diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-04-03 10:19:53 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-04-03 10:19:53 +0000 |
| commit | 1b6f8cd868ea200e88554ed7cba60a40964493bf (patch) | |
| tree | ae7b6ca7f3b02425489ffd5dd0cdb7b64927e75b /Gemfile | |
| parent | 8dca091ff7f04bb92a7835ebeff783b7f0ef76cd (diff) | |
| parent | cde51be2c628cb5c8c2cc2946918ce14361f9e27 (diff) | |
| download | gitlab-ce-1b6f8cd868ea200e88554ed7cba60a40964493bf.tar.gz | |
Merge branch 'blackst0ne-rails5-isolate-test_after_commit' into 'master'
[Rails5] Isolate `test_after_commit` gem
See merge request gitlab-org/gitlab-ce!18129
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -384,7 +384,7 @@ group :test do gem 'email_spec', '~> 1.6.0' gem 'json-schema', '~> 2.8.0' gem 'webmock', '~> 2.3.2' - gem 'test_after_commit', '~> 1.1' + gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0. gem 'sham_rack', '~> 1.3.6' gem 'concurrent-ruby', '~> 1.0.5' gem 'test-prof', '~> 0.2.5' |