fixed merge conflicts on UI branch

1 files changed, 6 insertions, 56 deletions

diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb
index 0d9558db68c..e0af7081411 100644
--- a/app/mailers/emails/projects.rb
+++ b/app/mailers/emails/projects.rb
@@ -1,53 +1,12 @@
 module Emails
   module Projects
-    def project_access_granted_email(project_member_id)
-      @project_member = ProjectMember.find project_member_id
-      @project = @project_member.project
-
-      @target_url = namespace_project_url(@project.namespace, @project)
-      @current_user = @project_member.user
-
-      mail(to: @project_member.user.notification_email,
-           subject: subject("Access to project was granted"))
-    end
-
-    def project_member_invited_email(project_member_id, token)
-      @project_member = ProjectMember.find project_member_id
-      @project = @project_member.project
-      @token = token
-
-      @target_url = namespace_project_url(@project.namespace, @project)
-      @current_user = @project_member.user
-
-      mail(to: @project_member.invite_email,
-           subject: "Invitation to join project #{@project.name_with_namespace}")
-    end
-
-    def project_invite_accepted_email(project_member_id)
-      @project_member = ProjectMember.find project_member_id
-      return if @project_member.created_by.nil?
-
-      @project = @project_member.project
-
-      @target_url = namespace_project_url(@project.namespace, @project)
-      @current_user = @project_member.created_by
-
-      mail(to: @project_member.created_by.notification_email,
-           subject: subject("Invitation accepted"))
-    end
-
-    def project_invite_declined_email(project_id, invite_email, access_level, created_by_id)
-      return if created_by_id.nil?
-
-      @project = Project.find(project_id)
-      @current_user = @created_by = User.find(created_by_id)
-      @access_level = access_level
-      @invite_email = invite_email
-
+    def project_was_moved_email(project_id, user_id, old_path_with_namespace)
+      @current_user = @user = User.find user_id
+      @project = Project.find project_id
       @target_url = namespace_project_url(@project.namespace, @project)
-
-      mail(to: @created_by.notification_email,
-           subject: subject("Invitation declined"))
+      @old_path_with_namespace = old_path_with_namespace
+      mail(to: @user.notification_email,
+           subject: subject("Project was moved"))
     end
 
     def project_was_exported_email(current_user, project)
@@ -63,15 +22,6 @@ module Emails
            subject: subject("Project export error"))
     end
 
-    def project_was_moved_email(project_id, user_id, old_path_with_namespace)
-      @current_user = @user = User.find user_id
-      @project = Project.find project_id
-      @target_url = namespace_project_url(@project.namespace, @project)
-      @old_path_with_namespace = old_path_with_namespace
-      mail(to: @user.notification_email,
-           subject: subject("Project was moved"))
-    end
-
     def repository_push_email(project_id, opts = {})
       @message =
         Gitlab::Email::Message::RepositoryPush.new(self, project_id, opts)