devise 4.0.0.rc1 → 4.0.0.rc2

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of devise might be problematic. Click here for more details.

Files changed (51) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +6 -6
  3. data/CHANGELOG.md +15 -0
  4. data/Gemfile +3 -3
  5. data/Gemfile.lock +52 -53
  6. data/README.md +3 -6
  7. data/app/controllers/devise/confirmations_controller.rb +1 -1
  8. data/app/controllers/devise/passwords_controller.rb +2 -2
  9. data/app/controllers/devise/registrations_controller.rb +3 -3
  10. data/app/controllers/devise/sessions_controller.rb +3 -3
  11. data/app/controllers/devise/unlocks_controller.rb +1 -1
  12. data/app/controllers/devise_controller.rb +9 -2
  13. data/app/views/devise/confirmations/new.html.erb +1 -1
  14. data/bin/test +13 -0
  15. data/gemfiles/Gemfile.rails-4.1-stable +4 -4
  16. data/gemfiles/Gemfile.rails-4.1-stable.lock +45 -46
  17. data/gemfiles/Gemfile.rails-4.2-stable +4 -4
  18. data/gemfiles/Gemfile.rails-4.2-stable.lock +47 -48
  19. data/gemfiles/Gemfile.rails-5.0-beta +19 -19
  20. data/gemfiles/Gemfile.rails-5.0-beta.lock +61 -106
  21. data/lib/devise.rb +4 -4
  22. data/lib/devise/controllers/helpers.rb +1 -1
  23. data/lib/devise/encryptor.rb +4 -4
  24. data/lib/devise/failure_app.rb +4 -5
  25. data/lib/devise/mailers/helpers.rb +1 -1
  26. data/lib/devise/models/confirmable.rb +2 -2
  27. data/lib/devise/models/database_authenticatable.rb +7 -5
  28. data/lib/devise/models/lockable.rb +1 -1
  29. data/lib/devise/omniauth/url_helpers.rb +62 -4
  30. data/lib/devise/rails/routes.rb +14 -16
  31. data/lib/devise/strategies/database_authenticatable.rb +3 -3
  32. data/lib/devise/test_helpers.rb +1 -1
  33. data/lib/devise/version.rb +1 -1
  34. data/lib/generators/active_record/devise_generator.rb +8 -2
  35. data/lib/generators/active_record/templates/migration.rb +1 -1
  36. data/lib/generators/active_record/templates/migration_existing.rb +1 -1
  37. data/lib/generators/devise/install_generator.rb +15 -0
  38. data/lib/generators/templates/devise.rb +10 -10
  39. data/test/failure_app_test.rb +1 -1
  40. data/test/generators/install_generator_test.rb +14 -3
  41. data/test/mailers/confirmation_instructions_test.rb +6 -6
  42. data/test/mailers/reset_password_instructions_test.rb +5 -5
  43. data/test/mailers/unlock_instructions_test.rb +5 -5
  44. data/test/models/confirmable_test.rb +2 -2
  45. data/test/models/database_authenticatable_test.rb +6 -6
  46. data/test/omniauth/url_helpers_test.rb +4 -6
  47. data/test/rails_app/config/initializers/devise.rb +1 -1
  48. data/test/routes_test.rb +2 -2
  49. data/test/test_helpers_test.rb +2 -2
  50. data/test/test_models.rb +1 -1
  51. metadata +4 -2
data/gemfiles/Gemfile.rails-4.1-stable CHANGED
@@ -1,10 +1,10 @@
1
1
  source "https://rubygems.org"
2
2
 
3
- gemspec path: '..'
3
+ gemspec path: ".."
4
4
 
5
- gem "rails", github: 'rails/rails', branch: '4-1-stable'
6
- gem "omniauth", "~> 1.2.0"
7
- gem "omniauth-oauth2", "~> 1.1.0"
5
+ gem "rails", github: "rails/rails", branch: "4-1-stable"
6
+ gem "omniauth", "~> 1.3"
7
+ gem "omniauth-oauth2", "~> 1.4"
8
8
  gem "rdoc"
9
9
 
10
10
  group :test do
data/gemfiles/Gemfile.rails-4.1-stable.lock CHANGED
@@ -1,54 +1,54 @@
1
1
  GIT
2
2
  remote: git://github.com/rails/rails.git
3
- revision: e8eda76893479a29ace8d85cf4e4cfc67cd6fd4b
3
+ revision: 41b4d81b4fd14cbf43060c223bea0f461256d099
4
4
  branch: 4-1-stable
