diff --git a/Gemfile b/Gemfile index 72d17cb2..b2e87083 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,5 @@ source 'http://rubygems.org' +ruby '2.2.4' gem 'rails', '3.0.12' gem 'gravatar_image_tag', '1.0.0.pre2' @@ -7,7 +8,6 @@ gem 'sqlite3', '1.3.4' gem "pg", "~> 0.15.1" gem "cf-autoconfig", "~> 0.2.1" gem 'rails_12factor', group: :production -ruby '2.0.0' group :development do gem 'rspec-rails', '2.6.1' @@ -16,7 +16,6 @@ group :development do end group :test do - gem 'rspec-rails', '2.6.1' gem 'webrat', '0.7.1' gem 'spork', '0.9.0.rc8' gem 'factory_girl_rails', '1.0' diff --git a/Gemfile.lock b/Gemfile.lock index 31a85bdc..2ac6a300 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,7 +34,7 @@ GEM cf-autoconfig (0.2.1) cf-runtime (= 0.2.0) cf-runtime (0.2.0) - diff-lcs (1.1.2) + diff-lcs (1.1.3) erubis (2.6.6) abstract (>= 1.0.0) factory_girl (1.3.3) @@ -43,18 +43,20 @@ GEM rails (>= 3.0.0.beta4) faker (0.3.1) gravatar_image_tag (1.0.0.pre2) - i18n (0.5.0) - json (1.6.6) - mail (2.2.19) + i18n (0.5.4) + json (1.8.3) + mail (2.2.20) activesupport (>= 2.3.6) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.18) - nokogiri (1.4.4) + mime-types (1.25.1) + mini_portile2 (2.0.0) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) pg (0.15.1) - polyglot (0.3.3) - rack (1.2.5) + polyglot (0.3.5) + rack (1.2.8) rack-mount (0.6.14) rack (>= 1.0.0) rack-test (0.5.7) @@ -67,19 +69,19 @@ GEM activesupport (= 3.0.12) bundler (~> 1.0) railties (= 3.0.12) - rails_12factor (0.0.2) + rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging - rails_serve_static_assets (0.0.2) - rails_stdout_logging (0.0.3) + rails_serve_static_assets (0.0.5) + rails_stdout_logging (0.0.5) railties (3.0.12) actionpack (= 3.0.12) activesupport (= 3.0.12) rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.4) - rake (0.9.2.2) - rdoc (3.12) + rake (11.1.2) + rdoc (3.12.2) json (~> 1.4) rspec (2.6.0) rspec-core (~> 2.6.0) @@ -97,10 +99,10 @@ GEM spork (0.9.0.rc8) sqlite3 (1.3.4) thor (0.14.6) - treetop (1.4.10) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.32) + tzinfo (0.3.49) webrat (0.7.1) nokogiri (>= 1.2.0) rack (>= 1.0) @@ -124,3 +126,6 @@ DEPENDENCIES sqlite3 (= 1.3.4) webrat (= 0.7.1) will_paginate (= 3.0.pre2) + +BUNDLED WITH + 1.11.2