Commits · e3c775259cd93d8417bcacde8a7dcdf2ddb1637b · nexedi / gitlab-ce

25 Apr, 2018 2 commits
- Update CHANGELOG.md for 10.7.2 · e3c77525
  Mayra Cabrera authored Apr 25, 2018
```
[ci skip]
```
  e3c77525
- Update CHANGELOG-EE.md for 10.7.2-ee · b92e18ef
  Mayra Cabrera authored Apr 25, 2018
```
[ci skip]
```
  b92e18ef
24 Apr, 2018 38 commits
- Update CHANGELOG.md for 10.6.5 · 7c1169dc
  Mayra Cabrera authored Apr 24, 2018
```
[ci skip]
```
  7c1169dc
- Update CHANGELOG-EE.md for 10.6.5-ee · 5a6de50f
  Mayra Cabrera authored Apr 24, 2018
```
[ci skip]
```
  5a6de50f
- Update CHANGELOG.md for 10.5.8 · a64db3f5
  Mayra Cabrera authored Apr 24, 2018
```
[ci skip]
```
  a64db3f5
- Update CHANGELOG-EE.md for 10.5.8-ee · 1899927c
  Mayra Cabrera authored Apr 24, 2018
```
[ci skip]
```
  1899927c
- Merge branch '5751-geo-undefined-method-pending_delete-for-nil-nilclass' into 'master' · bd54136e
  Stan Hu authored Apr 24, 2018
```
Resolve "Geo: undefined method `pending_delete?' for nil:NilClass in geo/repository_verification/secondary/single_worker.rb"

Closes #5751

See merge request gitlab-org/gitlab-ee!5470
```
  bd54136e
- Merge branch 'ce-to-ee-2018-04-24' into 'master' · 1a4b6568
  James Edwards-Jones authored Apr 24, 2018
```
CE upstream - 2018-04-24 12:36 UTC

See merge request gitlab-org/gitlab-ee!5467
```
  1a4b6568
- Merge branch 'ee-matbaj/gitlab-ce-add-inherit-command' into 'master' · 5ade9350
  Rémy Coutable authored Apr 24, 2018
```
Add copy_metadata quick action

See merge request gitlab-org/gitlab-ee!5433
```
  5ade9350
- Add CHANGELOG · 1378380b
  Douglas Barbosa Alexandre authored Apr 24, 2018
  
  1378380b
- Fix undefined method pending_delete for nil class · d1a3aef5
  Douglas Barbosa Alexandre authored Apr 24, 2018
  
  d1a3aef5
- Merge branch 'ee-30998-add-babel-rewire-plugin' into 'master' · aa78453c
  Clement Ho authored Apr 24, 2018
```
EE Port of "Add some way to mock and spy on default ES modules"

See merge request gitlab-org/gitlab-ee!5447
```
  aa78453c
- EE Port of "Add some way to mock and spy on default ES modules" · b80c7551
  Mike Greiling authored Apr 24, 2018
  
  b80c7551
- Fix conflicts on ci/yaml README · ea8d8412
  Takuya Noguchi authored Apr 24, 2018
  
  ea8d8412
- Fix conflicts on ci/variables readme · de292501
  Mayra Cabrera authored Apr 24, 2018
  
  de292501
- Fix conflicts in Auth::User classes, user routes and LDAP callback controller · 746706d1
  James Edwards-Jones authored Apr 24, 2018
  
  746706d1
- Add copy_metadata quick action · 1c652f03
  Sean McGivern authored Apr 20, 2018
```
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18497
```
  1c652f03
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-24 · d6a97dab
  GitLab Bot authored Apr 24, 2018
```
# Conflicts:
#	app/controllers/ldap/omniauth_callbacks_controller.rb
#	config/routes/user.rb
#	doc/ci/variables/README.md
#	doc/ci/yaml/README.md
#	lib/gitlab/auth/ldap/user.rb
#	lib/gitlab/auth/saml/user.rb

[ci skip]
```
  d6a97dab
- Merge branch '4950-unassign-slash-command-preview-fix' into 'master' · 8b41c406
  Sean McGivern authored Apr 24, 2018
```
Fix unassign slash command preview

See merge request gitlab-org/gitlab-ce!18447
```
  8b41c406
- Fix unassign slash command preview · 36dc28fd
  Athar Hameed authored Apr 24, 2018
  
  36dc28fd
- Merge branch '4950-unassign-slash-command-preview-fix' into 'master' · 4b542c17
  Sean McGivern authored Apr 24, 2018
```
[EE] Fix unassign slash command preview