5
5
  specs:
6
- actionmailer (4.1.14.1)
7
- actionpack (= 4.1.14.1)
8
- actionview (= 4.1.14.1)
6
+ actionmailer (4.1.15)
7
+ actionpack (= 4.1.15)
8
+ actionview (= 4.1.15)
9
9
  mail (~> 2.5, >= 2.5.4)
10
- actionpack (4.1.14.1)
11
- actionview (= 4.1.14.1)
12
- activesupport (= 4.1.14.1)
10
+ actionpack (4.1.15)
11
+ actionview (= 4.1.15)
12
+ activesupport (= 4.1.15)
13
13
  rack (~> 1.5.2)
14
14
  rack-test (~> 0.6.2)
15
- actionview (4.1.14.1)
16
- activesupport (= 4.1.14.1)
15
+ actionview (4.1.15)
16
+ activesupport (= 4.1.15)
17
17
  builder (~> 3.1)
18
18
  erubis (~> 2.7.0)
19
- activemodel (4.1.14.1)
20
- activesupport (= 4.1.14.1)
19
+ activemodel (4.1.15)
20
+ activesupport (= 4.1.15)
21
21
  builder (~> 3.1)
22
- activerecord (4.1.14.1)
23
- activemodel (= 4.1.14.1)
24
- activesupport (= 4.1.14.1)
22
+ activerecord (4.1.15)
23
+ activemodel (= 4.1.15)
24
+ activesupport (= 4.1.15)
25
25
  arel (~> 5.0.0)
26
- activesupport (4.1.14.1)
26
+ activesupport (4.1.15)
27
27
  i18n (~> 0.6, >= 0.6.9)
28
28
  json (~> 1.7, >= 1.7.7)
29
29
  minitest (~> 5.1)
30
30
  thread_safe (~> 0.1)
31
31
  tzinfo (~> 1.1)
32
- rails (4.1.14.1)
33
- actionmailer (= 4.1.14.1)
34
- actionpack (= 4.1.14.1)
35
- actionview (= 4.1.14.1)
36
- activemodel (= 4.1.14.1)
37
- activerecord (= 4.1.14.1)
38
- activesupport (= 4.1.14.1)
32
+ rails (4.1.15)
33
+ actionmailer (= 4.1.15)
34
+ actionpack (= 4.1.15)
35
+ actionview (= 4.1.15)
36
+ activemodel (= 4.1.15)
37
+ activerecord (= 4.1.15)
38
+ activesupport (= 4.1.15)
39
39
  bundler (>= 1.3.0, < 2.0)
40
- railties (= 4.1.14.1)
40
+ railties (= 4.1.15)
41
41
  sprockets-rails (~> 2.0)
42
- railties (4.1.14.1)
43
- actionpack (= 4.1.14.1)
44
- activesupport (= 4.1.14.1)
42
+ railties (4.1.15)
43
+ actionpack (= 4.1.15)
44
+ activesupport (= 4.1.15)
45
45
  rake (>= 0.8.7)
46
46
  thor (>= 0.18.1, < 2.0)
47
47
 
48
48
  PATH
49
49
  remote: ..
50
50
  specs:
51
- devise (4.0.0.rc1)
51
+ devise (4.0.0.rc2)
52
52
  bcrypt (~> 3.0)
53
53
  orm_adapter (~> 0.1)
54
54
  railties (>= 4.1.0, < 5.1)
@@ -59,10 +59,10 @@ GEM
59
59
  remote: https://rubygems.org/
60
60
  specs:
61
61
  arel (5.0.1.20140414130214)
62
- bcrypt (3.1.10)
62
+ bcrypt (3.1.11)
63
63
  bson (3.2.6)
64
64
  builder (3.2.2)
65
- concurrent-ruby (1.0.0)
65
+ concurrent-ruby (1.0.1)
66
66
  connection_pool (2.2.0)
67
67
  erubis (2.7.0)
68
68
  faraday (0.9.2)
@@ -70,11 +70,11 @@ GEM
70
70
  hashie (3.4.3)
71
71
  i18n (0.7.0)
72
72
  json (1.8.3)
73
- jwt (1.5.2)
73
+ jwt (1.5.1)
74
74
  mail (2.6.3)
75
75
  mime-types (>= 1.16, < 3)
76
76
  metaclass (0.0.4)
77
- mime-types (2.99)
77
+ mime-types (2.99.1)
78
78
  mini_portile2 (2.0.0)
