Merge branch 'ce-to-ee-2018-02-07' of gitlab.com:gitlab-org/gitlab-ee into ce-to-ee-2018-02-07

app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js

@@ -73,14 +73,11 @@ class FilteredSearchDropdownManager {
         gl: 'DropdownEmoji',
         element: this.container.querySelector('#js-dropdown-my-reaction'),
       },
-<<<<<<< HEAD
       weight: {
         reference: null,
         gl: 'DropdownNonUser',
         element: this.container.querySelector('#js-dropdown-weight'),
       },
-=======
->>>>>>> upstream/master
     };
 
     supportedTokens.forEach((type) => {