summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock26
1 files changed, 12 insertions, 14 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 2fc2fe5..145a7fc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -26,9 +26,8 @@ GEM
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
arel (4.0.2)
- atomic (1.1.16)
bcrypt-ruby (3.1.2)
- bootstrap-sass (3.1.1.0)
+ bootstrap-sass (3.1.1.1)
sass (~> 3.2)
builder (3.1.4)
carrierwave (0.10.0)
@@ -44,17 +43,17 @@ GEM
execjs
coffee-script-source (1.7.0)
daemons (1.1.9)
- delayed_job (4.0.0)
- activesupport (>= 3.0, < 4.1)
- delayed_job_active_record (4.0.0)
- activerecord (>= 3.0, < 4.1)
+ delayed_job (4.0.1)
+ activesupport (>= 3.0, < 4.2)
+ delayed_job_active_record (4.0.1)
+ activerecord (>= 3.0, < 4.2)
delayed_job (>= 3.0, < 4.1)
erubis (2.7.0)
execjs (2.0.2)
foreigner (1.6.1)
activerecord (>= 3.0.0)
hike (1.2.3)
- httparty (0.13.0)
+ httparty (0.13.1)
json (~> 1.8)
multi_xml (>= 0.5.2)
i18n (0.6.9)
@@ -94,16 +93,16 @@ GEM
activesupport (= 4.0.2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- rake (10.2.2)
+ rake (10.3.1)
rdoc (4.1.1)
json (~> 1.4)
ref (1.0.5)
- sass (3.2.18)
- sass-rails (4.0.2)
+ sass (3.2.19)
+ sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
- sprockets-rails (~> 2.0.0)
+ sprockets-rails (~> 2.0)
sdoc (0.4.0)
json (~> 1.8)
rdoc (~> 4.0, < 5.0)
@@ -123,13 +122,12 @@ GEM
libv8 (~> 3.16.14.0)
ref
thor (0.19.1)
- thread_safe (0.3.1)
- atomic (>= 1.1.7, < 2)
+ thread_safe (0.3.3)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
- turbolinks (2.2.1)
+ turbolinks (2.2.2)
coffee-rails
tzinfo (0.3.39)
uglifier (2.5.0)