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
6dee3684
Commit
6dee3684
authored
Nov 03, 2017
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix (un)approver names not being shown in plaintext emails
parent
370fb882
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-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
+1
-1
changelogs/unreleased-ee/3924-approver-emails-text.yml
changelogs/unreleased-ee/3924-approver-emails-text.yml
+5
-0
No files found.
app/views/notify/approved_merge_request_email.text.haml
View file @
6dee3684
Merge Request
#{
@merge_request
.
to_reference
}
was approved by
#{
@approved_by
_user
}
Merge Request
#{
@merge_request
.
to_reference
}
was approved by
#{
@approved_by
.
name
}
Merge Request url:
#{
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
)
}
Merge Request url:
#{
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
)
}
...
...
app/views/notify/unapproved_merge_request_email.text.haml
View file @
6dee3684
Merge Request
#{
@merge_request
.
to_reference
}
was unapproved by
#{
@unapproved_by
_user
}
Merge Request
#{
@merge_request
.
to_reference
}
was unapproved by
#{
@unapproved_by
.
name
}
Merge Request url:
#{
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
)
}
Merge Request url:
#{
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
)
}
...
...
changelogs/unreleased-ee/3924-approver-emails-text.yml
0 → 100644
View file @
6dee3684
---
title
:
Fix (un)approver names not being shown in plaintext emails
merge_request
:
3266
author
:
type
:
fixed
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