Skip to content

Commit

Permalink
fix: fix linting errors
Browse files Browse the repository at this point in the history
  • Loading branch information
peikk0 committed Mar 28, 2024
1 parent 1130bb1 commit ac89cc6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions server/core/config/valid/global_cfg.go
Original file line number Diff line number Diff line change
Expand Up @@ -345,13 +345,13 @@ func (g GlobalCfg) MergeProjectCfg(log logging.SimpleLogging, repoID string, pro
case RepoLocksKey:
//We check whether the server configured value and repo-root level
//config is different. If it is then we change to the more granular.
if rCfg.RepoLocks != nil && repoLocks.Mode != *&rCfg.RepoLocks.Mode {
if rCfg.RepoLocks != nil && repoLocks.Mode != rCfg.RepoLocks.Mode {
log.Debug("overriding server-defined %s with repo settings: [%#v]", RepoLocksKey, rCfg.RepoLocks)
repoLocks = *rCfg.RepoLocks
}
//Then we check whether the more granular project based config is
//different. If it is then we set it.
if proj.RepoLocks != nil && repoLocks.Mode != *&proj.RepoLocks.Mode {
if proj.RepoLocks != nil && repoLocks.Mode != proj.RepoLocks.Mode {
log.Debug("overriding repo-root-defined %s with repo settings: [%#v]", RepoLocksKey, *proj.RepoLocks)
repoLocks = *proj.RepoLocks
}
Expand Down

0 comments on commit ac89cc6

Please sign in to comment.