Skip to content

Commit

Permalink
Rails 6 support: improvements (#250)
Browse files Browse the repository at this point in the history
* Bump sass-rails to < 7.0

* Add rails 6 and ruby 2.3.5 to travis matrix

* Add ruby 2.5.0 to travis

* Move from ruby 2.5.0 to 2.5.1

* Add manifest.js to dummy app

Add application.css to manifest.js

Add application.js to manifest.js

Add admin assets to manifest.js
  • Loading branch information
mbajur authored and jensljungblad committed Nov 28, 2019
1 parent 3555b6d commit 26b3b6b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
9 changes: 9 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,18 @@ sudo: false
rvm:
- 2.2.2
- 2.3.5
- 2.5.1

gemfile:
- gemfiles/rails_5.gemfile
- gemfiles/rails_6.gemfile

matrix:
exclude:
- rvm: 2.2.2
gemfile: gemfiles/rails_6.gemfile
- rvm: 2.3.5
gemfile: gemfiles/rails_6.gemfile

addons:
code_climate:
Expand Down
2 changes: 1 addition & 1 deletion godmin.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Gem::Specification.new do |gem|
gem.add_dependency "momentjs-rails", "~> 2.8"
gem.add_dependency "pundit", [">= 1.1", "< 2.0"]
gem.add_dependency "rails", [">= 5.0", "< 7.0"]
gem.add_dependency "sass-rails", [">= 5.0", "< 6.0"]
gem.add_dependency "sass-rails", [">= 5.0", "< 7.0"]
gem.add_dependency "selectize-rails", "~> 0.12"

gem.add_development_dependency "appraisal"
Expand Down
4 changes: 4 additions & 0 deletions test/dummy/app/assets/config/manifest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
//= link application.css
//= link application.js
//= link admin/application.css
//= link admin/application.js

0 comments on commit 26b3b6b

Please sign in to comment.