deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix deprecation warnings

Browse source
This commit is contained in:
Nihad Abbasov 2012-05-29 19:16:28 +05:00
parent 058d80b336
commit 7c7761099c
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/admin/mailer_controller.rb
View file

@ -14,12 +14,12 @@ class Admin::MailerController < ApplicationController
case params[:type] case params[:type]
when "Commit" then when "Commit" then
@commit = @project.commit @commit = @project.commit
render :file => 'notify/note_commit_email.html.haml', :layout => 'notify' render :file => 'notify/note_commit_email', :layout => 'notify'
when "Issue" then when "Issue" then
@issue = Issue.first @issue = Issue.first
render :file => 'notify/note_issue_email.html.haml', :layout => 'notify' render :file => 'notify/note_issue_email', :layout => 'notify'
else else
render :file => 'notify/note_wall_email.html.haml', :layout => 'notify' render :file => 'notify/note_wall_email', :layout => 'notify'
end end
rescue rescue
render :text => "Preview not avaialble" render :text => "Preview not avaialble"
@ -29,7 +29,7 @@ class Admin::MailerController < ApplicationController
@user = User.first @user = User.first
@password = "DHasJKDHAS!" @password = "DHasJKDHAS!"
render :file => 'notify/new_user_email.html.haml', :layout => 'notify' render :file => 'notify/new_user_email', :layout => 'notify'
rescue rescue
render :text => "Preview not avaialble" render :text => "Preview not avaialble"
end end
@ -38,7 +38,7 @@ class Admin::MailerController < ApplicationController
@issue = Issue.first @issue = Issue.first
@user = @issue.assignee @user = @issue.assignee
@project = @issue.project @project = @issue.project
render :file => 'notify/new_issue_email.html.haml', :layout => 'notify' render :file => 'notify/new_issue_email', :layout => 'notify'
rescue rescue
render :text => "Preview not avaialble" render :text => "Preview not avaialble"
end end