Fix merge conflicts

Gemfile

@@ -255,21 +255,13 @@ gem 'font-awesome-rails', '~> 4.7'
 gem 'gemojione', '~> 3.0'
 gem 'gon', '~> 6.1.0'
 gem 'jquery-atwho-rails', '~> 1.3.2'
-<<<<<<< HEAD
-gem 'jquery-rails',       '~> 4.1.0'
-gem 'request_store',      '~> 1.3'
-gem 'select2-rails',      '~> 3.5.9'
-gem 'virtus',             '~> 1.0.1'
-gem 'net-ssh',            '~> 3.0.1'
-gem 'base32',             '~> 0.3.0'
-gem "gitlab-license", "~> 1.0"
-=======
 gem 'jquery-rails', '~> 4.1.0'
 gem 'request_store', '~> 1.3'
 gem 'select2-rails', '~> 3.5.9'
 gem 'virtus', '~> 1.0.1'
 gem 'base32', '~> 0.3.0'
->>>>>>> ce/master
+
+gem "gitlab-license", "~> 1.0"
 
 # Sentry integration
 gem 'sentry-raven', '~> 2.5.3'

Gemfile.lock

@@ -500,11 +500,7 @@ GEM
       mustermann (= 0.4.0)
     mysql2 (0.4.5)
     net-ldap (0.12.1)
-<<<<<<< HEAD
     net-ntp (2.1.3)
-    net-ssh (3.0.1)
-=======
->>>>>>> ce/master
     netrc (0.11.0)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
@@ -1051,14 +1047,9 @@ DEPENDENCIES
   method_source (~> 0.8)
   minitest (~> 5.7.0)
   mousetrap-rails (~> 1.4.6)
-<<<<<<< HEAD
   mysql2 (~> 0.4.5)
   net-ldap
   net-ntp
-  net-ssh (~> 3.0.1)
-=======
-  mysql2 (~> 0.3.16)
->>>>>>> ce/master
   nokogiri (~> 1.6.7, >= 1.6.7.2)
   oauth2 (~> 1.4)
   octokit (~> 4.6.2)

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

@@ -23,7 +23,6 @@ class BoardService {
         url: bulkUpdatePath,
       },
     });
-<<<<<<< HEAD
   }
 
   allBoards () {
@@ -35,8 +34,6 @@ class BoardService {
       return this.boards.update({ id: board.id }, board);
     }
     return this.boards.save({}, board);
-=======
->>>>>>> ce/master
   }
 
   all () {

app/presenters/merge_request_presenter.rb

@@ -76,15 +76,12 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated
     end
   end
 
-<<<<<<< HEAD
   def rebase_path
     if !rebase_in_progress? && should_be_rebased? && user_can_push_to_source_branch?
       rebase_project_merge_request_path(project, merge_request)
     end
   end
 
-=======
->>>>>>> ce/master
   def target_branch_tree_path
     if target_branch_exists?
       project_tree_path(project, target_branch)

spec/presenters/merge_request_presenter_spec.rb

@@ -388,7 +388,6 @@ describe MergeRequestPresenter do
     end
   end
 
-<<<<<<< HEAD
   describe '#can_push_to_source_branch' do
     before do
       allow(resource).to receive(:source_branch_exists?) { source_branch_exists }
@@ -521,8 +520,6 @@ describe MergeRequestPresenter do
     end
   end
 
-=======
->>>>>>> ce/master
   describe '#source_branch_with_namespace_link' do
     subject do
       described_class.new(resource, current_user: user).source_branch_with_namespace_link

spec/serializers/merge_request_entity_spec.rb

@@ -47,15 +47,11 @@ describe MergeRequestEntity do
                                :cancel_merge_when_pipeline_succeeds_path,
                                :create_issue_to_resolve_discussions_path,
                                :source_branch_path, :target_branch_commits_path,
-<<<<<<< HEAD
                                :target_branch_tree_path, :commits_count,
                                ## EE
                                :can_push_to_source_branch, :approvals_before_merge,
                                :squash, :rebase_commit_sha, :rebase_in_progress,
                                :approvals_path, :ff_only_enabled)
-=======
-                               :target_branch_tree_path, :commits_count)
->>>>>>> ce/master
   end
 
   it 'has email_patches_path' do

spec/support/redis/redis_shared_examples.rb

@@ -65,7 +65,6 @@ RSpec.shared_examples "redis_shared_examples" do
   end
 
   describe '.url' do
-<<<<<<< HEAD
     it 'withstands mutation' do
       url1 = described_class.url
       url2 = described_class.url
@@ -74,8 +73,6 @@ RSpec.shared_examples "redis_shared_examples" do
       expect(url2).not_to end_with('foobar')
     end
 
-=======
->>>>>>> ce/master
     context 'when yml file with env variable' do
       let(:config_file_name) { config_with_environment_variable_inside }