diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-02-12 16:48:53 +0100 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-02-12 16:48:53 +0100 |
| commit | de1c450abd6b367390a1295cac402344f500d41d (patch) | |
| tree | 35a2e893c321f9d08d2d17bdf5e0714666803781 /Gemfile.lock | |
| parent | d9f84f68675f4f2f637585754565f40564574e3c (diff) | |
| download | gitlab-ce-de1c450abd6b367390a1295cac402344f500d41d.tar.gz | |
Started on the rspec upgrade
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index aef30046d33..3283da40f8d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -459,21 +459,25 @@ GEM mime-types (>= 1.16) rinku (1.7.3) rouge (1.7.4) - rspec (2.14.1) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - rspec-core (2.14.7) - rspec-expectations (2.14.4) + rspec (2.99.0) + rspec-core (~> 2.99.0) + rspec-expectations (~> 2.99.0) + rspec-mocks (~> 2.99.0) + rspec-collection_matchers (1.1.2) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (2.99.2) + rspec-expectations (2.99.2) diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.4) - rspec-rails (2.14.0) + rspec-mocks (2.99.3) + rspec-rails (2.99.0) actionpack (>= 3.0) + activemodel (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) + rspec-collection_matchers + rspec-core (~> 2.99.0) + rspec-expectations (~> 2.99.0) + rspec-mocks (~> 2.99.0) rubocop (0.28.0) astrolabe (~> 1.3) parser (>= 2.2.0.pre.7, < 3.0) @@ -724,7 +728,7 @@ DEPENDENCIES redcarpet (~> 3.1.2) redis-rails request_store - rspec-rails + rspec-rails (= 2.99) rubocop (= 0.28.0) rugments sanitize (~> 2.0) |