Commits · c01ae4949815ff1dd467b11c5974b3afc5b88fc0 · nexedi / gitlab-ce

04 Apr, 2018 40 commits
- Resolve conflict in lib/api/projects.rb · c01ae494
  Rémy Coutable authored Apr 04, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  c01ae494
- Resolve conflict in doc/api/projects.md · fddfeacc
  Rémy Coutable authored Apr 04, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  fddfeacc
- Resolve conflict in changelogs/unreleased/39880-merge-method-api.yml · 8c455270
  Rémy Coutable authored Apr 04, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  8c455270
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-04 · 8cc7570f
  GitLab Bot authored Apr 04, 2018
```
# Conflicts:
#	changelogs/unreleased/39880-merge-method-api.yml
#	doc/api/projects.md
#	lib/api/projects.rb
#	spec/requests/api/projects_spec.rb

[ci skip]
```
  8cc7570f
- Merge branch 'pdeden/gitlab-ee-patch-7' into 'master' · aff9bf11
  Achilleas Pipinellis authored Apr 04, 2018
```
Fix syntax error in the `Envoy.blade.php` example

See merge request gitlab-org/gitlab-ce!18177
```
  aff9bf11
- Merge branch 'feature_detect_co_authored_commits' into 'master' · f8365c3d
  Douwe Maan authored Apr 04, 2018
```
Add banzai filter to detect commit message trailers and properly link the users

Closes #31640

See merge request gitlab-org/gitlab-ce!17919
```
  f8365c3d
- Add banzai filter to detect commit message trailers and properly link the users · a069aa49
  Omar Mekky authored Apr 04, 2018
  
  a069aa49
- Merge branch 'ce-to-ee-2018-04-04' into 'master' · 380cc283
  Rémy Coutable authored Apr 04, 2018
```
CE upstream - 2018-04-04 09:39 UTC

Closes gitaly#1110

See merge request gitlab-org/gitlab-ee!5221
```
  380cc283
- Merge branch 'sh-gitlab-sidekiq-logger' into 'master' · b15dd5df
  Sean McGivern authored Apr 04, 2018
```
Add support for Sidekiq JSON logging

Closes #20060

See merge request gitlab-org/gitlab-ce!18121
```
  b15dd5df
- Merge branch 'zj-revert-bad-grouping' into 'master' · 873a1d93
  Grzegorz Bizon authored Apr 04, 2018
```
Revert "Allow CI/CD Jobs being grouped on version strings"

Closes #44615

See merge request gitlab-org/gitlab-ce!18170
```
  873a1d93
- Merge branch 'zj-feature-gate-remove-http-api' into 'master' · e43c01e6
  Douwe Maan authored Apr 04, 2018
```
Allow feature gate removal through the API

See merge request gitlab-org/gitlab-ce!18146
```
  e43c01e6
- Revert changelog entry for removed feature · 695684c8
  Zeger-Jan van de Weg authored Apr 04, 2018
  
  695684c8
- Revert "Allow CI/CD Jobs being grouped on version strings" · 16ea3315
  Zeger-Jan van de Weg authored Apr 04, 2018
```
This reverts commit 4f2cdb51.
```
  16ea3315
- Add support for Sidekiq JSON logging · 6415ac9e
  Stan Hu authored Apr 01, 2018
```
Closes #20060
```
  6415ac9e
- Fix conflicts in app/finders/issuable_finder.rb and spec/models/user_spec.rb · 5b94a7da
  Dmitriy Zaporozhets authored Apr 04, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5b94a7da
- Fix conflict in app/views/admin/application_settings/_form.html.haml · 4048249b
  Dmitriy Zaporozhets authored Apr 04, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4048249b
- Merge branch 'ide-pending-tab' into 'master' · eaed588b
  Tim Zallmann authored Apr 04, 2018
```
Added pending tabs to IDE

See merge request gitlab-org/gitlab-ce!17936
```
  eaed588b
- Merge branch '20394-protected-branches-wildcard' into 'master' · 1f59aa24
  Rémy Coutable authored Apr 04, 2018
```
Resolve "Protected branches count is wrong when a wildcard includes several protected branches"

Closes #20394

See merge request gitlab-org/gitlab-ce!17920
```
  1f59aa24
- Resolve "Protected branches count is wrong when a wildcard includes several protected branches" · c2823a4b
  Jan authored Apr 04, 2018
  
  c2823a4b
- Merge branch 'update_code_quality_job' into 'master' · 6587a0cd
  Rémy Coutable authored Apr 04, 2018
```
Use standard codequality job

See merge request gitlab-org/gitlab-ce!18070
```
  6587a0cd
- Use standard codequality job · 81aba67e
  Olivier Gonzalez authored Apr 04, 2018
  
  81aba67e
