diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2017-08-01 17:34:14 -0400 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2017-08-01 17:34:14 -0400 |
| commit | feb1ddae021c38174f9c22bbd1298c8b73431b45 (patch) | |
| tree | 09a38695596cf80dc362dd4d93cf94d6f7415e7b /Gemfile | |
| parent | 3540e60c385286f3517ff56270b31a91ed3024a3 (diff) | |
| parent | f9a43f28c087f8ffd35ff7c33a60c938b60f2be2 (diff) | |
| download | rails-feb1ddae021c38174f9c22bbd1298c8b73431b45.tar.gz rails-feb1ddae021c38174f9c22bbd1298c8b73431b45.tar.bz2 rails-feb1ddae021c38174f9c22bbd1298c8b73431b45.zip | |
Merge remote-tracking branch 'origin/master' into unlock-minitest
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -22,7 +22,7 @@ gem "capybara", "~> 2.13" gem "rack-cache", "~> 1.2" gem "jquery-rails" gem "coffee-rails" -gem "sass-rails" +gem "sass-rails", github: "rails/sass-rails", branch: "5-0-stable" gem "turbolinks", "~> 5" # require: false so bcrypt is loaded only when has_secure_password is used. @@ -39,6 +39,8 @@ gem "json", ">= 2.0.0" gem "rubocop", ">= 0.47", require: false +gem "rb-inotify", github: "matthewd/rb-inotify", branch: "close-handling", require: false + group :doc do gem "sdoc", "> 1.0.0.rc1", "< 2.0" gem "redcarpet", "~> 3.2.3", platforms: :ruby @@ -54,6 +56,9 @@ gem "libxml-ruby", platforms: :ruby # Action View. For testing Erubis handler deprecation. gem "erubis", "~> 2.7.0", require: false +# for railties app_generator_test +gem "bootsnap", ">= 1.1.0", require: false + # Active Job. group :job do gem "resque", require: false |