summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/issue_show/components/edited.vue
diff options
context:
space:
mode:
authorGreg Myers <gmyers@gitlab.com>2019-08-27 15:51:04 +0000
committerGreg Myers <gmyers@gitlab.com>2019-08-27 15:51:04 +0000
commit51a0166af2c532aa7a0d04bb503b43499be97033 (patch)
tree9ebd74e8518d573fe4860763ddb41146dab1f453 /app/assets/javascripts/issue_show/components/edited.vue
parentf706677357fcdf9cd870d098379788543ea71058 (diff)
parent27c222d16ccb666878c7ac558f484efa56f77f37 (diff)
downloadgitlab-ce-51a0166af2c532aa7a0d04bb503b43499be97033.tar.gz
Merge branch 'master' into 'api-curl-quote-url-docs'api-curl-quote-url-docs
# Conflicts: # doc/api/events.md
Diffstat (limited to 'app/assets/javascripts/issue_show/components/edited.vue')
-rw-r--r--app/assets/javascripts/issue_show/components/edited.vue1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/issue_show/components/edited.vue b/app/assets/javascripts/issue_show/components/edited.vue
index 14ad8d3b7c9..2c92324d292 100644
--- a/app/assets/javascripts/issue_show/components/edited.vue
+++ b/app/assets/javascripts/issue_show/components/edited.vue
@@ -1,4 +1,5 @@
<script>
+/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
import timeAgoTooltip from '../../vue_shared/components/time_ago_tooltip.vue';
export default {