mirror of
https://github.com/heartcombo/devise.git
synced 2022-11-09 12:18:31 -05:00
Depend on jdbc master.
This commit is contained in:
parent
601e1d3dc9
commit
9ebcb691b0
2 changed files with 5 additions and 8 deletions
2
Gemfile
2
Gemfile
|
@ -14,7 +14,9 @@ group :test do
|
|||
end
|
||||
|
||||
platforms :jruby do
|
||||
gem 'activerecord-jdbc-adapter', :git => 'https://github.com/nicksieger/activerecord-jdbc-adapter.git'
|
||||
gem 'activerecord-jdbcsqlite3-adapter'
|
||||
gem 'jruby-openssl'
|
||||
end
|
||||
|
||||
platforms :mri_18 do
|
||||
|
|
|
@ -2,12 +2,7 @@ unless defined?(DEVISE_ORM)
|
|||
DEVISE_ORM = (ENV["DEVISE_ORM"] || :active_record).to_sym
|
||||
end
|
||||
|
||||
begin
|
||||
require File.expand_path("../../../../.bundle/environment", __FILE__)
|
||||
rescue LoadError
|
||||
require 'rubygems'
|
||||
require 'bundler'
|
||||
Bundler.setup :default, :test, DEVISE_ORM
|
||||
end
|
||||
require 'rubygems'
|
||||
require 'bundler/setup'
|
||||
|
||||
$:.unshift File.expand_path('../../../../lib', __FILE__)
|
Loading…
Reference in a new issue