79
79
  minitest (5.8.4)
80
80
  mocha (1.1.0)
@@ -93,21 +93,19 @@ GEM
93
93
  multipart-post (2.0.0)
94
94
  nokogiri (1.6.7.2)
95
95
  mini_portile2 (~> 2.0.0.rc2)
96
- oauth2 (0.9.4)
96
+ oauth2 (1.1.0)
97
97
  faraday (>= 0.8, < 0.10)
98
- jwt (~> 1.0)
98
+ jwt (~> 1.0, < 1.5.2)
99
99
  multi_json (~> 1.3)
100
100
  multi_xml (~> 0.5)
101
- rack (~> 1.2)
102
- omniauth (1.2.2)
101
+ rack (>= 1.2, < 3)
102
+ omniauth (1.3.1)
103
103
  hashie (>= 1.2, < 4)
104
- rack (~> 1.0)
105
- omniauth-facebook (1.6.0)
106
- omniauth-oauth2 (~> 1.1)
107
- omniauth-oauth2 (1.1.2)
108
- faraday (>= 0.8, < 0.10)
109
- multi_json (~> 1.3)
110
- oauth2 (~> 0.9.3)
104
+ rack (>= 1.0, < 3)
105
+ omniauth-facebook (3.0.0)
106
+ omniauth-oauth2 (~> 1.2)
107
+ omniauth-oauth2 (1.4.0)
108
+ oauth2 (~> 1.0)
111
109
  omniauth (~> 1.2)
112
110
  omniauth-openid (1.0.1)
113
111
  omniauth (~> 1.0)
@@ -121,8 +119,9 @@ GEM
121
119
  ruby-openid (>= 2.1.8)
122
120
  rack-test (0.6.3)
123
121
  rack (>= 1.0)
124
- rake (10.5.0)
125
- rdoc (4.2.1)
122
+ rake (11.0.1)
123
+ rdoc (4.2.2)
124
+ json (~> 1.4)
126
125
  responders (1.1.2)
127
126
  railties (>= 3.2, < 4.2)
128
127
  ruby-openid (2.7.0)
@@ -155,9 +154,9 @@ DEPENDENCIES
155
154
  jruby-openssl
156
155
  mocha (~> 1.1)
157
156
  mongoid (~> 4.0.0)
158
- omniauth (~> 1.2.0)
157
+ omniauth (~> 1.3)
159
158
  omniauth-facebook
160
- omniauth-oauth2 (~> 1.1.0)
159
+ omniauth-oauth2 (~> 1.4)
161
160
  omniauth-openid (~> 1.0.1)
162
161
  rails!
163
162
  rdoc
data/gemfiles/Gemfile.rails-4.2-stable CHANGED
@@ -1,10 +1,10 @@
1
1
  source "https://rubygems.org"
2
2
 
3
- gemspec path: '..'
3
+ gemspec path: ".."
4
4
 
5
- gem "rails", github: 'rails/rails', branch: '4-2-stable'
6
- gem "omniauth", "~> 1.2.2"
7
- gem "omniauth-oauth2", "~> 1.2.0"
5
+ gem "rails", github: "rails/rails", branch: "4-2-stable"
6
+ gem "omniauth", "~> 1.3"
7
+ gem "omniauth-oauth2", "~> 1.4"
8
8
  gem "rdoc"
9
9
 
10
10
  group :test do
data/gemfiles/Gemfile.rails-4.2-stable.lock CHANGED
@@ -1,64 +1,64 @@
1
1
  GIT
2
2
  remote: git://github.com/rails/rails.git
3
- revision: acf654b1c4a1ffe2a90d6ea63a0b989d656bb87d
3
+ revision: 2aa27582c202148296bb169159b0bf9a47a7bd80
4
4
  branch: 4-2-stable
5
5
  specs:
6
- actionmailer (4.2.5.1)
7
- actionpack (= 4.2.5.1)
8
- actionview (= 4.2.5.1)
9
- activejob (= 4.2.5.1)
6
+ actionmailer (4.2.6)
7
+ actionpack (= 4.2.6)
8
+ actionview (= 4.2.6)
9
+ activejob (= 4.2.6)
10
10
  mail (~> 2.5, >= 2.5.4)
11
11
  rails-dom-testing (~> 1.0, >= 1.0.5)
12
- actionpack (4.2.5.1)
13
- actionview (= 4.2.5.1)
14
- activesupport (= 4.2.5.1)
12
+ actionpack (4.2.6)
13
+ actionview (= 4.2.6)
14
+ activesupport (= 4.2.6)
15
15
  rack (~> 1.6)
