Remove activity log configuration no longer used (#2490)

This commit is contained in:
Naoki Takezoe
2020-07-26 11:50:48 +09:00
committed by GitHub
parent 1a4961c3e1
commit 67667dbff1
5 changed files with 0 additions and 20 deletions

View File

@@ -48,7 +48,6 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
)(RepositoryOperation.apply), )(RepositoryOperation.apply),
"gravatar" -> trim(label("Gravatar", boolean())), "gravatar" -> trim(label("Gravatar", boolean())),
"notification" -> trim(label("Notification", boolean())), "notification" -> trim(label("Notification", boolean())),
"activityLogLimit" -> trim(label("Limit of activity logs", optional(number()))),
"limitVisibleRepositories" -> trim(label("limitVisibleRepositories", boolean())), "limitVisibleRepositories" -> trim(label("limitVisibleRepositories", boolean())),
"ssh" -> mapping( "ssh" -> mapping(
"enabled" -> trim(label("SSH access", boolean())), "enabled" -> trim(label("SSH access", boolean())),

View File

@@ -28,7 +28,6 @@ trait SystemSettingsService {
props.setProperty(RepositoryOperationFork, settings.repositoryOperation.fork.toString) props.setProperty(RepositoryOperationFork, settings.repositoryOperation.fork.toString)
props.setProperty(Gravatar, settings.gravatar.toString) props.setProperty(Gravatar, settings.gravatar.toString)
props.setProperty(Notification, settings.notification.toString) props.setProperty(Notification, settings.notification.toString)
settings.activityLogLimit.foreach(x => props.setProperty(ActivityLogLimit, x.toString))
props.setProperty(LimitVisibleRepositories, settings.limitVisibleRepositories.toString) props.setProperty(LimitVisibleRepositories, settings.limitVisibleRepositories.toString)
props.setProperty(SshEnabled, settings.ssh.enabled.toString) props.setProperty(SshEnabled, settings.ssh.enabled.toString)
settings.ssh.sshHost.foreach(x => props.setProperty(SshHost, x.trim)) settings.ssh.sshHost.foreach(x => props.setProperty(SshHost, x.trim))
@@ -112,7 +111,6 @@ trait SystemSettingsService {
), ),
getValue(props, Gravatar, false), getValue(props, Gravatar, false),
getValue(props, Notification, false), getValue(props, Notification, false),
getOptionValue[Int](props, ActivityLogLimit, None),
getValue(props, LimitVisibleRepositories, false), getValue(props, LimitVisibleRepositories, false),
Ssh( Ssh(
getValue(props, SshEnabled, false), getValue(props, SshEnabled, false),
@@ -200,7 +198,6 @@ object SystemSettingsService {
repositoryOperation: RepositoryOperation, repositoryOperation: RepositoryOperation,
gravatar: Boolean, gravatar: Boolean,
notification: Boolean, notification: Boolean,
activityLogLimit: Option[Int],
limitVisibleRepositories: Boolean, limitVisibleRepositories: Boolean,
ssh: Ssh, ssh: Ssh,
useSMTP: Boolean, useSMTP: Boolean,

View File

@@ -266,20 +266,6 @@
</div> </div>
</fieldset> </fieldset>
<!--====================================================================--> <!--====================================================================-->
<!-- Activity -->
<!--====================================================================-->
<hr>
<label><span class="strong">Limit of activity logs</span> (Unlimited if it is not specified or zero)</label>
<fieldset>
<div class="form-group">
<label class="control-label col-md-2" for="activityLogLimit">Limit</label>
<div class="col-md-10">
<input type="text" id="activityLogLimit" name="activityLogLimit" class="form-control input-mini" value="@context.settings.activityLogLimit"/>
<span id="error-activityLogLimit" class="error"></span>
</div>
</div>
</fieldset>
<!--====================================================================-->
<!-- Sidebar --> <!-- Sidebar -->
<!--====================================================================--> <!--====================================================================-->
<hr> <hr>

View File

@@ -45,7 +45,6 @@ trait ServiceSpecBase extends MockitoSugar {
), ),
gravatar = false, gravatar = false,
notification = false, notification = false,
activityLogLimit = None,
limitVisibleRepositories = false, limitVisibleRepositories = false,
ssh = Ssh( ssh = Ssh(
enabled = false, enabled = false,

View File

@@ -131,7 +131,6 @@ class AvatarImageProviderSpec extends FunSpec with MockitoSugar {
), ),
gravatar = useGravatar, gravatar = useGravatar,
notification = false, notification = false,
activityLogLimit = None,
limitVisibleRepositories = false, limitVisibleRepositories = false,
ssh = Ssh( ssh = Ssh(
enabled = false, enabled = false,