Another fix.

getredash · Apr 18, 2019 · 5e5ea9e · 5e5ea9e
1 parent 7b454ec
commit 5e5ea9e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/redash/__init__.py b/redash/__init__.py
@@ -5,13 +5,6 @@
 import urlparse
 
 import redis
-<<<<<<< HEAD
-from flask import Flask, current_app
-from werkzeug.contrib.fixers import ProxyFix
-from werkzeug.routing import BaseConverter
-from statsd import StatsClient
-=======
->>>>>>> Split redash/__init__.py to prevent import time side-effects.
 from flask_mail import Mail
 from flask_limiter import Limiter
 from flask_limiter.util import get_ipaddr

diff --git a/redash/handlers/base.py b/redash/handlers/base.py
@@ -117,7 +117,7 @@ def paginate(query_set, page, page_size, serializer, **kwargs):
 
 def org_scoped_rule(rule):
     if settings.MULTI_ORG:
-        return "/<org_slug:org_slug>{}".format(rule)
+        return "/<org_slug>{}".format(rule)
 
     return rule