diff --git a/Gemfile b/Gemfile index d174571..6baf7dc 100644 --- a/Gemfile +++ b/Gemfile @@ -1,31 +1,32 @@ source 'https://rubygems.org' -gem 'rails', '~>3.2' +gem 'rails', '3.2.13' gem 'sqlite3' gem 'json' group :assets do - gem 'sass-rails', '~> 3.2.3' - gem 'coffee-rails', '~> 3.2.1' - gem 'uglifier', '>= 1.0.3' + gem 'sass-rails', '3.2.6' + gem 'coffee-rails', '3.2.2' + gem 'uglifier', '2.7.2' end -gem 'acts_as_list', '~>0.2' -gem 'acts_as_paranoid', '~>0.4' -gem 'acts_as_versioned', :git => 'https://github.com/jwhitehorn/acts_as_versioned.git' -gem 'bluecloth', '1.0.0', :path => './vendor/gems/bluecloth' -gem 'calendar_helper', "~>0.2" +gem 'acts_as_list', '0.2.0' +gem 'acts_as_paranoid', '0.4.2' +gem 'acts_as_versioned', + git: 'https://github.com/isoron/acts_as_versioned.git', + ref: 'df85fc1e438c18dddf610414b5c8a1ee8a7cefc9' +gem 'bluecloth', '1.0.0', path: './vendor/gems/bluecloth' +gem 'calendar_helper', '0.2.5' gem 'dynamic_form' -gem 'haml', '~>3.1' -gem 'hpricot', '~>0.8' -gem 'icalendar', '~>1.0' -gem 'jquery-rails' -gem 'shoulda', "~>3.5" -gem 'will_paginate', "~>3.0" -gem 'simplecov' +gem 'haml', '3.1.8' +gem 'hpricot', '0.8.6' +gem 'icalendar', '1.4.1' +gem 'jquery-rails', '3.0.4' +gem 'shoulda', "3.5.0" +gem 'will_paginate', "3.0.4" +gem 'rails-i18n', '3.0.0' group :test do + gem 'simplecov' gem 'turn' - #gem 'silencer' end - diff --git a/Gemfile.lock b/Gemfile.lock index f24797d..e307909 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,7 @@ GIT - remote: https://github.com/jwhitehorn/acts_as_versioned.git - revision: 44dfe632ba8c97c786cbc172a2da18a41b17f668 + remote: https://github.com/isoron/acts_as_versioned.git + revision: df85fc1e438c18dddf610414b5c8a1ee8a7cefc9 + ref: df85fc1e438c18dddf610414b5c8a1ee8a7cefc9 specs: acts_as_versioned (3.2.1) activerecord @@ -45,22 +46,21 @@ GEM acts_as_paranoid (0.4.2) activerecord (~> 3.2) ansi (1.5.0) - arel (3.0.2) + arel (3.0.3) builder (3.0.4) calendar_helper (0.2.5) open4 coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) - coffee-script (2.2.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.6.3) + coffee-script-source (1.9.1.1) docile (1.1.5) dynamic_form (1.1.4) erubis (2.7.0) - execjs (1.4.0) - multi_json (~> 1.0) + execjs (2.6.0) haml (3.1.8) hike (1.2.3) hpricot (0.8.6) @@ -70,21 +70,21 @@ GEM jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.0) + json (1.8.3) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.23) + mime-types (1.25.1) minitest (4.7.5) - multi_json (1.7.7) - open4 (1.3.0) - polyglot (0.3.3) - rack (1.4.5) + multi_json (1.11.2) + open4 (1.3.4) + polyglot (0.3.5) + rack (1.4.7) rack-cache (1.2) rack (>= 0.4) - rack-ssl (1.3.3) + rack-ssl (1.3.4) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (3.2.13) actionmailer (= 3.2.13) @@ -94,6 +94,9 @@ GEM activesupport (= 3.2.13) bundler (~> 1.0) railties (= 3.2.13) + rails-i18n (3.0.0) + i18n (~> 0.5) + rails (>= 3.0.0, < 4.0.0) railties (3.2.13) actionpack (= 3.2.13) activesupport (= 3.2.13) @@ -101,10 +104,10 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.1.0) + rake (10.4.2) rdoc (3.12.2) json (~> 1.4) - sass (3.2.9) + sass (3.4.18) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) @@ -120,50 +123,51 @@ GEM json (~> 1.8) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - 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.7) - thor (0.18.1) + sqlite3 (1.3.10) + thor (0.19.1) tilt (1.4.1) - treetop (1.4.14) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) turn (0.9.7) ansi minitest (~> 4) - tzinfo (0.3.37) - uglifier (2.1.2) + tzinfo (0.3.44) + uglifier (2.7.2) execjs (>= 0.3.0) - multi_json (~> 1.0, >= 1.0.2) + json (>= 1.8.0) will_paginate (3.0.4) PLATFORMS ruby DEPENDENCIES - acts_as_list (~> 0.2) - acts_as_paranoid (~> 0.4) + acts_as_list (= 0.2.0) + acts_as_paranoid (= 0.4.2) acts_as_versioned! bluecloth (= 1.0.0)! - calendar_helper (~> 0.2) - coffee-rails (~> 3.2.1) + calendar_helper (= 0.2.5) + coffee-rails (= 3.2.2) dynamic_form - haml (~> 3.1) - hpricot (~> 0.8) - icalendar (~> 1.0) - jquery-rails + haml (= 3.1.8) + hpricot (= 0.8.6) + icalendar (= 1.4.1) + jquery-rails (= 3.0.4) json - rails (~> 3.2) - sass-rails (~> 3.2.3) - shoulda (~> 3.5) + rails (= 3.2.13) + rails-i18n (= 3.0.0) + sass-rails (= 3.2.6) + shoulda (= 3.5.0) simplecov sqlite3 turn - uglifier (>= 1.0.3) - will_paginate (~> 3.0) + uglifier (= 2.7.2) + will_paginate (= 3.0.4) BUNDLED WITH 1.10.6