- Merge branch '39880-merge-method-api' into 'master' · 9c728799
  Rémy Coutable authored Apr 04, 2018
```
Resolve "Allow the configuration of a project's merge method via the API"

Closes #39880

See merge request gitlab-org/gitlab-ce!18031
```
  9c728799
- Resolve "Allow the configuration of a project's merge method via the API" · f6d58310
  Jan authored Apr 04, 2018
  
  f6d58310
- Merge branch 'ee-39880-merge-method-api' into 'master' · 8ba33b5d
  Rémy Coutable authored Apr 04, 2018
```
Port of 39880-merge-method-api to EE

Closes gitlab-ce#39880

See merge request gitlab-org/gitlab-ee!5154
```
  8ba33b5d
- Fixed conflict in user.rb · aef66258
  Francisco Javier López authored Apr 04, 2018
  
  aef66258
- Reolving conflict in adapter.rb · 8de362b3
  Francisco Javier López authored Apr 04, 2018
  
  8de362b3
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-04 · e69226c0
  GitLab Bot authored Apr 04, 2018
```
# Conflicts:
#	app/finders/issuable_finder.rb
#	app/views/admin/application_settings/_form.html.haml
#	lib/gitlab/auth/ldap/adapter.rb
#	lib/gitlab/auth/o_auth/user.rb
#	spec/models/user_spec.rb

[ci skip]
```
  e69226c0
- Merge branch 'ce-to-ee-2018-04-04' into 'master' · fba1f9dc
  Marin Jankovski authored Apr 04, 2018
```
CE upstream - 2018-04-04 00:24 UTC

See merge request gitlab-org/gitlab-ee!5219
```
  fba1f9dc
- Merge branch 'dz-improve-app-settings-5' into 'master' · c7e0fc76
  Filipa Lacerda authored Apr 04, 2018
```
Redesign application settings to match project settings (part 5)

See merge request gitlab-org/gitlab-ce!18159
```
  c7e0fc76
- Merge branch 'ee-dz-improve-app-settings-5' into 'master' · 9b64995d
  Filipa Lacerda authored Apr 04, 2018
```
Redesign application settings to match project settings (part 5)

See merge request gitlab-org/gitlab-ee!5214
```
  9b64995d
- Merge branch 'fix/use-shard-name-in-gitlab-projects-instead-of-shard-path' into 'master' · c3534266
  Sean McGivern authored Apr 04, 2018
```
Use shard name in Git::GitlabProjects instead of shard path

Closes gitaly#1110

See merge request gitlab-org/gitlab-ce!18015
```
  c3534266
- Merge branch 'blackst0ne-rails5-rename-sort-methods' into 'master' · 9dd33057
  Sean McGivern authored Apr 04, 2018
```
[Rails5] Rename `sort` methods to `sort_by_attribute`

See merge request gitlab-org/gitlab-ce!18142
```
  9dd33057
- [Rails5] Rename `sort` methods to `sort_by_attribute` · 3d3b46f3
  blackst0ne authored Apr 04, 2018
  
  3d3b46f3
- Merge branch 'blackst0ne-rails5-rename-sort-methods-ee' into 'master' · 97545f05
  Sean McGivern authored Apr 04, 2018
```
[Rails5] Rename `sort` methods to `sort_by_attribute`

See merge request gitlab-org/gitlab-ee!5207
```
  97545f05
- [Rails5] Rename `sort` methods to `sort_by_attribute` · 2cba6111
  blackst0ne authored Apr 04, 2018
  
  2cba6111
- Merge branch 'fj-174-better-ldap-connection-handling' into 'master' · e9ea5208
  Douwe Maan authored Apr 04, 2018
```
Add better LDAP connection handling

See merge request gitlab-org/gitlab-ce!18039
```
  e9ea5208
- Add better LDAP connection handling · ae84eaeb
  Francisco Javier López authored Apr 04, 2018
  
  ae84eaeb
- Merge branch 'ee-fj-174-better-ldap-connection-handling' into 'master' · b4db84a5
  Douwe Maan authored Apr 04, 2018
```
CE port: Add better LDAP connection handling

Closes #480 and #4941

See merge request gitlab-org/gitlab-ee!5173
```
  b4db84a5
- CE port: Add better LDAP connection handling · 4e2245ae
  Francisco Javier López authored Apr 04, 2018
  
  4e2245ae
- Merge branch 'blackst0ne-rails5-update-gemfile-rails5-lock' into 'master' · 5d16fc67
  Rémy Coutable authored Apr 04, 2018
```
[Rails5] Update Gemfile.rails5.lock

See merge request gitlab-org/gitlab-ce!18164
```
  5d16fc67