Commit 23e338852c6030e199608517315c5d4fad6b27d8
1 parent
f716c0a1
Exists in
master
and in
4 other branches
Dont set @project variable in list. Remove a bit of duplication in dash and group
Showing
6 changed files
with
21 additions
and
32 deletions
Show diff stats
app/views/dashboard/issues.html.haml
| ... | ... | @@ -12,9 +12,9 @@ |
| 12 | 12 | - if @issues.any? |
| 13 | 13 | - @issues.group_by(&:project).each do |group| |
| 14 | 14 | %div.ui-box |
| 15 | - - @project = group[0] | |
| 15 | + - project = group[0] | |
| 16 | 16 | %h5.title |
| 17 | - = link_to_project @project | |
| 17 | + = link_to_project project | |
| 18 | 18 | %ul.well-list.issues_table |
| 19 | 19 | - group[1].each do |issue| |
| 20 | 20 | = render(partial: 'issues/show', locals: {issue: issue}) | ... | ... |
app/views/dashboard/merge_requests.html.haml
| ... | ... | @@ -8,17 +8,4 @@ |
| 8 | 8 | .span3 |
| 9 | 9 | = render 'filter', entity: 'merge_request' |
| 10 | 10 | .span9 |
| 11 | - - if @merge_requests.any? | |
| 12 | - - @merge_requests.group_by(&:project).each do |group| | |
| 13 | - .ui-box | |
| 14 | - - @project = group[0] | |
| 15 | - %h5.title | |
| 16 | - = link_to_project @project | |
| 17 | - %ul.well-list | |
| 18 | - - group[1].each do |merge_request| | |
| 19 | - = render(partial: 'merge_requests/merge_request', locals: {merge_request: merge_request}) | |
| 20 | - %hr | |
| 21 | - = paginate @merge_requests, theme: "gitlab" | |
| 22 | - | |
| 23 | - - else | |
| 24 | - %h3.nothing_here_message Nothing to show here | |
| 11 | + = render 'shared/merge_requests' | ... | ... |
app/views/groups/issues.html.haml
| ... | ... | @@ -11,9 +11,9 @@ |
| 11 | 11 | - if @issues.any? |
| 12 | 12 | - @issues.group_by(&:project).each do |group| |
| 13 | 13 | %div.ui-box |
| 14 | - - @project = group[0] | |
| 14 | + - project = group[0] | |
| 15 | 15 | %h5.title |
| 16 | - = link_to_project @project | |
| 16 | + = link_to_project project | |
| 17 | 17 | %ul.well-list.issues_table |
| 18 | 18 | - group[1].each do |issue| |
| 19 | 19 | = render(partial: 'issues/show', locals: {issue: issue}) | ... | ... |
app/views/groups/merge_requests.html.haml
| ... | ... | @@ -8,17 +8,4 @@ |
| 8 | 8 | .span3 |
| 9 | 9 | = render 'filter', entity: 'merge_request' |
| 10 | 10 | .span9 |
| 11 | - - if @merge_requests.any? | |
| 12 | - - @merge_requests.group_by(&:project).each do |group| | |
| 13 | - .ui-box | |
| 14 | - - @project = group[0] | |
| 15 | - %h5.title | |
| 16 | - = link_to_project @project | |
| 17 | - %ul.well-list | |
| 18 | - - group[1].each do |merge_request| | |
| 19 | - = render(partial: 'merge_requests/merge_request', locals: {merge_request: merge_request}) | |
| 20 | - %hr | |
| 21 | - = paginate @merge_requests, theme: "gitlab" | |
| 22 | - | |
| 23 | - - else | |
| 24 | - %h3.nothing_here_message Nothing to show here | |
| 11 | + = render 'shared/merge_requests' | ... | ... |
app/views/shared/_clone_panel.html.haml
| 1 | 1 | .input-prepend.project_clone_holder |
| 2 | 2 | %button{class: "btn active", :"data-clone" => @project.ssh_url_to_repo} SSH |
| 3 | 3 | %button{class: "btn", :"data-clone" => @project.http_url_to_repo}= Gitlab.config.gitlab.protocol.upcase |
| 4 | + | |
| 4 | 5 | = text_field_tag :project_clone, @project.url_to_repo, class: "one_click_select input-xxlarge" | ... | ... |
| ... | ... | @@ -0,0 +1,14 @@ |
| 1 | +- if @merge_requests.any? | |
| 2 | + - @merge_requests.group_by(&:project).each do |group| | |
| 3 | + .ui-box | |
| 4 | + - project = group[0] | |
| 5 | + %h5.title | |
| 6 | + = link_to_project project | |
| 7 | + %ul.well-list | |
| 8 | + - group[1].each do |merge_request| | |
| 9 | + = render(partial: 'merge_requests/merge_request', locals: {merge_request: merge_request}) | |
| 10 | + %hr | |
| 11 | + = paginate @merge_requests, theme: "gitlab" | |
| 12 | + | |
| 13 | +- else | |
| 14 | + %h3.nothing_here_message Nothing to show here | ... | ... |