Commits · 380cc283f8f02bbebb990fc5448590845a71beb0 · nexedi / gitlab-ce

04 Apr, 2018 29 commits
- 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
- 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 '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
- Merge branch 'bvl-handle-missing-attribute-when-updating-username' into 'master' · 57b0636c
  Douwe Maan authored Apr 04, 2018
```
Handle invalid params when trying update_username

Closes #44925

See merge request gitlab-org/gitlab-ce!18167
```
  57b0636c
- Merge branch '41224-pipeline-icons' into 'master' · 611abb3e
  Tim Zallmann authored Apr 04, 2018
```
Resolve "Cancel icons in pipeline dropdowns are misaligned"

Closes #41224 and #37318

See merge request gitlab-org/gitlab-ce!18089
```
  611abb3e
- Handle invalid params when trying update_username · 3faa7653
  Bob Van Landuyt authored Apr 04, 2018
```
Using strong params to require the presence of a username when calling
`update_username`. Otherwise we'd raise a `NoMethodError` validating
the paths on disk.
```
  3faa7653
- Move network related app settings to expandable blocks · 52b36d61
  Dmitriy Zaporozhets authored Apr 03, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  52b36d61
- Move network related app settings to expandable blocks · 242345a0
  Dmitriy Zaporozhets authored Apr 03, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  242345a0
- Merge branch 'dz-improve-app-settings-4' into 'master' · b61e00ea
  Grzegorz Bizon authored Apr 04, 2018
```
Redesign application settings to match project settings (part 4)

See merge request gitlab-org/gitlab-ce!18100
```
  b61e00ea
- Merge branch 'ee-dz-improve-app-settings-4' into 'master' · 2657fe84
  Grzegorz Bizon authored Apr 04, 2018
```
Redesign application settings to match project settings (part 4)

See merge request gitlab-org/gitlab-ee!5184
```
  2657fe84
- [Rails5] Update Gemfile.rails5.lock [ci skip] · 975c084c
  blackst0ne authored Apr 04, 2018
  
  975c084c
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-04 · 835e46d0
  GitLab Bot authored Apr 04, 2018
  
  835e46d0
03 Apr, 2018 11 commits
- Merge branch 'ce-to-ee-2018-04-03' into 'master' · 3aa499a7
  Robert Speicher authored Apr 03, 2018
```
CE upstream - 2018-04-03 21:26 UTC

See merge request gitlab-org/gitlab-ee!5218
```
  3aa499a7
- Merge branch '5547-backport-gitlab-git-checksum-to-ce' into 'master' · 0bf38d35
  Stan Hu authored Apr 03, 2018
```
Move Gitlab::Git::Checksum outside the ee top folder.

See merge request gitlab-org/gitlab-ee!5215
```
  0bf38d35
- Merge branch '5547-backport-gitlab-git-checksum-to-ce' into 'master' · a08f15c6
  Stan Hu authored Apr 03, 2018
```
Backport Gitlab::Git::Checksum to CE

See merge request gitlab-org/gitlab-ce!18161
```
  a08f15c6
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-03 · e281aeb7
  GitLab Bot authored Apr 03, 2018
  
  e281aeb7
- Merge branch 'ce-to-ee-2018-04-03' into 'master' · c1aca58b
  Robert Speicher authored Apr 03, 2018
```
CE upstream - 2018-04-03 18:27 UTC

See merge request gitlab-org/gitlab-ee!5216
```
  c1aca58b
- Merge branch 'docs-update_security_products_examples' into 'master' · 6c5bd6d0
  Marcia Ramos authored Apr 03, 2018
```
Update Security Products examples documentation

See merge request gitlab-org/gitlab-ce!18151
```
  6c5bd6d0
- Update Security Products examples documentation · a0869452
  Olivier Gonzalez authored Apr 03, 2018
  
  a0869452
- Merge branch 'docs-update_security_products_examples-ee' into 'master' · 4470dcc8
  Philippe Lafoucrière authored Apr 03, 2018
```
Update Security Products examples documentation

See merge request gitlab-org/gitlab-ee!5210
```
  4470dcc8
- Resolve conflict in spec/controllers/projects/issues_controller_spec.rb · 21487749
  Robert Speicher authored Apr 03, 2018
  
  21487749
- Backport Gitlab::Git::Checksum to CE · 563d38e8
  Douglas Barbosa Alexandre authored Apr 03, 2018
  
  563d38e8
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-03 · 5e9a30bb
  GitLab Bot authored Apr 03, 2018
```
# Conflicts:
#	spec/controllers/projects/issues_controller_spec.rb

[ci skip]
```
  5e9a30bb