aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock21
1 files changed, 12 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index e34449a7b0..90ade529bc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -50,13 +50,13 @@ PATH
rack (~> 1.6)
rack-test (~> 0.6.3)
rails-dom-testing (~> 1.0, >= 1.0.5)
- rails-html-sanitizer (~> 1.0, >= 1.0.1)
+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.0.0.alpha)
activesupport (= 5.0.0.alpha)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
- rails-html-sanitizer (~> 1.0, >= 1.0.1)
+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (5.0.0.alpha)
activesupport (= 5.0.0.alpha)
globalid (>= 0.3.0)
@@ -87,6 +87,7 @@ PATH
railties (5.0.0.alpha)
actionpack (= 5.0.0.alpha)
activesupport (= 5.0.0.alpha)
+ method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
@@ -117,11 +118,13 @@ GEM
dante (0.1.5)
delayed_job (4.0.6)
activesupport (>= 3.0, < 5.0)
+ delayed_job_active_record (4.0.3)
+ activerecord (>= 3.0, < 5.0)
+ delayed_job (>= 3.0, < 4.1)
erubis (2.7.0)
execjs (2.3.0)
globalid (0.3.3)
activesupport (>= 4.1.0)
- hike (1.2.3)
hitimes (1.2.2)
i18n (0.7.0)
json (1.8.2)
@@ -131,13 +134,14 @@ GEM
loofah (2.0.1)
nokogiri (>= 1.5.9)
metaclass (0.0.4)
+ method_source (0.8.2)
mime-types (2.4.3)
mini_portile (0.6.2)
minitest (5.3.3)
mocha (0.14.0)
metaclass (~> 0.0.1)
mono_logger (1.1.0)
- multi_json (1.10.1)
+ multi_json (1.11.0)
mustache (1.0.0)
mysql (2.9.1)
mysql2 (0.3.18)
@@ -162,7 +166,7 @@ GEM
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
- rails-html-sanitizer (1.0.1)
+ rails-html-sanitizer (1.0.2)
loofah (~> 2.0)
rake (10.4.2)
rdoc (4.2.0)
@@ -206,11 +210,8 @@ GEM
serverengine
thor
thread
- sprockets (2.12.3)
- hike (~> 1.2)
- multi_json (~> 1.0)
+ sprockets (3.0.0.rc.1)
rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.4)
actionpack (>= 3.0)
activesupport (>= 3.0)
@@ -252,6 +253,7 @@ DEPENDENCIES
coffee-rails (~> 4.1.0)
dalli (>= 2.2.1)
delayed_job
+ delayed_job_active_record
jquery-rails!
json
kindlerb (= 0.1.1)
@@ -279,6 +281,7 @@ DEPENDENCIES
sequel
sidekiq
sneakers (= 0.1.1.pre)
+ sprockets (~> 3.0.0.rc.1)
sqlite3 (~> 1.3.6)
stackprof
sucker_punch