diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-03-29 10:47:02 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-03-29 10:47:02 +0300 |
| commit | 9a733851284b874b59eb5f225c0cf5ead7fbfd9c (patch) | |
| tree | 79746bb3ed3cb623464fa4d5ddf9010f098d3f37 | |
| parent | 0aae4251a0d547b514d254f70588259071e80374 (diff) | |
| parent | 8f8a75633b04d4b17b059ddc780116883a0e8997 (diff) | |
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
| -rw-r--r-- | Gemfile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -376,6 +376,8 @@ group :development, :test do gem 'stackprof', '~> 0.2.10', require: false gem 'simple_po_parser', '~> 1.1.2', require: false + + gem 'timecop', '~> 0.8.0' end group :test do @@ -385,7 +387,6 @@ group :test do gem 'webmock', '~> 2.3.2' gem 'test_after_commit', '~> 1.1' gem 'sham_rack', '~> 1.3.6' - gem 'timecop', '~> 0.8.0' gem 'concurrent-ruby', '~> 1.0.5' gem 'test-prof', '~> 0.2.5' end |