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
48e31125
Commit
48e31125
authored
Jan 17, 2017
by
Sean McGivern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add text version of unapproval email
parent
f92fd303
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
app/mailers/emails/merge_requests.rb
app/mailers/emails/merge_requests.rb
+0
-2
app/views/notify/approved_merge_request_email.text.haml
app/views/notify/approved_merge_request_email.text.haml
+1
-1
app/views/notify/unapproved_merge_request_email.text.haml
app/views/notify/unapproved_merge_request_email.text.haml
+8
-0
No files found.
app/mailers/emails/merge_requests.rb
View file @
48e31125
...
...
@@ -58,7 +58,6 @@ module Emails
setup_merge_request_mail
(
merge_request_id
,
recipient_id
)
@approved_by
=
User
.
find
(
approved_by_user_id
)
@approved_by_users
=
@merge_request
.
approved_by_users
.
map
(
&
:name
)
mail_answer_thread
(
@merge_request
,
merge_request_thread_options
(
approved_by_user_id
,
recipient_id
))
end
...
...
@@ -66,7 +65,6 @@ module Emails
setup_merge_request_mail
(
merge_request_id
,
recipient_id
)
@unapproved_by
=
User
.
find
(
unapproved_by_user_id
)
@unapproved_by_users
=
@merge_request
.
approved_by_users
.
map
(
&
:name
)
mail_answer_thread
(
@merge_request
,
merge_request_thread_options
(
approved_by_user_id
,
recipient_id
))
end
...
...
app/views/notify/approved_merge_request_email.text.haml
View file @
48e31125
=
"Merge Request
#{
@merge_request
.
to_reference
}
was approved by
#{
@approved_by_user
s
.
to_sentence
}
"
=
"Merge Request
#{
@merge_request
.
to_reference
}
was approved by
#{
@approved_by_user
}
"
Merge Request url:
#{
namespace_project_merge_request_url
(
@merge_request
.
target_project
.
namespace
,
@merge_request
.
target_project
,
@merge_request
)
}
...
...
app/views/notify/unapproved_merge_request_email.text.haml
0 → 100644
View file @
48e31125
=
"Merge Request
#{
@merge_request
.
to_reference
}
was unapproved by
#{
@unapproved_by_user
}
"
Merge Request url:
#{
namespace_project_merge_request_url
(
@merge_request
.
target_project
.
namespace
,
@merge_request
.
target_project
,
@merge_request
)
}
=
merge_path_description
(
@merge_request
,
'to'
)
Author:
#{
@merge_request
.
author_name
}
Assignee:
#{
@merge_request
.
assignee_name
}
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