Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade for security and performance #83

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Gemfile
Original file line number Original file line Diff line number Diff line change
@@ -1,24 +1,25 @@
source :rubygems source :rubygems


ruby '1.9.3'

gem 'dynamic_form', '1.1.4' gem 'dynamic_form', '1.1.4'
gem 'flutie', '1.3.3' gem 'flutie', '1.3.3'
gem 'bourbon', '2.1.0' gem 'bourbon', '2.1.0'
gem 'formtastic', '2.0.2' gem 'formtastic', '2.0.2'
gem 'htmldiff', '0.0.1' gem 'htmldiff', '0.0.1'
gem 'pg', '0.13.2' gem 'pg', '0.13.2'
gem 'rails', '3.2.6' gem 'rails', '3.2.11'
gem 'thin', '1.3.1' gem 'thin', '1.3.1'
gem 'yajl-ruby', '1.1.0', :require => 'yajl' gem 'yajl-ruby', '1.1.0', :require => 'yajl'
gem "jquery-rails", "1.0.19"


group :assets do group :assets do
gem 'sass-rails', "~> 3.2.5" gem 'sass-rails', "~> 3.2.5"
gem 'coffee-rails', "~> 3.2.1" gem 'coffee-rails', "~> 3.2.1"
gem 'uglifier' gem 'uglifier'
gem "yui-compressor" gem "yui-compressor"
gem "jquery-rails", "1.0.19"
end end



