Resolve conflicts

Signed-off-by: Rémy Coutable <remy@rymai.me>

.rubocop_todo.yml

@@ -180,18 +180,7 @@ Security/JSONLoad:
 Style/AlignParameters:
   Enabled: false
 
-<<<<<<< HEAD
-# Offense count: 29
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: always, conditionals
-Style/AndOr:
-  Enabled: false
-
-# Offense count: 53
-=======
 # Offense count: 54
->>>>>>> ce/master
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: percent_q, bare_percent

app/assets/javascripts/filtered_search/filtered_search_dropdown.js.es6

@@ -101,10 +101,7 @@
 
     resetFilters() {
       const hook = this.getCurrentHook();
-<<<<<<< HEAD
-=======
 
->>>>>>> ce/master
       if (hook) {
         const data = hook.list.data;
         const results = data.map((o) => {

app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js.es6

@@ -8,13 +8,10 @@
       this.filteredSearchTokenKeys = gl.FilteredSearchTokenKeys;
       this.filteredSearchInput = document.querySelector('.filtered-search');
       this.page = page;
-<<<<<<< HEAD
 
       if (this.page === 'issues') {
         this.filteredSearchTokenKeys = gl.FilteredSearchTokenKeysWithWeights;
       }
-=======
->>>>>>> ce/master
 
       this.setupMapping();
 

app/assets/javascripts/filtered_search/filtered_search_manager.js.es6

@@ -4,13 +4,10 @@
       this.filteredSearchInput = document.querySelector('.filtered-search');
       this.clearSearchButton = document.querySelector('.clear-search');
       this.filteredSearchTokenKeys = gl.FilteredSearchTokenKeys;
-<<<<<<< HEAD
 
       if (page === 'issues') {
         this.filteredSearchTokenKeys = gl.FilteredSearchTokenKeysWithWeights;
       }
-=======
->>>>>>> ce/master
 
       if (this.filteredSearchInput) {
         this.tokenizer = gl.FilteredSearchTokenizer;
@@ -125,11 +122,7 @@
         const keyParam = decodeURIComponent(split[0]);
         const value = split[1];
 
-<<<<<<< HEAD
-        // Check if it matches edge conditions listed in gl.FilteredSearchTokenKeys
-=======
         // Check if it matches edge conditions listed in this.filteredSearchTokenKeys
->>>>>>> ce/master
         const condition = this.filteredSearchTokenKeys.searchByConditionUrl(p);
 
         if (condition) {

app/controllers/projects/merge_requests_controller.rb

@@ -58,10 +58,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
       assignee = User.find_by_id(params[:assignee_id])
       @users.push(assignee) if assignee
     end
-<<<<<<< HEAD
-=======
 
->>>>>>> ce/master
     if params[:author_id].present?
       author = User.find_by_id(params[:author_id])
       @users.push(author) if author

app/views/layouts/header/_default.html.haml

@@ -35,15 +35,13 @@
               = link_to dashboard_todos_path, title: 'Todos', aria: { label: "Todos" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
                 = icon('bell fw')
                 %span.badge.todos-pending-count{ class: ("hidden" if todos_pending_count == 0) }
-<<<<<<< HEAD
-                  = todos_pending_count
+                  = todos_count_format(todos_pending_count)
+
             - if Gitlab::Geo.secondary?
               %li
                 = link_to Gitlab::Geo.primary_node.url, title: 'Go to primary node', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
                   = icon('globe fw')
-=======
-                  = todos_count_format(todos_pending_count)
->>>>>>> ce/master
+
             - if Gitlab::Sherlock.enabled?
               %li
                 = link_to sherlock_transactions_path, title: 'Sherlock Transactions',