diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 21:48:34 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:52 +0300 |
| commit | 14888a398c71565bf8c595ed125e52ca8fb0c5f9 (patch) | |
| tree | e34ea58c9aa870dfd977bb4dd1a2f31f562a5b37 /app/assets/javascripts/merge_conflict_data_provider.js.es6 | |
| parent | a1d0b0398b84f872bdaee6220b76ca0de6e90f66 (diff) | |
| download | gitlab-ce-14888a398c71565bf8c595ed125e52ca8fb0c5f9.tar.gz | |
Disable commit button if commit message textarea empty.
Diffstat (limited to 'app/assets/javascripts/merge_conflict_data_provider.js.es6')
| -rw-r--r-- | app/assets/javascripts/merge_conflict_data_provider.js.es6 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_conflict_data_provider.js.es6 b/app/assets/javascripts/merge_conflict_data_provider.js.es6 index 76088503323..10d8a8a8ea7 100644 --- a/app/assets/javascripts/merge_conflict_data_provider.js.es6 +++ b/app/assets/javascripts/merge_conflict_data_provider.js.es6 @@ -237,8 +237,14 @@ class MergeConflictDataProvider { } - isAllResolved() { - return !this.vueInstance.isSubmitting && this.getConflictsCount() === this.getResolvedCount(); + isReadyToCommit() { + const { conflictsData, isSubmitting } = this.vueInstance + const allResolved = this.getConflictsCount() === this.getResolvedCount(); + const hasCommitMessage = $.trim(conflictsData.commitMessage).length; + + return !isSubmitting && hasCommitMessage && allResolved; + } + getCommitButtonText() { const initial = 'Commit conflict resolution'; |