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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
9474e36f
Commit
9474e36f
authored
8 years ago
by
Jason Lee
Committed by
Rémy Coutable
8 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add option to include the sender name in body of Notify email. fix #7824
parent
2837f5c1
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
65 additions
and
0 deletions
+65
-0
CHANGELOG
CHANGELOG
+1
-0
app/controllers/admin/application_settings_controller.rb
app/controllers/admin/application_settings_controller.rb
+1
-0
app/models/application_setting.rb
app/models/application_setting.rb
+1
-0
app/views/admin/application_settings/_form.html.haml
app/views/admin/application_settings/_form.html.haml
+10
-0
app/views/notify/_note_message.html.haml
app/views/notify/_note_message.html.haml
+3
-0
app/views/notify/new_issue_email.html.haml
app/views/notify/new_issue_email.html.haml
+3
-0
app/views/notify/new_merge_request_email.html.haml
app/views/notify/new_merge_request_email.html.haml
+3
-0
db/migrate/20160121030729_add_email_author_in_body_to_application_settings.rb
...30729_add_email_author_in_body_to_application_settings.rb
+5
-0
db/schema.rb
db/schema.rb
+1
-0
spec/mailers/notify_spec.rb
spec/mailers/notify_spec.rb
+37
-0
No files found.
CHANGELOG
View file @
9474e36f
...
...
@@ -9,6 +9,7 @@ v 8.5.0 (unreleased)
- Render sanitized SVG images (Stan Hu)
- Support download access by PRIVATE-TOKEN header (Stan Hu)
- Upgrade gitlab_git to 7.2.23 to fix commit message mentions in first branch push
- Add option to include the sender name in body of Notify email (Jason Lee)
- New UI for pagination
- Don't prevent sign out when 2FA enforcement is enabled and user hasn't yet
set it up
...
...
This diff is collapsed.
Click to expand it.
app/controllers/admin/application_settings_controller.rb
View file @
9474e36f
...
...
@@ -81,6 +81,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:sentry_dsn
,
:akismet_enabled
,
:akismet_api_key
,
:email_author_in_body
,
restricted_visibility_levels:
[],
import_sources:
[]
)
...
...
This diff is collapsed.
Click to expand it.
app/models/application_setting.rb
View file @
9474e36f
...
...
@@ -43,6 +43,7 @@
# metrics_port :integer default(8089)
# sentry_enabled :boolean default(FALSE)
# sentry_dsn :string
# email_author_in_body :boolean default(FALSE)
#
class
ApplicationSetting
<
ActiveRecord
::
Base
...
...
This diff is collapsed.
Click to expand it.
app/views/admin/application_settings/_form.html.haml
View file @
9474e36f
...
...
@@ -47,6 +47,16 @@
=
f
.
label
:version_check_enabled
do
=
f
.
check_box
:version_check_enabled
Version check enabled
.form-group
.col-sm-offset-2.col-sm-10
.checkbox
=
f
.
label
:email_author_in_body
do
=
f
.
check_box
:email_author_in_body
Include author name in notification email body
.help-block
Some email servers do not support overriding the email sender name.
Enable this option to include the name of the author of the issue,
merge request or comment in the email body instead.
.form-group
=
f
.
label
:admin_notification_email
,
class:
'control-label col-sm-2'
.col-sm-10
...
...
This diff is collapsed.
Click to expand it.
app/views/notify/_note_message.html.haml
View file @
9474e36f
-
if
current_application_settings
.
email_author_in_body
%div
#{
link_to
@note
.
author_name
,
user_url
(
@note
.
author
)
}
wrote:
%div
=
markdown
(
@note
.
note
,
pipeline: :email
)
This diff is collapsed.
Click to expand it.
app/views/notify/new_issue_email.html.haml
View file @
9474e36f
-
if
current_application_settings
.
email_author_in_body
%div
#{
link_to
@issue
.
author_name
,
user_url
(
@issue
.
author
)
}
wrote:
-
if
@issue
.
description
=
markdown
(
@issue
.
description
,
pipeline: :email
)
...
...
This diff is collapsed.
Click to expand it.
app/views/notify/new_merge_request_email.html.haml
View file @
9474e36f
-
if
current_application_settings
.
email_author_in_body
%div
#{
link_to
@merge_request
.
author_name
,
user_url
(
@merge_request
.
author
)
}
wrote:
%p
.details
!=
merge_path_description
(
@merge_request
,
'→'
)
...
...
This diff is collapsed.
Click to expand it.
db/migrate/20160121030729_add_email_author_in_body_to_application_settings.rb
0 → 100644
View file @
9474e36f
class
AddEmailAuthorInBodyToApplicationSettings
<
ActiveRecord
::
Migration
def
change
add_column
:application_settings
,
:email_author_in_body
,
:boolean
,
default:
false
end
end
This diff is collapsed.
Click to expand it.
db/schema.rb
View file @
9474e36f
...
...
@@ -66,6 +66,7 @@ ActiveRecord::Schema.define(version: 20160129135155) do
t
.
string
"sentry_dsn"
t
.
boolean
"akismet_enabled"
,
default:
false
t
.
string
"akismet_api_key"
t
.
boolean
"email_author_in_body"
,
default:
false
end
create_table
"audit_events"
,
force: :cascade
do
|
t
|
...
...
This diff is collapsed.
Click to expand it.
spec/mailers/notify_spec.rb
View file @
9474e36f
...
...
@@ -270,6 +270,17 @@ describe Notify do
it
'contains a link to the new issue'
do
is_expected
.
to
have_body_text
/
#{
namespace_project_issue_path
project
.
namespace
,
project
,
issue
}
/
end
context
'when enabled email_author_in_body'
do
before
do
allow
(
current_application_settings
).
to
receive
(
:email_author_in_body
).
and_return
(
true
)
end
it
'contains a link to note author'
do
is_expected
.
to
have_body_text
issue
.
author_name
is_expected
.
to
have_body_text
/wrote\:/
end
end
end
describe
'that are new with a description'
do
...
...
@@ -377,6 +388,17 @@ describe Notify do
it
'has the correct message-id set'
do
is_expected
.
to
have_header
'Message-ID'
,
"<merge_request_
#{
merge_request
.
id
}
@
#{
Gitlab
.
config
.
gitlab
.
host
}
>"
end
context
'when enabled email_author_in_body'
do
before
do
allow
(
current_application_settings
).
to
receive
(
:email_author_in_body
).
and_return
(
true
)
end
it
'contains a link to note author'
do
is_expected
.
to
have_body_text
merge_request
.
author_name
is_expected
.
to
have_body_text
/wrote\:/
end
end
end
describe
'that are new with a description'
do
...
...
@@ -550,6 +572,21 @@ describe Notify do
it
'contains the message from the note'
do
is_expected
.
to
have_body_text
/
#{
note
.
note
}
/
end
it
'not contains note author'
do
is_expected
.
not_to
have_body_text
/wrote\:/
end
context
'when enabled email_author_in_body'
do
before
do
allow
(
current_application_settings
).
to
receive
(
:email_author_in_body
).
and_return
(
true
)
end
it
'contains a link to note author'
do
is_expected
.
to
have_body_text
note
.
author_name
is_expected
.
to
have_body_text
/wrote\:/
end
end
end
describe
'on a commit'
do
...
...
This diff is collapsed.
Click to expand it.
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