Resolve conflicts

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/assets/stylesheets/framework/variables.scss

@@ -179,15 +179,11 @@ $count-arrow-border: #dce0e5;
 $save-project-loader-color: #555;
 $divergence-graph-bar-bg: #ccc;
 $divergence-graph-separator-bg: #ccc;
-<<<<<<< HEAD
+$general-hover-transition-duration: 150ms;
+$general-hover-transition-curve: linear;
 $issue-box-upcoming-bg: #8f8f8f;
 $pages-group-name-color: #4c4e54;
 $ldap-members-override-bg: #fff1e0;
-=======
-$general-hover-transition-duration: 150ms;
-$general-hover-transition-curve: linear;
-
->>>>>>> ce/master
 
 /*
 * Common component specific colors

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

@@ -17,10 +17,6 @@
 
     - if @project.protected_branch? branch.name
       %span.label.label-success
-<<<<<<< HEAD
-        = icon('lock')
-=======
->>>>>>> ce/master
         protected
 
     - if @project.mirror_ever_updated_successfully? && @repository.diverged_from_upstream?(branch.name)

spec/services/projects/update_service_spec.rb

@@ -26,7 +26,6 @@ describe Projects::UpdateService, services: true do
     context 'when visibility levels are restricted to PUBLIC only' do
       before do
         stub_application_setting(restricted_visibility_levels: [Gitlab::VisibilityLevel::PUBLIC])
-<<<<<<< HEAD
       end
 
       context 'when visibility_level is INTERNAL' do
@@ -52,21 +51,10 @@ describe Projects::UpdateService, services: true do
             expect(project).to be_public
           end
         end
-=======
-      end
-
-      context 'when visibility_level is INTERNAL' do
-        it 'updates the project to internal' do
-          result = update_project(project, user, visibility_level: Gitlab::VisibilityLevel::INTERNAL)
-          expect(result).to eq({ status: :success })
-          expect(project).to be_internal
-        end
->>>>>>> ce/master
       end
     end
   end
 
-<<<<<<< HEAD
   describe 'visibility_level' do
     let(:project) { create(:project, :internal) }
     let(:forked_project) { create(:forked_project_with_submodules, :internal) }
@@ -136,58 +124,6 @@ describe Projects::UpdateService, services: true do
       expect(project).not_to receive(:change_repository_storage)
 
       update_project(project, user, opts).inspect
-=======
-      context 'when visibility_level is PUBLIC' do
-        it 'does not update the project to public' do
-          result = update_project(project, user, visibility_level: Gitlab::VisibilityLevel::PUBLIC)
-
-          expect(result).to eq({ status: :error, message: 'Visibility level unallowed' })
-          expect(project).to be_private
-        end
-
-        context 'when updated by an admin' do
-          it 'updates the project to public' do
-            result = update_project(project, admin, visibility_level: Gitlab::VisibilityLevel::PUBLIC)
-            expect(result).to eq({ status: :success })
-            expect(project).to be_public
-          end
-        end
-      end
-    end
-  end
-
-  describe 'visibility_level' do
-    let(:project) { create(:project, :internal) }
-    let(:forked_project) { create(:forked_project_with_submodules, :internal) }
-
-    before do
-      forked_project.build_forked_project_link(forked_to_project_id: forked_project.id, forked_from_project_id: project.id)
-      forked_project.save
-    end
-
-    it 'updates forks visibility level when parent set to more restrictive' do
-      opts = { visibility_level: Gitlab::VisibilityLevel::PRIVATE }
-
-      expect(project).to be_internal
-      expect(forked_project).to be_internal
-
-      expect(update_project(project, admin, opts)).to eq({ status: :success })
-
-      expect(project).to be_private
-      expect(forked_project.reload).to be_private
-    end
-
-    it 'does not update forks visibility level when parent set to less restrictive' do
-      opts = { visibility_level: Gitlab::VisibilityLevel::PUBLIC }
-
-      expect(project).to be_internal
-      expect(forked_project).to be_internal
-
-      expect(update_project(project, admin, opts)).to eq({ status: :success })
-
-      expect(project).to be_public
-      expect(forked_project.reload).to be_internal
->>>>>>> ce/master
     end
   end