Merge branch 'master' into add-default-merge-style

go-gitea · 6543 · Mar 27, 2021 · Feb 24, 2021 · Feb 24, 2021 · Feb 24, 2021
commit b77dab6a647cefb8f8d20912b1bd2ca5c367c25d
diff --git a/modules/forms/repo_form.go b/modules/forms/repo_form.go
@@ -123,28 +123,29 @@ type RepoSettingForm struct {
 	EnablePrune    bool
 
 	// Advanced settings
-	EnableWiki                       bool
-	EnableExternalWiki               bool
-	ExternalWikiURL                  string
-	EnableIssues                     bool
-	EnableExternalTracker            bool
-	ExternalTrackerURL               string
-	TrackerURLFormat                 string
-	TrackerIssueStyle                string
-	EnableProjects                   bool
-	EnablePulls                      bool
-	PullsIgnoreWhitespace            bool
-	PullsAllowMerge                  bool
-	PullsAllowRebase                 bool
-	PullsAllowRebaseMerge            bool
-	PullsAllowSquash                 bool
-	PullsAllowManualMerge            bool
-	PullsDefaultMergeStyle           string
-	EnableAutodetectManualMerge      bool
-	EnableTimetracker                bool
-	AllowOnlyContributorsToTrackTime bool
-	EnableIssueDependencies          bool
-	IsArchived                       bool
+	EnableWiki                            bool
+	EnableExternalWiki                    bool
+	ExternalWikiURL                       string
+	EnableIssues                          bool
+	EnableExternalTracker                 bool
+	ExternalTrackerURL                    string
+	TrackerURLFormat                      string
+	TrackerIssueStyle                     string
+	EnableCloseIssuesViaCommitInAnyBranch bool
+	EnableProjects                        bool
+	EnablePulls                           bool
+	PullsIgnoreWhitespace                 bool
+	PullsAllowMerge                       bool
+	PullsAllowRebase                      bool
+	PullsAllowRebaseMerge                 bool
+	PullsAllowSquash                      bool
+	PullsAllowManualMerge                 bool
+	PullsDefaultMergeStyle                string
+  EnableAutodetectManualMerge           bool
+	EnableTimetracker                     bool
+	AllowOnlyContributorsToTrackTime      bool
+	EnableIssueDependencies               bool
+	IsArchived                            bool
 
 	// Signing Settings
 	TrustModel string