Fix conflicts from !7754 and gitlab-ce!22039

Gemfile.lock

@@ -1064,10 +1064,7 @@ DEPENDENCIES
   github-markup (~> 1.7.0)
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-gollum-lib (~> 4.2)
-<<<<<<< HEAD
   gitlab-license (~> 1.0)
-=======
->>>>>>> upstream/master
   gitlab-markup (~> 1.6.4)
   gitlab-styles (~> 2.4)
   gitlab_omniauth-ldap (~> 2.0.4)

Gemfile.rails5.lock

@@ -1073,10 +1073,7 @@ DEPENDENCIES
   github-markup (~> 1.7.0)
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-gollum-lib (~> 4.2)
-<<<<<<< HEAD
   gitlab-license (~> 1.0)
-=======
->>>>>>> upstream/master
   gitlab-markup (~> 1.6.4)
   gitlab-styles (~> 2.4)
   gitlab_omniauth-ldap (~> 2.0.4)

scripts/lint-rugged

 #!/usr/bin/env ruby
 
 ALLOWED = [
-<<<<<<< HEAD
   # https://gitlab.com/gitlab-org/gitaly/issues/760
   'lib/elasticsearch/git/repository.rb',
 
-=======
->>>>>>> upstream/master
   # Needed to handle repositories that are not in any storage
   'lib/gitlab/bare_repository_import/repository.rb',
 

spec/models/namespace_spec.rb

@@ -363,7 +363,6 @@ describe Namespace do
 
     def project_rugged(project)
       rugged_repo(project.repository)
-<<<<<<< HEAD
     end
   end
 
@@ -376,8 +375,6 @@ describe Namespace do
 
     it 'returns the correct size limit' do
       expect(namespace.actual_size_limit).to eq(50)
-=======
->>>>>>> upstream/master
     end
   end