aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Bernloehr <Heiko.Bernloehr@FreeIT.de>2013-02-01 23:30:56 +0100
committerHeiko Bernloehr <Heiko.Bernloehr@FreeIT.de>2013-02-01 23:39:01 +0100
commit802847f9a7c0a21eb0d3f6a3377a12d0849d3b3b (patch)
tree5439516ae35ae3adb583a388d3f5b59e9ecd1378
parentb56653a4ef33063407abf13b323d53883457fc70 (diff)
downloadecs2-802847f9a7c0a21eb0d3f6a3377a12d0849d3b3b.tar.gz
ecs2-802847f9a7c0a21eb0d3f6a3377a12d0849d3b3b.zip
Updated rails to 2.3.16
This was needed because of "extremely critical security fixes".
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock44
-rw-r--r--config/environment.rb2
3 files changed, 25 insertions, 23 deletions
diff --git a/Gemfile b/Gemfile
index f1b180d..4e052f3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
source "http://rubygems.org"
-gem "rails", "2.3.14"
+gem "rails", "2.3.16"
gem "sqlite3"
gem "json", "1.5.3"
gem "jsonpretty"
diff --git a/Gemfile.lock b/Gemfile.lock
index cddb2db..0b7a87b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,33 +1,34 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (2.3.14)
- actionpack (= 2.3.14)
- actionpack (2.3.14)
- activesupport (= 2.3.14)
+ actionmailer (2.3.16)
+ actionpack (= 2.3.16)
+ actionpack (2.3.16)
+ activesupport (= 2.3.16)
rack (~> 1.1.0)
- activerecord (2.3.14)
- activesupport (= 2.3.14)
- activeresource (2.3.14)
- activesupport (= 2.3.14)
- activesupport (2.3.14)
+ activerecord (2.3.16)
+ activesupport (= 2.3.16)
+ activeresource (2.3.16)
+ activesupport (= 2.3.16)
+ activesupport (2.3.16)
columnize (0.3.6)
- haml (3.1.4)
+ haml (3.1.7)
i18n (0.3.7)
json (1.5.3)
jsonpretty (1.1.0)
linecache (0.46)
rbx-require-relative (> 0.0.4)
- rack (1.1.3)
- rails (2.3.14)
- actionmailer (= 2.3.14)
- actionpack (= 2.3.14)
- activerecord (= 2.3.14)
- activeresource (= 2.3.14)
- activesupport (= 2.3.14)
+ pg (0.14.1)
+ rack (1.1.5)
+ rails (2.3.16)
+ actionmailer (= 2.3.16)
+ actionpack (= 2.3.16)
+ activerecord (= 2.3.16)
+ activeresource (= 2.3.16)
+ activesupport (= 2.3.16)
rake (>= 0.8.3)
rake (0.9.2.2)
- rbx-require-relative (0.0.5)
+ rbx-require-relative (0.0.9)
rdoc (3.12)
json (~> 1.4)
ruby-debug (0.10.4)
@@ -35,9 +36,9 @@ GEM
ruby-debug-base (~> 0.10.4.0)
ruby-debug-base (0.10.4)
linecache (>= 0.3)
- simple-navigation (3.6.0)
+ simple-navigation (3.10.0)
activesupport (>= 2.3.2)
- sqlite3 (1.3.5)
+ sqlite3 (1.3.7)
PLATFORMS
ruby
@@ -47,7 +48,8 @@ DEPENDENCIES
i18n (= 0.3.7)
json (= 1.5.3)
jsonpretty
- rails (= 2.3.14)
+ pg
+ rails (= 2.3.16)
rake (~> 0.9.2.2)
rdoc (~> 3.12)
ruby-debug
diff --git a/config/environment.rb b/config/environment.rb
index 984cf22..fdb07fd 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -19,7 +19,7 @@
# Be sure to restart your server when you modify this file
# Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.16' unless defined? RAILS_GEM_VERSION
# Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot')