diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-07-30 01:27:52 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-07-30 01:27:52 +0000 |
| commit | 534f8fc7975f1fe5f38f8d4b2ba3c15ddb8ac9d1 (patch) | |
| tree | b90c08cb6f57746d6fcbb02d6193c94fbcb188c9 /Gemfile.lock | |
| parent | 8d9451dff764300334faf27d40226fb1ae8767ac (diff) | |
| parent | 9c8f6e0cdfcf3be90bd819751cf76ba760556d13 (diff) | |
| download | gitlab-ce-534f8fc7975f1fe5f38f8d4b2ba3c15ddb8ac9d1.tar.gz | |
Merge branch 'determinstic_dns_specs' into 'master'
Have deterministic DNS for specs
See merge request gitlab-org/gitlab-ce!31086
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a87bf239fb9..f9f6616bad2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -884,8 +884,6 @@ GEM faraday (>= 0.7.6, < 1.0) settingslogic (2.0.9) sexp_processor (4.12.0) - sham_rack (1.3.6) - rack shoulda-matchers (4.0.1) activesupport (>= 4.2.0) sidekiq (5.2.7) @@ -1232,7 +1230,6 @@ DEPENDENCIES selenium-webdriver (~> 3.141) sentry-raven (~> 2.9) settingslogic (~> 2.0.9) - sham_rack (~> 1.3.6) shoulda-matchers (~> 4.0.1) sidekiq (~> 5.2.7) sidekiq-cron (~> 1.0) |