devise 3.5.3 → 3.5.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

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

Files changed (27) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +37 -1
  3. data/Gemfile +1 -0
  4. data/Gemfile.lock +39 -35
  5. data/gemfiles/Gemfile.rails-3.2-stable.lock +44 -44
  6. data/gemfiles/Gemfile.rails-4.0-stable +1 -0
  7. data/gemfiles/Gemfile.rails-4.0-stable.lock +34 -34
  8. data/gemfiles/Gemfile.rails-4.1-stable +1 -0
  9. data/gemfiles/Gemfile.rails-4.1-stable.lock +58 -59
  10. data/gemfiles/Gemfile.rails-4.2-stable +1 -0
  11. data/gemfiles/Gemfile.rails-4.2-stable.lock +76 -77
  12. data/lib/devise/controllers/rememberable.rb +8 -1
  13. data/lib/devise/hooks/timeoutable.rb +3 -2
  14. data/lib/devise/models/confirmable.rb +2 -1
  15. data/lib/devise/models/lockable.rb +5 -1
  16. data/lib/devise/models/recoverable.rb +1 -1
  17. data/lib/devise/models/rememberable.rb +42 -21
  18. data/lib/devise/models/timeoutable.rb +0 -6
  19. data/lib/devise/strategies/rememberable.rb +3 -6
  20. data/lib/devise/version.rb +1 -1
  21. data/test/integration/rememberable_test.rb +41 -3
  22. data/test/integration/timeoutable_test.rb +1 -1
  23. data/test/models/confirmable_test.rb +23 -1
  24. data/test/models/lockable_test.rb +22 -0
  25. data/test/models/rememberable_test.rb +60 -95
  26. data/test/time_helpers.rb +137 -0
  27. metadata +5 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1258976e4bec4149281c7764cf903ced83632766
4
- data.tar.gz: 57096bdcca6de6c67b0fa26aee8251c446571c39
3
+ metadata.gz: 1c056db58a1f4a6a0a7732f2c856dde7e2ec4669
4
+ data.tar.gz: 0374256e647f923a10ef261ae405f55123bdfed8
5
5
  SHA512:
6
- metadata.gz: e3839e95f5c831805b43974ef72f7e6beca86d37c6c0177dec83ae5e8cc6ebcc5922da78cc505f413157ecdb0ed8b56c3c3499c061743a6ac25708e473ec035c
7
- data.tar.gz: 59eb1f8398ddf1f4bd05a493a6ff4e41fb3f3580d0f3b143ffefed385b435fd3f521b1aaaaf0e8eee97838a1bc81d992081597738c743becfc4b651aa051b97f
6
+ metadata.gz: cbac30ebe59bcc1aea16a7a9981677d71c2a361b4ece716fca6c594d4888130f583f7c6cf4c959278d189fba00a30fa2101c069fcb046609b020e2ddb3a61590
7
+ data.tar.gz: 53c77b74f79ba50de083d8625f0b77578ca10d45e3037c7f7ce1a871412e8eb8f082d10f817ab83d297ca9f4247eb1f82d14f3ae77f2bf9ccf3483a1522fbfc0
data/CHANGELOG.md CHANGED
@@ -1,4 +1,40 @@
1
- ### Unreleased
1
+ ### 3.5.10 - 2016-05-15
2
+
3
+ * bug fixes
4
+ * Fix overwriting the remember_token when a valid one already exists (by @ralinchimev).
5
+
6
+ ### 3.5.9 - 2016-05-02
7
+
8
+ * bug fixes
9
+ * Fix strategy checking in `Lockable#unlock_strategy_enabled?` for `:none`
10
+ and `:undefined` strategies. (by @f3ndot)
11
+
12
+ ### 3.5.8 - 2016-04-25
13
+
14
+ * bug fixes
15
+ * Fix the e-mail confirmation instructions send when a user updates the email address from nil
16
+
17
+ ### 3.5.7 - 2016-04-18
18
+
19
+ * bug fixes
20
+ * Fix the `extend_remember_period` configuration. When set to `false` it does
21
+ not update the cookie expiration anymore.(by @ulissesalmeida)
22
+
23
+ ### 3.5.6 - 2016-01-02
24
+
25
+ * bug fixes
26
+ * Fix type coercion of the rememberable timestamp stored on cookies.
27
+
28
+ ### 3.5.5 - 2016-22-01
29
+
30
+ * bug fixes
31
+ * Bring back remember_expired? implementation
32
+ * Ensure timeouts are not triggered if remember me is being used
33
+
34
+ ### 3.5.4 - 2016-18-01
35
+
36
+ * bug fixes
37
+ * Store creation timestamps on remember cookies
2
38
 
