Prepare v1.2.01.2.0

3 files changed, 49 insertions, 1 deletions

diff --git a/AUTHORS b/AUTHORS
index 7937908..ac5d28f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,7 +17,10 @@ Andrew Austin <aaustin@terremark.com>
 Armin Weihbold <armin.weihbold@gmail.com>
 Aron Pammer <info@aronpammer.me>
 Asher256 <Asher256@users.noreply.github.com>
+Bancarel Valentin <bancarel.valentin@gmail.com>
+Ben Brown <ben.brown@codethink.co.uk>
 Carlo Mion <mion00@users.noreply.github.com>
+Carlos Soriano <csoriano@gnome.org>
 Christian <cgumpert@users.noreply.github.com>
 Christian Wenk <christian.wenk@omicronenergy.com>
 Colin D Bennett <colin.bennett@harman.com>
@@ -28,6 +31,7 @@ derek-austin <derek.austin35@mailinator.com>
 Diego Giovane Pasqualin <dpasqualin@c3sl.ufpr.br>
 Dmytro Litvinov <litvinov.do.it@gmail.com>
 Eli Sarver <eli.sarver@gmail.com>
+Eric L Frederich <eric.frederich@siemens.com>
 Erik Weatherwax <erik.weatherwax@xls.xerox.com>
 fgouteroux <francois.gouteroux@d2-si.eu>
 Greg Allen <GregoryEAllen@users.noreply.github.com>
@@ -61,12 +65,14 @@ Mikhail Lopotkov <ms.lopotkov@tensor.ru>
 Missionrulz <missionrulz@gmail.com>
 Mond WAN <mondwan@users.noreply.github.com>
 Nathan Giesbrecht <NathanGiesbrecht@users.noreply.github.com>
+Nathan Schmidt <nathan@cascade-softworks.com>
 pa4373 <pa4373@gmail.com>
 Patrick Miller <patrick@velocitywebworks.com>
 Pavel Savchenko <asfaltboy@gmail.com>
 Peng Xiao <xiaoquwl@gmail.com>
 Pete Browne <pete.browne@localmed.com>
 Peter Mosmans <support@go-forward.net>
+P. F. Chimento <philip.chimento@gmail.com>
 Philipp Busch <philipp.busch@momox.biz>
 Rafael Eyng <rafaeleyng@gmail.com>
 Richard Hansen <rhansen@rhansen.org>
@@ -76,6 +82,7 @@ savenger <github@smahmood.de>
 Stefan K. Dunkler <stefan.dun@gmail.com>
 Stefan Klug <klug.stefan@gmx.de>
 Stefano Mandruzzato <stefano.mandruzzato@gmail.com>
+THEBAULT Julien <julien@thebault.co>
 Tim Neumann <mail@timnn.me>
 Will Starms <vilhelmen@gmail.com>
 Yosi Zelensky <yosyos04@gmail.com>
diff --git a/ChangeLog.rst b/ChangeLog.rst
index fe6b201..3049b9a 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,6 +1,46 @@
 ChangeLog
 =========
 
+Version 1.2.0_ - 2018-01-01
+---------------------------
+
+* Add mattermost service support
+* Add users custom attributes support
+* [doc] Fix project.triggers.create example with v4 API
+* Oauth token support
+* Remove deprecated objects/methods
+* Rework authentication args handling
+* Add support for oauth and anonymous auth in config/CLI
+* Add support for impersonation tokens API
+* Add support for user activities
+* Update user docs with gitlab URLs
+* [docs] Bad arguments in projetcs file documentation
+* Add support for user_agent_detail (issues)
+* Add a SetMixin
+* Add support for project housekeeping
+* Expected HTTP response for subscribe is 201
+* Update pagination docs for ProjectCommit
+* Add doc to get issue from iid
+* Make todo() raise GitlabTodoError on error
+* Add support for award emojis
+* Update project services docs for v4
+* Avoid sending empty update data to issue.save
+* [docstrings] Explicitly document pagination arguments
+* [docs] Add a note about password auth being removed from GitLab
+* Submanagers: allow having undefined parameters
+* ProjectFile.create(): don't modify the input data
+* Update testing tools for /session removal
+* Update groups tests
+* Allow per_page to be used with generators
+* Add groups listing attributes
+* Add support for subgroups listing
+* Add supported python versions in setup.py
+* Add support for pagesdomains
+* Add support for features flags
+* Add support for project and group custom variables
+* Add support for user/group/project filter by custom attribute
+* Respect content of REQUESTS_CA_BUNDLE and *_proxy envvars
+
 Version 1.1.0_ - 2017-11-03
 ---------------------------
 
@@ -495,6 +535,7 @@ Version 0.1 - 2013-07-08
 
 * Initial release
 
+.. _1.2.0: https://github.com/python-gitlab/python-gitlab/compare/1.1.0...1.2.0
 .. _1.1.0: https://github.com/python-gitlab/python-gitlab/compare/1.0.2...1.1.0
 .. _1.0.2: https://github.com/python-gitlab/python-gitlab/compare/1.0.1...1.0.2
 .. _1.0.1: https://github.com/python-gitlab/python-gitlab/compare/1.0.0...1.0.1
diff --git a/gitlab/__init__.py b/gitlab/__init__.py
index 89a787a..846380f 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__ = '1.1.0'
+__version__ = '1.2.0'
 __author__ = 'Gauvain Pocentek'
 __email__ = 'gauvain@pocentek.net'
 __license__ = 'LGPL3'