Commits · c285c405cdbd5388a02e0e192b87b00068e441d0 · nexedi / gitlab-ce

28 Feb, 2018 40 commits
- Resolve conflict in app/assets/javascripts/ide/components/repo_commit_section.vue · c285c405
  Rémy Coutable authored Feb 28, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  c285c405
- Resolve conflict in app/assets/javascripts/ide/components/ide_context_bar.vue · f5d890bd
  Rémy Coutable authored Feb 28, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  f5d890bd
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-28 · 1ed7baba
  GitLab Bot authored Feb 28, 2018
```
# Conflicts:
#	app/assets/javascripts/ide/components/ide_context_bar.vue
#	app/assets/javascripts/ide/components/repo_commit_section.vue
#	app/assets/javascripts/ide/stores/actions.js
#	doc/README.md
#	doc/user/project/merge_requests/index.md

[ci skip]
```
  1ed7baba
- Merge branch 'ce-to-ee-2018-02-28' into 'master' · 5efe5d41
  Rémy Coutable authored Feb 28, 2018
```
CE upstream - 2018-02-28 12:24 UTC

See merge request gitlab-org/gitlab-ee!4760
```
  5efe5d41
- Merge branch 'assignees-vue-component-missing-data-container' into 'master' · ccbce7af
  Filipa Lacerda authored Feb 28, 2018
```
Add Assignees vue component missing data container

See merge request gitlab-org/gitlab-ce!17426
```
  ccbce7af
- Merge branch '4826-create-empty-wiki-when-it-s-enabled' into 'master' · fb03846b
  Stan Hu authored Feb 28, 2018
```
Make sure wiki exists when it's enabled

See merge request gitlab-org/gitlab-ce!17117
```
  fb03846b
- Merge branch 'sh-issue-43636' into 'master' · ee631557
  Filipa Lacerda authored Feb 28, 2018
```
Remove pipelines mini graph spec that wasn't actually testing anything

Closes #43636

See merge request gitlab-org/gitlab-ce!17428
```
  ee631557
- Resolve conflict in app/assets/javascripts/pages/projects/merge_requests/show/index.js · 94c87cb8
  Rémy Coutable authored Feb 28, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  94c87cb8
- Resolve conflict in spec/controllers/projects/issues_controller_spec.rb · e8a3b49f
  Rémy Coutable authored Feb 28, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  e8a3b49f
- Resolve conflict in app/assets/javascripts/sidebar/components/assignees/assignees.vue · 31e842d2
  Rémy Coutable authored Feb 28, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  31e842d2
- Resolve conflict in app/assets/javascripts/notes.js · 60c6c55e
  Rémy Coutable authored Feb 28, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  60c6c55e
- Resolve conflict in app/assets/javascripts/diff_notes/diff_notes_bundle.js · ac3a05bf
  Rémy Coutable authored Feb 28, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  ac3a05bf
- Merge branch 'ee-dispatcher-cycle-analytics' into 'master' · 3304fd62
  Jacob Schatz authored Feb 28, 2018
```
Remove cycle analytics bundle webpack entry point (EE)

See merge request gitlab-org/gitlab-ee!4756
```
  3304fd62
- Remove cycle analytics bundle webpack entry point (EE) · 89846445
  Clement Ho authored Feb 28, 2018
  
  89846445
- Merge branch 'dispatcher-cycle-analytics' into 'master' · bbd8860d
  Jacob Schatz authored Feb 28, 2018
```
Remove cycle analytics bundle webpack entry point

See merge request gitlab-org/gitlab-ce!17407
```
  bbd8860d
- Remove cycle analytics bundle webpack entry point · a9db24b2
  Clement Ho authored Feb 28, 2018
  
  a9db24b2
- Merge branch 'docs/rs-harness-executable' into 'master' · 0d3ed41a
  Rémy Coutable authored Feb 28, 2018
```
Set security harness hook to executable after creation

Closes #43709

See merge request gitlab-org/gitlab-ce!17425
```
  0d3ed41a
- Merge branch 'patch-28' into 'master' · b07b2ea5
  Rémy Coutable authored Feb 28, 2018
```
Document new job variables: CI_RUNNER_{REVISION,VERSION,EXECUTABLE_ARCH}

See merge request gitlab-org/gitlab-ce!16834
```
  b07b2ea5
- Merge branch 'patch-28' into 'master' · 3c033360
  Rémy Coutable authored Feb 28, 2018
```
Replace whitespace demonstrating line-breaks in GFM docs

See merge request gitlab-org/gitlab-ce!16135
```
  3c033360
- Replace whitespace demonstrating line-breaks in GFM docs · 7de31641
  Jonathan Duck authored Feb 28, 2018
  
  7de31641
