Commits · b0e04e96d9aeb2eec918f6fc704c98c408b14572 · nexedi / gitlab-ce

01 Jun, 2018 16 commits
- Merge branch 'docs-fix-typo-pages' into 'master' · b0e04e96
  Achilleas Pipinellis authored Jun 01, 2018
```
Docs: fix typo

See merge request gitlab-org/gitlab-ee!5931
```
  b0e04e96
- Merge branch 'docs/ldap-ee' into 'master' · 60f94fd3
  Achilleas Pipinellis authored Jun 01, 2018
```
Refactor LDAP docs

See merge request gitlab-org/gitlab-ee!3691
```
  60f94fd3
- Refactor LDAP docs · 96ba68c4
  Achilleas Pipinellis authored Jun 01, 2018
  
  96ba68c4
- fix typo · 0fb15e85
  Marcia Ramos authored Jun 01, 2018
  
  0fb15e85
- Merge branch 'ce-to-ee-2018-05-31' into 'master' · 0eee2195
  Filipa Lacerda authored Jun 01, 2018
```
CE upstream - 2018-05-31 21:32 UTC

See merge request gitlab-org/gitlab-ee!5925
```
  0eee2195
- Merge branch 'ee-ide-jobs-list-components' into 'master' · 239dbdf5
  Filipa Lacerda authored Jun 01, 2018
```
EE port of ide-jobs-list-components

See merge request gitlab-org/gitlab-ee!5904
```
  239dbdf5
- Merge branch 'docs-update-reporter-role' into 'master' · 8dca5dcc
  Achilleas Pipinellis authored Jun 01, 2018
```
Remove assign merge requests ability from reporter role

Closes gitlab-ce#44728

See merge request gitlab-org/gitlab-ee!5922
```
  8dca5dcc
- Resolve another conflict in spec/controllers/application_controller_spec.rb · fe55ece9
  Imre Farkas authored Jun 01, 2018
  
  fe55ece9
- Resolve conflict in spec/controllers/application_controller_spec.rb · abc69dd2
  Imre Farkas authored Jun 01, 2018
  
  abc69dd2
- Resolve conflict in db/schema.rb · 6ccee496
  Imre Farkas authored Jun 01, 2018
  
  6ccee496
- Resolve conflict in config/routes/project.rb · 1723419b
  Imre Farkas authored Jun 01, 2018
  
  1723419b
- Merge branch 'ee-47046-use-sortable-from-npm' into 'master' · 985c8443
  Phil Hughes authored Jun 01, 2018
```
EE Port: Use NPM provided version of SortableJS

See merge request gitlab-org/gitlab-ee!5923
```
  985c8443
- Resolve conflict in app/views/projects/issues/_nav_btns.html.haml · 53f4664c
  Imre Farkas authored Jun 01, 2018
  
  53f4664c
- Resolve conflict in app/controllers/projects/issues_controller.rb · 7a760728
  Imre Farkas authored Jun 01, 2018
  
  7a760728
- Resolve conflict in app/controllers/profiles_controller.rb · 209762fc
  Imre Farkas authored Jun 01, 2018
  
  209762fc
- generate fresh gitlab.pot [skip ci] · 2e5ae2d4
  Paul Slaughter authored Jun 01, 2018
  
  2e5ae2d4
31 May, 2018 24 commits
- [skip ci] Fix conflict in app/views/shared/issuable/form/_merge_params.html.haml · 858e4cc9
  Clement Ho authored May 31, 2018
  
  858e4cc9
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-31 · c8c2bab5
  GitLab Bot authored May 31, 2018
```
# Conflicts:
#	app/controllers/profiles_controller.rb
#	app/controllers/projects/issues_controller.rb
#	app/views/projects/issues/_nav_btns.html.haml
#	app/views/shared/issuable/form/_merge_params.html.haml
#	config/routes/project.rb
#	db/schema.rb
#	locale/gitlab.pot
#	spec/controllers/application_controller_spec.rb

[ci skip]
```
  c8c2bab5
- Merge branch '25955/update-404-pages' into 'master' · c0bac47d
  Mike Greiling authored May 31, 2018
```
Update 404 and 403 pages

Closes #25955

See merge request gitlab-org/gitlab-ce!19096
```
  c0bac47d
