Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rails 6 #785

Merged
merged 44 commits into from Feb 22, 2019
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
039cdfb
Enable Rails 6 migrations
jmstfv Feb 20, 2019
7f9efbf
Update Ruby versions and remove rbx
jmstfv Feb 20, 2019
5d31cc8
Revert travis.yml back, but change rbx to rbx-3
jmstfv Feb 21, 2019
589ed78
Remove rbx-3 from travis.yml
jmstfv Feb 21, 2019
190e208
Phasing out old Ruby versions
jmstfv Feb 21, 2019
d144f11
Remove support for Devise 4.0, 4.1
jmstfv Feb 21, 2019
e4ee6e6
Update minimum allowed rubygems version
jmstfv Feb 21, 2019
4051e5e
Update Gemfile to use latest versions when possible
jmstfv Feb 21, 2019
02e4e60
Remove deprecated secret_token from Rails app
jmstfv Feb 21, 2019
29d088f
Use latest bundler 2.0.1
jmstfv Feb 21, 2019
4610c40
Remove rails-5.0 gemfile
jmstfv Feb 21, 2019
4d9d2af
Update Rails 4.2 dependencies
jmstfv Feb 21, 2019
6f07a64
Remove rails 5.2 config
jmstfv Feb 21, 2019
03cd2a7
Add config for devise 4.5
jmstfv Feb 21, 2019
3673f13
Order dependencies alphabetically, add git_source(:github)
jmstfv Feb 21, 2019
8e55fb6
Update devise 4.4 dependencies
jmstfv Feb 21, 2019
2ca94e9
Update devise 4.5 dependencies
jmstfv Feb 21, 2019
45875e6
Update Rails 4.2 dependencies
jmstfv Feb 21, 2019
128422d
Drop Rails 4.2 support
jmstfv Feb 21, 2019
b2c4850
Up required rubygems version to 2.5.0
jmstfv Feb 21, 2019
c178ca9
Install Bundler 2.0.1 before running CI
jmstfv Feb 21, 2019
196b8a8
Delete Devise 4.4 config
jmstfv Feb 21, 2019
5ac9146
Remove devise 4.5 config
jmstfv Feb 21, 2019
a01c491
Update minimum required versions for Ruby, Devise, Bundler, Actionmailer
jmstfv Feb 21, 2019
b4ae600
Add Gemfile for Rails 5.0
jmstfv Feb 21, 2019
9eb179c
Add Gemfile for Rails 5.1
jmstfv Feb 21, 2019
e0a43eb
Add Gemfile for Rails 5.2
jmstfv Feb 21, 2019
a46782f
Add Gemfile for Rails master
jmstfv Feb 21, 2019
0386242
Specify new Gemfiles in travis config
jmstfv Feb 21, 2019
7c54458
Remove Gemfile.rails-master
jmstfv Feb 21, 2019
466e0a8
Remove Gemfile.rails-master from travis config
jmstfv Feb 21, 2019
9108b1f
Update Gemfile
jmstfv Feb 21, 2019
43f433a
Update devise version in gemspec
jmstfv Feb 21, 2019
894537c
Standardize devise version (4.6) across all Gemfiles
jmstfv Feb 21, 2019
75103ce
Update JRuby and OpenJDK version
jmstfv Feb 21, 2019
29ac0ee
Temporarily comment out offending test line
jmstfv Feb 21, 2019
3200f6d
Merge branch 'master' into rails6-migrations
Feb 21, 2019
ff29db9
Remove boolean from invite_key test
jmstfv Feb 22, 2019
fa490a7
Remove obsolete file reference from travis.yml
jmstfv Feb 22, 2019
0b981fc
Remove factory_bot_rails dependency from Gemfiles
jmstfv Feb 22, 2019
5d91fab
Add Gemfile for the HEAD of the rails/rails repo
jmstfv Feb 22, 2019
0c30cd8
Add testing for Ruby 2.2.9
jmstfv Feb 22, 2019
431511e
Refactor gemspec
jmstfv Feb 22, 2019
4a0ad92
Up tested Ruby version from 2.2.9 to 2.2.10
jmstfv Feb 22, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 2 additions & 5 deletions .travis.yml
Expand Up @@ -2,11 +2,9 @@ language: ruby
sudo: false
cache: bundler
rvm:
- 2.2.9
- 2.3.6
- 2.4.3
- 2.3.8
- 2.4.5
- 2.5.0
- rbx
- jruby-9.1.16.0
jdk:
- openjdk7
Expand Down Expand Up @@ -45,7 +43,6 @@ matrix:
gemfile: gemfiles/Gemfile.rails-master
env: DEVISE_ORM=mongoid
scambra marked this conversation as resolved.
Show resolved Hide resolved
allow_failures:
- rvm: rbx
- rvm: jruby-9.1.16.0
gemfile: Gemfile
- gemfile: gemfiles/Gemfile.rails-master
6 changes: 3 additions & 3 deletions lib/generators/active_record/devise_invitable_generator.rb
Expand Up @@ -3,14 +3,14 @@
module ActiveRecord
module Generators
class DeviseInvitableGenerator < ActiveRecord::Generators::Base
source_root File.expand_path("../templates", __FILE__)
source_root File.expand_path('../templates', __FILE__)

def copy_devise_migration
migration_template "migration.rb", "db/migrate/devise_invitable_add_to_#{table_name}.rb", migration_version: migration_version
migration_template 'migration.rb', "db/migrate/devise_invitable_add_to_#{table_name}.rb", migration_version: migration_version
end

def migration_version
if Rails.version.start_with? '5.'
if Rails::VERSION::MAJOR >= 5
"[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
end
end
Expand Down