diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-11 09:59:25 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-11 09:59:25 +0000 |
| commit | 7d3bbeeb31731907456e8c4d5640e52e58a921fb (patch) | |
| tree | e6495c453cf449b8aa87845ec818798405323b9f /Gemfile.lock | |
| parent | a4f37e1834dbd755981b0ce19617e99b4ea43bb7 (diff) | |
| parent | b38c75b3dc2dc655377a1b4070cb6f5242594dbe (diff) | |
| download | gitlab-ce-7d3bbeeb31731907456e8c4d5640e52e58a921fb.tar.gz | |
Merge branch 'rs-update-rspec' into 'master'
Update rspec to 3.7
See merge request gitlab-org/gitlab-ce!19449
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index aa8e271673c..4fc5af40ce6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -742,36 +742,36 @@ GEM chunky_png rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) - rspec (3.6.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-core (3.6.0) - rspec-support (~> 3.6.0) - rspec-expectations (3.6.0) + rspec (3.7.0) + rspec-core (~> 3.7.0) + rspec-expectations (~> 3.7.0) + rspec-mocks (~> 3.7.0) + rspec-core (3.7.1) + rspec-support (~> 3.7.0) + rspec-expectations (3.7.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-mocks (3.6.0) + rspec-support (~> 3.7.0) + rspec-mocks (3.7.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) + rspec-support (~> 3.7.0) rspec-parameterized (0.4.0) binding_of_caller parser proc_to_ast rspec (>= 2.13, < 4) unparser - rspec-rails (3.6.0) + rspec-rails (3.7.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-support (~> 3.6.0) + rspec-core (~> 3.7.0) + rspec-expectations (~> 3.7.0) + rspec-mocks (~> 3.7.0) + rspec-support (~> 3.7.0) rspec-retry (0.4.5) rspec-core rspec-set (0.1.3) - rspec-support (3.6.0) + rspec-support (3.7.1) rspec_profiling (0.0.5) activerecord pg @@ -1141,7 +1141,7 @@ DEPENDENCIES rouge (~> 3.1) rqrcode-rails3 (~> 0.1.7) rspec-parameterized - rspec-rails (~> 3.6.0) + rspec-rails (~> 3.7.0) rspec-retry (~> 0.4.5) rspec-set (~> 0.1.3) rspec_profiling (~> 0.0.5) |