devise 3.3.0 → 3.5.10
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.
- checksums.yaml +4 -4
- data/.travis.yml +29 -20
- data/CHANGELOG.md +219 -102
- data/CODE_OF_CONDUCT.md +22 -0
- data/CONTRIBUTING.md +2 -0
- data/Gemfile +3 -2
- data/Gemfile.lock +101 -80
- data/MIT-LICENSE +1 -1
- data/README.md +87 -43
- data/Rakefile +2 -1
- data/app/controllers/devise/confirmations_controller.rb +5 -1
- data/app/controllers/devise/omniauth_callbacks_controller.rb +4 -0
- data/app/controllers/devise/passwords_controller.rb +14 -4
- data/app/controllers/devise/registrations_controller.rb +10 -11
- data/app/controllers/devise/sessions_controller.rb +7 -2
- data/app/controllers/devise/unlocks_controller.rb +3 -0
- data/app/controllers/devise_controller.rb +44 -21
- data/app/mailers/devise/mailer.rb +4 -0
- data/app/views/devise/confirmations/new.html.erb +7 -3
- data/app/views/devise/mailer/password_change.html.erb +3 -0
- data/app/views/devise/passwords/edit.html.erb +14 -5
- data/app/views/devise/passwords/new.html.erb +7 -3
- data/app/views/devise/registrations/edit.html.erb +19 -9
- data/app/views/devise/registrations/new.html.erb +18 -7
- data/app/views/devise/sessions/new.html.erb +15 -6
- data/app/views/devise/shared/{_links.erb → _links.html.erb} +1 -1
- data/app/views/devise/unlocks/new.html.erb +7 -3
- data/config/locales/en.yml +4 -2
- data/devise.gemspec +2 -2
- data/gemfiles/Gemfile.rails-3.2-stable.lock +54 -48
- data/gemfiles/Gemfile.rails-4.0-stable +1 -0
- data/gemfiles/Gemfile.rails-4.0-stable.lock +63 -59
- data/gemfiles/{Gemfile.rails-head → Gemfile.rails-4.1-stable} +3 -5
- data/gemfiles/Gemfile.rails-4.1-stable.lock +171 -0
- data/gemfiles/Gemfile.rails-4.2-stable +30 -0
- data/gemfiles/Gemfile.rails-4.2-stable.lock +193 -0
- data/lib/devise/controllers/helpers.rb +12 -6
- data/lib/devise/controllers/rememberable.rb +9 -2
- data/lib/devise/controllers/sign_in_out.rb +2 -8
- data/lib/devise/controllers/store_location.rb +3 -1
- data/lib/devise/controllers/url_helpers.rb +7 -9
- data/lib/devise/encryptor.rb +22 -0
- data/lib/devise/failure_app.rb +56 -14
- data/lib/devise/hooks/timeoutable.rb +5 -7
- data/lib/devise/mapping.rb +2 -1
- data/lib/devise/models/authenticatable.rb +28 -28
- data/lib/devise/models/confirmable.rb +51 -17
- data/lib/devise/models/database_authenticatable.rb +17 -11
- data/lib/devise/models/lockable.rb +7 -3
- data/lib/devise/models/recoverable.rb +23 -15
- data/lib/devise/models/rememberable.rb +56 -22
- data/lib/devise/models/timeoutable.rb +0 -6
- data/lib/devise/models/trackable.rb +1 -2
- data/lib/devise/models/validatable.rb +3 -3
- data/lib/devise/models.rb +1 -1
- data/lib/devise/rails/routes.rb +33 -27
- data/lib/devise/rails.rb +1 -1
- data/lib/devise/strategies/authenticatable.rb +8 -6
- data/lib/devise/strategies/database_authenticatable.rb +2 -1
- data/lib/devise/strategies/rememberable.rb +13 -3
- data/lib/devise/test_helpers.rb +2 -2
- data/lib/devise/version.rb +1 -1
- data/lib/devise.rb +39 -37
- data/lib/generators/active_record/devise_generator.rb +2 -1
- data/lib/generators/active_record/templates/migration.rb +1 -1
- data/lib/generators/active_record/templates/migration_existing.rb +1 -1
- data/lib/generators/devise/controllers_generator.rb +44 -0
- data/lib/generators/devise/views_generator.rb +14 -3
- data/lib/generators/templates/controllers/README +14 -0
- data/lib/generators/templates/controllers/confirmations_controller.rb +28 -0
- data/lib/generators/templates/controllers/omniauth_callbacks_controller.rb +28 -0
- data/lib/generators/templates/controllers/passwords_controller.rb +32 -0
- data/lib/generators/templates/controllers/registrations_controller.rb +60 -0
- data/lib/generators/templates/controllers/sessions_controller.rb +25 -0
- data/lib/generators/templates/controllers/unlocks_controller.rb +28 -0
- data/lib/generators/templates/devise.rb +19 -13
- data/lib/generators/templates/markerb/confirmation_instructions.markerb +1 -1
- data/lib/generators/templates/markerb/password_change.markerb +3 -0
- data/lib/generators/templates/markerb/reset_password_instructions.markerb +1 -1
- data/lib/generators/templates/markerb/unlock_instructions.markerb +1 -1
- data/lib/generators/templates/simple_form_for/passwords/edit.html.erb +1 -1
- data/lib/generators/templates/simple_form_for/registrations/new.html.erb +1 -1
- data/lib/generators/templates/simple_form_for/sessions/new.html.erb +2 -2
- data/test/controllers/custom_registrations_controller_test.rb +6 -1
- data/test/controllers/helper_methods_test.rb +21 -0
- data/test/controllers/helpers_test.rb +5 -0
- data/test/controllers/inherited_controller_i18n_messages_test.rb +51 -0
- data/test/controllers/internal_helpers_test.rb +10 -4
- data/test/controllers/load_hooks_controller_test.rb +19 -0
- data/test/controllers/passwords_controller_test.rb +1 -1
- data/test/controllers/sessions_controller_test.rb +3 -3
- data/test/controllers/url_helpers_test.rb +6 -0
- data/test/devise_test.rb +3 -3
- data/test/failure_app_test.rb +47 -0
- data/test/generators/controllers_generator_test.rb +48 -0
- data/test/generators/views_generator_test.rb +8 -1
- data/test/helpers/devise_helper_test.rb +9 -12
- data/test/integration/authenticatable_test.rb +1 -1
- data/test/integration/database_authenticatable_test.rb +11 -0
- data/test/integration/http_authenticatable_test.rb +1 -1
- data/test/integration/omniauthable_test.rb +12 -10
- data/test/integration/recoverable_test.rb +13 -0
- data/test/integration/rememberable_test.rb +50 -3
- data/test/integration/timeoutable_test.rb +13 -18
- data/test/mailers/confirmation_instructions_test.rb +1 -1
- data/test/mapping_test.rb +7 -0
- data/test/models/authenticatable_test.rb +10 -0
- data/test/models/confirmable_test.rb +99 -42
- data/test/models/database_authenticatable_test.rb +20 -0
- data/test/models/lockable_test.rb +45 -17
- data/test/models/recoverable_test.rb +62 -7
- data/test/models/rememberable_test.rb +68 -97
- data/test/models/validatable_test.rb +5 -5
- data/test/models_test.rb +15 -6
- data/test/rails_app/app/active_record/user_without_email.rb +8 -0
- data/test/rails_app/app/controllers/admins_controller.rb +0 -5
- data/test/rails_app/app/controllers/custom/registrations_controller.rb +10 -0
- data/test/rails_app/app/mailers/users/from_proc_mailer.rb +3 -0
- data/test/rails_app/app/mailers/users/mailer.rb +0 -9
- data/test/rails_app/app/mailers/users/reply_to_mailer.rb +4 -0
- data/test/rails_app/app/mongoid/user_without_email.rb +33 -0
- data/test/rails_app/config/application.rb +1 -1
- data/test/rails_app/config/environments/production.rb +6 -2
- data/test/rails_app/config/environments/test.rb +7 -2
- data/test/rails_app/config/initializers/devise.rb +12 -15
- data/test/rails_app/config/routes.rb +6 -3
- data/test/rails_app/db/migrate/20100401102949_create_tables.rb +2 -2
- data/test/rails_app/lib/shared_user.rb +1 -1
- data/test/rails_app/lib/shared_user_without_email.rb +26 -0
- data/test/rails_test.rb +9 -0
- data/test/support/helpers.rb +13 -6
- data/test/support/integration.rb +2 -2
- data/test/test_helper.rb +5 -0
- data/test/test_helpers_test.rb +22 -7
- data/test/test_models.rb +2 -2
- data/test/time_helpers.rb +137 -0
- metadata +58 -8
- data/gemfiles/Gemfile.rails-head.lock +0 -190
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
GIT
|
|
2
2
|
remote: git://github.com/rails/rails.git
|
|
3
|
-
revision:
|
|
3
|
+
revision: f85bbed4cdc1bdfd1e0dbd97bce9db81e44cbd11
|
|
4
4
|
branch: 3-2-stable
|
|
5
5
|
specs:
|
|
6
|
-
actionmailer (3.2.
|
|
7
|
-
actionpack (= 3.2.
|
|
6
|
+
actionmailer (3.2.22.2)
|
|
7
|
+
actionpack (= 3.2.22.2)
|
|
8
8
|
mail (~> 2.5.4)
|
|
9
|
-
actionpack (3.2.
|
|
10
|
-
activemodel (= 3.2.
|
|
11
|
-
activesupport (= 3.2.
|
|
9
|
+
actionpack (3.2.22.2)
|
|
10
|
+
activemodel (= 3.2.22.2)
|
|
11
|
+
activesupport (= 3.2.22.2)
|
|
12
12
|
builder (~> 3.0.0)
|
|
13
13
|
erubis (~> 2.7.0)
|
|
14
14
|
journey (~> 1.0.4)
|
|
@@ -16,31 +16,31 @@ GIT
|
|
|
16
16
|
rack-cache (~> 1.2)
|
|
17
17
|
rack-test (~> 0.6.1)
|
|
18
18
|
sprockets (~> 2.2.1)
|
|
19
|
-
activemodel (3.2.
|
|
20
|
-
activesupport (= 3.2.
|
|
19
|
+
activemodel (3.2.22.2)
|
|
20
|
+
activesupport (= 3.2.22.2)
|
|
21
21
|
builder (~> 3.0.0)
|
|
22
|
-
activerecord (3.2.
|
|
23
|
-
activemodel (= 3.2.
|
|
24
|
-
activesupport (= 3.2.
|
|
22
|
+
activerecord (3.2.22.2)
|
|
23
|
+
activemodel (= 3.2.22.2)
|
|
24
|
+
activesupport (= 3.2.22.2)
|
|
25
25
|
arel (~> 3.0.2)
|
|
26
26
|
tzinfo (~> 0.3.29)
|
|
27
|
-
activeresource (3.2.
|
|
28
|
-
activemodel (= 3.2.
|
|
29
|
-
activesupport (= 3.2.
|
|
30
|
-
activesupport (3.2.
|
|
27
|
+
activeresource (3.2.22.2)
|
|
28
|
+
activemodel (= 3.2.22.2)
|
|
29
|
+
activesupport (= 3.2.22.2)
|
|
30
|
+
activesupport (3.2.22.2)
|
|
31
31
|
i18n (~> 0.6, >= 0.6.4)
|
|
32
32
|
multi_json (~> 1.0)
|
|
33
|
-
rails (3.2.
|
|
34
|
-
actionmailer (= 3.2.
|
|
35
|
-
actionpack (= 3.2.
|
|
36
|
-
activerecord (= 3.2.
|
|
37
|
-
activeresource (= 3.2.
|
|
38
|
-
activesupport (= 3.2.
|
|
33
|
+
rails (3.2.22.2)
|
|
34
|
+
actionmailer (= 3.2.22.2)
|
|
35
|
+
actionpack (= 3.2.22.2)
|
|
36
|
+
activerecord (= 3.2.22.2)
|
|
37
|
+
activeresource (= 3.2.22.2)
|
|
38
|
+
activesupport (= 3.2.22.2)
|
|
39
39
|
bundler (~> 1.0)
|
|
40
|
-
railties (= 3.2.
|
|
41
|
-
railties (3.2.
|
|
42
|
-
actionpack (= 3.2.
|
|
43
|
-
activesupport (= 3.2.
|
|
40
|
+
railties (= 3.2.22.2)
|
|
41
|
+
railties (3.2.22.2)
|
|
42
|
+
actionpack (= 3.2.22.2)
|
|
43
|
+
activesupport (= 3.2.22.2)
|
|
44
44
|
rack-ssl (~> 1.3.2)
|
|
45
45
|
rake (>= 0.8.7)
|
|
46
46
|
rdoc (~> 3.4)
|
|
@@ -49,10 +49,11 @@ GIT
|
|
|
49
49
|
PATH
|
|
50
50
|
remote: ..
|
|
51
51
|
specs:
|
|
52
|
-
devise (3.
|
|
52
|
+
devise (3.5.8)
|
|
53
53
|
bcrypt (~> 3.0)
|
|
54
54
|
orm_adapter (~> 0.1)
|
|
55
55
|
railties (>= 3.2.6, < 5)
|
|
56
|
+
responders
|
|
56
57
|
thread_safe (~> 0.1)
|
|
57
58
|
warden (~> 1.2.3)
|
|
58
59
|
|
|
@@ -60,36 +61,36 @@ GEM
|
|
|
60
61
|
remote: https://rubygems.org/
|
|
61
62
|
specs:
|
|
62
63
|
arel (3.0.3)
|
|
63
|
-
bcrypt (3.1.
|
|
64
|
+
bcrypt (3.1.11)
|
|
64
65
|
builder (3.0.4)
|
|
65
66
|
erubis (2.7.0)
|
|
66
|
-
faraday (0.9.
|
|
67
|
+
faraday (0.9.2)
|
|
67
68
|
multipart-post (>= 1.2, < 3)
|
|
68
|
-
hashie (3.
|
|
69
|
+
hashie (3.4.3)
|
|
69
70
|
hike (1.2.3)
|
|
70
|
-
i18n (0.
|
|
71
|
+
i18n (0.7.0)
|
|
71
72
|
journey (1.0.4)
|
|
72
|
-
json (1.8.
|
|
73
|
-
jwt (1.
|
|
73
|
+
json (1.8.3)
|
|
74
|
+
jwt (1.5.4)
|
|
74
75
|
mail (2.5.4)
|
|
75
76
|
mime-types (~> 1.16)
|
|
76
77
|
treetop (~> 1.4.8)
|
|
77
78
|
metaclass (0.0.4)
|
|
78
79
|
mime-types (1.25.1)
|
|
79
|
-
|
|
80
|
+
mini_portile2 (2.0.0)
|
|
80
81
|
mocha (1.1.0)
|
|
81
82
|
metaclass (~> 0.0.1)
|
|
82
|
-
mongoid (3.1.
|
|
83
|
+
mongoid (3.1.7)
|
|
83
84
|
activemodel (~> 3.2)
|
|
84
85
|
moped (~> 1.4)
|
|
85
86
|
origin (~> 1.0)
|
|
86
87
|
tzinfo (~> 0.3.29)
|
|
87
|
-
moped (1.5.
|
|
88
|
-
multi_json (1.
|
|
88
|
+
moped (1.5.3)
|
|
89
|
+
multi_json (1.11.3)
|
|
89
90
|
multi_xml (0.5.5)
|
|
90
91
|
multipart-post (2.0.0)
|
|
91
|
-
nokogiri (1.6.
|
|
92
|
-
|
|
92
|
+
nokogiri (1.6.7.2)
|
|
93
|
+
mini_portile2 (~> 2.0.0.rc2)
|
|
93
94
|
oauth2 (0.9.4)
|
|
94
95
|
faraday (>= 0.8, < 0.10)
|
|
95
96
|
jwt (~> 1.0)
|
|
@@ -112,34 +113,36 @@ GEM
|
|
|
112
113
|
origin (1.1.0)
|
|
113
114
|
orm_adapter (0.5.0)
|
|
114
115
|
polyglot (0.3.5)
|
|
115
|
-
rack (1.4.
|
|
116
|
-
rack-cache (1.
|
|
116
|
+
rack (1.4.7)
|
|
117
|
+
rack-cache (1.6.1)
|
|
117
118
|
rack (>= 0.4)
|
|
118
119
|
rack-openid (1.3.1)
|
|
119
120
|
rack (>= 1.1.0)
|
|
120
121
|
ruby-openid (>= 2.1.8)
|
|
121
122
|
rack-ssl (1.3.4)
|
|
122
123
|
rack
|
|
123
|
-
rack-test (0.6.
|
|
124
|
+
rack-test (0.6.3)
|
|
124
125
|
rack (>= 1.0)
|
|
125
|
-
rake (
|
|
126
|
+
rake (11.1.2)
|
|
126
127
|
rdoc (3.12.2)
|
|
127
128
|
json (~> 1.4)
|
|
128
|
-
|
|
129
|
-
|
|
129
|
+
responders (1.1.2)
|
|
130
|
+
railties (>= 3.2, < 4.2)
|
|
131
|
+
ruby-openid (2.7.0)
|
|
132
|
+
sprockets (2.2.3)
|
|
130
133
|
hike (~> 1.2)
|
|
131
134
|
multi_json (~> 1.0)
|
|
132
135
|
rack (~> 1.0)
|
|
133
136
|
tilt (~> 1.1, != 1.3.0)
|
|
134
|
-
sqlite3 (1.3.
|
|
137
|
+
sqlite3 (1.3.11)
|
|
135
138
|
thor (0.19.1)
|
|
136
|
-
thread_safe (0.3.
|
|
139
|
+
thread_safe (0.3.5)
|
|
137
140
|
tilt (1.4.1)
|
|
138
141
|
treetop (1.4.15)
|
|
139
142
|
polyglot
|
|
140
143
|
polyglot (>= 0.3.1)
|
|
141
|
-
tzinfo (0.3.
|
|
142
|
-
warden (1.2.
|
|
144
|
+
tzinfo (0.3.49)
|
|
145
|
+
warden (1.2.6)
|
|
143
146
|
rack (>= 1.0)
|
|
144
147
|
webrat (0.7.3)
|
|
145
148
|
nokogiri (>= 1.2.0)
|
|
@@ -164,3 +167,6 @@ DEPENDENCIES
|
|
|
164
167
|
rdoc
|
|
165
168
|
sqlite3
|
|
166
169
|
webrat (= 0.7.3)
|
|
170
|
+
|
|
171
|
+
BUNDLED WITH
|
|
172
|
+
1.11.2
|
|
@@ -1,94 +1,95 @@
|
|
|
1
1
|
GIT
|
|
2
2
|
remote: git://github.com/rails/rails.git
|
|
3
|
-
revision:
|
|
3
|
+
revision: 9be9597e510d185ca7964d0a05b4ea2a7f2d50d1
|
|
4
4
|
branch: 4-0-stable
|
|
5
5
|
specs:
|
|
6
|
-
actionmailer (4.0.
|
|
7
|
-
actionpack (= 4.0.
|
|
6
|
+
actionmailer (4.0.13)
|
|
7
|
+
actionpack (= 4.0.13)
|
|
8
8
|
mail (~> 2.5, >= 2.5.4)
|
|
9
|
-
actionpack (4.0.
|
|
10
|
-
activesupport (= 4.0.
|
|
9
|
+
actionpack (4.0.13)
|
|
10
|
+
activesupport (= 4.0.13)
|
|
11
11
|
builder (~> 3.1.0)
|
|
12
12
|
erubis (~> 2.7.0)
|
|
13
13
|
rack (~> 1.5.2)
|
|
14
14
|
rack-test (~> 0.6.2)
|
|
15
|
-
activemodel (4.0.
|
|
16
|
-
activesupport (= 4.0.
|
|
15
|
+
activemodel (4.0.13)
|
|
16
|
+
activesupport (= 4.0.13)
|
|
17
17
|
builder (~> 3.1.0)
|
|
18
|
-
activerecord (4.0.
|
|
19
|
-
activemodel (= 4.0.
|
|
18
|
+
activerecord (4.0.13)
|
|
19
|
+
activemodel (= 4.0.13)
|
|
20
20
|
activerecord-deprecated_finders (~> 1.0.2)
|
|
21
|
-
activesupport (= 4.0.
|
|
21
|
+
activesupport (= 4.0.13)
|
|
22
22
|
arel (~> 4.0.0)
|
|
23
|
-
activesupport (4.0.
|
|
23
|
+
activesupport (4.0.13)
|
|
24
24
|
i18n (~> 0.6, >= 0.6.9)
|
|
25
25
|
minitest (~> 4.2)
|
|
26
26
|
multi_json (~> 1.3)
|
|
27
27
|
thread_safe (~> 0.1)
|
|
28
28
|
tzinfo (~> 0.3.37)
|
|
29
|
-
rails (4.0.
|
|
30
|
-
actionmailer (= 4.0.
|
|
31
|
-
actionpack (= 4.0.
|
|
32
|
-
activerecord (= 4.0.
|
|
33
|
-
activesupport (= 4.0.
|
|
29
|
+
rails (4.0.13)
|
|
30
|
+
actionmailer (= 4.0.13)
|
|
31
|
+
actionpack (= 4.0.13)
|
|
32
|
+
activerecord (= 4.0.13)
|
|
33
|
+
activesupport (= 4.0.13)
|
|
34
34
|
bundler (>= 1.3.0, < 2.0)
|
|
35
|
-
railties (= 4.0.
|
|
35
|
+
railties (= 4.0.13)
|
|
36
36
|
sprockets-rails (~> 2.0)
|
|
37
|
-
railties (4.0.
|
|
38
|
-
actionpack (= 4.0.
|
|
39
|
-
activesupport (= 4.0.
|
|
37
|
+
railties (4.0.13)
|
|
38
|
+
actionpack (= 4.0.13)
|
|
39
|
+
activesupport (= 4.0.13)
|
|
40
40
|
rake (>= 0.8.7)
|
|
41
41
|
thor (>= 0.18.1, < 2.0)
|
|
42
42
|
|
|
43
43
|
PATH
|
|
44
44
|
remote: ..
|
|
45
45
|
specs:
|
|
46
|
-
devise (3.
|
|
46
|
+
devise (3.5.8)
|
|
47
47
|
bcrypt (~> 3.0)
|
|
48
48
|
orm_adapter (~> 0.1)
|
|
49
49
|
railties (>= 3.2.6, < 5)
|
|
50
|
+
responders
|
|
50
51
|
thread_safe (~> 0.1)
|
|
51
52
|
warden (~> 1.2.3)
|
|
52
53
|
|
|
53
54
|
GEM
|
|
54
55
|
remote: https://rubygems.org/
|
|
55
56
|
specs:
|
|
56
|
-
activerecord-deprecated_finders (1.0.
|
|
57
|
+
activerecord-deprecated_finders (1.0.4)
|
|
57
58
|
arel (4.0.2)
|
|
58
|
-
bcrypt (3.1.
|
|
59
|
-
bson (2.
|
|
59
|
+
bcrypt (3.1.11)
|
|
60
|
+
bson (3.2.6)
|
|
60
61
|
builder (3.1.4)
|
|
61
|
-
|
|
62
|
+
concurrent-ruby (1.0.1)
|
|
63
|
+
connection_pool (2.2.0)
|
|
62
64
|
erubis (2.7.0)
|
|
63
|
-
faraday (0.9.
|
|
65
|
+
faraday (0.9.2)
|
|
64
66
|
multipart-post (>= 1.2, < 3)
|
|
65
|
-
hashie (3.
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
mime-types (>= 1.16, < 3)
|
|
67
|
+
hashie (3.4.3)
|
|
68
|
+
i18n (0.7.0)
|
|
69
|
+
json (1.8.3)
|
|
70
|
+
jwt (1.5.4)
|
|
71
|
+
mail (2.6.4)
|
|
72
|
+
mime-types (>= 1.16, < 4)
|
|
72
73
|
metaclass (0.0.4)
|
|
73
|
-
mime-types (2.
|
|
74
|
-
|
|
74
|
+
mime-types (2.99.1)
|
|
75
|
+
mini_portile2 (2.0.0)
|
|
75
76
|
minitest (4.7.5)
|
|
76
77
|
mocha (1.1.0)
|
|
77
78
|
metaclass (~> 0.0.1)
|
|
78
|
-
mongoid (4.0.
|
|
79
|
+
mongoid (4.0.2)
|
|
79
80
|
activemodel (~> 4.0)
|
|
80
81
|
moped (~> 2.0.0)
|
|
81
82
|
origin (~> 2.1)
|
|
82
83
|
tzinfo (>= 0.3.37)
|
|
83
|
-
moped (2.0.
|
|
84
|
-
bson (~>
|
|
84
|
+
moped (2.0.7)
|
|
85
|
+
bson (~> 3.0)
|
|
85
86
|
connection_pool (~> 2.0)
|
|
86
87
|
optionable (~> 0.2.0)
|
|
87
|
-
multi_json (1.
|
|
88
|
+
multi_json (1.11.3)
|
|
88
89
|
multi_xml (0.5.5)
|
|
89
90
|
multipart-post (2.0.0)
|
|
90
|
-
nokogiri (1.6.
|
|
91
|
-
|
|
91
|
+
nokogiri (1.6.7.2)
|
|
92
|
+
mini_portile2 (~> 2.0.0.rc2)
|
|
92
93
|
oauth2 (0.9.4)
|
|
93
94
|
faraday (>= 0.8, < 0.10)
|
|
94
95
|
jwt (~> 1.0)
|
|
@@ -109,33 +110,32 @@ GEM
|
|
|
109
110
|
omniauth (~> 1.0)
|
|
110
111
|
rack-openid (~> 1.3.1)
|
|
111
112
|
optionable (0.2.0)
|
|
112
|
-
origin (2.
|
|
113
|
+
origin (2.2.0)
|
|
113
114
|
orm_adapter (0.5.0)
|
|
114
|
-
rack (1.5.
|
|
115
|
+
rack (1.5.5)
|
|
115
116
|
rack-openid (1.3.1)
|
|
116
117
|
rack (>= 1.1.0)
|
|
117
118
|
ruby-openid (>= 2.1.8)
|
|
118
|
-
rack-test (0.6.
|
|
119
|
+
rack-test (0.6.3)
|
|
119
120
|
rack (>= 1.0)
|
|
120
|
-
rake (
|
|
121
|
-
rdoc (4.
|
|
121
|
+
rake (11.1.2)
|
|
122
|
+
rdoc (4.2.2)
|
|
122
123
|
json (~> 1.4)
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
sprockets-rails (2.
|
|
124
|
+
responders (1.1.2)
|
|
125
|
+
railties (>= 3.2, < 4.2)
|
|
126
|
+
ruby-openid (2.7.0)
|
|
127
|
+
sprockets (3.6.0)
|
|
128
|
+
concurrent-ruby (~> 1.0)
|
|
129
|
+
rack (> 1, < 3)
|
|
130
|
+
sprockets-rails (2.3.3)
|
|
130
131
|
actionpack (>= 3.0)
|
|
131
132
|
activesupport (>= 3.0)
|
|
132
|
-
sprockets (
|
|
133
|
-
sqlite3 (1.3.
|
|
133
|
+
sprockets (>= 2.8, < 4.0)
|
|
134
|
+
sqlite3 (1.3.11)
|
|
134
135
|
thor (0.19.1)
|
|
135
|
-
thread_safe (0.3.
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
warden (1.2.3)
|
|
136
|
+
thread_safe (0.3.5)
|
|
137
|
+
tzinfo (0.3.49)
|
|
138
|
+
warden (1.2.6)
|
|
139
139
|
rack (>= 1.0)
|
|
140
140
|
webrat (0.7.3)
|
|
141
141
|
nokogiri (>= 1.2.0)
|
|
@@ -150,6 +150,7 @@ DEPENDENCIES
|
|
|
150
150
|
activerecord-jdbcsqlite3-adapter
|
|
151
151
|
devise!
|
|
152
152
|
jruby-openssl
|
|
153
|
+
mime-types (~> 2.99)
|
|
153
154
|
mocha (~> 1.1)
|
|
154
155
|
mongoid (~> 4.0.0)
|
|
155
156
|
omniauth (~> 1.2.0)
|
|
@@ -160,3 +161,6 @@ DEPENDENCIES
|
|
|
160
161
|
rdoc
|
|
161
162
|
sqlite3
|
|
162
163
|
webrat (= 0.7.3)
|
|
164
|
+
|
|
165
|
+
BUNDLED WITH
|
|
166
|
+
1.11.2
|
|
@@ -2,13 +2,11 @@ source "https://rubygems.org"
|
|
|
2
2
|
|
|
3
3
|
gemspec path: '..'
|
|
4
4
|
|
|
5
|
-
gem "rails", github:
|
|
6
|
-
gem "arel", github: "rails/arel"
|
|
7
|
-
gem "rack", github: "rack/rack"
|
|
8
|
-
gem "i18n", github: "svenfuchs/i18n"
|
|
5
|
+
gem "rails", github: 'rails/rails', branch: '4-1-stable'
|
|
9
6
|
gem "omniauth", "~> 1.2.0"
|
|
10
7
|
gem "omniauth-oauth2", "~> 1.1.0"
|
|
11
8
|
gem "rdoc"
|
|
9
|
+
gem "mime-types", "~> 2.99"
|
|
12
10
|
|
|
13
11
|
group :test do
|
|
14
12
|
gem "omniauth-facebook"
|
|
@@ -28,5 +26,5 @@ platforms :ruby do
|
|
|
28
26
|
end
|
|
29
27
|
|
|
30
28
|
group :mongoid do
|
|
31
|
-
gem "mongoid",
|
|
29
|
+
gem "mongoid", "~> 4.0.0"
|
|
32
30
|
end
|
|
@@ -0,0 +1,171 @@
|
|
|
1
|
+
GIT
|
|
2
|
+
remote: git://github.com/rails/rails.git
|
|
3
|
+
revision: 41b4d81b4fd14cbf43060c223bea0f461256d099
|
|
4
|
+
branch: 4-1-stable
|
|
5
|
+
specs:
|
|
6
|
+
actionmailer (4.1.15)
|
|
7
|
+
actionpack (= 4.1.15)
|
|
8
|
+
actionview (= 4.1.15)
|
|
9
|
+
mail (~> 2.5, >= 2.5.4)
|
|
10
|
+
actionpack (4.1.15)
|
|
11
|
+
actionview (= 4.1.15)
|
|
12
|
+
activesupport (= 4.1.15)
|
|
13
|
+
rack (~> 1.5.2)
|
|
14
|
+
rack-test (~> 0.6.2)
|
|
15
|
+
actionview (4.1.15)
|
|
16
|
+
activesupport (= 4.1.15)
|
|
17
|
+
builder (~> 3.1)
|
|
18
|
+
erubis (~> 2.7.0)
|
|
19
|
+
activemodel (4.1.15)
|
|
20
|
+
activesupport (= 4.1.15)
|
|
21
|
+
builder (~> 3.1)
|
|
22
|
+
activerecord (4.1.15)
|
|
23
|
+
activemodel (= 4.1.15)
|
|
24
|
+
activesupport (= 4.1.15)
|
|
25
|
+
arel (~> 5.0.0)
|
|
26
|
+
activesupport (4.1.15)
|
|
27
|
+
i18n (~> 0.6, >= 0.6.9)
|
|
28
|
+
json (~> 1.7, >= 1.7.7)
|
|
29
|
+
minitest (~> 5.1)
|
|
30
|
+
thread_safe (~> 0.1)
|
|
31
|
+
tzinfo (~> 1.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
|
+
bundler (>= 1.3.0, < 2.0)
|
|
40
|
+
railties (= 4.1.15)
|
|
41
|
+
sprockets-rails (~> 2.0)
|
|
42
|
+
railties (4.1.15)
|
|
43
|
+
actionpack (= 4.1.15)
|
|
44
|
+
activesupport (= 4.1.15)
|
|
45
|
+
rake (>= 0.8.7)
|
|
46
|
+
thor (>= 0.18.1, < 2.0)
|
|
47
|
+
|
|
48
|
+
PATH
|
|
49
|
+
remote: ..
|
|
50
|
+
specs:
|
|
51
|
+
devise (3.5.8)
|
|
52
|
+
bcrypt (~> 3.0)
|
|
53
|
+
orm_adapter (~> 0.1)
|
|
54
|
+
railties (>= 3.2.6, < 5)
|
|
55
|
+
responders
|
|
56
|
+
thread_safe (~> 0.1)
|
|
57
|
+
warden (~> 1.2.3)
|
|
58
|
+
|
|
59
|
+
GEM
|
|
60
|
+
remote: https://rubygems.org/
|
|
61
|
+
specs:
|
|
62
|
+
arel (5.0.1.20140414130214)
|
|
63
|
+
bcrypt (3.1.11)
|
|
64
|
+
bson (3.2.6)
|
|
65
|
+
builder (3.2.2)
|
|
66
|
+
concurrent-ruby (1.0.1)
|
|
67
|
+
connection_pool (2.2.0)
|
|
68
|
+
erubis (2.7.0)
|
|
69
|
+
faraday (0.9.2)
|
|
70
|
+
multipart-post (>= 1.2, < 3)
|
|
71
|
+
hashie (3.4.3)
|
|
72
|
+
i18n (0.7.0)
|
|
73
|
+
json (1.8.3)
|
|
74
|
+
jwt (1.5.4)
|
|
75
|
+
mail (2.6.4)
|
|
76
|
+
mime-types (>= 1.16, < 4)
|
|
77
|
+
metaclass (0.0.4)
|
|
78
|
+
mime-types (2.99.1)
|
|
79
|
+
mini_portile2 (2.0.0)
|
|
80
|
+
minitest (5.8.4)
|
|
81
|
+
mocha (1.1.0)
|
|
82
|
+
metaclass (~> 0.0.1)
|
|
83
|
+
mongoid (4.0.2)
|
|
84
|
+
activemodel (~> 4.0)
|
|
85
|
+
moped (~> 2.0.0)
|
|
86
|
+
origin (~> 2.1)
|
|
87
|
+
tzinfo (>= 0.3.37)
|
|
88
|
+
moped (2.0.7)
|
|
89
|
+
bson (~> 3.0)
|
|
90
|
+
connection_pool (~> 2.0)
|
|
91
|
+
optionable (~> 0.2.0)
|
|
92
|
+
multi_json (1.11.3)
|
|
93
|
+
multi_xml (0.5.5)
|
|
94
|
+
multipart-post (2.0.0)
|
|
95
|
+
nokogiri (1.6.7.2)
|
|
96
|
+
mini_portile2 (~> 2.0.0.rc2)
|
|
97
|
+
oauth2 (0.9.4)
|
|
98
|
+
faraday (>= 0.8, < 0.10)
|
|
99
|
+
jwt (~> 1.0)
|
|
100
|
+
multi_json (~> 1.3)
|
|
101
|
+
multi_xml (~> 0.5)
|
|
102
|
+
rack (~> 1.2)
|
|
103
|
+
omniauth (1.2.2)
|
|
104
|
+
hashie (>= 1.2, < 4)
|
|
105
|
+
rack (~> 1.0)
|
|
106
|
+
omniauth-facebook (1.6.0)
|
|
107
|
+
omniauth-oauth2 (~> 1.1)
|
|
108
|
+
omniauth-oauth2 (1.1.2)
|
|
109
|
+
faraday (>= 0.8, < 0.10)
|
|
110
|
+
multi_json (~> 1.3)
|
|
111
|
+
oauth2 (~> 0.9.3)
|
|
112
|
+
omniauth (~> 1.2)
|
|
113
|
+
omniauth-openid (1.0.1)
|
|
114
|
+
omniauth (~> 1.0)
|
|
115
|
+
rack-openid (~> 1.3.1)
|
|
116
|
+
optionable (0.2.0)
|
|
117
|
+
origin (2.2.0)
|
|
118
|
+
orm_adapter (0.5.0)
|
|
119
|
+
rack (1.5.5)
|
|
120
|
+
rack-openid (1.3.1)
|
|
121
|
+
rack (>= 1.1.0)
|
|
122
|
+
ruby-openid (>= 2.1.8)
|
|
123
|
+
rack-test (0.6.3)
|
|
124
|
+
rack (>= 1.0)
|
|
125
|
+
rake (11.1.2)
|
|
126
|
+
rdoc (4.2.2)
|
|
127
|
+
json (~> 1.4)
|
|
128
|
+
responders (1.1.2)
|
|
129
|
+
railties (>= 3.2, < 4.2)
|
|
130
|
+
ruby-openid (2.7.0)
|
|
131
|
+
sprockets (3.6.0)
|
|
132
|
+
concurrent-ruby (~> 1.0)
|
|
133
|
+
rack (> 1, < 3)
|
|
134
|
+
sprockets-rails (2.3.3)
|
|
135
|
+
actionpack (>= 3.0)
|
|
136
|
+
activesupport (>= 3.0)
|
|
137
|
+
sprockets (>= 2.8, < 4.0)
|
|
138
|
+
sqlite3 (1.3.11)
|
|
139
|
+
thor (0.19.1)
|
|
140
|
+
thread_safe (0.3.5)
|
|
141
|
+
tzinfo (1.2.2)
|
|
142
|
+
thread_safe (~> 0.1)
|
|
143
|
+
warden (1.2.6)
|
|
144
|
+
rack (>= 1.0)
|
|
145
|
+
webrat (0.7.3)
|
|
146
|
+
nokogiri (>= 1.2.0)
|
|
147
|
+
rack (>= 1.0)
|
|
148
|
+
rack-test (>= 0.5.3)
|
|
149
|
+
|
|
150
|
+
PLATFORMS
|
|
151
|
+
ruby
|
|
152
|
+
|
|
153
|
+
DEPENDENCIES
|
|
154
|
+
activerecord-jdbc-adapter
|
|
155
|
+
activerecord-jdbcsqlite3-adapter
|
|
156
|
+
devise!
|
|
157
|
+
jruby-openssl
|
|
158
|
+
mime-types (~> 2.99)
|
|
159
|
+
mocha (~> 1.1)
|
|
160
|
+
mongoid (~> 4.0.0)
|
|
161
|
+
omniauth (~> 1.2.0)
|
|
162
|
+
omniauth-facebook
|
|
163
|
+
omniauth-oauth2 (~> 1.1.0)
|
|
164
|
+
omniauth-openid (~> 1.0.1)
|
|
165
|
+
rails!
|
|
166
|
+
rdoc
|
|
167
|
+
sqlite3
|
|
168
|
+
webrat (= 0.7.3)
|
|
169
|
+
|
|
170
|
+
BUNDLED WITH
|
|
171
|
+
1.11.2
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
source "https://rubygems.org"
|
|
2
|
+
|
|
3
|
+
gemspec path: '..'
|
|
4
|
+
|
|
5
|
+
gem "rails", github: 'rails/rails', branch: '4-2-stable'
|
|
6
|
+
gem "omniauth", "~> 1.2.2"
|
|
7
|
+
gem "omniauth-oauth2", "~> 1.2.0"
|
|
8
|
+
gem "rdoc"
|
|
9
|
+
gem "mime-types", "~> 2.99"
|
|
10
|
+
|
|
11
|
+
group :test do
|
|
12
|
+
gem "omniauth-facebook"
|
|
13
|
+
gem "omniauth-openid", "~> 1.0.1"
|
|
14
|
+
gem "webrat", "0.7.3", require: false
|
|
15
|
+
gem "mocha", "~> 1.1", require: false
|
|
16
|
+
end
|
|
17
|
+
|
|
18
|
+
platforms :jruby do
|
|
19
|
+
gem "activerecord-jdbc-adapter"
|
|
20
|
+
gem "activerecord-jdbcsqlite3-adapter"
|
|
21
|
+
gem "jruby-openssl"
|
|
22
|
+
end
|
|
23
|
+
|
|
24
|
+
platforms :ruby do
|
|
25
|
+
gem "sqlite3"
|
|
26
|
+
end
|
|
27
|
+
|
|
28
|
+
group :mongoid do
|
|
29
|
+
gem "mongoid", "~> 4.0.0"
|
|
30
|
+
end
|