Merge branch 'sh-promote-timecop-gemfile' into 'master'
Promote Timecop gem into joint test/development Bundler group Closes #44751 et gitlab-ee#5359 See merge request gitlab-org/gitlab-ce!18066
Showing
... | @@ -376,6 +376,8 @@ group :development, :test do | ... | @@ -376,6 +376,8 @@ group :development, :test do |
gem 'stackprof', '~> 0.2.10', require: false | gem 'stackprof', '~> 0.2.10', require: false | ||
gem 'simple_po_parser', '~> 1.1.2', require: false | gem 'simple_po_parser', '~> 1.1.2', require: false | ||
gem 'timecop', '~> 0.8.0' | |||
end | end | ||
group :test do | group :test do | ||
... | @@ -385,7 +387,6 @@ group :test do | ... | @@ -385,7 +387,6 @@ group :test do |
gem 'webmock', '~> 2.3.2' | gem 'webmock', '~> 2.3.2' | ||
gem 'test_after_commit', '~> 1.1' | gem 'test_after_commit', '~> 1.1' | ||
gem 'sham_rack', '~> 1.3.6' | gem 'sham_rack', '~> 1.3.6' | ||
gem 'timecop', '~> 0.8.0' | |||
gem 'concurrent-ruby', '~> 1.0.5' | gem 'concurrent-ruby', '~> 1.0.5' | ||
gem 'test-prof', '~> 0.2.5' | gem 'test-prof', '~> 0.2.5' | ||
end | end | ||
... | ... |
Please register or sign in to comment