diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-21 18:23:46 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-21 18:23:46 +0000 |
| commit | 2395b8f079fdd3f82428fd6f71221f57614cd226 (patch) | |
| tree | 702a1a67282630c603c0632d44b86f5bb27754cc /app/controllers/projects | |
| parent | 1050f5230eec21cf47d5af262a1b3e62c07fec5d (diff) | |
| parent | 8243eb3f0e3ee06a793831ae0899bfe409a31903 (diff) | |
| download | gitlab-ce-2395b8f079fdd3f82428fd6f71221f57614cd226.tar.gz | |
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
@dblessing Can you take a look at this MR as well please?
See merge request !297
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/commit_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index dac858d8e16..470efbd2114 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -12,6 +12,7 @@ class Projects::CommitController < Projects::ApplicationController @line_notes = @project.notes.for_commit_id(commit.id).inline @branches = @project.repository.branch_names_contains(commit.id) + @tags = @project.repository.tag_names_contains(commit.id) @diffs = @commit.diffs @note = @project.build_commit_note(commit) @notes_count = @project.notes.for_commit_id(commit.id).count |