summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-02-13 14:14:57 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-02-13 14:14:57 +0100
commit24e085ddcc30b8d6acec7dde8b165e105da5f004 (patch)
treeb1a6637ada753359fe4cd4f66a4dfe6f1d9e0d87
parentd216accd6f00ec90e19f3171440ae7c5d7cdb53a (diff)
Updated Rails to 3.2.12
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock59
2 files changed, 31 insertions, 30 deletions
diff --git a/Gemfile b/Gemfile
index c90adb5..ca49e69 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '3.2.11'
+gem 'rails', '3.2.12'
gem 'bcrypt-ruby'
gem 'sqlite3'
gem 'mysql2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6f4888b..d8531cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,31 +10,31 @@ GIT
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.11)
- actionpack (= 3.2.11)
+ actionmailer (3.2.12)
+ actionpack (= 3.2.12)
mail (~> 2.4.4)
- actionpack (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ actionpack (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
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.12)
+ activesupport (= 3.2.12)
builder (~> 3.0.0)
- activerecord (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ activerecord (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
- activesupport (3.2.11)
+ activeresource (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
+ activesupport (3.2.12)
i18n (~> 0.6)
multi_json (~> 1.0)
acts_as_list (0.1.9)
@@ -75,7 +75,7 @@ GEM
dalli (2.6.2)
delayed_job (3.0.5)
activesupport (~> 3.0)
- delayed_job_active_record (0.4.0)
+ delayed_job_active_record (0.4.1)
activerecord (>= 2.1.0, < 4)
delayed_job (~> 3.0)
erubis (2.7.0)
@@ -88,7 +88,8 @@ GEM
factory_girl (~> 4.2.0)
railties (>= 3.0.0)
fssm (0.2.10)
- haml (3.1.7)
+ haml (4.0.0)
+ tilt
hike (1.2.1)
hirb (0.7.1)
http_accept_language (1.0.2)
@@ -109,7 +110,7 @@ GEM
mime-types (1.21)
mini_magick (3.4)
subexec (~> 0.2.1)
- multi_json (1.5.1)
+ multi_json (1.6.0)
mysql2 (0.3.11)
nokogiri (1.5.6)
open4 (1.3.0)
@@ -123,17 +124,17 @@ 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.12)
+ actionmailer (= 3.2.12)
+ actionpack (= 3.2.12)
+ activerecord (= 3.2.12)
+ activeresource (= 3.2.12)
+ activesupport (= 3.2.12)
bundler (~> 1.0)
- railties (= 3.2.11)
- railties (3.2.11)
- actionpack (= 3.2.11)
- activesupport (= 3.2.11)
+ railties (= 3.2.12)
+ railties (3.2.12)
+ actionpack (= 3.2.12)
+ activesupport (= 3.2.12)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -217,7 +218,7 @@ DEPENDENCIES
mysql2
nokogiri
quiet_assets
- rails (= 3.2.11)
+ rails (= 3.2.12)
sass-rails
sextant
simple_form!