Closes #4950

See merge request gitlab-org/gitlab-ee!5334
```
  4b542c17
- [EE] Fix unassign slash command preview · 8bb15838
  Athar Hameed authored Apr 24, 2018
  
  8bb15838
- Merge branch... · c7b12a41
  Grzegorz Bizon authored Apr 24, 2018
```
Merge branch '43111-controller-projects-mergerequestscontroller-index-executes-more-than-100-sql-queries' into 'master'

Resolve "Controller Projects::MergeRequestsController#index executes more than 100 SQL queries"

Closes #43111

See merge request gitlab-org/gitlab-ce!18561
```
  c7b12a41
- Merge branch 'show-runners-description-on-jobs-page' into 'master' · b2041d1e
  Kamil Trzciński authored Apr 24, 2018
```
Show Runner's description on job's page

See merge request gitlab-org/gitlab-ce!17321
```
  b2041d1e
- Add CHANGELOG entry · d9325335
  Tomasz Maczukin authored Apr 05, 2018
  
  d9325335
- Show Runner's description on job's page · d71193a0
  Tomasz Maczukin authored Feb 23, 2018
  
  d71193a0
- Fix an N+1 for MRs from forks on the MR index page · 943fc87d
  Sean McGivern authored Apr 24, 2018
  
  943fc87d
- Merge branch '10244-add-project-ci-cd-settings' into 'master' · f5524d55
  Kamil Trzciński authored Apr 24, 2018
```
Introduce new ProjectCiCdSettings model with group_runners_enabled

See merge request gitlab-org/gitlab-ce!18144
```
  f5524d55
- Merge branch 'lm-update-ha-app-server-config' into 'master' · 687f5788
  Marin Jankovski authored Apr 24, 2018
```
HA Application Servers should have nginx running on them.

See merge request gitlab-org/gitlab-ee!5427
```
  687f5788
- Merge branch 'fj-45057-improve-ssrf-documentation' into 'master' · 26147b73
  Douwe Maan authored Apr 24, 2018
```
Improve documentation of SSRF protection

Closes #45057

See merge request gitlab-org/gitlab-ce!18532
```
  26147b73
- Improve documentation of SSRF protection · 6d3121be
  Francisco Javier López authored Apr 24, 2018
  
  6d3121be
- Merge branch 'jej/refactor-omniauth-controller' into 'master' · 1e624f34
  Douwe Maan authored Apr 24, 2018
```
Refactor OmniauthCallbacksController to remove duplication

Closes #26559

See merge request gitlab-org/gitlab-ce!16694
```
  1e624f34
- Merge branch 'ee-jej/refactor-omniauth-controller' into 'master' · 8e0fe6a4
  Douwe Maan authored Apr 24, 2018
```
[EE] Refactor OmniauthCallbacksController to remove duplication

See merge request gitlab-org/gitlab-ee!5416
```
  8e0fe6a4
- Merge branch 'bvl-warn-if-move-fails-on-mountpoint' into 'master' · d210c6b6
  Douwe Maan authored Apr 24, 2018
```
Warning when restore fails when data-dir is a moint point

Closes #19309

See merge request gitlab-org/gitlab-ce!18533
```
  d210c6b6
- Merge branch 'ce-to-ee-2018-04-23' into 'master' · eda46572
  Rémy Coutable authored Apr 24, 2018
```
CE upstream - 2018-04-23 21:23 UTC

See merge request gitlab-org/gitlab-ee!5457
```
  eda46572
- Merge branch 'ide-file-finder' into 'master' · bb8e4268
  Filipa Lacerda authored Apr 24, 2018
```
Added fuzzy file finder to web IDE

Closes #44841

See merge request gitlab-org/gitlab-ce!18323
```
  bb8e4268
- Merge branch 'sh-bump-lograge' into 'master' · b0f7ab7f
  Rémy Coutable authored Apr 24, 2018
```
Bump lograge to 0.10.0 and remove monkey patch

See merge request gitlab-org/gitlab-ce!18551
```
  b0f7ab7f
- Merge branch 'replace-fild-file-tests' into 'master' · fc070ad0
  Rémy Coutable authored Apr 24, 2018
```
Replace find file project spinach tests with RSpec

See merge request gitlab-org/gitlab-ce!18528
```
  fc070ad0
- Replace find file project spinach tests with RSpec · 8ad7cb77
  Semyon Pupkov authored Apr 24, 2018
  
  8ad7cb77
- Resolve conflict in spec/factories/namespaces.rb · 1133b322
  Rémy Coutable authored Apr 24, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  1133b322