Commits · e26af09f8926d04dbfc277e49e9f7d792980b2ca · nexedi / gitlab-ce

01 May, 2018 19 commits
- Exclude expired artifacts from syncable · e26af09f
  Michael Kozono authored May 01, 2018
  
  e26af09f
- Rename affected “local” registry finder methods · 3c34e90f
  Michael Kozono authored May 01, 2018
  
  3c34e90f
- Replace `with_files_stored_locally` with `geo_syncable` · e6a64aac
  Michael Kozono authored May 01, 2018
  
  e6a64aac
- Merge branch 'qa/gb/fix-repository-location-in-squash-specs' into 'master' · e5fc2b1e
  Robert Speicher authored May 01, 2018
```
Fix repository location in GitLab QA squash specs

See merge request gitlab-org/gitlab-ee!5528
```
  e5fc2b1e
- Merge branch 'ce-to-ee-2018-05-01' into 'master' · 23f8f6f8
  Robert Speicher authored May 01, 2018
```
CE upstream - 2018-05-01 00:27 UTC

See merge request gitlab-org/gitlab-ee!5524
```
  23f8f6f8
- Resolve conflicts in doc/README.md · 38ecf364
  Robert Speicher authored May 01, 2018
  
  38ecf364
- 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
- Fix conflicts · ee909b5f
  Victor Wu authored May 01, 2018
  
  ee909b5f
- 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
- Fix repository location in GitLab QA squash specs · 79485896
  Grzegorz Bizon authored May 01, 2018
  
  79485896
- Fix merge conflict in Gemfile.lock · 09d4b2b1
  Jacob Vosmaer authored May 01, 2018
  
  09d4b2b1
- 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
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-01 · a48184a7
  GitLab Bot authored May 01, 2018
```
# Conflicts:
#	Gemfile.lock
#	doc/README.md
#	doc/development/README.md

[ci skip]
```
  a48184a7
30 Apr, 2018 21 commits
- Merge branch 'revert-discussion-counter-height' into 'master' · 8b3db0d6
  Filipa Lacerda authored Apr 30, 2018
```
Revert discussion counter height

Closes #45896

See merge request gitlab-org/gitlab-ce!18656
```
  8b3db0d6
- 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
- Revert discussion counter height · 4c5829d7
  George Tsiolis authored Apr 30, 2018
  
  4c5829d7
- Merge branch 'fix-inconsistent-protected-branch-pill-baseline' into 'master' · c34061db
  Filipa Lacerda authored Apr 30, 2018
```
Fixed inconsistent protected branch pill baseline

Closes #41286 and #45354

See merge request gitlab-org/gitlab-ce!18409
```
  c34061db
- Fixed inconsistent protected branch pill baseline · 84141298
  Constance Okoghenun authored Apr 30, 2018
  
  84141298
- Resolve conflicts · 3c72a0a5
  Robert Speicher authored Apr 30, 2018
  
  3c72a0a5
- Merge branch '10-7-security_issue_42029' into 'security-10-7' · 2f7b71df
  Phil Hughes authored Apr 18, 2018
```
Sanitize user name to avoid XSS attacks

See merge request gitlab/gitlabhq!2373
```
  2f7b71df
- Merge branch 'security-45689-fix-archive-cache-bug' into 'security-10-7' · 9cf4e473
  Douwe Maan authored Apr 25, 2018
```
Serve archive requests with the correct file in all cases (10.7)

See merge request gitlab/gitlabhq!2376
```
  9cf4e473
- 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 'bvl-fix-openid-redirect' into 'master' · e71351d4
  Douwe Maan authored Apr 30, 2018
```
Skip `authenticate_user!` for Doorkeeper controllers

Closes #44639

See merge request gitlab-org/gitlab-ce!18599
```
  e71351d4
- Merge branch 'rebase-in-progress-fast-timeout' into 'master' · 5af7fd59
  Douwe Maan authored Apr 30, 2018
```
Use fast timeouts for Gitaly FooInProgress RPC's

See merge request gitlab-org/gitlab-ce!18655
```
  5af7fd59
- 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 '43614-osw-diff-docs' into 'master' · 7275c225
  Douwe Maan authored Apr 30, 2018
```
Add developer documentation on diff handling and limits

Closes #43614

See merge request gitlab-org/gitlab-ce!18269
```
  7275c225
- Merge branch 'grpc-1.11.0' into 'master' · 16e848c1
  Stan Hu authored Apr 30, 2018
```
Use grpc 1.11.0

See merge request gitlab-org/gitlab-ce!18652
```
  16e848c1
- 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 'ce-jej/branch-unprotection-disable-ui' into 'master' · d9ccc3af
  Grzegorz Bizon | OOO until May 7th authored Apr 30, 2018
```
Backports EE changes from disabling branch unprotect UI

See merge request gitlab-org/gitlab-ce!18262
```
  d9ccc3af
- 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
- Add developer documentation on diff handling and limits · 5e0a2db7
  Oswaldo Ferreira authored Apr 09, 2018
  
  5e0a2db7
- Use grpc 1.11.0 · 5b73d0db
  Jacob Vosmaer authored Apr 30, 2018
  
  5b73d0db