From 91f7f899732a5137b4dcd54b21cc81e58acfe536 Mon Sep 17 00:00:00 2001 From: Marcin Lulek Date: Wed, 21 Feb 2018 10:39:13 +0100 Subject: [PATCH 1/7] auth: fix regression on cache manage namespace generation in case of external plugins a new users. --- rhodecode/authentication/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rhodecode/authentication/base.py b/rhodecode/authentication/base.py index bd96300f..de1dd030 100644 --- a/rhodecode/authentication/base.py +++ b/rhodecode/authentication/base.py @@ -653,7 +653,7 @@ def authenticate(username, password, environ=None, auth_type=None, # get instance of cache manager configured for a namespace cache_manager = get_auth_cache_manager( - custom_ttl=cache_ttl, suffix=user.user_id) + custom_ttl=cache_ttl, suffix=user.user_id if user else '') log.debug('AUTH_CACHE_TTL for plugin `%s` active: %s (TTL: %s)', plugin.get_id(), plugin_cache_active, cache_ttl) From de7198cb57c984e9e657f0392505b58bfb80f40d Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Wed, 21 Feb 2018 10:46:05 +0100 Subject: [PATCH 2/7] docs: updated old commands not longer available starting from 4.11 --- docs/contributing/db-schema.rst | 2 +- docs/contributing/dev-setup.rst | 2 +- release.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/contributing/db-schema.rst b/docs/contributing/db-schema.rst index 7dbf9d7d..3a4bf08b 100644 --- a/docs/contributing/db-schema.rst +++ b/docs/contributing/db-schema.rst @@ -47,6 +47,6 @@ Migration Command After you've changed the database ORM and migration files, you can run:: - paster upgrade-db + rc-upgrade-db The database will be upgraded up to the version defined in the ``__init__`` file. \ No newline at end of file diff --git a/docs/contributing/dev-setup.rst b/docs/contributing/dev-setup.rst index 07b7a1a6..343274d5 100644 --- a/docs/contributing/dev-setup.rst +++ b/docs/contributing/dev-setup.rst @@ -162,7 +162,7 @@ Setup the Development Database To create a development database, use the following example. This is a one time operation executed from the nix-shell of rhodecode-enterprise-ce sources :: - paster setup-rhodecode dev.ini \ + rc-setup-app dev.ini \ --user=admin --password=secret \ --email=admin@example.com \ --repos=~/my_dev_repos diff --git a/release.nix b/release.nix index 8c76dcbe..f7bf0c75 100644 --- a/release.nix +++ b/release.nix @@ -136,7 +136,7 @@ let mkdir repos echo "Preparing the database" - paster setup-rhodecode \ + rc-setup-app \ --user=admin \ --email=admin@example.com \ --password=secret \ From ca1fde6d690ba71e33226ee4bc03266f1fdba9af Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Wed, 21 Feb 2018 11:00:10 +0100 Subject: [PATCH 3/7] docs: added 4.11.5 release notes --- docs/release-notes/release-notes-4.11.5.rst | 39 +++++++++++++++++++++ docs/release-notes/release-notes.rst | 1 + 2 files changed, 40 insertions(+) create mode 100644 docs/release-notes/release-notes-4.11.5.rst diff --git a/docs/release-notes/release-notes-4.11.5.rst b/docs/release-notes/release-notes-4.11.5.rst new file mode 100644 index 00000000..79a6fab2 --- /dev/null +++ b/docs/release-notes/release-notes-4.11.5.rst @@ -0,0 +1,39 @@ +|RCE| 4.11.5 |RNS| +------------------ + +Release Date +^^^^^^^^^^^^ + +- 2018-02-21 + + +New Features +^^^^^^^^^^^^ + + + +General +^^^^^^^ + + + +Security +^^^^^^^^ + + + +Performance +^^^^^^^^^^^ + + + +Fixes +^^^^^ + +- Auth: fixed a regression with external auth new users creation. + + +Upgrade notes +^^^^^^^^^^^^^ + +- Unscheduled bugfix release. diff --git a/docs/release-notes/release-notes.rst b/docs/release-notes/release-notes.rst index cbd33b9e..c1b8a211 100644 --- a/docs/release-notes/release-notes.rst +++ b/docs/release-notes/release-notes.rst @@ -9,6 +9,7 @@ Release Notes .. toctree:: :maxdepth: 1 + release-notes-4.11.5.rst release-notes-4.11.4.rst release-notes-4.11.3.rst release-notes-4.11.2.rst From e44afd3961fa66a214d26fcfb5b1ed2661cd8121 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Wed, 21 Feb 2018 11:01:30 +0100 Subject: [PATCH 4/7] release: Start preparation for 4.11.5 --- .bumpversion.cfg | 2 +- .release.cfg | 9 ++------- rhodecode/VERSION | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index a61167cd..1b6a335e 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.11.4 +current_version = 4.11.5 message = release: Bump version {current_version} to {new_version} [bumpversion:file:rhodecode/VERSION] diff --git a/.release.cfg b/.release.cfg index 43b6bf71..389b0bdb 100644 --- a/.release.cfg +++ b/.release.cfg @@ -5,23 +5,18 @@ done = false done = true [task:rc_tools_pinned] -done = true [task:fixes_on_stable] -done = true [task:pip2nix_generated] -done = true [task:changelog_updated] -done = true [task:generate_api_docs] -done = true [release] -state = prepared -version = 4.11.4 +state = in_progress +version = 4.11.5 [task:updated_translation] diff --git a/rhodecode/VERSION b/rhodecode/VERSION index 9b8bdff6..ccf338b8 100644 --- a/rhodecode/VERSION +++ b/rhodecode/VERSION @@ -1 +1 @@ -4.11.4 \ No newline at end of file +4.11.5 \ No newline at end of file From 91f06af65aec44d1eafd7ca3d9d8619c2751649f Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Wed, 21 Feb 2018 11:07:08 +0100 Subject: [PATCH 5/7] release: updated pip2nix output for 4.11.5 --- .release.cfg | 4 ++++ pkgs/python-packages.nix | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.release.cfg b/.release.cfg index 389b0bdb..71608ea2 100644 --- a/.release.cfg +++ b/.release.cfg @@ -5,14 +5,18 @@ done = false done = true [task:rc_tools_pinned] +done = true [task:fixes_on_stable] +done = true [task:pip2nix_generated] [task:changelog_updated] +done = true [task:generate_api_docs] +done = true [release] state = in_progress diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix index 558110b3..6f15478a 100644 --- a/pkgs/python-packages.nix +++ b/pkgs/python-packages.nix @@ -1680,7 +1680,7 @@ }; }; rhodecode-enterprise-ce = super.buildPythonPackage { - name = "rhodecode-enterprise-ce-4.11.4"; + name = "rhodecode-enterprise-ce-4.11.5"; buildInputs = with self; [pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage configobj]; doCheck = true; propagatedBuildInputs = with self; [setuptools-scm amqp authomatic Babel Beaker celery Chameleon channelstream click colander configobj cssselect decorator deform docutils dogpile.cache dogpile.core ecdsa FormEncode future futures gnureadline infrae.cache iso8601 itsdangerous Jinja2 billiard kombu lxml Mako Markdown MarkupSafe msgpack-python MySQL-python objgraph packaging Paste PasteDeploy PasteScript pathlib2 peppercorn psutil psycopg2 py-bcrypt pycrypto pycurl pyflakes pygments-markdown-lexer Pygments pyparsing pyramid-beaker pyramid-debugtoolbar pyramid-jinja2 pyramid-mako pyramid pysqlite python-dateutil python-ldap python-memcached python-pam pytz pyzmq py-gfm recaptcha-client redis repoze.lru requests Routes setproctitle simplejson six SQLAlchemy sshpubkeys subprocess32 supervisor Tempita translationstring trollius urllib3 URLObject venusian WebError WebHelpers2 WebHelpers WebOb Whoosh wsgiref zope.cachedescriptors zope.deprecation zope.event zope.interface nbconvert bleach nbformat jupyter-client alembic invoke bumpversion transifex-client gevent greenlet gunicorn waitress uWSGI ipdb ipython CProfileV bottle rhodecode-tools appenlight-client pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage]; From f8abf45507dfe518052f1a8f7e0c8e2e8b14de87 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Wed, 21 Feb 2018 11:07:10 +0100 Subject: [PATCH 6/7] release: Finish preparation for 4.11.5 --- .release.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.release.cfg b/.release.cfg index 71608ea2..43dc4a5c 100644 --- a/.release.cfg +++ b/.release.cfg @@ -11,6 +11,7 @@ done = true done = true [task:pip2nix_generated] +done = true [task:changelog_updated] done = true @@ -19,7 +20,7 @@ done = true done = true [release] -state = in_progress +state = prepared version = 4.11.5 [task:updated_translation] From 4bdd1027c8fc66106247a859f1252cddcc54ccef Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Wed, 21 Feb 2018 11:07:10 +0100 Subject: [PATCH 7/7] Added tag v4.11.5 for changeset 8fbd8b0c3ddc