Skip to content
This repository has been archived by the owner on Jan 11, 2024. It is now read-only.

Commit

Permalink
Security Updates
Browse files Browse the repository at this point in the history 
Updates for security vulnerabilities.
Removes guard component not being used
  • Loading branch information
Wayne Graham committed Nov 20, 2014
1 parent dc3a1bc commit 944c921
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 82 deletions.
6 changes: 3 additions & 3 deletions Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

ruby "2.1.3"
ruby "2.1.5"

gem 'will_paginate', '~> 3.0'
gem 'rails', '~>3.2.13'
Expand Down Expand Up @@ -66,7 +66,7 @@ group :development, :test do
gem "factory_girl_rails", "~> 1.3.0"
gem "nyan-cat-formatter", "~> 0.0.3"
gem "guard"
gem "guard-coffeescript"
#gem "guard-coffeescript"
gem 'forgery', '0.3.12'
end

Expand All @@ -78,7 +78,7 @@ group :test do
gem 'database_cleaner'
gem 'minitest'
gem 'ruby-prof'
gem "cucumber-rails"
gem "cucumber-rails", :require => false
gem "jasmine"
gem 'jasmine-jquery-rails'
end
Expand Down
147 changes: 72 additions & 75 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (3.2.19)
actionpack (= 3.2.19)
actionmailer (3.2.21)
actionpack (= 3.2.21)
mail (~> 2.5.4)
actionpack (3.2.19)
activemodel (= 3.2.19)
activesupport (= 3.2.19)
actionpack (3.2.21)
activemodel (= 3.2.21)
activesupport (= 3.2.21)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.19)
activesupport (= 3.2.19)
activemodel (3.2.21)
activesupport (= 3.2.21)
builder (~> 3.0.0)
activerecord (3.2.19)
activemodel (= 3.2.19)
activesupport (= 3.2.19)
activerecord (3.2.21)
activemodel (= 3.2.21)
activesupport (= 3.2.21)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activerecord-import (0.5.0)
activerecord-import (0.6.0)
activerecord (>= 3.0)
activeresource (3.2.19)
activemodel (= 3.2.19)
activesupport (= 3.2.19)
activesupport (3.2.19)
activeresource (3.2.21)
activemodel (= 3.2.21)
activesupport (= 3.2.21)
activesupport (3.2.21)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
airbrake (3.1.17)
Expand All @@ -47,40 +47,40 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
celluloid (0.15.2)
timers (~> 1.1.0)
childprocess (0.5.3)
celluloid (0.16.0)
timers (~> 4.0.0)
childprocess (0.5.5)
ffi (~> 1.0, >= 1.0.11)
chunky_png (1.3.1)
chunky_png (1.3.3)
code_analyzer (0.4.5)
sexp_processor
coderay (1.1.0)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.7.0)
coffee-script-source (1.8.0)
colored (1.2)
compass (0.12.6)
compass (0.12.7)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.2.19)
compass-rails (1.0.3)
compass (>= 0.12.2, < 0.14)
compass-susy-plugin (0.9)
compass (>= 0.11.1)
cucumber (1.3.15)
cucumber (1.3.17)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
gherkin (~> 2.12)
multi_json (>= 1.7.5, < 2.0)
multi_test (>= 0.1.1)
cucumber-rails (1.4.1)
cucumber-rails (1.4.2)
capybara (>= 1.1.2, < 3)
cucumber (>= 1.3.8, < 2)
mime-types (~> 1.16)
mime-types (>= 1.16, < 3)
nokogiri (~> 1.5)
rails (>= 3, < 5)
dalli (1.0.5)
Expand All @@ -106,11 +106,10 @@ GEM
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
ffaker (1.8.1)
ffi (1.9.3)
figaro (0.7.0)
bundler (~> 1.0)
rails (>= 3, < 5)
foreman (0.74.0)
ffi (1.9.6)
figaro (1.0.0)
thor (~> 0.14)
foreman (0.75.0)
dotenv (~> 0.11.1)
thor (~> 0.19.1)
forgery (0.3.12)
Expand All @@ -119,36 +118,34 @@ GEM
fssm (0.2.10)
gherkin (2.12.2)
multi_json (~> 1.3)
guard (2.6.1)
guard (2.8.2)
formatador (>= 0.2.4)
listen (~> 2.7)
lumberjack (~> 1.0)
pry (>= 0.9.12)
thor (>= 0.18.1)
guard-coffeescript (1.4.0)
coffee-script (>= 2.2.0)
guard (>= 1.1.0)
hashie (2.1.2)
hashie (3.3.1)
hike (1.2.3)
i18n (0.6.9)
jasmine (2.0.2)
jasmine-core (~> 2.0.0)
hitimes (1.2.2)
i18n (0.6.11)
jasmine (2.1.0)
jasmine-core (~> 2.1.0)
phantomjs
rack (>= 1.2.1)
rake
jasmine-core (2.0.0)
jasmine-core (2.1.2)
jasmine-jquery-rails (2.0.3)
journey (1.0.4)
jquery-rails (3.1.1)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (4.2.1)
jquery-ui-rails (5.0.2)
railties (>= 3.2.16)
json (1.8.1)
jwt (1.0.0)
kgio (2.9.2)
language_list (1.0.0)
listen (2.7.9)
listen (2.8.0)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
Expand All @@ -164,8 +161,8 @@ GEM
multi_test (0.1.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
mysql2 (0.3.16)
newrelic_rpm (3.9.0.229)
mysql2 (0.3.17)
newrelic_rpm (3.9.7.266)
nokogiri (1.5.11)
nyan-cat-formatter (0.0.9)
oauth (0.4.7)
Expand All @@ -175,8 +172,8 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
omniauth (1.2.1)
hashie (>= 1.2, < 3)
omniauth (1.2.2)
hashie (>= 1.2, < 4)
rack (~> 1.0)
omniauth-browserid (0.0.1)
faraday
Expand All @@ -188,8 +185,8 @@ GEM
multi_json
omniauth (~> 1.0)
omniauth-oauth
omniauth-google-oauth2 (0.2.4)
omniauth (~> 1.0)
omniauth-google-oauth2 (0.2.6)
omniauth (> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-oauth (1.0.1)
oauth
Expand All @@ -203,7 +200,7 @@ GEM
pg (0.17.1)
phantomjs (1.9.7.1)
polyglot (0.3.5)
pry (0.10.0)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
Expand All @@ -214,14 +211,14 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.19)
actionmailer (= 3.2.19)
actionpack (= 3.2.19)
activerecord (= 3.2.19)
activeresource (= 3.2.19)
activesupport (= 3.2.19)
rails (3.2.21)
actionmailer (= 3.2.21)
actionpack (= 3.2.21)
activerecord (= 3.2.21)
activeresource (= 3.2.21)
activesupport (= 3.2.21)
bundler (~> 1.0)
railties (= 3.2.19)
railties (= 3.2.21)
rails_best_practices (1.15.4)
activesupport
awesome_print
Expand All @@ -232,9 +229,9 @@ GEM
json
require_all
ruby-progressbar
railties (3.2.19)
actionpack (= 3.2.19)
activesupport (= 3.2.19)
railties (3.2.21)
actionpack (= 3.2.21)
activesupport (= 3.2.21)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
Expand All @@ -260,55 +257,56 @@ GEM
activesupport (>= 3.0)
railties (>= 3.0)
rspec (~> 2.8.0)
ruby-prof (0.15.1)
ruby-progressbar (1.5.1)
ruby-prof (0.15.2)
ruby-progressbar (1.7.0)
rubyzip (1.1.6)
sass (3.2.19)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
selenium-webdriver (2.42.0)
childprocess (>= 0.5.0)
selenium-webdriver (2.44.0)
childprocess (~> 0.5)
multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0.4)
sexp_processor (4.4.3)
websocket (~> 1.0)
sexp_processor (4.4.4)
simplecov (0.8.2)
docile (~> 1.1.0)
multi_json
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
slop (3.5.0)
slop (3.6.0)
spork (1.0.0rc4)
sprockets (2.2.2)
sprockets (2.2.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.9)
sqlite3 (1.3.10)
thor (0.19.1)
tilt (1.4.1)
timers (1.1.0)
timers (4.0.1)
hitimes
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
turn (0.9.7)
ansi
minitest (~> 4)
tzinfo (0.3.39)
uglifier (2.5.1)
tzinfo (0.3.42)
uglifier (2.5.3)
execjs (>= 0.3.0)
json (>= 1.8.0)
unicorn (4.8.3)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
uuidtools (2.1.4)
uuidtools (2.1.5)
warden (1.2.3)
rack (>= 1.0)
websocket (1.0.7)
will_paginate (3.0.5)
websocket (1.2.1)
will_paginate (3.0.7)
xpath (0.1.4)
nokogiri (~> 1.3)

Expand Down Expand Up @@ -337,7 +335,6 @@ DEPENDENCIES
foreman
forgery (= 0.3.12)
guard
guard-coffeescript
jasmine
jasmine-jquery-rails
jquery-rails
Expand Down
4 changes: 0 additions & 4 deletions Guardfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ guard 'coffeescript', :output => 'public/javascripts/compiled' do
watch(/^app\/assets\/javascripts\/(.*).coffee/)
end

guard 'coffeescript', :output => 'spec/javascripts/compiled' do
watch(/^spec\/javascripts\/unit\/(.*).coffee/)
end

guard 'livereload' do
watch('^spec/javascripts/compiled/.+\.js$')
watch('^public/javascripts/compiled/.+\.js$')
Expand Down

0 comments on commit 944c921

Please sign in to comment.