[Resolve CE->EE] Resolve first part of the conflicts

app/assets/javascripts/pipelines/components/async_button.vue

@@ -28,7 +28,6 @@ export default {
       required: false,
     },
   },
-<<<<<<< HEAD
 
   directives: {
     tooltip,
@@ -38,14 +37,6 @@ export default {
     loadingIcon,
   },
 
-=======
-  directives: {
-    tooltip,
-  },
-  components: {
-    loadingIcon,
-  },
->>>>>>> c00e5bfa065128c5212a991a5cfcb6f152981d51
   data() {
     return {
       isLoading: false,

app/controllers/admin/users_controller.rb

@@ -210,7 +210,6 @@ class Admin::UsersController < Admin::ApplicationController
     ]
   end
 
-<<<<<<< HEAD
   def user_params_ee
     [
       :note,
@@ -218,8 +217,6 @@ class Admin::UsersController < Admin::ApplicationController
     ]
   end
 
-=======
->>>>>>> c00e5bfa065128c5212a991a5cfcb6f152981d51
   def update_user(&block)
     result = Users::UpdateService.new(user).execute(&block)
 

app/helpers/button_helper.rb

@@ -68,12 +68,8 @@ module ButtonHelper
         html: true,
         placement: placement,
         container: 'body',
-<<<<<<< HEAD
-        title: _("Set a password on your account to pull or push via %{protocol}") % { protocol: protocol },
-        primary_url: (geo_primary_http_url_to_repo(project) if Gitlab::Geo.secondary?)
-=======
         title: tooltip_title
->>>>>>> c00e5bfa065128c5212a991a5cfcb6f152981d51
+        primary_url: (geo_primary_http_url_to_repo(project) if Gitlab::Geo.secondary?)
       }
   end
 

features/steps/dashboard/merge_requests.rb

-class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedPaths
-  include Select2Helper
-
-  step 'I should see merge requests assigned to me' do
-    should_see(assigned_merge_request)
-    should_see(assigned_merge_request_from_fork)
-    should_not_see(authored_merge_request)
-    should_not_see(authored_merge_request_from_fork)
-    should_not_see(other_merge_request)
-  end
-
-  step 'I should see merge requests authored by me' do
-    should_see(authored_merge_request)
-    should_see(authored_merge_request_from_fork)
-    should_not_see(assigned_merge_request)
-    should_not_see(assigned_merge_request_from_fork)
-    should_not_see(other_merge_request)
-  end
-
-  step 'I should see all merge requests' do
-    should_see(authored_merge_request)
-    should_see(assigned_merge_request)
-    should_see(other_merge_request)
-  end
-
-  step 'I have authored merge requests' do
-    authored_merge_request
-    authored_merge_request_from_fork
-  end
-
-  step 'I have assigned merge requests' do
-    assigned_merge_request
-    assigned_merge_request_from_fork
-  end
-
-  step 'I have other merge requests' do
-    other_merge_request
-  end
-
-  step 'I click "Authored by me" link' do
-    find("#assignee_id").set("")
-    find(".js-author-search", match: :first).click
-    find(".dropdown-menu-author li a", match: :first, text: current_user.to_reference).click
-  end
-
-  step 'I click "All" link' do
-    find(".js-author-search").click
-    expect(page).to have_selector(".dropdown-menu-author li a")
-    find(".dropdown-menu-author li a", match: :first).click
-    expect(page).not_to have_selector(".dropdown-menu-author li a")
-
-    find(".js-assignee-search").click
-    expect(page).to have_selector(".dropdown-menu-assignee li a")
-    find(".dropdown-menu-assignee li a", match: :first).click
-    expect(page).not_to have_selector(".dropdown-menu-assignee li a")
-  end
-
-  def should_see(merge_request)
-    expect(page).to have_content(merge_request.title[0..10])
-  end
-
-  def should_not_see(merge_request)
-    expect(page).not_to have_content(merge_request.title[0..10])
-  end
-
-  def assigned_merge_request
-    @assigned_merge_request ||= create :merge_request,
-                                  assignee: current_user,
-                                  target_project: project,
-                                  source_project: project
-  end
-
-  def authored_merge_request
-    @authored_merge_request ||= create :merge_request,
-                                  source_branch: 'markdown',
-                                  author: current_user,
-                                  target_project: project,
-                                  source_project: project
-  end
-
-  def other_merge_request
-    @other_merge_request ||= create :merge_request,
-                              source_branch: 'fix',
-                              target_project: project,
-                              source_project: project
-  end
-
-  def authored_merge_request_from_fork
-    @authored_merge_request_from_fork ||= create :merge_request,
-                                            source_branch: 'feature_conflict',
-                                            author: current_user,
-                                            target_project: public_project,
-                                            source_project: forked_project
-  end
-
-  def assigned_merge_request_from_fork
-    @assigned_merge_request_from_fork ||= create :merge_request,
-                                            source_branch: 'markdown',
-                                            assignee: current_user,
-                                            target_project: public_project,
-                                            source_project: forked_project
-  end
-
-  def project
-    @project ||= begin
-                   project = create(:project, :repository)
-                   project.team << [current_user, :master]
-                   project
-                 end
-  end
-
-  def public_project
-    @public_project ||= create(:project, :public, :repository)
-  end
-
-  def forked_project
-    @forked_project ||= Projects::ForkService.new(public_project, current_user).execute
-    # The call to project.repository.after_import in RepositoryForkWorker does
-    # not reset the @exists variable of @fork_project.repository so we have to
-    # explicitely call this method to clear the @exists variable.
-    @forked_project.repository.after_import
-    @forked_project
-  end
-end