summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/repofiles/update.go5
-rw-r--r--modules/setting/service.go2
2 files changed, 7 insertions, 0 deletions
diff --git a/modules/repofiles/update.go b/modules/repofiles/update.go
index 8e057700ab..5479616c4b 100644
--- a/modules/repofiles/update.go
+++ b/modules/repofiles/update.go
@@ -504,5 +504,10 @@ func PushUpdate(repo *models.Repository, branch string, opts models.PushUpdateOp
if opts.RefFullName == git.BranchPrefix+repo.DefaultBranch {
models.UpdateRepoIndexer(repo)
}
+
+ if err = models.WatchIfAuto(opts.PusherID, repo.ID, true); err != nil {
+ log.Warn("Fail to perform auto watch on user %v for repo %v: %v", opts.PusherID, repo.ID, err)
+ }
+
return nil
}
diff --git a/modules/setting/service.go b/modules/setting/service.go
index 93629100a2..6cbee8234d 100644
--- a/modules/setting/service.go
+++ b/modules/setting/service.go
@@ -44,6 +44,7 @@ var Service struct {
NoReplyAddress string
EnableUserHeatmap bool
AutoWatchNewRepos bool
+ AutoWatchOnChanges bool
DefaultOrgMemberVisible bool
// OpenID settings
@@ -85,6 +86,7 @@ func newService() {
Service.NoReplyAddress = sec.Key("NO_REPLY_ADDRESS").MustString("noreply.example.org")
Service.EnableUserHeatmap = sec.Key("ENABLE_USER_HEATMAP").MustBool(true)
Service.AutoWatchNewRepos = sec.Key("AUTO_WATCH_NEW_REPOS").MustBool(true)
+ Service.AutoWatchOnChanges = sec.Key("AUTO_WATCH_ON_CHANGES").MustBool(false)
Service.DefaultOrgVisibility = sec.Key("DEFAULT_ORG_VISIBILITY").In("public", structs.ExtractKeysFromMapString(structs.VisibilityModes))
Service.DefaultOrgVisibilityMode = structs.VisibilityModes[Service.DefaultOrgVisibility]
Service.DefaultOrgMemberVisible = sec.Key("DEFAULT_ORG_MEMBER_VISIBLE").MustBool()