Fix conflicts

CHANGELOG.md

@@ -427,7 +427,6 @@ entry.
 - Speed up group milestone index by passing group_id to IssuesFinder. !8363
 - Ensure issuable state changes only fire webhooks once.
 
-<<<<<<< HEAD
 ## 8.14.7 (2017-01-21)
 
 - Ensure export files are removed after a namespace is deleted.
@@ -436,8 +435,6 @@ entry.
 - Prevent users from deleting system deploy keys via the project deploy key API.
 - Upgrade omniauth gem to 1.3.2.
 
-=======
->>>>>>> ce/master
 ## 8.14.6 (2017-01-10)
 
 - Update the gitlab-markup gem to the version 1.5.1. !8509

app/controllers/projects/git_http_controller.rb

@@ -105,12 +105,11 @@ class Projects::GitHttpController < Projects::GitHttpClientController
     access_check.allowed?
   end
 
-<<<<<<< HEAD
   def log_user_activity
     Users::ActivityService.new(user, 'pull').execute
-=======
+  end
+
   def access_klass
     @access_klass ||= wiki? ? Gitlab::GitAccessWiki : Gitlab::GitAccess
->>>>>>> ce/master
   end
 end

app/models/project_group_link.rb

@@ -16,10 +16,7 @@ class ProjectGroupLink < ActiveRecord::Base
   validates :group_access, inclusion: { in: Gitlab::Access.values }, presence: true
   validate :different_group
 
-<<<<<<< HEAD
   before_destroy :delete_branch_protection
-=======
->>>>>>> ce/master
   after_commit :refresh_group_members_authorized_projects
 
   def self.access_options

app/services/application_settings/update_service.rb

 module ApplicationSettings
   class UpdateService < ApplicationSettings::BaseService
     def execute
-<<<<<<< HEAD
       # Repository size limit comes as MB from the view
       limit = @params.delete(:repository_size_limit)
       @application_setting.repository_size_limit = (limit.to_i.megabytes if limit.present?)
 
-=======
->>>>>>> ce/master
       @application_setting.update(@params)
     end
   end

app/services/ci/register_build_service.rb

@@ -3,18 +3,12 @@ module Ci
   # proper pending build to runner on runner API request
   class RegisterBuildService
     include Gitlab::CurrentSettings
-<<<<<<< HEAD
     prepend EE::Ci::RegisterBuildService
 
     attr_reader :runner
 
-=======
-
-    attr_reader :runner
-
     Result = Struct.new(:build, :valid?)
 
->>>>>>> ce/master
     def initialize(runner)
       @runner = runner
     end

app/services/projects/create_service.rb

@@ -22,12 +22,9 @@ module Projects
         return @project
       end
 
-<<<<<<< HEAD
       # Repository size limit comes as MB from the view
       set_repository_size_limit_as_bytes
 
-=======
->>>>>>> ce/master
       set_project_name_from_path
 
       # get namespace id
@@ -148,14 +145,11 @@ module Projects
       end
     end
 
-<<<<<<< HEAD
     def set_repository_size_limit_as_bytes
       limit = params.delete(:repository_size_limit)
       @project.repository_size_limit = (limit.to_i.megabytes if limit.present?)
     end
 
-=======
->>>>>>> ce/master
     def set_project_name_from_path
       # Set project name from path
       if @project.name.present? && @project.path.present?

app/views/projects/branches/_branch.html.haml

@@ -18,15 +18,12 @@
     - if @project.protected_branch? branch.name
       %span.label.label-success
         protected
-<<<<<<< HEAD
 
     - if @project.mirror_ever_updated_successfully? && @repository.diverged_from_upstream?(branch.name)
       %span.label.label-danger.has-tooltip{ data: { html: "true", title: branch_diverged_tooltip_message } }
         = icon('exclamation-triangle')
         diverged from upstream
 
-=======
->>>>>>> ce/master
     .controls.hidden-xs<
       - if merge_project && create_mr_button?(@repository.root_ref, branch.name)
         = link_to create_mr_path(@repository.root_ref, branch.name), class: 'btn btn-default' do

features/support/env.rb

@@ -14,11 +14,7 @@ if ENV['CI']
   Knapsack::Adapters::SpinachAdapter.bind
 end
 
-<<<<<<< HEAD
 %w(select2_helper test_env repo_helpers license wait_for_ajax sidekiq).each do |f|
-=======
-%w(select2_helper test_env repo_helpers wait_for_ajax sidekiq).each do |f|
->>>>>>> ce/master
   require Rails.root.join('spec', 'support', f)
 end
 

lib/ci/api/builds.rb

@@ -24,11 +24,7 @@ module Ci
 
           new_update = current_runner.ensure_runner_queue_value
 
-<<<<<<< HEAD
-          build = Ci::RegisterBuildService.new(current_runner).execute
-=======
           result = Ci::RegisterBuildService.new(current_runner).execute
->>>>>>> ce/master
 
           if result.valid?
             if result.build

spec/controllers/projects_controller_spec.rb

@@ -183,13 +183,13 @@ describe ProjectsController do
         it 'shows the over size limit warning message for project members' do
           allow(controller).to receive(:current_user).and_return(user)
 
-          get :show, namespace_id: project.namespace.path, id: project.path
+          get :show, namespace_id: public_project.namespace.path, id: public_project.path
 
           expect(response).to render_template('_above_size_limit_warning')
         end
 
         it 'does not show the message for non members' do
-          get :show, namespace_id: project.namespace.path, id: project.path
+          get :show, namespace_id: public_project.namespace.path, id: public_project.path
 
           expect(response).not_to render_template('_above_size_limit_warning')
         end

spec/services/ci/register_build_service_spec.rb

@@ -171,11 +171,7 @@ module Ci
       end
 
       def execute(runner)
-<<<<<<< HEAD
-        described_class.new(runner).execute
-=======
         described_class.new(runner).execute.build
->>>>>>> ce/master
       end
     end
   end

spec/services/ee/ci/register_build_service_spec.rb

@@ -65,7 +65,7 @@ module Ci
       end
 
       def execute(runner)
-        described_class.new(runner).execute
+        described_class.new(runner).execute.build
       end
     end
   end