Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-01-29 20:15:15 +0300
committerRobert Speicher <rspeicher@gmail.com>2015-01-29 21:14:30 +0300
commited17adfbcd7f279747ac8f23da079808299b06e6 (patch)
tree0df4c9d47597f2f2c8a7d1014991384ac195be18 /Gemfile.lock
parent9de4e696a68b7a0fb4d1e04becac24813fc4c922 (diff)
Update shoulda-matchers
This outdated gem was the cause of those annoying MiniTest errors. Also updates one use of `ensure_inclusion_of` which was deprecated in favor of `validate_inclusion_of`.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock8
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 4b5b718c87e..cd02837008b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -260,7 +260,7 @@ GEM
multi_xml (>= 0.5.2)
httpauth (0.2.1)
httpclient (2.5.3.3)
- i18n (0.6.11)
+ i18n (0.7.0)
ice_nine (0.10.0)
jasmine (2.0.2)
jasmine-core (~> 2.0.0)
@@ -279,7 +279,7 @@ GEM
turbolinks
jquery-ui-rails (4.2.1)
railties (>= 3.2.16)
- json (1.8.1)
+ json (1.8.2)
jwt (0.1.13)
multi_json (>= 1.5)
kaminari (0.15.1)
@@ -495,7 +495,7 @@ GEM
sass (~> 3.2)
settingslogic (2.0.9)
sexp_processor (4.4.0)
- shoulda-matchers (2.1.0)
+ shoulda-matchers (2.7.0)
activesupport (>= 3.0.0)
sidekiq (3.3.0)
celluloid (>= 0.16.0)
@@ -719,7 +719,7 @@ DEPENDENCIES
select2-rails
semantic-ui-sass (~> 1.8.0)
settingslogic
- shoulda-matchers (~> 2.1.0)
+ shoulda-matchers (~> 2.7.0)
sidekiq (~> 3.3)
simplecov
sinatra