16
16
  rack-test (~> 0.6.2)
17
17
  rails-dom-testing (~> 1.0, >= 1.0.5)
18
18
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
19
- actionview (4.2.5.1)
20
- activesupport (= 4.2.5.1)
19
+ actionview (4.2.6)
20
+ activesupport (= 4.2.6)
21
21
  builder (~> 3.1)
22
22
  erubis (~> 2.7.0)
23
23
  rails-dom-testing (~> 1.0, >= 1.0.5)
24
24
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
25
- activejob (4.2.5.1)
26
- activesupport (= 4.2.5.1)
25
+ activejob (4.2.6)
26
+ activesupport (= 4.2.6)
27
27
  globalid (>= 0.3.0)
28
- activemodel (4.2.5.1)
29
- activesupport (= 4.2.5.1)
28
+ activemodel (4.2.6)
29
+ activesupport (= 4.2.6)
30
30
  builder (~> 3.1)
31
- activerecord (4.2.5.1)
32
- activemodel (= 4.2.5.1)
33
- activesupport (= 4.2.5.1)
31
+ activerecord (4.2.6)
32
+ activemodel (= 4.2.6)
33
+ activesupport (= 4.2.6)
34
34
  arel (~> 6.0)
35
- activesupport (4.2.5.1)
35
+ activesupport (4.2.6)
36
36
  i18n (~> 0.7)
37
37
  json (~> 1.7, >= 1.7.7)
38
38
  minitest (~> 5.1)
39
39
  thread_safe (~> 0.3, >= 0.3.4)
40
40
  tzinfo (~> 1.1)
41
- rails (4.2.5.1)
42
- actionmailer (= 4.2.5.1)
43
- actionpack (= 4.2.5.1)
44
- actionview (= 4.2.5.1)
45
- activejob (= 4.2.5.1)
46
- activemodel (= 4.2.5.1)
47
- activerecord (= 4.2.5.1)
48
- activesupport (= 4.2.5.1)
41
+ rails (4.2.6)
42
+ actionmailer (= 4.2.6)
43
+ actionpack (= 4.2.6)
44
+ actionview (= 4.2.6)
45
+ activejob (= 4.2.6)
46
+ activemodel (= 4.2.6)
47
+ activerecord (= 4.2.6)
48
+ activesupport (= 4.2.6)
49
49
  bundler (>= 1.3.0, < 2.0)
50
- railties (= 4.2.5.1)
50
+ railties (= 4.2.6)
51
51
  sprockets-rails
52
- railties (4.2.5.1)
53
- actionpack (= 4.2.5.1)
54
- activesupport (= 4.2.5.1)
52
+ railties (4.2.6)
53
+ actionpack (= 4.2.6)
54
+ activesupport (= 4.2.6)
55
55
  rake (>= 0.8.7)
56
56
  thor (>= 0.18.1, < 2.0)
57
57
 
58
58
  PATH
59
59
  remote: ..
60
60
  specs:
61
- devise (4.0.0.rc1)
61
+ devise (4.0.0.rc2)
62
62
  bcrypt (~> 3.0)
63
63
  orm_adapter (~> 0.1)
64
64
  railties (>= 4.1.0, < 5.1)
@@ -69,10 +69,10 @@ GEM
69
69
  remote: https://rubygems.org/
70
70
  specs:
71
71
  arel (6.0.3)
72
- bcrypt (3.1.10)
72
+ bcrypt (3.1.11)
73
73
  bson (3.2.6)
74
74
  builder (3.2.2)
75
- concurrent-ruby (1.0.0)
75
+ concurrent-ruby (1.0.1)
76
76
  connection_pool (2.2.0)
77
77
  erubis (2.7.0)
78
78
  faraday (0.9.2)
@@ -82,13 +82,13 @@ GEM
82
82
  hashie (3.4.3)
83
83
  i18n (0.7.0)
84
84
  json (1.8.3)
85
- jwt (1.5.2)
85
+ jwt (1.5.1)
86
86
  loofah (2.0.3)
87
87
  nokogiri (>= 1.5.9)
88
88
  mail (2.6.3)
89
89
  mime-types (>= 1.16, < 3)
90
90
  metaclass (0.0.4)
91
- mime-types (2.99)
91
+ mime-types (2.99.1)
92
92
  mini_portile2 (2.0.0)
