Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
0b5fbd0e
Commit
0b5fbd0e
authored
Dec 08, 2020
by
peterhegman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Default `vue_2fa_recovery_codes` FF to `on`
Default `vue_2fa_recovery_codes` feature flag to `on`
parent
4c39e054
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
8 additions
and
12 deletions
+8
-12
app/views/profiles/two_factor_auths/_codes.html.haml
app/views/profiles/two_factor_auths/_codes.html.haml
+1
-1
app/views/profiles/two_factor_auths/create.html.haml
app/views/profiles/two_factor_auths/create.html.haml
+1
-1
changelogs/unreleased/290113-feature-flag-rollout-of-vue_2fa_recovery_codes.yml
...290113-feature-flag-rollout-of-vue_2fa_recovery_codes.yml
+5
-0
config/feature_flags/development/vue_2fa_recovery_codes.yml
config/feature_flags/development/vue_2fa_recovery_codes.yml
+1
-1
qa/qa/specs/features/browser_ui/1_manage/login/2fa_recovery_spec.rb
...s/features/browser_ui/1_manage/login/2fa_recovery_spec.rb
+0
-2
qa/qa/specs/features/browser_ui/1_manage/login/2fa_ssh_recovery_spec.rb
...atures/browser_ui/1_manage/login/2fa_ssh_recovery_spec.rb
+0
-5
qa/qa/specs/features/browser_ui/1_manage/login/log_in_with_2fa_spec.rb
...eatures/browser_ui/1_manage/login/log_in_with_2fa_spec.rb
+0
-2
No files found.
app/views/profiles/two_factor_auths/_codes.html.haml
View file @
0b5fbd0e
-
show_success_alert
=
local_assigns
.
fetch
(
:show_success_alert
,
nil
)
-
show_success_alert
=
local_assigns
.
fetch
(
:show_success_alert
,
nil
)
-
if
Feature
.
enabled?
(
:vue_2fa_recovery_codes
,
current_user
)
-
if
Feature
.
enabled?
(
:vue_2fa_recovery_codes
,
current_user
,
default_enabled:
true
)
.js-2fa-recovery-codes
{
data:
{
codes:
@codes
.
to_json
,
profile_account_path:
profile_account_path
(
two_factor_auth_enabled_successfully:
show_success_alert
)
}
}
.js-2fa-recovery-codes
{
data:
{
codes:
@codes
.
to_json
,
profile_account_path:
profile_account_path
(
two_factor_auth_enabled_successfully:
show_success_alert
)
}
}
-
else
-
else
%p
.slead
%p
.slead
...
...
app/views/profiles/two_factor_auths/create.html.haml
View file @
0b5fbd0e
-
page_title
_
(
'Two-factor Authentication'
),
_
(
'Account'
)
-
page_title
_
(
'Two-factor Authentication'
),
_
(
'Account'
)
-
add_page_specific_style
'page_bundles/profile_two_factor_auth'
-
add_page_specific_style
'page_bundles/profile_two_factor_auth'
-
unless
Feature
.
enabled?
(
:vue_2fa_recovery_codes
,
current_user
)
-
unless
Feature
.
enabled?
(
:vue_2fa_recovery_codes
,
current_user
,
default_enabled:
true
)
.gl-alert.gl-alert-success.gl-mb-5
.gl-alert.gl-alert-success.gl-mb-5
=
_
(
'Congratulations! You have enabled Two-factor Authentication!'
)
=
_
(
'Congratulations! You have enabled Two-factor Authentication!'
)
...
...
changelogs/unreleased/290113-feature-flag-rollout-of-vue_2fa_recovery_codes.yml
0 → 100644
View file @
0b5fbd0e
---
title
:
Require users to copy, download, or print 2FA recovery codes
merge_request
:
49493
author
:
type
:
changed
config/feature_flags/development/vue_2fa_recovery_codes.yml
View file @
0b5fbd0e
...
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/290113
...
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/290113
milestone
:
'
13.7'
milestone
:
'
13.7'
type
:
development
type
:
development
group
:
group::access
group
:
group::access
default_enabled
:
fals
e
default_enabled
:
tru
e
qa/qa/specs/features/browser_ui/1_manage/login/2fa_recovery_spec.rb
View file @
0b5fbd0e
...
@@ -29,7 +29,6 @@ module QA
...
@@ -29,7 +29,6 @@ module QA
end
end
before
do
before
do
Runtime
::
Feature
.
enable
(
'vue_2fa_recovery_codes'
,
user:
developer_user
)
group
.
add_member
(
developer_user
,
Resource
::
Members
::
AccessLevel
::
DEVELOPER
)
group
.
add_member
(
developer_user
,
Resource
::
Members
::
AccessLevel
::
DEVELOPER
)
end
end
...
@@ -58,7 +57,6 @@ module QA
...
@@ -58,7 +57,6 @@ module QA
end
end
after
do
after
do
Runtime
::
Feature
.
disable
(
'vue_2fa_recovery_codes'
,
user:
developer_user
)
group
.
set_require_two_factor_authentication
(
value:
'false'
)
group
.
set_require_two_factor_authentication
(
value:
'false'
)
group
.
remove_via_api!
group
.
remove_via_api!
sandbox_group
.
remove_via_api!
sandbox_group
.
remove_via_api!
...
...
qa/qa/specs/features/browser_ui/1_manage/login/2fa_ssh_recovery_spec.rb
View file @
0b5fbd0e
...
@@ -16,7 +16,6 @@ module QA
...
@@ -16,7 +16,6 @@ module QA
end
end
before
do
before
do
Runtime
::
Feature
.
enable
(
'vue_2fa_recovery_codes'
,
user:
user
)
enable_2fa_for_user
(
user
)
enable_2fa_for_user
(
user
)
end
end
...
@@ -47,10 +46,6 @@ module QA
...
@@ -47,10 +46,6 @@ module QA
expect
(
page
).
to
have_text
(
'Invalid two-factor code'
)
expect
(
page
).
to
have_text
(
'Invalid two-factor code'
)
end
end
after
do
Runtime
::
Feature
.
disable
(
'vue_2fa_recovery_codes'
,
user:
user
)
end
def
enable_2fa_for_user
(
user
)
def
enable_2fa_for_user
(
user
)
Flow
::
Login
.
while_signed_in
(
as:
user
)
do
Flow
::
Login
.
while_signed_in
(
as:
user
)
do
Page
::
Main
::
Menu
.
perform
(
&
:click_settings_link
)
Page
::
Main
::
Menu
.
perform
(
&
:click_settings_link
)
...
...
qa/qa/specs/features/browser_ui/1_manage/login/log_in_with_2fa_spec.rb
View file @
0b5fbd0e
...
@@ -31,7 +31,6 @@ module QA
...
@@ -31,7 +31,6 @@ module QA
let
(
:two_fa_expected_text
)
{
/The group settings for.*require you to enable Two-Factor Authentication for your account.*You need to do this before/
}
let
(
:two_fa_expected_text
)
{
/The group settings for.*require you to enable Two-Factor Authentication for your account.*You need to do this before/
}
before
do
before
do
Runtime
::
Feature
.
enable
(
'vue_2fa_recovery_codes'
,
user:
developer_user
)
group
.
add_member
(
developer_user
,
Resource
::
Members
::
AccessLevel
::
DEVELOPER
)
group
.
add_member
(
developer_user
,
Resource
::
Members
::
AccessLevel
::
DEVELOPER
)
end
end
...
@@ -58,7 +57,6 @@ module QA
...
@@ -58,7 +57,6 @@ module QA
end
end
after
do
after
do
Runtime
::
Feature
.
disable
(
'vue_2fa_recovery_codes'
,
user:
developer_user
)
group
.
set_require_two_factor_authentication
(
value:
'false'
)
group
.
set_require_two_factor_authentication
(
value:
'false'
)
group
.
remove_via_api!
do
|
resource
|
group
.
remove_via_api!
do
|
resource
|
resource
.
api_client
=
admin_api_client
resource
.
api_client
=
admin_api_client
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment