diff options
| author | Marius Bakke <marius@gnu.org> | 2020-06-14 16:24:34 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-06-14 16:24:34 +0200 |
| commit | 4193095e18b602705df94e38a8d60ef1fe380e49 (patch) | |
| tree | 2500f31bcfae9b4cb5a23d633395f6892a7bd8a7 /gnu/packages/rails.scm | |
| parent | a48a3f0640d76cb5e5945557c9aae6dabce39d93 (diff) | |
| parent | e88745a655b220b4047f7db5175c828ef9c33e11 (diff) | |
Merge branch 'master' into core-updates
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) |