Merge branch 'ce-to-ee-2018-02-28' into 'master'

CE upstream - 2018-02-28 12:24 UTC

See merge request gitlab-org/gitlab-ee!4760

app/assets/javascripts/diff_notes/diff_notes_bundle.js

@@ -73,7 +73,7 @@ export default () => {
       el: '#resolve-count-app',
       components: {
         'resolve-count': ResolveCount
-      }
+      },
     });
   }
 

app/assets/javascripts/notes.js

@@ -768,7 +768,7 @@ export default class Notes {
   }
 
   removeNoteEditForm($note) {
-    var form = $note.find('.current-note-edit-form');
+    var form = $note.find('.diffs .current-note-edit-form');
 
     $note.removeClass('is-editing');
     form.removeClass('current-note-edit-form');

app/assets/javascripts/pages/projects/merge_requests/conflicts/index.js

 import initSidebarBundle from '~/sidebar/sidebar_bundle';
+import initMergeConflicts from '~/merge_conflicts/merge_conflicts_bundle';
 
-document.addEventListener('DOMContentLoaded', initSidebarBundle);
+document.addEventListener('DOMContentLoaded', () => {
+  initSidebarBundle();
+  initMergeConflicts();
+});

app/assets/javascripts/pages/projects/merge_requests/conflicts/show/index.js

-import initSidebarBundle from '~/sidebar/sidebar_bundle';
-
-document.addEventListener('DOMContentLoaded', initSidebarBundle);

app/assets/javascripts/sidebar/components/assignees/assignees.vue

@@ -229,4 +229,3 @@ export default {
     </div>
   </div>
 </template>
-

app/views/projects/merge_requests/show.html.haml

@@ -12,6 +12,9 @@
   - if has_vue_discussions_cookie?
     = webpack_bundle_tag('mr_notes')
 
+  - if has_vue_discussions_cookie?
+    = webpack_bundle_tag('mr_notes')
+
 .merge-request{ data: { mr_action: j(params[:tab].presence || 'show'), url: merge_request_path(@merge_request, format: :json), project_path: project_path(@merge_request.project) } }
   = render "projects/merge_requests/mr_title"
 

changelogs/unreleased/refactor-move-assignees-vue-component.yml

+---
+title: Move Assignees vue component
+merge_request: 16952
+author: George Tsiolis
+type: performance

doc/development/fe_guide/vue.md

@@ -507,6 +507,7 @@ This is the entry point for our store. You can use the following as a guide:
 import Vue from 'vue';
 import Vuex from 'vuex';
 import * as actions from './actions';
+import * as getters from './getters';
 import * as mutations from './mutations';
 
 Vue.use(Vuex);
@@ -514,6 +515,7 @@ Vue.use(Vuex);
 export default new Vuex.Store({
   actions,
   getters,
+  mutations,
   state: {
     users: [],
   },