Skip to content

Commit

Permalink
Security Update on 2016-01-19
Browse files Browse the repository at this point in the history
  • Loading branch information
deppbot committed Jan 18, 2016
1 parent 3ac1284 commit 2ac7f1f
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 55 deletions.
9 changes: 6 additions & 3 deletions Gemfile
Expand Up @@ -11,13 +11,13 @@ gem 'htmlentities'
gem 'lyriki'
gem 'neat'
gem 'newrelic_rpm', '>= 3.5.3.25'
gem 'nokogiri'
gem 'nokogiri', '>= 1.6.7.1'
gem 'pg'
gem 'rails', '~> 4.2.1'
gem 'rails', '>= 4.2.2'
gem 'requirejs-rails'
gem 'sass-rails', '~> 4.0.3' # http://stackoverflow.com/a/22395250/303896
gem 'skylight'
gem 'uglifier'
gem 'uglifier', '>= 2.7.2'

group :production, :staging do
gem 'rails_log_stdout', github: 'heroku/rails_log_stdout' # for heroku
Expand Down Expand Up @@ -53,3 +53,6 @@ group :test do
gem 'vcr'
gem 'webmock'
end

gem 'rack', '>= 1.6.2'
gem 'rest-client', '>= 1.8.0'
114 changes: 62 additions & 52 deletions Gemfile.lock
Expand Up @@ -13,36 +13,36 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.1)
actionpack (= 4.2.1)
actionview (= 4.2.1)
activejob (= 4.2.1)
actionmailer (4.2.5)
actionpack (= 4.2.5)
actionview (= 4.2.5)
activejob (= 4.2.5)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.1)
actionview (= 4.2.1)
activesupport (= 4.2.1)
actionpack (4.2.5)
actionview (= 4.2.5)
activesupport (= 4.2.5)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.1)
activesupport (= 4.2.1)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.5)
activesupport (= 4.2.5)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
activejob (4.2.1)
activesupport (= 4.2.1)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.5)
activesupport (= 4.2.5)
globalid (>= 0.3.0)
activemodel (4.2.1)
activesupport (= 4.2.1)
activemodel (4.2.5)
activesupport (= 4.2.5)
builder (~> 3.1)
activerecord (4.2.1)
activemodel (= 4.2.1)
activesupport (= 4.2.1)
activerecord (4.2.5)
activemodel (= 4.2.5)
activesupport (= 4.2.5)
arel (~> 6.0)
activesupport (4.2.1)
activesupport (4.2.5)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
Expand All @@ -52,7 +52,7 @@ GEM
airbrake (4.1.0)
builder
multi_json
arel (6.0.0)
arel (6.0.3)
awesome_print (1.2.0)
better_errors (2.0.0)
coderay (>= 1.0.0)
Expand Down Expand Up @@ -105,8 +105,10 @@ GEM
debug_inspector (0.0.2)
diff-lcs (1.2.5)
docile (1.1.5)
domain_name (0.5.25)
unf (>= 0.0.5, < 1.0.0)
erubis (2.7.0)
execjs (2.2.2)
execjs (2.6.0)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.5.0)
Expand All @@ -118,7 +120,7 @@ GEM
fuubar (2.0.0)
rspec (~> 3.0)
ruby-progressbar (~> 1.4)
globalid (0.3.3)
globalid (0.3.6)
activesupport (>= 4.1.0)
google-search (1.0.3)
json
Expand All @@ -142,17 +144,19 @@ GEM
hike (1.2.3)
hitimes (1.2.2)
htmlentities (4.3.2)
http-cookie (1.0.2)
domain_name (~> 0.5)
httparty (0.13.3)
json (~> 1.8)
multi_xml (>= 0.5.2)
i18n (0.7.0)
json (1.8.2)
json (1.8.3)
kgio (2.9.2)
listen (2.8.4)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
loofah (2.0.1)
loofah (2.0.3)
nokogiri (>= 1.5.9)
lumberjack (1.0.9)
lyriki (0.0.1)
Expand All @@ -161,41 +165,41 @@ GEM
mail (2.6.3)
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (2.4.3)
mini_portile (0.6.2)
minitest (5.5.1)
multi_json (1.11.0)
mime-types (2.99)
mini_portile2 (2.0.0)
minitest (5.8.3)
multi_json (1.11.2)
multi_xml (0.5.5)
neat (1.5.1)
bourbon (>= 3.1)
sass (~> 3.2.19)
nenv (0.1.1)
netrc (0.8.0)
netrc (0.11.0)
newrelic_rpm (3.9.7.266)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
nokogiri (1.6.7.1)
mini_portile2 (~> 2.0.0.rc2)
pg (0.17.1)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
rack (1.6.0)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.1)
actionmailer (= 4.2.1)
actionpack (= 4.2.1)
actionview (= 4.2.1)
activejob (= 4.2.1)
activemodel (= 4.2.1)
activerecord (= 4.2.1)
activesupport (= 4.2.1)
rails (4.2.5)
actionmailer (= 4.2.5)
actionpack (= 4.2.5)
actionview (= 4.2.5)
activejob (= 4.2.5)
activemodel (= 4.2.5)
activerecord (= 4.2.5)
activesupport (= 4.2.5)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.1)
railties (= 4.2.5)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.6)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
Expand All @@ -206,19 +210,20 @@ GEM
rails_stdout_logging
rails_serve_static_assets (0.0.2)
rails_stdout_logging (0.0.3)
railties (4.2.1)
actionpack (= 4.2.1)
activesupport (= 4.2.1)
railties (4.2.5)
actionpack (= 4.2.5)
activesupport (= 4.2.5)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
rake (10.4.2)
rake (10.5.0)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
requirejs-rails (0.9.5)
railties (>= 3.1.1)
rest-client (1.7.2)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rspec (3.1.0)
Expand Down Expand Up @@ -277,7 +282,7 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.4)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
Expand All @@ -293,9 +298,12 @@ GEM
tins (1.3.3)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.5.3)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.1)
unicorn (4.8.3)
kgio (~> 2.6)
rack
Expand Down Expand Up @@ -334,19 +342,21 @@ DEPENDENCIES
lyriki
neat
newrelic_rpm (>= 3.5.3.25)
nokogiri
nokogiri (>= 1.6.7.1)
pg
rails (~> 4.2.1)
rack (>= 1.6.2)
rails (>= 4.2.2)
rails3_serve_static_assets!
rails_12factor
rails_log_stdout!
requirejs-rails
rest-client (>= 1.8.0)
rspec-activemodel-mocks
rspec-rails (~> 3.1)
sass-rails (~> 4.0.3)
shoulda-matchers
skylight
uglifier
uglifier (>= 2.7.2)
unicorn
vcr
webmock

0 comments on commit 2ac7f1f

Please sign in to comment.