- Merge branch 'move-last-ee-specific-js-files-to' into 'master' · 235fa773
  Clement Ho authored Feb 28, 2018
```
Move the remaining EE-specific JS files to ee/

See merge request gitlab-org/gitlab-ce!17423
```
  235fa773
- Merge branch 'move-last-ee-specific-js-files-to-ee' into 'master' · 9cd5292c
  Clement Ho authored Feb 28, 2018
```
Move the remaining EE-specific JS files to ee/

See merge request gitlab-org/gitlab-ee!4751
```
  9cd5292c
- Remove pipelines mini graph spec that wasn't actually testing anything · 02f0b90c
  Stan Hu authored Feb 28, 2018
```
This was also causing crashes in Chrome V64, so it's best to remove it
for now.

Closes #43636
```
  02f0b90c
- Merge branch 'patch-29' into 'master' · 3297896c
  Rémy Coutable authored Feb 28, 2018
```
Change the wording to reduce confusion about whether you need to reconfigure or restart.

See merge request gitlab-org/gitlab-ce!15041
```
  3297896c
- Change the wording to reduce confusion about whether you need to reconfigure or restart. · 94d3a6ed
  Andrew Davis authored Feb 28, 2018
  
  94d3a6ed
- Merge branch 'docs-geo-10-5-improvements' into 'master' · 8f3fa21c
  Nick Thomas authored Feb 28, 2018
```
Improve Geo documentation

Closes #4921, #4889, #4883, #4892, #4882, #4886, #4890, and #4482

See merge request gitlab-org/gitlab-ee!4585
```
  8f3fa21c
- Improve Geo documentation · 68bb1d0d
  Gabriel Mazetto authored Feb 28, 2018
  
  68bb1d0d
- Add Assignees vue component missing data container · c1e259ec
  George Tsiolis authored Feb 28, 2018
  
  c1e259ec
- Merge branch 'add-edge-cases-to-include-documentation' into 'master' · 1fc7ad5f
  Kamil Trzciński authored Feb 28, 2018
```
Document edge cases for gitlab-ci.yml `include` keyword

Closes #5025 and #5028

See merge request gitlab-org/gitlab-ee!4711
```
  1fc7ad5f
- Document edge cases for gitlab-ci.yml `include` keyword · 43f432c2
  Mayra Cabrera authored Feb 28, 2018
  
  43f432c2
- Merge branch 'docs-add-note-dot-com-tiers-ee' into 'master' · 61bdccf4
  Marcia Ramos authored Feb 28, 2018
```
Docs: explain feature availability in GitLab.com

See merge request gitlab-org/gitlab-ee!4703
```
  61bdccf4
- Docs: explain feature availability in GitLab.com · fc42b517
  Marcia Ramos authored Feb 28, 2018
  
  fc42b517
- Set security harness hook to executable after creation · a04ff31e
  Robert Speicher authored Feb 28, 2018
  
  a04ff31e
- Merge branch 'an/lograge-fix' into 'master' · 607f63f8
  Stan Hu authored Feb 28, 2018
```
Fix for open-ended parameter's in lograge causing elastic memory issues

See merge request gitlab-org/gitlab-ce!17419
```
  607f63f8
- Fix for open-ended parameter's in lograge causing elastic memory issues · e62a6cca
  Andrew Newdigate authored Feb 28, 2018
  
  e62a6cca
- Merge branch 'docs-add-note-dot-com-tiers' into 'master' · ff2f57da
  🚄 Job van der Voort 🚀 authored Feb 28, 2018
```
Docs: explain feature availability in GitLab.com

See merge request gitlab-org/gitlab-ce!17325
```
  ff2f57da
- Docs: explain feature availability in GitLab.com · 5d74be21
  Marcia Ramos authored Feb 28, 2018
  
  5d74be21
- Merge branch 'gitaly-reenable-wiki' into 'master' · a2a48581
  Douwe Maan authored Feb 28, 2018
```
Re-enable the remaning Wiki Gitaly-Endpoints

See merge request gitlab-org/gitlab-ce!17422
```
  a2a48581
- Merge branch 'feature/edit_pages_domain' into 'master' · 01b8d4bd
  Nick Thomas authored Feb 28, 2018
```
PagesDomain: allow update of key/certificate

Closes #29720

See merge request gitlab-org/gitlab-ce!17376
```
  01b8d4bd
- Merge branch '43643-fix-mr-label-filtering' into 'master' · 2e48bf11
  Filipa Lacerda authored Feb 28, 2018
```
Enable filtering MR list based on clicked label in MR sidebar

Closes #43643

See merge request gitlab-org/gitlab-ce!17390
```
  2e48bf11