Merge branch 'release/1.1.1'

This commit is contained in:
Jonathan Abbett 2016-12-20 11:58:30 -05:00
commit 1e6e6c95c7
6 changed files with 21 additions and 8 deletions

View File

@ -7,6 +7,13 @@ source 'http://rails-assets.org'
# development dependencies will be added by default to the :development group.
gemspec
# These rails-assets dependencies need to be added to the developer's Gemfile
# since there's no way to specify a source in the gemspec.
source 'http://rails-assets.org' do
gem 'rails-assets-shepherd.js', '~> 1.8'
gem 'rails-assets-js-cookie', '~> 2.1'
end
# Declare any dependencies that are still in development here instead of in
# your gemspec. These might include edge Rails or gems from your path or
# Git. Remember to move these dependencies to your gemspec before releasing

View File

@ -1,7 +1,7 @@
PATH
remote: .
specs:
abraham (1.0.0)
abraham (1.1.1)
jquery-rails
rails (~> 5.0.0, >= 5.0.0.1)
rails-assets-js-cookie (~> 2.1)
@ -146,6 +146,8 @@ PLATFORMS
DEPENDENCIES
abraham!
rails-assets-js-cookie (~> 2.1)!
rails-assets-shepherd.js (~> 1.8)!
rails-assets-tether!
rubocop
sqlite3

View File

@ -16,10 +16,15 @@ Abraham needs to know the current user to track tour views, e.g. `current_user`
## Installation
Add Abraham to your Gemfile:
Add `abraham` and its JavaScript dependencies to your Gemfile:
```
gem 'abraham'
source 'https://rails-assets.org' do
gem 'rails-assets-shepherd.js', '~> 1.8'
gem 'rails-assets-js-cookie', '~> 2.1'
end
```
Then run:

View File

@ -19,11 +19,10 @@ Gem::Specification.new do |s|
s.add_dependency 'rails', '~> 5.0.0', '>= 5.0.0.1'
s.add_dependency 'sass-rails', '~> 5.0'
s.add_dependency 'jquery-rails'
s.add_dependency 'rails-assets-shepherd.js', '~> 1.8'
s.add_dependency 'rails-assets-js-cookie', '~> 2.1'
s.add_development_dependency 'sqlite3'
s.add_development_dependency 'rubocop'
s.add_runtime_dependency 'jquery-rails'
end

View File

@ -1,10 +1,10 @@
# frozen_string_literal: true
require 'rubygems'
require 'rails-assets-shepherd.js'
require 'jquery-rails'
require 'rails-assets-js-cookie'
module Abraham
class Engine < ::Rails::Engine
require 'rails-assets-shepherd.js'
require 'jquery-rails'
require 'rails-assets-js-cookie'
end
end

View File

@ -1,4 +1,4 @@
# frozen_string_literal: true
module Abraham
VERSION = '1.1.0'
VERSION = '1.1.1'
end