diff options
| author | Lin Jen-Shin (godfat) <godfat@godfat.org> | 2017-10-27 15:55:08 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-10-27 15:55:08 +0000 |
| commit | 57d7ed05d96928f7e33135e7397bdd6b3b0d25e0 (patch) | |
| tree | cc5f65076fc0acc1b5ff191d502a706e797544af /app/views/projects/branches | |
| parent | 7c4da276d34e008b5aa86971cfd627a813d84df7 (diff) | |
| download | gitlab-ce-57d7ed05d96928f7e33135e7397bdd6b3b0d25e0.tar.gz | |
Fetch the merged branches at once
Diffstat (limited to 'app/views/projects/branches')
| -rw-r--r-- | app/views/projects/branches/_branch.html.haml | 5 | ||||
| -rw-r--r-- | app/views/projects/branches/index.html.haml | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index 49101d1efa4..6e02ae6c9cc 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -1,3 +1,4 @@ +- merged = local_assigns.fetch(:merged, false) - commit = @repository.commit(branch.dereferenced_target) - bar_graph_width_factor = @max_commits > 0 ? 100.0/@max_commits : 0 - diverging_commit_counts = @repository.diverging_commit_counts(branch) @@ -12,7 +13,7 @@ - if branch.name == @repository.root_ref %span.label.label-primary default - - elsif @repository.merged_to_root_ref? branch.name + - elsif merged %span.label.label-info.has-tooltip{ title: s_('Branches|Merged into %{default_branch}') % { default_branch: @repository.root_ref } } = s_('Branches|merged') @@ -47,7 +48,7 @@ target: "#modal-delete-branch", delete_path: project_branch_path(@project, branch.name), branch_name: branch.name, - is_merged: ("true" if @repository.merged_to_root_ref?(branch.name)) } } + is_merged: ("true" if merged) } } = icon("trash-o") - else %button{ class: "btn btn-remove remove-row js-ajax-loading-spinner has-tooltip disabled", diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml index 7d9645d79e6..aade310236e 100644 --- a/app/views/projects/branches/index.html.haml +++ b/app/views/projects/branches/index.html.haml @@ -38,7 +38,7 @@ - if @branches.any? %ul.content-list.all-branches - @branches.each do |branch| - = render "projects/branches/branch", branch: branch + = render "projects/branches/branch", branch: branch, merged: @repository.merged_to_root_ref?(branch, @merged_branch_names) = paginate @branches, theme: 'gitlab' - else .nothing-here-block |