Download as
Browse Code »

Commit 850b4af0fffa77d5f3440d89015543f060d9ac67

Authored by James Newton
1 parent 25a723c3
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

have email views use iid

Showing 23 changed files with 29 additions and 29 deletions   Show diff stats
app/views/notify/closed_issue_email.html.haml
  Diff comments   View file @850b4af
1 %p 1 %p
2 = "Issue was closed by #{@updated_by.name}" 2 = "Issue was closed by #{@updated_by.name}"
3 %p 3 %p
4 - = "Issue ##{@issue.id}" 4 + = "Issue ##{@issue.iid}"
5 = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title 5 = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
app/views/notify/closed_issue_email.text.haml
  Diff comments   View file @850b4af
1 = "Issue was closed by #{@updated_by.name}" 1 = "Issue was closed by #{@updated_by.name}"
2 2
3 -Issue ##{@issue.id}: #{project_issue_url(@issue.project, @issue)} 3 +Issue ##{@issue.iid}: #{project_issue_url(@issue.project, @issue)}
app/views/notify/closed_merge_request_email.html.haml
  Diff comments   View file @850b4af
1 %p 1 %p
2 - = "Merge Request #{@merge_request.id} was closed by #{@updated_by.name}" 2 + = "Merge Request #{@merge_request.iid} was closed by #{@updated_by.name}"
3 %p 3 %p
4 = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request) 4 = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request)
5 %p 5 %p
app/views/notify/closed_merge_request_email.text.haml
  Diff comments   View file @850b4af
1 -= "Merge Request #{@merge_request.id} was closed by #{@updated_by.name}" 1 += "Merge Request #{@merge_request.iid} was closed by #{@updated_by.name}"
2 2
3 Merge Request url: #{project_merge_request_url(@merge_request.target_project, @merge_request)} 3 Merge Request url: #{project_merge_request_url(@merge_request.target_project, @merge_request)}
4 4
app/views/notify/issue_status_changed_email.html.haml
  Diff comments   View file @850b4af
1 %p 1 %p
2 = "Issue was #{@issue_status} by #{@updated_by.name}" 2 = "Issue was #{@issue_status} by #{@updated_by.name}"
3 %p 3 %p
4 - = "Issue ##{@issue.id}" 4 + = "Issue ##{@issue.iid}"
5 = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title 5 = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
app/views/notify/issue_status_changed_email.text.erb
  Diff comments   View file @850b4af
1 Issue was <%= @issue_status %> by <%= @updated_by.name %> 1 Issue was <%= @issue_status %> by <%= @updated_by.name %>
2 2
3 -Issue <%= @issue.id %>: <%= url_for(project_issue_url(@issue.project, @issue)) %> 3 +Issue <%= @issue.iid %>: <%= url_for(project_issue_url(@issue.project, @issue)) %>
4 4
app/views/notify/merged_merge_request_email.html.haml
  Diff comments   View file @850b4af
1 %p 1 %p
2 - = "Merge Request #{@merge_request.id} was merged" 2 + = "Merge Request #{@merge_request.iid} was merged"
3 %p 3 %p
4 = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request) 4 = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request)
5 %p 5 %p
app/views/notify/merged_merge_request_email.text.haml
  Diff comments   View file @850b4af
1 -= "Merge Request #{@merge_request.id} was merged" 1 += "Merge Request #{@merge_request.iid} was merged"
2 2
3 Merge Request Url: #{project_merge_request_url(@merge_request.target_project, @merge_request)} 3 Merge Request Url: #{project_merge_request_url(@merge_request.target_project, @merge_request)}
4 4
app/views/notify/new_issue_email.html.haml
  Diff comments   View file @850b4af
1 %p 1 %p
2 New Issue was created. 2 New Issue was created.
3 %p 3 %p
4 - = "Issue ##{@issue.id}" 4 + = "Issue ##{@issue.iid}"
5 = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title 5 = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
6 %p 6 %p
7 Author: #{@issue.author_name} 7 Author: #{@issue.author_name}
app/views/notify/new_issue_email.text.erb
  Diff comments   View file @850b4af
1 New Issue was created. 1 New Issue was created.
2 -  
3 -Issue <%= @issue.id %>: <%= url_for(project_issue_url(@issue.project, @issue)) %> 2 +
  3 +Issue <%= @issue.iid %>: <%= url_for(project_issue_url(@issue.project, @issue)) %>
4 Author: <%= @issue.author_name %> 4 Author: <%= @issue.author_name %>
5 Asignee: <%= @issue.assignee_name %> 5 Asignee: <%= @issue.assignee_name %>
app/views/notify/new_merge_request_email.html.haml
  Diff comments   View file @850b4af
1 %p 1 %p
2 - = "New Merge Request !#{@merge_request.id}" 2 + = "New Merge Request !#{@merge_request.iid}"
3 %p 3 %p
4 = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request) 4 = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request)
5 %p 5 %p
app/views/notify/new_merge_request_email.text.erb
  Diff comments   View file @850b4af
1 -New Merge Request <%= @merge_request.id %> 1 +New Merge Request <%= @merge_request.iid %>
2 2
3 <%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %> 3 <%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %>
4 4
app/views/notify/new_user_email.text.erb
  Diff comments   View file @850b4af
@@ -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
5 login.................. <%= @user.email %> 5 login.................. <%= @user.email %>
6 <% if @user.created_by_id %> 6 <% if @user.created_by_id %>
7 password............... <%= @password %> 7 password............... <%= @password %>
8 - 8 +
9 You will be forced to change this password immediately after login. 9 You will be forced to change this password immediately after login.
10 <% end %> 10 <% end %>
11 11
app/views/notify/note_issue_email.html.haml
  Diff comments   View file @850b4af
