Merge branch 'master' into 'multiple-qualities-backend'

RabbitMQ addition in master

See merge request !1

6 files changed, 12 insertions, 12 deletions

diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini
index 0a8da73e..bd3003d0 100644
--- a/mediagoblin/config_spec.ini
+++ b/mediagoblin/config_spec.ini
@@ -153,8 +153,7 @@ CELERY_RESULT_BACKEND = string(default="database")
 CELERY_RESULT_DBURI = string(default="sqlite:///%(here)s/celery.db")
 
 # default kombu stuff
-BROKER_TRANSPORT = string(default="sqlalchemy")
-BROKER_URL = string(default="sqlite:///%(here)s/kombu.db")
+BROKER_URL = string(default="amqp://")
 
 # known booleans
 CELERY_RESULT_PERSISTENT = boolean()
diff --git a/mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html b/mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html
index 8c16daeb..bad33c8c 100644
--- a/mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html
+++ b/mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html
@@ -52,7 +52,7 @@
         {% if request.user and request.user.username==user.username %}
             <p>You have not created any blog yet.</p>
         {% else %}
-            <p>No blog has been created by <strong>{{ user.username }}</strong>yet.</p>
+            <p>No blog has been created by <strong>{{ user.username }}</strong> yet.</p>
         {% endif %}
     {% endif %}
     <br/>
diff --git a/mediagoblin/processing/task.py b/mediagoblin/processing/task.py
index 5e0e772d..bedfd32d 100644
--- a/mediagoblin/processing/task.py
+++ b/mediagoblin/processing/task.py
@@ -69,6 +69,9 @@ class ProcessMedia(celery.Task):
     """
     Pass this entry off for processing.
     """
+
+    name = 'process_media'
+
     def run(self, media_id, feed_url, reprocess_action, reprocess_info=None):
         """
         Pass the media entry off to the appropriate processing function
diff --git a/mediagoblin/static/js/audio.js b/mediagoblin/static/js/audio.js
index 36b4eab2..59a8c801 100644
--- a/mediagoblin/static/js/audio.js
+++ b/mediagoblin/static/js/audio.js
@@ -116,9 +116,9 @@ var audioPlayer = new Object();
         var im = audioPlayer.imageElement;
         var pos = (e.offsetX || e.originalEvent.layerX) / im.width();
 
-	console.log('pos', (e.offsetX || e.originalEvent.layerX) / im.width())
-	console.log('setting current time to',
-			pos * audioPlayer.audioElement.duration)
+        console.log('pos', (e.offsetX || e.originalEvent.layerX) / im.width())
+        console.log('setting current time to',
+            pos * audioPlayer.audioElement.duration)
 
         audioPlayer.audioElement.currentTime = pos * audioPlayer.audioElement.duration;
         audioPlayer.audioElement.play();
@@ -158,13 +158,13 @@ var audioPlayer = new Object();
                 el = $('.audio-spectrogram .audio-control-play-pause')
                     .removeClass('paused').addClass('playing')
                     .text('▮▮').attr('aria-label', 'Pause');
-		el[0].setAttribute('aria-label', 'Pause')
+                el[0].setAttribute('aria-label', 'Pause')
                 break;
             case audioPlayer.PAUSED:
                 el = $('.audio-spectrogram .audio-control-play-pause')
                     .removeClass('playing').addClass('paused')
                     .text('▶').attr('aria-label', 'Play');
-		el[0].setAttribute('aria-label', 'Play')
+                el[0].setAttribute('aria-label', 'Play')
                 break;
         }
     };
diff --git a/mediagoblin/templates/mediagoblin/auth/register.html b/mediagoblin/templates/mediagoblin/auth/register.html
index a7b8033f..b52ecff4 100644
--- a/mediagoblin/templates/mediagoblin/auth/register.html
+++ b/mediagoblin/templates/mediagoblin/auth/register.html
@@ -37,6 +37,7 @@
       {% template_hook("register_link") %}
       {{ wtforms_util.render_divs(register_form, True) }}
       {{ csrf_token }}
+      {% template_hook("register_captcha") %}
       <div class="form_submit_buttons">
         <input type="submit" value="{% trans %}Create{% endtrans %}"
                class="button_form" />
diff --git a/mediagoblin/tests/test_celery_setup.py b/mediagoblin/tests/test_celery_setup.py
index df0d04b0..0749c7f4 100644
--- a/mediagoblin/tests/test_celery_setup.py
+++ b/mediagoblin/tests/test_celery_setup.py
@@ -55,7 +55,4 @@ def test_setup_celery_from_config():
         'sqlite:///' +
         pkg_resources.resource_filename('mediagoblin.tests', 'celery.db'))
 
-    assert fake_celery_module.BROKER_TRANSPORT == 'sqlalchemy'
-    assert fake_celery_module.BROKER_URL == (
-        'sqlite:///' +
-        pkg_resources.resource_filename('mediagoblin.tests', 'kombu.db'))
+    assert fake_celery_module.BROKER_URL == 'amqp://'