From f8f3a39d93b1eee2df91101d50bb35a37e999f91 Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Tue, 23 Feb 2021 08:44:25 +0100
Subject: [PATCH 01/28] comments: forbig removal of comments by anyone except
 the owners.

---
 rhodecode/apps/repository/views/repo_commits.py       | 4 ++++
 rhodecode/apps/repository/views/repo_pull_requests.py | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/rhodecode/apps/repository/views/repo_commits.py b/rhodecode/apps/repository/views/repo_commits.py
index c2b45655..c2606b73 100644
--- a/rhodecode/apps/repository/views/repo_commits.py
+++ b/rhodecode/apps/repository/views/repo_commits.py
@@ -674,6 +674,10 @@ class RepoCommitsView(RepoAppView):
         is_repo_comment = comment.repo.repo_id == self.db_repo.repo_id
         comment_repo_admin = is_repo_admin and is_repo_comment
 
+        if comment.draft and not comment_owner:
+            # We never allow to delete draft comments for other than owners
+            raise HTTPNotFound()
+
         if super_admin or comment_owner or comment_repo_admin:
             CommentsModel().delete(comment=comment, auth_user=self._rhodecode_user)
             Session().commit()
diff --git a/rhodecode/apps/repository/views/repo_pull_requests.py b/rhodecode/apps/repository/views/repo_pull_requests.py
index fa4aa267..baf4d554 100644
--- a/rhodecode/apps/repository/views/repo_pull_requests.py
+++ b/rhodecode/apps/repository/views/repo_pull_requests.py
@@ -1748,6 +1748,10 @@ class RepoPullRequestsView(RepoAppView, DataGridAppView):
         is_repo_comment = comment.repo.repo_name == self.db_repo_name
         comment_repo_admin = is_repo_admin and is_repo_comment
 
+        if comment.draft and not comment_owner:
+            # We never allow to delete draft comments for other than owners
+            raise HTTPNotFound()
+
         if super_admin or comment_owner or comment_repo_admin:
             old_calculated_status = comment.pull_request.calculated_review_status()
             CommentsModel().delete(comment=comment, auth_user=self._rhodecode_user)

From 712064268e377489b4ef8dfe489a06987c374703 Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Thu, 4 Mar 2021 22:08:18 +0100
Subject: [PATCH 02/28] ssh: allow clone by ID via SSH operations.

---
 rhodecode/apps/ssh_support/lib/backends/__init__.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/rhodecode/apps/ssh_support/lib/backends/__init__.py b/rhodecode/apps/ssh_support/lib/backends/__init__.py
index 9d8a589c..d5a31627 100644
--- a/rhodecode/apps/ssh_support/lib/backends/__init__.py
+++ b/rhodecode/apps/ssh_support/lib/backends/__init__.py
@@ -89,6 +89,14 @@ class SshWrapper(object):
 
         return conn
 
+    def maybe_translate_repo_uid(self, repo_name):
+        if repo_name.startswith('_'):
+            from rhodecode.model.repo import RepoModel
+            by_id_match = RepoModel().get_repo_by_id(repo_name)
+            if by_id_match:
+                repo_name = by_id_match.repo_name
+        return repo_name
+
     def get_repo_details(self, mode):
         vcs_type = mode if mode in ['svn', 'hg', 'git'] else None
         repo_name = None
@@ -97,14 +105,14 @@ class SshWrapper(object):
         hg_match = re.match(hg_pattern, self.command)
         if hg_match is not None:
             vcs_type = 'hg'
-            repo_name = hg_match.group(1).strip('/')
+            repo_name = self.maybe_translate_repo_uid(hg_match.group(1).strip('/'))
             return vcs_type, repo_name, mode
 
         git_pattern = r'^git-(receive-pack|upload-pack)\s\'[/]?(\S+?)(|\.git)\'$'
         git_match = re.match(git_pattern, self.command)
         if git_match is not None:
             vcs_type = 'git'
-            repo_name = git_match.group(2).strip('/')
+            repo_name = self.maybe_translate_repo_uid(git_match.group(2).strip('/'))
             mode = git_match.group(1)
             return vcs_type, repo_name, mode
 

From c8ec0b9bcacb1bbeafa37e618cfacf6b4779ec6c Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Tue, 9 Mar 2021 21:16:34 +0100
Subject: [PATCH 03/28] rcextensions: fixed pre-files extractor return code
 support.

---
 rhodecode/config/rcextensions/helpers/extract_pre_files.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rhodecode/config/rcextensions/helpers/extract_pre_files.py b/rhodecode/config/rcextensions/helpers/extract_pre_files.py
index 9485357b..f9c85e3f 100644
--- a/rhodecode/config/rcextensions/helpers/extract_pre_files.py
+++ b/rhodecode/config/rcextensions/helpers/extract_pre_files.py
@@ -32,6 +32,7 @@ import json
 from rhodecode.lib import diffs
 from rhodecode.lib.vcs.backends.hg.diff import MercurialDiff
 from rhodecode.lib.vcs.backends.git.diff import GitDiff
+from vcsserver.utils import safe_int
 
 
 def get_svn_files(repo, vcs_repo, refs):
@@ -74,7 +75,7 @@ def get_svn_files(repo, vcs_repo, refs):
                 # skip dirs
                 continue
 
-            parsed_entry['file_size'] = int(stdout.strip())
+            parsed_entry['file_size'] = safe_int(stdout.strip()) or 0
 
         files.append(parsed_entry)
 

From dcadd22a7d121c376c6a0230184f72dc36eee6ea Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Tue, 9 Mar 2021 21:16:40 +0100
Subject: [PATCH 04/28] release: Bump version 4.24.0 to 4.25.0

---
 .bumpversion.cfg         | 2 +-
 pkgs/python-packages.nix | 2 +-
 rhodecode/VERSION        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 7bbc7c73..a612c39b 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4.24.0
+current_version = 4.25.0
 message = release: Bump version {current_version} to {new_version}
 
 [bumpversion:file:rhodecode/VERSION]
diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix
index 7cea3d2a..490ce273 100644
--- a/pkgs/python-packages.nix
+++ b/pkgs/python-packages.nix
@@ -1883,7 +1883,7 @@ self: super: {
     };
   };
   "rhodecode-enterprise-ce" = super.buildPythonPackage {
-    name = "rhodecode-enterprise-ce-4.24.0";
+    name = "rhodecode-enterprise-ce-4.25.0";
     buildInputs = [
       self."pytest"
       self."py"
diff --git a/rhodecode/VERSION b/rhodecode/VERSION
index 2c4686f5..71cf3665 100644
--- a/rhodecode/VERSION
+++ b/rhodecode/VERSION
@@ -1 +1 @@
-4.24.0
\ No newline at end of file
+4.25.0
\ No newline at end of file

From bfa14dbb3a0b7c741caf793bf3d9ca11c7ccd163 Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Thu, 11 Mar 2021 10:06:40 +0100
Subject: [PATCH 05/28] archives: use a special name for non-hashed archives to
 fix caching issues.

---
 .../apps/repository/tests/test_repo_files.py  | 22 +++++++++++++++++++
 rhodecode/apps/repository/views/repo_files.py |  9 ++++----
 rhodecode/templates/summary/summary.mako      |  3 ++-
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/rhodecode/apps/repository/tests/test_repo_files.py b/rhodecode/apps/repository/tests/test_repo_files.py
index 2c808546..3768cb7b 100644
--- a/rhodecode/apps/repository/tests/test_repo_files.py
+++ b/rhodecode/apps/repository/tests/test_repo_files.py
@@ -542,6 +542,28 @@ class TestRepositoryArchival(object):
             for header in headers:
                 assert header in response.headers.items()
 
+    def test_archival_no_hash(self, backend):
+        backend.enable_downloads()
+        commit = backend.repo.get_commit(commit_idx=173)
+        for a_type, content_type, extension in settings.ARCHIVE_SPECS:
+
+            short = 'plain' + extension
+            fname = commit.raw_id + extension
+            filename = '%s-%s' % (backend.repo_name, short)
+            response = self.app.get(
+                route_path('repo_archivefile',
+                           repo_name=backend.repo_name,
+                           fname=fname, params={'with_hash': 0}))
+
+            assert response.status == '200 OK'
+            headers = [
+                ('Content-Disposition', 'attachment; filename=%s' % filename),
+                ('Content-Type', '%s' % content_type),
+            ]
+
+            for header in headers:
+                assert header in response.headers.items()
+
     @pytest.mark.parametrize('arch_ext',[
         'tar', 'rar', 'x', '..ax', '.zipz', 'tar.gz.tar'])
     def test_archival_wrong_ext(self, backend, arch_ext):
diff --git a/rhodecode/apps/repository/views/repo_files.py b/rhodecode/apps/repository/views/repo_files.py
index aec275d9..be093aba 100644
--- a/rhodecode/apps/repository/views/repo_files.py
+++ b/rhodecode/apps/repository/views/repo_files.py
@@ -325,17 +325,18 @@ class RepoFilesView(RepoAppView):
 
         return lf_enabled
 
-    def _get_archive_name(self, db_repo_name, commit_sha, ext, subrepos=False, path_sha=''):
+    def _get_archive_name(self, db_repo_name, commit_sha, ext, subrepos=False, path_sha='', with_hash=True):
         # original backward compat name of archive
         clean_name = safe_str(db_repo_name.replace('/', '_'))
 
         # e.g vcsserver.zip
         # e.g vcsserver-abcdefgh.zip
         # e.g vcsserver-abcdefgh-defghijk.zip
-        archive_name = '{}{}{}{}{}'.format(
+        archive_name = '{}{}{}{}{}{}'.format(
             clean_name,
             '-sub' if subrepos else '',
             commit_sha,
+            '-{}'.format('plain') if not with_hash else '',
             '-{}'.format(path_sha) if path_sha else '',
             ext)
         return archive_name
@@ -385,7 +386,7 @@ class RepoFilesView(RepoAppView):
         # used for cache etc
         archive_name = self._get_archive_name(
             self.db_repo_name, commit_sha=short_sha, ext=ext, subrepos=subrepos,
-            path_sha=path_sha)
+            path_sha=path_sha, with_hash=with_hash)
 
         if not with_hash:
             short_sha = ''
@@ -394,7 +395,7 @@ class RepoFilesView(RepoAppView):
         # what end client gets served
         response_archive_name = self._get_archive_name(
             self.db_repo_name, commit_sha=short_sha, ext=ext, subrepos=subrepos,
-            path_sha=path_sha)
+            path_sha=path_sha, with_hash=with_hash)
         # remove extension from our archive directory name
         archive_dir_name = response_archive_name[:-len(ext)]
 
diff --git a/rhodecode/templates/summary/summary.mako b/rhodecode/templates/summary/summary.mako
index 2fe6ed2d..64876f18 100644
--- a/rhodecode/templates/summary/summary.mako
+++ b/rhodecode/templates/summary/summary.mako
@@ -95,7 +95,8 @@ $(document).ready(function(){
             var fname = selectedReference.raw_id + ext;
             var href = pyroutes.url('repo_archivefile', {
                 'repo_name': templateContext.repo_name,
-                'fname': fname
+                'fname': fname,
+                'with_hash': '1'
             });
             // set new label
             $(this).html(ico + ' {0}{1}'.format(escapeHtml(e.added.text), ext));

From 8c12bc34c3f913b0edaea407d67ac549d6a2143a Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Thu, 11 Mar 2021 10:28:52 +0100
Subject: [PATCH 06/28] archives: if implicit ref name was used to obtain
 archive, redirect to explicit commit sha so we can have the proper caching
 for references names.

---
 rhodecode/apps/repository/views/repo_files.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/rhodecode/apps/repository/views/repo_files.py b/rhodecode/apps/repository/views/repo_files.py
index be093aba..a2ae4e21 100644
--- a/rhodecode/apps/repository/views/repo_files.py
+++ b/rhodecode/apps/repository/views/repo_files.py
@@ -373,6 +373,11 @@ class RepoFilesView(RepoAppView):
         except EmptyRepositoryError:
             return Response(_('Empty repository'))
 
+        # we used a ref, or a shorter version, lets redirect client ot use explicit hash
+        if commit_id != commit.raw_id:
+            fname='{}{}'.format(commit.raw_id, ext)
+            raise HTTPFound(self.request.current_route_path(fname=fname))
+
         try:
             at_path = commit.get_node(at_path).path or default_at_path
         except Exception:
@@ -405,9 +410,10 @@ class RepoFilesView(RepoAppView):
         cached_archive_path = None
 
         if archive_cache_enabled:
-            # check if we it's ok to write
+            # check if we it's ok to write, and re-create the archive cache
             if not os.path.isdir(CONFIG['archive_cache_dir']):
                 os.makedirs(CONFIG['archive_cache_dir'])
+
             cached_archive_path = os.path.join(
                 CONFIG['archive_cache_dir'], archive_name)
             if os.path.isfile(cached_archive_path):

From 2637470cf84ee3d54ceac4b0d5623e981c8c26ad Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Thu, 11 Mar 2021 12:50:55 +0100
Subject: [PATCH 07/28] packaging: fixed few packages requirements for a proper
 builds

---
 pkgs/patches/channelstream/setuptools.patch   | 13 +++++++++++++
 pkgs/patches/pyramid_apispec/setuptools.patch | 12 ++++++++++++
 pkgs/python-packages-overrides.nix            | 12 ++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 pkgs/patches/channelstream/setuptools.patch
 create mode 100644 pkgs/patches/pyramid_apispec/setuptools.patch

diff --git a/pkgs/patches/channelstream/setuptools.patch b/pkgs/patches/channelstream/setuptools.patch
new file mode 100644
index 00000000..2e513de3
--- /dev/null
+++ b/pkgs/patches/channelstream/setuptools.patch
@@ -0,0 +1,13 @@
+diff -rup channelstream-0.6.14-orig/setup.py channelstream-0.6.14/setup.py
+
+--- channelstream-0.6.14/setup-orig.py	2021-03-11 12:34:45.000000000 +0100
++++ channelstream-0.6.14/setup.py	2021-03-11 12:34:56.000000000 +0100
+@@ -52,7 +52,7 @@ setup(
+     include_package_data=True,
+     install_requires=requires,
+     python_requires=">=2.7",
+-    setup_requires=["pytest-runner"],
++    setup_requires=["pytest-runner==5.1.0"],
+     extras_require={
+         "dev": ["coverage", "pytest", "pyramid", "tox", "mock", "webtest"],
+         "lint": ["black"],
diff --git a/pkgs/patches/pyramid_apispec/setuptools.patch b/pkgs/patches/pyramid_apispec/setuptools.patch
new file mode 100644
index 00000000..fad7949b
--- /dev/null
+++ b/pkgs/patches/pyramid_apispec/setuptools.patch
@@ -0,0 +1,12 @@
+diff -rup pyramid-apispec-0.3.2-orig/setup.py pyramid-apispec-0.3.2/setup.py
+--- pyramid-apispec-0.3.2-orig/setup.py	2021-03-11 11:19:26.000000000 +0100
++++ pyramid-apispec-0.3.2/setup.py	2021-03-11 11:19:51.000000000 +0100
+@@ -44,7 +44,7 @@ setup(
+     packages=find_packages(exclude=["contrib", "docs", "tests"]),
+     package_data={"pyramid_apispec": ["static/*.*"], "": ["LICENSE"]},
+     install_requires=["apispec[yaml]==1.0.0"],
+-    setup_requires=["pytest-runner"],
++    setup_requires=["pytest-runner==5.1"],
+     extras_require={
+         "dev": ["coverage", "pytest", "pyramid", "tox", "webtest"],
+         "demo": ["marshmallow==2.15.3", "pyramid", "apispec", "webtest"],
\ No newline at end of file
diff --git a/pkgs/python-packages-overrides.nix b/pkgs/python-packages-overrides.nix
index 51f5b3df..01a1e1e1 100644
--- a/pkgs/python-packages-overrides.nix
+++ b/pkgs/python-packages-overrides.nix
@@ -280,6 +280,18 @@ self: super: {
     ];
   });
 
+  "pyramid-apispec" = super."pyramid-apispec".override (attrs: {
+    patches = [
+      ./patches/pyramid_apispec/setuptools.patch
+    ];
+  });
+
+  "channelstream" = super."channelstream".override (attrs: {
+    patches = [
+      ./patches/channelstream/setuptools.patch
+    ];
+  });
+
   # Avoid that base packages screw up the build process
   inherit (basePythonPackages)
     setuptools;

From ce1015425ed3c53784857800248205fd85c4a967 Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Thu, 11 Mar 2021 22:20:02 +0100
Subject: [PATCH 08/28] pull-requests: fixed multiple repetitions of referenced
 tickets in pull requests summary sidebar.

---
 rhodecode/lib/helpers.py                      | 47 +++++++++++++++----
 .../templates/compare/compare_commits.mako    |  4 +-
 .../pullrequests/pullrequest_show.mako        | 29 +++++++-----
 3 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py
index 2d463f3e..ea670467 100644
--- a/rhodecode/lib/helpers.py
+++ b/rhodecode/lib/helpers.py
@@ -25,6 +25,7 @@ Consists of functions to typically be used within templates, but also
 available to Controllers. This module is available to both as 'h'.
 """
 import base64
+import collections
 
 import os
 import random
@@ -1733,7 +1734,7 @@ def process_patterns(text_string, repo_name, link_format='html', active_entries=
 
 
 def urlify_commit_message(commit_text, repository=None, active_pattern_entries=None,
-                          issues_container=None, error_container=None):
+                          issues_container_callback=None, error_container=None):
     """
     Parses given text message and makes proper links.
     issues are linked to given issue-server, and rest is a commit link
@@ -1756,8 +1757,9 @@ def urlify_commit_message(commit_text, repository=None, active_pattern_entries=N
     new_text, issues, errors = process_patterns(
         new_text, repository or '', active_entries=active_pattern_entries)
 
-    if issues_container is not None:
-        issues_container.extend(issues)
+    if issues_container_callback is not None:
+        for issue in issues:
+            issues_container_callback(issue)
 
     if error_container is not None:
         error_container.extend(errors)
@@ -1802,7 +1804,7 @@ def renderer_from_filename(filename, exclude=None):
 
 
 def render(source, renderer='rst', mentions=False, relative_urls=None,
-           repo_name=None, active_pattern_entries=None, issues_container=None):
+           repo_name=None, active_pattern_entries=None, issues_container_callback=None):
 
     def maybe_convert_relative_links(html_source):
         if relative_urls:
@@ -1819,8 +1821,9 @@ def render(source, renderer='rst', mentions=False, relative_urls=None,
             source, issues, errors = process_patterns(
                 source, repo_name, link_format='rst',
                 active_entries=active_pattern_entries)
-            if issues_container is not None:
-                issues_container.extend(issues)
+            if issues_container_callback is not None:
+                for issue in issues:
+                    issues_container_callback(issue)
 
         return literal(
             '<div class="rst-block">%s</div>' %
@@ -1833,8 +1836,10 @@ def render(source, renderer='rst', mentions=False, relative_urls=None,
             source, issues, errors = process_patterns(
                 source, repo_name, link_format='markdown',
                 active_entries=active_pattern_entries)
-            if issues_container is not None:
-                issues_container.extend(issues)
+            if issues_container_callback is not None:
+                for issue in issues:
+                    issues_container_callback(issue)
+
 
         return literal(
             '<div class="markdown-block">%s</div>' %
@@ -2115,3 +2120,29 @@ def is_active(menu_entry, selected):
 
     if selected in menu_entry:
         return "active"
+
+
+class IssuesRegistry(object):
+    """
+    issue_registry = IssuesRegistry()
+    some_func(issues_callback=issues_registry(...))
+    """
+
+    def __init__(self):
+        self.issues = []
+        self.unique_issues = collections.defaultdict(lambda: [])
+
+    def __call__(self, commit_dict=None):
+        def callback(issue):
+            if commit_dict and issue:
+                issue['commit'] = commit_dict
+            self.issues.append(issue)
+            self.unique_issues[issue['id']].append(issue)
+        return callback
+
+    def get_issues(self):
+        return self.issues
+
+    @property
+    def issues_unique_count(self):
+        return len(set(i['id'] for i in self.issues))
diff --git a/rhodecode/templates/compare/compare_commits.mako b/rhodecode/templates/compare/compare_commits.mako
index fe0338a6..e13dbb90 100644
--- a/rhodecode/templates/compare/compare_commits.mako
+++ b/rhodecode/templates/compare/compare_commits.mako
@@ -24,7 +24,7 @@
     ## to speed up lookups cache some functions before the loop
     <%
         active_patterns = h.get_active_pattern_entries(c.repo_name)
-        urlify_commit_message = h.partial(h.urlify_commit_message, active_pattern_entries=active_patterns, issues_container=getattr(c, 'referenced_commit_issues', None))
+        urlify_commit_message = h.partial(h.urlify_commit_message, active_pattern_entries=active_patterns)
     %>
 
     %for commit in c.commit_ranges:
@@ -57,7 +57,7 @@
             </td>
             <td class="mid td-description">
                 <div class="log-container truncate-wrap">
-                    <div class="message truncate" id="c-${commit.raw_id}" data-message-raw="${commit.message}">${urlify_commit_message(commit.message, c.repo_name)}</div>
+                    <div class="message truncate" id="c-${commit.raw_id}" data-message-raw="${commit.message}">${urlify_commit_message(commit.message, c.repo_name, issues_container_callback=getattr(c, 'referenced_commit_issues', lambda p:p)(commit.serialize()))}</div>
                 </div>
             </td>
         </tr>
diff --git a/rhodecode/templates/pullrequests/pullrequest_show.mako b/rhodecode/templates/pullrequests/pullrequest_show.mako
index b171588e..723cd864 100644
--- a/rhodecode/templates/pullrequests/pullrequest_show.mako
+++ b/rhodecode/templates/pullrequests/pullrequest_show.mako
@@ -27,8 +27,8 @@
 <%def name="main()">
 ## Container to gather extracted Tickets
 <%
-    c.referenced_commit_issues = []
-    c.referenced_desc_issues = []
+    c.referenced_commit_issues = h.IssuesRegistry()
+    c.referenced_desc_issues = h.IssuesRegistry()
 %>
 
 <script type="text/javascript">
@@ -86,7 +86,7 @@
     </div>
 
     <div id="pr-desc" class="input" title="${_('Rendered using {} renderer').format(c.renderer)}">
-        ${h.render(c.pull_request.description, renderer=c.renderer, repo_name=c.repo_name, issues_container=c.referenced_desc_issues)}
+        ${h.render(c.pull_request.description, renderer=c.renderer, repo_name=c.repo_name, issues_container_callback=c.referenced_desc_issues())}
     </div>
 
     <div id="pr-desc-edit" class="input textarea" style="display: none;">
@@ -435,7 +435,7 @@
                                 </td>
                                 <td class="mid td-description">
                                     <div class="log-container truncate-wrap">
-                                        <div class="message truncate" id="c-${commit.raw_id}" data-message-raw="${commit.message}">${h.urlify_commit_message(commit.message, c.repo_name, issues_container=c.referenced_commit_issues)}</div>
+                                        <div class="message truncate" id="c-${commit.raw_id}" data-message-raw="${commit.message}">${h.urlify_commit_message(commit.message, c.repo_name, issues_container_callback=c.referenced_commit_issues(commit.serialize()))}</div>
                                     </div>
                                 </td>
                             </tr>
@@ -809,7 +809,7 @@
             <div class="sidebar-element clear-both">
                 <div class="tooltip right-sidebar-collapsed-state" style="display: none" onclick="toggleSidebar(); return false" title="${_('Referenced Tickets')}">
                     <i class="icon-info-circled"></i>
-                    ${(len(c.referenced_desc_issues) + len(c.referenced_commit_issues))}
+                    ${(c.referenced_desc_issues.issues_unique_count + c.referenced_commit_issues.issues_unique_count)}
                 </div>
 
                 <div class="right-sidebar-expanded-state pr-details-title">
@@ -822,15 +822,17 @@
                     <table>
 
                         <tr><td><code>${_('In pull request description')}:</code></td></tr>
-                        % if c.referenced_desc_issues:
-                            % for ticket_dict in sorted(c.referenced_desc_issues):
+                        % if c.referenced_desc_issues.issues:
+
+                            % for ticket_id, ticket_dict in c.referenced_desc_issues.unique_issues.items():
                             <tr>
                                 <td>
-                                    <a href="${ticket_dict.get('url')}">
-                                    ${ticket_dict.get('id')}
+                                    <a href="${ticket_dict[0].get('url')}">
+                                    ${ticket_id}
                                     </a>
                                 </td>
                             </tr>
+
                             % endfor
                         % else:
                             <tr>
@@ -841,13 +843,14 @@
                         % endif
 
                         <tr><td style="padding-top: 10px"><code>${_('In commit messages')}:</code></td></tr>
-                        % if c.referenced_commit_issues:
-                            % for ticket_dict in sorted(c.referenced_commit_issues):
+                        % if c.referenced_commit_issues.issues:
+                            % for ticket_id, ticket_dict in c.referenced_commit_issues.unique_issues.items():
                             <tr>
                                 <td>
-                                    <a href="${ticket_dict.get('url')}">
-                                    ${ticket_dict.get('id')}
+                                    <a href="${ticket_dict[0].get('url')}">
+                                    ${ticket_id}
                                     </a>
+                                    - ${_ungettext('in %s commit', 'in %s commits', len(ticket_dict)) % (len(ticket_dict))}
                                 </td>
                             </tr>
                             % endfor

From efa29d89da6609fe4fa41380605b58e918b9489f Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Thu, 11 Mar 2021 22:34:32 +0100
Subject: [PATCH 09/28] build: fix rhodecode-tools for docker builds

---
 pkgs/patches/rhodecode_tools/setuptools.patch | 12 ++++++++++++
 pkgs/python-packages-overrides.nix            |  6 ++++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/patches/rhodecode_tools/setuptools.patch

diff --git a/pkgs/patches/rhodecode_tools/setuptools.patch b/pkgs/patches/rhodecode_tools/setuptools.patch
new file mode 100644
index 00000000..5cb09ff1
--- /dev/null
+++ b/pkgs/patches/rhodecode_tools/setuptools.patch
@@ -0,0 +1,12 @@
+diff -rup rhodecode-tools-1.4.0-orig/setup.py rhodecode-tools-1.4.0/setup.py
+--- rhodecode-tools-1.4.0/setup-orig.py	2021-03-11 12:34:45.000000000 +0100
++++ rhodecode-tools-1.4.0/setup.py	2021-03-11 12:34:56.000000000 +0100
+@@ -69,7 +69,7 @@ def _get_requirements(req_filename, excl
+
+
+ # requirements extract
+-setup_requirements = ['pytest-runner']
++setup_requirements = ['pytest-runner==5.1.0']
+ install_requirements = _get_requirements(
+     'requirements.txt', exclude=['setuptools'])
+ test_requirements = _get_requirements('requirements_test.txt')
\ No newline at end of file
diff --git a/pkgs/python-packages-overrides.nix b/pkgs/python-packages-overrides.nix
index 01a1e1e1..947c78e4 100644
--- a/pkgs/python-packages-overrides.nix
+++ b/pkgs/python-packages-overrides.nix
@@ -292,6 +292,12 @@ self: super: {
     ];
   });
 
+  "rhodecode-tools" = super."rhodecode-tools".override (attrs: {
+    patches = [
+      ./patches/rhodecode_tools/setuptools.patch
+    ];
+  });
+
   # Avoid that base packages screw up the build process
   inherit (basePythonPackages)
     setuptools;

From a801004fc798c824713ce028450714c5c9bb8bd1 Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Tue, 16 Mar 2021 12:19:15 +0100
Subject: [PATCH 10/28] pull-requests: fixed some xss problems with odd
 filenames.

---
 rhodecode/public/js/src/rhodecode/comments.js    | 2 +-
 rhodecode/templates/ejs_templates/templates.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rhodecode/public/js/src/rhodecode/comments.js b/rhodecode/public/js/src/rhodecode/comments.js
index 6138be41..90ed8b9c 100644
--- a/rhodecode/public/js/src/rhodecode/comments.js
+++ b/rhodecode/public/js/src/rhodecode/comments.js
@@ -1331,7 +1331,7 @@ var CommentsController = function() {
 
           // There aren't any comments, we init the `.inline-comments` with `reply-thread-container` first
           if ($comments.length===0) {
-            var replBtn = '<button class="cb-comment-add-button" onclick="return Rhodecode.comments.createComment(this, \'{0}\', \'{1}\', null)">Reply...</button>'.format(f_path, line_no)
+            var replBtn = '<button class="cb-comment-add-button" onclick="return Rhodecode.comments.createComment(this, \'{0}\', \'{1}\', null)">Reply...</button>'.format(escapeHtml(f_path), line_no)
             var $reply_container = $('#cb-comments-inline-container-template')
             $reply_container.find('button.cb-comment-add-button').replaceWith(replBtn);
             $td.append($($reply_container).html());
diff --git a/rhodecode/templates/ejs_templates/templates.html b/rhodecode/templates/ejs_templates/templates.html
index 74881e33..18d2face 100644
--- a/rhodecode/templates/ejs_templates/templates.html
+++ b/rhodecode/templates/ejs_templates/templates.html
@@ -221,7 +221,7 @@ if (show_disabled) {
                 <%= version_info %>
             <% } %>
             <br/>
-            File: <code><%- file_name -%></code>
+            File: <code><%= file_name -%></code>
         <% } else { %>
             <% if (review_status) { %>
                 <i class="icon-circle review-status-<%= review_status %>"></i>

From 2cc353de2c0248054720e775d7b540bd25a0da81 Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Tue, 16 Mar 2021 23:18:52 +0100
Subject: [PATCH 11/28] backends: use reference explicitly to properly
 translate GIT references to commits such as numeric branches

---
 rhodecode/lib/utils2.py                      |  5 +++--
 rhodecode/lib/vcs/backends/base.py           |  6 +++++-
 rhodecode/lib/vcs/backends/git/repository.py | 21 ++++++++++++++------
 rhodecode/lib/vcs/backends/hg/repository.py  |  2 +-
 rhodecode/lib/vcs/backends/svn/repository.py |  2 +-
 rhodecode/model/db.py                        |  4 ++--
 rhodecode/model/pull_request.py              |  6 ++++--
 7 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/rhodecode/lib/utils2.py b/rhodecode/lib/utils2.py
index d0acae8d..35e64b79 100644
--- a/rhodecode/lib/utils2.py
+++ b/rhodecode/lib/utils2.py
@@ -655,7 +655,7 @@ def get_clone_url(request, uri_tmpl, repo_name, repo_id, repo_type, **override):
 
 
 def get_commit_safe(repo, commit_id=None, commit_idx=None, pre_load=None,
-                    maybe_unreachable=False):
+                    maybe_unreachable=False, reference_obj=None):
     """
     Safe version of get_commit if this commit doesn't exists for a
     repository it returns a Dummy one instead
@@ -665,6 +665,7 @@ def get_commit_safe(repo, commit_id=None, commit_idx=None, pre_load=None,
     :param commit_idx: numeric commit index
     :param pre_load: optional list of commit attributes to load
     :param maybe_unreachable: translate unreachable commits on git repos
+    :param reference_obj: explicitly search via a reference obj in git. E.g "branch:123" would mean branch "123"
     """
     # TODO(skreft): remove these circular imports
     from rhodecode.lib.vcs.backends.base import BaseRepository, EmptyCommit
@@ -676,7 +677,7 @@ def get_commit_safe(repo, commit_id=None, commit_idx=None, pre_load=None,
     try:
         commit = repo.get_commit(
             commit_id=commit_id, commit_idx=commit_idx, pre_load=pre_load,
-            maybe_unreachable=maybe_unreachable)
+            maybe_unreachable=maybe_unreachable, reference_obj=reference_obj)
     except (RepositoryError, LookupError):
         commit = EmptyCommit()
     return commit
diff --git a/rhodecode/lib/vcs/backends/base.py b/rhodecode/lib/vcs/backends/base.py
index a6165db0..2cd0b700 100644
--- a/rhodecode/lib/vcs/backends/base.py
+++ b/rhodecode/lib/vcs/backends/base.py
@@ -72,6 +72,10 @@ class Reference(_Reference):
         if self.type == 'book':
             return self.name
 
+    @property
+    def to_unicode(self):
+        return reference_to_unicode(self)
+
 
 def unicode_to_reference(raw):
     """
@@ -483,7 +487,7 @@ class BaseRepository(object):
         self._is_empty = False
 
     def get_commit(self, commit_id=None, commit_idx=None, pre_load=None,
-                   translate_tag=None, maybe_unreachable=False):
+                   translate_tag=None, maybe_unreachable=False, reference_obj=None):
         """
         Returns instance of `BaseCommit` class. If `commit_id` and `commit_idx`
         are both None, most recent commit is returned.
diff --git a/rhodecode/lib/vcs/backends/git/repository.py b/rhodecode/lib/vcs/backends/git/repository.py
index 9b63624c..6772dc43 100644
--- a/rhodecode/lib/vcs/backends/git/repository.py
+++ b/rhodecode/lib/vcs/backends/git/repository.py
@@ -228,7 +228,8 @@ class GitRepository(BaseRepository):
             return []
         return output.splitlines()
 
-    def _lookup_commit(self, commit_id_or_idx, translate_tag=True, maybe_unreachable=False):
+    def _lookup_commit(self, commit_id_or_idx, translate_tag=True, maybe_unreachable=False, reference_obj=None):
+
         def is_null(value):
             return len(value) == commit_id_or_idx.count('0')
 
@@ -239,15 +240,20 @@ class GitRepository(BaseRepository):
             *map(safe_str, [commit_id_or_idx, self.name]))
 
         is_bstr = isinstance(commit_id_or_idx, (str, unicode))
-        if ((is_bstr and commit_id_or_idx.isdigit() and len(commit_id_or_idx) < 12)
-            or isinstance(commit_id_or_idx, int) or is_null(commit_id_or_idx)):
+        is_branch = reference_obj and reference_obj.branch
+        is_numeric_idx = \
+            (is_bstr and commit_id_or_idx.isdigit() and len(commit_id_or_idx) < 12) \
+            or isinstance(commit_id_or_idx, int)
+
+        if not is_branch and (is_numeric_idx or is_null(commit_id_or_idx)):
             try:
                 commit_id_or_idx = self.commit_ids[int(commit_id_or_idx)]
             except Exception:
                 raise CommitDoesNotExistError(commit_missing_err)
 
         elif is_bstr:
-            # Need to call remote to translate id for tagging scenario
+            # Need to call remote to translate id for tagging scenarios,
+            # or branch that are numeric
             try:
                 remote_data = self._remote.get_object(commit_id_or_idx,
                                                       maybe_unreachable=maybe_unreachable)
@@ -413,11 +419,12 @@ class GitRepository(BaseRepository):
             return
 
     def get_commit(self, commit_id=None, commit_idx=None, pre_load=None,
-                   translate_tag=True, maybe_unreachable=False):
+                   translate_tag=True, maybe_unreachable=False, reference_obj=None):
         """
         Returns `GitCommit` object representing commit from git repository
         at the given `commit_id` or head (most recent commit) if None given.
         """
+
         if self.is_empty():
             raise EmptyRepositoryError("There are no commits yet")
 
@@ -443,7 +450,9 @@ class GitRepository(BaseRepository):
             commit_id = "tip"
 
         if translate_tag:
-            commit_id = self._lookup_commit(commit_id, maybe_unreachable=maybe_unreachable)
+            commit_id = self._lookup_commit(
+                commit_id, maybe_unreachable=maybe_unreachable,
+                reference_obj=reference_obj)
 
         try:
             idx = self._commit_ids[commit_id]
diff --git a/rhodecode/lib/vcs/backends/hg/repository.py b/rhodecode/lib/vcs/backends/hg/repository.py
index 040fe80c..2e6e3a21 100644
--- a/rhodecode/lib/vcs/backends/hg/repository.py
+++ b/rhodecode/lib/vcs/backends/hg/repository.py
@@ -437,7 +437,7 @@ class MercurialRepository(BaseRepository):
         return os.path.join(self.path, '.hg', '.hgrc')
 
     def get_commit(self, commit_id=None, commit_idx=None, pre_load=None,
-                   translate_tag=None, maybe_unreachable=False):
+                   translate_tag=None, maybe_unreachable=False, reference_obj=None):
         """
         Returns ``MercurialCommit`` object representing repository's
         commit at the given `commit_id` or `commit_idx`.
diff --git a/rhodecode/lib/vcs/backends/svn/repository.py b/rhodecode/lib/vcs/backends/svn/repository.py
index f34e53ae..1faf9c43 100644
--- a/rhodecode/lib/vcs/backends/svn/repository.py
+++ b/rhodecode/lib/vcs/backends/svn/repository.py
@@ -277,7 +277,7 @@ class SubversionRepository(base.BaseRepository):
         return os.path.join(self.path, 'hooks')
 
     def get_commit(self, commit_id=None, commit_idx=None, pre_load=None,
-                   translate_tag=None, maybe_unreachable=False):
+                   translate_tag=None, maybe_unreachable=False, reference_obj=None):
         if self.is_empty():
             raise EmptyRepositoryError("There are no commits yet")
         if commit_id is not None:
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index 39d5ed82..571c7837 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -2398,10 +2398,10 @@ class Repository(Base, BaseModel):
     # SCM PROPERTIES
     #==========================================================================
 
-    def get_commit(self, commit_id=None, commit_idx=None, pre_load=None, maybe_unreachable=False):
+    def get_commit(self, commit_id=None, commit_idx=None, pre_load=None, maybe_unreachable=False, reference_obj=None):
         return get_commit_safe(
             self.scm_instance(), commit_id, commit_idx, pre_load=pre_load,
-            maybe_unreachable=maybe_unreachable)
+            maybe_unreachable=maybe_unreachable, reference_obj=reference_obj)
 
     def get_changeset(self, rev=None, pre_load=None):
         warnings.warn("Use get_commit", DeprecationWarning)
diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py
index abbc6da4..e56a5ed2 100644
--- a/rhodecode/model/pull_request.py
+++ b/rhodecode/model/pull_request.py
@@ -908,7 +908,8 @@ class PullRequestModel(BaseModel):
 
         try:
             if source_ref_type in self.REF_TYPES:
-                source_commit = source_repo.get_commit(source_ref_name)
+                source_commit = source_repo.get_commit(
+                    source_ref_name, reference_obj=pull_request.source_ref_parts)
             else:
                 source_commit = source_repo.get_commit(source_ref_id)
         except CommitDoesNotExistError:
@@ -922,7 +923,8 @@ class PullRequestModel(BaseModel):
 
         try:
             if target_ref_type in self.REF_TYPES:
-                target_commit = target_repo.get_commit(target_ref_name)
+                target_commit = target_repo.get_commit(
+                    target_ref_name, reference_obj=pull_request.target_ref_parts)
             else:
                 target_commit = target_repo.get_commit(target_ref_id)
         except CommitDoesNotExistError:

From 6a44d04b911859bf4319774a5bb4561314818cc2 Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Wed, 17 Mar 2021 08:15:29 +0100
Subject: [PATCH 12/28] tests: fixed some flacky tests on docker.

---
 rhodecode/apps/ssh_support/tests/test_server_git.py | 4 ++++
 rhodecode/apps/ssh_support/tests/test_server_hg.py  | 1 +
 rhodecode/apps/ssh_support/tests/test_server_svn.py | 3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/rhodecode/apps/ssh_support/tests/test_server_git.py b/rhodecode/apps/ssh_support/tests/test_server_git.py
index 7bd4bc3c..e64948b9 100644
--- a/rhodecode/apps/ssh_support/tests/test_server_git.py
+++ b/rhodecode/apps/ssh_support/tests/test_server_git.py
@@ -19,6 +19,8 @@
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import json
+import os
+
 import mock
 import pytest
 
@@ -107,6 +109,8 @@ class TestGitServer(object):
     def test_run_returns_executes_command(self, git_server):
         server = git_server.create()
         from rhodecode.apps.ssh_support.lib.backends.git import GitTunnelWrapper
+
+        os.environ['SSH_CLIENT'] = '127.0.0.1'
         with mock.patch.object(GitTunnelWrapper, 'create_hooks_env') as _patch:
             _patch.return_value = 0
             with mock.patch.object(GitTunnelWrapper, 'command', return_value='date'):
diff --git a/rhodecode/apps/ssh_support/tests/test_server_hg.py b/rhodecode/apps/ssh_support/tests/test_server_hg.py
index b7273179..c9f9bdc1 100644
--- a/rhodecode/apps/ssh_support/tests/test_server_hg.py
+++ b/rhodecode/apps/ssh_support/tests/test_server_hg.py
@@ -108,6 +108,7 @@ class TestMercurialServer(object):
     def test_run_returns_executes_command(self, hg_server):
         server = hg_server.create()
         from rhodecode.apps.ssh_support.lib.backends.hg import MercurialTunnelWrapper
+        os.environ['SSH_CLIENT'] = '127.0.0.1'
         with mock.patch.object(MercurialTunnelWrapper, 'create_hooks_env') as _patch:
             _patch.return_value = 0
             with mock.patch.object(MercurialTunnelWrapper, 'command', return_value='date'):
diff --git a/rhodecode/apps/ssh_support/tests/test_server_svn.py b/rhodecode/apps/ssh_support/tests/test_server_svn.py
index 4cd4e622..f55f8bad 100644
--- a/rhodecode/apps/ssh_support/tests/test_server_svn.py
+++ b/rhodecode/apps/ssh_support/tests/test_server_svn.py
@@ -17,7 +17,7 @@
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
-
+import os
 import mock
 import pytest
 
@@ -174,6 +174,7 @@ class TestSubversionServer(object):
     def test_run_returns_executes_command(self, svn_server):
         server = svn_server.create()
         from rhodecode.apps.ssh_support.lib.backends.svn import SubversionTunnelWrapper
+        os.environ['SSH_CLIENT'] = '127.0.0.1'
         with mock.patch.object(
                 SubversionTunnelWrapper, 'get_first_client_response',
                 return_value={'url': 'http://server/test-svn'}):

From 3d88792e6b4339f19bcd3672daf7e5595c4ffb46 Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Wed, 17 Mar 2021 17:54:23 +0100
Subject: [PATCH 13/28] core: optimize some calls to skip license/scm detection
 on them

---
 rhodecode/lib/middleware/vcs.py | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/rhodecode/lib/middleware/vcs.py b/rhodecode/lib/middleware/vcs.py
index ca090b2c..55d32a4d 100644
--- a/rhodecode/lib/middleware/vcs.py
+++ b/rhodecode/lib/middleware/vcs.py
@@ -161,15 +161,28 @@ def detect_vcs_request(environ, backends):
     # List of path views first chunk we don't do any checks
     white_list = [
         # e.g /_file_store/download
-        '_file_store'
+        '_file_store',
+
+        # static files no detection
+        '_static',
+
+        # full channelstream connect should be VCS skipped
+        '_admin/channelstream/connect',
     ]
 
     path_info = environ['PATH_INFO']
 
-    if get_path_elem(path_info) in white_list:
+    path_elem = get_path_elem(path_info)
+
+    if path_elem in white_list:
         log.debug('path `%s` in whitelist, skipping...', path_info)
         return handler
 
+    path_url = path_info.lstrip('/')
+    if path_url in white_list:
+        log.debug('full url path `%s` in whitelist, skipping...', path_url)
+        return handler
+
     if VCS_TYPE_KEY in environ:
         raw_type = environ[VCS_TYPE_KEY]
         if raw_type == VCS_TYPE_SKIP:
@@ -181,7 +194,7 @@ def detect_vcs_request(environ, backends):
             log.debug('got handler:%s from environ', handler)
 
     if not handler:
-        log.debug('request start: checking if request is of VCS type in order: %s', backends)
+        log.debug('request start: checking if request for `%s` is of VCS type in order: %s', path_elem, backends)
         for vcs_type in backends:
             vcs_check, _handler = checks[vcs_type]
             if vcs_check(environ):

From 723ccff72e3436535c6d43168e0b3be29adb27ce Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Wed, 17 Mar 2021 17:55:02 +0100
Subject: [PATCH 14/28] git: fix lookups.

- prioritize referenace names over numerical ids
- numerical ids are supported as a fallback if ref matching is unsuccessful.
---
 rhodecode/lib/vcs/backends/git/repository.py | 30 +++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/rhodecode/lib/vcs/backends/git/repository.py b/rhodecode/lib/vcs/backends/git/repository.py
index 6772dc43..2b62d96e 100644
--- a/rhodecode/lib/vcs/backends/git/repository.py
+++ b/rhodecode/lib/vcs/backends/git/repository.py
@@ -241,25 +241,33 @@ class GitRepository(BaseRepository):
 
         is_bstr = isinstance(commit_id_or_idx, (str, unicode))
         is_branch = reference_obj and reference_obj.branch
-        is_numeric_idx = \
-            (is_bstr and commit_id_or_idx.isdigit() and len(commit_id_or_idx) < 12) \
-            or isinstance(commit_id_or_idx, int)
 
-        if not is_branch and (is_numeric_idx or is_null(commit_id_or_idx)):
-            try:
-                commit_id_or_idx = self.commit_ids[int(commit_id_or_idx)]
-            except Exception:
-                raise CommitDoesNotExistError(commit_missing_err)
-
-        elif is_bstr:
+        lookup_ok = False
+        if is_bstr:
             # Need to call remote to translate id for tagging scenarios,
             # or branch that are numeric
             try:
                 remote_data = self._remote.get_object(commit_id_or_idx,
                                                       maybe_unreachable=maybe_unreachable)
                 commit_id_or_idx = remote_data["commit_id"]
+                lookup_ok = True
             except (CommitDoesNotExistError,):
-                raise CommitDoesNotExistError(commit_missing_err)
+                lookup_ok = False
+
+        if lookup_ok is False:
+            is_numeric_idx = \
+                (is_bstr and commit_id_or_idx.isdigit() and len(commit_id_or_idx) < 12) \
+                or isinstance(commit_id_or_idx, int)
+            if not is_branch and (is_numeric_idx or is_null(commit_id_or_idx)):
+                try:
+                    commit_id_or_idx = self.commit_ids[int(commit_id_or_idx)]
+                    lookup_ok = True
+                except Exception:
+                    raise CommitDoesNotExistError(commit_missing_err)
+
+        # we failed regular lookup, and by integer number lookup
+        if lookup_ok is False:
+            raise CommitDoesNotExistError(commit_missing_err)
 
         # Ensure we return full id
         if not SHA_PATTERN.match(str(commit_id_or_idx)):

From dd92a641f8cfe432e2c322bd836181c988e92228 Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Thu, 18 Mar 2021 10:15:54 +0100
Subject: [PATCH 15/28] compare-view: fix referenced commits bug

---
 rhodecode/templates/compare/compare_commits.mako | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rhodecode/templates/compare/compare_commits.mako b/rhodecode/templates/compare/compare_commits.mako
index e13dbb90..33cecd9a 100644
--- a/rhodecode/templates/compare/compare_commits.mako
+++ b/rhodecode/templates/compare/compare_commits.mako
@@ -57,7 +57,7 @@
             </td>
             <td class="mid td-description">
                 <div class="log-container truncate-wrap">
-                    <div class="message truncate" id="c-${commit.raw_id}" data-message-raw="${commit.message}">${urlify_commit_message(commit.message, c.repo_name, issues_container_callback=getattr(c, 'referenced_commit_issues', lambda p:p)(commit.serialize()))}</div>
+                    <div class="message truncate" id="c-${commit.raw_id}" data-message-raw="${commit.message}">${urlify_commit_message(commit.message, c.repo_name, issues_container_callback=getattr(c, 'referenced_commit_issues', h.IssuesRegistry())(commit.serialize()))}</div>
                 </div>
             </td>
         </tr>

From 5891f641fcef906375a0485080ee2b1a4250b88e Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Thu, 18 Mar 2021 13:52:23 +0100
Subject: [PATCH 16/28] miantainance: fixed bad routes def

---
 rhodecode/apps/repository/__init__.py         |  8 +-
 .../tests/test_repo_maintainance.py           | 74 +++++++++++++++++++
 2 files changed, 78 insertions(+), 4 deletions(-)
 create mode 100644 rhodecode/apps/repository/tests/test_repo_maintainance.py

diff --git a/rhodecode/apps/repository/__init__.py b/rhodecode/apps/repository/__init__.py
index b1059837..98437d9b 100644
--- a/rhodecode/apps/repository/__init__.py
+++ b/rhodecode/apps/repository/__init__.py
@@ -950,8 +950,8 @@ def includeme(config):
     config.add_view(
         RepoMaintenanceView,
         attr='repo_maintenance',
-        route_name='edit_repo_maintenance_execute', request_method='GET',
-        renderer='json', xhr=True)
+        route_name='edit_repo_maintenance', request_method='GET',
+        renderer='rhodecode:templates/admin/repos/repo_edit.mako')
 
     config.add_route(
         name='edit_repo_maintenance_execute',
@@ -959,8 +959,8 @@ def includeme(config):
     config.add_view(
         RepoMaintenanceView,
         attr='repo_maintenance_execute',
-        route_name='edit_repo_maintenance', request_method='GET',
-        renderer='rhodecode:templates/admin/repos/repo_edit.mako')
+        route_name='edit_repo_maintenance_execute', request_method='GET',
+        renderer='json', xhr=True)
 
     # Fields
     config.add_route(
diff --git a/rhodecode/apps/repository/tests/test_repo_maintainance.py b/rhodecode/apps/repository/tests/test_repo_maintainance.py
new file mode 100644
index 00000000..ab3404f7
--- /dev/null
+++ b/rhodecode/apps/repository/tests/test_repo_maintainance.py
@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2020 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import mock
+import pytest
+
+from rhodecode.lib.utils2 import str2bool
+from rhodecode.lib.vcs.exceptions import RepositoryRequirementError
+from rhodecode.model.db import Repository, UserRepoToPerm, Permission, User
+from rhodecode.model.meta import Session
+from rhodecode.tests import (
+    TEST_USER_ADMIN_LOGIN, TEST_USER_REGULAR_LOGIN, assert_session_flash)
+from rhodecode.tests.fixture import Fixture
+
+fixture = Fixture()
+
+
+def route_path(name, params=None, **kwargs):
+    import urllib
+
+    base_url = {
+        'edit_repo_maintenance': '/{repo_name}/settings/maintenance',
+        'edit_repo_maintenance_execute': '/{repo_name}/settings/maintenance/execute',
+
+    }[name].format(**kwargs)
+
+    if params:
+        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+    return base_url
+
+
+def _get_permission_for_user(user, repo):
+    perm = UserRepoToPerm.query()\
+        .filter(UserRepoToPerm.repository ==
+                Repository.get_by_repo_name(repo))\
+        .filter(UserRepoToPerm.user == User.get_by_username(user))\
+        .all()
+    return perm
+
+
+@pytest.mark.usefixtures('autologin_user', 'app')
+class TestAdminRepoMaintenance(object):
+    @pytest.mark.parametrize('urlname', [
+        'edit_repo_maintenance',
+    ])
+    def test_show_page(self, urlname, app, backend):
+        app.get(route_path(urlname, repo_name=backend.repo_name), status=200)
+
+    def test_execute_maintenance_for_repo_hg(self, app, backend_hg, autologin_user, xhr_header):
+        repo_name = backend_hg.repo_name
+
+        response = app.get(
+            route_path('edit_repo_maintenance_execute',
+                       repo_name=repo_name,),
+            extra_environ=xhr_header)
+
+        assert "HG Verify repo" in ''.join(response.json)

From c0508d2945103d0fdda810935176cce909737a48 Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Thu, 18 Mar 2021 15:26:51 +0100
Subject: [PATCH 17/28] git: fix for unicode branches

---
 rhodecode/apps/repository/views/repo_changelog.py |  4 ++--
 rhodecode/lib/vcs/backends/git/commit.py          | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/rhodecode/apps/repository/views/repo_changelog.py b/rhodecode/apps/repository/views/repo_changelog.py
index e20aecca..da7c6f8e 100644
--- a/rhodecode/apps/repository/views/repo_changelog.py
+++ b/rhodecode/apps/repository/views/repo_changelog.py
@@ -34,7 +34,7 @@ from rhodecode.lib.auth import (
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.graphmod import _colored, _dagwalker
 from rhodecode.lib.helpers import RepoPage
-from rhodecode.lib.utils2 import safe_int, safe_str, str2bool
+from rhodecode.lib.utils2 import safe_int, safe_str, str2bool, safe_unicode
 from rhodecode.lib.vcs.exceptions import (
     RepositoryError, CommitDoesNotExistError,
     CommitError, NodeDoesNotExistError, EmptyRepositoryError)
@@ -110,7 +110,7 @@ class RepoChangelogView(RepoAppView):
 
     def _check_if_valid_branch(self, branch_name, repo_name, f_path):
         if branch_name not in self.rhodecode_vcs_repo.branches_all:
-            h.flash('Branch {} is not found.'.format(h.escape(branch_name)),
+            h.flash(u'Branch {} is not found.'.format(h.escape(safe_unicode(branch_name))),
                     category='warning')
             redirect_url = h.route_path(
                 'repo_commits_file', repo_name=repo_name,
diff --git a/rhodecode/lib/vcs/backends/git/commit.py b/rhodecode/lib/vcs/backends/git/commit.py
index dd918b01..61445d39 100644
--- a/rhodecode/lib/vcs/backends/git/commit.py
+++ b/rhodecode/lib/vcs/backends/git/commit.py
@@ -98,7 +98,7 @@ class GitCommit(base.BaseCommit):
             elif attr == "parents":
                 value = self._make_commits(value)
             elif attr == "branch":
-                value = value[0] if value else None
+                value = self._set_branch(value)
             self.__dict__[attr] = value
 
     @LazyProperty
@@ -156,14 +156,16 @@ class GitCommit(base.BaseCommit):
                 branches.append(name)
         return branches
 
-    @LazyProperty
-    def branch(self):
-        branches = self._remote.branch(self.raw_id)
-
+    def _set_branch(self, branches):
         if branches:
             # actually commit can have multiple branches in git
             return safe_unicode(branches[0])
 
+    @LazyProperty
+    def branch(self):
+        branches = self._remote.branch(self.raw_id)
+        return self._set_branch(branches)
+
     def _get_tree_id_for_path(self, path):
         path = safe_str(path)
         if path in self._paths:

From 89ee31e1c26a1090c6509b8153748c1751202d76 Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Tue, 23 Mar 2021 14:53:22 +0100
Subject: [PATCH 18/28] core: added patches to support latest problems with
 setuptools scm.

---
 pkgs/patches/configparser/pyproject.patch     | 10 ++++
 .../importlib_metadata/pyproject.patch        |  7 +++
 pkgs/patches/pytest/setuptools.patch          |  2 +-
 pkgs/patches/zipp/pyproject.patch             | 10 ++++
 pkgs/python-packages-overrides.nix            | 48 +++++++++++++++++++
 pkgs/python-packages.nix                      | 11 +++++
 6 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/patches/configparser/pyproject.patch
 create mode 100644 pkgs/patches/importlib_metadata/pyproject.patch
 create mode 100644 pkgs/patches/zipp/pyproject.patch

diff --git a/pkgs/patches/configparser/pyproject.patch b/pkgs/patches/configparser/pyproject.patch
new file mode 100644
index 00000000..72ec725b
--- /dev/null
+++ b/pkgs/patches/configparser/pyproject.patch
@@ -0,0 +1,10 @@
+diff -rup configparser-4.0.2-orig/pyproject.toml configparser-4.0.2/pyproject.toml
+--- configparser-4.0.2-orig/pyproject.toml 2021-03-22 21:28:11.000000000 +0100
++++ configparser-4.0.2/pyproject.toml 2021-03-22 21:28:11.000000000 +0100
+@@ -1,5 +1,5 @@
+ [build-system]
+-requires = ["setuptools>=40.7", "wheel", "setuptools_scm>=1.15"]
++requires = ["setuptools<=42.0", "wheel", "setuptools_scm<6.0.0"]
+ build-backend = "setuptools.build_meta"
+
+ [tool.black]
diff --git a/pkgs/patches/importlib_metadata/pyproject.patch b/pkgs/patches/importlib_metadata/pyproject.patch
new file mode 100644
index 00000000..b7c66647
--- /dev/null
+++ b/pkgs/patches/importlib_metadata/pyproject.patch
@@ -0,0 +1,7 @@
+diff -rup importlib-metadata-1.6.0-orig/yproject.toml importlib-metadata-1.6.0/pyproject.toml
+--- importlib-metadata-1.6.0-orig/yproject.toml	2021-03-22 22:10:33.000000000 +0100
++++ importlib-metadata-1.6.0/pyproject.toml	2021-03-22 22:11:09.000000000 +0100
+@@ -1,3 +1,3 @@
+ [build-system]
+-requires = ["setuptools>=30.3", "wheel", "setuptools_scm"]
++requires = ["setuptools<42.0", "wheel", "setuptools_scm<6.0.0"]
diff --git a/pkgs/patches/pytest/setuptools.patch b/pkgs/patches/pytest/setuptools.patch
index 755a8009..2bad9cdb 100644
--- a/pkgs/patches/pytest/setuptools.patch
+++ b/pkgs/patches/pytest/setuptools.patch
@@ -6,7 +6,7 @@ diff -rup pytest-4.6.5-orig/setup.py pytest-4.6.5/setup.py
      setup(
          use_scm_version={"write_to": "src/_pytest/_version.py"},
 -        setup_requires=["setuptools-scm", "setuptools>=40.0"],
-+        setup_requires=["setuptools-scm", "setuptools<=42.0"],
++        setup_requires=["setuptools-scm<6.0.0", "setuptools<=42.0"],
          package_dir={"": "src"},
          # fmt: off
          extras_require={
\ No newline at end of file
diff --git a/pkgs/patches/zipp/pyproject.patch b/pkgs/patches/zipp/pyproject.patch
new file mode 100644
index 00000000..47590ad1
--- /dev/null
+++ b/pkgs/patches/zipp/pyproject.patch
@@ -0,0 +1,10 @@
+diff -rup zip-1.2.0-orig/pyproject.toml zip-1.2.0/pyproject.toml
+--- zip-1.2.0-orig/pyproject.toml	2021-03-23 10:55:37.000000000 +0100
++++ zip-1.2.0/pyproject.toml	2021-03-23 10:56:05.000000000 +0100
+@@ -1,5 +1,5 @@
+ [build-system]
+-requires = ["setuptools>=34.4", "wheel", "setuptools_scm>=1.15"]
++requires = ["setuptools<42.0", "wheel", "setuptools_scm<6.0.0"]
+ build-backend = "setuptools.build_meta"
+
+ [tool.black]
diff --git a/pkgs/python-packages-overrides.nix b/pkgs/python-packages-overrides.nix
index 947c78e4..bfc7641a 100644
--- a/pkgs/python-packages-overrides.nix
+++ b/pkgs/python-packages-overrides.nix
@@ -280,6 +280,54 @@ self: super: {
     ];
   });
 
+  "pytest-runner" = super."pytest-runner".override (attrs: {
+    propagatedBuildInputs = [
+      self."setuptools-scm"
+    ];
+  });
+
+  "py" = super."py".override (attrs: {
+    propagatedBuildInputs = [
+      self."setuptools-scm"
+    ];
+  });
+
+  "python-dateutil" = super."python-dateutil".override (attrs: {
+    propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+      self."setuptools-scm"
+    ];
+  });
+
+  "configparser" = super."configparser".override (attrs: {
+    patches = [
+      ./patches/configparser/pyproject.patch
+    ];
+    propagatedBuildInputs = [
+      self."setuptools-scm"
+    ];
+  });
+
+  "importlib-metadata" = super."importlib-metadata".override (attrs: {
+
+    patches = [
+      ./patches/importlib_metadata/pyproject.patch
+    ];
+
+    propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+      self."setuptools-scm"
+    ];
+
+  });
+
+  "zipp" = super."zipp".override (attrs: {
+    patches = [
+      ./patches/zipp/pyproject.patch
+    ];
+    propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
+      self."setuptools-scm"
+    ];
+  });
+
   "pyramid-apispec" = super."pyramid-apispec".override (attrs: {
     patches = [
       ./patches/pyramid_apispec/setuptools.patch
diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix
index 490ce273..0ca95b54 100644
--- a/pkgs/python-packages.nix
+++ b/pkgs/python-packages.nix
@@ -2092,6 +2092,17 @@ self: super: {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
+  "setuptools-scm" = super.buildPythonPackage {
+    name = "setuptools-scm-3.5.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/b2/f7/60a645aae001a2e06cf4b8db2fba9d9f36b8fd378f10647e3e218b61b74b/setuptools_scm-3.5.0.tar.gz";
+      sha256 = "5bdf21a05792903cafe7ae0c9501182ab52497614fa6b1750d9dbae7b60c1a87";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.psfl ];
+    };
+  };
   "simplegeneric" = super.buildPythonPackage {
     name = "simplegeneric-0.8.1";
     doCheck = false;

From c0254f795273332aed61663b6caa60928edc1c95 Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Tue, 23 Mar 2021 21:43:02 +0100
Subject: [PATCH 19/28] artifacts: added admin panel to manage all artifacts in
 an instance.

---
 rhodecode/apps/file_store/backends/local_store.py | 5 +++--
 rhodecode/public/js/rhodecode/routes.js           | 6 ++++++
 rhodecode/templates/base/base.mako                | 1 +
 rhodecode/templates/data_table/_dt_elements.mako  | 7 +++++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/rhodecode/apps/file_store/backends/local_store.py b/rhodecode/apps/file_store/backends/local_store.py
index 62809155..a5ae16e7 100755
--- a/rhodecode/apps/file_store/backends/local_store.py
+++ b/rhodecode/apps/file_store/backends/local_store.py
@@ -255,7 +255,7 @@ class LocalFileStorage(object):
 
         return filename, metadata
 
-    def get_metadata(self, filename):
+    def get_metadata(self, filename, ignore_missing=False):
         """
         Reads JSON stored metadata for a file
 
@@ -264,6 +264,7 @@ class LocalFileStorage(object):
         """
         filename = self.store_path(filename)
         filename_meta = filename + '.meta'
-
+        if ignore_missing and not os.path.isfile(filename_meta):
+            return {}
         with open(filename_meta, "rb") as source_meta:
             return json.loads(source_meta.read())
diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js
index 18e5a375..a7fba8fc 100644
--- a/rhodecode/public/js/rhodecode/routes.js
+++ b/rhodecode/public/js/rhodecode/routes.js
@@ -12,6 +12,12 @@
  ******************************************************************************/
 function registerRCRoutes() {
     // routes registration
+    pyroutes.register('admin_artifacts', '/_admin/artifacts', []);
+    pyroutes.register('admin_artifacts_data', '/_admin/artifacts-data', []);
+    pyroutes.register('admin_artifacts_delete', '/_admin/artifacts/%(uid)s/delete', ['uid']);
+    pyroutes.register('admin_artifacts_show_all', '/_admin/artifacts', []);
+    pyroutes.register('admin_artifacts_show_info', '/_admin/artifacts/%(uid)s', ['uid']);
+    pyroutes.register('admin_artifacts_update', '/_admin/artifacts/%(uid)s/update', ['uid']);
     pyroutes.register('admin_audit_log_entry', '/_admin/audit_logs/%(audit_log_id)s', ['audit_log_id']);
     pyroutes.register('admin_audit_logs', '/_admin/audit_logs', []);
     pyroutes.register('admin_defaults_repositories', '/_admin/defaults/repositories', []);
diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako
index aa1bb8f6..7ed0a81f 100644
--- a/rhodecode/templates/base/base.mako
+++ b/rhodecode/templates/base/base.mako
@@ -115,6 +115,7 @@
           <li class="${h.is_active('repository_groups', active)}"><a href="${h.route_path('repo_groups')}">${_('Repository groups')}</a></li>
           <li class="${h.is_active('users', active)}"><a href="${h.route_path('users')}">${_('Users')}</a></li>
           <li class="${h.is_active('user_groups', active)}"><a href="${h.route_path('user_groups')}">${_('User groups')}</a></li>
+          <li class="${h.is_active('artifacts', active)}"><a href="${h.route_path('admin_artifacts')}">${_('Artifacts')}</a></li>
           <li class="${h.is_active('permissions', active)}"><a href="${h.route_path('admin_permissions_application')}">${_('Permissions')}</a></li>
           <li class="${h.is_active('authentication', active)}"><a href="${h.route_path('auth_home', traverse='')}">${_('Authentication')}</a></li>
           <li class="${h.is_active('integrations', active)}"><a href="${h.route_path('global_integrations_home')}">${_('Integrations')}</a></li>
diff --git a/rhodecode/templates/data_table/_dt_elements.mako b/rhodecode/templates/data_table/_dt_elements.mako
index 41751ad4..b2ba41e5 100644
--- a/rhodecode/templates/data_table/_dt_elements.mako
+++ b/rhodecode/templates/data_table/_dt_elements.mako
@@ -416,6 +416,12 @@ ${h.style_metatag(tag_type, tag)|n,trim}
     </a>
 </%def>
 
+<%def name="repo_artifact_admin_name(file_uid, artifact_display_name)">
+    <a href="${h.route_path('admin_artifacts_show_info', uid=file_uid)}">
+        ${(artifact_display_name or '_EMPTY_NAME_')}
+    </a>
+</%def>
+
 <%def name="repo_artifact_uid(repo_name, file_uid)">
     <code>${h.shorter(file_uid, size=24, prefix=True)}</code>
 </%def>
@@ -443,6 +449,7 @@ ${h.style_metatag(tag_type, tag)|n,trim}
 % endif
 </%def>
 
+
 <%def name="markup_form(form_id, form_text='', help_text=None)">
 
   <div class="markup-form">

From ae9f4779d2524187c0010ea5941fdc2edf1d920a Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Wed, 24 Mar 2021 14:54:26 +0100
Subject: [PATCH 20/28] permissions: flush permissions on owner changes for
 repo and repo groups.

---
 rhodecode/model/repo.py       | 13 ++++++++++++-
 rhodecode/model/repo_group.py | 12 +++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py
index f98d7517..87b21560 100644
--- a/rhodecode/model/repo.py
+++ b/rhodecode/model/repo.py
@@ -46,6 +46,7 @@ from rhodecode.model.db import (
     Session, Repository, UserRepoToPerm, UserGroupRepoToPerm,
     UserRepoGroupToPerm, UserGroupRepoGroupToPerm, User, Permission,
     Statistics, UserGroup, RepoGroup, RepositoryField, UserLog)
+from rhodecode.model.permission import PermissionModel
 from rhodecode.model.settings import VcsSettingsModel
 
 log = logging.getLogger(__name__)
@@ -422,8 +423,15 @@ class RepoModel(BaseModel):
         try:
             cur_repo = self._get_repo(repo)
             source_repo_name = cur_repo.repo_name
+
+            affected_user_ids = []
             if 'user' in kwargs:
-                cur_repo.user = User.get_by_username(kwargs['user'])
+                old_owner_id = cur_repo.user.user_id
+                new_owner = User.get_by_username(kwargs['user'])
+                cur_repo.user = new_owner
+
+                if old_owner_id != new_owner.user_id:
+                    affected_user_ids = [new_owner.user_id, old_owner_id]
 
             if 'repo_group' in kwargs:
                 cur_repo.group = RepoGroup.get(kwargs['repo_group'])
@@ -474,6 +482,9 @@ class RepoModel(BaseModel):
                 self._rename_filesystem_repo(
                     old=source_repo_name, new=new_name)
 
+            if affected_user_ids:
+                PermissionModel().trigger_permission_flush(affected_user_ids)
+
             return cur_repo
         except Exception:
             log.error(traceback.format_exc())
diff --git a/rhodecode/model/repo_group.py b/rhodecode/model/repo_group.py
index 25c00d31..f7bf9e37 100644
--- a/rhodecode/model/repo_group.py
+++ b/rhodecode/model/repo_group.py
@@ -39,6 +39,7 @@ from rhodecode.model import BaseModel
 from rhodecode.model.db import (_hash_key, func, or_, in_filter_generator,
     Session, RepoGroup, UserRepoGroupToPerm, User, Permission, UserGroupRepoGroupToPerm,
     UserGroup, Repository)
+from rhodecode.model.permission import PermissionModel
 from rhodecode.model.settings import VcsSettingsModel, SettingsModel
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.lib.utils2 import action_logger_generic
@@ -531,8 +532,14 @@ class RepoGroupModel(BaseModel):
 
             new_path = repo_group.full_path
 
+            affected_user_ids = []
             if 'user' in form_data:
-                repo_group.user = User.get_by_username(form_data['user'])
+                old_owner_id = repo_group.user.user_id
+                new_owner = User.get_by_username(form_data['user'])
+                repo_group.user = new_owner
+
+                if old_owner_id != new_owner.user_id:
+                    affected_user_ids = [new_owner.user_id, old_owner_id]
 
             self.sa.add(repo_group)
 
@@ -566,6 +573,9 @@ class RepoGroupModel(BaseModel):
             # Trigger update event.
             events.trigger(events.RepoGroupUpdateEvent(repo_group))
 
+            if affected_user_ids:
+                PermissionModel().trigger_permission_flush(affected_user_ids)
+
             return repo_group
         except Exception:
             log.error(traceback.format_exc())

From 219a05baa4c9112ce3f759976ac7255b4f4b0257 Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Wed, 24 Mar 2021 16:52:47 +0100
Subject: [PATCH 21/28] permissions: use constant for fork enable/disable

---
 rhodecode/api/views/repo_api.py               | 2 +-
 rhodecode/apps/repository/views/repo_forks.py | 4 ++--
 rhodecode/lib/auth.py                         | 4 +++-
 rhodecode/model/permission.py                 | 6 ++++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/rhodecode/api/views/repo_api.py b/rhodecode/api/views/repo_api.py
index 7906d219..ead03c35 100644
--- a/rhodecode/api/views/repo_api.py
+++ b/rhodecode/api/views/repo_api.py
@@ -1212,7 +1212,7 @@ def fork_repo(request, apiuser, repoid, fork_name,
         validate_repo_permissions(apiuser, repoid, repo, _perms)
 
         # check if the regular user has at least fork permissions as well
-        if not HasPermissionAnyApi('hg.fork.repository')(user=apiuser):
+        if not HasPermissionAnyApi(PermissionModel.FORKING_ENABLED)(user=apiuser):
             raise JSONRPCForbidden()
 
     # check if user can set owner parameter
diff --git a/rhodecode/apps/repository/views/repo_forks.py b/rhodecode/apps/repository/views/repo_forks.py
index 319d3cf4..1c2c8f0f 100644
--- a/rhodecode/apps/repository/views/repo_forks.py
+++ b/rhodecode/apps/repository/views/repo_forks.py
@@ -165,7 +165,7 @@ class RepoForksView(RepoAppView, DataGridAppView):
 
     @LoginRequired()
     @NotAnonymous()
-    @HasPermissionAnyDecorator('hg.admin', 'hg.fork.repository')
+    @HasPermissionAnyDecorator('hg.admin', PermissionModel.FORKING_ENABLED)
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     def repo_fork_new(self):
@@ -191,7 +191,7 @@ class RepoForksView(RepoAppView, DataGridAppView):
 
     @LoginRequired()
     @NotAnonymous()
-    @HasPermissionAnyDecorator('hg.admin', 'hg.fork.repository')
+    @HasPermissionAnyDecorator('hg.admin', PermissionModel.FORKING_ENABLED)
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @CSRFRequired()
diff --git a/rhodecode/lib/auth.py b/rhodecode/lib/auth.py
index 7700b343..c667f836 100644
--- a/rhodecode/lib/auth.py
+++ b/rhodecode/lib/auth.py
@@ -524,8 +524,10 @@ class PermissionCalculator(object):
 
         # In case we want to extend this list we should make sure
         # this is in sync with User.DEFAULT_USER_PERMISSIONS definitions
+        from rhodecode.model.permission import PermissionModel
+
         _configurable = frozenset([
-            'hg.fork.none', 'hg.fork.repository',
+            PermissionModel.FORKING_DISABLED, PermissionModel.FORKING_ENABLED,
             'hg.create.none', 'hg.create.repository',
             'hg.usergroup.create.false', 'hg.usergroup.create.true',
             'hg.repogroup.create.false', 'hg.repogroup.create.true',
diff --git a/rhodecode/model/permission.py b/rhodecode/model/permission.py
index 1e59ec88..93458478 100644
--- a/rhodecode/model/permission.py
+++ b/rhodecode/model/permission.py
@@ -41,6 +41,8 @@ class PermissionModel(BaseModel):
     """
     Permissions model for RhodeCode
     """
+    FORKING_DISABLED = 'hg.fork.none'
+    FORKING_ENABLED = 'hg.fork.repository'
 
     cls = Permission
     global_perms = {
@@ -122,8 +124,8 @@ class PermissionModel(BaseModel):
             ('hg.repogroup.create.true', _('Enabled'))]
 
         c_obj.fork_choices = [
-            ('hg.fork.none', _('Disabled')),
-            ('hg.fork.repository', _('Enabled'))]
+            (self.FORKING_DISABLED, _('Disabled')),
+            (self.FORKING_ENABLED, _('Enabled'))]
 
         c_obj.inherit_default_permission_choices = [
             ('hg.inherit_default_perms.false', _('Disabled')),

From 9be627ad2f3d078b420c4943a2362eeb8f519187 Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Wed, 24 Mar 2021 16:53:08 +0100
Subject: [PATCH 22/28] perms: fixed fork permission help text to reflect the
 actual state on how it works.

---
 rhodecode/templates/base/default_perms_box.mako | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rhodecode/templates/base/default_perms_box.mako b/rhodecode/templates/base/default_perms_box.mako
index 09e5d3c4..17ca53d1 100644
--- a/rhodecode/templates/base/default_perms_box.mako
+++ b/rhodecode/templates/base/default_perms_box.mako
@@ -62,7 +62,7 @@
            <div class="radios">
                ${h.radio('default_fork_create' + suffix, c.fork_choices[1][0], label=c.fork_choices[1][1], **kwargs)}
                ${h.radio('default_fork_create' + suffix, c.fork_choices[0][0], label=c.fork_choices[0][1], **kwargs)}
-               <span class="help-block">${_('Permission to create root level repository forks. When disabled, users can still fork repositories inside their own repository groups.')}</span>
+               <span class="help-block">${_('Permission to create repository forks. Root level forks will only work if repository creation is enabled.')}</span>
            </div>
         </div>
         <div class="field">

From 0ab0b3cbabe16caa2bec672715c415572200acdb Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Thu, 25 Mar 2021 16:24:04 +0100
Subject: [PATCH 23/28] feed: fix errors on feed access of empty repositories.

---
 rhodecode/apps/repository/views/repo_feed.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rhodecode/apps/repository/views/repo_feed.py b/rhodecode/apps/repository/views/repo_feed.py
index 75d917ee..7edabbe4 100644
--- a/rhodecode/apps/repository/views/repo_feed.py
+++ b/rhodecode/apps/repository/views/repo_feed.py
@@ -104,6 +104,9 @@ class RepoFeedView(RepoAppView):
 
     def _get_commits(self):
         pre_load = ['author', 'branch', 'date', 'message', 'parents']
+        if self.rhodecode_vcs_repo.is_empty():
+            return []
+
         collection = self.rhodecode_vcs_repo.get_commits(
             branch_name=None, show_hidden=False, pre_load=pre_load,
             translate_tags=False)
@@ -137,6 +140,7 @@ class RepoFeedView(RepoAppView):
                 language=self.language,
                 ttl=self.ttl
             )
+
             for commit in reversed(self._get_commits()):
                 date = self._set_timezone(commit.date)
                 feed.add_item(

From 1df8822469ec3f47a33c57bb60743bae5e76ee88 Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Thu, 25 Mar 2021 21:46:25 +0100
Subject: [PATCH 24/28] largefiles: added fix for downloading largefiles
 without an extension in name.

---
 rhodecode/lib/vcs/nodes.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rhodecode/lib/vcs/nodes.py b/rhodecode/lib/vcs/nodes.py
index 1de7b3e5..c8832c9c 100644
--- a/rhodecode/lib/vcs/nodes.py
+++ b/rhodecode/lib/vcs/nodes.py
@@ -468,7 +468,7 @@ class FileNode(Node):
         mtype, encoding = db.guess_type(self.name)
 
         if mtype is None:
-            if self.is_binary:
+            if not self.is_largefile() and self.is_binary:
                 mtype = 'application/octet-stream'
                 encoding = None
             else:
@@ -839,6 +839,7 @@ class LargeFileNode(FileNode):
         self.org_path = org_path
         self.kind = NodeKind.LARGEFILE
         self.alias = alias
+        self._content = ''
 
     def _validate_path(self, path):
         """

From e6e16f3d3e596e11e1490ea28363a89f72e5f323 Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Thu, 25 Mar 2021 23:15:48 +0100
Subject: [PATCH 25/28] clone-uri: fixed the problems with key mismatch that
 caused errors on summary page.

---
 rhodecode/lib/utils2.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rhodecode/lib/utils2.py b/rhodecode/lib/utils2.py
index 35e64b79..b2738184 100644
--- a/rhodecode/lib/utils2.py
+++ b/rhodecode/lib/utils2.py
@@ -594,6 +594,9 @@ def credentials_filter(uri):
     :param uri:
     """
     import urlobject
+    if isinstance(uri, rhodecode.lib.encrypt.InvalidDecryptedValue):
+        return 'InvalidDecryptionKey'
+
     url_obj = urlobject.URLObject(cleaned_uri(uri))
     url_obj = url_obj.without_password().without_username()
 

From 12a0e578cd1071cc343453cf4d44f4379366b506 Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Tue, 30 Mar 2021 23:40:21 +0200
Subject: [PATCH 26/28] branch-permissions: fixed ce view. Fixes #5656

---
 rhodecode/apps/repository/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rhodecode/apps/repository/__init__.py b/rhodecode/apps/repository/__init__.py
index 98437d9b..750a5739 100644
--- a/rhodecode/apps/repository/__init__.py
+++ b/rhodecode/apps/repository/__init__.py
@@ -932,8 +932,8 @@ def includeme(config):
         name='edit_repo_perms_branch',
         pattern='/{repo_name:.*?[^/]}/settings/branch_permissions', repo_route=True)
     config.add_view(
-        RepoBranchesView,
-        attr='branches',
+        RepoSettingsBranchPermissionsView,
+        attr='branch_permissions',
         route_name='edit_repo_perms_branch', request_method='GET',
         renderer='rhodecode:templates/admin/repos/repo_edit.mako')
 

From d0215870263db7ffb9d699b1dcf91f03ae1924fe Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Fri, 2 Apr 2021 12:22:20 +0200
Subject: [PATCH 27/28] file-store: added delete method

---
 docs/api/methods/store-methods.rst | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/api/methods/store-methods.rst b/docs/api/methods/store-methods.rst
index cfe8f8d4..8f447984 100644
--- a/docs/api/methods/store-methods.rst
+++ b/docs/api/methods/store-methods.rst
@@ -130,6 +130,24 @@ file_store_get_info (EE only)
      error :  null
 
 
+file_store_delete (EE only)
+---------------------------
+
+.. py:function:: file_store_delete(apiuser, store_fid)
+
+   Delete an artifact based on the secret uuid.
+
+   Example output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result: {
+         "artifact" : {"uid": "some uid", "removed": true}
+     }
+     error :  null
+
+
 file_store_add_metadata (EE only)
 ---------------------------------
 

From 997bcf9b10ec36785ab52b859313636cd439a994 Mon Sep 17 00:00:00 2001
From: Milka Kuzminski <milka@rhodecode.com>
Date: Fri, 2 Apr 2021 22:59:53 +0200
Subject: [PATCH 28/28] docs: added 4.25.0 release notes

---
 docs/release-notes/release-notes-4.25.0.rst | 76 +++++++++++++++++++++
 docs/release-notes/release-notes.rst        |  1 +
 2 files changed, 77 insertions(+)
 create mode 100644 docs/release-notes/release-notes-4.25.0.rst

diff --git a/docs/release-notes/release-notes-4.25.0.rst b/docs/release-notes/release-notes-4.25.0.rst
new file mode 100644
index 00000000..8d120279
--- /dev/null
+++ b/docs/release-notes/release-notes-4.25.0.rst
@@ -0,0 +1,76 @@
+|RCE| 4.25.0 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2021-04-02
+
+
+New Features
+^^^^^^^^^^^^
+
+- SSH: allow clone by ID via SSH operations.
+- Artifacts: added an admin panel to manage artifacts.
+- Redmine: added option to add note to a ticket without changing its status in Redmine integration.
+
+
+General
+^^^^^^^
+
+- Git: change lookups logic. Prioritize reference names over numerical ids.
+  Numerical ids are supported as a fallback if ref matching is unsuccessful.
+- Permissions: changed fork permission help text to reflect the actual state on how it works.
+- Permissions: flush permissions on owner changes for repo and repo groups. This
+  would fix problems when owner of repository changes then the new owner lacked permissions
+  until cache expired.
+- Artifacts: added API function to remove artifacts.
+- Archives: use a special name for non-hashed archives to fix caching issues.
+- Packaging: fixed few packages requirements for a proper builds.
+- Packaging: fix rhodecode-tools for docker builds.
+- Packaging: fixed some problem after latest setuptools-scm release.
+- Packaging: added setuptools-scm to packages for build.
+- Packaging: fix jira package for reproducible builds.
+- Packaging: fix zipp package patches.
+
+
+Security
+^^^^^^^^
+
+- Comments: forbid removal of comments by anyone except the owners.
+  Previously admins of a repository could remove them if they would construct a special url with data.
+- Pull requests: fixed some xss problems when a deleted file with special characters were commented on.
+
+
+Performance
+^^^^^^^^^^^
+
+- License: skip channelstream connect on license checks logic to reduce calls handling times.
+- Core: optimize some calls to skip license/scm detection on them. Each license check is expensive
+  and we don't need them on each call.
+
+
+Fixes
+^^^^^
+
+- Branch-permissions: fixed ce view. Fixes #5656
+- Feed: fix errors on feed access of empty repositories.
+- Archives: if implicit ref name was used (e.g master) to obtain archive, we now
+  redirect to explicit commit sha so we can have the proper caching for references names.
+- rcextensions: fixed pre-files extractor return code support.
+- Svn: fix subprocess problems on some of the calls for file checking.
+- Pull requests: fixed multiple repetitions of referenced tickets in pull requests summary sidebar.
+- Maintenance: fixed bad routes def
+- clone-uri: fixed the problems with key mismatch that caused errors on summary page.
+- Largefiles: added fix for downloading largefiles which had no extension in file name.
+- Compare: fix referenced commits bug.
+- Git: fix for unicode branches
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- Scheduled release 4.25.0.
+
+
+
diff --git a/docs/release-notes/release-notes.rst b/docs/release-notes/release-notes.rst
index 661b1ee2..1d2bea7f 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.25.0.rst
    release-notes-4.24.1.rst
    release-notes-4.24.0.rst
    release-notes-4.23.2.rst