Commits · a5ea8b16fe8d59d918751982ed796de2c1291886 · nexedi / gitlab-ce

07 May, 2018 1 commit
- Present MRs on Jira development panel integration · a5ea8b16
  Oswaldo Ferreira authored May 01, 2018
  
  a5ea8b16
01 May, 2018 9 commits
- Merge branch '5224-remove-use_system_git_for_fetch' into 'master' · 13dba821
  Nick Thomas authored May 01, 2018
```
Resolve "Remove USE_SYSTEM_GIT_FOR_FETCH"

Closes #5224

See merge request gitlab-org/gitlab-ee!5525
```
  13dba821
- Merge branch 'geo-dr-fix' into 'master' · ef44e5cc
  Nick Thomas authored May 01, 2018
```
Minor fix of disaster recovery doc

See merge request gitlab-org/gitlab-ee!5518
```
  ef44e5cc
- Merge branch '5466-geo-prometheus-metrics-for-checksummed-verification-is-confusing' into 'master' · 52e86a42
  Nick Thomas authored May 01, 2018
```
Resolve "Geo: Prometheus metrics for checksummed/verification is confusing"

Closes #5466

See merge request gitlab-org/gitlab-ee!5367
```
  52e86a42
- Resolve "Geo: Prometheus metrics for checksummed/verification is confusing" · 314bbca3
  Douglas Barbosa Alexandre authored May 01, 2018
  
  314bbca3
- Merge branch 'ee-jprovazn-commit-notes-api' into 'master' · e1c8d698
  Douwe Maan authored May 01, 2018
```
[EE] Discussion API for merge requests and commits

See merge request gitlab-org/gitlab-ee!5469
```
  e1c8d698
- [EE] Discussion API for merge requests and commits · 507430cd
  Jan Provaznik authored May 01, 2018
  
  507430cd
- Merge branch 'jej/exclude-group-saml-buttons' into 'master' · f2bf6717
  Douwe Maan authored May 01, 2018
```
Exclude GroupSAML from sign in buttons

See merge request gitlab-org/gitlab-ee!5449
```
  f2bf6717
- Merge remote-tracking branch 'dev/master' · f3dfa02b
  Stan Hu authored Apr 30, 2018
  
  f3dfa02b
- Remove ENV['USE_SYSTEM_GIT_FOR_FETCH'] support · b76713af
  Ash McKenzie authored May 01, 2018
  
  b76713af
30 Apr, 2018 27 commits
- Merge branch 'ce-to-ee-2018-04-30' into 'master' · a2e85860
  Robert Speicher authored Apr 30, 2018
```
CE upstream - 2018-04-30 09:25 UTC

See merge request gitlab-org/gitlab-ee!5519
```
  a2e85860
- Resolve conflicts · 3c72a0a5
  Robert Speicher authored Apr 30, 2018
  
  3c72a0a5
- Exclude Group SAML from sign in buttons · 4b584643
  James Edwards-Jones authored Apr 30, 2018
```
Also excludes Group SAML from OmniauthCallbacksController methods
```
  4b584643
- Exclude LDAP from OmniauthCallbackController base methods · e8fbf7aa
  James Edwards-Jones authored Apr 23, 2018
  
  e8fbf7aa
- Merge branch '43614-osw-diff-docs-ee' into 'master' · 91046f85
  Douwe Maan authored Apr 30, 2018
```
Avoid conflicts with gitlab-ce!18269

See merge request gitlab-org/gitlab-ee!5456
```
  91046f85
- Merge branch 'ee-grpc-1.11.0' into 'master' · 2184c6ed
  Stan Hu authored Apr 30, 2018
```
Use grpc 1.11.0 (EE version)

See merge request gitlab-org/gitlab-ee!5520
```
  2184c6ed
- Merge branch 'jej/branch-unprotection-disable-ui' into 'master' · 2b8261c0
  Grzegorz Bizon | OOO until May 7th authored Apr 30, 2018
```
Branch unprotection restrictions disable UI

See merge request gitlab-org/gitlab-ee!5296
```
  2b8261c0
- Add developer documentation on diff handling and limits · a6b56112
  Oswaldo Ferreira authored Apr 09, 2018
  
  a6b56112
- Use grpc 1.11.0 · 5b73d0db
  Jacob Vosmaer authored Apr 30, 2018
  
  5b73d0db
- Merge branch 'docs-review-home-ee' into 'master' · 06ada8c0
  Achilleas Pipinellis authored Apr 30, 2018
```
Docs: review product categories in doc/README

See merge request gitlab-org/gitlab-ee!5443
```
  06ada8c0