93
93
  minitest (5.8.4)
94
94
  mocha (1.1.0)
@@ -107,20 +107,18 @@ GEM
107
107
  multipart-post (2.0.0)
108
108
  nokogiri (1.6.7.2)
109
109
  mini_portile2 (~> 2.0.0.rc2)
110
- oauth2 (1.0.0)
110
+ oauth2 (1.1.0)
111
111
  faraday (>= 0.8, < 0.10)
112
- jwt (~> 1.0)
112
+ jwt (~> 1.0, < 1.5.2)
113
113
  multi_json (~> 1.3)
114
114
  multi_xml (~> 0.5)
115
- rack (~> 1.2)
116
- omniauth (1.2.2)
115
+ rack (>= 1.2, < 3)
116
+ omniauth (1.3.1)
117
117
  hashie (>= 1.2, < 4)
118
- rack (~> 1.0)
118
+ rack (>= 1.0, < 3)
119
119
  omniauth-facebook (3.0.0)
120
120
  omniauth-oauth2 (~> 1.2)
121
- omniauth-oauth2 (1.2.0)
122
- faraday (>= 0.8, < 0.10)
123
- multi_json (~> 1.3)
121
+ omniauth-oauth2 (1.4.0)
124
122
  oauth2 (~> 1.0)
125
123
  omniauth (~> 1.2)
126
124
  omniauth-openid (1.0.1)
@@ -143,15 +141,16 @@ GEM
143
141
  rails-deprecated_sanitizer (>= 1.0.1)
144
142
  rails-html-sanitizer (1.0.3)
145
143
  loofah (~> 2.0)
146
- rake (10.5.0)
147
- rdoc (4.2.1)
144
+ rake (11.0.1)
145
+ rdoc (4.2.2)
146
+ json (~> 1.4)
148
147
  responders (2.1.1)
149
148
  railties (>= 4.2.0, < 5.1)
150
149
  ruby-openid (2.7.0)
151
150
  sprockets (3.5.2)
152
151
  concurrent-ruby (~> 1.0)
153
152
  rack (> 1, < 3)
154
- sprockets-rails (3.0.0)
153
+ sprockets-rails (3.0.4)
155
154
  actionpack (>= 4.0)
156
155
  activesupport (>= 4.0)
157
156
  sprockets (>= 3.0.0)
@@ -177,9 +176,9 @@ DEPENDENCIES
177
176
  jruby-openssl
178
177
  mocha (~> 1.1)
179
178
  mongoid (~> 4.0.0)
180
- omniauth (~> 1.2.2)
179
+ omniauth (~> 1.3)
181
180
  omniauth-facebook
182
- omniauth-oauth2 (~> 1.2.0)
181
+ omniauth-oauth2 (~> 1.4)
183
182
  omniauth-openid (~> 1.0.1)
184
183
  rails!
185
184
  rdoc
data/gemfiles/Gemfile.rails-5.0-beta CHANGED
@@ -1,37 +1,37 @@
1
- source 'https://rubygems.org'
1
+ source "https://rubygems.org"
2
2
 
3
- gemspec path: '..'
3
+ gemspec path: ".."
4
4
 
5
- gem 'rails', '5.0.0.beta1.1'
6
- gem 'omniauth', '~>1.3.1'
7
- gem 'oauth2', github: 'intridea/oauth2', branch: 'master'
8
- gem 'omniauth-oauth2', '>= 1.2.0', '< 1.5.0'
9
- gem 'rdoc'
5
+ gem "rails", "5.0.0.beta3"
6
+ gem "omniauth", " ~>1.3"
7
+ gem "oauth2"
8
+ gem "omniauth-oauth2", ">= 1.2.0", "< 1.5.0"
9
+ gem "rdoc"
10
10
 
11
- gem 'activemodel-serializers-xml', github: 'rails/activemodel-serializers-xml'
11
+ gem "activemodel-serializers-xml", github: "rails/activemodel-serializers-xml"
12
12
 
13
- gem 'rails-controller-testing'
13
+ gem "rails-controller-testing"
14
14
 
15
- gem 'responders', '~>2.1.1'
15
+ gem "responders", "~> 2.1.1"
16
16
 
17
17
  group :test do
18
- gem 'omniauth-facebook'
19
- gem 'omniauth-openid', '~> 1.0.1'
20
- gem 'webrat', '0.7.3', require: false
21
- gem 'mocha', '~> 1.1', require: false
18
+ gem "omniauth-facebook"
19
+ gem "omniauth-openid", "~> 1.0.1"
20
+ gem "webrat", "0.7.3", require: false
21
+ gem "mocha", "~> 1.1", require: false
22
22
  end
