summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-28 12:33:54 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-28 12:33:54 +0200
commitecf3b2e4710276aa1e12a931960bda2aff6ec95c (patch)
tree038e37838fd8fdf89e319f739a1f0b28462780a3
parentc04120c1c512bd515fceccc70d0c7cf0a6bf4cb7 (diff)
downloadgitlab-ce-ecf3b2e4710276aa1e12a931960bda2aff6ec95c.tar.gz
add text templates to new emails
-rw-r--r--app/views/notify/closed_issue_email.text.haml3
-rw-r--r--app/views/notify/closed_merge_request_email.text.haml8
-rw-r--r--app/views/notify/merged_merge_request_email.text.haml8
3 files changed, 19 insertions, 0 deletions
diff --git a/app/views/notify/closed_issue_email.text.haml b/app/views/notify/closed_issue_email.text.haml
new file mode 100644
index 00000000000..0cca321552c
--- /dev/null
+++ b/app/views/notify/closed_issue_email.text.haml
@@ -0,0 +1,3 @@
+= "Issue was closed by #{@updated_by.name}"
+
+Issue ##{@issue.id}: #{project_issue_url(@issue.project, @issue)}
diff --git a/app/views/notify/closed_merge_request_email.text.haml b/app/views/notify/closed_merge_request_email.text.haml
new file mode 100644
index 00000000000..ee4648e3d09
--- /dev/null
+++ b/app/views/notify/closed_merge_request_email.text.haml
@@ -0,0 +1,8 @@
+= "Merge Request #{@merge_request.id} was closed by #{@updated_by.name}"
+
+Merge Request url: #{project_merge_request_url(@merge_request.project, @merge_request)}
+
+Branches: #{@merge_request.source_branch} - #{@merge_request.target_branch}
+
+Author: #{@merge_request.author_name}
+Assignee: #{@merge_request.assignee_name}
diff --git a/app/views/notify/merged_merge_request_email.text.haml b/app/views/notify/merged_merge_request_email.text.haml
new file mode 100644
index 00000000000..91c23360195
--- /dev/null
+++ b/app/views/notify/merged_merge_request_email.text.haml
@@ -0,0 +1,8 @@
+= "Merge Request #{@merge_request.id} was merged"
+
+Merge Request Url: #{project_merge_request_url(@merge_request.project, @merge_request)}
+
+Branches: #{@merge_request.source_branch} - #{@merge_request.target_branch}
+
+Author: #{@merge_request.author_name}
+Assignee: #{@merge_request.assignee_name}