Resolve remaining conflicts

app/controllers/autocomplete_controller.rb

@@ -7,17 +7,13 @@ class AutocompleteController < ApplicationController
     @users = @users.search(params[:search]) if params[:search].present?
     @users = @users.active
     @users = @users.reorder(:name)
-<<<<<<< HEAD
 
     if params[:push_code_to_protected_branches].present? && params[:project_id].present?
       project = Project.find_by(id: params[:project_id])
       @users = @users.to_a.select { |user| user.can?(:push_code_to_protected_branches, project) }.take(PER_PAGE)
     else
-      @users = @users.page(params[:page]).per(PER_PAGE)
+      @users = @users.page(params[:page])
     end
-=======
-    @users = @users.page(params[:page])
->>>>>>> ce/master
 
     if params[:search].blank?
       # Include current user if available to filter by "Me"

app/services/merge_requests/build_service.rb

@@ -47,11 +47,11 @@ module MergeRequests
         merge_request.title = merge_request.source_branch.titleize.humanize
       end
 
-<<<<<<< HEAD
       # Set MR description based on project template
       if merge_request.target_project.merge_requests_template.present?
         merge_request.description = merge_request.target_project.merge_requests_template
-=======
+      end
+
       # When your branch name starts with an iid followed by a dash this pattern will
       # be interpreted as the use wants to close that issue on this project
       # Pattern example: 112-fix-mep-mep
@@ -65,7 +65,6 @@ module MergeRequests
         else
           merge_request.description = closes_issue
         end
->>>>>>> ce/master
       end
 
       merge_request

app/views/layouts/notify.html.haml

@@ -4,10 +4,7 @@
     %title
       GitLab
     = stylesheet_link_tag 'notify'
-<<<<<<< HEAD
     = yield :head
-=======
->>>>>>> ce/master
   %body
     %div.content
       = yield

app/views/shared/issuable/_form.html.haml

@@ -13,15 +13,6 @@
 
     - if issuable.is_a?(MergeRequest)
       %p.help-block
-<<<<<<< HEAD
-        - if issuable.work_in_progress?
-          Remove the <code>WIP</code> prefix from the title to allow this
-          <strong>Work In Progress</strong> merge request to be merged when it's ready.
-        - else
-          Start the title with <code>[WIP]</code> or <code>WIP:</code> to prevent a
-          <strong>Work In Progress</strong> merge request from being merged before it's ready.
-
-=======
         .js-wip-explanation
           %a.js-toggle-wip{href: ""}
             Remove the
@@ -37,7 +28,6 @@
           to prevent a
           %strong Work In Progress
           merge request from being merged before it's ready.
->>>>>>> ce/master
 .form-group.detail-page-description
   = f.label :description, 'Description', class: 'control-label'
   .col-sm-10
@@ -186,17 +176,6 @@
   - if issuable.new_record?
     = link_to 'Cancel', namespace_project_issues_path(@project.namespace, @project), class: 'btn btn-cancel'
   - else
-<<<<<<< HEAD
-    - cancel_project = issuable.project
-  = link_to 'Cancel', [cancel_project.namespace.becomes(Namespace), cancel_project, issuable], class: 'btn btn-cancel'
-
-%li.project-approvers.hide.approver-template{id: "user_{user_id}"}
-  = link_to "{approver_name}", "#"
-  .pull-right
-    = link_to "#", data: { confirm: "Are you sure you want to remove approver {approver_name}"}, class: "btn-xs btn btn-remove", title: 'Remove approver' do
-      = icon("sign-out")
-      Remove
-=======
     .pull-right
       - if current_user.can?(:"destroy_#{issuable.to_ability_name}", @project)
         = link_to polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), data: { confirm: "#{issuable.class.name.titleize} will be removed! Are you sure?" },
@@ -204,4 +183,10 @@
           = icon('trash-o')
           Delete
       = link_to 'Cancel', namespace_project_issue_path(@project.namespace, @project, issuable), class: 'btn btn-grouped btn-cancel'
->>>>>>> ce/master
+
+%li.project-approvers.hide.approver-template{id: "user_{user_id}"}
+  = link_to "{approver_name}", "#"
+  .pull-right
+    = link_to "#", data: { confirm: "Are you sure you want to remove approver {approver_name}"}, class: "btn-xs btn btn-remove", title: 'Remove approver' do
+      = icon("sign-out")
+      Remove

app/workers/post_receive.rb

@@ -18,7 +18,6 @@ class PostReceive
     end
 
     if post_received.wiki?
-<<<<<<< HEAD
       update_wiki_es_indexes(post_received)
 
       # Triggers repository update on secondary nodes when Geo is enabled
@@ -34,17 +33,6 @@ class PostReceive
     end
   end
 
