diff options
author | Eric Eastwood <contact@ericeastwood.com> | 2017-09-29 22:13:35 +0300 |
---|---|---|
committer | Eric Eastwood <contact@ericeastwood.com> | 2017-09-29 22:13:35 +0300 |
commit | 439e3f073591b41ef9926a4b8c33000ae1b068f7 (patch) | |
tree | 9ae497ed8747b398de6232dec8c6626726f6a5eb /app/assets/javascripts/vue_merge_request_widget | |
parent | dbfe8597419d409b10ce79daec7f5b39cfad492d (diff) |
Port semi-linear merge strategy to CE (mostly FE)
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js index e745de89b8d..dc252f8a9b7 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js @@ -15,7 +15,7 @@ export default { showDisabledButton /> <div class="media-body space-children"> <span - v-if="mr.ffOnlyEnabled" + v-if="mr.shouldBeRebased" class="bold"> Fast-forward merge is not possible. To merge this request, first rebase locally. 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 03969e33e97..8255fd3e792 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 @@ -58,6 +58,7 @@ export default class MergeRequestStore { this.mergeWhenPipelineSucceeds = data.merge_when_pipeline_succeeds || false; this.mergePath = data.merge_path; this.ffOnlyEnabled = data.ff_only_enabled; + this.shouldBeRebased = !!data.should_be_rebased; this.statusPath = data.status_path; this.emailPatchesPath = data.email_patches_path; this.plainDiffPath = data.plain_diff_path; |