From 8d330e74ef42db9a321e152a370e57bfe1e0fdda Mon Sep 17 00:00:00 2001 From: Andrew Tomaka Date: Thu, 30 May 2013 21:40:18 -0400 Subject: [PATCH] Update Rails --- Gemfile | 2 +- Gemfile.lock | 103 ++++++++++++++++++++++++++------------------------- 2 files changed, 53 insertions(+), 52 deletions(-) diff --git a/Gemfile b/Gemfile index ebfa1bd..870d520 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.11' +gem 'rails', '3.2.13' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' diff --git a/Gemfile.lock b/Gemfile.lock index 7cfda63..2bd1548 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/atomaka/devise-kerberos-authenticatable.git - revision: a1ec781b8e982d37c31da6834b124663d377954d + revision: b08938a66e1e1688bf3b15c2794645fe8b487eac specs: devise-kerberos-authenticatable (0.1.0) devise (~> 2.2.3) @@ -9,53 +9,54 @@ GIT 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.13) + actionpack (= 3.2.13) + mail (~> 2.5.3) + actionpack (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) 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.13) + activesupport (= 3.2.13) builder (~> 3.0.0) - activerecord (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) + activerecord (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) 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.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) + activesupport (3.2.13) + i18n (= 0.6.1) multi_json (~> 1.0) arel (3.0.2) bcrypt-ruby (3.0.1) - better_errors (0.8.0) + better_errors (0.9.0) coderay (>= 1.0.0) erubis (>= 2.6.6) binding_of_caller (0.7.1) debug_inspector (>= 0.0.1) - brakeman (1.9.5) + brakeman (2.0.0) erubis (~> 2.6) fastercsv (~> 1.5) haml (>= 3.0, < 5.0) - highline (~> 1.6) + highline (~> 1.6.19) multi_json (~> 1.2) - ruby2ruby (= 2.0.3) + ruby2ruby (~> 2.0.5) ruby_parser (~> 3.1.1) sass (~> 3.0) slim (~> 1.3.6) terminal-table (~> 1.4) builder (3.0.4) - cancan (1.6.9) + callsite (0.0.11) + cancan (1.6.10) coderay (1.0.9) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -67,7 +68,7 @@ GEM commonjs (0.2.6) daemons (1.1.9) debug_inspector (0.0.2) - devise (2.2.3) + devise (2.2.4) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) railties (~> 3.1) @@ -79,32 +80,32 @@ GEM execjs (1.4.0) multi_json (~> 1.0) fastercsv (1.5.5) - haml (4.0.2) + haml (4.0.3) tilt - highline (1.6.18) + highline (1.6.19) hike (1.2.2) - i18n (0.6.4) + i18n (0.6.1) journey (1.0.4) - jquery-rails (2.2.1) + jquery-rails (3.0.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.7.7) + json (1.8.0) less (2.3.2) commonjs (~> 0.2.6) less-rails (2.3.3) actionpack (>= 3.1) less (~> 2.3.1) libv8 (3.3.10.4) - mail (2.4.4) - i18n (>= 0.4.0) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) meta_programming (0.2.2) - meta_request (0.2.3) + meta_request (0.2.6) + callsite rack-contrib railties mime-types (1.23) - multi_json (1.7.2) + multi_json (1.7.4) orm_adapter (0.4.0) polyglot (0.3.3) rack (1.4.5) @@ -118,19 +119,19 @@ GEM rack rack-test (0.6.2) 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.13) + actionmailer (= 3.2.13) + actionpack (= 3.2.13) + activerecord (= 3.2.13) + activeresource (= 3.2.13) + activesupport (= 3.2.13) bundler (~> 1.0) - railties (= 3.2.11) + railties (= 3.2.13) rails-footnotes (3.7.9) rails (>= 3.0.0) - railties (3.2.11) - actionpack (= 3.2.11) - activesupport (= 3.2.11) + railties (3.2.13) + actionpack (= 3.2.13) + activesupport (= 3.2.13) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -138,27 +139,27 @@ GEM rake (10.0.4) rdoc (3.12.2) json (~> 1.4) - ruby2ruby (2.0.3) + ruby2ruby (2.0.5) ruby_parser (~> 3.1) sexp_processor (~> 4.0) ruby_parser (3.1.3) sexp_processor (~> 4.1) - sass (3.2.7) + sass (3.2.9) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) sexp_processor (4.2.1) - slim (1.3.8) + slim (1.3.9) temple (~> 0.6.3) - tilt (~> 1.3.3) + tilt (~> 1.3, >= 1.3.3) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.7) - temple (0.6.4) + temple (0.6.5) terminal-table (1.4.5) therubyracer (0.10.2) libv8 (~> 3.3.10) @@ -167,7 +168,7 @@ GEM eventmachine (>= 0.12.6) rack (>= 1.0.0) thor (0.18.1) - tilt (1.3.7) + tilt (1.4.1) timfel-krb5-auth (0.8) treetop (1.4.12) polyglot @@ -177,7 +178,7 @@ GEM execjs railties (>= 3.1) tzinfo (0.3.37) - uglifier (2.0.1) + uglifier (2.1.1) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) warden (1.2.1) @@ -199,7 +200,7 @@ DEPENDENCIES less-rails meta_request rack-mini-profiler - rails (= 3.2.11) + rails (= 3.2.13) rails-footnotes sass-rails (~> 3.2.3) sqlite3