[CE->EE] Fix second part of the conflicts[ci skip]

db/schema.rb

@@ -11,11 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-<<<<<<< HEAD
-ActiveRecord::Schema.define(version: 20170315194013) do
-=======
 ActiveRecord::Schema.define(version: 20170317203554) do
->>>>>>> b22d4c2e9f171b6cabeb537f3a3a0a688a4e0cc3
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -1525,4 +1521,4 @@ ActiveRecord::Schema.define(version: 20170317203554) do
   add_foreign_key "timelogs", "merge_requests", name: "fk_timelogs_merge_requests_merge_request_id", on_delete: :cascade
   add_foreign_key "trending_projects", "projects", on_delete: :cascade
   add_foreign_key "u2f_registrations", "users"
-end
+end
\ No newline at end of file

spec/controllers/admin/application_settings_controller_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe Admin::ApplicationSettingsController do
   include StubENV
 
-<<<<<<< HEAD
   let(:group) { create(:group) }
   let(:project) { create(:project, namespace: group) }
   let(:admin) { create(:admin) }
@@ -74,28 +73,6 @@ describe Admin::ApplicationSettingsController do
       expect(body["version"]).to eq(Gitlab::VERSION)
       expect(body).to include('counts')
       expect(response.status).to eq(200)
-=======
-  let(:admin) { create(:admin) }
-
-  before do
-    sign_in(admin)
-    stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
-  end
-
-  describe 'PATCH #update' do
-    it 'updates the default_project_visibility for string value' do
-      patch :update, application_setting: { default_project_visibility: "20" }
-
-      expect(response).to redirect_to(admin_application_settings_path)
-      expect(ApplicationSetting.current.default_project_visibility).to eq Gitlab::VisibilityLevel::PUBLIC
-    end
-
-    it 'falls back to default with default_project_visibility setting is omitted' do
-      patch :update, application_setting: {}
-
-      expect(response).to redirect_to(admin_application_settings_path)
-      expect(ApplicationSetting.current.default_project_visibility).to eq Gitlab::VisibilityLevel::PRIVATE
->>>>>>> b22d4c2e9f171b6cabeb537f3a3a0a688a4e0cc3
     end
   end
 end

spec/controllers/projects/merge_requests_controller_spec.rb

@@ -366,14 +366,14 @@ describe Projects::MergeRequestsController do
   end
 
   describe 'PUT update' do
-<<<<<<< HEAD
     def update_merge_request(params = {})
       post :update,
            namespace_id: project.namespace.to_param,
            project_id: project.to_param,
            id: merge_request.iid,
            merge_request: params
-=======
+    end
+
     context 'changing the assignee' do
       it 'limits the attributes exposed on the assignee' do
         assignee = create(:user)
@@ -390,7 +390,7 @@ describe Projects::MergeRequestsController do
         expect(body['assignee'].keys)
           .to match_array(%w(name username avatar_url))
       end
->>>>>>> b22d4c2e9f171b6cabeb537f3a3a0a688a4e0cc3
+
     end
 
     context 'there is no source project' do

spec/models/project_wiki_spec.rb

@@ -52,7 +52,6 @@ describe ProjectWiki, models: true do
 
         expect(project_wiki.http_url_to_repo(user)).to start_with("http://#{user.username}@")
       end
-<<<<<<< HEAD
     end
   end
 
@@ -61,8 +60,6 @@ describe ProjectWiki, models: true do
       gitlab_kerberos_url = Gitlab.config.build_gitlab_kerberos_url
       repo_kerberos_url = "#{gitlab_kerberos_url}/#{subject.path_with_namespace}.git"
       expect(subject.kerberos_url_to_repo).to eq(repo_kerberos_url)
-=======
->>>>>>> b22d4c2e9f171b6cabeb537f3a3a0a688a4e0cc3
     end
   end