diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-10-24 20:57:50 +0200 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-10-24 23:31:44 +0200 |
| commit | 1a92af2868f6ef565d5730c2f2da3455bf576c9c (patch) | |
| tree | 6085bc84692640c11b742482363c642f0ce3c924 /app | |
| parent | 4196583cf9315bffdebdfd802bd7a9efad63d692 (diff) | |
| download | gitlab-ce-1a92af2868f6ef565d5730c2f2da3455bf576c9c.tar.gz | |
Fix rspec error text regex
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js index 30e10cab00d..8a29058b451 100644 --- a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js +++ b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js @@ -18,7 +18,8 @@ export default class MergeRequestStore { this.squash = data.squash; this.squashBeforeMergeHelpPath = this.squashBeforeMergeHelpPath || data.squash_before_merge_help_path; - this.troubleshootingDocsPath = data.troubleshooting_docs_path; + this.troubleshootingDocsPath = + this.troubleshootingDocsPath || data.troubleshooting_docs_path; this.enableSquashBeforeMerge = this.enableSquashBeforeMerge || true; this.iid = data.iid; |