Skip to content

Commit 15930bd

Browse files
committed
Add reference to documentation, clean up comments in .asf.yaml and make merge button configuration consistent with required_linear_history
1 parent b568e54 commit 15930bd

1 file changed

Lines changed: 9 additions & 11 deletions

File tree

.asf.yaml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16+
# This file is used to configure ASF GitHub repositories.
17+
# It is used by the ASF GitHub bot to automate various tasks such as labeling,
18+
# merging, and notifications.
19+
# For more information, see https://github.com/apache/infrastructure-asfyaml/blob/main/README.md
20+
1621
github:
1722
description: "Apache OFBiz is an open source product for the automation of enterprise processes. It includes framework components and business applications for ERP, CRM, E-Business/E-Commerce, Supply Chain Management and Manufacturing Resource Planning. OFBiz provides a foundation and starting point for reliable, secure and scalable enterprise solutions."
1823
homepage: https://ofbiz.apache.org/
@@ -32,20 +37,13 @@ github:
3237
- content
3338
- geospatial
3439
- hacktoberfest
40+
3541
enabled_merge_buttons:
36-
# enable squash button:
42+
merge: false
43+
rebase: true
3744
squash: true
38-
# default commit message when merging with a squash commit
39-
# can either be: DEFAULT | PR_TITLE | PR_TITLE_AND_COMMIT_DETAILS | PR_TITLE_AND_DESC
4045
squash_commit_message: PR_TITLE_AND_DESC
41-
# enable merge button:
42-
merge: true
43-
# default commit message when merging with a merge commit
44-
# can either be: DEFAULT | PR_TITLE | PR_TITLE_AND_DESC
45-
merge_commit_message: PR_TITLE_AND_DESC
46-
# enable rebase button:
47-
rebase: true
48-
46+
4947
rulesets:
5048
- name: "Default Branch Protection"
5149
type: branch

0 commit comments

Comments
 (0)