Skip to content

Commit ce0a241

Browse files
authored
Merge pull request #198 from bokmann/rails-5.2-support
Rails 5.2 support
2 parents abf7780 + 29e966b commit ce0a241

5 files changed

Lines changed: 12 additions & 7 deletions

File tree

.travis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@ language: ruby
22
cache: bundler
33
sudo: false
44
rvm:
5-
- 2.2.7
6-
- 2.3.4
7-
- 2.4.1
5+
- 2.3.5
6+
- 2.4.3
7+
- 2.5.0
88
gemfile:
99
- Gemfile
1010
- gemfiles/rails-4.2.gemfile
1111
- gemfiles/rails-5.0.gemfile
1212
- gemfiles/rails-5.1.gemfile
13+
- gemfiles/rails-5.2.gemfile
1314
- gemfiles/rails-master.gemfile
1415
matrix:
1516
include:
16-
- rvm: 2.2.7
17+
- rvm: 2.2.9
1718
gemfile: gemfiles/rails-3.2.gemfile
1819
allow_failures:
1920
- gemfile: gemfiles/rails-master.gemfile

font-awesome-rails.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
1515
gem.require_paths = ["lib"]
1616
gem.version = FontAwesome::Rails::VERSION
1717

18-
gem.add_dependency "railties", ">= 3.2", "< 5.2"
18+
gem.add_dependency "railties", ">= 3.2", "< 6.0"
1919

2020
gem.add_development_dependency "activesupport"
2121
gem.add_development_dependency "sass-rails"

gemfiles/rails-5.0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
source 'https://rubygems.org'
22

33
gemspec path: "../"
4-
gem "railties", "~> 5.0.0.rc1"
4+
gem "railties", "~> 5.0.0"

gemfiles/rails-5.1.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
source 'https://rubygems.org'
22

33
gemspec path: "../"
4-
gem "railties", "~> 5.1.x"
4+
gem "railties", "~> 5.1.0"

gemfiles/rails-5.2.gemfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
source 'https://rubygems.org'
2+
3+
gemspec path: "../"
4+
gem "railties", "~> 5.2.0"

0 commit comments

Comments
 (0)