Skip to content

Commit 4d0a8d5

Browse files
committed
support Rails 6
This copies some changes over from a previous attempt to support Rails 6 which is in the `rails6` branch.
1 parent 4a1a323 commit 4d0a8d5

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

kracken.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
2222
s.add_dependency 'faraday', ['>= 0.8', '< 2.0']
2323
s.add_dependency 'omniauth', '~> 1.0'
2424
s.add_dependency 'omniauth-oauth2', '~> 1.1'
25-
s.add_dependency 'rails', [">= 5.2", "< 6.0"]
25+
s.add_dependency 'rails', [">= 5.2", "< 7.0"]
2626

2727
s.add_development_dependency 'pry'
2828
s.add_development_dependency 'pry-nav'

lib/kracken/rspec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ def current_user
4646
module Kracken
4747
module Controllers
4848
module Authenticatable
49+
undef_method :current_user
4950
def current_user
5051
Kracken::SpecHelper.current_user
5152
end

0 commit comments

Comments
 (0)