diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-04 16:17:36 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-04 16:17:36 +0000 |
| commit | e09bdd78431371fd30ca1862f0466eacba09a0d2 (patch) | |
| tree | 1aa1188421eb8f82a572368e417c130d9271e786 /Gemfile.lock | |
| parent | 25c66be492dc83cd1b51212007b1a17d1903ae1d (diff) | |
| parent | 3c2236cbe1b50629155b99d99bd2e44d9cbe133e (diff) | |
| download | gitlab-ce-e09bdd78431371fd30ca1862f0466eacba09a0d2.tar.gz | |
Merge branch 'upgrade-rspec-rails' into 'master'
Upgrade rspec-rails from 3.4.2 to 3.5.0.
Also upgrade its dependencies. Includes Rails 5 support. Working toward #14286
Changelogs: http://rspec.info/blog/2016/07/rspec-3-5-has-been-released/
See merge request !5051
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 35c3770d42c..9b07c97b078 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -585,29 +585,29 @@ GEM chunky_png rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) - rspec (3.4.0) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-core (3.4.4) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-core (3.5.0) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-mocks (3.4.1) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-rails (3.4.2) - actionpack (>= 3.0, < 4.3) - activesupport (>= 3.0, < 4.3) - railties (>= 3.0, < 4.3) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-support (~> 3.4.0) + rspec-support (~> 3.5.0) + rspec-rails (3.5.0) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) rspec-retry (0.4.5) rspec-core - rspec-support (3.4.1) + rspec-support (3.5.0) rubocop (0.40.0) parser (>= 2.3.1.0, < 3.0) powerpack (~> 0.1) @@ -937,7 +937,7 @@ DEPENDENCIES responders (~> 2.0) rouge (~> 1.11) rqrcode-rails3 (~> 0.1.7) - rspec-rails (~> 3.4.0) + rspec-rails (~> 3.5.0) rspec-retry rubocop (~> 0.40.0) rubocop-rspec (~> 1.5.0) |