1 %p 1 %p
2 - = "New comment for Issue ##{@issue.id}" 2 + = "New comment for Issue ##{@issue.iid}"
3 = link_to_gfm truncate(@issue.title, length: 35), project_issue_url(@issue.project, @issue, anchor: "note_#{@note.id}") 3 = link_to_gfm truncate(@issue.title, length: 35), project_issue_url(@issue.project, @issue, anchor: "note_#{@note.id}")
4 = render 'note_message' 4 = render 'note_message'
app/views/notify/note_issue_email.text.erb
  Diff comments   View file @850b4af
1 -New comment for Issue <%= @issue.id %> 1 +New comment for Issue <%= @issue.iid %>
2 2
3 <%= url_for(project_issue_url(@issue.project, @issue, anchor: "note_#{@note.id}")) %> 3 <%= url_for(project_issue_url(@issue.project, @issue, anchor: "note_#{@note.id}")) %>
4 4
app/views/notify/note_merge_request_email.html.haml
  Diff comments   View file @850b4af
@@ -3,6 +3,6 @@ @@ -3,6 +3,6 @@
3 = link_to "New comment on diff", diffs_project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}") 3 = link_to "New comment on diff", diffs_project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")
4 - else 4 - else
5 = link_to "New comment", project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}") 5 = link_to "New comment", project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")
6 - for Merge Request ##{@merge_request.id} 6 + for Merge Request ##{@merge_request.iid}
7 %cite "#{truncate(@merge_request.title, length: 20)}" 7 %cite "#{truncate(@merge_request.title, length: 20)}"
8 = render 'note_message' 8 = render 'note_message'
app/views/notify/note_merge_request_email.text.erb
  Diff comments   View file @850b4af
1 -New comment for Merge Request <%= @merge_request.id %> 1 +New comment for Merge Request <%= @merge_request.iid %>
2 2
3 <%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")) %> 3 <%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")) %>
4 - 4 +
5 5
6 <%= @note.author_name %> 6 <%= @note.author_name %>
7 - 7 +
8 <%= @note.note %> 8 <%= @note.note %>
9 9
app/views/notify/note_wall_email.text.erb
  Diff comments   View file @850b4af
1 New message on the project wall <%= @note.project %> 1 New message on the project wall <%= @note.project %>
2 2
3 <%= url_for(project_wall_url(@note.project, anchor: "note_#{@note.id}")) %> 3 <%= url_for(project_wall_url(@note.project, anchor: "note_#{@note.id}")) %>
4 - 4 +
5 5
6 <%= @note.author_name %> 6 <%= @note.author_name %>
7 7
app/views/notify/project_was_moved_email.text.erb
  Diff comments   View file @850b4af
1 Project was moved to another location 1 Project was moved to another location
2 - 2 +
3 The project is now located under 3 The project is now located under
4 <%= project_url(@project) %> 4 <%= project_url(@project) %>
5 - 5 +
6 6
7 To update the remote url in your local repository run: 7 To update the remote url in your local repository run:
8 git remote set-url origin <%= @project.ssh_url_to_repo %> 8 git remote set-url origin <%= @project.ssh_url_to_repo %>
app/views/notify/reassigned_issue_email.html.haml
  Diff comments   View file @850b4af
1 %p 1 %p
2 - = "Reassigned Issue ##{@issue.id}" 2 + = "Reassigned Issue ##{@issue.iid}"
3 = link_to_gfm truncate(@issue.title, length: 30), project_issue_url(@issue.project, @issue) 3 = link_to_gfm truncate(@issue.title, length: 30), project_issue_url(@issue.project, @issue)
4 %p 4 %p
5 Assignee changed 5 Assignee changed
app/views/notify/reassigned_issue_email.text.erb
  Diff comments   View file @850b4af
1 -Reassigned Issue <%= @issue.id %> 1 +Reassigned Issue <%= @issue.iid %>
2 2
3 <%= url_for(project_issue_url(@issue.project, @issue)) %> 3 <%= url_for(project_issue_url(@issue.project, @issue)) %>
4 - 4 +
5 Assignee changed <%= "from #{@previous_assignee.name}" if @previous_assignee %> to <%= @issue.assignee_name %> 5 Assignee changed <%= "from #{@previous_assignee.name}" if @previous_assignee %> to <%= @issue.assignee_name %>
app/views/notify/reassigned_merge_request_email.html.haml
  Diff comments   View file @850b4af
1 %p 1 %p
2 - = "Reassigned Merge Request !#{@merge_request.id}" 2 + = "Reassigned Merge Request !#{@merge_request.iid}"
3 = link_to_gfm truncate(@merge_request.title, length: 30), project_merge_request_url(@merge_request.target_project, @merge_request) 3 = link_to_gfm truncate(@merge_request.title, length: 30), project_merge_request_url(@merge_request.target_project, @merge_request)
4 %p 4 %p
5 Assignee changed 5 Assignee changed
app/views/notify/reassigned_merge_request_email.text.erb
  Diff comments   View file @850b4af
1 -Reassigned Merge Request <%= @merge_request.id %> 1 +Reassigned Merge Request <%= @merge_request.iid %>
2 2
3 <%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %> 3 <%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %>
4 - 4 +
5 5
6 Assignee changed <%= "from #{@previous_assignee.name}" if @previous_assignee %> to <%= @merge_request.assignee_name %> 6 Assignee changed <%= "from #{@previous_assignee.name}" if @previous_assignee %> to <%= @merge_request.assignee_name %>
7 7