Merge branch 'master' of https://github.com/OWASP/railsgoat into rubocop-clean

This commit is contained in:
Joseph Mastey
2017-12-06 17:15:56 -06:00
2 changed files with 3 additions and 6 deletions
+3 -4
View File
@@ -13,9 +13,8 @@ gem "ruby-prof"
# Bundle edge Rails instead: # Bundle edge Rails instead:
# gem 'rails', git: 'https://github.com/rails/rails' # gem 'rails', git: 'https://github.com/rails/rails'
gem "crack", "0.3.2" gem 'sqlite3'
gem "foreman" gem 'foreman'
gem "sqlite3"
# Pry for Rails, not in dev group in case running via prod/staging @ a training # Pry for Rails, not in dev group in case running via prod/staging @ a training
gem "pry-rails" gem "pry-rails"
@@ -68,7 +67,7 @@ gem "jquery-rails"
gem "bcrypt" gem "bcrypt"
# Use unicorn as the app server # Use unicorn as the app server
gem "unicorn" gem "unicorn"
# Pow related gem # Pow related gem
gem "powder" gem "powder"
-2
View File
@@ -82,7 +82,6 @@ GEM
coffee-script-source (1.12.2) coffee-script-source (1.12.2)
concurrent-ruby (1.0.5) concurrent-ruby (1.0.5)
contracts (0.16.0) contracts (0.16.0)
crack (0.3.2)
crass (1.0.3) crass (1.0.3)
cucumber (3.1.0) cucumber (3.1.0)
builder (>= 2.1.2) builder (>= 2.1.2)
@@ -336,7 +335,6 @@ DEPENDENCIES
bundler-audit bundler-audit
capybara capybara
coffee-rails coffee-rails
crack (= 0.3.2)
database_cleaner database_cleaner
execjs execjs
foreman foreman