Skip to content

Commit d4b2c7c

Browse files
authored
Merge branch 'master' into patch-1
2 parents 88fcd94 + b4e3ed6 commit d4b2c7c

File tree

4 files changed

+3
-25
lines changed

4 files changed

+3
-25
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ jobs:
1919
- 2.7
2020
- 2.6
2121
gemfile:
22-
#- rails_4.2.gemfile
23-
#- rails_4.2_sprockets4.gemfile
2422
- rails_5.0.gemfile
2523
- rails_5.0_sprockets4.gemfile
2624
- rails_5.2.gemfile

angular-rails-templates.gemspec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@ Gem::Specification.new do |s|
1616

1717
s.require_paths = ["lib"]
1818

19-
s.add_dependency "railties", ">= 4.2", "< 7.1"
19+
s.add_dependency "railties", ">= 5.0", "< 7.1"
2020
s.add_dependency "sprockets", ">= 3.0", '< 5'
2121
s.add_dependency "sprockets-rails"
2222
s.add_dependency "tilt"
2323

24-
s.add_development_dependency "minitest"
24+
# There is a deprecation warning indicating the build will fail with Minitest 6
25+
s.add_development_dependency "minitest", '< 6'
2526
s.add_development_dependency "capybara"
2627
s.add_development_dependency "uglifier"
2728
end

gemfiles/rails_4.2.gemfile

Lines changed: 0 additions & 10 deletions
This file was deleted.

gemfiles/rails_4.2_sprockets4.gemfile

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)