diff --git a/Gemfile b/Gemfile index 909ff90..69dc7f1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.11' +gem 'rails', '3.2.17' gem 'bootstrap-sass', '2.0.0' gem 'bcrypt-ruby', '3.0.1' gem 'faker', '1.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index c42adbf..ce32a32 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,37 +1,37 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.11) - actionpack (= 3.2.11) - mail (~> 2.4.4) - actionpack (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) + 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.4) - rack (~> 1.4.0) + rack (~> 1.4.5) rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.11) - activesupport (= 3.2.11) + activemodel (3.2.17) + activesupport (= 3.2.17) builder (~> 3.0.0) - activerecord (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) + activerecord (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) - activesupport (3.2.11) - 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) addressable (2.3.2) annotate (2.5.0) rake - arel (3.0.2) + arel (3.0.3) bcrypt-ruby (3.0.1) bootstrap-sass (2.0.0) bootstrap-will_paginate (0.0.6) @@ -56,6 +56,7 @@ GEM coffee-script-source execjs coffee-script-source (1.4.0) + concurrent-ruby (1.1.5) cucumber (1.2.1) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -92,58 +93,57 @@ GEM childprocess (>= 0.2.3) guard (>= 1.1) spork (>= 0.8.4) - hike (1.2.1) - i18n (0.6.1) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) jquery-rails (2.1.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.7.6) + json (2.2.0) libwebsocket (0.1.7.1) addressable websocket listen (0.7.2) lumberjack (1.0.2) - mail (2.4.4) - i18n (>= 0.4.0) + mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) method_source (0.8.1) - mime-types (1.19) - multi_json (1.5.0) + mime-types (1.25.1) + multi_json (1.14.0) nokogiri (1.5.6) pg (0.12.2) - polyglot (0.3.3) + polyglot (0.3.5) pry (0.9.10) coderay (~> 1.0.5) method_source (~> 0.8) slop (~> 3.3.1) - rack (1.4.3) - rack-cache (1.2) + 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.2) + rack-test (0.6.3) rack (>= 1.0) - rails (3.2.11) - actionmailer (= 3.2.11) - actionpack (= 3.2.11) - activerecord (= 3.2.11) - activeresource (= 3.2.11) - activesupport (= 3.2.11) + 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.11) - railties (3.2.11) - actionpack (= 3.2.11) - activesupport (= 3.2.11) + 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, < 2.0) - rake (10.0.3) + rake (13.0.0) rb-fsevent (0.9.3) - rdoc (3.12) - json (~> 1.4) + rdoc (3.9.5) rspec (2.10.0) rspec-core (~> 2.10.0) rspec-expectations (~> 2.10.0) @@ -170,18 +170,18 @@ GEM rubyzip slop (3.3.3) spork (0.9.2) - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.5) - thor (0.16.0) - tilt (1.3.3) - treetop (1.4.12) + thor (0.20.3) + tilt (1.4.1) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.35) + tzinfo (0.3.55) uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) @@ -210,7 +210,7 @@ DEPENDENCIES guard-spork jquery-rails pg (= 0.12.2) - rails (= 3.2.11) + rails (= 3.2.17) rb-fsevent rspec-rails (= 2.10.0) sass-rails (~> 3.2.4)