diff --git a/Gemfile b/Gemfile index f43190b5..06ff5bdf 100644 --- a/Gemfile +++ b/Gemfile @@ -3,8 +3,8 @@ source "https://rubygems.org" gemspec gem "rails", "~> 4.2.5" -gem "omniauth", "~> 1.2.0" -gem "omniauth-oauth2", "~> 1.1.0" +gem "omniauth", "~> 1.3" +gem "omniauth-oauth2", "~> 1.4" gem "rdoc" group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 7e0d3183..42ceb219 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,36 +11,36 @@ PATH GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.5.1) - actionpack (= 4.2.5.1) - actionview (= 4.2.5.1) - activejob (= 4.2.5.1) + actionmailer (4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.5.1) - actionview (= 4.2.5.1) - activesupport (= 4.2.5.1) + actionpack (4.2.6) + actionview (= 4.2.6) + activesupport (= 4.2.6) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.5.1) - activesupport (= 4.2.5.1) + actionview (4.2.6) + activesupport (= 4.2.6) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.5.1) - activesupport (= 4.2.5.1) + activejob (4.2.6) + activesupport (= 4.2.6) globalid (>= 0.3.0) - activemodel (4.2.5.1) - activesupport (= 4.2.5.1) + activemodel (4.2.6) + activesupport (= 4.2.6) builder (~> 3.1) - activerecord (4.2.5.1) - activemodel (= 4.2.5.1) - activesupport (= 4.2.5.1) + activerecord (4.2.6) + activemodel (= 4.2.6) + activesupport (= 4.2.6) arel (~> 6.0) - activesupport (4.2.5.1) + activesupport (4.2.6) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -50,7 +50,7 @@ GEM bcrypt (3.1.11) bson (3.2.6) builder (3.2.2) - concurrent-ruby (1.0.0) + concurrent-ruby (1.0.1) connection_pool (2.2.0) erubis (2.7.0) faraday (0.9.2) @@ -60,13 +60,13 @@ GEM hashie (3.4.3) i18n (0.7.0) json (1.8.3) - jwt (1.5.2) + jwt (1.5.1) loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.3) mime-types (>= 1.16, < 3) metaclass (0.0.4) - mime-types (2.99) + mime-types (2.99.1) mini_portile2 (2.0.0) minitest (5.8.4) mocha (1.1.0) @@ -85,21 +85,19 @@ GEM multipart-post (2.0.0) nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) - oauth2 (0.9.4) + oauth2 (1.1.0) faraday (>= 0.8, < 0.10) - jwt (~> 1.0) + jwt (~> 1.0, < 1.5.2) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (~> 1.2) - omniauth (1.2.2) + rack (>= 1.2, < 3) + omniauth (1.3.1) hashie (>= 1.2, < 4) - rack (~> 1.0) - omniauth-facebook (1.6.0) - omniauth-oauth2 (~> 1.1) - omniauth-oauth2 (1.1.2) - faraday (>= 0.8, < 0.10) - multi_json (~> 1.3) - oauth2 (~> 0.9.3) + rack (>= 1.0, < 3) + omniauth-facebook (3.0.0) + omniauth-oauth2 (~> 1.2) + omniauth-oauth2 (1.4.0) + oauth2 (~> 1.0) omniauth (~> 1.2) omniauth-openid (1.0.1) omniauth (~> 1.0) @@ -113,16 +111,16 @@ GEM ruby-openid (>= 2.1.8) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.5.1) - actionmailer (= 4.2.5.1) - actionpack (= 4.2.5.1) - actionview (= 4.2.5.1) - activejob (= 4.2.5.1) - activemodel (= 4.2.5.1) - activerecord (= 4.2.5.1) - activesupport (= 4.2.5.1) + rails (4.2.6) + actionmailer (= 4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + activemodel (= 4.2.6) + activerecord (= 4.2.6) + activesupport (= 4.2.6) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.5.1) + railties (= 4.2.6) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -132,12 +130,12 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (4.2.5.1) - actionpack (= 4.2.5.1) - activesupport (= 4.2.5.1) + railties (4.2.6) + actionpack (= 4.2.6) + activesupport (= 4.2.6) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.5.0) + rake (11.0.1) rdoc (4.2.2) json (~> 1.4) responders (2.1.1) @@ -146,7 +144,7 @@ GEM sprockets (3.5.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.1) + sprockets-rails (3.0.4) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -172,9 +170,9 @@ DEPENDENCIES jruby-openssl mocha (~> 1.1) mongoid (~> 4.0) - omniauth (~> 1.2.0) + omniauth (~> 1.3) omniauth-facebook - omniauth-oauth2 (~> 1.1.0) + omniauth-oauth2 (~> 1.4) omniauth-openid (~> 1.0.1) rails (~> 4.2.5) rdoc diff --git a/gemfiles/Gemfile.rails-4.1-stable b/gemfiles/Gemfile.rails-4.1-stable index f4f0e37c..72d73d6f 100644 --- a/gemfiles/Gemfile.rails-4.1-stable +++ b/gemfiles/Gemfile.rails-4.1-stable @@ -1,10 +1,10 @@ source "https://rubygems.org" -gemspec path: '..' +gemspec path: ".." -gem "rails", github: 'rails/rails', branch: '4-1-stable' -gem "omniauth", "~> 1.2.0" -gem "omniauth-oauth2", "~> 1.1.0" +gem "rails", github: "rails/rails", branch: "4-1-stable" +gem "omniauth", "~> 1.3" +gem "omniauth-oauth2", "~> 1.4" gem "rdoc" group :test do diff --git a/gemfiles/Gemfile.rails-4.1-stable.lock b/gemfiles/Gemfile.rails-4.1-stable.lock index 71b55e77..b67b6de6 100644 --- a/gemfiles/Gemfile.rails-4.1-stable.lock +++ b/gemfiles/Gemfile.rails-4.1-stable.lock @@ -1,47 +1,47 @@ GIT remote: git://github.com/rails/rails.git - revision: e8eda76893479a29ace8d85cf4e4cfc67cd6fd4b + revision: 41b4d81b4fd14cbf43060c223bea0f461256d099 branch: 4-1-stable specs: - actionmailer (4.1.14.1) - actionpack (= 4.1.14.1) - actionview (= 4.1.14.1) + actionmailer (4.1.15) + actionpack (= 4.1.15) + actionview (= 4.1.15) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.14.1) - actionview (= 4.1.14.1) - activesupport (= 4.1.14.1) + actionpack (4.1.15) + actionview (= 4.1.15) + activesupport (= 4.1.15) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.14.1) - activesupport (= 4.1.14.1) + actionview (4.1.15) + activesupport (= 4.1.15) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.14.1) - activesupport (= 4.1.14.1) + activemodel (4.1.15) + activesupport (= 4.1.15) builder (~> 3.1) - activerecord (4.1.14.1) - activemodel (= 4.1.14.1) - activesupport (= 4.1.14.1) + activerecord (4.1.15) + activemodel (= 4.1.15) + activesupport (= 4.1.15) arel (~> 5.0.0) - activesupport (4.1.14.1) + activesupport (4.1.15) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - rails (4.1.14.1) - actionmailer (= 4.1.14.1) - actionpack (= 4.1.14.1) - actionview (= 4.1.14.1) - activemodel (= 4.1.14.1) - activerecord (= 4.1.14.1) - activesupport (= 4.1.14.1) + rails (4.1.15) + actionmailer (= 4.1.15) + actionpack (= 4.1.15) + actionview (= 4.1.15) + activemodel (= 4.1.15) + activerecord (= 4.1.15) + activesupport (= 4.1.15) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.14.1) + railties (= 4.1.15) sprockets-rails (~> 2.0) - railties (4.1.14.1) - actionpack (= 4.1.14.1) - activesupport (= 4.1.14.1) + railties (4.1.15) + actionpack (= 4.1.15) + activesupport (= 4.1.15) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -62,7 +62,7 @@ GEM bcrypt (3.1.11) bson (3.2.6) builder (3.2.2) - concurrent-ruby (1.0.0) + concurrent-ruby (1.0.1) connection_pool (2.2.0) erubis (2.7.0) faraday (0.9.2) @@ -70,11 +70,11 @@ GEM hashie (3.4.3) i18n (0.7.0) json (1.8.3) - jwt (1.5.2) + jwt (1.5.1) mail (2.6.3) mime-types (>= 1.16, < 3) metaclass (0.0.4) - mime-types (2.99) + mime-types (2.99.1) mini_portile2 (2.0.0) minitest (5.8.4) mocha (1.1.0) @@ -93,21 +93,19 @@ GEM multipart-post (2.0.0) nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) - oauth2 (0.9.4) + oauth2 (1.1.0) faraday (>= 0.8, < 0.10) - jwt (~> 1.0) + jwt (~> 1.0, < 1.5.2) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (~> 1.2) - omniauth (1.2.2) + rack (>= 1.2, < 3) + omniauth (1.3.1) hashie (>= 1.2, < 4) - rack (~> 1.0) - omniauth-facebook (1.6.0) - omniauth-oauth2 (~> 1.1) - omniauth-oauth2 (1.1.2) - faraday (>= 0.8, < 0.10) - multi_json (~> 1.3) - oauth2 (~> 0.9.3) + rack (>= 1.0, < 3) + omniauth-facebook (3.0.0) + omniauth-oauth2 (~> 1.2) + omniauth-oauth2 (1.4.0) + oauth2 (~> 1.0) omniauth (~> 1.2) omniauth-openid (1.0.1) omniauth (~> 1.0) @@ -121,8 +119,9 @@ GEM ruby-openid (>= 2.1.8) rack-test (0.6.3) rack (>= 1.0) - rake (10.5.0) - rdoc (4.2.1) + rake (11.0.1) + rdoc (4.2.2) + json (~> 1.4) responders (1.1.2) railties (>= 3.2, < 4.2) ruby-openid (2.7.0) @@ -155,9 +154,9 @@ DEPENDENCIES jruby-openssl mocha (~> 1.1) mongoid (~> 4.0.0) - omniauth (~> 1.2.0) + omniauth (~> 1.3) omniauth-facebook - omniauth-oauth2 (~> 1.1.0) + omniauth-oauth2 (~> 1.4) omniauth-openid (~> 1.0.1) rails! rdoc diff --git a/gemfiles/Gemfile.rails-4.2-stable b/gemfiles/Gemfile.rails-4.2-stable index 972e2f10..de9c4d05 100644 --- a/gemfiles/Gemfile.rails-4.2-stable +++ b/gemfiles/Gemfile.rails-4.2-stable @@ -1,10 +1,10 @@ source "https://rubygems.org" -gemspec path: '..' +gemspec path: ".." -gem "rails", github: 'rails/rails', branch: '4-2-stable' -gem "omniauth", "~> 1.2.2" -gem "omniauth-oauth2", "~> 1.2.0" +gem "rails", github: "rails/rails", branch: "4-2-stable" +gem "omniauth", "~> 1.3" +gem "omniauth-oauth2", "~> 1.4" gem "rdoc" group :test do diff --git a/gemfiles/Gemfile.rails-4.2-stable.lock b/gemfiles/Gemfile.rails-4.2-stable.lock index 6e365783..6144a11d 100644 --- a/gemfiles/Gemfile.rails-4.2-stable.lock +++ b/gemfiles/Gemfile.rails-4.2-stable.lock @@ -1,57 +1,57 @@ GIT remote: git://github.com/rails/rails.git - revision: acf654b1c4a1ffe2a90d6ea63a0b989d656bb87d + revision: 2aa27582c202148296bb169159b0bf9a47a7bd80 branch: 4-2-stable specs: - actionmailer (4.2.5.1) - actionpack (= 4.2.5.1) - actionview (= 4.2.5.1) - activejob (= 4.2.5.1) + actionmailer (4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.5.1) - actionview (= 4.2.5.1) - activesupport (= 4.2.5.1) + actionpack (4.2.6) + actionview (= 4.2.6) + activesupport (= 4.2.6) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.5.1) - activesupport (= 4.2.5.1) + actionview (4.2.6) + activesupport (= 4.2.6) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.5.1) - activesupport (= 4.2.5.1) + activejob (4.2.6) + activesupport (= 4.2.6) globalid (>= 0.3.0) - activemodel (4.2.5.1) - activesupport (= 4.2.5.1) + activemodel (4.2.6) + activesupport (= 4.2.6) builder (~> 3.1) - activerecord (4.2.5.1) - activemodel (= 4.2.5.1) - activesupport (= 4.2.5.1) + activerecord (4.2.6) + activemodel (= 4.2.6) + activesupport (= 4.2.6) arel (~> 6.0) - activesupport (4.2.5.1) + activesupport (4.2.6) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - rails (4.2.5.1) - actionmailer (= 4.2.5.1) - actionpack (= 4.2.5.1) - actionview (= 4.2.5.1) - activejob (= 4.2.5.1) - activemodel (= 4.2.5.1) - activerecord (= 4.2.5.1) - activesupport (= 4.2.5.1) + rails (4.2.6) + actionmailer (= 4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + activemodel (= 4.2.6) + activerecord (= 4.2.6) + activesupport (= 4.2.6) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.5.1) + railties (= 4.2.6) sprockets-rails - railties (4.2.5.1) - actionpack (= 4.2.5.1) - activesupport (= 4.2.5.1) + railties (4.2.6) + actionpack (= 4.2.6) + activesupport (= 4.2.6) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -72,7 +72,7 @@ GEM bcrypt (3.1.11) bson (3.2.6) builder (3.2.2) - concurrent-ruby (1.0.0) + concurrent-ruby (1.0.1) connection_pool (2.2.0) erubis (2.7.0) faraday (0.9.2) @@ -82,13 +82,13 @@ GEM hashie (3.4.3) i18n (0.7.0) json (1.8.3) - jwt (1.5.2) + jwt (1.5.1) loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.3) mime-types (>= 1.16, < 3) metaclass (0.0.4) - mime-types (2.99) + mime-types (2.99.1) mini_portile2 (2.0.0) minitest (5.8.4) mocha (1.1.0) @@ -107,20 +107,18 @@ GEM multipart-post (2.0.0) nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) - oauth2 (1.0.0) + oauth2 (1.1.0) faraday (>= 0.8, < 0.10) - jwt (~> 1.0) + jwt (~> 1.0, < 1.5.2) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (~> 1.2) - omniauth (1.2.2) + rack (>= 1.2, < 3) + omniauth (1.3.1) hashie (>= 1.2, < 4) - rack (~> 1.0) + rack (>= 1.0, < 3) omniauth-facebook (3.0.0) omniauth-oauth2 (~> 1.2) - omniauth-oauth2 (1.2.0) - faraday (>= 0.8, < 0.10) - multi_json (~> 1.3) + omniauth-oauth2 (1.4.0) oauth2 (~> 1.0) omniauth (~> 1.2) omniauth-openid (1.0.1) @@ -143,15 +141,16 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - rake (10.5.0) - rdoc (4.2.1) + rake (11.0.1) + rdoc (4.2.2) + json (~> 1.4) responders (2.1.1) railties (>= 4.2.0, < 5.1) ruby-openid (2.7.0) sprockets (3.5.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.0) + sprockets-rails (3.0.4) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -177,9 +176,9 @@ DEPENDENCIES jruby-openssl mocha (~> 1.1) mongoid (~> 4.0.0) - omniauth (~> 1.2.2) + omniauth (~> 1.3) omniauth-facebook - omniauth-oauth2 (~> 1.2.0) + omniauth-oauth2 (~> 1.4) omniauth-openid (~> 1.0.1) rails! rdoc diff --git a/gemfiles/Gemfile.rails-5.0-beta b/gemfiles/Gemfile.rails-5.0-beta index 81a2cc1a..100b7f5e 100644 --- a/gemfiles/Gemfile.rails-5.0-beta +++ b/gemfiles/Gemfile.rails-5.0-beta @@ -1,37 +1,37 @@ -source 'https://rubygems.org' +source "https://rubygems.org" -gemspec path: '..' +gemspec path: ".." -gem 'rails', '5.0.0.beta2' -gem 'omniauth', '~>1.3.1' -gem 'oauth2' -gem 'omniauth-oauth2', '>= 1.2.0', '< 1.5.0' -gem 'rdoc' +gem "rails", "5.0.0.beta3" +gem "omniauth", " ~>1.3" +gem "oauth2" +gem "omniauth-oauth2", ">= 1.2.0", "< 1.5.0" +gem "rdoc" -gem 'activemodel-serializers-xml', github: 'rails/activemodel-serializers-xml' +gem "activemodel-serializers-xml", github: "rails/activemodel-serializers-xml" -gem 'rails-controller-testing' +gem "rails-controller-testing" -gem 'responders', '~>2.1.1' +gem "responders", "~> 2.1.1" group :test do - gem 'omniauth-facebook' - gem 'omniauth-openid', '~> 1.0.1' - gem 'webrat', '0.7.3', require: false - gem 'mocha', '~> 1.1', require: false + gem "omniauth-facebook" + gem "omniauth-openid", "~> 1.0.1" + gem "webrat", "0.7.3", require: false + gem "mocha", "~> 1.1", require: false end platforms :jruby do - gem 'activerecord-jdbc-adapter' - gem 'activerecord-jdbcsqlite3-adapter' - gem 'jruby-openssl' + gem "activerecord-jdbc-adapter" + gem "activerecord-jdbcsqlite3-adapter" + gem "jruby-openssl" end platforms :ruby do - gem 'sqlite3' + gem "sqlite3" end # TODO: # group :mongoid do -# gem 'mongoid', '~> 4.0.0' +# gem "mongoid", "~> 4.0.0" # end diff --git a/gemfiles/Gemfile.rails-5.0-beta.lock b/gemfiles/Gemfile.rails-5.0-beta.lock index c6e30f29..7e35cbcd 100644 --- a/gemfiles/Gemfile.rails-5.0-beta.lock +++ b/gemfiles/Gemfile.rails-5.0-beta.lock @@ -1,11 +1,12 @@ GIT remote: git://github.com/rails/activemodel-serializers-xml.git - revision: 1f72d9507c91b1cda10d1d20eac2b74dd6d9d4b9 + revision: ad5ff3a9262576362792196a991de1d1778c5f48 specs: - activemodel-serializers-xml (0.1.0) - activemodel - activerecord - activesupport + activemodel-serializers-xml (1.0.0) + activemodel (> 5.x) + activerecord (> 5.x) + activesupport (> 5.x) + builder (~> 3.1) PATH remote: .. @@ -20,49 +21,47 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (5.0.0.beta2) - actionpack (= 5.0.0.beta2) + actioncable (5.0.0.beta3) + actionpack (= 5.0.0.beta3) nio4r (~> 1.2) websocket-driver (~> 0.6.1) - actionmailer (5.0.0.beta2) - actionpack (= 5.0.0.beta2) - actionview (= 5.0.0.beta2) - activejob (= 5.0.0.beta2) + actionmailer (5.0.0.beta3) + actionpack (= 5.0.0.beta3) + actionview (= 5.0.0.beta3) + activejob (= 5.0.0.beta3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (5.0.0.beta2) - actionview (= 5.0.0.beta2) - activesupport (= 5.0.0.beta2) + actionpack (5.0.0.beta3) + actionview (= 5.0.0.beta3) + activesupport (= 5.0.0.beta3) rack (~> 2.x) rack-test (~> 0.6.3) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.0.beta2) - activesupport (= 5.0.0.beta2) + actionview (5.0.0.beta3) + activesupport (= 5.0.0.beta3) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (5.0.0.beta2) - activesupport (= 5.0.0.beta2) + activejob (5.0.0.beta3) + activesupport (= 5.0.0.beta3) globalid (>= 0.3.6) - activemodel (5.0.0.beta2) - activesupport (= 5.0.0.beta2) - activerecord (5.0.0.beta2) - activemodel (= 5.0.0.beta2) - activesupport (= 5.0.0.beta2) + activemodel (5.0.0.beta3) + activesupport (= 5.0.0.beta3) + activerecord (5.0.0.beta3) + activemodel (= 5.0.0.beta3) + activesupport (= 5.0.0.beta3) arel (~> 7.0) - activesupport (5.0.0.beta2) + activesupport (5.0.0.beta3) concurrent-ruby (~> 1.0) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) - method_source minitest (~> 5.1) tzinfo (~> 1.1) arel (7.0.0) bcrypt (3.1.11) builder (3.2.2) - concurrent-ruby (1.0.0) + concurrent-ruby (1.0.1) erubis (2.7.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) @@ -78,7 +77,7 @@ GEM mime-types (>= 1.16, < 3) metaclass (0.0.4) method_source (0.8.2) - mime-types (2.99) + mime-types (2.99.1) mini_portile2 (2.0.0) minitest (5.8.4) mocha (1.1.0) @@ -114,20 +113,22 @@ GEM ruby-openid (>= 2.1.8) rack-test (0.6.3) rack (>= 1.0) - rails (5.0.0.beta2) - actioncable (= 5.0.0.beta2) - actionmailer (= 5.0.0.beta2) - actionpack (= 5.0.0.beta2) - actionview (= 5.0.0.beta2) - activejob (= 5.0.0.beta2) - activemodel (= 5.0.0.beta2) - activerecord (= 5.0.0.beta2) - activesupport (= 5.0.0.beta2) + rails (5.0.0.beta3) + actioncable (= 5.0.0.beta3) + actionmailer (= 5.0.0.beta3) + actionpack (= 5.0.0.beta3) + actionview (= 5.0.0.beta3) + activejob (= 5.0.0.beta3) + activemodel (= 5.0.0.beta3) + activerecord (= 5.0.0.beta3) + activesupport (= 5.0.0.beta3) bundler (>= 1.3.0, < 2.0) - railties (= 5.0.0.beta2) + railties (= 5.0.0.beta3) sprockets-rails (>= 2.0.0) - rails-controller-testing (0.0.3) - rails (>= 4.2) + rails-controller-testing (0.1.1) + actionpack (~> 5.x) + actionview (~> 5.x) + activesupport (~> 5.x) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.7) @@ -136,21 +137,22 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (5.0.0.beta2) - actionpack (= 5.0.0.beta2) - activesupport (= 5.0.0.beta2) + railties (5.0.0.beta3) + actionpack (= 5.0.0.beta3) + activesupport (= 5.0.0.beta3) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.5.0) - rdoc (4.2.1) + rake (11.0.1) + rdoc (4.2.2) + json (~> 1.4) responders (2.1.1) railties (>= 4.2.0, < 5.1) ruby-openid (2.7.0) sprockets (3.5.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.1) + sprockets-rails (3.0.4) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -180,11 +182,11 @@ DEPENDENCIES jruby-openssl mocha (~> 1.1) oauth2 - omniauth (~> 1.3.1) + omniauth (~> 1.3) omniauth-facebook omniauth-oauth2 (>= 1.2.0, < 1.5.0) omniauth-openid (~> 1.0.1) - rails (= 5.0.0.beta2) + rails (= 5.0.0.beta3) rails-controller-testing rdoc responders (~> 2.1.1)