From 408bc55db2f644e23f36b0f42eb95f08345af605 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Wed, 7 Nov 2018 22:48:57 +0100 Subject: [PATCH 1/9] mailer: use default port for mails --- rhodecode/lib/celerylib/tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rhodecode/lib/celerylib/tasks.py b/rhodecode/lib/celerylib/tasks.py index fde9b168..e31a8922 100644 --- a/rhodecode/lib/celerylib/tasks.py +++ b/rhodecode/lib/celerylib/tasks.py @@ -79,7 +79,7 @@ def send_email(recipients, subject, body='', html_body='', email_config=None): # translate our LEGACY config into the one that pyramid_mailer supports email_conf = dict( host=mail_server, - port=email_config.get('smtp_port'), + port=email_config.get('smtp_port', 25), username=email_config.get('smtp_username'), password=email_config.get('smtp_password'), From 2b6d6acff5572d3c1b4531aeb0cefa7e45033e68 Mon Sep 17 00:00:00 2001 From: Marcin Lulek Date: Wed, 7 Nov 2018 23:43:46 +0100 Subject: [PATCH 2/9] ui: make branding consistent in all pages. --- rhodecode/templates/login.mako | 2 +- rhodecode/templates/password_reset.mako | 2 +- rhodecode/templates/register.mako | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rhodecode/templates/login.mako b/rhodecode/templates/login.mako index 0de7f40f..6c74fab4 100644 --- a/rhodecode/templates/login.mako +++ b/rhodecode/templates/login.mako @@ -17,7 +17,7 @@ RhodeCode %if c.rhodecode_name: -
${h.branding(c.rhodecode_name)}
+
- ${h.branding(c.rhodecode_name)}
%endif diff --git a/rhodecode/templates/password_reset.mako b/rhodecode/templates/password_reset.mako index 6d9e491f..24193916 100644 --- a/rhodecode/templates/password_reset.mako +++ b/rhodecode/templates/password_reset.mako @@ -17,7 +17,7 @@ RhodeCode %if c.rhodecode_name: -
${h.branding(c.rhodecode_name)}
+
- ${h.branding(c.rhodecode_name)}
%endif diff --git a/rhodecode/templates/register.mako b/rhodecode/templates/register.mako index 9fffbd46..86118a44 100644 --- a/rhodecode/templates/register.mako +++ b/rhodecode/templates/register.mako @@ -17,7 +17,7 @@ RhodeCode %if c.rhodecode_name: -
${h.branding(c.rhodecode_name)}
+
- ${h.branding(c.rhodecode_name)}
%endif From 1afcbb6b9d7fcce5979a541e25bccfd84ef74c63 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Fri, 9 Nov 2018 13:19:16 +0100 Subject: [PATCH 3/9] ui: increase label width after font changes. --- rhodecode/public/css/type.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rhodecode/public/css/type.less b/rhodecode/public/css/type.less index ea918e27..f607ef33 100644 --- a/rhodecode/public/css/type.less +++ b/rhodecode/public/css/type.less @@ -436,7 +436,7 @@ dd { @media (min-width: 768px) { dt { float: left; - width: 180px; + width: 185px; clear: left; text-align: right; } From 8d18223bec999cd055e53983bc876f67b861a65b Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Mon, 12 Nov 2018 12:10:07 +0100 Subject: [PATCH 4/9] hooks: use safer way to validate kwargs. If rcextensions are disable we shouldn't do any actions. --- rhodecode/lib/hooks_base.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rhodecode/lib/hooks_base.py b/rhodecode/lib/hooks_base.py index 7041e421..fb5c63d8 100644 --- a/rhodecode/lib/hooks_base.py +++ b/rhodecode/lib/hooks_base.py @@ -339,7 +339,12 @@ class ExtensionCallback(object): self._kwargs_keys = set(kwargs_keys) def __call__(self, *args, **kwargs): - log.debug('Calling extension callback for %s', self._hook_name) + log.debug('Calling extension callback for `%s`', self._hook_name) + callback = self._get_callback() + if not callback: + log.debug('extension callback `%s` not found, skipping...', self._hook_name) + return + kwargs_to_pass = {} for key in self._kwargs_keys: try: @@ -349,16 +354,11 @@ class ExtensionCallback(object): key, self._kwargs_keys) raise - # backward compat for removed api_key for old hooks. THis was it works + # backward compat for removed api_key for old hooks. This was it works # with older rcextensions that require api_key present if self._hook_name in ['CREATE_USER_HOOK', 'DELETE_USER_HOOK']: kwargs_to_pass['api_key'] = '_DEPRECATED_' - - callback = self._get_callback() - if callback: - return callback(**kwargs_to_pass) - else: - log.debug('extensions callback not found skipping...') + return callback(**kwargs_to_pass) def is_active(self): return hasattr(rhodecode.EXTENSIONS, self._hook_name) From b5ceb42e74f2ca17d540217593eb1a264cbda4fa Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Mon, 12 Nov 2018 13:11:18 +0100 Subject: [PATCH 5/9] docs: added 4.14.1 release notes --- docs/release-notes/release-notes-4.14.1.rst | 46 +++++++++++++++++++++ docs/release-notes/release-notes.rst | 1 + 2 files changed, 47 insertions(+) create mode 100644 docs/release-notes/release-notes-4.14.1.rst diff --git a/docs/release-notes/release-notes-4.14.1.rst b/docs/release-notes/release-notes-4.14.1.rst new file mode 100644 index 00000000..8b24d1d7 --- /dev/null +++ b/docs/release-notes/release-notes-4.14.1.rst @@ -0,0 +1,46 @@ +|RCE| 4.14.1 |RNS| +------------------ + +Release Date +^^^^^^^^^^^^ + +- 2018-11-12 + + +New Features +^^^^^^^^^^^^ + + + +General +^^^^^^^ + +- ui: increase label width after font changes. +- ui: make branding consistent in all pages. + + +Security +^^^^^^^^ + + + +Performance +^^^^^^^^^^^ + + + +Fixes +^^^^^ + +- hooks: fixed SVN hook problem on commit with new rcextensions. +- hooks: use safer way to validate kwargs. If rcextensions are disable we shouldn't + validate any parameters. +- mailer: use default port for mails. Without ports mailer would fail with an odd + unrelated error message. + + +Upgrade notes +^^^^^^^^^^^^^ + +- Un-scheduled release addressing reported problems. + diff --git a/docs/release-notes/release-notes.rst b/docs/release-notes/release-notes.rst index 11f352a8..f93b986c 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.14.1.rst release-notes-4.14.0.rst release-notes-4.13.3.rst release-notes-4.13.2.rst From 0d02f7ed6c5fe875021647805023c42c0e7e2340 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Mon, 12 Nov 2018 13:12:06 +0100 Subject: [PATCH 6/9] release: Start preparation for 4.14.1 --- .bumpversion.cfg | 2 +- .release.cfg | 14 ++++---------- rhodecode/VERSION | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 8339a0f5..b1e96739 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.14.0 +current_version = 4.14.1 message = release: Bump version {current_version} to {new_version} [bumpversion:file:rhodecode/VERSION] diff --git a/.release.cfg b/.release.cfg index fa7b3fe9..2abcc34a 100644 --- a/.release.cfg +++ b/.release.cfg @@ -5,26 +5,20 @@ 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 - -[task:updated_translation] -done = true [release] -state = prepared -version = 4.14.0 +state = in_progress +version = 4.14.1 + +[task:updated_translation] [task:generate_js_routes] diff --git a/rhodecode/VERSION b/rhodecode/VERSION index 09ce0ce7..5704b893 100644 --- a/rhodecode/VERSION +++ b/rhodecode/VERSION @@ -1 +1 @@ -4.14.0 \ No newline at end of file +4.14.1 \ No newline at end of file From 701ab67fa5cab1a4df3677689deb57f887b955ad Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Mon, 12 Nov 2018 13:16:46 +0100 Subject: [PATCH 7/9] release: updated pip2nix output for 4.14.1 --- .release.cfg | 4 ++++ pkgs/python-packages.nix | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.release.cfg b/.release.cfg index 2abcc34a..1f4df23d 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 45dde9be..57d336b3 100644 --- a/pkgs/python-packages.nix +++ b/pkgs/python-packages.nix @@ -1615,7 +1615,7 @@ self: super: { }; }; "rhodecode-enterprise-ce" = super.buildPythonPackage { - name = "rhodecode-enterprise-ce-4.14.0"; + name = "rhodecode-enterprise-ce-4.14.1"; buildInputs = [ self."pytest" self."py" From c020d5df1147749daa6f9bde261eda1eddcef966 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Mon, 12 Nov 2018 13:16:48 +0100 Subject: [PATCH 8/9] release: Finish preparation for 4.14.1 --- .release.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.release.cfg b/.release.cfg index 1f4df23d..fbc18eeb 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.14.1 [task:updated_translation] From 8db9648a4a596a4920f174561e28c9b7defb7b50 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Mon, 12 Nov 2018 13:16:49 +0100 Subject: [PATCH 9/9] Added tag v4.14.1 for changeset a47eeac5dfa4