3
39
  ### 3.5.3 - 2015-12-10
4
40
 
data/Gemfile CHANGED
@@ -6,6 +6,7 @@ gem "rails", "4.2.2"
6
6
  gem "omniauth", "~> 1.2.0"
7
7
  gem "omniauth-oauth2", "~> 1.1.0"
8
8
  gem "rdoc"
9
+ gem "mime-types", "~> 2.99"
9
10
 
10
11
  group :test do
11
12
  gem "omniauth-facebook"
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- devise (3.5.3)
4
+ devise (3.5.10)
5
5
  bcrypt (~> 3.0)
6
6
  orm_adapter (~> 0.1)
7
7
  railties (>= 3.2.6, < 5)
@@ -47,28 +47,29 @@ GEM
47
47
  minitest (~> 5.1)
48
48
  thread_safe (~> 0.3, >= 0.3.4)
49
49
  tzinfo (~> 1.1)
50
- arel (6.0.0)
51
- bcrypt (3.1.10)
52
- bson (3.1.2)
50
+ arel (6.0.3)
51
+ bcrypt (3.1.11)
52
+ bson (3.2.6)
53
53
  builder (3.2.2)
54
+ concurrent-ruby (1.0.1)
54
55
  connection_pool (2.2.0)
55
56
  erubis (2.7.0)
56
- faraday (0.9.1)
57
+ faraday (0.9.2)
57
58
  multipart-post (>= 1.2, < 3)
58
- globalid (0.3.5)
59
+ globalid (0.3.6)
59
60
  activesupport (>= 4.1.0)
60
- hashie (3.4.0)
61
+ hashie (3.4.3)
61
62
  i18n (0.7.0)
62
63
  json (1.8.3)
63
- jwt (1.4.1)
64
- loofah (2.0.2)
64
+ jwt (1.5.4)
65
+ loofah (2.0.3)
65
66
  nokogiri (>= 1.5.9)
66
- mail (2.6.3)
67
- mime-types (>= 1.16, < 3)
67
+ mail (2.6.4)
68
+ mime-types (>= 1.16, < 4)
68
69
  metaclass (0.0.4)
69
- mime-types (2.6.1)
70
- mini_portile (0.6.2)
71
- minitest (5.7.0)
70
+ mime-types (2.99.1)
71
+ mini_portile2 (2.0.0)
72
+ minitest (5.8.4)
72
73
  mocha (1.1.0)
73
74
  metaclass (~> 0.0.1)
74
75
  mongoid (4.0.2)
@@ -76,15 +77,15 @@ GEM
76
77
  moped (~> 2.0.0)
77
78
  origin (~> 2.1)
78
79
  tzinfo (>= 0.3.37)
79
- moped (2.0.6)
80
+ moped (2.0.7)
80
81
  bson (~> 3.0)
81
82
  connection_pool (~> 2.0)
82
83
  optionable (~> 0.2.0)
83
- multi_json (1.11.1)
84
+ multi_json (1.11.3)
84
85
  multi_xml (0.5.5)
85
86
  multipart-post (2.0.0)
86
- nokogiri (1.6.6.2)
87
- mini_portile (~> 0.6.0)
87
+ nokogiri (1.6.7.2)
88
+ mini_portile2 (~> 2.0.0.rc2)
88
89
  oauth2 (0.9.4)
89
90
  faraday (>= 0.8, < 0.10)
90
91
  jwt (~> 1.0)
@@ -105,9 +106,9 @@ GEM
105
106
  omniauth (~> 1.0)
106
107
  rack-openid (~> 1.3.1)
107
108
  optionable (0.2.0)
108
- origin (2.1.1)
109
+ origin (2.2.0)
109
110
  orm_adapter (0.5.0)
110
- rack (1.6.2)
111
+ rack (1.6.4)
111
112
  rack-openid (1.3.1)
112
113
  rack (>= 1.1.0)
113
114
  ruby-openid (>= 2.1.8)
@@ -126,34 +127,36 @@ GEM
126
127
  sprockets-rails
127
128
  rails-deprecated_sanitizer (1.0.3)
128
129
  activesupport (>= 4.2.0.alpha)
129
- rails-dom-testing (1.0.6)
130
+ rails-dom-testing (1.0.7)
130
131
  activesupport (>= 4.2.0.beta, < 5.0)
131
132
  nokogiri (~> 1.6.0)
132
133
  rails-deprecated_sanitizer (>= 1.0.1)
133
- rails-html-sanitizer (1.0.2)
134
+ rails-html-sanitizer (1.0.3)
134
135
  loofah (~> 2.0)
