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
2a3f5dae
Commit
2a3f5dae
authored
Dec 20, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix email send on close/reopen issue. Display project name with namespace. remove css style
parent
75dd7042
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
22 additions
and
26 deletions
+22
-26
app/mailers/notify.rb
app/mailers/notify.rb
+1
-0
app/observers/issue_observer.rb
app/observers/issue_observer.rb
+1
-1
app/views/layouts/notify.html.haml
app/views/layouts/notify.html.haml
+5
-12
app/views/notify/issue_status_changed_email.html.haml
app/views/notify/issue_status_changed_email.html.haml
+1
-1
app/views/notify/new_issue_email.html.haml
app/views/notify/new_issue_email.html.haml
+1
-1
app/views/notify/new_merge_request_email.html.haml
app/views/notify/new_merge_request_email.html.haml
+2
-1
app/views/notify/project_access_granted_email.html.haml
app/views/notify/project_access_granted_email.html.haml
+8
-7
app/views/notify/project_was_moved_email.html.haml
app/views/notify/project_was_moved_email.html.haml
+1
-1
app/views/notify/reassigned_issue_email.html.haml
app/views/notify/reassigned_issue_email.html.haml
+1
-1
app/views/notify/reassigned_merge_request_email.html.haml
app/views/notify/reassigned_merge_request_email.html.haml
+1
-1
No files found.
app/mailers/notify.rb
View file @
2a3f5dae
...
...
@@ -31,6 +31,7 @@ class Notify < ActionMailer::Base
def
issue_status_changed_email
(
recipient_id
,
issue_id
,
status
,
updated_by_user_id
)
@issue
=
Issue
.
find
issue_id
@issue_status
=
status
@project
=
@issue
.
project
@updated_by
=
User
.
find
updated_by_user_id
mail
(
to:
recipient
(
recipient_id
),
subject:
subject
(
"changed issue #
#{
@issue
.
id
}
"
,
@issue
.
title
))
...
...
app/observers/issue_observer.rb
View file @
2a3f5dae
...
...
@@ -16,7 +16,7 @@ class IssueObserver < ActiveRecord::Observer
if
status
Note
.
create_status_change_note
(
issue
,
current_user
,
status
)
[
issue
.
author
,
issue
.
assignee
].
compact
.
each
do
|
recipient
|
Notify
.
issue_status_changed_email
(
recipient
.
id
,
issue
.
id
,
status
,
current_user
)
Notify
.
issue_status_changed_email
(
recipient
.
id
,
issue
.
id
,
status
,
current_user
.
id
).
deliver
end
end
end
...
...
app/views/layouts/notify.html.haml
View file @
2a3f5dae
...
...
@@ -3,14 +3,7 @@
%meta
{
content:
"text/html; charset=utf-8"
,
"http-equiv"
=>
"Content-Type"
}
%title
GitLab
:css
.header
h1
{
color
:
#BBBBBB
!important
;
font
:
bold
22px
Helvetica
,
Arial
,
sans-serif
;
margin
:
0
;
padding
:
0
;
line-height
:
32px
;}
.header
p
{
color
:
#c6c6c6
;
font
:
normal
12px
Helvetica
,
Arial
,
sans-serif
;
margin
:
0
;
padding
:
0
;
line-height
:
18px
;}
.content
h2
{
color
:
#646464
!important
;
font-weight
:
bold
;
margin
:
0
;
padding
:
0
;
line-height
:
26px
;
font-size
:
18px
;
font-family
:
Helvetica
,
Arial
,
sans-serif
;
}
.content
p
{
color
:
#767676
;
font-weight
:
normal
;
margin
:
0
;
padding
:
0
;
line-height
:
20px
;
font-size
:
12px
;
font-family
:
Helvetica
,
Arial
,
sans-serif
;}
.content
a
{
color
:
#0eb6ce
;
text-decoration
:
none
;}
.footer
p
{
font-size
:
11px
;
color
:
#7d7a7a
;
margin
:
0
;
padding
:
0
;
font-family
:
Helvetica
,
Arial
,
sans-serif
;}
.footer
a
{
color
:
#0eb6ce
;
text-decoration
:
none
;}
%body
{
bgcolor:
"#EAEAEA"
,
style:
"margin: 0; padding: 0; background: #EAEAEA"
}
%table
{
align:
"center"
,
border:
"0"
,
cellpadding:
"0"
,
cellspacing:
"0"
,
style:
"padding: 35px 0; background: #EAEAEA;"
,
width:
"100%"
}
%tr
...
...
@@ -19,11 +12,11 @@
%tr
%td
{
style:
"font-size: 0px;"
,
width:
"20"
}
\
%td
{
align:
"left"
,
style:
"padding: 1
8px 0 10px;
"
,
width:
"580"
}
%h1
{
style:
"color: #BBBBBB; font: normal 22px Helvetica, Arial, sans-serif; margin: 0; padding: 0; line-height: 32px;"
}
%td
{
align:
"left"
,
style:
"padding: 1
0px 0
"
,
width:
"580"
}
%h1
{
style:
"
font-size: 24px;
color: #BBBBBB; font: normal 22px Helvetica, Arial, sans-serif; margin: 0; padding: 0; line-height: 32px;"
}
GITLAB
-
if
@project
|
#{
@project
.
nam
e
}
→
#{
@project
.
name_with_namespac
e
}
%table
{
align:
"center"
,
bgcolor:
"#fff"
,
border:
"0"
,
cellpadding:
"0"
,
cellspacing:
"0"
,
style:
"font-family: Helvetica, Arial, sans-serif; background: #fff;"
,
width:
"600"
}
%tr
=
yield
%tr
...
...
@@ -35,5 +28,5 @@
%p
{
style:
"font-size: 11px; color:#7d7a7a; margin: 0; padding: 0; font-family: Helvetica, Arial, sans-serif;"
}
You're receiving this notification because you are a member of the
-
if
@project
#{
@project
.
name
}
#{
@project
.
name
_with_namespace
}
project team.
app/views/notify/issue_status_changed_email.html.haml
View file @
2a3f5dae
...
...
@@ -9,7 +9,7 @@
%tr
%td
{
style:
"font-size: 1px; line-height: 1px;"
,
width:
"21"
}
%td
{
align:
"left"
,
style:
"padding: 20px 0 0;"
}
%
h2
{
style:
"color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18
px; font-family: Helvetica, Arial, sans-serif; "
}
%
p
{
style:
"color:#646464 !important; line-height: 26px; font-size: 16
px; font-family: Helvetica, Arial, sans-serif; "
}
=
"Issue #
#{
@issue
.
id
}
"
=
link_to_gfm
truncate
(
@issue
.
title
,
length:
45
),
project_issue_url
(
@issue
.
project
,
@issue
),
title:
@issue
.
title
%br
...
...
app/views/notify/new_issue_email.html.haml
View file @
2a3f5dae
...
...
@@ -9,7 +9,7 @@
%tr
%td
{
style:
"font-size: 1px; line-height: 1px;"
,
width:
"21"
}
%td
{
align:
"left"
,
style:
"padding: 20px 0 0;"
}
%
h2
{
style:
"color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18
px; font-family: Helvetica, Arial, sans-serif; "
}
%
p
{
style:
"color:#646464 !important; line-height: 26px; font-size: 16
px; font-family: Helvetica, Arial, sans-serif; "
}
=
"Issue #
#{
@issue
.
id
}
"
=
link_to_gfm
truncate
(
@issue
.
title
,
length:
45
),
project_issue_url
(
@issue
.
project
,
@issue
),
title:
@issue
.
title
%br
app/views/notify/new_merge_request_email.html.haml
View file @
2a3f5dae
...
...
@@ -5,7 +5,8 @@
%td
{
align:
"left"
,
style:
"padding: 20px 0 0;"
}
%h2
{
style:
"color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
=
"New Merge Request !
#{
@merge_request
.
id
}
"
=
link_to_gfm
truncate
(
@merge_request
.
title
,
length:
16
),
project_merge_request_url
(
@merge_request
.
project
,
@merge_request
)
%p
{
style:
"color:#646464 !important; line-height: 26px; font-size: 16px; font-family: Helvetica, Arial, sans-serif; "
}
=
link_to_gfm
truncate
(
@merge_request
.
title
,
length:
40
),
project_merge_request_url
(
@merge_request
.
project
,
@merge_request
)
%td
{
style:
"font-size: 1px; line-height: 1px;"
,
width:
"21"
}
%tr
%td
{
style:
"font-size: 1px; line-height: 1px;"
,
width:
"21"
}
...
...
app/views/notify/project_access_granted_email.html.haml
View file @
2a3f5dae
%td
.content
{
align:
"left"
,
style:
"font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;"
,
valign:
"top"
,
width:
"600"
}
%table
{
border:
"0"
,
cellpadding:
"0"
,
cellspacing:
"0"
,
style:
"color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;"
,
width:
"600"
}
%tr
%td
{
style:
"font-size: 1px; line-height: 1px;"
,
width:
"21"
}
%td
{
align:
"left"
,
style:
"padding: 20px 0 0;"
}
%h2
{
style:
"color:#646464;
font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
%td
{
width:
"21"
}
%td
%h2
{
style:
"color:#646464;
"
}
=
"You have been granted
#{
@users_project
.
project_access_human
}
access to project"
%td
{
style:
"font-size: 1px; line-height: 1px;"
,
width:
"21"
}
%tr
%td
{
style:
"font-size: 1px; line-height: 1px;"
,
width:
"21"
}
%td
{
align:
"left"
,
style:
"padding: 20px 0 0;"
}
%h2
{
style:
"color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
=
link_to_gfm
truncate
(
@project
.
name
,
length:
45
),
project_url
(
@project
),
title:
@project
.
name
%td
{
width:
"21"
}
%td
%h3
=
link_to
project_url
(
@project
)
do
=
@project
.
name_with_namespace
%br
app/views/notify/project_was_moved_email.html.haml
View file @
2a3f5dae
...
...
@@ -3,7 +3,7 @@
%tr
%td
{
width:
"21"
}
%td
%h
3
%h
2
=
"Project was moved in another location"
%td
{
width:
"21"
}
%tr
...
...
app/views/notify/reassigned_issue_email.html.haml
View file @
2a3f5dae
...
...
@@ -5,7 +5,7 @@
%td
{
align:
"left"
,
style:
"padding: 20px 0 0;"
}
%h2
{
style:
"color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
=
"Reassigned Issue #
#{
@issue
.
id
}
"
=
link_to_gfm
truncate
(
@issue
.
title
,
length:
16
),
project_issue_url
(
@issue
.
project
,
@issue
)
=
link_to_gfm
truncate
(
@issue
.
title
,
length:
30
),
project_issue_url
(
@issue
.
project
,
@issue
)
%td
{
style:
"font-size: 1px; line-height: 1px;"
,
width:
"21"
}
%tr
%td
{
style:
"font-size: 1px; line-height: 1px;"
,
width:
"21"
}
...
...
app/views/notify/reassigned_merge_request_email.html.haml
View file @
2a3f5dae
...
...
@@ -5,7 +5,7 @@
%td
{
align:
"left"
,
style:
"padding: 20px 0 0;"
}
%h2
{
style:
"color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
=
"Reassigned Merge Request !
#{
@merge_request
.
id
}
"
=
link_to_gfm
truncate
(
@merge_request
.
title
,
length:
16
),
project_merge_request_url
(
@merge_request
.
project
,
@merge_request
)
=
link_to_gfm
truncate
(
@merge_request
.
title
,
length:
30
),
project_merge_request_url
(
@merge_request
.
project
,
@merge_request
)
%td
{
style:
"font-size: 1px; line-height: 1px;"
,
width:
"21"
}
%tr
%td
{
style:
"font-size: 1px; line-height: 1px;"
,
width:
"21"
}
...
...
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