Skip to content

Commit 56ab3ae

Browse files
authored
Merge pull request #163 from mathieujobin/patch-1
Add support for Rails 7.0
2 parents b4e3ed6 + ab00d45 commit 56ab3ae

File tree

5 files changed

+18
-3
lines changed

5 files changed

+18
-3
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,12 @@ jobs:
2525
- rails_5.2_sprockets4.gemfile
2626
- rails_6.0.gemfile
2727
- rails_6.1.gemfile
28+
- rails_7.0.gemfile
2829
#- rails_head.gemfile
2930
#- rails_head_sprockets4.gemfile
31+
exclude:
32+
- gemfile: rails_7.0.gemfile
33+
ruby: 2.6
3034
env:
3135
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}
3236
AWS_REGION: us-east1

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Adds your HTML templates into Angular's `$templateCache` using Rails asset pipel
1313

1414
Branch | Build Status
1515
------------|---------
16-
master | [![Build Status](https://travis-ci.org/pitr/angular-rails-templates.png?branch=master)](https://travis-ci.org/pitr/angular-rails-templates)
16+
master | [![Build Status](https://github.com/pitr/angular-rails-templates/workflows/build/badge.svg)](https://github.com/pitr/angular-rails-templates)
1717
0-x-stable | [![Build Status](https://travis-ci.org/pitr/angular-rails-templates.png?branch=0-x-stable)](https://travis-ci.org/pitr/angular-rails-templates)
1818

1919
It removes the need for AJAX calls to retrieve the templates (or for you to manually set them into the DOM).

angular-rails-templates.gemspec

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ Gem::Specification.new do |s|
1616

1717
s.require_paths = ["lib"]
1818

19-
s.add_dependency "railties", ">= 5.0", "< 7"
19+
s.add_dependency "railties", ">= 5.0", "< 7.1"
2020
s.add_dependency "sprockets", ">= 3.0", '< 5'
21+
s.add_dependency "sprockets-rails"
2122
s.add_dependency "tilt"
2223

2324
# There is a deprecation warning indicating the build will fail with Minitest 6

gemfiles/rails_7.0.gemfile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
source "https://rubygems.org"
2+
3+
gem "rails", "~> 7.0.2"
4+
gem "slim-rails"
5+
gem "haml"
6+
gem "kramdown"
7+
8+
gem 'coveralls', require: false
9+
10+
gemspec :path => ".././"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module AngularRailsTemplates
2-
VERSION = '1.1.0'
2+
VERSION = '1.2.0'
33
end

0 commit comments

Comments
 (0)