Merge remote-tracking branch 'refs/remotes/dthompson/453_disable_comments'

diff --cc mediagoblin/config_spec.ini
index b7c6f29a2b8338973eb767ca52520fa942f40502,545d02e21553501f9f0420e2230d06631e44cfa3..6c00aa58db15cfb14c7390fae2e8d8c7ca3898bb
--- 1/mediagoblin/config_spec.ini
--- 2/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)
  

diff --cc mediagoblin/templates/mediagoblin/user_pages/media.html
Simple merge

diff --cc mediagoblin/user_pages/views.py
Simple merge