23
23
 
24
24
  platforms :jruby do
25
- gem 'activerecord-jdbc-adapter'
26
- gem 'activerecord-jdbcsqlite3-adapter'
27
- gem 'jruby-openssl'
25
+ gem "activerecord-jdbc-adapter"
26
+ gem "activerecord-jdbcsqlite3-adapter"
27
+ gem "jruby-openssl"
28
28
  end
29
29
 
30
30
  platforms :ruby do
31
- gem 'sqlite3'
31
+ gem "sqlite3"
32
32
  end
33
33
 
34
34
  # TODO:
35
35
  # group :mongoid do
36
- # gem 'mongoid', '~> 4.0.0'
36
+ # gem "mongoid", "~> 4.0.0"
37
37
  # end
data/gemfiles/Gemfile.rails-5.0-beta.lock CHANGED
@@ -1,28 +1,17 @@
1
- GIT
2
- remote: git://github.com/intridea/oauth2.git
3
- revision: 43e1fdd87e95a5b02438d5cce6a67e411afb5fec
4
- branch: master
5
- specs:
6
- oauth2 (1.0.0)
7
- faraday (>= 0.8, < 0.10)
8
- jwt (~> 1.0, < 1.5.2)
9
- multi_json (~> 1.3)
10
- multi_xml (~> 0.5)
11
- rack (>= 1.2, < 3)
12
-
13
1
  GIT
14
2
  remote: git://github.com/rails/activemodel-serializers-xml.git
15
- revision: 1f72d9507c91b1cda10d1d20eac2b74dd6d9d4b9
3
+ revision: ad5ff3a9262576362792196a991de1d1778c5f48
16
4
  specs:
17
- activemodel-serializers-xml (0.1.0)
18
- activemodel
19
- activerecord
20
- activesupport
5
+ activemodel-serializers-xml (1.0.0)
6
+ activemodel (> 5.x)
7
+ activerecord (> 5.x)
8
+ activesupport (> 5.x)
9
+ builder (~> 3.1)
21
10
 
22
11
  PATH
23
12
  remote: ..
24
13
  specs:
25
- devise (4.0.0.rc1)
14
+ devise (4.0.0.rc2)
26
15
  bcrypt (~> 3.0)
27
16
  orm_adapter (~> 0.1)
28
17
  railties (>= 4.1.0, < 5.1)
@@ -32,94 +21,53 @@ PATH
32
21
  GEM
33
22
  remote: https://rubygems.org/
34
23
  specs:
35
- actioncable (5.0.0.beta1.1)
36
- actionpack (= 5.0.0.beta1.1)
37
- celluloid (~> 0.17.2)
38
- coffee-rails (~> 4.1.0)
39
- em-hiredis (~> 0.3.0)
40
- faye-websocket (~> 0.10.0)
41
- redis (~> 3.0)
24
+ actioncable (5.0.0.beta3)
25
+ actionpack (= 5.0.0.beta3)
26
+ nio4r (~> 1.2)
42
27
  websocket-driver (~> 0.6.1)
43
- actionmailer (5.0.0.beta1.1)
44
- actionpack (= 5.0.0.beta1.1)
45
- actionview (= 5.0.0.beta1.1)
46
- activejob (= 5.0.0.beta1.1)
28
+ actionmailer (5.0.0.beta3)
29
+ actionpack (= 5.0.0.beta3)
30
+ actionview (= 5.0.0.beta3)
31
+ activejob (= 5.0.0.beta3)
47
32
  mail (~> 2.5, >= 2.5.4)
48
33
  rails-dom-testing (~> 1.0, >= 1.0.5)
49
- actionpack (5.0.0.beta1.1)
50
- actionview (= 5.0.0.beta1.1)
51
- activesupport (= 5.0.0.beta1.1)
34
+ actionpack (5.0.0.beta3)
35
+ actionview (= 5.0.0.beta3)
36
+ activesupport (= 5.0.0.beta3)
52
37
  rack (~> 2.x)
53
38
  rack-test (~> 0.6.3)
54
39
  rails-dom-testing (~> 1.0, >= 1.0.5)
55
40
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
56
- actionview (5.0.0.beta1.1)
57
- activesupport (= 5.0.0.beta1.1)
41
+ actionview (5.0.0.beta3)
42
+ activesupport (= 5.0.0.beta3)
58
43
  builder (~> 3.1)
