Skip to content

Commit af130aa

Browse files
authored
Merge pull request #422 from jacobbednarz/rails-edge-support
Support for Rails edge
2 parents dd04a6a + c196f0f commit af130aa

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,16 @@ matrix:
3838
rvm: 2.4.1
3939
- gemfile: gemfiles/Gemfile-rails-5-1
4040
rvm: 2.4.1
41+
- gemfile: gemfiles/Gemfile-rails-edge
42+
rvm: 2.4.1
4143
- gemfile: Gemfile
4244
rvm: 2.4.1
4345
- gemfile: gemfiles/Gemfile-rails-5-0
4446
rvm: ruby-head
4547
- gemfile: gemfiles/Gemfile-rails-5-1
4648
rvm: ruby-head
49+
- gemfile: gemfiles/Gemfile-rails-edge
50+
rvm: 2.5.3
4751
- gemfile: Gemfile
4852
rvm: ruby-head
4953

gemfiles/Gemfile-rails-edge

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
source "https://rubygems.org"
2+
3+
# Specify your gem"s dependencies in sass-rails.gemspec
4+
gemspec path: ".."
5+
6+
gem "rails", git: "https://github.com/rails/rails.git"
7+
gem "sprockets", "~> 4.0.0.beta2"
8+
gem "sprockets-rails", "~> 3.0.4"

sass-rails.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
1313
s.description = %q{Sass adapter for the Rails asset pipeline.}
1414
s.license = %q{MIT}
1515

16-
s.add_dependency 'railties', '>= 4.0.0', '< 6'
16+
s.add_dependency 'railties', '>= 4.0.0'
1717
s.add_dependency 'sass', '~> 3.4'
1818
s.add_dependency 'sprockets-rails', '< 4.0'
1919
s.add_dependency 'sprockets', '~> 4.x'

test/fixtures/engine_project/engine_project.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
1515
s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]
1616
s.test_files = Dir["test/**/*"]
1717

18-
s.add_dependency "rails", ">= 4.0.0.beta", "< 6"
18+
s.add_dependency "rails", ">= 4.0.0.beta"
1919
# s.add_dependency "jquery-rails"
2020

2121
s.add_development_dependency "sqlite3"

0 commit comments

Comments
 (0)