Permalink
Browse files

Merge pull request #10 from ryanj/security-patch-CVE-2012-5664

updating Rails to 3.2.10 to patch SQL injection CVE-2012-5664
  • Loading branch information...
2 parents 0ea0fbe + df7ed7e commit 14e89334c2e2d795001e29273472c8e02c2ea5bb @BanzaiMan BanzaiMan committed Jan 5, 2013
Showing with 48 additions and 47 deletions.
  1. +1 −1 Gemfile
  2. +45 −44 Gemfile.lock
  3. +2 −2 public/index.html
View
@@ -1,6 +1,6 @@
source 'http://mirror1.prod.rhcloud.com/mirror/ruby/'
-gem 'rails', '3.2.6'
+gem 'rails', '3.2.10'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
View
@@ -1,105 +1,106 @@
GEM
remote: http://mirror1.prod.rhcloud.com/mirror/ruby/
specs:
- actionmailer (3.2.6)
- actionpack (= 3.2.6)
+ actionmailer (3.2.10)
+ actionpack (= 3.2.10)
mail (~> 2.4.4)
- actionpack (3.2.6)
- activemodel (= 3.2.6)
- activesupport (= 3.2.6)
+ actionpack (3.2.10)
+ activemodel (= 3.2.10)
+ activesupport (= 3.2.10)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- journey (~> 1.0.1)
+ journey (~> 1.0.4)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.3)
- activemodel (3.2.6)
- activesupport (= 3.2.6)
+ sprockets (~> 2.2.1)
+ activemodel (3.2.10)
+ activesupport (= 3.2.10)
builder (~> 3.0.0)
- activerecord (3.2.6)
- activemodel (= 3.2.6)
- activesupport (= 3.2.6)
+ activerecord (3.2.10)
+ activemodel (= 3.2.10)
+ activesupport (= 3.2.10)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.6)
- activemodel (= 3.2.6)
- activesupport (= 3.2.6)
- activesupport (3.2.6)
+ activeresource (3.2.10)
+ activemodel (= 3.2.10)
+ activesupport (= 3.2.10)
+ activesupport (3.2.10)
i18n (~> 0.6)
multi_json (~> 1.0)
arel (3.0.2)
- builder (3.0.0)
+ builder (3.0.4)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.3.3)
+ coffee-script-source (1.4.0)
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
hike (1.2.1)
- i18n (0.6.0)
+ i18n (0.6.1)
journey (1.0.4)
- jquery-rails (2.0.2)
- railties (>= 3.2.0, < 5.0)
- thor (~> 0.14)
- json (1.7.3)
+ jquery-rails (2.1.4)
+ railties (>= 3.0, < 5.0)
+ thor (>= 0.14, < 2.0)
+ json (1.7.6)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
- minitest (3.2.0)
- multi_json (1.3.6)
+ minitest (4.3.3)
+ multi_json (1.5.0)
mysql2 (0.3.11)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.6)
- actionmailer (= 3.2.6)
- actionpack (= 3.2.6)
- activerecord (= 3.2.6)
- activeresource (= 3.2.6)
- activesupport (= 3.2.6)
+ rails (3.2.10)
+ actionmailer (= 3.2.10)
+ actionpack (= 3.2.10)
+ activerecord (= 3.2.10)
+ activeresource (= 3.2.10)
+ activesupport (= 3.2.10)
bundler (~> 1.0)
- railties (= 3.2.6)
- railties (3.2.6)
- actionpack (= 3.2.6)
- activesupport (= 3.2.6)
+ railties (= 3.2.10)
+ railties (3.2.10)
+ actionpack (= 3.2.10)
+ activesupport (= 3.2.10)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (0.9.2.2)
+ rake (10.0.3)
rdoc (3.12)
json (~> 1.4)
- sass (3.1.20)
+ sass (3.2.4)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- sprockets (2.1.3)
+ sprockets (2.2.2)
hike (~> 1.2)
+ multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
thor (0.14.6)
tilt (1.3.3)
- treetop (1.4.10)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.33)
- uglifier (1.2.6)
+ tzinfo (0.3.35)
+ uglifier (1.3.0)
execjs (>= 0.3.0)
- multi_json (~> 1.3)
+ multi_json (~> 1.0, >= 1.0.2)
PLATFORMS
ruby
@@ -109,7 +110,7 @@ DEPENDENCIES
jquery-rails
minitest
mysql2
- rails (= 3.2.6)
+ rails (= 3.2.10)
sass-rails (~> 3.2.3)
sqlite3
thor (= 0.14.6)
View
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title>OpenShift - Rails 3.2</title>
+ <title>OpenShift - Rails 3.2.10</title>
<style>
html {
background: black;
@@ -121,7 +121,7 @@
<div class="brand-text"><strong>Open</strong>Shift</div>
</a>
<h1>
- OpenShift - Rails 3.2
+ OpenShift - Rails 3.2.10
</h1>
<p>
This application was created using <a href="https://github.com/openshift/rails-example">this OpenShift quickstart</a>.

0 comments on commit 14e8933

Please sign in to comment.