Commits · 001a28d04203feac77840b90024b769b442130b2 · nexedi / gitlab-ce

07 Mar, 2018 11 commits
- Merge branch 'dz-plugins-project-integrations' into 'master' · 001a28d0
  Dmitriy Zaporozhets authored Mar 07, 2018
```
Show plugins list on system hooks page

Closes #40812

See merge request gitlab-org/gitlab-ce!17518
```
  001a28d0
- Merge branch 'consistent-deployment_platform' into 'master' · 4a341c6d
  Grzegorz Bizon authored Mar 07, 2018
```
Unify deployment_platform interface with EE

See merge request gitlab-org/gitlab-ce!17594
```
  4a341c6d
- Merge branch 'fix-group-boards-migration-name' into 'master' · 493fb889
  Sean McGivern authored Mar 07, 2018
```
Fix group boards migration name

See merge request gitlab-org/gitlab-ce!17592
```
  493fb889
- Merge branch 'include-mr-discussions-calendar-activity' into 'master' · 5d8d6dbd
  Sean McGivern authored Mar 07, 2018
```
Count discussions on issues and merge requests as contributions for the contributions calendar

See merge request gitlab-org/gitlab-ce!17557
```
  5d8d6dbd
- Count discussions on issues and merge requests as contributions for the contributions calendar · e2bdce8d
  Riccardo Padovani authored Mar 07, 2018
  
  e2bdce8d
- Unify deployment_platform interface with EE · 0917e817
  Lin Jen-Shin authored Mar 07, 2018
  
  0917e817
- Merge branch '43502-clipboard-btn' into 'master' · cfe203fa
  Phil Hughes authored Mar 07, 2018
```
Resolve "Update clipboard button component not to render default css classes"

Closes #43502

See merge request gitlab-org/gitlab-ce!17529
```
  cfe203fa
- Merge branch 'gitlab-shell-6-0-4' into 'master' · 9ecfb287
  Sean McGivern authored Mar 07, 2018
```
Bump Gitlab Shell to v6.0.4

Closes #43739

See merge request gitlab-org/gitlab-ce!17582
```
  9ecfb287
- Fix group boards migration name · e73bf10a
  Sean McGivern authored Mar 07, 2018
```
This had the same name in EE, so give it a different name in CE.
```
  e73bf10a
- Merge branch 'master' into 'master' · 95016507
  Grzegorz Bizon authored Mar 07, 2018
```
CI charts now include the current day

Closes #42921

See merge request gitlab-org/gitlab-ce!17032
```
  95016507
- Merge branch 'sh-make-prune-optional-in-git-fetch' into 'master' · 0649a1f8
  Nick Thomas authored Mar 07, 2018
```
Make --prune a configurable parameter in fetching a git remote

See merge request gitlab-org/gitlab-ce!17346
```
  0649a1f8
06 Mar, 2018 29 commits
- Merge branch 'remove-common-vue' into 'master' · ff00cfe4
  Clement Ho authored Mar 06, 2018
```
Remove common_vue bundle

See merge request gitlab-org/gitlab-ce!17551
```
  ff00cfe4
- Remove common_vue bundle · a898a2ab
  Mike Greiling authored Mar 06, 2018
  
  a898a2ab
- Merge branch 'ee-183-common-code-backport' into 'master' · 47e866b3
  Sean McGivern authored Mar 06, 2018
```
Gitlab::Utils - backport `.ensure_array_from_string` from EE

See merge request gitlab-org/gitlab-ce!17574
```
  47e866b3
- Gitlab::Utils - backport `.ensure_array_from_string` from EE · f9d61717
  Mario de la Ossa authored Mar 06, 2018
  
  f9d61717
- Removes btn-transparent and btn-clipboard as default classes for clipboard button component · 51b88741
  Filipa Lacerda authored Mar 05, 2018
```
Changes after review
```
  51b88741
- Merge branch 'banzai-n-plus-one' into 'master' · 135ef031
  Douwe Maan authored Mar 06, 2018
```
Gitaly N+1 notice on Banzai filtering

See merge request gitlab-org/gitlab-ce!17540
```
  135ef031
- Bump Gitlab Shell to v6.0.4 · 4c84ee52
  Alejandro Rodríguez authored Mar 06, 2018
  
  4c84ee52
- Merge branch... · 35f6efae
  Kamil Trzciński authored Mar 06, 2018
```
Merge branch 'move-pipeline_default-update_head_pipeline_for_merge_request-queue-to-pipeline_processing-namespace' into 'master'

Move update_head_pipeline_for_merge_request queue to `pipeline_processing` namespace

Closes #43919

See merge request gitlab-org/gitlab-ce!17572
```
  35f6efae
