summaryrefslogtreecommitdiffstats
path: root/modules/auth
diff options
context:
space:
mode:
authorLanre Adelowo <adelowomailbox@gmail.com>2019-02-10 20:27:19 +0100
committerLauris BH <lauris@nix.lv>2019-02-10 21:27:19 +0200
commit9d8178b3ac5f86a64f67ab7b5dea99347a5afe72 (patch)
treeed560142815927211f7d52db859728b88f0d9734 /modules/auth
parentc0adb5ea8bd0b2551a8c414b54ef5bc67882de55 (diff)
downloadgitea-9d8178b3ac5f86a64f67ab7b5dea99347a5afe72.tar.gz
gitea-9d8178b3ac5f86a64f67ab7b5dea99347a5afe72.zip
Add option to close issues via commit on a non master branch (#5992)
* fixes #5957 * add tests to make sure config option is respected * use already defined struct * - use migration to make the flag repo wide not for the entire gitea instance Also note that the config value can still be set so as to be able to control the value for new repositories that are to be created - fix copy/paste error in copyright header year and rearrange import - use repo config instead of server config value to determine if a commit should close an issue - update testsuite * use global config only when creating a new repository * allow repo admin toggle feature via UI * fix typo and improve testcase * fix fixtures * add DEFAULT prefix to config value * fix test
Diffstat (limited to 'modules/auth')
-rw-r--r--modules/auth/repo_form.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go
index 58be0ec3ae..1a67f2b884 100644
--- a/modules/auth/repo_form.go
+++ b/modules/auth/repo_form.go
@@ -14,7 +14,7 @@ import (
"github.com/Unknwon/com"
"github.com/go-macaron/binding"
- "gopkg.in/macaron.v1"
+ macaron "gopkg.in/macaron.v1"
)
// _______________________________________ _________.______________________ _______________.___.
@@ -120,7 +120,8 @@ type RepoSettingForm struct {
IsArchived bool
// Admin settings
- EnableHealthCheck bool
+ EnableHealthCheck bool
+ EnableCloseIssuesViaCommitInAnyBranch bool
}
// Validate validates the fields