59
44
  erubis (~> 2.7.0)
60
45
  rails-dom-testing (~> 1.0, >= 1.0.5)
61
46
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
62
- activejob (5.0.0.beta1.1)
63
- activesupport (= 5.0.0.beta1.1)
47
+ activejob (5.0.0.beta3)
48
+ activesupport (= 5.0.0.beta3)
64
49
  globalid (>= 0.3.6)
65
- activemodel (5.0.0.beta1.1)
66
- activesupport (= 5.0.0.beta1.1)
67
- builder (~> 3.1)
68
- activerecord (5.0.0.beta1.1)
69
- activemodel (= 5.0.0.beta1.1)
70
- activesupport (= 5.0.0.beta1.1)
50
+ activemodel (5.0.0.beta3)
51
+ activesupport (= 5.0.0.beta3)
52
+ activerecord (5.0.0.beta3)
53
+ activemodel (= 5.0.0.beta3)
54
+ activesupport (= 5.0.0.beta3)
71
55
  arel (~> 7.0)
72
- activesupport (5.0.0.beta1.1)
56
+ activesupport (5.0.0.beta3)
73
57
  concurrent-ruby (~> 1.0)
74
58
  i18n (~> 0.7)
75
- json (~> 1.7, >= 1.7.7)
76
- method_source
77
59
  minitest (~> 5.1)
78
60
  tzinfo (~> 1.1)
79
61
  arel (7.0.0)
80
- bcrypt (3.1.10)
62
+ bcrypt (3.1.11)
81
63
  builder (3.2.2)
82
- celluloid (0.17.3)
83
- celluloid-essentials
84
- celluloid-extras
85
- celluloid-fsm
86
- celluloid-pool
87
- celluloid-supervision
88
- timers (>= 4.1.1)
89
- celluloid-essentials (0.20.5)
90
- timers (>= 4.1.1)
91
- celluloid-extras (0.20.5)
92
- timers (>= 4.1.1)
93
- celluloid-fsm (0.20.5)
94
- timers (>= 4.1.1)
95
- celluloid-pool (0.20.5)
96
- timers (>= 4.1.1)
97
- celluloid-supervision (0.20.5)
98
- timers (>= 4.1.1)
99
- coffee-rails (4.1.1)
100
- coffee-script (>= 2.2.0)
101
- railties (>= 4.0.0, < 5.1.x)
102
- coffee-script (2.4.1)
103
- coffee-script-source
104
- execjs
105
- coffee-script-source (1.10.0)
106
- concurrent-ruby (1.0.0)
107
- em-hiredis (0.3.0)
108
- eventmachine (~> 1.0)
109
- hiredis (~> 0.5.0)
64
+ concurrent-ruby (1.0.1)
110
65
  erubis (2.7.0)
111
- eventmachine (1.0.9.1)
112
- execjs (2.6.0)
113
66
  faraday (0.9.2)
114
67
  multipart-post (>= 1.2, < 3)
115
- faye-websocket (0.10.2)
116
- eventmachine (>= 0.12.0)
117
- websocket-driver (>= 0.5.1)
118
68
  globalid (0.3.6)
119
69
  activesupport (>= 4.1.0)
120
70
  hashie (3.4.3)
121
- hiredis (0.5.2)
122
- hitimes (1.2.3)
123
71
  i18n (0.7.0)
124
72
  json (1.8.3)
125
73
  jwt (1.5.1)
@@ -129,7 +77,7 @@ GEM
129
77
  mime-types (>= 1.16, < 3)
130
78
  metaclass (0.0.4)
131
79
  method_source (0.8.2)
132
- mime-types (2.99)
80
+ mime-types (2.99.1)
133
81
  mini_portile2 (2.0.0)
134
82
  minitest (5.8.4)
135
83
  mocha (1.1.0)
@@ -137,8 +85,15 @@ GEM
137
85
  multi_json (1.11.2)
138
86
  multi_xml (0.5.5)
139
87
  multipart-post (2.0.0)
88
+ nio4r (1.2.1)
140
89
  nokogiri (1.6.7.2)
141
90
  mini_portile2 (~> 2.0.0.rc2)
91
+ oauth2 (1.1.0)
92
+ faraday (>= 0.8, < 0.10)
93
+ jwt (~> 1.0, < 1.5.2)
94
+ multi_json (~> 1.3)
95
+ multi_xml (~> 0.5)
96
+ rack (>= 1.2, < 3)
142
97
  omniauth (1.3.1)