-=======
-      # Nothing defined here yet.
-    elsif post_received.regular_project?
-      process_project_changes(post_received)
-    else
-      log("Triggered hook for unidentifiable repository type with full path \"#{repo_path} \"")
-      false
-    end
-  end
-
->>>>>>> ce/master
   def process_project_changes(post_received)
     post_received.changes.each do |change|
       oldrev, newrev, ref = change.strip.split(' ')
@@ -64,7 +52,6 @@ class PostReceive
     end
   end
 
-<<<<<<< HEAD
   def update_wiki_es_indexes(post_received)
     return unless Gitlab.config.elasticsearch.enabled
 
@@ -73,10 +60,6 @@ class PostReceive
 
   private
 
-=======
-  private
-  
->>>>>>> ce/master
   def log(message)
     Gitlab::GitLogger.error("POST-RECEIVE: #{message}")
   end

spec/controllers/projects/issues_controller_spec.rb

 require('spec_helper')
 
 describe Projects::IssuesController do
-<<<<<<< HEAD
-  describe "GET #index" do
-    let(:project) { create(:project) }
-    let(:user) { create(:user) }
-    let(:issue) { create(:issue, project: project) }
-
-    before do
-      sign_in(user)
-      project.team << [user, :developer]
-    end
-
-=======
   let(:project) { create(:project_empty_repo) }
   let(:user)    { create(:user) }
   let(:issue)   { create(:issue, project: project) }
@@ -23,7 +11,6 @@ describe Projects::IssuesController do
       project.team << [user, :developer]
     end
 
->>>>>>> ce/master
     it "returns index" do
       get :index, namespace_id: project.namespace.path, project_id: project.path
 
@@ -54,11 +41,7 @@ describe Projects::IssuesController do
   end
 
   describe 'Confidential Issues' do
-<<<<<<< HEAD
-    let(:project) { create(:empty_project, :public) }
-=======
     let(:project) { create(:project_empty_repo, :public) }
->>>>>>> ce/master
     let(:assignee) { create(:assignee) }
     let(:author) { create(:user) }
     let(:non_member) { create(:user) }
@@ -123,68 +106,6 @@ describe Projects::IssuesController do
           project_id: project.to_param
       end
     end
-<<<<<<< HEAD
-
-    shared_examples_for 'restricted action' do |http_status|
-      it 'returns 404 for guests' do
-        sign_out :user
-        go(id: unescaped_parameter_value.to_param)
-
-        expect(response).to have_http_status :not_found
-      end
-
-      it 'returns 404 for non project members' do
-        sign_in(non_member)
-        go(id: unescaped_parameter_value.to_param)
-
-        expect(response).to have_http_status :not_found
-      end
-
-      it "returns #{http_status[:success]} for author" do
-        sign_in(author)
-        go(id: unescaped_parameter_value.to_param)
-
-        expect(response).to have_http_status http_status[:success]
-      end
-
-      it "returns #{http_status[:success]} for assignee" do
-        sign_in(assignee)
-        go(id: request_forgery_timing_attack.to_param)
-
-        expect(response).to have_http_status http_status[:success]
-      end
-
-      it "returns #{http_status[:success]} for project members" do
-        sign_in(member)
-        project.team << [member, :developer]
-        go(id: unescaped_parameter_value.to_param)
-
-        expect(response).to have_http_status http_status[:success]
-      end
-
-      it "returns #{http_status[:success]} for admin" do
-        sign_in(admin)
-        go(id: unescaped_parameter_value.to_param)
-
-        expect(response).to have_http_status http_status[:success]
-      end
-    end
-
-    describe 'GET #show' do
-      it_behaves_like 'restricted action', success: 200
-
-      def go(id:)
-        get :show,
-          namespace_id: project.namespace.to_param,
-          project_id: project.to_param,
-          id: id
-      end
-    end
-
-    describe 'GET #edit' do
-      it_behaves_like 'restricted action', success: 200
-
-=======
 
     shared_examples_for 'restricted action' do |http_status|
       it 'returns 404 for guests' do
@@ -245,7 +166,6 @@ describe Projects::IssuesController do
     describe 'GET #edit' do
       it_behaves_like 'restricted action', success: 200
 
->>>>>>> ce/master
       def go(id:)
         get :edit,
           namespace_id: project.namespace.to_param,
@@ -265,8 +185,6 @@ describe Projects::IssuesController do
           issue: { title: 'New title' }
       end
     end
-<<<<<<< HEAD
-=======
   end
 
   describe "DELETE #destroy" do
@@ -292,6 +210,5 @@ describe Projects::IssuesController do
         expect(controller).to set_flash[:notice].to(/The issue was successfully deleted\./).now
       end
     end
->>>>>>> ce/master
   end
 end