Merge branch 'ce-to-ee-2018-02-01' of https://gitlab.com/gitlab-org/gitlab-ee...

Merge branch 'ce-to-ee-2018-02-01' of https://gitlab.com/gitlab-org/gitlab-ee into ce-to-ee-2018-02-01

scripts/lint-rugged

 #!/usr/bin/env ruby
 
 ALLOWED = [
-<<<<<<< HEAD
   # https://gitlab.com/gitlab-org/gitaly/issues/760
   'lib/elasticsearch/git/repository.rb',
 
-=======
->>>>>>> upstream/master
   # Can be fixed once Rugged is no longer used in production. Doesn't make Rugged calls.
   'config/initializers/8_metrics.rb',