Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
7c776109
Commit
7c776109
authored
May 29, 2012
by
Nihad Abbasov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix deprecation warnings
parent
058d80b3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
app/controllers/admin/mailer_controller.rb
app/controllers/admin/mailer_controller.rb
+5
-5
No files found.
app/controllers/admin/mailer_controller.rb
View file @
7c776109
...
@@ -14,12 +14,12 @@ class Admin::MailerController < ApplicationController
...
@@ -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
...
@@ -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
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment