diff --git a/Gemfile b/Gemfile index d739aa5..f409c61 100644 --- a/Gemfile +++ b/Gemfile @@ -39,7 +39,7 @@ gem 'mobile-fu' gem "rails_config" # jquery magick -gem 'jquery-rails' +gem 'jquery-rails', '~> 3.1.3' # pagination gem 'kaminari' @@ -85,7 +85,7 @@ gem "inline-style", "0.5.2ex", :source => 'https://engineering.extension.org/rub gem 'hashids' # html scrubbing -gem "loofah" +gem "loofah", "~> 2.2.3" # useragent analysis gem 'useragent' diff --git a/Gemfile.lock b/Gemfile.lock index 2a985a9..bcced5c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,7 +4,7 @@ GEM specs: actionmailer (3.2.22.5) actionpack (= 3.2.22.5) - mail (~> 2.5.4) + mail (~> 2.5.5) actionpack (3.2.22.5) activemodel (= 3.2.22.5) activesupport (= 3.2.22.5) @@ -72,8 +72,9 @@ GEM execjs coffee-script-source (1.6.3) colorize (0.8.1) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.5) connection_pool (1.1.0) + crass (1.0.5) csspool (3.0.2) debug_inspector (0.0.2) declarative (0.0.10) @@ -122,7 +123,7 @@ GEM colorize rack hurley (0.2) - i18n (0.9.1) + i18n (0.9.5) concurrent-ruby (~> 1.0) inline-style (0.5.2ex) csspool @@ -131,13 +132,13 @@ GEM activesupport (>= 3.0.0) multi_json (>= 1.2.0) journey (1.0.4) - jquery-rails (3.0.4) + jquery-rails (3.1.5) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-ui-rails (4.0.4) jquery-rails railties (>= 3.1.0) - json (1.8.3) + json (2.2.0) jwt (2.1.0) kaminari (0.14.1) actionpack (>= 3.0.0) @@ -150,9 +151,10 @@ GEM actionpack (>= 3) activesupport (>= 3) railties (>= 3) - loofah (1.2.1) - nokogiri (>= 1.4.4) - mail (2.5.4) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) memoist (0.16.0) @@ -166,7 +168,7 @@ GEM mobile-fu (1.2.1) rack-mobile-detect rails - multi_json (1.13.1) + multi_json (1.14.1) multipart-post (2.0.0) mysql2 (0.3.21) net-scp (1.2.1) @@ -195,13 +197,13 @@ GEM quiet_assets (1.0.2) railties (>= 3.1, < 5.0) rack (1.4.7) - rack-cache (1.6.1) + rack-cache (1.9.0) rack (>= 0.4) rack-contrib (1.1.0) rack (>= 0.9.1) rack-mobile-detect (0.4.0) rack - rack-protection (1.5.0) + rack-protection (1.5.5) rack rack-robustness (1.1.0) rack-ssl (1.3.4) @@ -225,9 +227,8 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (11.3.0) - rdoc (3.12.2) - json (~> 1.4) + rake (13.0.0) + rdoc (3.9.5) redis (3.0.4) redis-actionpack (3.2.4) actionpack (~> 3.2.0) @@ -285,7 +286,7 @@ GEM multi_json (~> 1.10) sinatra (1.3.6) rack (~> 1.4) - rack-protection (~> 1.3) + rack-protection (~> 1.5.5) tilt (~> 1.3, >= 1.3.3) slack-notifier (1.5.1) slop (3.4.7) @@ -296,7 +297,7 @@ GEM tilt (~> 1.1, != 1.3.0) test-unit (3.2.1) power_assert - thor (0.20.0) + thor (0.20.3) tilt (1.4.1) timers (1.1.0) treetop (1.4.15) @@ -349,11 +350,11 @@ DEPENDENCIES httplog inline-style (= 0.5.2ex)! jbuilder - jquery-rails + jquery-rails (~> 3.1.3) jquery-ui-rails kaminari lograge - loofah + loofah (~> 2.2.3) meta_request mobile-fu mysql2