diff --git a/Gemfile b/Gemfile index e456ff9..249f000 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.2' +gem 'rails', '3.2.22.5' gem "simple_form" gem 'twitter-bootstrap-rails', :git => "git://github.com/seyhunak/twitter-bootstrap-rails.git" diff --git a/Gemfile.lock b/Gemfile.lock index 2f153e0..781cbf5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -18,40 +18,42 @@ GEM remote: https://rubygems.org/ specs: ZenTest (4.7.0) - 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.22.5) + actionpack (= 3.2.22.5) + mail (~> 2.5.4) + actionpack (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) 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.22.5) + activesupport (= 3.2.22.5) builder (~> 3.0.0) - activerecord (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) + activerecord (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) 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.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) + activesupport (3.2.22.5) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - addressable (2.2.7) - arel (3.0.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + arel (3.0.3) autotest (4.4.6) ZenTest (>= 4.4.1) autotest-rails (4.1.2) ZenTest (~> 4.5) - builder (3.0.0) + buftok (0.2.0) + builder (3.0.4) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) @@ -60,8 +62,12 @@ GEM execjs coffee-script-source (1.2.0) commonjs (0.2.5) + concurrent-ruby (1.1.5) database_cleaner (0.7.2) diff-lcs (1.1.3) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + equalizer (0.0.11) erubis (2.7.0) execjs (1.3.0) multi_json (~> 1.0) @@ -70,17 +76,23 @@ GEM factory_girl_rails (2.0.0) factory_girl (~> 3.0.0) railties (>= 3.0.0) - faraday (0.7.6) - addressable (~> 2.2) - multipart-post (~> 1.1) - rack (~> 1.1) - hike (1.2.1) - i18n (0.6.0) - journey (1.0.3) + hike (1.2.3) + http (3.3.0) + addressable (~> 2.3) + http-cookie (~> 1.0) + http-form_data (~> 2.0) + http_parser.rb (~> 0.6.0) + http-cookie (1.0.3) + domain_name (~> 0.5) + http-form_data (2.2.0) + http_parser.rb (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + journey (1.0.4) jquery-rails (2.0.1) railties (>= 3.2.0, < 5.0) thor (~> 0.14) - json (1.6.5) + json (1.8.6) less (2.0.11) commonjs (~> 0.2.0) therubyracer (~> 0.9.9) @@ -88,39 +100,42 @@ GEM actionpack (>= 3.1) less (~> 2.0.7) 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.1.0) - multipart-post (1.1.5) + memoizable (0.4.2) + thread_safe (~> 0.3, >= 0.3.1) + mime-types (1.25.1) + multi_json (1.14.1) + multipart-post (2.1.1) + naught (1.1.0) pg (0.13.2) - polyglot (0.3.3) - rack (1.4.1) - rack-cache (1.2) + polyglot (0.3.5) + public_suffix (4.0.3) + rack (1.4.7) + rack-cache (1.11.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.22.5) + actionmailer (= 3.2.22.5) + actionpack (= 3.2.22.5) + activerecord (= 3.2.22.5) + activeresource (= 3.2.22.5) + activesupport (= 3.2.22.5) bundler (~> 1.0) - railties (= 3.2.2) - railties (3.2.2) - actionpack (= 3.2.2) - activesupport (= 3.2.2) + railties (= 3.2.22.5) + railties (3.2.22.5) + actionpack (= 3.2.22.5) + activesupport (= 3.2.22.5) 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.1) + rdoc (3.12.2) json (~> 1.4) rspec (2.8.0) rspec-core (~> 2.8.0) @@ -148,28 +163,39 @@ GEM simple_form (2.0.1) actionpack (~> 3.0) activemodel (~> 3.0) - simple_oauth (0.1.5) - sprockets (2.1.2) + simple_oauth (0.3.1) + sprockets (2.2.3) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.5) therubyracer (0.9.10) libv8 (~> 3.3.10) - thor (0.14.6) - tilt (1.3.3) - treetop (1.4.10) + thor (0.20.3) + thread_safe (0.3.6) + tilt (1.4.1) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - twitter (2.1.1) - activesupport (>= 2.3.9, < 4) - faraday (~> 0.7) - multi_json (~> 1.0) - simple_oauth (~> 0.1) - tzinfo (0.3.32) + twitter (6.2.0) + addressable (~> 2.3) + buftok (~> 0.2.0) + equalizer (~> 0.0.11) + http (~> 3.0) + http-form_data (~> 2.0) + http_parser.rb (~> 0.6.0) + memoizable (~> 0.4.0) + multipart-post (~> 2.0) + naught (~> 1.0) + simple_oauth (~> 0.3.0) + tzinfo (0.3.56) uglifier (1.2.3) execjs (>= 0.3.0) multi_json (>= 1.0.2) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.6) PLATFORMS ruby @@ -183,7 +209,7 @@ DEPENDENCIES factory_girl_rails (~> 2.0) jquery-rails pg - rails (= 3.2.2) + rails (= 3.2.22.5) rspec-rails sass-rails (~> 3.2.3) shoulda (~> 3.0.0)