app/assets/javascripts/notes/components/note_actions.vue · 173890fd31b0e0f92cbfbb5724c6953296281b3d · nexedi / gitlab-ce

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-12 · 173890fd

GitLab Bot authored Sep 12, 2018

# Conflicts:
#	app/assets/javascripts/environments/components/environments_table.vue
#	app/assets/javascripts/notes/components/note_actions.vue
#	lib/api/triggers.rb

[ci skip]

173890fd

note_actions.vue 6.02 KB

Replace note_actions.vue