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
ee721848
Commit
ee721848
authored
Aug 26, 2021
by
Ammar Alakkad
Committed by
Natalia Tepluhina
Aug 26, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move "Allow users to request access" setting to a new subsection "Membership"
parent
c3a5d918
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
2 deletions
+13
-2
app/views/groups/settings/_permissions.html.haml
app/views/groups/settings/_permissions.html.haml
+4
-2
ee/app/views/groups/settings/_membership.html.haml
ee/app/views/groups/settings/_membership.html.haml
+6
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
app/views/groups/settings/_permissions.html.haml
View file @
ee721848
...
...
@@ -4,8 +4,9 @@
%fieldset
%h5
=
_
(
'Permissions'
)
.form-group
=
render
'shared/allow_request_access'
,
form:
f
-
unless
::
Feature
.
enabled?
(
:saas_user_caps
)
.form-group
=
render
'shared/allow_request_access'
,
form:
f
-
if
@group
.
root?
.form-group.gl-mb-3
...
...
@@ -43,5 +44,6 @@
=
render_if_exists
'groups/settings/prevent_forking'
,
f:
f
,
group:
@group
=
render
'groups/settings/two_factor_auth'
,
f:
f
,
group:
@group
=
render_if_exists
'groups/personal_access_token_expiration_policy'
,
f:
f
,
group:
@group
=
render_if_exists
'groups/settings/membership'
,
f:
f
=
render_if_exists
'groups/member_lock_setting'
,
f:
f
,
group:
@group
=
f
.
submit
_
(
'Save changes'
),
class:
'btn gl-button btn-confirm gl-mt-3 js-dirty-submit'
,
data:
{
qa_selector:
'save_permissions_changes_button'
}
ee/app/views/groups/settings/_membership.html.haml
0 → 100644
View file @
ee721848
-
return
unless
::
Feature
.
enabled?
(
:saas_user_caps
)
%h5
=
_
(
'Membership'
)
.form-group
{
data:
{
testid:
'membership-form-group'
}
}
=
render
'shared/allow_request_access'
,
form:
f
locale/gitlab.pot
View file @
ee721848
...
...
@@ -20760,6 +20760,9 @@ msgstr ""
msgid "Members of a group may only view projects they have permission to access"
msgstr ""
msgid "Membership"
msgstr ""
msgid "Members|%{time} by %{user}"
msgstr ""
...
...
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