143
98
  hashie (>= 1.2, < 4)
144
99
  rack (>= 1.0, < 3)
@@ -158,20 +113,22 @@ GEM
158
113
  ruby-openid (>= 2.1.8)
159
114
  rack-test (0.6.3)
160
115
  rack (>= 1.0)
161
- rails (5.0.0.beta1.1)
162
- actioncable (= 5.0.0.beta1.1)
163
- actionmailer (= 5.0.0.beta1.1)
164
- actionpack (= 5.0.0.beta1.1)
165
- actionview (= 5.0.0.beta1.1)
166
- activejob (= 5.0.0.beta1.1)
167
- activemodel (= 5.0.0.beta1.1)
168
- activerecord (= 5.0.0.beta1.1)
169
- activesupport (= 5.0.0.beta1.1)
116
+ rails (5.0.0.beta3)
117
+ actioncable (= 5.0.0.beta3)
118
+ actionmailer (= 5.0.0.beta3)
119
+ actionpack (= 5.0.0.beta3)
120
+ actionview (= 5.0.0.beta3)
121
+ activejob (= 5.0.0.beta3)
122
+ activemodel (= 5.0.0.beta3)
123
+ activerecord (= 5.0.0.beta3)
124
+ activesupport (= 5.0.0.beta3)
170
125
  bundler (>= 1.3.0, < 2.0)
171
- railties (= 5.0.0.beta1.1)
126
+ railties (= 5.0.0.beta3)
172
127
  sprockets-rails (>= 2.0.0)
173
- rails-controller-testing (0.0.3)
174
- rails (>= 4.2)
128
+ rails-controller-testing (0.1.1)
129
+ actionpack (~> 5.x)
130
+ actionview (~> 5.x)
131
+ activesupport (~> 5.x)
175
132
  rails-deprecated_sanitizer (1.0.3)
176
133
  activesupport (>= 4.2.0.alpha)
177
134
  rails-dom-testing (1.0.7)
@@ -180,30 +137,28 @@ GEM
180
137
  rails-deprecated_sanitizer (>= 1.0.1)
181
138
  rails-html-sanitizer (1.0.3)
182
139
  loofah (~> 2.0)
183
- railties (5.0.0.beta1.1)
184
- actionpack (= 5.0.0.beta1.1)
185
- activesupport (= 5.0.0.beta1.1)
140
+ railties (5.0.0.beta3)
141
+ actionpack (= 5.0.0.beta3)
142
+ activesupport (= 5.0.0.beta3)
186
143
  method_source
187
144
  rake (>= 0.8.7)
188
145
  thor (>= 0.18.1, < 2.0)
189
- rake (10.5.0)
190
- rdoc (4.2.1)
191
- redis (3.2.2)
146
+ rake (11.0.1)
147
+ rdoc (4.2.2)
148
+ json (~> 1.4)
192
149
  responders (2.1.1)
193
150
  railties (>= 4.2.0, < 5.1)
194
151
  ruby-openid (2.7.0)
195
152
  sprockets (3.5.2)
196
153
  concurrent-ruby (~> 1.0)
197
154
  rack (> 1, < 3)
198
- sprockets-rails (3.0.0)
155
+ sprockets-rails (3.0.4)
199
156
  actionpack (>= 4.0)
200
157
  activesupport (>= 4.0)
201
158
  sprockets (>= 3.0.0)
202
159
  sqlite3 (1.3.11)
203
160
  thor (0.19.1)
204
161
  thread_safe (0.3.5)
205
- timers (4.1.1)
206
- hitimes
207
162
  tzinfo (1.2.2)
208
163
  thread_safe (~> 0.1)
209
164
  warden (1.2.6)
@@ -226,12 +181,12 @@ DEPENDENCIES
226
181
  devise!
227
182
  jruby-openssl
228
183
  mocha (~> 1.1)
229
- oauth2!
230
- omniauth (~> 1.3.1)
184
+ oauth2
185
+ omniauth (~> 1.3)
231
186
  omniauth-facebook
232
187
  omniauth-oauth2 (>= 1.2.0, < 1.5.0)
233
188
  omniauth-openid (~> 1.0.1)
234
- rails (= 5.0.0.beta1.1)
189
+ rails (= 5.0.0.beta3)
235
190
  rails-controller-testing
236
191
  rdoc
237
192
  responders (~> 2.1.1)