diff options
| -rw-r--r-- | Gemfile | 9 | ||||
| -rw-r--r-- | Gemfile.lock | 113 |
2 files changed, 60 insertions, 62 deletions
@@ -7,7 +7,8 @@ if File.exist? "/etc/debian_version" and File.open("/etc/debian_version").read.s end source 'https://rubygems.org' -gem 'rails', '3.1.12' +gem 'rails', '3.2.15' + gem 'pg' # New gem releases aren't being done. master is newer and supports Rails > 3.0 @@ -53,10 +54,10 @@ gem 'unidecode' group :assets do gem 'bootstrap-sass' - gem 'sass-rails', "= 3.1.4" + gem 'sass-rails', '~> 3.2.3' gem 'compass-rails' - gem 'coffee-rails', "~> 3.1" - gem 'uglifier' + gem 'coffee-rails', "~> 3.2.1" + gem 'uglifier', '>= 1.0.3' gem 'therubyracer' end diff --git a/Gemfile.lock b/Gemfile.lock index c3fdd40da..e64df94da 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -18,37 +18,36 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (3.1.12) - actionpack (= 3.1.12) - mail (~> 2.4.4) - actionpack (3.1.12) - activemodel (= 3.1.12) - activesupport (= 3.1.12) + actionmailer (3.2.15) + actionpack (= 3.2.15) + mail (~> 2.5.4) + actionpack (3.2.15) + activemodel (= 3.2.15) + activesupport (= 3.2.15) builder (~> 3.0.0) erubis (~> 2.7.0) - i18n (~> 0.6) - rack (~> 1.3.6) + journey (~> 1.0.4) + rack (~> 1.4.5) rack-cache (~> 1.2) - rack-mount (~> 0.8.2) rack-test (~> 0.6.1) - sprockets (~> 2.0.4) - activemodel (3.1.12) - activesupport (= 3.1.12) + sprockets (~> 2.2.1) + activemodel (3.2.15) + activesupport (= 3.2.15) builder (~> 3.0.0) - i18n (~> 0.6) - activerecord (3.1.12) - activemodel (= 3.1.12) - activesupport (= 3.1.12) - arel (~> 2.2.3) + activerecord (3.2.15) + activemodel (= 3.2.15) + activesupport (= 3.2.15) + arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.1.12) - activemodel (= 3.1.12) - activesupport (= 3.1.12) - activesupport (3.1.12) + activeresource (3.2.15) + activemodel (= 3.2.15) + activesupport (= 3.2.15) + activesupport (3.2.15) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) annotate (2.5.0) rake - arel (2.2.3) + arel (3.0.2) bootstrap-sass (2.3.1.2) sass (~> 3.2) builder (3.0.4) @@ -60,9 +59,9 @@ GEM net-ssh-gateway (>= 1.1.0) charlock_holmes (0.6.9.4) chunky_png (1.2.8) - coffee-rails (3.1.1) + coffee-rails (3.2.2) coffee-script (>= 2.2.0) - railties (~> 3.1.0) + railties (~> 3.2.0) coffee-script (2.2.0) coffee-script-source execjs @@ -94,6 +93,7 @@ GEM eventmachine (1.0.3) exception_notification (3.0.1) actionmailer (>= 3.0.4) + activesupport (>= 3.0.4) execjs (2.0.1) factory_girl (2.6.4) activesupport (>= 2.3.9) @@ -114,17 +114,17 @@ GEM highline (1.6.19) hike (1.2.3) i18n (0.6.5) + journey (1.0.4) jquery-rails (2.3.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.0) + json (1.8.1) libv8 (3.16.14.3) linecache (0.46) rbx-require-relative (> 0.0.4) locale (2.0.8) mahoro (0.4) - mail (2.4.4) - i18n (>= 0.4.0) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) mailcatcher (0.5.11) @@ -136,8 +136,8 @@ GEM skinny (~> 0.2.3) sqlite3 (~> 1.3) thin (~> 1.5.0) - mime-types (1.23) - multi_json (1.8.0) + mime-types (1.25) + multi_json (1.8.2) net-http-local (0.1.2) net-purge (0.1.0) net-scp (1.1.1) @@ -154,34 +154,32 @@ GEM railties (~> 3.0) pg (0.15.1) polyglot (0.3.3) - rack (1.3.10) + rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-mount (0.8.3) - rack (>= 1.0.0) rack-protection (1.5.0) rack rack-ssl (1.3.3) rack rack-test (0.6.2) rack (>= 1.0) - rails (3.1.12) - actionmailer (= 3.1.12) - actionpack (= 3.1.12) - activerecord (= 3.1.12) - activeresource (= 3.1.12) - activesupport (= 3.1.12) + rails (3.2.15) + actionmailer (= 3.2.15) + actionpack (= 3.2.15) + activerecord (= 3.2.15) + activeresource (= 3.2.15) + activesupport (= 3.2.15) bundler (~> 1.0) - railties (= 3.1.12) + railties (= 3.2.15) rails-i18n (0.7.3) i18n (~> 0.5) - railties (3.1.12) - actionpack (= 3.1.12) - activesupport (= 3.1.12) + railties (3.2.15) + actionpack (= 3.2.15) + activesupport (= 3.2.15) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) - thor (~> 0.14.6) + thor (>= 0.14.6, < 2.0) rake (0.9.2.2) rbx-require-relative (0.0.9) rdoc (3.12.2) @@ -214,12 +212,10 @@ GEM vpim (>= 0.360) ruby-ole (1.2.11.6) sass (3.2.10) - sass-rails (3.1.4) - actionpack (~> 3.1.0) - railties (~> 3.1.0) - sass (>= 3.1.4) - sprockets (~> 2.0.0) - tilt (~> 1.3.2) + sass-rails (3.2.6) + railties (~> 3.2.0) + sass (>= 3.1.10) + tilt (~> 1.3) simplecov (0.7.1) multi_json (~> 1.0) simplecov-html (~> 0.7.1) @@ -235,8 +231,9 @@ GEM spork-rails (3.2.1) rails (>= 3.0.0, < 3.3.0) spork (>= 1.0rc0) - sprockets (2.0.4) + sprockets (2.2.2) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.7) @@ -250,12 +247,12 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.14.6) - tilt (1.3.7) - treetop (1.4.12) + thor (0.18.1) + tilt (1.4.1) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.37) + tzinfo (0.3.38) uglifier (2.2.1) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) @@ -280,7 +277,7 @@ DEPENDENCIES bootstrap-sass capistrano charlock_holmes - coffee-rails (~> 3.1) + coffee-rails (~> 3.2.1) compass-rails coveralls debugger @@ -304,7 +301,7 @@ DEPENDENCIES nokogiri pg rack - rails (= 3.1.12) + rails (= 3.2.15) rails-i18n rake (= 0.9.2.2) rdoc @@ -314,12 +311,12 @@ DEPENDENCIES rspec-rails ruby-debug ruby-msg (~> 1.5.0) - sass-rails (= 3.1.4) + sass-rails (~> 3.2.3) spork-rails statistics2 (~> 0.54) syslog_protocol therubyracer - uglifier + uglifier (>= 1.0.3) unicode unidecode vpim |