Download as
Browse Code »

Commit 7c7761099cae83f59fe5780340e100be890847b2

Authored by Nihad Abbasov
1 parent 058d80b3
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

fix deprecation warnings

Showing 1 changed file with 5 additions and 5 deletions   Show diff stats
app/controllers/admin/mailer_controller.rb
  Diff comments   View file @7c77610
@@ -14,12 +14,12 @@ class Admin::MailerController < ApplicationController @@ -14,12 +14,12 @@ class Admin::MailerController < ApplicationController
14 case params[:type] 14 case params[:type]
15 when "Commit" then 15 when "Commit" then
16 @commit = @project.commit 16 @commit = @project.commit
17 - render :file => 'notify/note_commit_email.html.haml', :layout => 'notify' 17 + render :file => 'notify/note_commit_email', :layout => 'notify'
18 when "Issue" then 18 when "Issue" then
19 @issue = Issue.first 19 @issue = Issue.first
20 - render :file => 'notify/note_issue_email.html.haml', :layout => 'notify' 20 + render :file => 'notify/note_issue_email', :layout => 'notify'
21 else 21 else
22 - render :file => 'notify/note_wall_email.html.haml', :layout => 'notify' 22 + render :file => 'notify/note_wall_email', :layout => 'notify'
23 end 23 end
24 rescue 24 rescue
25 render :text => "Preview not avaialble" 25 render :text => "Preview not avaialble"
@@ -29,7 +29,7 @@ class Admin::MailerController < ApplicationController @@ -29,7 +29,7 @@ class Admin::MailerController < ApplicationController
29 @user = User.first 29 @user = User.first
30 @password = "DHasJKDHAS!" 30 @password = "DHasJKDHAS!"
31 31
32 - render :file => 'notify/new_user_email.html.haml', :layout => 'notify' 32 + render :file => 'notify/new_user_email', :layout => 'notify'
33 rescue 33 rescue
34 render :text => "Preview not avaialble" 34 render :text => "Preview not avaialble"
35 end 35 end
@@ -38,7 +38,7 @@ class Admin::MailerController < ApplicationController @@ -38,7 +38,7 @@ class Admin::MailerController < ApplicationController
38 @issue = Issue.first 38 @issue = Issue.first
39 @user = @issue.assignee 39 @user = @issue.assignee
40 @project = @issue.project 40 @project = @issue.project
41 - render :file => 'notify/new_issue_email.html.haml', :layout => 'notify' 41 + render :file => 'notify/new_issue_email', :layout => 'notify'
42 rescue 42 rescue
43 render :text => "Preview not avaialble" 43 render :text => "Preview not avaialble"
44 end 44 end