summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-03-25 20:19:12 +0200
committerTim Zallmann <tzallmann@gitlab.com>2018-03-25 20:19:12 +0200
commit5ddde3fbb0829b3053435b95f668915bae81c5d5 (patch)
treeab6fc31fe09b9978ef66a80976872d2f64e7394a
parentb5c989f614ac0e30a6fc3587623f8c4bb169e1ca (diff)
downloadgitlab-ce-5ddde3fbb0829b3053435b95f668915bae81c5d5.tar.gz
Fix for MR Widget Header reset
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue86
1 files changed, 43 insertions, 43 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
index bbe7f511cbe..3d886e7d628 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
@@ -1,53 +1,53 @@
<script>
-import tooltip from '~/vue_shared/directives/tooltip';
-import { n__ } from '~/locale';
-import icon from '~/vue_shared/components/icon.vue';
-import clipboardButton from '~/vue_shared/components/clipboard_button.vue';
+ import tooltip from '~/vue_shared/directives/tooltip';
+ import { n__ } from '~/locale';
+ import icon from '~/vue_shared/components/icon.vue';
+ import clipboardButton from '~/vue_shared/components/clipboard_button.vue';
-export default {
- name: 'MRWidgetHeader',
- directives: {
- tooltip,
- },
- components: {
- icon,
- clipboardButton,
- },
- props: {
- mr: {
- type: Object,
- required: true,
+ export default {
+ name: 'MRWidgetHeader',
+ directives: {
+ tooltip,
},
- },
- computed: {
- shouldShowCommitsBehindText() {
- return this.mr.divergedCommitsCount > 0;
+ components: {
+ icon,
+ clipboardButton,
},
- commitsText() {
- return n__('%d commit behind', '%d commits behind', this.mr.divergedCommitsCount);
+ props: {
+ mr: {
+ type: Object,
+ required: true,
+ },
},
- branchNameClipboardData() {
- // This supports code in app/assets/javascripts/copy_to_clipboard.js that
- // works around ClipboardJS limitations to allow the context-specific
- // copy/pasting of plain text or GFM.
- return JSON.stringify({
- text: this.mr.sourceBranch,
- gfm: `\`${this.mr.sourceBranch}\``,
- });
+ computed: {
+ shouldShowCommitsBehindText() {
+ return this.mr.divergedCommitsCount > 0;
+ },
+ commitsText() {
+ return n__('%d commit behind', '%d commits behind', this.mr.divergedCommitsCount);
+ },
+ branchNameClipboardData() {
+ // This supports code in app/assets/javascripts/copy_to_clipboard.js that
+ // works around ClipboardJS limitations to allow the context-specific
+ // copy/pasting of plain text or GFM.
+ return JSON.stringify({
+ text: this.mr.sourceBranch,
+ gfm: `\`${this.mr.sourceBranch}\``,
+ });
+ },
+ isSourceBranchLong() {
+ return this.isBranchTitleLong(this.mr.sourceBranch);
+ },
+ isTargetBranchLong() {
+ return this.isBranchTitleLong(this.mr.targetBranch);
+ },
},
- isSourceBranchLong() {
- return this.isBranchTitleLong(this.mr.sourceBranch);
+ methods: {
+ isBranchTitleLong(branchTitle) {
+ return branchTitle.length > 32;
+ },
},
- isTargetBranchLong() {
- return this.isBranchTitleLong(this.mr.targetBranch);
- },
- },
- methods: {
- isBranchTitleLong(branchTitle) {
- return branchTitle.length > 32;
- },
- },
-};
+ };
</script>
<template>
<div class="mr-source-target">