Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 1 deletions

diff --git a/scripts/gitaly_test.rb b/scripts/gitaly_test.rb
index b5cc5118530..922dc17ed2e 100644
--- a/scripts/gitaly_test.rb
+++ b/scripts/gitaly_test.rb
@@ -56,6 +56,14 @@ module GitalyTest
   end
 
   def check_gitaly_config!
+    puts "Checking gitaly-ruby Gemfile..."
+
+    unless File.exist?(gemfile)
+      message = "#{gemfile} does not exist."
+      message += "\n\nThis might have happened if the CI artifacts for this build were destroyed." if ENV['CI']
+      abort message
+    end
+
     puts 'Checking gitaly-ruby bundle...'
     abort 'bundle check failed' unless system(env, 'bundle', 'check', chdir: File.dirname(gemfile))
   end
diff --git a/scripts/lint-conflicts.sh b/scripts/lint-conflicts.sh
index f3877600c8c..2d04507f81e 100755
--- a/scripts/lint-conflicts.sh
+++ b/scripts/lint-conflicts.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-output=`git ls-files -z | grep -zvE '\.(rb|js|haml)$' | xargs -0n1 grep -HEn '^<<<<<<< '`
+output=`git grep -En '^<<<<<<< ' -- . ':(exclude)spec/lib/gitlab/conflict/file_spec.rb' ':(exclude)spec/lib/gitlab/git/conflict/parser_spec.rb'`
 echo $output
 test -z "$output"