Version 7.10.0.rc5v7.10.0.rc5

53 files changed, 0 insertions, 410 deletions

diff --git a/app/views/notify/_note_message.html.haml b/app/views/notify/_note_message.html.haml
deleted file mode 100644
index 3fd4b04ac84..00000000000
--- a/app/views/notify/_note_message.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-%div
-  = markdown(@note.note, reference_only_path: false)
diff --git a/app/views/notify/_reassigned_issuable_email.html.haml b/app/views/notify/_reassigned_issuable_email.html.haml
deleted file mode 100644
index 56d81b2ed2e..00000000000
--- a/app/views/notify/_reassigned_issuable_email.html.haml
+++ /dev/null
@@ -1,10 +0,0 @@
-%p
-  Assignee changed
-  - if @previous_assignee
-    from
-    %strong #{@previous_assignee.name}
-  to
-  - if issuable.assignee_id
-    %strong #{issuable.assignee_name}
-  - else
-    %strong Unassigned
diff --git a/app/views/notify/_reassigned_issuable_email.text.erb b/app/views/notify/_reassigned_issuable_email.text.erb
deleted file mode 100644
index 855d37429d9..00000000000
--- a/app/views/notify/_reassigned_issuable_email.text.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-Reassigned <%= issuable.class.model_name.human.titleize %> <%= issuable.iid %>
-
-<%= url_for([issuable.project.namespace.becomes(Namespace), issuable.project, issuable, {only_path: false}]) %>
-
-Assignee changed <%= "from #{@previous_assignee.name}" if @previous_assignee -%>
- to <%= "#{issuable.assignee_id ? issuable.assignee_name : 'Unassigned'}" %>
diff --git a/app/views/notify/closed_issue_email.html.haml b/app/views/notify/closed_issue_email.html.haml
deleted file mode 100644
index 56c18cd83cd..00000000000
--- a/app/views/notify/closed_issue_email.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-%p
-  = "Issue was closed by #{@updated_by.name}"
diff --git a/app/views/notify/closed_issue_email.text.haml b/app/views/notify/closed_issue_email.text.haml
deleted file mode 100644
index ac703b31edd..00000000000
--- a/app/views/notify/closed_issue_email.text.haml
+++ /dev/null
@@ -1,3 +0,0 @@
-= "Issue was closed by #{@updated_by.name}"
-
-Issue ##{@issue.iid}: #{namespace_project_issue_url(@issue.project.namespace, @issue.project, @issue)}
diff --git a/app/views/notify/closed_merge_request_email.html.haml b/app/views/notify/closed_merge_request_email.html.haml
deleted file mode 100644
index 574e8bfef24..00000000000
--- a/app/views/notify/closed_merge_request_email.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-%p
-  = "Merge Request ##{@merge_request.iid} was closed by #{@updated_by.name}"
diff --git a/app/views/notify/closed_merge_request_email.text.haml b/app/views/notify/closed_merge_request_email.text.haml
deleted file mode 100644
index 59db86b08bc..00000000000
--- a/app/views/notify/closed_merge_request_email.text.haml
+++ /dev/null
@@ -1,8 +0,0 @@
-= "Merge Request ##{@merge_request.iid} was closed by #{@updated_by.name}"
-
-Merge Request url: #{namespace_project_merge_request_url(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request)}
-
-= merge_path_description(@merge_request, 'to')
-
-Author: #{@merge_request.author_name}
-Assignee: #{@merge_request.assignee_name}
diff --git a/app/views/notify/group_access_granted_email.html.haml b/app/views/notify/group_access_granted_email.html.haml
deleted file mode 100644
index f1916d624b6..00000000000
--- a/app/views/notify/group_access_granted_email.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-%p
-  = "You have been granted #{@group_member.human_access} access to group"
-  = link_to group_url(@group) do
-    = @group.name
diff --git a/app/views/notify/group_access_granted_email.text.erb b/app/views/notify/group_access_granted_email.text.erb
deleted file mode 100644
index ef9617bfc16..00000000000
--- a/app/views/notify/group_access_granted_email.text.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-
-You have been granted <%= @group_member.human_access %> access to group <%= @group.name %>
-
-<%= url_for(group_url(@group)) %>
diff --git a/app/views/notify/group_invite_accepted_email.html.haml b/app/views/notify/group_invite_accepted_email.html.haml
deleted file mode 100644
index 55efad384a7..00000000000
--- a/app/views/notify/group_invite_accepted_email.html.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-%p
-  #{@group_member.invite_email}, now known as
-  #{link_to @group_member.user.name, user_url(@group_member.user)},
-  has accepted your invitation to join group
-  #{link_to @group.name, group_url(@group)}.
-
diff --git a/app/views/notify/group_invite_accepted_email.text.erb b/app/views/notify/group_invite_accepted_email.text.erb
deleted file mode 100644
index f8b70f7a5a6..00000000000
--- a/app/views/notify/group_invite_accepted_email.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= @group_member.invite_email %>, now known as <%= @group_member.user.name %>, has accepted your invitation to join group <%= @group.name %>.
-
-<%= group_url(@group) %>
diff --git a/app/views/notify/group_invite_declined_email.html.haml b/app/views/notify/group_invite_declined_email.html.haml
deleted file mode 100644
index f9525d84fac..00000000000
--- a/app/views/notify/group_invite_declined_email.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-%p
-  #{@invite_email}
-  has declined your invitation to join group
-  #{link_to @group.name, group_url(@group)}.
-
diff --git a/app/views/notify/group_invite_declined_email.text.erb b/app/views/notify/group_invite_declined_email.text.erb
deleted file mode 100644
index 6c19a288d15..00000000000
--- a/app/views/notify/group_invite_declined_email.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= @invite_email %> has declined your invitation to join group <%= @group.name %>.
-
-<%= group_url(@group) %>
diff --git a/app/views/notify/group_member_invited_email.html.haml b/app/views/notify/group_member_invited_email.html.haml
deleted file mode 100644
index 163e88bfea3..00000000000
--- a/app/views/notify/group_member_invited_email.html.haml
+++ /dev/null
@@ -1,14 +0,0 @@
-%p
-  You have been invited
-  - if inviter = @group_member.created_by
-    by
-    = link_to inviter.name, user_url(inviter)
-  to join group
-  = link_to @group.name, group_url(@group)
-  as #{@group_member.human_access}.
-
-%p
-  = link_to 'Accept invitation', invite_url(@token)
-  or
-  = link_to 'decline', decline_invite_url(@token)
-
diff --git a/app/views/notify/group_member_invited_email.text.erb b/app/views/notify/group_member_invited_email.text.erb
deleted file mode 100644
index 28ce4819b14..00000000000
--- a/app/views/notify/group_member_invited_email.text.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-You have been invited <%= "by #{@group_member.created_by.name} " if @group_member.created_by %>to join group <%= @group.name %> as <%= @group_member.human_access %>.
-
-Accept invitation: <%= invite_url(@token) %>
-Decline invitation: <%= decline_invite_url(@token) %>
diff --git a/app/views/notify/issue_status_changed_email.html.haml b/app/views/notify/issue_status_changed_email.html.haml
deleted file mode 100644
index 482c884a9db..00000000000
--- a/app/views/notify/issue_status_changed_email.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-%p
-  = "Issue was #{@issue_status} by #{@updated_by.name}"
diff --git a/app/views/notify/issue_status_changed_email.text.erb b/app/views/notify/issue_status_changed_email.text.erb
deleted file mode 100644
index e6ab3fcde77..00000000000
--- a/app/views/notify/issue_status_changed_email.text.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-Issue was <%= @issue_status %> by <%= @updated_by.name %>
-
-Issue <%= @issue.iid %>: <%= url_for(namespace_project_issue_url(@issue.project.namespace, @issue.project, @issue)) %>
-
diff --git a/app/views/notify/merge_request_status_email.html.haml b/app/views/notify/merge_request_status_email.html.haml
deleted file mode 100644
index c9bf04f514e..00000000000
--- a/app/views/notify/merge_request_status_email.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-%p
-  = "Merge Request ##{@merge_request.iid} was #{@mr_status} by #{@updated_by.name}"
diff --git a/app/views/notify/merge_request_status_email.text.haml b/app/views/notify/merge_request_status_email.text.haml
deleted file mode 100644
index b96dd0fd8ab..00000000000
--- a/app/views/notify/merge_request_status_email.text.haml
+++ /dev/null
@@ -1,8 +0,0 @@
-= "Merge Request ##{@merge_request.iid} was #{@mr_status} by #{@updated_by.name}"
-
-Merge Request url: #{namespace_project_merge_request_url(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request)}
-
-= merge_path_description(@merge_request, 'to')
-
-Author: #{@merge_request.author_name}
-Assignee: #{@merge_request.assignee_name}
diff --git a/app/views/notify/merged_merge_request_email.html.haml b/app/views/notify/merged_merge_request_email.html.haml
deleted file mode 100644
index 6762fae7f64..00000000000
--- a/app/views/notify/merged_merge_request_email.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-%p
-  = "Merge Request ##{@merge_request.iid} was merged"
diff --git a/app/views/notify/merged_merge_request_email.text.haml b/app/views/notify/merged_merge_request_email.text.haml
deleted file mode 100644
index 9db75bdb19e..00000000000
--- a/app/views/notify/merged_merge_request_email.text.haml
+++ /dev/null
@@ -1,8 +0,0 @@
-= "Merge Request ##{@merge_request.iid} was merged"
-
-Merge Request Url: #{namespace_project_merge_request_url(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request)}
-
-= merge_path_description(@merge_request, 'to')
-
-Author: #{@merge_request.author_name}
-Assignee: #{@merge_request.assignee_name}
diff --git a/app/views/notify/new_email_email.html.haml b/app/views/notify/new_email_email.html.haml
deleted file mode 100644
index 4a0448a573c..00000000000
--- a/app/views/notify/new_email_email.html.haml
+++ /dev/null
@@ -1,10 +0,0 @@
-%p
-  Hi #{@user.name}!
-%p
-  A new email was added to your account:
-%p
-  email:
-  %code= @email.email
-%p
-  If this email was added in error, you can remove it here:
-  = link_to "Emails", profile_emails_url
diff --git a/app/views/notify/new_email_email.text.erb b/app/views/notify/new_email_email.text.erb
deleted file mode 100644
index 51cba99ad0d..00000000000
--- a/app/views/notify/new_email_email.text.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-Hi <%= @user.name %>!
-
-A new email was added to your account:
-
-email.................. <%= @email.email %>
-
-If this email was added in error, you can remove it here: <%= profile_emails_url %>
diff --git a/app/views/notify/new_issue_email.html.haml b/app/views/notify/new_issue_email.html.haml
deleted file mode 100644
index 53a068be52e..00000000000
--- a/app/views/notify/new_issue_email.html.haml
+++ /dev/null
@@ -1,6 +0,0 @@
--if @issue.description
-  = markdown(@issue.description, reference_only_path: false)
-
-- if @issue.assignee_id.present?
-  %p
-    Assignee: #{@issue.assignee_name}
diff --git a/app/views/notify/new_issue_email.text.erb b/app/views/notify/new_issue_email.text.erb
deleted file mode 100644
index 0cc62935498..00000000000
--- a/app/views/notify/new_issue_email.text.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-New Issue was created.
-
-Issue <%= @issue.iid %>: <%= url_for(namespace_project_issue_url(@issue.project.namespace, @issue.project, @issue)) %>
-Author:   <%= @issue.author_name %>
-Asignee:  <%= @issue.assignee_name %>
diff --git a/app/views/notify/new_merge_request_email.html.haml b/app/views/notify/new_merge_request_email.html.haml
deleted file mode 100644
index 5b7dd117c16..00000000000
--- a/app/views/notify/new_merge_request_email.html.haml
+++ /dev/null
@@ -1,9 +0,0 @@
-%p.details
-  != merge_path_description(@merge_request, '&rarr;')
-
-- if @merge_request.assignee_id.present?
-  %p
-    Assignee: #{@merge_request.author_name} &rarr; #{@merge_request.assignee_name}
-
--if @merge_request.description
-  = markdown(@merge_request.description, reference_only_path: false)
diff --git a/app/views/notify/new_merge_request_email.text.erb b/app/views/notify/new_merge_request_email.text.erb
deleted file mode 100644
index f08039ad045..00000000000
--- a/app/views/notify/new_merge_request_email.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-New Merge Request #<%= @merge_request.iid %>
-
-<%= url_for(namespace_project_merge_request_url(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request)) %>
-
-<%= merge_path_description(@merge_request, 'to') %>
-Author:   <%= @merge_request.author_name %>
-Asignee:  <%= @merge_request.assignee_name %>
-
diff --git a/app/views/notify/new_ssh_key_email.html.haml b/app/views/notify/new_ssh_key_email.html.haml
deleted file mode 100644
index 63b0cbbd205..00000000000
--- a/app/views/notify/new_ssh_key_email.html.haml
+++ /dev/null
@@ -1,10 +0,0 @@
-%p
-  Hi #{@user.name}!
-%p
-  A new public key was added to your account:
-%p
-  title:
-  %code= @key.title
-%p
-  If this key was added in error, you can remove it under
-  = link_to "SSH Keys", profile_keys_url
diff --git a/app/views/notify/new_ssh_key_email.text.erb b/app/views/notify/new_ssh_key_email.text.erb
deleted file mode 100644
index 05b551c89a0..00000000000
--- a/app/views/notify/new_ssh_key_email.text.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-Hi <%= @user.name %>!
-
-A new public key was added to your account:
-
-Title: <%= @key.title %>
-
-If this key was added in error, you can remove it at <%= profile_keys_url %>
diff --git a/app/views/notify/new_user_email.html.haml b/app/views/notify/new_user_email.html.haml
deleted file mode 100644
index ebbe98dd472..00000000000
--- a/app/views/notify/new_user_email.html.haml
+++ /dev/null
@@ -1,14 +0,0 @@
-%p
-  Hi #{@user['name']}!
-%p
-  - if Gitlab.config.gitlab.signup_enabled
-    Your account has been created successfully.
-  - else
-    The Administrator created an account for you. Now you are a member of the company GitLab application.
-%p
-  login..........................................
-  %code= @user['email']
-
-- if @user.created_by_id
-  %p
-    = link_to "Click here to set your password", edit_password_url(@user, :reset_password_token => @token)
diff --git a/app/views/notify/new_user_email.text.erb b/app/views/notify/new_user_email.text.erb
deleted file mode 100644
index 96b26879a77..00000000000
--- a/app/views/notify/new_user_email.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Hi <%= @user.name %>!
-
-The Administrator created an account for you. Now you are a member of the company GitLab application.
-
-login.................. <%= @user.email %>
-<% if @user.created_by_id %>
-  <%= link_to "Click here to set your password", edit_password_url(@user, :reset_password_token => @token) %>
-<% end %>
diff --git a/app/views/notify/note_commit_email.html.haml b/app/views/notify/note_commit_email.html.haml
deleted file mode 100644
index 1d961e4424c..00000000000
--- a/app/views/notify/note_commit_email.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-= render 'note_message'
-
diff --git a/app/views/notify/note_commit_email.text.erb b/app/views/notify/note_commit_email.text.erb
deleted file mode 100644
index aaeaf5fdf73..00000000000
--- a/app/views/notify/note_commit_email.text.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-New comment for Commit <%= @commit.short_id %>
-
-<%= url_for(namespace_project_commit_url(@note.project.namespace, @note.project, id: @commit.id, anchor: "note_#{@note.id}")) %>
-
-
-Author: <%= @note.author_name %>
-
-<%= @note.note %>
-
diff --git a/app/views/notify/note_issue_email.html.haml b/app/views/notify/note_issue_email.html.haml
deleted file mode 100644
index 2fa2f784661..00000000000
--- a/app/views/notify/note_issue_email.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= render 'note_message'
diff --git a/app/views/notify/note_issue_email.text.erb b/app/views/notify/note_issue_email.text.erb
deleted file mode 100644
index e33cbcd70f2..00000000000
--- a/app/views/notify/note_issue_email.text.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-New comment for Issue <%= @issue.iid %>
-
-<%= url_for(namespace_project_issue_url(@issue.project.namespace, @issue.project, @issue, anchor: "note_#{@note.id}")) %>
-
-
-Author: <%= @note.author_name %>
-
-<%= @note.note %>
-
diff --git a/app/views/notify/note_merge_request_email.html.haml b/app/views/notify/note_merge_request_email.html.haml
deleted file mode 100644
index 65f0e4c4068..00000000000
--- a/app/views/notify/note_merge_request_email.html.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-- if @note.diff_file_name
-  %p.details
-    New comment on diff for
-    = link_to @note.diff_file_name, @target_url
-    \:
-
-= render 'note_message'
diff --git a/app/views/notify/note_merge_request_email.text.erb b/app/views/notify/note_merge_request_email.text.erb
deleted file mode 100644
index 1d1411992a6..00000000000
--- a/app/views/notify/note_merge_request_email.text.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-New comment for Merge Request <%= @merge_request.iid %>
-
-<%= url_for(namespace_project_merge_request_url(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")) %>
-
-
-<%= @note.author_name %>
-
-<%= @note.note %>
-
diff --git a/app/views/notify/project_access_granted_email.html.haml b/app/views/notify/project_access_granted_email.html.haml
deleted file mode 100644
index dfc30a2d360..00000000000
--- a/app/views/notify/project_access_granted_email.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-%p
-  = "You have been granted #{@project_member.human_access} access to project"
-%p
-  = link_to namespace_project_url(@project.namespace, @project) do
-    = @project.name_with_namespace
diff --git a/app/views/notify/project_access_granted_email.text.erb b/app/views/notify/project_access_granted_email.text.erb
deleted file mode 100644
index 68eb1611ba7..00000000000
--- a/app/views/notify/project_access_granted_email.text.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-
-You have been granted <%= @project_member.human_access %> access to project <%= @project.name_with_namespace %>
-
-<%= url_for(namespace_project_url(@project.namespace, @project)) %>
diff --git a/app/views/notify/project_invite_accepted_email.html.haml b/app/views/notify/project_invite_accepted_email.html.haml
deleted file mode 100644
index 7e58d30b10a..00000000000
--- a/app/views/notify/project_invite_accepted_email.html.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-%p
-  #{@project_member.invite_email}, now known as
-  #{link_to @project_member.user.name, user_url(@project_member.user)},
-  has accepted your invitation to join project
-  #{link_to @project.name_with_namespace, namespace_project_url(@project.namespace, @project)}.
-
diff --git a/app/views/notify/project_invite_accepted_email.text.erb b/app/views/notify/project_invite_accepted_email.text.erb
deleted file mode 100644
index fcbe752114d..00000000000
--- a/app/views/notify/project_invite_accepted_email.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= @project_member.invite_email %>, now known as <%= @project_member.user.name %>, has accepted your invitation to join project <%= @project.name_with_namespace %>.
-
-<%= namespace_project_url(@project.namespace, @project) %>
diff --git a/app/views/notify/project_invite_declined_email.html.haml b/app/views/notify/project_invite_declined_email.html.haml
deleted file mode 100644
index c2d7e6f6e3a..00000000000
--- a/app/views/notify/project_invite_declined_email.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-%p
-  #{@invite_email}
-  has declined your invitation to join project
-  #{link_to @project.name_with_namespace, namespace_project_url(@project.namespace, @project)}.
-
diff --git a/app/views/notify/project_invite_declined_email.text.erb b/app/views/notify/project_invite_declined_email.text.erb
deleted file mode 100644
index 484687fa51c..00000000000
--- a/app/views/notify/project_invite_declined_email.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= @invite_email %> has declined your invitation to join project <%= @project.name_with_namespace %>.
-
-<%= namespace_project_url(@project.namespace, @project) %>
diff --git a/app/views/notify/project_member_invited_email.html.haml b/app/views/notify/project_member_invited_email.html.haml
deleted file mode 100644
index 79eb89616de..00000000000
--- a/app/views/notify/project_member_invited_email.html.haml
+++ /dev/null
@@ -1,13 +0,0 @@
-%p
-  You have been invited 
-  - if inviter = @project_member.created_by
-    by
-    = link_to inviter.name, user_url(inviter)
-  to join project
-  = link_to @project.name_with_namespace, namespace_project_url(@project.namespace, @project)
-  as #{@project_member.human_access}.
-
-%p
-  = link_to 'Accept invitation', invite_url(@token)
-  or
-  = link_to 'decline', decline_invite_url(@token)
diff --git a/app/views/notify/project_member_invited_email.text.erb b/app/views/notify/project_member_invited_email.text.erb
deleted file mode 100644
index e0706272115..00000000000
--- a/app/views/notify/project_member_invited_email.text.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-You have been invited <%= "by #{@project_member.created_by.name} " if @project_member.created_by %>to join project <%= @project.name_with_namespace %> as <%= @project_member.human_access %>.
-
-Accept invitation: <%= invite_url(@token) %>
-Decline invitation: <%= decline_invite_url(@token) %>
diff --git a/app/views/notify/project_was_moved_email.html.haml b/app/views/notify/project_was_moved_email.html.haml
deleted file mode 100644
index 3cd759f1f57..00000000000
--- a/app/views/notify/project_was_moved_email.html.haml
+++ /dev/null
@@ -1,15 +0,0 @@
-%p
-  Project was moved to another location
-%p
-  The project is now located under
-  = link_to namespace_project_url(@project.namespace, @project) do
-    = @project.name_with_namespace
-%p
-  To update the remote url in your local repository run (for ssh):
-%p{ style: "background: #f5f5f5; padding:10px; border:1px solid #ddd" }
-  git remote set-url origin #{@project.ssh_url_to_repo}
-%p
-  or for http(s):
-%p{ style: "background: #f5f5f5; padding:10px; border:1px solid #ddd" }
-  git remote set-url origin #{@project.http_url_to_repo}
-%br
diff --git a/app/views/notify/project_was_moved_email.text.erb b/app/views/notify/project_was_moved_email.text.erb
deleted file mode 100644
index b3f18b35a4d..00000000000
--- a/app/views/notify/project_was_moved_email.text.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-Project was moved to another location
-
-The project is now located under 
-<%= namespace_project_url(@project.namespace, @project) %>
-
-
-To update the remote url in your local repository run (for ssh):
-  git remote set-url origin <%= @project.ssh_url_to_repo %>
-or for http(s):
-  git remote set-url origin <%= @project.http_url_to_repo %>
diff --git a/app/views/notify/reassigned_issue_email.html.haml b/app/views/notify/reassigned_issue_email.html.haml
deleted file mode 100644
index 498ba8b8365..00000000000
--- a/app/views/notify/reassigned_issue_email.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= render 'reassigned_issuable_email', issuable: @issue
diff --git a/app/views/notify/reassigned_issue_email.text.erb b/app/views/notify/reassigned_issue_email.text.erb
deleted file mode 100644
index 710253be984..00000000000
--- a/app/views/notify/reassigned_issue_email.text.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render 'reassigned_issuable_email', issuable: @issue %>
diff --git a/app/views/notify/reassigned_merge_request_email.html.haml b/app/views/notify/reassigned_merge_request_email.html.haml
deleted file mode 100644
index 2a650130f59..00000000000
--- a/app/views/notify/reassigned_merge_request_email.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= render 'reassigned_issuable_email', issuable: @merge_request
diff --git a/app/views/notify/reassigned_merge_request_email.text.erb b/app/views/notify/reassigned_merge_request_email.text.erb
deleted file mode 100644
index b5b4f1ff99a..00000000000
--- a/app/views/notify/reassigned_merge_request_email.text.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render 'reassigned_issuable_email', issuable: @merge_request %>
diff --git a/app/views/notify/repository_push_email.html.haml b/app/views/notify/repository_push_email.html.haml
deleted file mode 100644
index a374a662333..00000000000
--- a/app/views/notify/repository_push_email.html.haml
+++ /dev/null
@@ -1,66 +0,0 @@
-%h3 #{@author.name} #{@action_name} #{@ref_type} #{@ref_name} at #{link_to @project.name_with_namespace, namespace_project_url(@project.namespace, @project)}
-
-- if @compare
-  - if @reverse_compare
-    %p
-      %strong WARNING:
-      The push did not contain any new commits, but force pushed to delete the commits and changes below.
-
-  %h4
-    = @reverse_compare ? "Deleted commits:" : "Commits:"
-
-  %ul
-    - @commits.each do |commit|
-      %li
-        %strong #{link_to commit.short_id, namespace_project_commit_url(@project.namespace, @project, commit)}
-        %div
-          %span by #{commit.author_name}
-          %i at #{commit.committed_date.strftime("%Y-%m-%dT%H:%M:%SZ")}
-        %pre.commit-message 
-          = commit.safe_message
-
-  %h4 #{pluralize @diffs.count, "changed file"}:
-
-  %ul
-    - @diffs.each_with_index do |diff, i|
-      %li.file-stats
-        %a{href: "#{@target_url if @disable_diffs}#diff-#{i}" }
-          - if diff.deleted_file
-            %span.deleted-file
-              &minus;
-              = diff.old_path
-          - elsif diff.renamed_file
-            = diff.old_path
-            &rarr;
-            = diff.new_path
-          - elsif diff.new_file
-            %span.new-file
-              &plus;
-              = diff.new_path
-          - else
-            = diff.new_path
-
-  - unless @disable_diffs
-    %h4 Changes:
-    - @diffs.each_with_index do |diff, i|
-      %li{id: "diff-#{i}"}
-        %a{href: @target_url + "#diff-#{i}"}
-          - if diff.deleted_file
-            %strong
-              = diff.old_path
-            deleted
-          - elsif diff.renamed_file
-            %strong
-              = diff.old_path
-            &rarr;
-            %strong
-              = diff.new_path
-          - else
-            %strong
-              = diff.new_path
-        %hr
-        = color_email_diff(diff.diff)
-        %br
-
-  - if @compare.timeout
-    %h5 Huge diff. To prevent performance issues changes are hidden
diff --git a/app/views/notify/repository_push_email.text.haml b/app/views/notify/repository_push_email.text.haml
deleted file mode 100644
index 97a176ed2a3..00000000000
--- a/app/views/notify/repository_push_email.text.haml
+++ /dev/null
@@ -1,49 +0,0 @@
-#{@author.name} #{@action_name} #{@ref_type} #{@ref_name} at #{@project.name_with_namespace}
-- if @compare
-  \
-  \
-  - if @reverse_compare
-    WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below.
-    \
-    \
-  = @reverse_compare ? "Deleted commits:" : "Commits:"
-  - @commits.each do |commit|
-    #{commit.short_id} by #{commit.author_name} at #{commit.committed_date.strftime("%Y-%m-%dT%H:%M:%SZ")}
-    #{commit.safe_message}
-    \- - - - -
-  \
-  \
-  #{pluralize @diffs.count, "changed file"}:
-  \
-  - @diffs.each do |diff|
-    - if diff.deleted_file
-      \- − #{diff.old_path}
-    - elsif diff.renamed_file
-      \- #{diff.old_path} → #{diff.new_path}
-    - elsif diff.new_file
-      \- + #{diff.new_path}
-    - else
-      \- #{diff.new_path}
-  - unless @disable_diffs
-    \
-    \
-    Changes:
-    - @diffs.each do |diff|
-      \
-      \=====================================
-      - if diff.deleted_file
-        #{diff.old_path} deleted
-      - elsif diff.renamed_file
-        #{diff.old_path} → #{diff.new_path}
-      - else
-        = diff.new_path
-      \=====================================
-      != diff.diff
-  - if @compare.timeout
-    \
-    \
-    Huge diff. To prevent performance issues it was hidden
-  - if @target_url
-    \
-    \
-    View it on GitLab: #{@target_url}