Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-27 12:53:40 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-27 12:53:40 +0300
commit3ed05b2191a7ede4734e2b7952f3810e5a1ee728 (patch)
tree01c88b0fec5666c7d5a03e5ed21b7dee5efed517 /spec/factories.rb
parent1dbfecb2bb08a7d20d10a13c1c7898ee562a6594 (diff)
parent7b879bb8bded3aa7577133a9bc2be0c7fc97d855 (diff)
Merge branch 'rs-manual-2fa-entry' into 'master'
Add support for manually entering 2FA details > ![Screen_Shot_2015-05-22_at_6.39.26_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/27b6cc0b2f88e0ccec234dd8d20db957/Screen_Shot_2015-05-22_at_6.39.26_PM.png) Related to #1679 though I'm not sure if it entirely fixes it, since I don't have access to a Windows Phone. See merge request !694
Diffstat (limited to 'spec/factories.rb')
-rw-r--r--spec/factories.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/factories.rb b/spec/factories.rb
index b7b2a1dac8e..9373a7af024 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -31,7 +31,7 @@ FactoryGirl.define do
trait :two_factor do
before(:create) do |user|
user.otp_required_for_login = true
- user.otp_secret = User.generate_otp_secret
+ user.otp_secret = User.generate_otp_secret(32)
end
end