- Update 404 and 403 pages · bbff2d68
  Paul Slaughter authored May 31, 2018
  
  bbff2d68
- Merge branch 'bootstrap-squash-alignment' into 'master' · e16859c4
  Annabel Gray authored May 31, 2018
```
Fix bootstrap squash checkbox alignment

Closes #47055

See merge request gitlab-org/gitlab-ce!19292
```
  e16859c4
- Merge branch 'bootstrap-pipeline-right-align' into 'master' · ccf9e52e
  Annabel Gray authored May 31, 2018
```
Fix bootstrap pipeline right alignment

Closes #46875

See merge request gitlab-org/gitlab-ce!19284
```
  ccf9e52e
- Merge branch '46817-new-application' into 'master' · bddde764
  Clement Ho authored May 31, 2018
```
Resolve "Admin area > New Application form"

Closes #46817

See merge request gitlab-org/gitlab-ce!19290
```
  bddde764
- Fix bootstrap squash checkbox alignment · 698f954e
  Clement Ho authored May 31, 2018
  
  698f954e
- Merge branch 'ee-bootstrap-checkbox' into 'master' · 409abd54
  Annabel Gray authored May 31, 2018
```
Fix checkbox/radio button structure (EE)

See merge request gitlab-org/gitlab-ee!5913
```
  409abd54
- Fix checkbox/radio button structure (EE) · 9fb8a96d
  Clement Ho authored May 31, 2018
  
  9fb8a96d
- Merge branch 'jivl-update-form-horizontal-usage' into 'master' · f153faa8
  Annabel Gray authored May 31, 2018
```
Remove form-horizontal class where applicable

Closes #46744

See merge request gitlab-org/gitlab-ce!19262
```
  f153faa8
- Merge branch 'bootstrap-checkbox' into 'master' · 7e83211f
  Annabel Gray authored May 31, 2018
```
Fix checkbox/radio button structure

Closes #46766 and #46719

See merge request gitlab-org/gitlab-ce!19254
```
  7e83211f
- Fix checkbox/radio button structure · 1a6d848d
  Clement Ho authored May 31, 2018
  
  1a6d848d
- Fix new application layout · 267fcb82
  Annabel Dunstone Gray authored May 31, 2018
  
  267fcb82
- Remove form-horizontal class where applicable · cf3f7601
  Jose authored May 30, 2018
  
  cf3f7601
- Fix bootstrap pipeline right alignment · 4d55be42
  Clement Ho authored May 31, 2018
  
  4d55be42
- Merge branch 'ee-fix-snippets-embed' into 'master' · 99a9a8a9
  Annabel Gray authored May 31, 2018
```
Fix snippets embed form (EE)

See merge request gitlab-org/gitlab-ee!5894
```
  99a9a8a9
- Fix snippets embed form (EE) · c905436f
  Clement Ho authored May 31, 2018
  
  c905436f
- Merge branch 'fix-snippets-embed' into 'master' · e57ad62d
  Annabel Gray authored May 31, 2018
```
Fix snippets embed form

Closes #46948

See merge request gitlab-org/gitlab-ce!19219
```
  e57ad62d
- Fix snippets embed form · bf2fb848
  Clement Ho authored May 31, 2018
  
  bf2fb848
- Merge branch 'rails5-active-sup-subscriber' into 'master' · 02f8f900
  Rémy Coutable authored May 31, 2018
```
Make ActiveRecordSubscriber rails 5 compatible

Closes #44702

See merge request gitlab-org/gitlab-ce!19276
```
  02f8f900
- Merge branch '41587-osw-mr-metrics-migration-take-two-ee' into 'master' · 0eba75e9
  Grzegorz Bizon authored May 31, 2018
```
[CE port] Take two for MR metrics population background migration

See merge request gitlab-org/gitlab-ee!5911
```
  0eba75e9
- Merge branch 'ce-to-ee-2018-05-31' into 'master' · e01963e8
  Rémy Coutable authored May 31, 2018
```
CE upstream - 2018-05-31 12:26 UTC

Closes gitaly#1208

See merge request gitlab-org/gitlab-ee!5920
```
  e01963e8
- Merge branch 'issue_45082' into 'master' · df164bb9
  Douwe Maan authored May 31, 2018
```
Add merge requests list endpoint for groups

Closes #45082

See merge request gitlab-org/gitlab-ce!18915
```
  df164bb9