- Merge branch 'sha256-checksum-for-trace' into 'master' · ee2cfd0f
  Kamil Trzciński authored Mar 06, 2018
```
Set sha256 checksum when archiving traces

Closes #43940

See merge request gitlab-org/gitlab-ce!17570
```
  ee2cfd0f
- Merge branch 'ce-3727-fe-labels-for-epics' into 'master' · c5160c11
  Filipa Lacerda authored Mar 06, 2018
```
CE Port: Add `js-` classes in LabelsSelect component

See merge request gitlab-org/gitlab-ce!17558
```
  c5160c11
- Merge branch 'cluster-monitoring-changes-ce-backport' into 'master' · 2d00d6d4
  Phil Hughes authored Mar 06, 2018
```
Cluster monitoring changes CE backport

See merge request gitlab-org/gitlab-ce!17547
```
  2d00d6d4
- Fix false positive spec of using digest instead of hexdigest · 0b49e8e6
  Shinya Maeda authored Mar 07, 2018
  
  0b49e8e6
- Change queue namespace of UpdateHeadPipelineForMergeRequestWorker · f0dac729
  Shinya Maeda authored Mar 07, 2018
  
  f0dac729
- Merge branch 'issue_38337' into 'master' · d12f60a5
  Sean McGivern authored Mar 06, 2018
```
Bring one group board to CE

Closes #38337

See merge request gitlab-org/gitlab-ce!17274
```
  d12f60a5
- prefer checking explicitly for null · 226d43b3
  Mike Greiling authored Mar 06, 2018
  
  226d43b3
- Merge branch 'prepend-grape-api-ce' into 'master' · cd611d67
  Rémy Coutable authored Mar 06, 2018
```
Unify lib/api/merge_requests.rb with EE

See merge request gitlab-org/gitlab-ce!17539
```
  cd611d67
- replace fixture with simple mount point · 57d1ddff
  Mike Greiling authored Mar 06, 2018
  
  57d1ddff
- add new tests for metrics dashboard changes · bae88da8
  Mike Greiling authored Mar 06, 2018
  
  bae88da8
- Merge branch 'rc/speedup-rake-jobs' into 'master' · be60d106
  Robert Speicher authored Mar 06, 2018
```
Speedup CI jobs

See merge request gitlab-org/gitlab-ce!14911
```
  be60d106
- Set sha256 checksum when archiving traces · b8ce910f
  Shinya Maeda authored Mar 07, 2018
  
  b8ce910f
- Move update_head_pipeline_for_merge_request queue to pipeline_processing namespace · 10f135cf
  Shinya Maeda authored Mar 07, 2018
  
  10f135cf
- Merge branch 'docs-devguide-cherry-pick-ce-to-ee' into 'master' · 2a97550d
  Achilleas Pipinellis authored Mar 06, 2018
```
Docs guidelines: cherry-picking commits from CE to EE

Closes #41338 and #28822

See merge request gitlab-org/gitlab-ce!17367
```
  2a97550d
- Docs guidelines: cherry-picking commits from CE to EE · 9ede3a66
  Marcia Ramos authored Mar 06, 2018
  
  9ede3a66
- Merge branch '5029-support-cluster-metrics-ce' into 'master' · 348c16e7
  Grzegorz Bizon authored Mar 06, 2018
```
Refactoring changes to support cluster metrics in EE

Closes #42820

See merge request gitlab-org/gitlab-ce!17336
```
  348c16e7
- Merge branch 'master' into 'issue_38337' · e77c4e9e
  Felipe Artur authored Mar 06, 2018
```
# Conflicts:
#   app/models/group.rb
#   db/schema.rb
```
  e77c4e9e
- Merge branch 'zj-lazy-parents' into 'master' · 9a8f5a2b
  Douwe Maan authored Mar 06, 2018
```
Lazy fetch parent commits for a commit

See merge request gitlab-org/gitlab-ce!17559
```
  9a8f5a2b
- Add feature test for plugins on system hooks page · 30b76e4b
  Dmitriy Zaporozhets authored Mar 06, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  30b76e4b
- Merge branch 'extract-job-artifacts-api-ce' into 'master' · 9cdaa452
  Rémy Coutable authored Mar 06, 2018
```
Unify lib/api/job_artifacts.rb with EE

See merge request gitlab-org/gitlab-ce!17556
```
  9cdaa452
- Merge branch 'bvl-port-of-ee-translations' into 'master' · 7ed46d27
  Douwe Maan authored Mar 06, 2018
```
Port of ee translations

See merge request gitlab-org/gitlab-ce!17526
```
  7ed46d27