add rails 5 support
This commit is contained in:
parent
9dc6cabf42
commit
82ea57ef34
2 changed files with 54 additions and 49 deletions
101
Gemfile.lock
101
Gemfile.lock
|
|
@ -9,7 +9,7 @@ PATH
|
||||||
valid (~> 1.0)
|
valid (~> 1.0)
|
||||||
diaspora_federation-rails (0.1.5)
|
diaspora_federation-rails (0.1.5)
|
||||||
diaspora_federation (= 0.1.5)
|
diaspora_federation (= 0.1.5)
|
||||||
rails (~> 4.2)
|
rails (>= 4.2)
|
||||||
diaspora_federation-test (0.1.5)
|
diaspora_federation-test (0.1.5)
|
||||||
diaspora_federation (= 0.1.5)
|
diaspora_federation (= 0.1.5)
|
||||||
factory_girl (~> 4.7)
|
factory_girl (~> 4.7)
|
||||||
|
|
@ -17,43 +17,45 @@ PATH
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.2.7.1)
|
actioncable (5.0.0.1)
|
||||||
actionpack (= 4.2.7.1)
|
actionpack (= 5.0.0.1)
|
||||||
actionview (= 4.2.7.1)
|
nio4r (~> 1.2)
|
||||||
activejob (= 4.2.7.1)
|
websocket-driver (~> 0.6.1)
|
||||||
|
actionmailer (5.0.0.1)
|
||||||
|
actionpack (= 5.0.0.1)
|
||||||
|
actionview (= 5.0.0.1)
|
||||||
|
activejob (= 5.0.0.1)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 2.0)
|
||||||
actionpack (4.2.7.1)
|
actionpack (5.0.0.1)
|
||||||
actionview (= 4.2.7.1)
|
actionview (= 5.0.0.1)
|
||||||
activesupport (= 4.2.7.1)
|
activesupport (= 5.0.0.1)
|
||||||
rack (~> 1.6)
|
rack (~> 2.0)
|
||||||
rack-test (~> 0.6.2)
|
rack-test (~> 0.6.3)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
actionview (4.2.7.1)
|
actionview (5.0.0.1)
|
||||||
activesupport (= 4.2.7.1)
|
activesupport (= 5.0.0.1)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
activejob (4.2.7.1)
|
activejob (5.0.0.1)
|
||||||
activesupport (= 4.2.7.1)
|
activesupport (= 5.0.0.1)
|
||||||
globalid (>= 0.3.0)
|
globalid (>= 0.3.6)
|
||||||
activemodel (4.2.7.1)
|
activemodel (5.0.0.1)
|
||||||
activesupport (= 4.2.7.1)
|
activesupport (= 5.0.0.1)
|
||||||
builder (~> 3.1)
|
activerecord (5.0.0.1)
|
||||||
activerecord (4.2.7.1)
|
activemodel (= 5.0.0.1)
|
||||||
activemodel (= 4.2.7.1)
|
activesupport (= 5.0.0.1)
|
||||||
activesupport (= 4.2.7.1)
|
arel (~> 7.0)
|
||||||
arel (~> 6.0)
|
activesupport (5.0.0.1)
|
||||||
activesupport (4.2.7.1)
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||||
i18n (~> 0.7)
|
i18n (~> 0.7)
|
||||||
json (~> 1.7, >= 1.7.7)
|
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
thread_safe (~> 0.3, >= 0.3.4)
|
|
||||||
tzinfo (~> 1.1)
|
tzinfo (~> 1.1)
|
||||||
addressable (2.4.0)
|
addressable (2.4.0)
|
||||||
arel (6.0.3)
|
arel (7.1.4)
|
||||||
ast (2.3.0)
|
ast (2.3.0)
|
||||||
builder (3.2.2)
|
builder (3.2.2)
|
||||||
byebug (9.0.6)
|
byebug (9.0.6)
|
||||||
|
|
@ -140,6 +142,7 @@ GEM
|
||||||
multi_xml (0.5.5)
|
multi_xml (0.5.5)
|
||||||
multipart-post (2.0.0)
|
multipart-post (2.0.0)
|
||||||
nenv (0.3.0)
|
nenv (0.3.0)
|
||||||
|
nio4r (1.2.1)
|
||||||
nokogiri (1.6.8.1)
|
nokogiri (1.6.8.1)
|
||||||
mini_portile2 (~> 2.1.0)
|
mini_portile2 (~> 2.1.0)
|
||||||
notiffany (0.1.1)
|
notiffany (0.1.1)
|
||||||
|
|
@ -169,31 +172,30 @@ GEM
|
||||||
pry-byebug (3.4.0)
|
pry-byebug (3.4.0)
|
||||||
byebug (~> 9.0)
|
byebug (~> 9.0)
|
||||||
pry (~> 0.10)
|
pry (~> 0.10)
|
||||||
rack (1.6.4)
|
rack (2.0.1)
|
||||||
rack-test (0.6.3)
|
rack-test (0.6.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (4.2.7.1)
|
rails (5.0.0.1)
|
||||||
actionmailer (= 4.2.7.1)
|
actioncable (= 5.0.0.1)
|
||||||
actionpack (= 4.2.7.1)
|
actionmailer (= 5.0.0.1)
|
||||||
actionview (= 4.2.7.1)
|
actionpack (= 5.0.0.1)
|
||||||
activejob (= 4.2.7.1)
|
actionview (= 5.0.0.1)
|
||||||
activemodel (= 4.2.7.1)
|
activejob (= 5.0.0.1)
|
||||||
activerecord (= 4.2.7.1)
|
activemodel (= 5.0.0.1)
|
||||||
activesupport (= 4.2.7.1)
|
activerecord (= 5.0.0.1)
|
||||||
|
activesupport (= 5.0.0.1)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.2.7.1)
|
railties (= 5.0.0.1)
|
||||||
sprockets-rails
|
sprockets-rails (>= 2.0.0)
|
||||||
rails-deprecated_sanitizer (1.0.3)
|
rails-dom-testing (2.0.1)
|
||||||
activesupport (>= 4.2.0.alpha)
|
activesupport (>= 4.2.0, < 6.0)
|
||||||
rails-dom-testing (1.0.7)
|
|
||||||
activesupport (>= 4.2.0.beta, < 5.0)
|
|
||||||
nokogiri (~> 1.6.0)
|
nokogiri (~> 1.6.0)
|
||||||
rails-deprecated_sanitizer (>= 1.0.1)
|
|
||||||
rails-html-sanitizer (1.0.3)
|
rails-html-sanitizer (1.0.3)
|
||||||
loofah (~> 2.0)
|
loofah (~> 2.0)
|
||||||
railties (4.2.7.1)
|
railties (5.0.0.1)
|
||||||
actionpack (= 4.2.7.1)
|
actionpack (= 5.0.0.1)
|
||||||
activesupport (= 4.2.7.1)
|
activesupport (= 5.0.0.1)
|
||||||
|
method_source
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rainbow (2.1.0)
|
rainbow (2.1.0)
|
||||||
|
|
@ -278,6 +280,9 @@ GEM
|
||||||
addressable (>= 2.3.6)
|
addressable (>= 2.3.6)
|
||||||
crack (>= 0.3.2)
|
crack (>= 0.3.2)
|
||||||
hashdiff
|
hashdiff
|
||||||
|
websocket-driver (0.6.4)
|
||||||
|
websocket-extensions (>= 0.1.0)
|
||||||
|
websocket-extensions (0.1.2)
|
||||||
yard (0.9.5)
|
yard (0.9.5)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ Gem::Specification.new do |s|
|
||||||
|
|
||||||
s.required_ruby_version = "~> 2.1"
|
s.required_ruby_version = "~> 2.1"
|
||||||
|
|
||||||
s.add_dependency "rails", "~> 4.2"
|
s.add_dependency "rails", ">= 4.2"
|
||||||
|
|
||||||
s.add_dependency "diaspora_federation", DiasporaFederation::VERSION
|
s.add_dependency "diaspora_federation", DiasporaFederation::VERSION
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue