diff --git a/Gemfile b/Gemfile index 5c1ec8f..ee271d3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.2' +gem 'rails', '3.2.17' gem 'sorcery', git: 'https://github.com/patrickdet/sorcery.git', branch: 'stateless_auth_token' gem 'bcrypt-ruby' gem 'cancan' diff --git a/Gemfile.lock b/Gemfile.lock index 4f2186e..bd9ff0a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,36 +11,36 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.2) - actionpack (= 3.2.2) - mail (~> 2.4.0) - actionpack (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) + actionmailer (3.2.17) + actionpack (= 3.2.17) + mail (~> 2.5.4) + actionpack (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) builder (~> 3.0.0) erubis (~> 2.7.0) - journey (~> 1.0.1) - rack (~> 1.4.0) - rack-cache (~> 1.1) + journey (~> 1.0.4) + rack (~> 1.4.5) + rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.2) - activemodel (3.2.2) - activesupport (= 3.2.2) + sprockets (~> 2.2.1) + activemodel (3.2.17) + activesupport (= 3.2.17) builder (~> 3.0.0) - activerecord (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) + activerecord (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) - activesupport (3.2.2) - i18n (~> 0.6) + activeresource (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) + activesupport (3.2.17) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - arel (3.0.2) + arel (3.0.3) bcrypt-ruby (3.0.1) - builder (3.0.0) + builder (3.0.4) cancan (1.6.7) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -49,6 +49,7 @@ GEM coffee-script-source execjs coffee-script-source (1.3.3) + concurrent-ruby (1.1.5) daemons (1.1.8) diff-lcs (1.1.3) ejs (1.0.0) @@ -76,52 +77,52 @@ GEM sprockets (>= 2.0.3) tilt has_scope (0.5.1) - hike (1.2.1) - i18n (0.6.0) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) inherited_resources (1.3.1) has_scope (~> 0.5.0) responders (~> 0.6) jasminerice (0.0.8) haml - journey (1.0.3) - json (1.7.3) + journey (1.0.4) + json (1.8.6) libv8 (3.3.10.4) - mail (2.4.4) - i18n (>= 0.4.0) + mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.18) - multi_json (1.3.5) + mime-types (1.25.1) + multi_json (1.14.1) multipart-post (1.1.5) oauth (0.4.6) oauth2 (0.5.2) faraday (~> 0.7) multi_json (~> 1.0) - polyglot (0.3.3) - rack (1.4.1) - rack-cache (1.2) + polyglot (0.3.5) + rack (1.4.7) + rack-cache (1.9.0) rack (>= 0.4) - rack-ssl (1.3.2) + rack-ssl (1.3.4) rack - rack-test (0.6.1) + rack-test (0.6.3) rack (>= 1.0) - rails (3.2.2) - actionmailer (= 3.2.2) - actionpack (= 3.2.2) - activerecord (= 3.2.2) - activeresource (= 3.2.2) - activesupport (= 3.2.2) + rails (3.2.17) + actionmailer (= 3.2.17) + actionpack (= 3.2.17) + activerecord (= 3.2.17) + activeresource (= 3.2.17) + activesupport (= 3.2.17) bundler (~> 1.0) - railties (= 3.2.2) - railties (3.2.2) - actionpack (= 3.2.2) - activesupport (= 3.2.2) + railties (= 3.2.17) + railties (3.2.17) + actionpack (= 3.2.17) + activesupport (= 3.2.17) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) - thor (~> 0.14.6) - rake (0.9.2.2) - rdoc (3.12) + thor (>= 0.14.6, < 2.0) + rake (13.0.0) + rdoc (3.12.2) json (~> 1.4) responders (0.9.1) railties (~> 3.1) @@ -145,8 +146,9 @@ GEM tilt (~> 1.3) shoulda-matchers (1.1.0) activesupport (>= 3.0.0) - sprockets (2.1.3) + sprockets (2.2.3) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.6) @@ -156,12 +158,12 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.14.6) - tilt (1.3.3) - treetop (1.4.10) + thor (0.20.3) + tilt (1.4.1) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.33) + tzinfo (0.3.55) PLATFORMS ruby @@ -179,7 +181,7 @@ DEPENDENCIES handlebars_assets inherited_resources jasminerice - rails (= 3.2.2) + rails (= 3.2.17) rspec-rails sass-rails shoulda-matchers