Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-21 21:23:46 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-21 21:23:46 +0300
commit2395b8f079fdd3f82428fd6f71221f57614cd226 (patch)
tree702a1a67282630c603c0632d44b86f5bb27754cc /app/views
parent1050f5230eec21cf47d5af262a1b3e62c07fec5d (diff)
parent8243eb3f0e3ee06a793831ae0899bfe409a31903 (diff)
Merge branch 'show_tags_in_commit_view' into 'master'
Show tags in commit view ### What does this MR do? With this MR you can see the assigned tags for a commit in the commit view. ### Are there points in the code the reviewer needs to double check? I don't think so. But it would be awesome if the reviewer can tell me how to add a tag to the sample_commit in spec/support/repo_helpers.rb. Then I can add a test for the new tag_names_contains method as soon as possible :) ### Why was this MR needed? At the moment if one click on a commit will see details such as: parent commit, amount of additions, deletions, but will not see if this commit has Tag linked to it. Showing branch, tag details will give better overview about the commit ### What are the relevant issue numbers / Feature requests? Feature request: http://feedback.gitlab.com/forums/176466-general/suggestions/3962044-show-tags-in-commit-view ### Screenshots ![gitlab_feature_show_tags](https://gitlab.com/uploads/haynes/gitlab-ce/771c1a36bb/gitlab_feature_show_tags.png) @dblessing Can you take a look at this MR as well please? See merge request !297
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/commit/_commit_box.html.haml7
1 files changed, 7 insertions, 0 deletions
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index e149f017f84..1d4658432ae 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -50,6 +50,13 @@
%span.js-details-content.hide
= commit_branches_links(@project, @branches)
+- if @tags.any?
+ .commit-info-row
+ %span.cgray
+ Tags:
+ %span
+ = commit_tags_links(@project, @tags)
+
.commit-box
%h3.commit-title
= gfm escape_once(@commit.title)