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
9a0b763e
Commit
9a0b763e
authored
Aug 06, 2012
by
Riyad Preukschas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix missing @project errors
parent
6f9428b1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
4 deletions
+13
-4
app/mailers/notify.rb
app/mailers/notify.rb
+9
-0
app/views/dashboard/issues.html.haml
app/views/dashboard/issues.html.haml
+2
-2
app/views/dashboard/merge_requests.html.haml
app/views/dashboard/merge_requests.html.haml
+2
-2
No files found.
app/mailers/notify.rb
View file @
9a0b763e
...
@@ -16,12 +16,14 @@ class Notify < ActionMailer::Base
...
@@ -16,12 +16,14 @@ class Notify < ActionMailer::Base
def
new_issue_email
(
issue_id
)
def
new_issue_email
(
issue_id
)
@issue
=
Issue
.
find
(
issue_id
)
@issue
=
Issue
.
find
(
issue_id
)
@project
=
@issue
.
project
mail
(
:to
=>
@issue
.
assignee_email
,
:subject
=>
"gitlab | New Issue was created"
)
mail
(
:to
=>
@issue
.
assignee_email
,
:subject
=>
"gitlab | New Issue was created"
)
end
end
def
note_wall_email
(
recipient_id
,
note_id
)
def
note_wall_email
(
recipient_id
,
note_id
)
recipient
=
User
.
find
(
recipient_id
)
recipient
=
User
.
find
(
recipient_id
)
@note
=
Note
.
find
(
note_id
)
@note
=
Note
.
find
(
note_id
)
@project
=
@note
.
project
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab |
#{
@note
.
project_name
}
"
)
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab |
#{
@note
.
project_name
}
"
)
end
end
...
@@ -29,6 +31,7 @@ class Notify < ActionMailer::Base
...
@@ -29,6 +31,7 @@ class Notify < ActionMailer::Base
recipient
=
User
.
find
(
recipient_id
)
recipient
=
User
.
find
(
recipient_id
)
@note
=
Note
.
find
(
note_id
)
@note
=
Note
.
find
(
note_id
)
@commit
=
@note
.
target
@commit
=
@note
.
target
@project
=
@note
.
project
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab | note for commit |
#{
@note
.
project_name
}
"
)
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab | note for commit |
#{
@note
.
project_name
}
"
)
end
end
...
@@ -36,6 +39,7 @@ class Notify < ActionMailer::Base
...
@@ -36,6 +39,7 @@ class Notify < ActionMailer::Base
recipient
=
User
.
find
(
recipient_id
)
recipient
=
User
.
find
(
recipient_id
)
@note
=
Note
.
find
(
note_id
)
@note
=
Note
.
find
(
note_id
)
@merge_request
=
@note
.
noteable
@merge_request
=
@note
.
noteable
@project
=
@note
.
project
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab | note for merge request |
#{
@note
.
project_name
}
"
)
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab | note for merge request |
#{
@note
.
project_name
}
"
)
end
end
...
@@ -43,6 +47,7 @@ class Notify < ActionMailer::Base
...
@@ -43,6 +47,7 @@ class Notify < ActionMailer::Base
recipient
=
User
.
find
(
recipient_id
)
recipient
=
User
.
find
(
recipient_id
)
@note
=
Note
.
find
(
note_id
)
@note
=
Note
.
find
(
note_id
)
@issue
=
@note
.
noteable
@issue
=
@note
.
noteable
@project
=
@note
.
project
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab | note for issue
#{
@issue
.
id
}
|
#{
@note
.
project_name
}
"
)
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab | note for issue
#{
@issue
.
id
}
|
#{
@note
.
project_name
}
"
)
end
end
...
@@ -50,11 +55,13 @@ class Notify < ActionMailer::Base
...
@@ -50,11 +55,13 @@ class Notify < ActionMailer::Base
recipient
=
User
.
find
(
recipient_id
)
recipient
=
User
.
find
(
recipient_id
)
@note
=
Note
.
find
(
note_id
)
@note
=
Note
.
find
(
note_id
)
@wiki
=
@note
.
noteable
@wiki
=
@note
.
noteable
@project
=
@note
.
project
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab | note for wiki |
#{
@note
.
project_name
}
"
)
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab | note for wiki |
#{
@note
.
project_name
}
"
)
end
end
def
new_merge_request_email
(
merge_request_id
)
def
new_merge_request_email
(
merge_request_id
)
@merge_request
=
MergeRequest
.
find
(
merge_request_id
)
@merge_request
=
MergeRequest
.
find
(
merge_request_id
)
@project
=
@merge_request
.
project
mail
(
:to
=>
@merge_request
.
assignee_email
,
:subject
=>
"gitlab | new merge request |
#{
@merge_request
.
title
}
"
)
mail
(
:to
=>
@merge_request
.
assignee_email
,
:subject
=>
"gitlab | new merge request |
#{
@merge_request
.
title
}
"
)
end
end
...
@@ -62,6 +69,7 @@ class Notify < ActionMailer::Base
...
@@ -62,6 +69,7 @@ class Notify < ActionMailer::Base
recipient
=
User
.
find
(
recipient_id
)
recipient
=
User
.
find
(
recipient_id
)
@merge_request
=
MergeRequest
.
find
(
merge_request_id
)
@merge_request
=
MergeRequest
.
find
(
merge_request_id
)
@previous_assignee
||=
User
.
find
(
previous_assignee_id
)
@previous_assignee
||=
User
.
find
(
previous_assignee_id
)
@project
=
@merge_request
.
project
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab | merge request changed |
#{
@merge_request
.
title
}
"
)
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab | merge request changed |
#{
@merge_request
.
title
}
"
)
end
end
...
@@ -69,6 +77,7 @@ class Notify < ActionMailer::Base
...
@@ -69,6 +77,7 @@ class Notify < ActionMailer::Base
recipient
=
User
.
find
(
recipient_id
)
recipient
=
User
.
find
(
recipient_id
)
@issue
=
Issue
.
find
(
issue_id
)
@issue
=
Issue
.
find
(
issue_id
)
@previous_assignee
||=
User
.
find
(
previous_assignee_id
)
@previous_assignee
||=
User
.
find
(
previous_assignee_id
)
@project
=
@issue
.
project
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab | changed issue |
#{
@issue
.
title
}
"
)
mail
(
:to
=>
recipient
.
email
,
:subject
=>
"gitlab | changed issue |
#{
@issue
.
title
}
"
)
end
end
end
end
app/views/dashboard/issues.html.haml
View file @
9a0b763e
...
@@ -8,8 +8,8 @@
...
@@ -8,8 +8,8 @@
-
if
@issues
.
any?
-
if
@issues
.
any?
-
@issues
.
group_by
(
&
:project
).
each
do
|
group
|
-
@issues
.
group_by
(
&
:project
).
each
do
|
group
|
%div
.ui-box
%div
.ui-box
-
project
=
group
[
0
]
-
@
project
=
group
[
0
]
%h5
=
project
.
name
%h5
=
@
project
.
name
%ul
.unstyled.issues_table
%ul
.unstyled.issues_table
-
group
[
1
].
each
do
|
issue
|
-
group
[
1
].
each
do
|
issue
|
=
render
(
:partial
=>
'issues/show'
,
:locals
=>
{
:issue
=>
issue
})
=
render
(
:partial
=>
'issues/show'
,
:locals
=>
{
:issue
=>
issue
})
...
...
app/views/dashboard/merge_requests.html.haml
View file @
9a0b763e
...
@@ -7,8 +7,8 @@
...
@@ -7,8 +7,8 @@
-
if
@merge_requests
.
any?
-
if
@merge_requests
.
any?
-
@merge_requests
.
group_by
(
&
:project
).
each
do
|
group
|
-
@merge_requests
.
group_by
(
&
:project
).
each
do
|
group
|
%ul
.unstyled.ui-box
%ul
.unstyled.ui-box
-
project
=
group
[
0
]
-
@
project
=
group
[
0
]
%h5
=
project
.
name
%h5
=
@
project
.
name
-
group
[
1
].
each
do
|
merge_request
|
-
group
[
1
].
each
do
|
merge_request
|
=
render
(
:partial
=>
'merge_requests/merge_request'
,
:locals
=>
{
:merge_request
=>
merge_request
})
=
render
(
:partial
=>
'merge_requests/merge_request'
,
:locals
=>
{
:merge_request
=>
merge_request
})
%hr
%hr
...
...
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