Skip to content

Commit b7e8a8f

Browse files
committed
update
1 parent 6207c6d commit b7e8a8f

3 files changed

Lines changed: 15 additions & 13 deletions

File tree

Gemfile.lock

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ GEM
2626
thread_safe (~> 0.1)
2727
tzinfo (~> 0.3.37)
2828
arel (4.0.2)
29-
atomic (1.1.15)
3029
bcrypt (3.1.7)
31-
bcrypt-ruby (3.1.5)
32-
bcrypt (>= 3.1.3)
3330
builder (3.1.4)
3431
coderay (1.1.0)
3532
coffee-rails (4.0.1)
@@ -39,8 +36,8 @@ GEM
3936
coffee-script-source
4037
execjs
4138
coffee-script-source (1.7.0)
42-
devise (3.2.3)
43-
bcrypt-ruby (~> 3.0)
39+
devise (3.2.4)
40+
bcrypt (~> 3.0)
4441
orm_adapter (~> 0.1)
4542
railties (>= 3.2.6, < 5)
4643
thread_safe (~> 0.1)
@@ -62,7 +59,7 @@ GEM
6259
method_source (0.8.2)
6360
mime-types (1.25.1)
6461
minitest (4.7.5)
65-
multi_json (1.8.4)
62+
multi_json (1.9.2)
6663
orm_adapter (0.5.0)
6764
polyglot (0.3.4)
6865
pry (0.9.12.6)
@@ -85,7 +82,7 @@ GEM
8582
activesupport (= 4.0.3)
8683
rake (>= 0.8.7)
8784
thor (>= 0.18.1, < 2.0)
88-
rake (10.1.1)
85+
rake (10.3.1)
8986
randexp (0.1.7)
9087
rdoc (4.1.1)
9188
json (~> 1.4)
@@ -99,7 +96,7 @@ GEM
9996
json (~> 1.8)
10097
rdoc (~> 4.0, < 5.0)
10198
slop (3.4.7)
102-
sprockets (2.11.0)
99+
sprockets (2.12.1)
103100
hike (~> 1.2)
104101
multi_json (~> 1.0)
105102
rack (~> 1.0)
@@ -109,21 +106,20 @@ GEM
109106
activesupport (>= 3.0)
110107
sprockets (~> 2.8)
111108
sqlite3 (1.3.9)
112-
thor (0.18.1)
113-
thread_safe (0.2.0)
114-
atomic (>= 1.1.7, < 2)
109+
thor (0.19.1)
110+
thread_safe (0.3.3)
115111
tilt (1.4.1)
116112
treetop (1.4.15)
117113
polyglot
118114
polyglot (>= 0.3.1)
119115
turbolinks (2.2.1)
120116
coffee-rails
121-
two_factor_authentication (1.0)
117+
two_factor_authentication (1.1)
122118
devise
123119
rails (>= 3.1.1)
124120
randexp
125121
rotp
126-
tzinfo (0.3.38)
122+
tzinfo (0.3.39)
127123
uglifier (2.4.0)
128124
execjs (>= 0.3.0)
129125
json (>= 1.8.0)

app/models/user.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,8 @@ class User < ActiveRecord::Base
88
def send_two_factor_authentication_code
99
puts ">>>>>>>>>>>>>>> otp_secret_key: #{otp_secret_key}, otp_code: #{otp_code}"
1010
end
11+
12+
def need_two_factor_authentication?(request)
13+
not otp_secret_key.nil?
14+
end
1115
end

config/environments/development.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,6 @@
2626
# This option may cause significant delays in view rendering with a large
2727
# number of complex assets.
2828
config.assets.debug = true
29+
30+
config.action_mailer.default_url_options = { :host => 'localhost' }
2931
end

0 commit comments

Comments
 (0)