From 23e338852c6030e199608517315c5d4fad6b27d8 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 14 Jan 2013 10:09:01 +0200
Subject: [PATCH] Dont set @project variable in list. Remove a bit of duplication in dash and group

---
 app/views/dashboard/issues.html.haml         |  4 ++--
 app/views/dashboard/merge_requests.html.haml | 15 +--------------
 app/views/groups/issues.html.haml            |  4 ++--
 app/views/groups/merge_requests.html.haml    | 15 +--------------
 app/views/shared/_clone_panel.html.haml      |  1 +
 app/views/shared/_merge_requests.html.haml   | 14 ++++++++++++++
 6 files changed, 21 insertions(+), 32 deletions(-)
 create mode 100644 app/views/shared/_merge_requests.html.haml

diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml
index 68e3b3d..307d0d8 100644
--- a/app/views/dashboard/issues.html.haml
+++ b/app/views/dashboard/issues.html.haml
@@ -12,9 +12,9 @@
     - if @issues.any?
       - @issues.group_by(&:project).each do |group|
         %div.ui-box
-          - @project = group[0]
+          - project = group[0]
           %h5.title
-            = link_to_project @project
+            = link_to_project project
           %ul.well-list.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 c5245da..0c4d6e0 100644
--- a/app/views/dashboard/merge_requests.html.haml
+++ b/app/views/dashboard/merge_requests.html.haml
@@ -8,17 +8,4 @@
   .span3
     = render 'filter', entity: 'merge_request'
   .span9
-    - if @merge_requests.any?
-      - @merge_requests.group_by(&:project).each do |group|
-        .ui-box
-          - @project = group[0]
-          %h5.title
-            = link_to_project @project
-          %ul.well-list
-            - group[1].each do |merge_request|
-              = render(partial: 'merge_requests/merge_request', locals: {merge_request: merge_request})
-      %hr
-      = paginate @merge_requests, theme: "gitlab"
-
-    - else
-      %h3.nothing_here_message Nothing to show here
+    = render 'shared/merge_requests'
diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml
index ffca2dc..9e8642f 100644
--- a/app/views/groups/issues.html.haml
+++ b/app/views/groups/issues.html.haml
@@ -11,9 +11,9 @@
     - if @issues.any?
       - @issues.group_by(&:project).each do |group|
         %div.ui-box
-          - @project = group[0]
+          - project = group[0]
           %h5.title
-            = link_to_project @project
+            = link_to_project project
           %ul.well-list.issues_table
             - group[1].each do |issue|
               = render(partial: 'issues/show', locals: {issue: issue})
diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml
index c5245da..0c4d6e0 100644
--- a/app/views/groups/merge_requests.html.haml
+++ b/app/views/groups/merge_requests.html.haml
@@ -8,17 +8,4 @@
   .span3
     = render 'filter', entity: 'merge_request'
   .span9
-    - if @merge_requests.any?
-      - @merge_requests.group_by(&:project).each do |group|
-        .ui-box
-          - @project = group[0]
-          %h5.title
-            = link_to_project @project
-          %ul.well-list
-            - group[1].each do |merge_request|
-              = render(partial: 'merge_requests/merge_request', locals: {merge_request: merge_request})
-      %hr
-      = paginate @merge_requests, theme: "gitlab"
-
-    - else
-      %h3.nothing_here_message Nothing to show here
+    = render 'shared/merge_requests'
diff --git a/app/views/shared/_clone_panel.html.haml b/app/views/shared/_clone_panel.html.haml
index e283d9b..7b5de4a 100644
--- a/app/views/shared/_clone_panel.html.haml
+++ b/app/views/shared/_clone_panel.html.haml
@@ -1,4 +1,5 @@
 .input-prepend.project_clone_holder
   %button{class: "btn active", :"data-clone" => @project.ssh_url_to_repo} SSH
   %button{class: "btn", :"data-clone" => @project.http_url_to_repo}= Gitlab.config.gitlab.protocol.upcase
+
   = text_field_tag :project_clone, @project.url_to_repo, class: "one_click_select input-xxlarge"
diff --git a/app/views/shared/_merge_requests.html.haml b/app/views/shared/_merge_requests.html.haml
new file mode 100644
index 0000000..85391a3
--- /dev/null
+++ b/app/views/shared/_merge_requests.html.haml
@@ -0,0 +1,14 @@
+- if @merge_requests.any?
+  - @merge_requests.group_by(&:project).each do |group|
+    .ui-box
+      - project = group[0]
+      %h5.title
+        = link_to_project project
+      %ul.well-list
+        - group[1].each do |merge_request|
+          = render(partial: 'merge_requests/merge_request', locals: {merge_request: merge_request})
+  %hr
+  = paginate @merge_requests, theme: "gitlab"
+
+- else
+  %h3.nothing_here_message Nothing to show here
--
libgit2 0.21.2