From: Christopher Allan Webber Date: Fri, 10 May 2013 21:33:52 +0000 (-0500) Subject: Merge remote-tracking branch 'refs/remotes/dthompson/453_disable_comments' X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=94fadafe0908e497b9562f6e2689d83d07c5147d;p=mediagoblin.git Merge remote-tracking branch 'refs/remotes/dthompson/453_disable_comments' --- 94fadafe0908e497b9562f6e2689d83d07c5147d diff --cc mediagoblin/config_spec.ini index b7c6f29a,545d02e2..6c00aa58 --- a/mediagoblin/config_spec.ini +++ b/mediagoblin/config_spec.ini @@@ -32,8 -32,11 +32,11 @@@ email_smtp_pass = string(default=None allow_registration = boolean(default=True) # tag parsing -tags_max_length = integer(default=50) +tags_max_length = integer(default=255) + # Enable/disable comments + allow_comments = boolean(default=True) + # Whether comments are ascending or descending comments_ascending = boolean(default=True)