diff options
author | Phil Hughes <me@iamphill.com> | 2017-08-10 15:51:11 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-08-10 15:51:11 +0300 |
commit | 26684325c2c6b137bf0729df94771062bed1e2c1 (patch) | |
tree | 5287c01e6ffcb412d7709668cff0eb0bf1412e20 /app | |
parent | af9250372c5d8eeffd80500dd8297e299da1a1c7 (diff) | |
parent | afae4cb2ff90873d8841753f066950a5e559af86 (diff) |
Merge branch '36158-new-issue-button' into 'master'
Render new issue link in failed job as a regular link instead of a UJS one
Closes #36158
See merge request !13450
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/jobs/components/header.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/vue_shared/components/header_ci_component.vue | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/jobs/components/header.vue b/app/assets/javascripts/jobs/components/header.vue index 5b9cf577189..3f6f40d47ba 100644 --- a/app/assets/javascripts/jobs/components/header.vue +++ b/app/assets/javascripts/jobs/components/header.vue @@ -40,7 +40,7 @@ label: 'New issue', path: this.job.new_issue_path, cssClass: 'js-new-issue btn btn-new btn-inverted visible-md-block visible-lg-block', - type: 'ujs-link', + type: 'link', }); } diff --git a/app/assets/javascripts/vue_shared/components/header_ci_component.vue b/app/assets/javascripts/vue_shared/components/header_ci_component.vue index bdc059f4a03..d305bd6acdc 100644 --- a/app/assets/javascripts/vue_shared/components/header_ci_component.vue +++ b/app/assets/javascripts/vue_shared/components/header_ci_component.vue @@ -120,7 +120,7 @@ export default { </a> <a - v-if="action.type === 'ujs-link'" + v-else-if="action.type === 'ujs-link'" :href="action.path" data-method="post" rel="nofollow" @@ -129,7 +129,7 @@ export default { </a> <button - v-else="action.type === 'button'" + v-else-if="action.type === 'button'" @click="onClickAction(action)" :disabled="action.isLoading" :class="action.cssClass" |