Fix many conflicts

app/assets/javascripts/application.js

@@ -21,11 +21,7 @@ require('vendor/jquery.waitforimages');
 require('vendor/jquery.caret');
 require('vendor/jquery.atwho');
 require('vendor/jquery.scrollTo');
-<<<<<<< HEAD
-require('vendor/jquery.turbolinks');
 require('vendor/jquery.tablesorter');
-=======
->>>>>>> ce/master
 window.Cookies = require('vendor/js.cookie');
 require('./autosave');
 require('bootstrap/js/affix');

app/assets/javascripts/boards/boards_bundle.js.es6

@@ -36,13 +36,9 @@ $(() => {
     el: $boardApp,
     components: {
       'board': gl.issueBoards.Board,
-<<<<<<< HEAD
       'boards-selector': gl.issueBoards.BoardsSelector,
-      'board-sidebar': gl.issueBoards.BoardSidebar
-=======
       'board-sidebar': gl.issueBoards.BoardSidebar,
       'board-add-issues-modal': gl.issueBoards.IssuesModal,
->>>>>>> ce/master
     },
     data: {
       state: Store.state,

app/assets/javascripts/boards/services/board_service.js.es6

@@ -2,10 +2,6 @@
 /* global Vue */
 
 class BoardService {
-<<<<<<< HEAD
-  constructor (root, boardId) {
-    this.boards = Vue.resource(`${root}{/id}.json`);
-=======
   constructor (root, bulkUpdatePath, boardId) {
     this.boards = Vue.resource(`${root}{/id}.json`, {}, {
       issues: {
@@ -13,7 +9,6 @@ class BoardService {
         url: `${root}/${boardId}/issues.json`
       }
     });
->>>>>>> ce/master
     this.lists = Vue.resource(`${root}/${boardId}/lists{/id}`, {}, {
       generate: {
         method: 'POST',

app/assets/javascripts/merge_request_widget/ci_bundle.js.es6

@@ -46,14 +46,11 @@
       .on('click', '.js-rebase-button', () => {
         $('.js-rebase-button').html("<i class='fa fa-spinner fa-spin'></i> Rebase in progress");
       });
-<<<<<<< HEAD
     } else if (!$('.mr-approvals-footer').length) {
       // getMergeStatus replaces the MR widget with new, updated HTML, which means any persistent
       // event management gets clobbered. When the MR is approvable, MR status is already managed
       // and breaks when the DOM is clobbered.
-=======
     } else {
->>>>>>> ce/master
       setTimeout(() => merge_request_widget.getMergeStatus(), 200);
     }
   });

app/helpers/merge_requests_helper.rb

@@ -191,10 +191,6 @@ module MergeRequestsHelper
   end
 
   def merge_params_ee(merge_request)
-<<<<<<< HEAD
     { squash: merge_request.squash }
-=======
-    {}
->>>>>>> ce/master
   end
 end

app/services/merge_requests/build_service.rb

@@ -20,17 +20,7 @@ module MergeRequests
 
     private
 
-<<<<<<< HEAD
-      compare = CompareService.new(
-        merge_request.source_project,
-        merge_request.source_branch
-      ).execute(
-        merge_request.target_project,
-        merge_request.target_branch
-      )
-=======
     attr_accessor :merge_request
->>>>>>> ce/master
 
     delegate :target_branch, :source_branch, :source_project, :target_project, :compare_commits, :wip_title, :description, :errors, to: :merge_request
 

app/services/merge_requests/merge_service.rb

@@ -18,15 +18,12 @@ module MergeRequests
 
       return log_merge_error('Merge request is not mergeable', true) unless @merge_request.mergeable?
 
-<<<<<<< HEAD
       if @merge_request.target_project.above_size_limit?
         message = Gitlab::RepositorySizeError.new(@merge_request.target_project).merge_error
         @merge_request.update(merge_error: message)
         return error(message)
       end
 
-=======
->>>>>>> ce/master
       @source = find_merge_source
 
       return log_merge_error('No source for merge', true) unless @source
@@ -114,7 +111,6 @@ module MergeRequests
     end
 
     def find_merge_source
-<<<<<<< HEAD
       return merge_request.diff_head_sha unless merge_request.squash
 
       squash_result = SquashService.new(project, current_user, params).execute(merge_request)
@@ -126,9 +122,6 @@ module MergeRequests
 
         nil
       end
-=======
-      merge_request.diff_head_sha
->>>>>>> ce/master
     end
   end
 end

app/services/search/global_service.rb

@@ -10,18 +10,15 @@ module Search
 
     def execute
       group = Group.find_by(id: params[:group_id]) if params[:group_id].present?
-<<<<<<< HEAD
-=======
       projects = ProjectsFinder.new.execute(current_user)
 
       if group
         projects = projects.inside_path(group.full_path)
       end
->>>>>>> ce/master
 
       if current_application_settings.elasticsearch_search?
         projects = current_user ? current_user.authorized_projects : Project.none
-        projects = projects.in_namespace(group.id) if group
+        projects = projects.inside_path(group.id) if group
 
         Gitlab::Elastic::SearchResults.new(
           current_user,
@@ -30,9 +27,6 @@ module Search
           !group
         )
       else
-        projects = ProjectsFinder.new.execute(current_user)
-        projects = projects.in_namespace(group.id) if group
-
         Gitlab::SearchResults.new(current_user, projects, params[:search])
       end
     end

app/views/projects/edit.html.haml

@@ -196,10 +196,6 @@
             %li Container registry images
             %li CI variables
             %li Any encrypted tokens
-<<<<<<< HEAD
-  %hr
-=======
->>>>>>> ce/master
   - if can? current_user, :archive_project, @project
     %hr
     .row.prepend-top-default

app/views/projects/merge_requests/widget/open/_accept.html.haml

@@ -38,7 +38,6 @@
           = label_tag :should_remove_source_branch, class: "merge-param-checkbox" do
             = check_box_tag :should_remove_source_branch
             Remove source branch
-<<<<<<< HEAD
       .accept-control.checkbox
         = label_tag :squash, class: 'merge-param-checkbox' do
           = hidden_field_tag :squash, '0', id: nil
@@ -53,7 +52,6 @@
           = link_to "#", class: "modify-merge-commit-link js-toggle-button" do
             = icon('edit')
             Modify commit message
-
     - unless @project.merge_requests_ff_only_enabled
       .js-toggle-content.hide.prepend-top-default
         = render 'shared/commit_message_container', params: params,
@@ -61,17 +59,5 @@
             message_without_description: @merge_request.merge_commit_message,
             text: @merge_request.merge_commit_message,
             rows: 14, hint: true
-=======
-      .accept-control
-        = link_to "#", class: "modify-merge-commit-link js-toggle-button" do
-          = icon('edit')
-          Modify commit message
-    .js-toggle-content.hide.prepend-top-default
-      = render 'shared/commit_message_container', params: params,
-          message_with_description: @merge_request.merge_commit_message(include_description: true),
-          message_without_description: @merge_request.merge_commit_message,
-          text: @merge_request.merge_commit_message,
-          rows: 14, hint: true
->>>>>>> ce/master
 
     = hidden_field_tag :merge_when_build_succeeds, "", autocomplete: "off"

app/views/shared/_import_form.html.haml

@@ -13,8 +13,7 @@
         %li
           The import will time out after 15 minutes. For repositories that take longer, use a clone/push combination.
         %li
-<<<<<<< HEAD
-          To migrate an SVN repository, check out #{link_to "this document", "http://doc.gitlab.com/ce/workflow/importing/migrating_from_svn.html"}.
+          To migrate an SVN repository, check out #{link_to "this document", help_page_path('workflow/importing/migrating_from_svn')}.
         %li
           The Git LFS/Annex objects will <strong>not</strong> be imported.
 
@@ -30,6 +29,3 @@
         repository every hour. The Git LFS/Annex objects will not be synced.
 
 = f.hidden_field :mirror_user_id, value: current_user.id
-=======
-          To migrate an SVN repository, check out #{link_to "this document", help_page_path('workflow/importing/migrating_from_svn')}.
->>>>>>> ce/master

app/views/shared/issuable/form/_merge_params.html.haml

@@ -3,12 +3,9 @@
 - return unless issuable.is_a?(MergeRequest)
 - return if issuable.closed_without_fork?
 
-<<<<<<< HEAD
-=======
 -# This check is duplicated below, to avoid conflicts with EE.
 - return unless issuable.can_remove_source_branch?(current_user)
 
->>>>>>> ce/master
 .form-group
   .col-sm-10.col-sm-offset-2
     - if issuable.can_remove_source_branch?(current_user)
@@ -17,7 +14,6 @@
           = hidden_field_tag 'merge_request[force_remove_source_branch]', '0', id: nil
           = check_box_tag 'merge_request[force_remove_source_branch]', '1', issuable.force_remove_source_branch?
           Remove source branch when merge request is accepted.
-<<<<<<< HEAD
 
     .checkbox
       = label_tag 'merge_request[squash]' do
@@ -25,5 +21,3 @@
         = check_box_tag 'merge_request[squash]', '1', issuable.squash
         Squash commits when merge request is accepted.
         = link_to 'About this feature', help_page_path('user/project/merge_requests/squash_and_merge')
-=======
->>>>>>> ce/master

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

@@ -6,10 +6,7 @@
       = page_title
     %p
       #{link_to "Webhooks", help_page_path("user/project/integrations/webhooks")} can be
-<<<<<<< HEAD
-=======
       used for binding events when something is happening within the project.
->>>>>>> ce/master
   .col-lg-9.append-bottom-default
     = form_for hook, as: :hook, url: polymorphic_path(url_components + [:hooks]) do |f|
       = form_errors(hook)

doc/api/services.md

@@ -808,8 +808,6 @@ Get JetBrains TeamCity CI service settings for a project.
 GET /projects/:id/services/teamcity
 ```
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 ## Jenkins CI
 
 A continuous integration and build server
@@ -881,7 +879,5 @@ Get Jenkins CI (Deprecated) service settings for a project.
 GET /projects/:id/services/jenkins-deprecated
 ```
 
-=======
->>>>>>> ce/master
 [jira-doc]: ../user/project/integrations/jira.md
 [old-jira-api]: https://gitlab.com/gitlab-org/gitlab-ce/blob/8-13-stable/doc/api/services.md#jira

spec/features/merge_requests/widget_spec.rb

@@ -5,40 +5,32 @@ describe 'Merge request', :feature, :js do
 
   let(:project) { create(:project) }
   let(:user) { create(:user) }
-<<<<<<< HEAD
   let(:merge_request) { create(:merge_request, source_project: project) }
-=======
->>>>>>> ce/master
 
   before do
     project.team << [user, :master]
     login_as(user)
-<<<<<<< HEAD
-  end
 
-  context 'new merge request' do
-    before do
-      visit new_namespace_project_merge_request_path(
-        project.namespace,
-        project,
-        merge_request: {
-          source_project_id: project.id,
-          target_project_id: project.id,
-          source_branch: 'feature',
-          target_branch: 'master'
-        }
-      )
-    end
+    visit new_namespace_project_merge_request_path(
+      project.namespace,
+      project,
+      merge_request: {
+        source_project_id: project.id,
+        target_project_id: project.id,
+        source_branch: 'feature',
+        target_branch: 'master'
+      }
+    )
+  end
 
-    it 'shows widget status after creating new merge request' do
-      click_button 'Submit merge request'
+  it 'shows widget status after creating new merge request' do
+    click_button 'Submit merge request'
 
-      expect(find('.mr-state-widget')).to have_content('Checking ability to merge automatically')
+    expect(find('.mr-state-widget')).to have_content('Checking ability to merge automatically')
 
-      wait_for_ajax
+    wait_for_ajax
 
-      expect(page).to have_selector('.accept_merge_request')
-    end
+    expect(page).to have_selector('.accept_merge_request')
   end
 
   context 'view merge request' do
@@ -57,28 +49,5 @@ describe 'Merge request', :feature, :js do
         expect(find('.js-environment-link')[:href]).to include(environment.formatted_external_url)
       end
     end
-=======
-
-    visit new_namespace_project_merge_request_path(
-      project.namespace,
-      project,
-      merge_request: {
-        source_project_id: project.id,
-        target_project_id: project.id,
-        source_branch: 'feature',
-        target_branch: 'master'
-      }
-    )
-  end
-
-  it 'shows widget status after creating new merge request' do
-    click_button 'Submit merge request'
-
-    expect(find('.mr-state-widget')).to have_content('Checking ability to merge automatically')
-
-    wait_for_ajax
-
-    expect(page).to have_selector('.accept_merge_request')
->>>>>>> ce/master
   end
 end

spec/lib/gitlab/git_access_spec.rb

@@ -222,7 +222,6 @@ describe Gitlab::GitAccess, lib: true do
 
     def merge_into_protected_branch
       @protected_branch_merge_commit ||= begin
-<<<<<<< HEAD
                                            stub_git_hooks
                                            project.repository.add_branch(user, unprotected_branch, 'feature')
                                            target_branch = project.repository.lookup('feature')
@@ -233,24 +232,6 @@ describe Gitlab::GitAccess, lib: true do
                                            merge_index = rugged.merge_commits(target_branch, source_branch)
                                            Rugged::Commit.create(rugged, author: author, committer: author, message: "commit message", parents: [target_branch, source_branch], tree: merge_index.write_tree(rugged))
                                          end
-=======
-        stub_git_hooks
-        project.repository.add_branch(user, unprotected_branch, 'feature')
-        target_branch = project.repository.lookup('feature')
-        source_branch = project.repository.commit_file(
-          user,
-          FFaker::InternetSE.login_user_name,
-          FFaker::HipsterIpsum.paragraph,
-          message: FFaker::HipsterIpsum.sentence,
-          branch_name: unprotected_branch,
-          update: false)
-        rugged = project.repository.rugged
-        author = { email: "email@example.com", time: Time.now, name: "Example Git User" }
-
-        merge_index = rugged.merge_commits(target_branch, source_branch)
-        Rugged::Commit.create(rugged, author: author, committer: author, message: "commit message", parents: [target_branch, source_branch], tree: merge_index.write_tree(rugged))
-      end
->>>>>>> ce/master
     end
 
     # Run permission checks for a user

spec/services/boards/issues/list_service_spec.rb

@@ -13,10 +13,6 @@ describe Boards::Issues::ListService, services: true do
     let(:p2) { create(:label, title: 'P2', project: project, priority: 2) }
     let(:p3) { create(:label, title: 'P3', project: project, priority: 3) }
 
-<<<<<<< HEAD
-    let!(:backlog) { board.backlog_list }
-=======
->>>>>>> ce/master
     let!(:list1)   { create(:list, board: board, label: development, position: 0) }
     let!(:list2)   { create(:list, board: board, label: testing, position: 1) }
     let!(:done)    { board.done_list }

spec/services/boards/issues/move_service_spec.rb

@@ -10,10 +10,6 @@ describe Boards::Issues::MoveService, services: true do
     let(:development) { create(:label, project: project, name: 'Development') }
     let(:testing)  { create(:label, project: project, name: 'Testing') }
 
-<<<<<<< HEAD
-    let!(:backlog) { board1.backlog_list }
-=======
->>>>>>> ce/master
     let!(:list1)   { create(:list, board: board1, label: development, position: 0) }
     let!(:list2)   { create(:list, board: board1, label: testing, position: 1) }
     let!(:done)    { board1.done_list }

spec/services/boards/lists/move_service_spec.rb

@@ -6,10 +6,6 @@ describe Boards::Lists::MoveService, services: true do
     let(:board)   { create(:board, project: project) }
     let(:user)    { create(:user) }
 
-<<<<<<< HEAD
-    let!(:backlog)     { board.backlog_list }
-=======
->>>>>>> ce/master
     let!(:planning)    { create(:list, board: board, position: 0) }
     let!(:development) { create(:list, board: board, position: 1) }
     let!(:review)      { create(:list, board: board, position: 2) }

spec/services/merge_requests/refresh_service_spec.rb

@@ -102,10 +102,6 @@ describe MergeRequests::RefreshService, services: true do
         author = { email: 'test@gitlab.com', time: Time.now, name: "Me" }
         commit_options = { message: 'Test message', committer: author, author: author }
         @project.repository.merge(@user, @merge_request.diff_head_sha, @merge_request, commit_options)
-<<<<<<< HEAD
-
-=======
->>>>>>> ce/master
         commit = @project.repository.commit('feature')
         service.new(@project, @user).execute(@oldrev, commit.id, 'refs/heads/feature')
         reload_mrs