feat(task-for-automatic-pr-merge): added f-ty to support pull request auto merge for EE. Fixes: RCCE-67

rhodecode/model/forms.py

@@ -445,6 +445,7 @@ class _BaseVcsSettingsForm(formencode.Schema):
 
     # PR/Code-review
     rhodecode_pr_merge_enabled = v.StringBoolean(if_missing=False)
+    rhodecode_auto_merge_enabled = v.StringBoolean(if_missing=False)
     rhodecode_use_outdated_comments = v.StringBoolean(if_missing=False)
 
     # hg

rhodecode/model/pull_request.py

@@ -2125,6 +2125,10 @@ class PullRequestModel(BaseModel):
         return self._get_general_setting(
             pull_request, 'rhodecode_pr_merge_enabled')
 
+    def is_automatic_merge_enabled(self, pull_request):
+        return self._get_general_setting(
+            pull_request, 'rhodecode_auto_merge_enabled')
+
     def _use_rebase_for_merging(self, pull_request):
         repo_type = pull_request.target_repo.repo_type
         if repo_type == 'hg':

rhodecode/model/settings.py

@@ -461,6 +461,7 @@ class VcsSettingsModel(object):
     GENERAL_SETTINGS = (
         'use_outdated_comments',
         'pr_merge_enabled',
+        'auto_merge_enabled',
         'hg_use_rebase_for_merging',
         'hg_close_branch_before_merging',
         'git_use_rebase_for_merging',