Commits · 809afc540eec2419b78dbf1df4f74b7c17d28185 · nexedi / gitlab-ce

24 May, 2018 16 commits
- Rename code quality job and artifact. Refs #5779 · 809afc54
  Olivier Gonzalez authored May 18, 2018
  
  809afc54
- Merge branch 'patch-7' into 'master' · 06adb05e
  Marcia Ramos authored May 24, 2018
```
Updated documentation as per latest missing features on about.gitlab.com

See merge request gitlab-org/gitlab-ee!5794
```
  06adb05e
- Updated documentation as per latest missing features on about.gitlab.com · 45186591
  Eddie Stubbington authored May 24, 2018
  
  45186591
- Merge branch 'jej/saml-failure-messages' into 'master' · b9a5a4c9
  Grzegorz Bizon authored May 24, 2018
```
Display Group SAML failures in flash

Closes #5898

See merge request gitlab-org/gitlab-ee!5617
```
  b9a5a4c9
- Merge branch 'ce-to-ee-2018-05-24' into 'master' · cfbeabf0
  Rémy Coutable authored May 24, 2018
```
CE upstream - 2018-05-24 09:42 UTC

See merge request gitlab-org/gitlab-ee!5834
```
  cfbeabf0
- Merge branch '5778_rename_container_scanning_job_and_artifact-ee' into 'master' · db1a9930
  Grzegorz Bizon authored May 24, 2018
```
Rename container scanning job and artifact

See merge request gitlab-org/gitlab-ee!5770
```
  db1a9930
- Fix conflict · e21ed2cc
  Mark Chao authored May 24, 2018
  
  e21ed2cc
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-24 · c5b8592f
  GitLab Bot authored May 24, 2018
```
# Conflicts:
#	app/mailers/emails/merge_requests.rb
#	app/services/notification_service.rb
#	app/services/todo_service.rb

[ci skip]
```
  c5b8592f
- Merge branch 'ee-mr-conflict-notification' into 'master' · cd352364
  Douwe Maan authored May 24, 2018
```
MR unmergeable notification

See merge request gitlab-org/gitlab-ee!5744
```
  cd352364
- Merge branch 'mr-conflict-notification' into 'master' · e97a8743
  Douwe Maan authored May 24, 2018
```
MR unmergeable notification

See merge request gitlab-org/gitlab-ce!18042
```
  e97a8743
- Merge branch 'jprovazn-fix-resolvable' into 'master' · 56d2d462
  Douwe Maan authored May 24, 2018
```
Check if note's noteable is not nil when checking resolvability

Closes #46573

See merge request gitlab-org/gitlab-ce!19081
```
  56d2d462
- Merge branch 'ce-to-ee-2018-05-24' into 'master' · e1adaefb
  Marin Jankovski authored May 24, 2018
```
CE upstream - 2018-05-24 06:25 UTC

See merge request gitlab-org/gitlab-ee!5830
```
  e1adaefb
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-24 · 2f5d5ded
  GitLab Bot authored May 24, 2018
  
  2f5d5ded
- Merge branch '45850-close-mr-checkout-modal-on-escape' into 'master' · c52db71e
  Mike Greiling authored May 24, 2018
```
Resolve "Escape key to close MR check out branch modal"

Closes #45850

See merge request gitlab-org/gitlab-ce!19050
```
  c52db71e
- Add spec · 91647f09
  Mark Chao authored May 24, 2018
  
  91647f09
- Add spec · 13aa6f67
  Mark Chao authored May 24, 2018
  
  13aa6f67
23 May, 2018 24 commits
- Merge branch 'ce-to-ee-2018-05-23' into 'master' · 76e24efe
  Stan Hu authored May 23, 2018
```
CE upstream - 2018-05-23 21:27 UTC

See merge request gitlab-org/gitlab-ee!5828
```
  76e24efe
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-23 · 73fcf983
  GitLab Bot authored May 23, 2018
  
  73fcf983
- Update tests to ensure all combinations of job and artifact names are working together · ced2f262
  Olivier Gonzalez authored May 23, 2018
  
  ced2f262
- Update CHANGELOG.md for 10.8.1 · 6c51e220
  Mayra Cabrera authored May 23, 2018
```
[ci skip]
```
  6c51e220
- Update CHANGELOG.md for 10.8.1 · bad0dd18
  Mayra Cabrera authored May 23, 2018
```
[ci skip]
```
  bad0dd18
- Update CHANGELOG-EE.md for 10.8.1-ee · 53dbd65b
  Mayra Cabrera authored May 23, 2018
```
[ci skip]
```
  53dbd65b