135
136
  railties (4.2.2)
136
137
  actionpack (= 4.2.2)
137
138
  activesupport (= 4.2.2)
138
139
  rake (>= 0.8.7)
139
140
  thor (>= 0.18.1, < 2.0)
140
- rake (10.4.2)
141
- rdoc (4.2.0)
142
- responders (2.1.0)
143
- railties (>= 4.2.0, < 5)
141
+ rake (11.1.2)
142
+ rdoc (4.2.2)
143
+ json (~> 1.4)
144
+ responders (2.2.0)
145
+ railties (>= 4.2.0, < 5.1)
144
146
  ruby-openid (2.7.0)
145
- sprockets (3.2.0)
146
- rack (~> 1.0)
147
- sprockets-rails (2.3.1)
148
- actionpack (>= 3.0)
149
- activesupport (>= 3.0)
150
- sprockets (>= 2.8, < 4.0)
151
- sqlite3 (1.3.10)
147
+ sprockets (3.6.0)
148
+ concurrent-ruby (~> 1.0)
149
+ rack (> 1, < 3)
150
+ sprockets-rails (3.0.4)
151
+ actionpack (>= 4.0)
152
+ activesupport (>= 4.0)
153
+ sprockets (>= 3.0.0)
154
+ sqlite3 (1.3.11)
152
155
  thor (0.19.1)
153
156
  thread_safe (0.3.5)
154
157
  tzinfo (1.2.2)
155
158
  thread_safe (~> 0.1)
156
- warden (1.2.4)
159
+ warden (1.2.6)
157
160
  rack (>= 1.0)
158
161
  webrat (0.7.3)
159
162
  nokogiri (>= 1.2.0)
@@ -168,6 +171,7 @@ DEPENDENCIES
168
171
  activerecord-jdbcsqlite3-adapter
169
172
  devise!
170
173
  jruby-openssl
174
+ mime-types (~> 2.99)
171
175
  mocha (~> 1.1)
172
176
  mongoid (~> 4.0)
173
177
  omniauth (~> 1.2.0)
@@ -180,4 +184,4 @@ DEPENDENCIES
180
184
  webrat (= 0.7.3)
181
185
 
182
186
  BUNDLED WITH
183
- 1.10.6
187
+ 1.12.3
data/gemfiles/Gemfile.rails-3.2-stable.lock CHANGED
@@ -1,14 +1,14 @@
1
1
  GIT
2
2
  remote: git://github.com/rails/rails.git
3
- revision: b344986bc3d94ca7821fc5e0eef1874882ac6cbb
3
+ revision: f85bbed4cdc1bdfd1e0dbd97bce9db81e44cbd11
4
4
  branch: 3-2-stable
5
5
  specs:
6
- actionmailer (3.2.21)
7
- actionpack (= 3.2.21)
6
+ actionmailer (3.2.22.2)
7
+ actionpack (= 3.2.22.2)
8
8
  mail (~> 2.5.4)
9
- actionpack (3.2.21)
10
- activemodel (= 3.2.21)
11
- activesupport (= 3.2.21)
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.21)
20
- activesupport (= 3.2.21)
19
+ activemodel (3.2.22.2)
20
+ activesupport (= 3.2.22.2)
21
21
  builder (~> 3.0.0)
22
- activerecord (3.2.21)
23
- activemodel (= 3.2.21)
24
- activesupport (= 3.2.21)
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.21)
28
- activemodel (= 3.2.21)
29
- activesupport (= 3.2.21)
30
- activesupport (3.2.21)
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.21)
34
- actionmailer (= 3.2.21)
35
- actionpack (= 3.2.21)
36
- activerecord (= 3.2.21)
37
- activeresource (= 3.2.21)
38
- activesupport (= 3.2.21)
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.21)
41
- railties (3.2.21)
42
- actionpack (= 3.2.21)
43
- activesupport (= 3.2.21)
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,7 +49,7 @@ GIT
49
49
  PATH
50
50
  remote: ..
51
51
  specs:
52
- devise (3.5.3)
52
+ devise (3.5.8)
53
53
  bcrypt (~> 3.0)
54
54
  orm_adapter (~> 0.1)
55
55
  railties (>= 3.2.6, < 5)
@@ -61,36 +61,36 @@ GEM
61
61
  remote: https://rubygems.org/
62
62
  specs:
63
63
  arel (3.0.3)
64
- bcrypt (3.1.10)
64
+ bcrypt (3.1.11)
65
65
  builder (3.0.4)
66
66
  erubis (2.7.0)
67
- faraday (0.9.1)
67
+ faraday (0.9.2)
68
68
  multipart-post (>= 1.2, < 3)
