diff options
| author | Mek Stittri <mstittri@gitlab.com> | 2018-06-20 18:05:56 +0300 |
|---|---|---|
| committer | Mek Stittri <mstittri@gitlab.com> | 2018-06-20 18:05:56 +0300 |
| commit | 3e28cca5744410a82131bf02e17d785c7223d44b (patch) | |
| tree | 2a5713659df1ed0c6865714032af9ac2c8f73b2a /app/assets/javascripts/notes/components/noteable_note.vue | |
| parent | acdc0d73274b80fb104eea73e86eb4b9f92c848d (diff) | |
| parent | abc6be62a06349f395da0b33e814512ef15c06fb (diff) | |
Resolve conflicts with latest workflow label changes
Diffstat (limited to 'app/assets/javascripts/notes/components/noteable_note.vue')
| -rw-r--r-- | app/assets/javascripts/notes/components/noteable_note.vue | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue index 713f93456b1..9225a6b1a7c 100644 --- a/app/assets/javascripts/notes/components/noteable_note.vue +++ b/app/assets/javascripts/notes/components/noteable_note.vue @@ -170,7 +170,6 @@ export default { :author="author" :created-at="note.created_at" :note-id="note.id" - action-text="commented" /> <note-actions :author-id="author.id" |