Merge branch 'master' into rework_api

6 files changed, 22 insertions, 6 deletions

diff --git a/.travis.yml b/.travis.yml
index dd405f5..7c8b9fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ addons:
 language: python
 python: 2.7
 env:
+  - TOX_ENV=py36
   - TOX_ENV=py35
   - TOX_ENV=py34
   - TOX_ENV=py27
diff --git a/AUTHORS b/AUTHORS
index 9a11b3c..d95dad8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -20,6 +20,7 @@ Asher256@users.noreply.github.com <Asher256>
 Christian <cgumpert@users.noreply.github.com>
 Christian Wenk <christian.wenk@omicronenergy.com>
 Colin D Bennett <colin.bennett@harman.com>
+Cosimo Lupo <cosimo.lupo@daltonmaag.com>
 Crestez Dan Leonard <lcrestez@ixiacom.com>
 Daniel Kimsey <dekimsey@ufl.edu>
 derek-austin <derek.austin35@mailinator.com>
@@ -35,6 +36,7 @@ Ian Sparks <isparks@mdsol.com>
 itxaka <itxakaserrano@gmail.com>
 Ivica Arsov <ivica.arsov@sculpteo.com>
 James (d0c_s4vage) Johnson <james.johnson@exodusintel.com>
+Jamie Bliss <astronouth7303@gmail.com>
 James E. Flemer <james.flemer@ndpgroup.com>
 James Johnson <d0c.s4vage@gmail.com>
 Jason Antman <jason@jasonantman.com>
@@ -50,6 +52,7 @@ Michal Galet <michal.galet@gmail.com>
 Mikhail Lopotkov <ms.lopotkov@tensor.ru>
 Missionrulz <missionrulz@gmail.com>
 Mond WAN <mondwan@users.noreply.github.com>
+Nathan Giesbrecht <NathanGiesbrecht@users.noreply.github.com>
 pa4373 <pa4373@gmail.com>
 Patrick Miller <patrick@velocitywebworks.com>
 Peng Xiao <xiaoquwl@gmail.com>
diff --git a/ChangeLog.rst b/ChangeLog.rst
index 306a730..a72ac6f 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,6 +1,17 @@
 ChangeLog
 =========
 
+Version 0.21.2_ - 2017-06-11
+----------------------------
+
+* Install doc: use sudo for system commands
+* [v4] Make MR work properly
+* Remove extra_attrs argument from _raw_list
+* [v4] Make project issues work properly
+* Fix urlencode() usage (python 2/3) (#268)
+* Fixed spelling mistake (#269)
+* Add new event types to ProjectHook
+
 Version 0.21.1_ - 2017-05-25
 ----------------------------
 
@@ -423,6 +434,7 @@ Version 0.1 - 2013-07-08
 
 * Initial release
 
+.. _0.21.2: https://github.com/python-gitlab/python-gitlab/compare/0.21.1...0.21.2
 .. _0.21.1: https://github.com/python-gitlab/python-gitlab/compare/0.21...0.21.1
 .. _0.21: https://github.com/python-gitlab/python-gitlab/compare/0.20...0.21
 .. _0.20: https://github.com/python-gitlab/python-gitlab/compare/0.19...0.20
diff --git a/docs/cli.rst b/docs/cli.rst
index 6730c9b..f0ed2ee 100644
--- a/docs/cli.rst
+++ b/docs/cli.rst
@@ -49,9 +49,9 @@ The configuration file uses the ``INI`` format. It contains at least a
    timeout = 1
 
 The ``default`` option of the ``[global]`` section defines the GitLab server to
-use if no server is explitly specified with the ``--gitlab`` CLI option.
+use if no server is explicitly specified with the ``--gitlab`` CLI option.
 
-The ``[global]`` section also defines the values for the default connexion
+The ``[global]`` section also defines the values for the default connection
 parameters. You can override the values in each GitLab server section.
 
 .. list-table:: Global options
diff --git a/gitlab/__init__.py b/gitlab/__init__.py
index 4dd7e29..0696f34 100644
--- a/gitlab/__init__.py
+++ b/gitlab/__init__.py
@@ -34,7 +34,7 @@ from gitlab.exceptions import *  # noqa
 from gitlab.v3.objects import *  # noqa
 
 __title__ = 'python-gitlab'
-__version__ = '0.21.1'
+__version__ = '0.21.2'
 __author__ = 'Gauvain Pocentek'
 __email__ = 'gauvain@pocentek.net'
 __license__ = 'LGPL3'
@@ -70,7 +70,7 @@ class Gitlab(object):
 
     def __init__(self, url, private_token=None, email=None, password=None,
                  ssl_verify=True, http_username=None, http_password=None,
-                 timeout=None, api_version='3'):
+                 timeout=None, api_version='3', session=None):
 
         self._api_version = str(api_version)
         self._url = '%s/api/v%s' % (url, api_version)
@@ -89,7 +89,7 @@ class Gitlab(object):
         self.http_password = http_password
 
         #: Create a session object for requests
-        self.session = requests.Session()
+        self.session = session or requests.Session()
 
         objects = importlib.import_module('gitlab.v%s.objects' %
                                           self._api_version)
diff --git a/tox.ini b/tox.ini
index ef3e68a..bb1b84c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py35,py34,py27,pep8
+envlist = py36,py35,py34,py27,pep8
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}