diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-01 03:08:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-01 03:08:20 +0300 |
commit | a6808e1619fd119547de2654cbacecef1618ff4b (patch) | |
tree | 0f99d7334379697f893c05816c1c5a2883e3b218 /app/assets/javascripts/projects | |
parent | 6eaa83428407acdaf2ca389939d4d778e57ad3d4 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/projects')
-rw-r--r-- | app/assets/javascripts/projects/settings/branch_rules/components/rule_edit.vue | 11 | ||||
-rw-r--r-- | app/assets/javascripts/projects/settings/branch_rules/mount_branch_rules.js | 15 |
2 files changed, 26 insertions, 0 deletions
diff --git a/app/assets/javascripts/projects/settings/branch_rules/components/rule_edit.vue b/app/assets/javascripts/projects/settings/branch_rules/components/rule_edit.vue new file mode 100644 index 00000000000..941da667a05 --- /dev/null +++ b/app/assets/javascripts/projects/settings/branch_rules/components/rule_edit.vue @@ -0,0 +1,11 @@ +<script> +export default { + name: 'RuleEdit', +}; +</script> + +<template> + <div> + <!-- TODO - Add branch protections (https://gitlab.com/gitlab-org/gitlab/-/issues/362212) --> + </div> +</template> diff --git a/app/assets/javascripts/projects/settings/branch_rules/mount_branch_rules.js b/app/assets/javascripts/projects/settings/branch_rules/mount_branch_rules.js new file mode 100644 index 00000000000..716281c4a3e --- /dev/null +++ b/app/assets/javascripts/projects/settings/branch_rules/mount_branch_rules.js @@ -0,0 +1,15 @@ +import Vue from 'vue'; +import RuleEdit from './components/rule_edit.vue'; + +export default function mountBranchRules(el) { + if (!el) { + return null; + } + + return new Vue({ + el, + render(h) { + return h(RuleEdit); + }, + }); +} |