69
- hashie (3.4.0)
69
+ hashie (3.4.3)
70
70
  hike (1.2.3)
71
71
  i18n (0.7.0)
72
72
  journey (1.0.4)
73
- json (1.8.2)
74
- jwt (1.4.1)
73
+ json (1.8.3)
74
+ jwt (1.5.4)
75
75
  mail (2.5.4)
76
76
  mime-types (~> 1.16)
77
77
  treetop (~> 1.4.8)
78
78
  metaclass (0.0.4)
79
79
  mime-types (1.25.1)
80
- mini_portile (0.6.2)
80
+ mini_portile2 (2.0.0)
81
81
  mocha (1.1.0)
82
82
  metaclass (~> 0.0.1)
83
- mongoid (3.1.6)
83
+ mongoid (3.1.7)
84
84
  activemodel (~> 3.2)
85
85
  moped (~> 1.4)
86
86
  origin (~> 1.0)
87
87
  tzinfo (~> 0.3.29)
88
- moped (1.5.2)
89
- multi_json (1.11.0)
88
+ moped (1.5.3)
89
+ multi_json (1.11.3)
90
90
  multi_xml (0.5.5)
91
91
  multipart-post (2.0.0)
92
- nokogiri (1.6.6.2)
93
- mini_portile (~> 0.6.0)
92
+ nokogiri (1.6.7.2)
93
+ mini_portile2 (~> 2.0.0.rc2)
94
94
  oauth2 (0.9.4)
95
95
  faraday (>= 0.8, < 0.10)
96
96
  jwt (~> 1.0)
@@ -113,8 +113,8 @@ GEM
113
113
  origin (1.1.0)
114
114
  orm_adapter (0.5.0)
115
115
  polyglot (0.3.5)
116
- rack (1.4.5)
117
- rack-cache (1.2)
116
+ rack (1.4.7)
117
+ rack-cache (1.6.1)
118
118
  rack (>= 0.4)
119
119
  rack-openid (1.3.1)
120
120
  rack (>= 1.1.0)
@@ -123,7 +123,7 @@ GEM
123
123
  rack
124
124
  rack-test (0.6.3)
125
125
  rack (>= 1.0)
126
- rake (10.4.2)
126
+ rake (11.1.2)
127
127
  rdoc (3.12.2)
128
128
  json (~> 1.4)
129
129
  responders (1.1.2)
@@ -134,15 +134,15 @@ GEM
134
134
  multi_json (~> 1.0)
135
135
  rack (~> 1.0)
136
136
  tilt (~> 1.1, != 1.3.0)
137
- sqlite3 (1.3.10)
137
+ sqlite3 (1.3.11)
138
138
  thor (0.19.1)
139
139
  thread_safe (0.3.5)
140
140
  tilt (1.4.1)
141
141
  treetop (1.4.15)
142
142
  polyglot
143
143
  polyglot (>= 0.3.1)
144
- tzinfo (0.3.43)
145
- warden (1.2.4)
144
+ tzinfo (0.3.49)
145
+ warden (1.2.6)
146
146
  rack (>= 1.0)
147
147
  webrat (0.7.3)
148
148
  nokogiri (>= 1.2.0)
@@ -169,4 +169,4 @@ DEPENDENCIES
169
169
  webrat (= 0.7.3)
170
170
 
171
171
  BUNDLED WITH
172
- 1.10.6
172
+ 1.11.2
data/gemfiles/Gemfile.rails-4.0-stable CHANGED
@@ -6,6 +6,7 @@ gem "rails", github: 'rails/rails', branch: '4-0-stable'
6
6
  gem "omniauth", "~> 1.2.0"
7
7
  gem "omniauth-oauth2", "~> 1.1.0"
8
8
  gem "rdoc"
9
+ gem "mime-types", "~> 2.99"
9
10
 
10
11
  group :test do
11
12
  gem "omniauth-facebook"
data/gemfiles/Gemfile.rails-4.0-stable.lock CHANGED
@@ -1,6 +1,6 @@
1
1
  GIT
2
2
  remote: git://github.com/rails/rails.git
3
- revision: 7ec9c9635bf4d57009135ed11e89d8bf32306d73
3
+ revision: 9be9597e510d185ca7964d0a05b4ea2a7f2d50d1
4
4
  branch: 4-0-stable
5
5
  specs:
6
6
  actionmailer (4.0.13)
@@ -43,7 +43,7 @@ GIT
43
43
  PATH
44
44
  remote: ..
45
45
  specs:
46
- devise (3.5.3)
46
+ devise (3.5.8)
47
47
  bcrypt (~> 3.0)
