diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-09 16:11:07 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-09 16:11:07 +0300 |
| commit | d866faf251d680cf594910bd91bbf468ee059935 (patch) | |
| tree | be0c9299fca99b8ef1500cf5e47d1653fd09487c /app/views | |
| parent | 92af60c2449cae5cbe2a8ef8ea65e973017053c2 (diff) | |
| parent | 30ee4ea6659c91ac6a249d700a9fcdd266676942 (diff) | |
| download | gitlab-ce-d866faf251d680cf594910bd91bbf468ee059935.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixes
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/project.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index 20d6cdf7246..2049b204956 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -5,8 +5,8 @@ - content_for :scripts_body_top do - project = @target_project || @project - - if @project_wiki - - markdown_preview_path = namespace_project_wikis_markdown_preview_path(project.namespace, project) + - if @project_wiki && @page + - markdown_preview_path = namespace_project_wiki_markdown_preview_path(project.namespace, project, params[:id]) - else - markdown_preview_path = markdown_preview_namespace_project_path(project.namespace, project) - if current_user diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 5ddd0ecc4c1..bcdbff08011 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -20,10 +20,11 @@ - access = note.project.team.human_max_access(note.author.id) - if access %span.note-role.hidden-xs= access - - if note_editable + - if current_user = link_to '#', title: 'Award Emoji', class: 'note-action-button note-emoji-button js-add-award js-note-emoji', data: { position: 'right' } do = icon('spinner spin') = icon('smile-o') + - if note_editable = link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do = icon('pencil') = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button hidden-xs js-note-delete danger' do |