Fix missing @project errors

diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index 2ce940c..a6e986c 100644 (file)
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -16,12 +16,14 @@ class Notify < ActionMailer::Base
 
   def new_issue_email(issue_id)
     @issue = Issue.find(issue_id)
+    @project = @issue.project
     mail(:to => @issue.assignee_email, :subject => "gitlab | New Issue was created")
   end
 
   def note_wall_email(recipient_id, note_id)
     recipient = User.find(recipient_id)
     @note = Note.find(note_id)
+    @project = @note.project
     mail(:to => recipient.email, :subject => "gitlab | #{@note.project_name} ")
   end
 
@@ -29,6 +31,7 @@ class Notify < ActionMailer::Base
     recipient = User.find(recipient_id)
     @note = Note.find(note_id)
     @commit = @note.target
+    @project = @note.project
     mail(:to => recipient.email, :subject => "gitlab | note for commit | #{@note.project_name} ")
   end
 
@@ -36,6 +39,7 @@ class Notify < ActionMailer::Base
     recipient = User.find(recipient_id)
     @note = Note.find(note_id)
     @merge_request = @note.noteable
+    @project = @note.project
     mail(:to => recipient.email, :subject => "gitlab | note for merge request | #{@note.project_name} ")
   end
 
@@ -43,6 +47,7 @@ class Notify < ActionMailer::Base
     recipient = User.find(recipient_id)
     @note = Note.find(note_id)
     @issue = @note.noteable
+    @project = @note.project
     mail(:to => recipient.email, :subject => "gitlab | note for issue #{@issue.id} | #{@note.project_name} ")
   end
 
@@ -50,11 +55,13 @@ class Notify < ActionMailer::Base
     recipient = User.find(recipient_id)
     @note = Note.find(note_id)
     @wiki = @note.noteable
+    @project = @note.project
     mail(:to => recipient.email, :subject => "gitlab | note for wiki | #{@note.project_name}")
   end
 
   def new_merge_request_email(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} ")
   end
 
@@ -62,6 +69,7 @@ class Notify < ActionMailer::Base
     recipient = User.find(recipient_id)
     @merge_request = MergeRequest.find(merge_request_id)
     @previous_assignee ||= User.find(previous_assignee_id)
+    @project = @merge_request.project
     mail(:to => recipient.email, :subject => "gitlab | merge request changed | #{@merge_request.title} ")
   end
 
@@ -69,6 +77,7 @@ class Notify < ActionMailer::Base
     recipient = User.find(recipient_id)
     @issue = Issue.find(issue_id)
     @previous_assignee ||= User.find(previous_assignee_id)
+    @project = @issue.project
     mail(:to => recipient.email, :subject => "gitlab | changed issue | #{@issue.title} ")
   end
 end

diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml
index ca87fc6..5b20bff 100644 (file)
--- a/app/views/dashboard/issues.html.haml
+++ b/app/views/dashboard/issues.html.haml
@@ -8,8 +8,8 @@
 - if @issues.any?
   - @issues.group_by(&:project).each do |group|
     %div.ui-box
-      - project = group[0]
-      %h5= project.name
+      - @project = group[0]
+      %h5= @project.name
       %ul.unstyled.issues_table
         - group[1].each do |issue|
           = render(:partial => 'issues/show', :locals => {:issue => issue})

diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml
index 407bf53..1117610 100644 (file)
--- a/app/views/dashboard/merge_requests.html.haml
+++ b/app/views/dashboard/merge_requests.html.haml
@@ -7,8 +7,8 @@
 - if @merge_requests.any?
   - @merge_requests.group_by(&:project).each do |group|
     %ul.unstyled.ui-box
-      - project = group[0]
-      %h5= project.name
+      - @project = group[0]
+      %h5= @project.name
       - group[1].each do |merge_request|
         = render(:partial => 'merge_requests/merge_request', :locals => {:merge_request => merge_request})
   %hr