48
48
  orm_adapter (~> 0.1)
49
49
  railties (>= 3.2.6, < 5)
@@ -54,24 +54,25 @@ PATH
54
54
  GEM
55
55
  remote: https://rubygems.org/
56
56
  specs:
57
- activerecord-deprecated_finders (1.0.3)
57
+ activerecord-deprecated_finders (1.0.4)
58
58
  arel (4.0.2)
59
- bcrypt (3.1.10)
60
- bson (2.3.0)
59
+ bcrypt (3.1.11)
60
+ bson (3.2.6)
61
61
  builder (3.1.4)
62
- connection_pool (2.1.3)
62
+ concurrent-ruby (1.0.1)
63
+ connection_pool (2.2.0)
63
64
  erubis (2.7.0)
64
- faraday (0.9.1)
65
+ faraday (0.9.2)
65
66
  multipart-post (>= 1.2, < 3)
66
- hashie (3.4.0)
67
- hike (1.2.3)
67
+ hashie (3.4.3)
68
68
  i18n (0.7.0)
69
- jwt (1.4.1)
70
- mail (2.6.3)
71
- mime-types (>= 1.16, < 3)
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.4.3)
74
- mini_portile (0.6.2)
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)
@@ -80,15 +81,15 @@ GEM
80
81
  moped (~> 2.0.0)
81
82
  origin (~> 2.1)
82
83
  tzinfo (>= 0.3.37)
83
- moped (2.0.4)
84
- bson (~> 2.2)
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.11.0)
88
+ multi_json (1.11.3)
88
89
  multi_xml (0.5.5)
89
90
  multipart-post (2.0.0)
90
- nokogiri (1.6.6.2)
91
- mini_portile (~> 0.6.0)
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,34 +110,32 @@ GEM
109
110
  omniauth (~> 1.0)
110
111
  rack-openid (~> 1.3.1)
111
112
  optionable (0.2.0)
112
- origin (2.1.1)
113
+ origin (2.2.0)
113
114
  orm_adapter (0.5.0)
114
- rack (1.5.2)
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
119
  rack-test (0.6.3)
119
120
  rack (>= 1.0)
120
- rake (10.4.2)
121
- rdoc (4.2.0)
121
+ rake (11.1.2)
122
+ rdoc (4.2.2)
123
+ json (~> 1.4)
122
124
  responders (1.1.2)
123
125
  railties (>= 3.2, < 4.2)
124
126
  ruby-openid (2.7.0)
125
- sprockets (2.12.3)
126
- hike (~> 1.2)
127
- multi_json (~> 1.0)
128
- rack (~> 1.0)
129
- tilt (~> 1.1, != 1.3.0)
130
- sprockets-rails (2.2.4)
127
+ sprockets (3.6.0)
128
+ concurrent-ruby (~> 1.0)
129
+ rack (> 1, < 3)
130
+ sprockets-rails (2.3.3)
131
131
  actionpack (>= 3.0)
132
132
  activesupport (>= 3.0)
133
133
  sprockets (>= 2.8, < 4.0)
134
- sqlite3 (1.3.10)
134
+ sqlite3 (1.3.11)
135
135
  thor (0.19.1)
136
136
  thread_safe (0.3.5)
137
- tilt (1.4.1)
138
- tzinfo (0.3.43)
139
- warden (1.2.4)
137
+ tzinfo (0.3.49)
138
+ warden (1.2.6)
140
139
  rack (>= 1.0)
141
140
  webrat (0.7.3)
142
141
  nokogiri (>= 1.2.0)
@@ -151,6 +150,7 @@ DEPENDENCIES
151
150
  activerecord-jdbcsqlite3-adapter
152
151
  devise!
153
152
  jruby-openssl
153
+ mime-types (~> 2.99)
154
154
  mocha (~> 1.1)
155
155
  mongoid (~> 4.0.0)
156
156
  omniauth (~> 1.2.0)
@@ -163,4 +163,4 @@ DEPENDENCIES
163
163
  webrat (= 0.7.3)
164
164
 
165
165
  BUNDLED WITH
166
- 1.10.6
166
+ 1.11.2
data/gemfiles/Gemfile.rails-4.1-stable CHANGED
@@ -6,6 +6,7 @@ gem "rails", github: 'rails/rails', branch: '4-1-stable'
6
6
  gem "omniauth", "~> 1.2.0"
7
7
  gem "omniauth-oauth2", "~> 1.1.0"
8
8
  gem "rdoc"
9
+ gem "mime-types", "~> 2.99"
9
10
 
10
11
  group :test do
11
12
  gem "omniauth-facebook"