Skip to content
Snippets Groups Projects

Editable notes

Merged Editable notes
github/fork/jackbot/editable-notes into master
Merged gitlab-qa-bot requested to merge github/fork/jackbot/editable-notes into master

Created by: jackbot

Add ability to edit notes, as per this feature request. Also allows attachments to be deleted from existing notes.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
app/views/notes/_note.html.haml
6 6 Link here
7 7  
8 8 - if(note.author_id == current_user.id) || can?(current_user, :admin_note, @project)
9 = link_to project_note_path(@project, note), title: "Remove comment", method: :delete, confirm: 'Are you sure you want to remove comment?', remote: true, class: "danger js-note-delete" do
9 = link_to "#", title: "Edit comment", class: "js-note-edit" do
  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: dzaporozhets

    "#" instead of "javascript:;"

    By Administrator on 2013-07-01T09:49:10 (imported from GitLab project)

    By Administrator on 2013-07-01T09:49:10 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: dzaporozhets

    Can you make it mergeable please?

    By Administrator on 2013-06-30T16:35:12 (imported from GitLab project)

    By Administrator on 2013-06-30T16:35:12 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: Razer6

    @jackbot was your last commit your rebase?

    By Administrator on 2013-07-01T06:26:22 (imported from GitLab project)

    By Administrator on 2013-07-01T06:26:22 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: jackbot

    I've squashed the commits into one (is that what you mean?) Messed up a bit and added an empty merge though, sorry. Is this mergeable?

    By Administrator on 2013-07-01T09:26:37 (imported from GitLab project)

    By Administrator on 2013-07-01T09:26:37 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: jackbot

    Think I've sorted it now, first proper PR :)

    By Administrator on 2013-07-01T09:50:59 (imported from GitLab project)

    By Administrator on 2013-07-01T09:50:59 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: coveralls

    Coverage Status

    Coverage remained the same when pulling 6fa06893 on jackbot:editable-notes into 315d4cc8 on gitlabhq:master.

    By Administrator on 2013-07-01T10:04:05 (imported from GitLab project)

    By Administrator on 2013-07-01T10:04:05 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: jackbot

    I'm not sure why the build is failing on Travis, it's passing on the VM :/

    By Administrator on 2013-07-01T17:23:04 (imported from GitLab project)

    By Administrator on 2013-07-01T17:23:04 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: dzaporozhets

    @jackbot thank you. I will play with it tomorrow

    By Administrator on 2013-07-01T18:12:47 (imported from GitLab project)

    By Administrator on 2013-07-01T18:12:47 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: dzaporozhets

    @jackbot thank you!

    By Administrator on 2013-07-02T08:41:38 (imported from GitLab project)

    By Administrator on 2013-07-02T08:41:38 (imported from GitLab)

    • Please register or sign in to reply