Commits · 7577d713d9a5ed47cbaf926a32afd99145d57f15 · nexedi / gitlab-ce

01 Mar, 2018 4 commits
- Merge branch '4572-open-staged-files-in-editor' into 'master' · 7577d713
  Phil Hughes authored Mar 01, 2018
```
Open staged files from Web IDE right sidebar

Closes #4572

See merge request gitlab-org/gitlab-ee!4704
```
  7577d713
- Merge branch 'ee-build-finished-worker-spec-prepend' into 'master' · 265df23c
  Rémy Coutable authored Mar 01, 2018
```
EE: Remove use of any_instance_of in runner spec

See merge request gitlab-org/gitlab-ee!4763
```
  265df23c
- Merge branch 'ce-to-ee-2018-02-28' into 'master' · cdba9047
  Stan Hu authored Mar 01, 2018
```
CE upstream - 2018-02-28 18:24 UTC

Closes gitlab-ce#43580

See merge request gitlab-org/gitlab-ee!4767
```
  cdba9047
- Merge branch 'ee-protected-tags-bundle-refactor' into 'master' · 499bb3a1
  Clement Ho authored Mar 01, 2018
```
Ee protected tags bundle refactor

See merge request gitlab-org/gitlab-ee!4710
```
  499bb3a1
28 Feb, 2018 36 commits
- Tag migration specs with :sidekiq to clear queues between tests · dd2a9692
  Stan Hu authored Feb 28, 2018
  
  dd2a9692
- Merge branch 'ee-enviroments-webpack-bundle-refactor' into 'master' · c4bdfa92
  Jacob Schatz authored Feb 28, 2018
```
Remove webpack bundle tag for enviroments

See merge request gitlab-org/gitlab-ee!4735
```
  c4bdfa92
- Remove webpack bundle tag for enviroments · bb90d640
  Constance Okoghenun authored Feb 28, 2018
  
  bb90d640
- Switched naming convention for improted CE files · e8844652
  Constance Okoghenun authored Feb 28, 2018
  
  e8844652
- Added conditional loading of protected tag bundles · 2e63c8b6
  Constance Okoghenun authored Feb 28, 2018
  
  2e63c8b6
- Merge branch 'ee-pipelines_show_refactor' into 'master' · 7b92ef29
  Jacob Schatz authored Feb 28, 2018
```
Refactor pipelines show for webpack bundle tag removal (EE)

See merge request gitlab-org/gitlab-ee!4755
```
  7b92ef29
- Refactor pipelines show for webpack bundle tag removal (EE) · 52b2bb3d
  Clement Ho authored Feb 28, 2018
  
  52b2bb3d
- Merge branch 'jivl-fix-canary-legends' into 'master' · 7a857375
  Clement Ho authored Feb 28, 2018
```
Fix canary legend for single series

See merge request gitlab-org/gitlab-ee!4522
```
  7a857375
- Resolve conflict in doc/user/project/merge_requests/index.md · 856405ec
  Rémy Coutable authored Feb 28, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  856405ec
- Resolve conflict in doc/README.md · a5945c5e
  Rémy Coutable authored Feb 28, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  a5945c5e
- Resolve conflict in app/assets/javascripts/ide/stores/actions.js · edf2268c
  Rémy Coutable authored Feb 28, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  edf2268c
- 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