Skip to content

Commit

Permalink
Merge pull request #163 from mathieujobin/patch-1
Browse files Browse the repository at this point in the history
Add support for Rails 7.0
  • Loading branch information
mathieujobin authored Aug 4, 2022
2 parents b4e3ed6 + ab00d45 commit 56ab3ae
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,12 @@ jobs:
- rails_5.2_sprockets4.gemfile
- rails_6.0.gemfile
- rails_6.1.gemfile
- rails_7.0.gemfile
#- rails_head.gemfile
#- rails_head_sprockets4.gemfile
exclude:
- gemfile: rails_7.0.gemfile
ruby: 2.6
env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}
AWS_REGION: us-east1
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Adds your HTML templates into Angular's `$templateCache` using Rails asset pipel

Branch | Build Status
------------|---------
master | [![Build Status](https://travis-ci.org/pitr/angular-rails-templates.png?branch=master)](https://travis-ci.org/pitr/angular-rails-templates)
master | [![Build Status](https://github.com/pitr/angular-rails-templates/workflows/build/badge.svg)](https://github.com/pitr/angular-rails-templates)
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)

It removes the need for AJAX calls to retrieve the templates (or for you to manually set them into the DOM).
Expand Down
3 changes: 2 additions & 1 deletion angular-rails-templates.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ Gem::Specification.new do |s|

s.require_paths = ["lib"]

s.add_dependency "railties", ">= 5.0", "< 7"
s.add_dependency "railties", ">= 5.0", "< 7.1"
s.add_dependency "sprockets", ">= 3.0", '< 5'
s.add_dependency "sprockets-rails"
s.add_dependency "tilt"

# There is a deprecation warning indicating the build will fail with Minitest 6
Expand Down
10 changes: 10 additions & 0 deletions gemfiles/rails_7.0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
source "https://rubygems.org"

gem "rails", "~> 7.0.2"
gem "slim-rails"
gem "haml"
gem "kramdown"

gem 'coveralls', require: false

gemspec :path => ".././"
2 changes: 1 addition & 1 deletion lib/angular-rails-templates/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module AngularRailsTemplates
VERSION = '1.1.0'
VERSION = '1.2.0'
end

0 comments on commit 56ab3ae

Please sign in to comment.