group :development, :test do group :development, :test do
gem 'foreman', '0.40.0' gem 'foreman', '0.40.0'
gem 'launchy', '2.0.5' gem 'launchy', '2.0.5'
Expand Down
83 changes: 42 additions & 41 deletions Gemfile.lock
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -5,31 +5,31 @@ GEM
Platform (>= 0.4.0) Platform (>= 0.4.0)
open4 open4
Platform (0.4.0) Platform (0.4.0)
actionmailer (3.2.6) actionmailer (3.2.11)
actionpack (= 3.2.6) actionpack (= 3.2.11)
mail (~> 2.4.4) mail (~> 2.4.4)
actionpack (3.2.6) actionpack (3.2.11)
activemodel (= 3.2.6) activemodel (= 3.2.11)
activesupport (= 3.2.6) activesupport (= 3.2.11)
builder (~> 3.0.0) builder (~> 3.0.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
journey (~> 1.0.1) journey (~> 1.0.4)
rack (~> 1.4.0) rack (~> 1.4.0)
rack-cache (~> 1.2) rack-cache (~> 1.2)
rack-test (~> 0.6.1) rack-test (~> 0.6.1)
sprockets (~> 2.1.3) sprockets (~> 2.2.1)
activemodel (3.2.6) activemodel (3.2.11)
activesupport (= 3.2.6) activesupport (= 3.2.11)
builder (~> 3.0.0) builder (~> 3.0.0)
activerecord (3.2.6) activerecord (3.2.11)
activemodel (= 3.2.6) activemodel (= 3.2.11)
activesupport (= 3.2.6) activesupport (= 3.2.11)
arel (~> 3.0.2) arel (~> 3.0.2)
tzinfo (~> 0.3.29) tzinfo (~> 0.3.29)
activeresource (3.2.6) activeresource (3.2.11)
activemodel (= 3.2.6) activemodel (= 3.2.11)
activesupport (= 3.2.6) activesupport (= 3.2.11)
activesupport (3.2.6) activesupport (3.2.11)
i18n (~> 0.6) i18n (~> 0.6)
multi_json (~> 1.0) multi_json (~> 1.0)
addressable (2.2.7) addressable (2.2.7)
Expand All @@ -38,7 +38,7 @@ GEM
sass (>= 3.1) sass (>= 3.1)
bourne (1.1.1) bourne (1.1.1)
mocha (= 0.10.4) mocha (= 0.10.4)
builder (3.0.0) builder (3.0.4)
capybara (1.1.2) capybara (1.1.2)
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
Expand Down Expand Up @@ -93,12 +93,12 @@ GEM
json (>= 1.4.6) json (>= 1.4.6)
hike (1.2.1) hike (1.2.1)
htmldiff (0.0.1) htmldiff (0.0.1)
i18n (0.6.0) i18n (0.6.1)
journey (1.0.4) journey (1.0.4)
jquery-rails (1.0.19) jquery-rails (1.0.19)
railties (~> 3.0) railties (~> 3.0)
thor (~> 0.14) thor (~> 0.14)
json (1.7.3) json (1.7.6)
launchy (2.0.5) launchy (2.0.5)
addressable (~> 2.2.6) addressable (~> 2.2.6)
libwebsocket (0.1.3) libwebsocket (0.1.3)
Expand All @@ -108,38 +108,38 @@ GEM
mime-types (~> 1.16) mime-types (~> 1.16)
treetop (~> 1.4.8) treetop (~> 1.4.8)
metaclass (0.0.1) metaclass (0.0.1)
mime-types (1.19) mime-types (1.20.1)
mocha (0.10.4) mocha (0.10.4)
metaclass (~> 0.0.1) metaclass (~> 0.0.1)
multi_json (1.3.6) multi_json (1.5.0)
nokogiri (1.5.4) nokogiri (1.5.4)
open4 (1.3.0) open4 (1.3.0)
pg (0.13.2) pg (0.13.2)
polyglot (0.3.3) polyglot (0.3.3)
rack (1.4.1) rack (1.4.5)
rack-cache (1.2) rack-cache (1.2)
rack (>= 0.4) rack (>= 0.4)
rack-ssl (1.3.2) rack-ssl (1.3.3)
rack rack
rack-test (0.6.1) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (3.2.6) rails (3.2.11)
actionmailer (= 3.2.6) actionmailer (= 3.2.11)
actionpack (= 3.2.6) actionpack (= 3.2.11)
activerecord (= 3.2.6) activerecord (= 3.2.11)
activeresource (= 3.2.6) activeresource (= 3.2.11)
activesupport (= 3.2.6) activesupport (= 3.2.11)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.2.6) railties (= 3.2.11)
railties (3.2.6) railties (3.2.11)
actionpack (= 3.2.6) actionpack (= 3.2.11)
activesupport (= 3.2.6) activesupport (= 3.2.11)
rack-ssl (~> 1.3.2) rack-ssl (~> 1.3.2)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0) thor (>= 0.14.6, < 2.0)
rake (0.9.2.2) rake (10.0.3)
rdoc (3.12) rdoc (3.12.1)
json (~> 1.4) json (~> 1.4)
rspec (2.8.0) rspec (2.8.0)
rspec-core (~> 2.8.0) rspec-core (~> 2.8.0)
Expand Down Expand Up @@ -167,22 +167,23 @@ GEM
rubyzip rubyzip
shoulda-matchers (1.0.0) shoulda-matchers (1.0.0)
spork (0.9.0) spork (0.9.0)
sprockets (2.1.3) sprockets (2.2.2)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
term-ansicolor (1.0.7) term-ansicolor (1.0.7)
thin (1.3.1) thin (1.3.1)
daemons (>= 1.0.9) daemons (>= 1.0.9)
eventmachine (>= 0.12.6) eventmachine (>= 0.12.6)
rack (>= 1.0.0) rack (>= 1.0.0)
thor (0.15.3) thor (0.17.0)
tilt (1.3.3) tilt (1.3.3)
timecop (0.3.5) timecop (0.3.5)
treetop (1.4.10) treetop (1.4.12)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
tzinfo (0.3.33) tzinfo (0.3.35)
uglifier (1.2.4) uglifier (1.2.4)
execjs (>= 0.3.0) execjs (>= 0.3.0)
multi_json (>= 1.0.2) multi_json (>= 1.0.2)
Expand Down Expand Up @@ -212,7 +213,7 @@ DEPENDENCIES
jquery-rails (= 1.0.19) jquery-rails (= 1.0.19)
launchy (= 2.0.5) launchy (= 2.0.5)
pg (= 0.13.2) pg (= 0.13.2)
rails (= 3.2.6) rails (= 3.2.11)
rspec-rails (= 2.8.1) rspec-rails (= 2.8.1)
sass-rails (~> 3.2.5) sass-rails (~> 3.2.5)
shoulda-matchers (= 1.0.0) shoulda-matchers (= 1.0.0)
Expand Down