diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-09-18 17:06:47 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-09-19 23:48:40 -0500 |
| commit | f7f9847b26fd9f401039908843de2b660473e73d (patch) | |
| tree | a66ffe98c8e912a426de98470205a885da7d113a /app/assets/javascripts/vue_merge_request_widget/stores | |
| parent | ccdf687baa82dd0e0f809cfb24dc892db756bad7 (diff) | |
| download | gitlab-ce-f7f9847b26fd9f401039908843de2b660473e73d.tar.gz | |
Port fast-forward MR widget states from EE
See https://gitlab.com/gitlab-org/gitlab-ce/issues/20076
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/stores')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js | 1 |
1 files changed, 1 insertions, 0 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 29464662578..03969e33e97 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 @@ -57,6 +57,7 @@ export default class MergeRequestStore { this.onlyAllowMergeIfPipelineSucceeds = data.only_allow_merge_if_pipeline_succeeds || false; this.mergeWhenPipelineSucceeds = data.merge_when_pipeline_succeeds || false; this.mergePath = data.merge_path; + this.ffOnlyEnabled = data.ff_only_enabled; this.statusPath = data.status_path; this.emailPatchesPath = data.email_patches_path; this.plainDiffPath = data.plain_diff_path; |