Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

2 files changed, 23 insertions, 5 deletions

diff --git a/app/assets/javascripts/protected_branches/protected_branch_create.js b/app/assets/javascripts/protected_branches/protected_branch_create.js
index c9474f0516c..726ddba1014 100644
--- a/app/assets/javascripts/protected_branches/protected_branch_create.js
+++ b/app/assets/javascripts/protected_branches/protected_branch_create.js
@@ -15,17 +15,23 @@ export default class ProtectedBranchCreate {
     this.isLocalStorageAvailable = AccessorUtilities.isLocalStorageAccessSafe();
     this.currentProjectUserDefaults = {};
     this.buildDropdowns();
+    this.$forcePushToggle = this.$form.find('.js-force-push-toggle');
     this.$codeOwnerToggle = this.$form.find('.js-code-owner-toggle');
     this.bindEvents();
   }
 
   bindEvents() {
+    this.$forcePushToggle.on('click', this.onForcePushToggleClick.bind(this));
     if (this.hasLicense) {
       this.$codeOwnerToggle.on('click', this.onCodeOwnerToggleClick.bind(this));
     }
     this.$form.on('submit', this.onFormSubmit.bind(this));
   }
 
+  onForcePushToggleClick() {
+    this.$forcePushToggle.toggleClass('is-checked');
+  }
+
   onCodeOwnerToggleClick() {
     this.$codeOwnerToggle.toggleClass('is-checked');
   }
@@ -86,6 +92,7 @@ export default class ProtectedBranchCreate {
       authenticity_token: this.$form.find('input[name="authenticity_token"]').val(),
       protected_branch: {
         name: this.$form.find('input[name="protected_branch[name]"]').val(),
+        allow_force_push: this.$forcePushToggle.hasClass('is-checked'),
         code_owner_approval_required: this.$codeOwnerToggle.hasClass('is-checked'),
       },
     };
diff --git a/app/assets/javascripts/protected_branches/protected_branch_edit.js b/app/assets/javascripts/protected_branches/protected_branch_edit.js
index 986abeecafa..bd2694e0cf7 100644
--- a/app/assets/javascripts/protected_branches/protected_branch_edit.js
+++ b/app/assets/javascripts/protected_branches/protected_branch_edit.js
@@ -14,6 +14,7 @@ export default class ProtectedBranchEdit {
     this.$wrap = options.$wrap;
     this.$allowedToMergeDropdown = this.$wrap.find('.js-allowed-to-merge');
     this.$allowedToPushDropdown = this.$wrap.find('.js-allowed-to-push');
+    this.$forcePushToggle = this.$wrap.find('.js-force-push-toggle');
     this.$codeOwnerToggle = this.$wrap.find('.js-code-owner-toggle');
 
     this.$wraps[ACCESS_LEVELS.MERGE] = this.$allowedToMergeDropdown.closest(
@@ -28,11 +29,23 @@ export default class ProtectedBranchEdit {
   }
 
   bindEvents() {
+    this.$forcePushToggle.on('click', this.onForcePushToggleClick.bind(this));
     if (this.hasLicense) {
       this.$codeOwnerToggle.on('click', this.onCodeOwnerToggleClick.bind(this));
     }
   }
 
+  onForcePushToggleClick() {
+    this.$forcePushToggle.toggleClass('is-checked');
+    this.$forcePushToggle.prop('disabled', true);
+
+    const formData = {
+      allow_force_push: this.$forcePushToggle.hasClass('is-checked'),
+    };
+
+    this.updateProtectedBranch(formData, () => this.$forcePushToggle.prop('disabled', false));
+  }
+
   onCodeOwnerToggleClick() {
     this.$codeOwnerToggle.toggleClass('is-checked');
     this.$codeOwnerToggle.prop('disabled', true);
@@ -41,17 +54,15 @@ export default class ProtectedBranchEdit {
       code_owner_approval_required: this.$codeOwnerToggle.hasClass('is-checked'),
     };
 
-    this.updateCodeOwnerApproval(formData);
+    this.updateProtectedBranch(formData, () => this.$codeOwnerToggle.prop('disabled', false));
   }
 
-  updateCodeOwnerApproval(formData) {
+  updateProtectedBranch(formData, callback) {
     axios
       .patch(this.$wrap.data('url'), {
         protected_branch: formData,
       })
-      .then(() => {
-        this.$codeOwnerToggle.prop('disabled', false);
-      })
+      .then(callback)
       .catch(() => {
         flash(__('Failed to update branch!'));
       });