Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Upgrade for security and performance #83

Open
wants to merge 2 commits into from

2 participants

@p1nox
p1nox added some commits
@p1nox p1nox [#81] Security upgrade Rails
- Upgrading Rails version for security matters after reading the heroku blog post "Rails Security Vulnerability" (https://blog.heroku.com/archives/2013/1/11/rails_security_vulnerability/)
adde973
@p1nox p1nox [#81] Performance upgrade Rails
- Upgrading Ruby version to 1.9.3 and beautifying of gemfile for performance matters according to the article "Speeding Up Heroku Boot Time for Rails app" (http://webcache.googleusercontent.com/search?q=cache:5XICWnTYQiMJ:devign.me/speeding-up-heroku-boot-time-for-rails-app-beating-the-error-r10-boot-timeout/+&cd=7&hl=en&ct=clnk)
2c4a23d
@betelgeuse

The first commit is a duplicate for #81.

@p1nox

I linked this pull request to issue 81 beacause it was a upgrading feature, and it would be nice to upgrade to Ruby 1.9.3 and swaping jquery-rails to assets group.

What can I do to fix it? Create another pull request just with changes different to the rails version on the gemfile?

@betelgeuse

@p1nox #81 is also a pull request. The bigger problem here seems to be that the maintainers are not responsive.

@p1nox

Ok, I think that the solution here is to wait for maintainers decision, and sorry for the duplicated commit.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 9, 2013
  1. @p1nox

    [#81] Security upgrade Rails

    p1nox authored
    - Upgrading Rails version for security matters after reading the heroku blog post "Rails Security Vulnerability" (https://blog.heroku.com/archives/2013/1/11/rails_security_vulnerability/)
  2. @p1nox

    [#81] Performance upgrade Rails

    p1nox authored
    - Upgrading Ruby version to 1.9.3 and beautifying of gemfile for performance matters according to the article "Speeding Up Heroku Boot Time for Rails app" (http://webcache.googleusercontent.com/search?q=cache:5XICWnTYQiMJ:devign.me/speeding-up-heroku-boot-time-for-rails-app-beating-the-error-r10-boot-timeout/+&cd=7&hl=en&ct=clnk)
This page is out of date. Refresh to see the latest.
Showing with 46 additions and 44 deletions.
  1. +4 −3 Gemfile
  2. +42 −41 Gemfile.lock
View
7 Gemfile
@@ -1,24 +1,25 @@
source :rubygems
+ruby '1.9.3'
+
gem 'dynamic_form', '1.1.4'
gem 'flutie', '1.3.3'
gem 'bourbon', '2.1.0'
gem 'formtastic', '2.0.2'
gem 'htmldiff', '0.0.1'
gem 'pg', '0.13.2'
-gem 'rails', '3.2.6'
+gem 'rails', '3.2.11'
gem 'thin', '1.3.1'
gem 'yajl-ruby', '1.1.0', :require => 'yajl'
-gem "jquery-rails", "1.0.19"
group :assets do
gem 'sass-rails', "~> 3.2.5"
gem 'coffee-rails', "~> 3.2.1"
gem 'uglifier'
gem "yui-compressor"
+ gem "jquery-rails", "1.0.19"
end
-
group :development, :test do
gem 'foreman', '0.40.0'
gem 'launchy', '2.0.5'
View
83 Gemfile.lock
@@ -5,31 +5,31 @@ GEM
Platform (>= 0.4.0)
open4
Platform (0.4.0)
- actionmailer (3.2.6)
- actionpack (= 3.2.6)
+ actionmailer (3.2.11)
+ actionpack (= 3.2.11)
mail (~> 2.4.4)
- actionpack (3.2.6)
- activemodel (= 3.2.6)
- activesupport (= 3.2.6)
+ actionpack (3.2.11)
+ activemodel (= 3.2.11)
+ activesupport (= 3.2.11)
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.11)
+ activesupport (= 3.2.11)
builder (~> 3.0.0)
- activerecord (3.2.6)
- activemodel (= 3.2.6)
- activesupport (= 3.2.6)
+ activerecord (3.2.11)
+ activemodel (= 3.2.11)
+ activesupport (= 3.2.11)
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.11)
+ activemodel (= 3.2.11)
+ activesupport (= 3.2.11)
+ activesupport (3.2.11)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.7)
@@ -38,7 +38,7 @@ GEM
sass (>= 3.1)
bourne (1.1.1)
mocha (= 0.10.4)
- builder (3.0.0)
+ builder (3.0.4)
capybara (1.1.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@@ -93,12 +93,12 @@ GEM
json (>= 1.4.6)
hike (1.2.1)
htmldiff (0.0.1)
- i18n (0.6.0)
+ i18n (0.6.1)
journey (1.0.4)
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
- json (1.7.3)
+ json (1.7.6)
launchy (2.0.5)
addressable (~> 2.2.6)
libwebsocket (0.1.3)
@@ -108,38 +108,38 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
- mime-types (1.19)
+ mime-types (1.20.1)
mocha (0.10.4)
metaclass (~> 0.0.1)
- multi_json (1.3.6)
+ multi_json (1.5.0)
nokogiri (1.5.4)
open4 (1.3.0)
pg (0.13.2)
polyglot (0.3.3)
- rack (1.4.1)
+ rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
- rack-ssl (1.3.2)
+ rack-ssl (1.3.3)
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.11)
+ actionmailer (= 3.2.11)
+ actionpack (= 3.2.11)
+ activerecord (= 3.2.11)
+ activeresource (= 3.2.11)
+ activesupport (= 3.2.11)
bundler (~> 1.0)
- railties (= 3.2.6)
- railties (3.2.6)
- actionpack (= 3.2.6)
- activesupport (= 3.2.6)
+ railties (= 3.2.11)
+ railties (3.2.11)
+ actionpack (= 3.2.11)
+ activesupport (= 3.2.11)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (0.9.2.2)
- rdoc (3.12)
+ rake (10.0.3)
+ rdoc (3.12.1)
json (~> 1.4)
rspec (2.8.0)
rspec-core (~> 2.8.0)
@@ -167,8 +167,9 @@ GEM
rubyzip
shoulda-matchers (1.0.0)
spork (0.9.0)
- sprockets (2.1.3)
+ sprockets (2.2.2)
hike (~> 1.2)
+ multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
term-ansicolor (1.0.7)
@@ -176,13 +177,13 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
- thor (0.15.3)
+ thor (0.17.0)
tilt (1.3.3)
timecop (0.3.5)
- treetop (1.4.10)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.33)
+ tzinfo (0.3.35)
uglifier (1.2.4)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
@@ -212,7 +213,7 @@ DEPENDENCIES
jquery-rails (= 1.0.19)
launchy (= 2.0.5)
pg (= 0.13.2)
- rails (= 3.2.6)
+ rails (= 3.2.11)
rspec-rails (= 2.8.1)
sass-rails (~> 3.2.5)
shoulda-matchers (= 1.0.0)
Something went wrong with that request. Please try again.