summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-08-10 11:01:25 +0100
committerFilipa Lacerda <filipa@gitlab.com>2017-08-10 11:05:02 +0100
commitafae4cb2ff90873d8841753f066950a5e559af86 (patch)
tree26bc755be9356ba79ccb4dfe8548c831df40e924
parent188181b780c5c0e5b05339daddad9c25c3b1bf85 (diff)
downloadgitlab-ce-36158-new-issue-button.tar.gz
Render new issue link in failed job as a regular link instead of a UJS one36158-new-issue-button
-rw-r--r--app/assets/javascripts/jobs/components/header.vue2
-rw-r--r--app/assets/javascripts/vue_shared/components/header_ci_component.vue4
-rw-r--r--changelogs/unreleased/36158-new-issue-button.yml4
3 files changed, 7 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"
diff --git a/changelogs/unreleased/36158-new-issue-button.yml b/changelogs/unreleased/36158-new-issue-button.yml
new file mode 100644
index 00000000000..df61fa06af7
--- /dev/null
+++ b/changelogs/unreleased/36158-new-issue-button.yml
@@ -0,0 +1,4 @@
+---
+title: Fixes new issue button for failed job returning 404
+merge_request:
+author: