From 43fcd623f32ef6191e33241ae9b2fde86c241901 Mon Sep 17 00:00:00 2001 From: Thomas Berger Date: Fri, 11 Jan 2013 17:53:30 +0100 Subject: [PATCH 1/2] added text-templates for mail notification --- app/views/notify/issue_status_changed_email.text.erb | 4 ++++ app/views/notify/new_issue_email.text.erb | 4 ++++ app/views/notify/new_merge_request_email.text.erb | 9 +++++++++ app/views/notify/new_user_email.text.erb | 8 ++++++++ app/views/notify/note_commit_email.text.erb | 9 +++++++++ app/views/notify/note_issue_email.text.erb | 9 +++++++++ app/views/notify/note_merge_request_email.text.erb | 9 +++++++++ app/views/notify/note_wall_email.text.erb | 9 +++++++++ app/views/notify/project_access_granted_email.text.erb | 4 ++++ app/views/notify/project_was_moved_email.text.erb | 8 ++++++++ app/views/notify/reassigned_issue_email.text.erb | 7 +++++++ app/views/notify/reassigned_merge_request_email.text.erb | 7 +++++++ 12 files changed, 87 insertions(+) create mode 100644 app/views/notify/issue_status_changed_email.text.erb create mode 100644 app/views/notify/new_issue_email.text.erb create mode 100644 app/views/notify/new_merge_request_email.text.erb create mode 100644 app/views/notify/new_user_email.text.erb create mode 100644 app/views/notify/note_commit_email.text.erb create mode 100644 app/views/notify/note_issue_email.text.erb create mode 100644 app/views/notify/note_merge_request_email.text.erb create mode 100644 app/views/notify/note_wall_email.text.erb create mode 100644 app/views/notify/project_access_granted_email.text.erb create mode 100644 app/views/notify/project_was_moved_email.text.erb create mode 100644 app/views/notify/reassigned_issue_email.text.erb create mode 100644 app/views/notify/reassigned_merge_request_email.text.erb diff --git a/app/views/notify/issue_status_changed_email.text.erb b/app/views/notify/issue_status_changed_email.text.erb new file mode 100644 index 00000000000..6f6f3e4e547 --- /dev/null +++ b/app/views/notify/issue_status_changed_email.text.erb @@ -0,0 +1,4 @@ +Issue was <%= @issue_status %> by <%= @updated_by.name => + +Issue <%= @issue.id %>: <%= url_for(project_issue_url(@issue.project, @issue)) %> + diff --git a/app/views/notify/new_issue_email.text.erb b/app/views/notify/new_issue_email.text.erb new file mode 100644 index 00000000000..b7bc537f9d6 --- /dev/null +++ b/app/views/notify/new_issue_email.text.erb @@ -0,0 +1,4 @@ +New Issue was created and assigned to you. + + +Issue <%= @issue.id} %>: <%= url_for(project_issue_url(@issue.project, @issue)) %> diff --git a/app/views/notify/new_merge_request_email.text.erb b/app/views/notify/new_merge_request_email.text.erb new file mode 100644 index 00000000000..3393d8384f1 --- /dev/null +++ b/app/views/notify/new_merge_request_email.text.erb @@ -0,0 +1,9 @@ +New Merge Request <%= @merge_request.id %> + +<%= url_for(project_merge_request_url(@merge_request.project, @merge_request)) %> + + +Branches: <%= @merge_request.source_branch %> to <%= @merge_request.target_branch %> +Author: <%= @merge_request.author_name %> +Asignee: <%= @merge_request.assignee_name %> + diff --git a/app/views/notify/new_user_email.text.erb b/app/views/notify/new_user_email.text.erb new file mode 100644 index 00000000000..794d5a2c3e8 --- /dev/null +++ b/app/views/notify/new_user_email.text.erb @@ -0,0 +1,8 @@ +Hi <%= @user.name %>! + +Administrator created account for you. Now you are a member of company GitLab application. + +login.................. <%= @user.email %> +password............... <%= @password %> + +Click here to login: <%= url_for(root_url) %> diff --git a/app/views/notify/note_commit_email.text.erb b/app/views/notify/note_commit_email.text.erb new file mode 100644 index 00000000000..aab8e5cfb6c --- /dev/null +++ b/app/views/notify/note_commit_email.text.erb @@ -0,0 +1,9 @@ +New comment for Commit <%= @commit.short_id %> + +<%= url_for(project_commit_url(@note.project, id: @commit.id, anchor: "note_#{@note.id}")) %> + + +Author: <%= @note.author_name %> + +<%= @note.note %> + diff --git a/app/views/notify/note_issue_email.text.erb b/app/views/notify/note_issue_email.text.erb new file mode 100644 index 00000000000..a476b286ae4 --- /dev/null +++ b/app/views/notify/note_issue_email.text.erb @@ -0,0 +1,9 @@ +New comment for Issue <%= @issue.id %> + +<%= url_for(project_issue_url(@issue.project, @issue, anchor: "note_#{@note.id}")) %> + + +Author: <%= @note.author_name %> + +<%= @note.note %> + diff --git a/app/views/notify/note_merge_request_email.text.erb b/app/views/notify/note_merge_request_email.text.erb new file mode 100644 index 00000000000..26c73bdaa38 --- /dev/null +++ b/app/views/notify/note_merge_request_email.text.erb @@ -0,0 +1,9 @@ +New comment for Merge Request <%= @merge_request.id %> + +<%= url_for(project_merge_request_url(@merge_request.project, @merge_request, anchor: "note_#{@note.id}")) %> + + +<%= @note.author_name %> + +<%= @note.note %> + diff --git a/app/views/notify/note_wall_email.text.erb b/app/views/notify/note_wall_email.text.erb new file mode 100644 index 00000000000..ea1b7efbe84 --- /dev/null +++ b/app/views/notify/note_wall_email.text.erb @@ -0,0 +1,9 @@ +New message on the project wall <%= @note.project %> + +<%= url_for(wall_project_url(@note.project, anchor: "note_#{@note.id}")) %> + + +<%= @note.author_name %> + +<%= @note.note %> + diff --git a/app/views/notify/project_access_granted_email.text.erb b/app/views/notify/project_access_granted_email.text.erb new file mode 100644 index 00000000000..077c3b8a7de --- /dev/null +++ b/app/views/notify/project_access_granted_email.text.erb @@ -0,0 +1,4 @@ + +You have been granted <%= @users_project.project_access_human %> access to project <%= @project.name_with_namespace %> + +<%= url_for(project_url(@project)) %> diff --git a/app/views/notify/project_was_moved_email.text.erb b/app/views/notify/project_was_moved_email.text.erb new file mode 100644 index 00000000000..da123c2f89c --- /dev/null +++ b/app/views/notify/project_was_moved_email.text.erb @@ -0,0 +1,8 @@ +Project was moved to another location + +The project is now located under +<%= url_for(link_to project_url(@project)) %> + + +To update the remote url in your local repository run: + git remote set-url origin <%= @project.ssh_url_to_repo %> diff --git a/app/views/notify/reassigned_issue_email.text.erb b/app/views/notify/reassigned_issue_email.text.erb new file mode 100644 index 00000000000..497044184dc --- /dev/null +++ b/app/views/notify/reassigned_issue_email.text.erb @@ -0,0 +1,7 @@ +Reassigned Issue <%= @issue.id %> + +<%= url_for(project_issue_url(@issue.project, @issue)) %> + + +Assignee changed from <%= @previous_assignee.name %> to <%= @issue.assignee_name %> + diff --git a/app/views/notify/reassigned_merge_request_email.text.erb b/app/views/notify/reassigned_merge_request_email.text.erb new file mode 100644 index 00000000000..1af4ab559f6 --- /dev/null +++ b/app/views/notify/reassigned_merge_request_email.text.erb @@ -0,0 +1,7 @@ +Reassigned Merge Request <%= @merge_request.id %> + +<%= url_for(project_merge_request_url(@merge_request.project, @merge_request)) %> + + +Assignee changed from <%= @previous_assignee.name %> to <%= @merge_request.assignee_name %> + -- GitLab From bce60ab54102be0c63d0cd91036165e59e6f673b Mon Sep 17 00:00:00 2001 From: Thomas Berger Date: Fri, 11 Jan 2013 21:24:28 +0100 Subject: [PATCH 2/2] fixed typo --- app/views/notify/new_issue_email.text.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/notify/new_issue_email.text.erb b/app/views/notify/new_issue_email.text.erb index b7bc537f9d6..5ed55c35b23 100644 --- a/app/views/notify/new_issue_email.text.erb +++ b/app/views/notify/new_issue_email.text.erb @@ -1,4 +1,4 @@ New Issue was created and assigned to you. -Issue <%= @issue.id} %>: <%= url_for(project_issue_url(@issue.project, @issue)) %> +Issue <%= @issue.id %>: <%= url_for(project_issue_url(@issue.project, @issue)) %> -- GitLab