Commits · e97a87433b2f55b2f688771cbe47d627f49d4b44 · nexedi / gitlab-ce

24 May, 2018 4 commits
- 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 '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 · 13aa6f67
  Mark Chao authored May 24, 2018
  
  13aa6f67
23 May, 2018 36 commits
- Update CHANGELOG.md for 10.8.1 · 6c51e220
  Mayra Cabrera authored May 23, 2018
```
[ci skip]
```
  6c51e220
- 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 '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... · 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 '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 '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
- Merge branch '46630-add-missing-columns-to-project-mirror-data' into 'master' · 31413f4c
  Douwe Maan authored May 23, 2018
```
Upgrading from EE to CE fails on project_mirror_data migrations

Closes #46630

See merge request gitlab-org/gitlab-ce!19109
```
  31413f4c
- 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
- Check if note's noteable is not nil when checking resolvability · 0230ca83
  Jan Provaznik authored May 22, 2018
```
This can occur when a note is added to a commit and then this commit
is deleted.
```
  0230ca83
- Rollback changes made to CreateProjectMirrorData · b92b1e8d
  Tiago Botelho authored May 23, 2018
  
  b92b1e8d
- Renames AddMissingColumnsToProjectMirrorData to EnsureMissingColumnsToProjectMirrorData · 29257b0e
  Tiago Botelho authored May 23, 2018
  
  29257b0e
- Don't expire the current ApplicationSetting in config/initializers/1_settings.rb · d7ecdceb
  Rémy Coutable authored May 16, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  d7ecdceb
- Simplify Gitlab::CurrentSettings now that the logic is in CacheableAttributes · 2bdf6ede
  Rémy Coutable authored May 16, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  2bdf6ede
- Use ApplicationSetting.current_without_cache instead of ApplicationSetting.current where applicable · a46929ea
  Rémy Coutable authored May 16, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  a46929ea
- Use the new CacheableAttributes concern in the ApplicationSetting and Appearance models · e531a0c1
  Rémy Coutable authored May 04, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  e531a0c1
- Introduce a new CacheableAttributes concern · 02f17a09
  Rémy Coutable authored May 04, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  02f17a09
- Fix rubocop · 7a73cff7
  Tiago Botelho authored May 23, 2018
  
  7a73cff7
- Adds changelog · f9d83840
  Tiago Botelho authored May 23, 2018
  
  f9d83840
- Adds migration to ensure the new project_mirror_data columns are indeed added to the table · 9b058b8d
  Tiago Botelho authored May 23, 2018
  
  9b058b8d
- Edits create_project_mirror_data to add the new columns when table already exists · 2fdf15dd
  Tiago Botelho authored May 23, 2018
  
  2fdf15dd
- 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 '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 '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
- 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
- Merge branch 'gitaly-repo-info-attributes-opt-out' into 'master' · 18ed49c9
  Douwe Maan authored May 23, 2018
```
Move Repository#info_attributes to OptOut in gitaly

See merge request gitlab-org/gitlab-ce!19092
```
  18ed49c9