Commit 850b4af0 authored by James Newton's avatar James Newton

have email views use iid

parent 25a723c3
%p %p
= "Issue was closed by #{@updated_by.name}" = "Issue was closed by #{@updated_by.name}"
%p %p
= "Issue ##{@issue.id}" = "Issue ##{@issue.iid}"
= link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
= "Issue was closed by #{@updated_by.name}" = "Issue was closed by #{@updated_by.name}"
Issue ##{@issue.id}: #{project_issue_url(@issue.project, @issue)} Issue ##{@issue.iid}: #{project_issue_url(@issue.project, @issue)}
%p %p
= "Merge Request #{@merge_request.id} was closed by #{@updated_by.name}" = "Merge Request #{@merge_request.iid} was closed by #{@updated_by.name}"
%p %p
= link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request) = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request)
%p %p
......
= "Merge Request #{@merge_request.id} was closed by #{@updated_by.name}" = "Merge Request #{@merge_request.iid} was closed by #{@updated_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)}
......
%p %p
= "Issue was #{@issue_status} by #{@updated_by.name}" = "Issue was #{@issue_status} by #{@updated_by.name}"
%p %p
= "Issue ##{@issue.id}" = "Issue ##{@issue.iid}"
= link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
Issue was <%= @issue_status %> by <%= @updated_by.name %> Issue was <%= @issue_status %> by <%= @updated_by.name %>
Issue <%= @issue.id %>: <%= url_for(project_issue_url(@issue.project, @issue)) %> Issue <%= @issue.iid %>: <%= url_for(project_issue_url(@issue.project, @issue)) %>
%p %p
= "Merge Request #{@merge_request.id} was merged" = "Merge Request #{@merge_request.iid} was merged"
%p %p
= link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request) = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request)
%p %p
......
= "Merge Request #{@merge_request.id} was merged" = "Merge Request #{@merge_request.iid} was merged"
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)}
......
%p %p
New Issue was created. New Issue was created.
%p %p
= "Issue ##{@issue.id}" = "Issue ##{@issue.iid}"
= link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
%p %p
Author: #{@issue.author_name} Author: #{@issue.author_name}
......
New Issue was created. New Issue was created.
Issue <%= @issue.id %>: <%= url_for(project_issue_url(@issue.project, @issue)) %> Issue <%= @issue.iid %>: <%= url_for(project_issue_url(@issue.project, @issue)) %>
Author: <%= @issue.author_name %> Author: <%= @issue.author_name %>
Asignee: <%= @issue.assignee_name %> Asignee: <%= @issue.assignee_name %>
%p %p
= "New Merge Request !#{@merge_request.id}" = "New Merge Request !#{@merge_request.iid}"
%p %p
= link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request) = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request)
%p %p
......
New Merge Request <%= @merge_request.id %> New Merge Request <%= @merge_request.iid %>
<%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %> <%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %>
......
...@@ -5,7 +5,7 @@ The Administrator created an account for you. Now you are a member of the compan ...@@ -5,7 +5,7 @@ The Administrator created an account for you. Now you are a member of the compan
login.................. <%= @user.email %> login.................. <%= @user.email %>
<% if @user.created_by_id %> <% if @user.created_by_id %>
password............... <%= @password %> password............... <%= @password %>
You will be forced to change this password immediately after login. You will be forced to change this password immediately after login.
<% end %> <% end %>
......
%p %p
= "New comment for Issue ##{@issue.id}" = "New comment for Issue ##{@issue.iid}"
= link_to_gfm truncate(@issue.title, length: 35), project_issue_url(@issue.project, @issue, anchor: "note_#{@note.id}") = link_to_gfm truncate(@issue.title, length: 35), project_issue_url(@issue.project, @issue, anchor: "note_#{@note.id}")
= render 'note_message' = render 'note_message'
New comment for Issue <%= @issue.id %> New comment for Issue <%= @issue.iid %>
<%= url_for(project_issue_url(@issue.project, @issue, anchor: "note_#{@note.id}")) %> <%= url_for(project_issue_url(@issue.project, @issue, anchor: "note_#{@note.id}")) %>
......
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
= link_to "New comment on diff", diffs_project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}") = link_to "New comment on diff", diffs_project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")
- else - else
= link_to "New comment", project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}") = link_to "New comment", project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")
for Merge Request ##{@merge_request.id} for Merge Request ##{@merge_request.iid}
%cite "#{truncate(@merge_request.title, length: 20)}" %cite "#{truncate(@merge_request.title, length: 20)}"
= render 'note_message' = render 'note_message'
New comment for Merge Request <%= @merge_request.id %> New comment for Merge Request <%= @merge_request.iid %>
<%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")) %> <%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")) %>
<%= @note.author_name %> <%= @note.author_name %>
<%= @note.note %> <%= @note.note %>
New message on the project wall <%= @note.project %> New message on the project wall <%= @note.project %>
<%= url_for(project_wall_url(@note.project, anchor: "note_#{@note.id}")) %> <%= url_for(project_wall_url(@note.project, anchor: "note_#{@note.id}")) %>
<%= @note.author_name %> <%= @note.author_name %>
......
Project was moved to another location Project was moved to another location
The project is now located under The project is now located under
<%= project_url(@project) %> <%= project_url(@project) %>
To update the remote url in your local repository run: To update the remote url in your local repository run:
git remote set-url origin <%= @project.ssh_url_to_repo %> git remote set-url origin <%= @project.ssh_url_to_repo %>
%p %p
= "Reassigned Issue ##{@issue.id}" = "Reassigned Issue ##{@issue.iid}"
= link_to_gfm truncate(@issue.title, length: 30), project_issue_url(@issue.project, @issue) = link_to_gfm truncate(@issue.title, length: 30), project_issue_url(@issue.project, @issue)
%p %p
Assignee changed Assignee changed
......
Reassigned Issue <%= @issue.id %> Reassigned Issue <%= @issue.iid %>
<%= url_for(project_issue_url(@issue.project, @issue)) %> <%= url_for(project_issue_url(@issue.project, @issue)) %>
Assignee changed <%= "from #{@previous_assignee.name}" if @previous_assignee %> to <%= @issue.assignee_name %> Assignee changed <%= "from #{@previous_assignee.name}" if @previous_assignee %> to <%= @issue.assignee_name %>
%p %p
= "Reassigned Merge Request !#{@merge_request.id}" = "Reassigned Merge Request !#{@merge_request.iid}"
= link_to_gfm truncate(@merge_request.title, length: 30), project_merge_request_url(@merge_request.target_project, @merge_request) = link_to_gfm truncate(@merge_request.title, length: 30), project_merge_request_url(@merge_request.target_project, @merge_request)
%p %p
Assignee changed Assignee changed
......
Reassigned Merge Request <%= @merge_request.id %> Reassigned Merge Request <%= @merge_request.iid %>
<%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %> <%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %>
Assignee changed <%= "from #{@previous_assignee.name}" if @previous_assignee %> to <%= @merge_request.assignee_name %> Assignee changed <%= "from #{@previous_assignee.name}" if @previous_assignee %> to <%= @merge_request.assignee_name %>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment