summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-07-01 10:08:51 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-07-01 10:08:51 -0600
commit3c2236cbe1b50629155b99d99bd2e44d9cbe133e (patch)
tree9c97dd20d9f3c9a2b7fe86df34f3d28cf9c10f1f /Gemfile.lock
parent557ca2b31ff503b36a4b65af2641fcd0f5682d5b (diff)
downloadgitlab-ce-3c2236cbe1b50629155b99d99bd2e44d9cbe133e.tar.gz
Upgrade rspec-rails from 3.4.2 to 3.5.0.upgrade-rspec-rails
Also upgrade its dependencies. Includes Rails 5 support. Changelogs: rspec-rails: https://github.com/rspec/rspec-rails/compare/v3.4.2...v3.5.0 rspec-core: https://github.com/rspec/rspec-core/compare/v3.4.0...v3.5.0 rspec-support: https://github.com/rspec/rspec-support/compare/v3.4.0...v3.5.0 rspec-expectations: https://github.com/rspec/rspec-expectations/compare/v3.4.0...v3.5.0 rspec-mocks: https://github.com/rspec/rspec-mocks/compare/v3.4.0...v3.5.0 rspec: https://github.com/rspec/rspec/compare/v3.4.0...v3.5.0
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock40
1 files changed, 20 insertions, 20 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index b1f2c8c142c..85ececb7cd7 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)
@@ -936,7 +936,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)