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
7292b771
Commit
7292b771
authored
Nov 20, 2019
by
Fabio Huser
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor(user-parser): apply merge request review comments
parent
ceb49508
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
8 deletions
+6
-8
app/views/groups/settings/_permissions.html.haml
app/views/groups/settings/_permissions.html.haml
+1
-1
db/migrate/20191114132259_add_mentions_disabled_to_namespaces.rb
...ate/20191114132259_add_mentions_disabled_to_namespaces.rb
+0
-2
doc/user/group/index.md
doc/user/group/index.md
+3
-3
lib/banzai/reference_parser/user_parser.rb
lib/banzai/reference_parser/user_parser.rb
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+1
-1
No files found.
app/views/groups/settings/_permissions.html.haml
View file @
7292b771
...
...
@@ -28,7 +28,7 @@
=
f
.
check_box
:mentions_disabled
,
checked:
@group
.
mentions_disabled?
,
class:
'form-check-input'
=
f
.
label
:mentions_disabled
,
class:
'form-check-label'
do
%span
.d-block
=
s_
(
'GroupSettings|Disable group mentions'
)
%span
.text-muted
=
s_
(
'GroupSettings|This setting will prevent group members from
gett
ing notified if the group is mentioned.'
)
%span
.text-muted
=
s_
(
'GroupSettings|This setting will prevent group members from
be
ing notified if the group is mentioned.'
)
=
render_if_exists
'groups/settings/ip_restriction'
,
f:
f
,
group:
@group
=
render_if_exists
'groups/settings/allowed_email_domain'
,
f:
f
,
group:
@group
...
...
db/migrate/20191114132259_add_mentions_disabled_to_namespaces.rb
View file @
7292b771
# frozen_string_literal: true
class
AddMentionsDisabledToNamespaces
<
ActiveRecord
::
Migration
[
5.2
]
include
Gitlab
::
Database
::
MigrationHelpers
DOWNTIME
=
false
def
change
...
...
doc/user/group/index.md
View file @
7292b771
...
...
@@ -436,11 +436,11 @@ To enable this feature:
> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/21301) in GitLab 12.6.
You can prevent users from being added to a conversation and getting notified when
one mentions a group in which those users are members.
any
one mentions a group in which those users are members.
Groups with disabled mentions are visuali
sed accordingly in the auto-completion menu
.
Groups with disabled mentions are visuali
zed accordingly in the autocompletion dropdown
.
This is particularly helpful
, if a group has large amount
of users.
This is particularly helpful
for groups with a large number
of users.
To enable this feature:
...
...
lib/banzai/reference_parser/user_parser.rb
View file @
7292b771
...
...
@@ -98,7 +98,7 @@ module Banzai
return
[]
if
ids
.
empty?
User
.
joins
(
:group_members
).
where
(
members:
{
source_id:
Namespace
.
where
(
id:
ids
,
mentions_disabled:
[
false
,
nil
]
).
select
(
:id
)
source_id:
Namespace
.
where
(
id:
ids
).
where
(
'mentions_disabled IS NOT TRUE'
).
select
(
:id
)
}).
to_a
end
...
...
locale/gitlab.pot
View file @
7292b771
...
...
@@ -8911,7 +8911,7 @@ msgstr ""
msgid "GroupSettings|This setting will override user notification preferences for all members of the group, subgroups, and projects."
msgstr ""
msgid "GroupSettings|This setting will prevent group members from
gett
ing notified if the group is mentioned."
msgid "GroupSettings|This setting will prevent group members from
be
ing notified if the group is mentioned."
msgstr ""
msgid "GroupSettings|Transfer group"
...
...
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