Merge branch 'revert-satellites' into 'master'

Revert satellites

Return satellites to master for 7.14

We remove satellites in next release (8.0)

See merge request !1136

1 files changed, 0 insertions, 14 deletions

diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index d96244f23e0..0927cde61a6 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -34,20 +34,6 @@ describe Repository do
     end
   end
 
-  describe :can_be_merged? do
-    context 'mergeable branches' do
-      subject { repository.can_be_merged?('0b4bc9a49b562e85de7cc9e834518ea6828729b9', 'master') }
-
-      it { is_expected.to be_truthy }
-    end
-
-    context 'non-mergeable branches' do
-      subject { repository.can_be_merged?('bb5206fee213d983da88c47f9cf4cc6caf9c66dc', 'feature') }
-
-      it { is_expected.to be_falsey }
-    end
-  end
-
   describe "search_files" do
     let(:results) { repository.search_files('feature', 'master') }
     subject { results }