Merge branch '2.0.0'

# Conflicts:
#	flaskbb/auth/views.py

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.0.0
+current_version = 2.0.1
 commit = True
 tag = True
 

.travis.yml

@@ -24,5 +24,5 @@ deploy:
   distributions: sdist bdist_wheel
   on:
     tags: true
-    branch: master
+    all_branches: true
     repo: flaskbb/flaskbb

CHANGES

@@ -4,6 +4,14 @@ Changelog
 Here you can see the full list of changes between each release.
 
 
+Version 2.0.1
+-------------
+
+Releases June 21st, 2018
+
+* Fix issue where activation tokens would fail with an exception
+
+
 Version 2.0.0
 -------------
 

docs/conf.py

@@ -60,9 +60,9 @@ author = u'Peter Justin'
 # built documents.
 #
 # The short X.Y version.
-version = u'2.0.0'
+version = u'2.0.1'
 # The full version, including alpha/beta/rc tags.
-release = u'2.0.0'
+release = u'2.0.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

flaskbb/__init__.py

@@ -9,7 +9,7 @@
     :copyright: (c) 2014 by the FlaskBB Team.
     :license: BSD, see LICENSE for more details.
 """
-__version__ = "2.0.0"
+__version__ = "2.0.1"
 
 import logging
 logger = logging.getLogger(__name__)

flaskbb/auth/views.py

@@ -333,7 +333,7 @@ class AutoActivateAccount(MethodView):
                     ), "danger"
                 )
 
-                return redirect('auth.request_activation_token')
+                return redirect(url_for('auth.request_activation_token'))
 
             flash(
                 _("Your account has been activated and you can now login."),
@@ -382,7 +382,7 @@ class ActivateAccount(MethodView):
                         ), "danger"
                     )
 
-                    return redirect('auth.request_activation_token')
+                    return redirect(url_for('auth.request_activation_token'))
 
                 flash(
                     _("Your account has been activated and you can now login."),

setup.py

@@ -45,7 +45,7 @@ install_requires = get_requirements()
 
 setup(
     name='FlaskBB',
-    version="2.0.0",
+    version="2.0.1",
     url='https://flaskbb.org',
     project_urls={
         'Documentation': 'https://flaskbb.readthedocs.io/en/latest/',