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

Update gems to fix hakiri security issue #3

Merged
merged 1 commit into from
Jun 13, 2016
Merged
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
5 changes: 1 addition & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ gem 'bcrypt', '~> 3.1.7'
# gem 'unicorn'

# Use puma as the app server
gem 'puma', group: :production
gem 'puma'

# Use Capistrano for deployment
gem 'capistrano', group: :development
Expand All @@ -44,9 +44,6 @@ gem 'capistrano3-puma', group: :development
# Use brakeman
gem 'brakeman', group: :development

# Use passenger
gem 'passenger', group: :development

# User quiet_assets on development
gem 'quiet_assets', group: :development

Expand Down
67 changes: 23 additions & 44 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,27 +36,23 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
airbrussh (1.0.2)
sshkit (>= 1.6.1, != 1.7.0)
arel (6.0.3)
bcrypt (3.1.11)
brakeman (3.2.1)
erubis (~> 2.6)
haml (>= 3.0, < 5.0)
highline (>= 1.6.20, < 2.0)
ruby2ruby (~> 2.3.0)
ruby_parser (~> 3.8.1)
safe_yaml (>= 1.0)
sass (~> 3.0)
slim (>= 1.3.6, < 4.0)
terminal-table (~> 1.4)
brakeman (3.3.2)
builder (3.2.2)
capistrano (3.4.0)
capistrano (3.5.0)
airbrussh (>= 1.0.0)
capistrano-harrow
i18n
rake (>= 10.0.0)
sshkit (~> 1.3)
sshkit (>= 1.9.0)
capistrano-bundler (1.1.4)
capistrano (~> 3.1)
sshkit (~> 1.2)
capistrano-rails (1.1.6)
capistrano-harrow (0.5.1)
capistrano-rails (1.1.7)
capistrano (~> 3.1)
capistrano-bundler (~> 1.1)
capistrano3-puma (1.2.1)
Expand All @@ -70,14 +66,11 @@ GEM
execjs
coffee-script-source (1.10.0)
erubis (2.7.0)
execjs (2.6.0)
execjs (2.7.0)
figaro (1.1.1)
thor (~> 0.14)
globalid (0.3.6)
activesupport (>= 4.1.0)
haml (4.0.7)
tilt
highline (1.7.8)
hike (1.2.3)
i18n (0.7.0)
jquery-rails (4.1.1)
Expand All @@ -89,21 +82,20 @@ GEM
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
mime-types (3.0)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0221)
mini_portile2 (2.0.0)
minitest (5.8.4)
multi_json (1.11.2)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.9.0)
multi_json (1.12.1)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (3.1.1)
newrelic_rpm (3.15.1.316)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
passenger (5.0.26)
rack
rake (>= 0.8.1)
newrelic_rpm (3.15.2.317)
nokogiri (1.6.8)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
pkg-config (1.1.7)
puma (3.4.0)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
Expand Down Expand Up @@ -134,15 +126,9 @@ GEM
activesupport (= 4.2.6)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (11.1.1)
rake (11.2.2)
rdoc (4.2.2)
json (~> 1.4)
ruby2ruby (2.3.0)
ruby_parser (~> 3.1)
sexp_processor (~> 4.0)
ruby_parser (3.8.1)
sexp_processor (~> 4.1)
safe_yaml (1.0.4)
sass (3.2.19)
sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0)
Expand All @@ -152,11 +138,7 @@ GEM
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
sexp_processor (4.7.0)
slim (3.0.6)
temple (~> 0.7.3)
tilt (>= 1.3.3, < 2.1)
spring (1.6.4)
spring (1.7.1)
sprockets (2.12.4)
hike (~> 1.2)
multi_json (~> 1.0)
Expand All @@ -166,11 +148,9 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sshkit (1.9.0)
sshkit (1.10.0)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
temple (0.7.6)
terminal-table (1.5.2)
thor (0.19.1)
thread_safe (0.3.5)
tilt (1.4.1)
Expand All @@ -195,7 +175,6 @@ DEPENDENCIES
figaro
jquery-rails
newrelic_rpm
passenger
puma
quiet_assets
rails (~> 4.2.6)
Expand Down