summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-03-19 10:34:55 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-03-19 10:34:55 +0100
commit08bc995e52767823996c6734bb3e48166fb8a301 (patch)
tree14c42b2c500e45e9633c2c0ea2e4e1587d0a531b
parent7bbcde96fbd3661c9c0269477ca48f5fa8d73a1b (diff)
Upgrade to Rails 3.2.13
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock70
2 files changed, 36 insertions, 36 deletions
diff --git a/Gemfile b/Gemfile
index a69b2be..0084033 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ end
source 'http://rubygems.org'
-gem 'rails', '3.2.12'
+gem 'rails', '3.2.13'
gem 'bcrypt-ruby'
gem 'sqlite3'
gem 'mysql2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 555495a..1a120fe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,12 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.12)
- actionpack (= 3.2.12)
- mail (~> 2.4.4)
- actionpack (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
+ 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)
@@ -14,25 +14,25 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.12)
- activesupport (= 3.2.12)
+ activemodel (3.2.13)
+ activesupport (= 3.2.13)
builder (~> 3.0.0)
- activerecord (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
+ activerecord (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
- activesupport (3.2.12)
- 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)
acts_as_list (0.2.0)
activerecord (>= 3.0)
addressable (2.3.3)
arel (3.0.2)
- backup (3.1.2)
+ backup (3.1.3)
open4 (~> 1.3.0)
thor (>= 0.15.4, < 2)
bcrypt-ruby (3.0.1)
@@ -107,7 +107,7 @@ GEM
hirb (0.7.1)
http_accept_language (1.0.2)
http_parser.rb (0.5.3)
- i18n (0.6.4)
+ i18n (0.6.1)
inifile (2.0.2)
journey (1.0.4)
jquery-rails (2.2.1)
@@ -117,16 +117,16 @@ GEM
kgio (2.8.0)
macaddr (1.6.1)
systemu (~> 2.5.0)
- mail (2.4.4)
+ mail (2.5.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.21)
mini_magick (3.5.0)
subexec (~> 0.2.1)
- multi_json (1.6.1)
+ multi_json (1.7.1)
mysql2 (0.3.11)
- nokogiri (1.5.6)
+ nokogiri (1.5.7)
open4 (1.3.0)
polyglot (0.3.3)
private_pub (1.0.3)
@@ -140,17 +140,17 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.12)
- actionmailer (= 3.2.12)
- actionpack (= 3.2.12)
- activerecord (= 3.2.12)
- activeresource (= 3.2.12)
- activesupport (= 3.2.12)
+ 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.12)
- railties (3.2.12)
- actionpack (= 3.2.12)
- activesupport (= 3.2.12)
+ railties (= 3.2.13)
+ railties (3.2.13)
+ actionpack (= 3.2.13)
+ activesupport (= 3.2.13)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -183,16 +183,16 @@ GEM
railties (~> 3.0)
subexec (0.2.2)
systemu (2.5.2)
- thin (1.5.0)
+ thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.17.0)
- tilt (1.3.5)
+ tilt (1.3.6)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.36)
+ tzinfo (0.3.37)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
@@ -240,7 +240,7 @@ DEPENDENCIES
nokogiri
private_pub
quiet_assets
- rails (= 3.2.12)
+ rails (= 3.2.13)
sass-rails
sextant
simple_form (~> 2.1.0)