diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-23 16:47:16 +0000 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2015-03-24 12:56:42 -0700 |
| commit | b6a5a46163c12859c60be71753055d7b9845f9bc (patch) | |
| tree | 7d7aec68e74be9958369036f39e95de88295b6c2 | |
| parent | b6f1f5e3b4c4dd0ab87c04cb658545942684cdb8 (diff) | |
| download | gitlab-ce-b6a5a46163c12859c60be71753055d7b9845f9bc.tar.gz | |
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
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | app/views/projects/diffs/_text_file.html.haml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 62fbdd25c6f..08bc3e9d625 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -28,6 +28,9 @@ v 7.10.0 (unreleased) - Restrict permissions on backup files - Improve oauth accounts UI in profile page - Add ability to unlink connected accounts + - Replace commits calendar with faster contribution calendar that includes issues and merge requests + - Add inifinite scroll to user page activity + - Don't show commit comment button when user is not signed in. v 7.9.0 (unreleased) - Add HipChat integration documentation (Stan Hu) 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" ? " " : 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" ? " " : line.new_pos) , "##{line_code}", id: line_code |