Commits · e8a3b49f2dc94b24c4bc4f5898407d648b22ace9 · nexedi / gitlab-ce

28 Feb, 2018 30 commits
- 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 remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-28 · f79d81d1
  GitLab Bot authored Feb 28, 2018
```
# Conflicts:
#	app/assets/javascripts/diff_notes/diff_notes_bundle.js
#	app/assets/javascripts/notes.js
#	app/assets/javascripts/pages/projects/merge_requests/show/index.js
#	app/assets/javascripts/sidebar/components/assignees/assignees.vue
#	spec/controllers/projects/issues_controller_spec.rb

[ci skip]
```
  f79d81d1
- Merge branch 'ce-to-ee-2018-02-27' into 'master' · 5a33ee0f
  Rémy Coutable authored Feb 28, 2018
```
CE upstream - 2018-02-27 22:10 UTC

See merge request gitlab-org/gitlab-ee!4754
```
  5a33ee0f
- Merge branch 'refactor/move-assignees-vue-component' into 'master' · 56af0631
  Filipa Lacerda authored Feb 28, 2018
```
Move (Multiple) Assignees vue component

See merge request gitlab-org/gitlab-ce!16952
```
  56af0631
- Merge branch 'ee-refactor/move-assignees-vue-component' into 'master' · 47b51c11
  Filipa Lacerda authored Feb 28, 2018
```
Move Assignees vue component

See merge request gitlab-org/gitlab-ee!4467
```
  47b51c11
- Merge branch 'docs-fix-vuex-store-example' into 'master' · fcf34e28
  Phil Hughes authored Feb 28, 2018
```
Fix example in Vuex docs

See merge request gitlab-org/gitlab-ce!17415
```
  fcf34e28
- Fix example in Vuex docs · 08923697
  Filipa Lacerda authored Feb 28, 2018
  
  08923697
- resolve conflict · f7351ec0
  Simon Knox authored Feb 28, 2018
```
content is the same as init_merge_request_show.js
```
  f7351ec0
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2018-02-27 · e8dd920a
  Rémy Coutable authored Feb 28, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  e8dd920a
- fix bad import · 7d815a71
  Simon Knox authored Feb 28, 2018
  
  7d815a71
- remove deleted partial · 6b0d8ae1
  Simon Knox authored Feb 28, 2018
  
  6b0d8ae1
- fix error on MR page - don't load CE sidebar bundle on EE · 2e09574f
  Simon Knox authored Feb 28, 2018
  
  2e09574f
- fix error in Issue page - don't load CE issue sidebar bundle on EE page · 3842e68f
  Simon Knox authored Feb 28, 2018
  
  3842e68f
- Merge branch 'remove-merge-conflicts-bundle-ee' into 'master' · 94d7e98e
  Jacob Schatz authored Feb 28, 2018
```
Port of "Remove merge_conflicts bundle" to EE

See merge request gitlab-org/gitlab-ee!4758
```
  94d7e98e
- Merge branch '1674-weight-desc-nullfix' into 'master' · 1143eb64
  Nick Thomas authored Feb 28, 2018
```
Issue - fix order_weight_desc so null weights are placed at the end

Closes #1674

See merge request gitlab-org/gitlab-ee!4714
```
  1143eb64
- Issue - fix order_weight_desc so null weights are placed at the end · c6ad1f01
  Mario de la Ossa authored Feb 28, 2018
  
  c6ad1f01
- Merge branch 'remove-merge-conflicts-bundle' into 'master' · 4371f845
  Jacob Schatz authored Feb 28, 2018
```
Remove merge_conflicts bundle

See merge request gitlab-org/gitlab-ce!17408
```
  4371f845
- restore CE version of route to reduce possibility for conflicts · 44c82950
  Mike Greiling authored Feb 27, 2018
  
  44c82950
- remove duplicate common and common_vue definitions · 8a0a927f
  Mike Greiling authored Feb 27, 2018
  
  8a0a927f
- refactor merge conflicts bundle to reduce side effects · 2a1e5d4d
  Mike Greiling authored Feb 27, 2018
  
  2a1e5d4d
- remove merge_conflicts bundle in favor of pages directory entry point · 5781f80e
  Mike Greiling authored Feb 27, 2018
  
  5781f80e
- Fix typo in epic_reference_filter.rb: project -> group · 6fc434bb
  Stan Hu authored Feb 27, 2018
  
  6fc434bb
- Resolve build failures in ee/lib/ee/banzai/filter/epic_reference_filter.rb · a666a2a1
  Stan Hu authored Feb 27, 2018
  
  a666a2a1
- Merge branch 'ee-acet-mr-notes-index' into 'master' · 85ff85f1
  Jacob Schatz authored Feb 28, 2018
```
MR Notes Refactor

See merge request gitlab-org/gitlab-ee!4245
```
  85ff85f1
- MR Notes Refactor · 6d3648af
  Fatih Acet authored Feb 28, 2018
  
  6d3648af
- Merge branch 'acet-mr-notes-index' into 'master' · 1f233e33
  Jacob Schatz authored Feb 28, 2018
```
Render MR Notes with Vue with behind a cookie

See merge request gitlab-org/gitlab-ce!15732
```
  1f233e33
- Render MR Notes with Vue with behind a cookie · 059ab73b
  Fatih Acet authored Feb 28, 2018
  
  059ab73b
27 Feb, 2018 10 commits
- Merge branch '5063-fix-ee-files-location-check-ee' into 'master' · 8660f732
  Robert Speicher authored Feb 27, 2018
```
Resolve "ee-files-location-check bug for non-'gitlab-org' repo-based MRs"

Closes #5063

See merge request gitlab-org/gitlab-ee!4746
```
  8660f732
- remove duplicate common and common_vue definitions · 7ec5d320
  Mike Greiling authored Feb 27, 2018
  
  7ec5d320
- refactor merge conflicts bundle to reduce side effects · c62fe6a2
  Mike Greiling authored Feb 27, 2018
  
  c62fe6a2
- remove merge_conflicts bundle in favor of pages directory entry point · 94d5dd3b
  Mike Greiling authored Feb 27, 2018
  
  94d5dd3b
- Merge branch 'ee-profile-bundle-tag-refactor' into 'master' · 4617a251
  Jacob Schatz authored Feb 27, 2018
```
EE profile bundle tag refactor

See merge request gitlab-org/gitlab-ee!4708
```
  4617a251
- Merge branch 'master' into ce-to-ee-2018-02-27 · 9b7c2a90
  Stan Hu authored Feb 27, 2018
  
  9b7c2a90
- Resolve conflicts in config/webpack.config.js · d29dc55d
  Stan Hu authored Feb 27, 2018
  
  d29dc55d
- Resolve conflict in app/views/projects/merge_requests/show.html.haml · 0daf3be9
  Stan Hu authored Feb 27, 2018
  
  0daf3be9
- Merge branch 'ee-remove-snippets-bundle' into 'master' · 1e9c58a5
  Jacob Schatz authored Feb 27, 2018
```
Remove snippet bundle webpack entry point (EE)

See merge request gitlab-org/gitlab-ee!4730
```
  1e9c58a5
- Remove snippet bundle webpack entry point (EE) · 02fc042d
  Clement Ho authored Feb 27, 2018
  
  02fc042d