Merge branch 'master' into 'qa-define-selectors-ee'
# Conflicts: # qa/qa/page/group/show.rb
Showing
... | ... | @@ -337,7 +337,7 @@ group :development, :test do |
gem 'spinach-rerun-reporter', '~> 0.0.2' | ||
gem 'rspec_profiling', '~> 0.0.5' | ||
gem 'rspec-set', '~> 0.1.3' | ||
gem 'rspec-parameterized' | ||
gem 'rspec-parameterized', require: false | ||
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) | ||
gem 'minitest', '~> 5.7.0' | ||
... | ... |
bin/upgrade.rb
deleted
100755 → 0
lib/gitlab/popen/runner.rb
0 → 100644
70.1 KB
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.