BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
b7f6f96a
Unverified
Commit
b7f6f96a
authored
May 24, 2018
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix group settings layout
parent
7c8fda2e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
_group_admin_settings.html.haml
app/views/groups/_group_admin_settings.html.haml
+6
-6
edit.html.haml
app/views/groups/edit.html.haml
+1
-1
No files found.
app/views/groups/_group_admin_settings.html.haml
View file @
b7f6f96a
.form-group
=
f
.
label
:lfs_enabled
,
'Large File Storage'
,
class:
'col-form-label'
.form-group
.row
=
f
.
label
:lfs_enabled
,
'Large File Storage'
,
class:
'col-form-label
col-sm-2
'
.col-sm-10
.form-check
=
f
.
label
:lfs_enabled
do
...
...
@@ -10,7 +10,7 @@
%br
/
%span
.descr
This setting can be overridden in each project.
.form-group
.form-group
.row
=
f
.
label
:require_two_factor_authentication
,
'Two-factor authentication'
,
class:
'col-form-label col-sm-2'
.col-sm-10
.form-check
...
...
@@ -19,8 +19,8 @@
%strong
Require all users in this group to setup Two-factor authentication
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'security/two_factor_authentication'
,
anchor:
'enforcing-2fa-for-all-users-in-a-group'
)
.form-group
.
col-sm-offset
-2.col-sm-10
.form-group
.row
.
offset-sm
-2.col-sm-10
.form-check
=
f
.
text_field
:two_factor_grace_period
,
class:
'
col-form-labe
l'
=
f
.
text_field
:two_factor_grace_period
,
class:
'
form-contro
l'
.form-text.text-muted
Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication
app/views/groups/edit.html.haml
View file @
b7f6f96a
...
...
@@ -30,7 +30,7 @@
=
render
'shared/allow_request_access'
,
form:
f
.form-group.row
%label
.col-form-label
%label
.col-form-label
.col-sm-2
=
s_
(
"GroupSettings|Share with group lock"
)
.col-sm-10
.form-check
...
...
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