- Docs: review product categories in doc/README · aa329e3a
  Marcia Ramos authored Apr 30, 2018
  
  aa329e3a
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-30 · 8fa498c0
  GitLab Bot authored Apr 30, 2018
```
# Conflicts:
#	app/models/members/group_member.rb
#	app/models/members/project_member.rb
#	app/services/notification_service.rb
#	config/initializers/omniauth.rb

[ci skip]
```
  8fa498c0
- Merge branch 'patch-28' into 'master' · 649f791e
  Achilleas Pipinellis authored Apr 30, 2018
```
Update index.md

See merge request gitlab-org/gitlab-ce!18450
```
  649f791e
- Update index.md · b5932cdf
  Shinya Maeda authored Apr 30, 2018
  
  b5932cdf
- Merge branch 'fix_ci_view_typo' into 'master' · 80695a59
  Filipa Lacerda authored Apr 30, 2018
```
Fix typo

See merge request gitlab-org/gitlab-ee!5506
```
  80695a59
- Minor fix of disaster recovery doc · 408270b7
  Valery Sizov authored Apr 30, 2018
  
  408270b7
- Merge branch 'add-jwt-strategy-to-gitlab-suite' into 'master' · fa7b98d5
  Douwe Maan authored Apr 30, 2018
```
Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suite

See merge request gitlab-org/gitlab-ce!18580
```
  fa7b98d5
- Merge branch 'ee-add-jwt-strategy-to-gitlab-suite' into 'master' · d81891da
  Douwe Maan authored Apr 30, 2018
```
Ee add jwt strategy to gitlab suite

See merge request gitlab-org/gitlab-ee!5498
```
  d81891da
- Merge branch 'docs-update-pages-for-newbies' into 'master' · decdb4aa
  Achilleas Pipinellis authored Apr 30, 2018
```
Docs: update Pages for newbies

See merge request gitlab-org/gitlab-ee!5503
```
  decdb4aa
- Docs: update Pages for newbies · 3be32e17
  Marcia Ramos authored Apr 30, 2018
  
  3be32e17
- Merge branch 'docs-update-pages-for-newbies-ce' into 'master' · 7160be14
  Achilleas Pipinellis authored Apr 30, 2018
```
Docs: update Pages for newbies

See merge request gitlab-org/gitlab-ce!18629
```
  7160be14
- Docs: update Pages for newbies · ef804d5c
  Marcia Ramos authored Apr 30, 2018
  
  ef804d5c
- Merge branch '45572-members-invitations-scheduled-before-commit' into 'master' · 507e3fbc
  Douwe Maan authored Apr 30, 2018
```
Resolve "Members invitations scheduled before commit"

Closes #45572

See merge request gitlab-org/gitlab-ce!18538
```
  507e3fbc
- Merge branch 'ee-45572-members-invitations-scheduled-before-commit' into 'master' · f7bd848e
  Douwe Maan authored Apr 30, 2018
```
[EE] Ensure member invitation is sent after its actual creation in the DB

See merge request gitlab-org/gitlab-ee!5462
```
  f7bd848e
- Merge branch 'move-notification-service-calls-to-sidekiq' into 'master' · 0bbed2ec
  Douwe Maan authored Apr 30, 2018
```
Move NotificationService calls to Sidekiq

Closes #43106

See merge request gitlab-org/gitlab-ce!18535
```
  0bbed2ec
- Merge branch 'move-notification-service-calls-to-sidekiq' into 'master' · 8814fda9
  Douwe Maan authored Apr 30, 2018
```
Move NotificationService calls to Sidekiq

See merge request gitlab-org/gitlab-ee!5463
```
  8814fda9
- Merge remote-tracking branch 'dev/master' · af036b3f
  James Lopez authored Apr 30, 2018
  
  af036b3f
29 Apr, 2018 3 commits
- Merge branch 'ce-to-ee-2018-04-29' into 'master' · 15396b1a
  Stan Hu authored Apr 29, 2018
```
CE upstream - 2018-04-29 18:23 UTC

See merge request gitlab-org/gitlab-ee!5511
```
  15396b1a
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-29 · 6ca9339d
  GitLab Bot authored Apr 29, 2018
  
  6ca9339d
- Merge branch 'jramsay-44880-filter-pipelines-by-sha' into 'master' · 87f1736a
  Kamil Trzciński authored Apr 29, 2018
```
Add sha filter to list pipelines

Closes #44880

See merge request gitlab-org/gitlab-ce!18125
```
  87f1736a