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
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-23 19:47:16 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-23 19:47:16 +0300
commit54326f490e92078fe28651dde3e345f756924ac4 (patch)
tree40726106cf1ebeded576fffa0539056e98f2c361 /app
parentc5d65ed62f637a91b6ea9554db57e4e74bab9cb3 (diff)
parenta30645c68f31d848ebad8c7ca395b55b9449db6d (diff)
Merge branch 'no-comment-bubble' into 'master'
Don't show commit comment button when user is not signed in. Address private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2167. See merge request !429
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/diffs/_text_file.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/diffs/_text_file.html.haml b/app/views/projects/diffs/_text_file.html.haml
index b1c987563f1..e691db9c08e 100644
--- a/app/views/projects/diffs/_text_file.html.haml
+++ b/app/views/projects/diffs/_text_file.html.haml
@@ -16,7 +16,7 @@
- else
%td.old_line
= link_to raw(type == "new" ? "&nbsp;" : line_old), "##{line_code}", id: line_code
- - if @comments_allowed
+ - if @comments_allowed && can?(current_user, :write_note, @project)
= link_to_new_diff_note(line_code)
%td.new_line{data: {linenumber: line.new_pos}}
= link_to raw(type == "old" ? "&nbsp;" : line.new_pos) , "##{line_code}", id: line_code