Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline

# Conflicts:
#	db/schema.rb

2 files changed, 24 insertions, 10 deletions

diff --git a/spec/services/delete_tag_service_spec.rb b/spec/services/delete_tag_service_spec.rb
index 5b7ba521812..477551f5036 100644
--- a/spec/services/delete_tag_service_spec.rb
+++ b/spec/services/delete_tag_service_spec.rb
@@ -6,21 +6,12 @@ describe DeleteTagService, services: true do
   let(:user) { create(:user) }
   let(:service) { described_class.new(project, user) }
 
-  let(:tag) { double(:tag, name: '8.5', target: 'abc123') }
-
   describe '#execute' do
-    before do
-      allow(repository).to receive(:find_tag).and_return(tag)
-    end
-
     it 'removes the tag' do
-      expect_any_instance_of(Gitlab::Shell).to receive(:rm_tag).
-        and_return(true)
-
       expect(repository).to receive(:before_remove_tag)
       expect(service).to receive(:success)
 
-      service.execute('8.5')
+      service.execute('v1.1.0')
     end
   end
 end
diff --git a/spec/services/projects/transfer_service_spec.rb b/spec/services/projects/transfer_service_spec.rb
index c46259431aa..06017317339 100644
--- a/spec/services/projects/transfer_service_spec.rb
+++ b/spec/services/projects/transfer_service_spec.rb
@@ -38,4 +38,27 @@ describe Projects::TransferService, services: true do
   def transfer_project(project, user, new_namespace)
     Projects::TransferService.new(project, user).execute(new_namespace)
   end
+
+  context 'visibility level' do
+    let(:internal_group) { create(:group, :internal) }
+
+    before { internal_group.add_owner(user) }
+
+    context 'when namespace visibility level < project visibility level' do
+      let(:public_project) { create(:project, :public, namespace: user.namespace) }
+
+      before { transfer_project(public_project, user, internal_group) }
+
+      it { expect(public_project.visibility_level).to eq(internal_group.visibility_level) }
+    end
+
+    context 'when namespace visibility level > project visibility level' do
+      let(:private_project) { create(:project, :private, namespace: user.namespace) }
+
+      before { transfer_project(private_project, user, internal_group) }
+
+      it { expect(private_project.visibility_level).to eq(Gitlab::VisibilityLevel::PRIVATE) }
+    end
+  end
+
 end