Commits · bad0dd18d28fe1b3b1e8fba2720694f6f5fb7fb6 · nexedi / gitlab-ce

23 May, 2018 40 commits
- 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... · 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 '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... · 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 '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
- Resolve conflicts for application_helper.rb · 04729350
  Lin Jen-Shin authored May 23, 2018
  
  04729350
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-23 · 6724cabe
  GitLab Bot authored May 23, 2018
```
# Conflicts:
#	app/helpers/application_helper.rb

[ci skip]
```
  6724cabe
- Merge branch '46413-error-when-prometheus-adapter-is-disabled' into 'master' · 83796a71
  Rémy Coutable authored May 23, 2018
```
Render 404 when prometheus adapter is disabled in Prometheus metrics controller

Closes #46413

See merge request gitlab-org/gitlab-ce!19110
```
  83796a71
- Render 404 when prometheus adapter is disabled in Prometheus metrics controller · 58313de4
  Tiago Botelho authored May 23, 2018
  
  58313de4
- Merge branch '5831-security-apps' into 'master' · fe251765
  Phil Hughes authored May 23, 2018
```
Resolve "Security reports app tests are not 100% correct"

Closes #5831

See merge request gitlab-org/gitlab-ee!5821
```
  fe251765
- Don't expire the current ApplicationSetting in config/initializers/1_settings.rb · 415faf99
  Rémy Coutable authored May 16, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  415faf99
- Simplify Gitlab::CurrentSettings now that the logic is in CacheableAttributes · 0d6c7128
  Rémy Coutable authored May 16, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  0d6c7128
- Use ApplicationSetting.current_without_cache instead of ApplicationSetting.current where applicable · 47696650
  Rémy Coutable authored May 16, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  47696650
- Use the new CacheableAttributes concern in the ApplicationSetting and Appearance models · 3e0f81e2
  Rémy Coutable authored May 04, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  3e0f81e2
- Introduce a new CacheableAttributes concern · 7f38f84f
  Rémy Coutable authored May 04, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  7f38f84f
- Merge branch 'ce-to-ee-2018-05-23' into 'master' · 0ba793c6
  Mayra Cabrera authored May 23, 2018
```
CE upstream - 2018-05-23 12:34 UTC

See merge request gitlab-org/gitlab-ee!5822
```
  0ba793c6
- Resolve CE to EE merge conflict · 10e1077f
  Olivier Gonzalez authored May 23, 2018
  
  10e1077f
- Merge branch 'ce_backport_issue_5128' into 'master' · a2dbca4a
  Rémy Coutable authored May 23, 2018
```
CE backport - Allow viewing only one board when multiple issue boards is not enabled

See merge request gitlab-org/gitlab-ce!19068
```
  a2dbca4a
- Merge branch 'ce-5949-render_optional' into 'master' · e1f9113a
  Rémy Coutable authored May 23, 2018
```
CE: Use render_if_exists to hide EE specific codes

See merge request gitlab-org/gitlab-ce!19041
```
  e1f9113a
- CE: Use render_if_exists to hide EE specific codes · 4634e749
  Lin Jen-Shin authored May 23, 2018
  
  4634e749
- Merge branch 'issue_5128' into 'master' · f0486994
  Rémy Coutable authored May 23, 2018
```
Allow viewing only one board when multiple issue boards is not enabled

Closes #5128

See merge request gitlab-org/gitlab-ee!5741
```
  f0486994
- Merge branch '5949-render_optional' into 'master' · fff246d3
  Rémy Coutable authored May 23, 2018
```
Use render_if_exists to hide EE specific codes

Closes #5949

See merge request gitlab-org/gitlab-ee!5767
```
  fff246d3
- Use render_if_exists to hide EE specific codes · ae83dd1a
  Lin Jen-Shin authored May 23, 2018
  
  ae83dd1a
- Merge branch 'rs-boards-issues-create-service-parity' into 'master' · 4a56a6a1
  Rémy Coutable authored May 23, 2018
```
Bring CE-EE parity to app/services/boards/issues/create_service.rb

See merge request gitlab-org/gitlab-ce!19093
```
  4a56a6a1
- Merge branch 'rs-boards-issues-create-service-parity-ee' into 'master' · 288595cc
  Rémy Coutable authored May 23, 2018
```
Bring CE-EE parity to app/services/boards/issues/create_service.rb

See merge request gitlab-org/gitlab-ee!5810
```
  288595cc
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-23 · f8d775a8
  GitLab Bot authored May 23, 2018
```
# Conflicts:
#	doc/user/project/integrations/project_services.md

[ci skip]
```
  f8d775a8
- Fix typo · e8408ba5
  Philippe Lafoucrière authored May 23, 2018
```
[skip ci]
```
  e8408ba5
- Merge branch 'use-git-depth-1-on-cng-trigger' into 'master' · acdb7435
  Rémy Coutable authored May 23, 2018
```
Set GIT_DEPTH to 1 to speed up cloning for the cloud images trigger

See merge request gitlab-org/gitlab-ce!19098
```
  acdb7435
- Fix broken tests - missing setTimeout · 43997a7b
  Filipa Lacerda authored May 23, 2018
  
  43997a7b
- Use a factory function in the security apps store · d9d5bdf9
  Filipa Lacerda authored May 23, 2018
  
  d9d5bdf9
- Merge branch 'ce-to-ee-2018-05-23' into 'master' · 756bd842
  Phil Hughes authored May 23, 2018
```
CE upstream - 2018-05-23 09:39 UTC

See merge request gitlab-org/gitlab-ee!5820
```
  756bd842
- fixed conflicts in api.js · 51b94860
  Phil Hughes authored May 23, 2018
  
  51b94860
- Merge branch 'issue-25256' into 'master' · 3f7b9244
  Douwe Maan authored May 23, 2018
```
skip email trim when email is creating new issue

See merge request gitlab-org/gitlab-ce!18865
```
  3f7b9244
- Merge branch 'gitaly-repo-squash-in-progress-opt-out' into 'master' · d6d7abb1
  Douwe Maan authored May 23, 2018
```
Make Repo#squash_in_progress Opt-Out

See merge request gitlab-org/gitlab-ce!19088
```
  d6d7abb1
- Merge branch 'gitaly-wiki-get-formatted-data-opt-out' into 'master' · 91f3930c
  Douwe Maan authored May 23, 2018
```
Move Wiki::GetFormattedData to OptOut

See merge request gitlab-org/gitlab-ce!19091
```
  91f3930c
- Merge branch 'gitaly-import-project-opt-out' into 'master' · 68b5cd71
  Douwe Maan authored May 23, 2018
```
Move ImportProject to OptOut in Gitaly

See merge request gitlab-org/gitlab-ce!19090
```
  68b5cd71