- Merge branch 'ce-to-ee-2018-05-23' into 'master' · 7ec23df3
  Stan Hu authored May 23, 2018
```
CE upstream - 2018-05-23 15:36 UTC

See merge request gitlab-org/gitlab-ee!5824
```
  7ec23df3
- Merge branch '39710-search-placeholder-cut-off' into 'master' · dd512684
  Annabel Gray authored May 23, 2018
```
Resolve "Runners search input placeholder is cut off"

Closes #39710

See merge request gitlab-org/gitlab-ce!19015
```
  dd512684
- Merge branch... · 95002b2a
  Nick Thomas authored May 23, 2018
```
Merge branch '6077-geo-repository-verification-gets-stuck-when-all-projects-have-been-verified-at-least-once' into 'master'

Resolve "Geo: Repository verification gets stuck when all projects have been verified at least once"

Closes #6077

See merge request gitlab-org/gitlab-ee!5772
```
  95002b2a
- Merge branch 'ldap-u2f-fix' into 'master' · 332a16b6
  Mike Greiling authored May 23, 2018
```
Fixed U2F authentication when used with LDAP

Closes #46661

See merge request gitlab-org/gitlab-ce!19115
```
  332a16b6
- Merge branch 'ck-add-host-keys-ha-setup-docs' into 'master' · 4d1fd196
  Achilleas Pipinellis authored May 23, 2018
```
Add instruction for configuring host keys on HA secondary servers

See merge request gitlab-org/gitlab-ee!5670
```
  4d1fd196
- Add instruction for configuring host keys on HA secondary servers · fd0b3db6
  Chenjerai Katanda authored May 23, 2018
  
  fd0b3db6
- Merge branch... · ddc760a0
  Douwe Maan authored May 23, 2018
```
Merge branch '45175-cache-json-instead-of-activerecord-objects-in-appearance-and-applicationsetting' into 'master'

Resolve "Cache JSON instead of ActiveRecord objects in `Appearance` and `ApplicationSetting`"

Closes #45175

See merge request gitlab-org/gitlab-ce!18754
```
  ddc760a0
- Merge branch... · a7a0932b
  Douwe Maan authored May 23, 2018
```
Merge branch 'ee-45175-cache-json-instead-of-activerecord-objects-in-appearance-and-applicationsetting' into 'master'

[EE] Resolve "Cache JSON instead of ActiveRecord objects in `Appearance` and `ApplicationSetting`"

See merge request gitlab-org/gitlab-ee!5740
```
  a7a0932b
- Merge branch 'akaemmerle-update-keyboard-shortcuts-doc' into 'master' · 610aefe4
  Achilleas Pipinellis authored May 23, 2018
```
Update keyboard shortcut conventions

See merge request gitlab-org/gitlab-ce!19014
```
  610aefe4
- Update keyboard shortcut conventions · 137c949e
  Andreas Kämmerle authored May 23, 2018
  
  137c949e
- Merge branch 'fix/devops-remove-beta' into 'master' · a2658b08
  Tim Zallmann authored May 23, 2018
```
removed "(Beta)" from "Auto DevOps" messages

See merge request gitlab-org/gitlab-ce!18759
```
  a2658b08
- Merge branch '46505-update-autodevops-docs' into 'master' · a352c0d5
  Achilleas Pipinellis authored May 23, 2018
```
Add documentation of variables usage for disabling/enabling jobs in  Auto DevOps

Closes #46505

See merge request gitlab-org/gitlab-ce!19076
```
  a352c0d5
- Add documentation of variables usage for disabling/enabling jobs in Auto DevOps · e7de169a
  Tomasz Maczukin authored May 23, 2018
  
  e7de169a
- Merge branch 'fix/devops-remove-beta' into 'master' · aeab91a6
  Tim Zallmann authored May 23, 2018
```
removed "(Beta)" from "Auto DevOps" messages

See merge request gitlab-org/gitlab-ee!5583
```
  aeab91a6
- removed "(Beta)" from "Auto DevOps" messages · 5a3037eb
  Paul Slaughter authored May 23, 2018
  
  5a3037eb
- Merge branch '46259-prometheus-integration-fails-on-kube-1-10' into 'master' · 63379a2a
  Rémy Coutable authored May 23, 2018
```
Resolve "Prometheus integration fails on k8s 1.10"

Closes #46259

See merge request gitlab-org/gitlab-ce!19082
```
  63379a2a
- Fixed U2F authentication when used with LDAP · 2303b083
  Phil Hughes authored May 23, 2018
```
Closes #46661
```
  2303b083
- Resolve conflicts for application_helper.rb · 04729350
  Lin Jen-Shin authored May 23, 2018
  
  04729350