diff options
| author | Marius Bakke <[email protected]> | 2020-05-26 22:34:46 +0200 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2020-05-26 22:34:46 +0200 |
| commit | aa13c5657d4f8b5dd52beda88a9a8ccc59ebca86 (patch) | |
| tree | 856094a6541a72b70d471ed5265d6e940cb11e55 /gnu/packages/rails.scm | |
| parent | 8ab211dbdb7df000a64aceadfe7b53488819d245 (diff) | |
| parent | b4f04e0efff1fb6112b84dc6d36ea46215c336b2 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/rails.scm')
| -rw-r--r-- | gnu/packages/rails.scm | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index f77c153197..2fc7f0a113 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -555,12 +555,6 @@ application bootup, plugins, generators, and Rake tasks.") ;; tzinfo-data is propagated by ruby-activesupport, but it ;; needs to be in the Gemfile to become available. (("group :test do") "group :test do\n gem 'tzinfo-data'")) - #t)) - (add-after 'unpack 'fix-mocha-minitest-require - (lambda _ - (substitute* "test/test_helper.rb" - ;; This chanegd in recent versions of Mocha - (("mocha/minitest") "mocha/mini_test")) #t))))) (propagated-inputs `(("ruby-actionview" ,ruby-actionview) |