Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-28

# 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]

app/assets/javascripts/diff_notes/diff_notes_bundle.js

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

app/assets/javascripts/notes.js

@@ -768,7 +768,11 @@ export default class Notes {
   }
 
   removeNoteEditForm($note) {
+<<<<<<< HEAD
     var form = $note.find('.current-note-edit-form');
+=======
+    var form = $note.find('.diffs .current-note-edit-form');
+>>>>>>> upstream/master
 
     $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/pages/projects/merge_requests/show/index.js

@@ -4,4 +4,20 @@ import initShow from '../init_merge_request_show';
 document.addEventListener('DOMContentLoaded', () => {
   initShow();
   initSidebarBundle();
+<<<<<<< HEAD
+=======
+  initNotes();
+  initDiffNotes();
+  initPipelines();
+
+  const mrShowNode = document.querySelector('.merge-request');
+  window.mergeRequest = new MergeRequest({
+    action: mrShowNode.dataset.mrAction,
+  });
+
+  new ShortcutsIssuable(true); // eslint-disable-line no-new
+  handleLocationHash();
+  howToMerge();
+  initWidget();
+>>>>>>> upstream/master
 });

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

@@ -194,7 +194,10 @@ export default {
           >
             <a
               class="user-link has-tooltip"
+<<<<<<< HEAD
               data-container="body"
+=======
+>>>>>>> upstream/master
               data-placement="bottom"
               :href="assigneeUrl(user)"
               :data-title="user.name"

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: [],
   },

spec/controllers/projects/issues_controller_spec.rb

@@ -975,6 +975,7 @@ describe Projects::IssuesController do
         get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid
 
         expect(json_response.first.keys).to match_array(%w[id reply_id expanded notes diff_discussion individual_note resolvable resolve_with_issue_path resolved])
+<<<<<<< HEAD
       end
 
       it 'filters notes that the user should not see' do
@@ -1040,6 +1041,8 @@ describe Projects::IssuesController do
         let(:project) { create(:project, :public) }
 
         it_behaves_like 'user cannot see confidential issue', Gitlab::Access::NO_ACCESS
+=======
+>>>>>>> upstream/master
       end
 
       context 'with cross-reference system note', :request_store do