faalis 0.14.2 → 0.14.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/faalis/user.rb +5 -2
- data/app/views/faalis/home/index.html.erb +1 -1
- data/lib/faalis/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1e3e6159671f88e1538d9a3eb65e6d6da9042f58
|
|
4
|
+
data.tar.gz: f6fb5aab1a5c0ba6a80f7a688a149c5f7ee557ce
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7635159ba7b1370aeb2ecf527928aec5574eec1945670874f0603d7e3a3fe805a230bbd4ec4230d9a3e729d21ed978aa7be7ce1c1bca429f4e0494115f27399f
|
|
7
|
+
data.tar.gz: c82b1784b2c8ea26973279ad64bba18830d291cb983836a4867dfc8da30b8e26f16d69258275037c3be8e796a11ecfb9cd2a0452a6abe39c00a428e8f5a1c7b2
|
data/app/models/faalis/user.rb
CHANGED
|
@@ -52,8 +52,11 @@ module Faalis
|
|
|
52
52
|
|
|
53
53
|
def password_required?
|
|
54
54
|
# TODO: nil? is not suitable for here we should use empty? or blink?
|
|
55
|
-
|
|
56
|
-
|
|
55
|
+
if Devise.omniauth_configs.any?
|
|
56
|
+
return (provider.nil? || password.nil?) && super
|
|
57
|
+
else
|
|
58
|
+
password.nil? && super
|
|
59
|
+
end
|
|
57
60
|
end
|
|
58
61
|
|
|
59
62
|
def self.find_from_oauth(auth, signed_in_resource=nil)
|
data/lib/faalis/version.rb
CHANGED