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
9f760488
Commit
9f760488
authored
Apr 08, 2022
by
peterhegman
Committed by
Peter Hegman
Apr 14, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate checkboxes on admin group edit page to be Pajamas compliant
Part of Pajamas migration day Changelog: changed
parent
8492e153
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
18 deletions
+10
-18
app/views/admin/groups/_form.html.haml
app/views/admin/groups/_form.html.haml
+1
-1
app/views/groups/_group_admin_settings.html.haml
app/views/groups/_group_admin_settings.html.haml
+9
-14
app/views/shared/_allow_request_access.html.haml
app/views/shared/_allow_request_access.html.haml
+0
-3
No files found.
app/views/admin/groups/_form.html.haml
View file @
9f760488
...
...
@@ -18,7 +18,7 @@
.form-group.row
.offset-sm-2.col-sm-10
=
render
'shared/allow_request_access'
,
form:
f
,
bold_label:
true
=
render
'shared/allow_request_access'
,
form:
f
=
render
'groups/group_admin_settings'
,
f:
f
...
...
app/views/groups/_group_admin_settings.html.haml
View file @
9f760488
...
...
@@ -2,14 +2,12 @@
.col-sm-2.col-form-label.pt-0
=
f
.
label
:lfs_enabled
,
_
(
'Large File Storage'
)
.col-sm-10
.form-check
=
f
.
check_box
:lfs_enabled
,
checked:
@group
.
lfs_enabled?
,
class:
'form-check-input'
=
f
.
label
:lfs_enabled
,
class:
'form-check-label'
do
%strong
=
_
(
'Allow projects within this group to use Git LFS'
)
=
link_to
sprite_icon
(
'question-o'
),
help_page_path
(
'topics/git/lfs/index'
)
%br
/
%span
=
_
(
'This setting can be overridden in each project.'
)
-
label
=
_
(
'Allow projects within this group to use Git LFS'
)
-
help_link
=
link_to
sprite_icon
(
'question-o'
),
help_page_path
(
'topics/git/lfs/index'
),
class:
'gl-ml-2'
=
f
.
gitlab_ui_checkbox_component
:lfs_enabled
,
'%{label}%{help_link}'
.
html_safe
%
{
label:
label
,
help_link:
help_link
},
help_text:
_
(
'This setting can be overridden in each project.'
),
checkbox_options:
{
checked:
@group
.
lfs_enabled?
}
.form-group.row
.col-sm-2.col-form-label
=
f
.
label
s_
(
'ProjectCreationLevel|Allowed to create projects'
)
...
...
@@ -26,12 +24,9 @@
.col-sm-2.col-form-label.pt-0
=
f
.
label
:require_two_factor_authentication
,
_
(
'Two-factor authentication'
)
.col-sm-10
.form-check
=
f
.
check_box
:require_two_factor_authentication
,
class:
'form-check-input'
=
f
.
label
:require_two_factor_authentication
,
class:
'form-check-label'
do
%strong
=
_
(
"Require all users in this group to set up two-factor authentication"
)
=
link_to
sprite_icon
(
'question-o'
),
help_page_path
(
'security/two_factor_authentication'
,
anchor:
'enforce-2fa-for-all-users-in-a-group'
)
-
label
=
_
(
"Require all users in this group to set up two-factor authentication"
)
-
help_link
=
link_to
sprite_icon
(
'question-o'
),
help_page_path
(
'security/two_factor_authentication'
,
anchor:
'enforce-2fa-for-all-users-in-a-group'
),
class:
'gl-ml-2'
=
f
.
gitlab_ui_checkbox_component
:require_two_factor_authentication
,
'%{label}%{help_link}'
.
html_safe
%
{
label:
label
,
help_link:
help_link
}
.form-group.row
.offset-sm-2.col-sm-10
.form-check
...
...
app/views/shared/_allow_request_access.html.haml
View file @
9f760488
-
label_class
=
local_assigns
.
fetch
(
:bold_label
,
false
)
?
'font-weight-bold'
:
''
=
form
.
gitlab_ui_checkbox_component
:request_access_enabled
,
_
(
'Allow users to request access (if visibility is public or internal)'
),
label_options:
{
class:
label_class
},
checkbox_options:
{
data:
{
qa_selector:
'request_access_checkbox'
}
}
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