summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile.lock32
1 files changed, 18 insertions, 14 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 68ebb9f..36b6c7b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,10 +28,12 @@ GEM
activesupport (3.2.13)
i18n (= 0.6.1)
multi_json (~> 1.0)
- annotate (2.4.0)
+ annotate (2.5.0)
+ rake
arel (3.0.2)
bcrypt-ruby (3.0.1)
- bootstrap-sass (2.1.1.0)
+ bootstrap-sass (2.3.1.0)
+ sass (~> 3.2)
builder (3.0.4)
capybara (2.0.3)
mime-types (>= 1.16)
@@ -57,7 +59,7 @@ GEM
coffee-script-source (1.4.0)
colorize (0.5.8)
connection_pool (1.0.0)
- coveralls (0.6.2)
+ coveralls (0.6.5)
colorize
multi_json (~> 1.3)
rest-client
@@ -73,17 +75,17 @@ GEM
execjs (1.4.0)
multi_json (~> 1.0)
facter (1.6.18)
- factory_girl (4.1.0)
+ factory_girl (4.2.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.1.0)
- factory_girl (~> 4.1.0)
+ factory_girl_rails (4.2.1)
+ factory_girl (~> 4.2.0)
railties (>= 3.0.0)
ffaker (1.14.0)
ffi (1.6.0)
- font-awesome-sass-rails (3.0.0.1)
+ font-awesome-sass-rails (3.0.2.2)
railties (>= 3.1.1)
sass-rails (>= 3.1.1)
- foreman (0.60.2)
+ foreman (0.62.0)
thor (>= 0.13.6)
gitlab_ci_meta (1.0)
growl (1.0.3)
@@ -98,7 +100,7 @@ GEM
activesupport (>= 3.1, < 4.1)
haml (~> 3.1)
railties (>= 3.1, < 4.1)
- hike (1.2.1)
+ hike (1.2.2)
i18n (0.6.1)
journey (1.0.4)
jquery-rails (2.1.3)
@@ -108,7 +110,7 @@ GEM
kaminari (0.14.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
- libv8 (3.3.10.4)
+ libv8 (3.11.8.17)
listen (0.5.0)
mail (2.5.3)
i18n (>= 0.4.0)
@@ -163,6 +165,7 @@ GEM
redis (3.0.3)
redis-namespace (1.2.1)
redis (~> 3.0.0)
+ ref (1.0.4)
rest-client (1.6.7)
mime-types (>= 1.16)
rspec-core (2.13.1)
@@ -178,8 +181,8 @@ GEM
rspec-mocks (~> 2.13.0)
rubyzip (0.9.9)
rugged (0.17.0.b7)
- sass (3.2.1)
- sass-rails (3.2.5)
+ sass (3.2.7)
+ sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
@@ -217,8 +220,9 @@ GEM
stamp (0.3.0)
state_machine (1.1.2)
temple (0.5.5)
- therubyracer (0.10.2)
- libv8 (~> 3.3.10)
+ therubyracer (0.11.4)
+ libv8 (~> 3.11.8.12)
+ ref
thor (0.18.1)
tilt (1.3.6)
timers (1.1.0)