Commits · 610aefe43440a7eae8e317aa0a2ed43f0437db98 · Léo-Paul Géneau / gitlab-ce

23 May, 2018 36 commits
- 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
- 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
- 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
- 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
- Merge branch... · 7f484cd1
  Douwe Maan authored May 23, 2018
```
Merge branch '22846-notifications-broken-during-email-address-change-before-email-confirmed' into 'master'

Resolve "notifications broken during email address change before email confirmed"

Closes #22846

See merge request gitlab-org/gitlab-ce!18474
```
  7f484cd1
- Merge branch '46354-deprecate_gemnasium_service' into 'master' · b71c990a
  Douwe Maan authored May 23, 2018
```
Resolve "Deprecate Gemnasium project service"

Closes #46354

See merge request gitlab-org/gitlab-ce!18954
```
  b71c990a
- Resolve "Deprecate Gemnasium project service" · 40dd12c7
  Olivier Gonzalez authored May 23, 2018
  
  40dd12c7
- Merge branch '45530-web-ide-doesn-t-work-for-branches-with-slashes' into 'master' · f0fbdad9
  Douwe Maan authored May 23, 2018
```
Resolve "Web IDE doesn't work for branches with slashes"

Closes #45530

See merge request gitlab-org/gitlab-ce!18878
```
  f0fbdad9
- Resolve "Web IDE doesn't work for branches with slashes" · 8056a77d
  Tim Zallmann authored May 23, 2018
  
  8056a77d
- Merge branch 'ide-commit-state-bug' into 'master' · 3a3f542d
  Filipa Lacerda authored May 23, 2018
```
Fixed web IDE review & commit editors getting into incorrect state

Closes #46392

See merge request gitlab-org/gitlab-ce!19038
```
  3a3f542d
- Merge branch '46603-add-vue-loader-cache' into 'master' · 4ba8ff50
  Fatih Acet authored May 23, 2018
```
Resolve "Add vue-loader compile caching to frontend build process"

Closes #46603

See merge request gitlab-org/gitlab-ce!19099
```
  4ba8ff50
- Merge branch 'ide-jobs-list' into 'master' · 7e1e3559
  Filipa Lacerda authored May 23, 2018
```
Pipelines store actions & states in web IDE

Closes #44604

See merge request gitlab-org/gitlab-ce!18912
```
  7e1e3559
- Merge branch 'ide-file-finder-improve-order' into 'master' · 1623e4ac
  Filipa Lacerda authored May 23, 2018
```
Fixed IDE file finder ordering

See merge request gitlab-org/gitlab-ce!18948
```
  1623e4ac
- fixed spec · fff2b4f6
  Phil Hughes authored May 23, 2018
  
  fff2b4f6
- skip email trim when email is creating new issue · 421dbb17
  Cameron Crockett authored May 09, 2018
```
Updates from MR discussion

1. Added test for ReplyParser
2. Changed param to trim_reply with default set as true

Removed keyword param in favor of normal options param

updates for MR discussion

Resolutions for code review comments

more code review fixes
```
  421dbb17
22 May, 2018 4 commits
- add file cache to vue-loader to speed up compilation · 7774b318
  Mike Greiling authored May 22, 2018
  
  7774b318
- Merge branch '44895-explicit-merge-conflict' into 'master' · 76e276cb
  Tim Zallmann authored May 22, 2018
```
Resolve "Make explicit that merge conflict feature commits to source branch"

Closes #44895

See merge request gitlab-org/gitlab-ce!18921
```
  76e276cb
- Set GIT_DEPTH to 1 to speed up cloning for the cloud images trigger · d394226e
  DJ Mountney authored May 22, 2018
  
  d394226e
- Bring CE-EE parity to app/services/boards/issues/create_service.rb · 9251a1bf
  Robert Speicher authored May 22, 2018
  
  9251a1bf