release: merge back stable branch into default

docs/release-notes/release-notes-4.24.1.rst

@@ -0,0 +1,46 b''
+|RCE| 4.24.1 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2021-02-04
+
+
+New Features
+^^^^^^^^^^^^
+
+
+
+General
+^^^^^^^
+
+- Core: added statsd client for statistics usage.
+- Clone urls: allow custom clone by id template so users can set clone-by-id as default.
+- Automation: enable check for new version for EE edition as automation task that will send notifications when new RhodeCode version is available
+
+Security
+^^^^^^^^
+
+
+
+Performance
+^^^^^^^^^^^
+
+- Core: bumped git to 2.30.0
+
+
+Fixes
+^^^^^
+
+- Comments: add ability to resolve todos from the side-bar. This should prevent situations
+  when a TODO was left over in outdated/removed code pieces, and users needs to search to resolve them.
+- Pull requests: fixed a case when template marker was used in description field causing 500 errors on commenting.
+- Merges: fixed excessive data saved in merge metadata that could not fit inside the DB table.
+- Exceptions: fixed problem with exceptions formatting resulting in limited exception data reporting.
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- Un-scheduled release addressing problems in 4.24.X releases.

pkgs/patches/pytest/setuptools.patch

@@ -0,0 +1,12 b''
+diff -rup pytest-4.6.5-orig/setup.py pytest-4.6.5/setup.py
+--- pytest-4.6.5-orig/setup.py	2018-04-10 10:23:04.000000000 +0200
++++  pytest-4.6.5/setup.py	2018-04-10 10:23:34.000000000 +0200
+@@ -24,7 +24,7 @@ INSTALL_REQUIRES = [
+ def main():
+     setup(
+         use_scm_version={"write_to": "src/_pytest/_version.py"},
+-        setup_requires=["setuptools-scm", "setuptools>=40.0"],
++        setup_requires=["setuptools-scm", "setuptools<=42.0"],
+         package_dir={"": "src"},
+         # fmt: off
+         extras_require={
  No newline at end of file

rhodecode/lib/_vendor/statsd/__init__.py

@@ -0,0 +1,46 b''
+from __future__ import absolute_import, division, unicode_literals
+
+import logging
+
+from .stream import TCPStatsClient, UnixSocketStatsClient  # noqa
+from .udp import StatsClient  # noqa
+
+HOST = 'localhost'
+PORT = 8125
+IPV6 = False
+PREFIX = None
+MAXUDPSIZE = 512
+
+log = logging.getLogger('rhodecode.statsd')
+
+
+def statsd_config(config, prefix='statsd.'):
+    _config = {}
+    for key in config.keys():
+        if key.startswith(prefix):
+            _config[key[len(prefix):]] = config[key]
+    return _config
+
+
+def client_from_config(configuration, prefix='statsd.', **kwargs):
+    from pyramid.settings import asbool
+
+    _config = statsd_config(configuration, prefix)
+    statsd_enabled = asbool(_config.pop('enabled', False))
+    if not statsd_enabled:
+        log.debug('statsd client not enabled by statsd.enabled =  flag, skipping...')
+        return
+
+    host = _config.pop('statsd_host', HOST)
+    port = _config.pop('statsd_port', PORT)
+    prefix = _config.pop('statsd_prefix', PREFIX)
+    maxudpsize = _config.pop('statsd_maxudpsize', MAXUDPSIZE)
+    ipv6 = asbool(_config.pop('statsd_ipv6', IPV6))
+    log.debug('configured statsd client %s:%s', host, port)
+
+    return StatsClient(
+        host=host, port=port, prefix=prefix, maxudpsize=maxudpsize, ipv6=ipv6)
+
+
+def get_statsd_client(request):
+    return client_from_config(request.registry.settings)

rhodecode/lib/_vendor/statsd/base.py

@@ -0,0 +1,107 b''
+from __future__ import absolute_import, division, unicode_literals
+
+import random
+from collections import deque
+from datetime import timedelta
+
+from .timer import Timer
+
+
+class StatsClientBase(object):
+    """A Base class for various statsd clients."""
+
+    def close(self):
+        """Used to close and clean up any underlying resources."""
+        raise NotImplementedError()
+
+    def _send(self):
+        raise NotImplementedError()
+
+    def pipeline(self):
+        raise NotImplementedError()
+
+    def timer(self, stat, rate=1):
+        return Timer(self, stat, rate)
+
+    def timing(self, stat, delta, rate=1):
+        """
+        Send new timing information.
+
+        `delta` can be either a number of milliseconds or a timedelta.
+        """
+        if isinstance(delta, timedelta):
+            # Convert timedelta to number of milliseconds.
+            delta = delta.total_seconds() * 1000.
+        self._send_stat(stat, '%0.6f|ms' % delta, rate)
+
+    def incr(self, stat, count=1, rate=1):
+        """Increment a stat by `count`."""
+        self._send_stat(stat, '%s|c' % count, rate)
+
+    def decr(self, stat, count=1, rate=1):
+        """Decrement a stat by `count`."""
+        self.incr(stat, -count, rate)
+
+    def gauge(self, stat, value, rate=1, delta=False):
+        """Set a gauge value."""
+        if value < 0 and not delta:
+            if rate < 1:
+                if random.random() > rate:
+                    return
+            with self.pipeline() as pipe:
+                pipe._send_stat(stat, '0|g', 1)
+                pipe._send_stat(stat, '%s|g' % value, 1)
+        else:
+            prefix = '+' if delta and value >= 0 else ''
+            self._send_stat(stat, '%s%s|g' % (prefix, value), rate)
+
+    def set(self, stat, value, rate=1):
+        """Set a set value."""
+        self._send_stat(stat, '%s|s' % value, rate)
+
+    def _send_stat(self, stat, value, rate):
+        self._after(self._prepare(stat, value, rate))
+
+    def _prepare(self, stat, value, rate):
+        if rate < 1:
+            if random.random() > rate:
+                return
+            value = '%s|@%s' % (value, rate)
+
+        if self._prefix:
+            stat = '%s.%s' % (self._prefix, stat)
+
+        return '%s:%s' % (stat, value)
+
+    def _after(self, data):
+        if data:
+            self._send(data)
+
+
+class PipelineBase(StatsClientBase):
+
+    def __init__(self, client):
+        self._client = client
+        self._prefix = client._prefix
+        self._stats = deque()
+
+    def _send(self):
+        raise NotImplementedError()
+
+    def _after(self, data):
+        if data is not None:
+            self._stats.append(data)
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, typ, value, tb):
+        self.send()
+
+    def send(self):
+        if not self._stats:
+            return
+        self._send()
+
+    def pipeline(self):
+        return self.__class__(self)

rhodecode/lib/_vendor/statsd/stream.py

@@ -0,0 +1,75 b''
+from __future__ import absolute_import, division, unicode_literals
+
+import socket
+
+from .base import StatsClientBase, PipelineBase
+
+
+class StreamPipeline(PipelineBase):
+    def _send(self):
+        self._client._after('\n'.join(self._stats))
+        self._stats.clear()
+
+
+class StreamClientBase(StatsClientBase):
+    def connect(self):
+        raise NotImplementedError()
+
+    def close(self):
+        if self._sock and hasattr(self._sock, 'close'):
+            self._sock.close()
+        self._sock = None
+
+    def reconnect(self):
+        self.close()
+        self.connect()
+
+    def pipeline(self):
+        return StreamPipeline(self)
+
+    def _send(self, data):
+        """Send data to statsd."""
+        if not self._sock:
+            self.connect()
+        self._do_send(data)
+
+    def _do_send(self, data):
+        self._sock.sendall(data.encode('ascii') + b'\n')
+
+
+class TCPStatsClient(StreamClientBase):
+    """TCP version of StatsClient."""
+
+    def __init__(self, host='localhost', port=8125, prefix=None,
+                 timeout=None, ipv6=False):
+        """Create a new client."""
+        self._host = host
+        self._port = port
+        self._ipv6 = ipv6
+        self._timeout = timeout
+        self._prefix = prefix
+        self._sock = None
+
+    def connect(self):
+        fam = socket.AF_INET6 if self._ipv6 else socket.AF_INET
+        family, _, _, _, addr = socket.getaddrinfo(
+            self._host, self._port, fam, socket.SOCK_STREAM)[0]
+        self._sock = socket.socket(family, socket.SOCK_STREAM)
+        self._sock.settimeout(self._timeout)
+        self._sock.connect(addr)
+
+
+class UnixSocketStatsClient(StreamClientBase):
+    """Unix domain socket version of StatsClient."""
+
+    def __init__(self, socket_path, prefix=None, timeout=None):
+        """Create a new client."""
+        self._socket_path = socket_path
+        self._timeout = timeout
+        self._prefix = prefix
+        self._sock = None
+
+    def connect(self):
+        self._sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+        self._sock.settimeout(self._timeout)
+        self._sock.connect(self._socket_path)

rhodecode/lib/_vendor/statsd/timer.py

@@ -0,0 +1,71 b''
+from __future__ import absolute_import, division, unicode_literals
+
+import functools
+
+# Use timer that's not susceptible to time of day adjustments.
+try:
+    # perf_counter is only present on Py3.3+
+    from time import perf_counter as time_now
+except ImportError:
+    # fall back to using time
+    from time import time as time_now
+
+
+def safe_wraps(wrapper, *args, **kwargs):
+    """Safely wraps partial functions."""
+    while isinstance(wrapper, functools.partial):
+        wrapper = wrapper.func
+    return functools.wraps(wrapper, *args, **kwargs)
+
+
+class Timer(object):
+    """A context manager/decorator for statsd.timing()."""
+
+    def __init__(self, client, stat, rate=1):
+        self.client = client
+        self.stat = stat
+        self.rate = rate
+        self.ms = None
+        self._sent = False
+        self._start_time = None
+
+    def __call__(self, f):
+        """Thread-safe timing function decorator."""
+        @safe_wraps(f)
+        def _wrapped(*args, **kwargs):
+            start_time = time_now()
+            try:
+                return f(*args, **kwargs)
+            finally:
+                elapsed_time_ms = 1000.0 * (time_now() - start_time)
+                self.client.timing(self.stat, elapsed_time_ms, self.rate)
+        return _wrapped
+
+    def __enter__(self):
+        return self.start()
+
+    def __exit__(self, typ, value, tb):
+        self.stop()
+
+    def start(self):
+        self.ms = None
+        self._sent = False
+        self._start_time = time_now()
+        return self
+
+    def stop(self, send=True):
+        if self._start_time is None:
+            raise RuntimeError('Timer has not started.')
+        dt = time_now() - self._start_time
+        self.ms = 1000.0 * dt  # Convert to milliseconds.
+        if send:
+            self.send()
+        return self
+
+    def send(self):
+        if self.ms is None:
+            raise RuntimeError('No data recorded.')
+        if self._sent:
+            raise RuntimeError('Already sent data.')
+        self._sent = True
+        self.client.timing(self.stat, self.ms, self.rate)

rhodecode/lib/_vendor/statsd/udp.py

@@ -0,0 +1,55 b''
+from __future__ import absolute_import, division, unicode_literals
+
+import socket
+
+from .base import StatsClientBase, PipelineBase
+
+
+class Pipeline(PipelineBase):
+
+    def __init__(self, client):
+        super(Pipeline, self).__init__(client)
+        self._maxudpsize = client._maxudpsize
+
+    def _send(self):
+        data = self._stats.popleft()
+        while self._stats:
+            # Use popleft to preserve the order of the stats.
+            stat = self._stats.popleft()
+            if len(stat) + len(data) + 1 >= self._maxudpsize:
+                self._client._after(data)
+                data = stat
+            else:
+                data += '\n' + stat
+        self._client._after(data)
+
+
+class StatsClient(StatsClientBase):
+    """A client for statsd."""
+
+    def __init__(self, host='localhost', port=8125, prefix=None,
+                 maxudpsize=512, ipv6=False):
+        """Create a new client."""
+        fam = socket.AF_INET6 if ipv6 else socket.AF_INET
+        family, _, _, _, addr = socket.getaddrinfo(
+            host, port, fam, socket.SOCK_DGRAM)[0]
+        self._addr = addr
+        self._sock = socket.socket(family, socket.SOCK_DGRAM)
+        self._prefix = prefix
+        self._maxudpsize = maxudpsize
+
+    def _send(self, data):
+        """Send data to statsd."""
+        try:
+            self._sock.sendto(data.encode('ascii'), self._addr)
+        except (socket.error, RuntimeError):
+            # No time for love, Dr. Jones!
+            pass
+
+    def close(self):
+        if self._sock and hasattr(self._sock, 'close'):
+            self._sock.close()
+        self._sock = None
+
+    def pipeline(self):
+        return Pipeline(self)

rhodecode/lib/dbmigrate/versions/113_version_4_24_0.py

@@ -0,0 +1,64 b''
+# -*- coding: utf-8 -*-
+
+import logging
+from sqlalchemy import *
+
+from alembic.migration import MigrationContext
+from alembic.operations import Operations
+
+from rhodecode.lib.dbmigrate.versions import _reset_base
+from rhodecode.model import meta, init_model_encryption
+
+
+log = logging.getLogger(__name__)
+
+
+def upgrade(migrate_engine):
+    """
+    Upgrade operations go here.
+    Don't create your own engine; bind migrate_engine to your metadata
+    """
+    _reset_base(migrate_engine)
+    from rhodecode.lib.dbmigrate.schema import db_4_20_0_0 as db
+
+    init_model_encryption(db)
+
+    # issue fixups
+    fixups(db, meta.Session)
+
+
+def downgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine
+
+
+def fixups(models, _SESSION):
+    # now create new changed value of clone_url
+    Optional = models.Optional
+
+    def get_by_name(cls, key):
+        return cls.query().filter(cls.app_settings_name == key).scalar()
+
+    def create_or_update(cls, key, val=Optional(''), type_=Optional('unicode')):
+        res = get_by_name(cls, key)
+        if not res:
+            val = Optional.extract(val)
+            type_ = Optional.extract(type_)
+            res = cls(key, val, type_)
+        else:
+            res.app_settings_name = key
+            if not isinstance(val, Optional):
+                # update if set
+                res.app_settings_value = val
+            if not isinstance(type_, Optional):
+                # update if set
+                res.app_settings_type = type_
+        return res
+
+    clone_uri_tmpl = models.Repository.DEFAULT_CLONE_URI_ID
+    print('settings new clone by url template to %s' % clone_uri_tmpl)
+
+    sett = create_or_update(models.RhodeCodeSetting,
+        'clone_uri_id_tmpl', clone_uri_tmpl, 'unicode')
+    _SESSION().add(sett)
+    _SESSION.commit()

rhodecode/templates/email_templates/update_available.mako

@@ -0,0 +1,32 b''
+## -*- coding: utf-8 -*-
+<%inherit file="base.mako"/>
+
+<%def name="subject()" filter="n,trim,whitespace_filter">
+New Version of RhodeCode is available !
+</%def>
+
+## plain text version of the email. Empty by default
+<%def name="body_plaintext()" filter="n,trim">
+A new version of RhodeCode is available!
+
+Your version: ${current_ver}
+New version: ${latest_ver}
+
+Release notes:
+
+https://docs.rhodecode.com/RhodeCode-Enterprise/release-notes/release-notes-${latest_ver}.html
+</%def>
+
+## BODY GOES BELOW
+
+<h3>A new version of RhodeCode is available!</h3>
+<br/>
+Your version: ${current_ver}<br/>
+New version: <strong>${latest_ver}</strong><br/>
+
+<h4>Release notes</h4>
+
+<a href="https://docs.rhodecode.com/RhodeCode-Enterprise/release-notes/release-notes-${latest_ver}.html">
+    https://docs.rhodecode.com/RhodeCode-Enterprise/release-notes/release-notes-${latest_ver}.html
+</a>
+

.hgtags

@@ -1,75 +1,77 b''
 1bd3e92b7e2e2d2024152b34bb88dff1db544a71 v4.0.0
 170c5398320ea6cddd50955e88d408794c21d43a v4.0.1
 c3fe200198f5aa34cf2e4066df2881a9cefe3704 v4.1.0
 7fd5c850745e2ea821fb4406af5f4bff9b0a7526 v4.1.1
 41c87da28a179953df86061d817bc35533c66dd2 v4.1.2
 baaf9f5bcea3bae0ef12ae20c8b270482e62abb6 v4.2.0
 32a70c7e56844a825f61df496ee5eaf8c3c4e189 v4.2.1
 fa695cdb411d294679ac081d595ac654e5613b03 v4.3.0
 0e4dc11b58cad833c513fe17bac39e6850edf959 v4.3.1
 8a876f48f5cb1d018b837db28ff928500cb32cfb v4.4.0
 8dd86b410b1aac086ffdfc524ef300f896af5047 v4.4.1
 d2514226abc8d3b4f6fb57765f47d1b6fb360a05 v4.4.2
 27d783325930af6dad2741476c0d0b1b7c8415c2 v4.5.0
 7f2016f352abcbdba4a19d4039c386e9629449da v4.5.1
 416fec799314c70a5c780fb28b3357b08869333a v4.5.2
 27c3b85fafc83143e6678fbc3da69e1615bcac55 v4.6.0
 5ad13deb9118c2a5243d4032d4d9cc174e5872db v4.6.1
 2be921e01fa24bb102696ada596f87464c3666f6 v4.7.0
 7198bdec29c2872c974431d55200d0398354cdb1 v4.7.1
 bd1c8d230fe741c2dfd7100a0ef39fd0774fd581 v4.7.2
 9731914f89765d9628dc4dddc84bc9402aa124c8 v4.8.0
 c5a2b7d0e4bbdebc4a62d7b624befe375207b659 v4.9.0
 d9aa3b27ac9f7e78359775c75fedf7bfece232f1 v4.9.1
 4ba4d74981cec5d6b28b158f875a2540952c2f74 v4.10.0
 0a6821cbd6b0b3c21503002f88800679fa35ab63 v4.10.1
 434ad90ec8d621f4416074b84f6e9ce03964defb v4.10.2
 68baee10e698da2724c6e0f698c03a6abb993bf2 v4.10.3
 00821d3afd1dce3f4767cc353f84a17f7d5218a1 v4.10.4
 22f6744ad8cc274311825f63f953e4dee2ea5cb9 v4.10.5
 96eb24bea2f5f9258775245e3f09f6fa0a4dda01 v4.10.6
 3121217a812c956d7dd5a5875821bd73e8002a32 v4.11.0
 fa98b454715ac5b912f39e84af54345909a2a805 v4.11.1
 3982abcfdcc229a723cebe52d3a9bcff10bba08e v4.11.2
 33195f145db9172f0a8f1487e09207178a6ab065 v4.11.3
 194c74f33e32bbae6fc4d71ec5a999cff3c13605 v4.11.4
 8fbd8b0c3ddc2fa4ac9e4ca16942a03eb593df2d v4.11.5
 f0609aa5d5d05a1ca2f97c3995542236131c9d8a v4.11.6
 b5b30547d90d2e088472a70c84878f429ffbf40d v4.12.0
 9072253aa8894d20c00b4a43dc61c2168c1eff94 v4.12.1
 6a517543ea9ef9987d74371bd2a315eb0b232dc9 v4.12.2
 7fc0731b024c3114be87865eda7ab621cc957e32 v4.12.3
 6d531c0b068c6eda62dddceedc9f845ecb6feb6f v4.12.4
 3d6bf2d81b1564830eb5e83396110d2a9a93eb1e v4.13.0
 5468fc89e708bd90e413cd0d54350017abbdbc0e v4.13.1
 610d621550521c314ee97b3d43473ac0bcf06fb8 v4.13.2
 7dc62c090881fb5d03268141e71e0940d7c3295d v4.13.3
 9151328c1c46b72ba6f00d7640d9141e75aa1ca2 v4.14.0
 a47eeac5dfa41fa6779d90452affba4091c3ade8 v4.14.1
 4b34ce0d2c3c10510626b3b65044939bb7a2cddf v4.15.0
 14502561d22e6b70613674cd675ae9a604b7989f v4.15.1
 4aaa40b605b01af78a9f6882eca561c54b525ef0 v4.15.2
 797744642eca86640ed20bef2cd77445780abaec v4.16.0
 6c3452c7c25ed35ff269690929e11960ed6ad7d3 v4.16.1
 5d8057df561c4b6b81b6401aed7d2f911e6e77f7 v4.16.2
 13acfc008896ef4c62546bab5074e8f6f89b4fa7 v4.17.0
 45b9b610976f483877142fe75321808ce9ebac59 v4.17.1
 ad5bd0c4bd322fdbd04bb825a3d027e08f7a3901 v4.17.2
 037f5794b55a6236d68f6485a485372dde6566e0 v4.17.3
 83bc3100cfd6094c1d04f475ddb299b7dc3d0b33 v4.17.4
 e3de8c95baf8cc9109ca56aee8193a2cb6a54c8a v4.17.4
 f37a3126570477543507f0bc9d245ce75546181a v4.18.0
 71d8791463e87b64c1a18475de330ee600d37561 v4.18.1
 4bd6b75dac1d25c64885d4d49385e5533f21c525 v4.18.2
 12ed92fe57f2e9fc7b71dc0b65e26c2da5c7085f v4.18.3
 ddef396a6567117de531d67d44c739cbbfc3eebb v4.19.0
 c0c65acd73914bf4368222d510afe1161ab8c07c v4.19.1
 7ac623a4a2405917e2af660d645ded662011e40d v4.19.2
 ef7ffda65eeb90c3ba88590a6cb816ef9b0bc232 v4.19.3
 3e635489bb7961df93b01e42454ad1a8730ae968 v4.20.0
 7e2eb896a02ca7cd2cd9f0f853ef3dac3f0039e3 v4.20.1
 8bb5fece08ab65986225b184e46f53d2a71729cb v4.21.0
 90734aac31ee4563bbe665a43ff73190cc762275 v4.22.0
 a9655707f7cf4146affc51c12fe5ed8e02898a57 v4.23.0
 56310d93b33b97535908ef9c7b0985b89bb7fad2 v4.23.1
 7637c38528fa38c1eabc1fde6a869c20995a0da7 v4.23.2
+6aeb4ac3ef7f0ac699c914740dad3688c9495e83 v4.24.0
+6eaf953da06e468a4c4e5239d3d0e700bda6b163 v4.24.1

docs/release-notes/release-notes-4.24.0.rst

@@ -1,54 +1,56 b''
-|RCE| 4.23.0 |RNS|
+|RCE| 4.24.0 |RNS|
 ------------------
 
 Release Date
 ^^^^^^^^^^^^
 
 - 2021-01-10
 
 
 New Features
 ^^^^^^^^^^^^
 
 - Artifacts: expose additional headers, and content-disposition for downloads from artifacts exposing the real name of the file.
 - Token access: allow token in headers not only in GET/URL.
 - File-store: added a stream upload endpoint, it allows to upload GBs of data into artifact store efficiently.
   Can be used for backups etc.
 - Pull requests: expose commit versions in the pull-request commit list.
 
+
 General
 ^^^^^^^
 
 - Deps: bumped redis to 3.5.3
-- rcextensions: improve examples
+- Rcextensions: improve examples for some usage.
 - Setup: added optional parameters to apply a default license, or skip re-creation of database at install.
 - Docs: update headers for NGINX
 - Beaker cache: remove no longer used beaker cache init
+- Installation: the installer no longer requires gzip and bzip packages, and works on python 2 and 3
 
 
 Security
 ^^^^^^^^
 
 
 
 Performance
 ^^^^^^^^^^^
 
 - Core: speed up cache loading on application startup.
 - Core: allow loading all auth plugins in once place for CE/EE code.
 - Application: not use config.scan(), and replace all @add_view decorator into a explicit add_view call for faster app start.
 
 
 Fixes
 ^^^^^
 
 - Svn: don't print exceptions in case of safe calls
 - Vcsserver: use safer maxfd reporting, some linux systems get a problem with this
 - Hooks-daemon: fixed problem with lost hooks value from .ini file.
 - Exceptions: fixed truncated exception text
 
 
 Upgrade notes
 ^^^^^^^^^^^^^
 
 - Scheduled release 4.24.0

docs/release-notes/release-notes.rst

@@ -1,152 +1,153 b''
 .. _rhodecode-release-notes-ref:
 
 Release Notes
 =============
 
 |RCE| 4.x Versions
 ------------------
 
 .. toctree::
    :maxdepth: 1
 
+   release-notes-4.24.1.rst
    release-notes-4.24.0.rst
    release-notes-4.23.2.rst
    release-notes-4.23.1.rst
    release-notes-4.23.0.rst
    release-notes-4.22.0.rst
    release-notes-4.21.0.rst
    release-notes-4.20.1.rst
    release-notes-4.20.0.rst
    release-notes-4.19.3.rst
    release-notes-4.19.2.rst
    release-notes-4.19.1.rst
    release-notes-4.19.0.rst
    release-notes-4.18.3.rst
    release-notes-4.18.2.rst
    release-notes-4.18.1.rst
    release-notes-4.18.0.rst
    release-notes-4.17.4.rst
    release-notes-4.17.3.rst
    release-notes-4.17.2.rst
    release-notes-4.17.1.rst
    release-notes-4.17.0.rst
    release-notes-4.16.2.rst
    release-notes-4.16.1.rst
    release-notes-4.16.0.rst
    release-notes-4.15.2.rst
    release-notes-4.15.1.rst
    release-notes-4.15.0.rst
    release-notes-4.14.1.rst
    release-notes-4.14.0.rst
    release-notes-4.13.3.rst
    release-notes-4.13.2.rst
    release-notes-4.13.1.rst
    release-notes-4.13.0.rst
    release-notes-4.12.4.rst
    release-notes-4.12.3.rst
    release-notes-4.12.2.rst
    release-notes-4.12.1.rst
    release-notes-4.12.0.rst
    release-notes-4.11.6.rst
    release-notes-4.11.5.rst
    release-notes-4.11.4.rst
    release-notes-4.11.3.rst
    release-notes-4.11.2.rst
    release-notes-4.11.1.rst
    release-notes-4.11.0.rst
    release-notes-4.10.6.rst
    release-notes-4.10.5.rst
    release-notes-4.10.4.rst
    release-notes-4.10.3.rst
    release-notes-4.10.2.rst
    release-notes-4.10.1.rst
    release-notes-4.10.0.rst
    release-notes-4.9.1.rst
    release-notes-4.9.0.rst
    release-notes-4.8.0.rst
    release-notes-4.7.2.rst
    release-notes-4.7.1.rst
    release-notes-4.7.0.rst
    release-notes-4.6.1.rst
    release-notes-4.6.0.rst
    release-notes-4.5.2.rst
    release-notes-4.5.1.rst
    release-notes-4.5.0.rst
    release-notes-4.4.2.rst
    release-notes-4.4.1.rst
    release-notes-4.4.0.rst
    release-notes-4.3.1.rst
    release-notes-4.3.0.rst
    release-notes-4.2.1.rst
    release-notes-4.2.0.rst
    release-notes-4.1.2.rst
    release-notes-4.1.1.rst
    release-notes-4.1.0.rst
    release-notes-4.0.1.rst
    release-notes-4.0.0.rst
 
 |RCE| 3.x Versions
 ------------------
 
 .. toctree::
    :maxdepth: 1
 
    release-notes-3.8.4.rst
    release-notes-3.8.3.rst
    release-notes-3.8.2.rst
    release-notes-3.8.1.rst
    release-notes-3.8.0.rst
    release-notes-3.7.1.rst
    release-notes-3.7.0.rst
    release-notes-3.6.1.rst
    release-notes-3.6.0.rst
    release-notes-3.5.2.rst
    release-notes-3.5.1.rst
    release-notes-3.5.0.rst
    release-notes-3.4.1.rst
    release-notes-3.4.0.rst
    release-notes-3.3.4.rst
    release-notes-3.3.3.rst
    release-notes-3.3.2.rst
    release-notes-3.3.1.rst
    release-notes-3.3.0.rst
    release-notes-3.2.3.rst
    release-notes-3.2.2.rst
    release-notes-3.2.1.rst
    release-notes-3.2.0.rst
    release-notes-3.1.1.rst
    release-notes-3.1.0.rst
    release-notes-3.0.2.rst
    release-notes-3.0.1.rst
    release-notes-3.0.0.rst
 
 |RCE| 2.x Versions
 ------------------
 
 .. toctree::
    :maxdepth: 1
 
    release-notes-2.2.8.rst
    release-notes-2.2.7.rst
    release-notes-2.2.6.rst
    release-notes-2.2.5.rst
    release-notes-2.2.4.rst
    release-notes-2.2.3.rst
    release-notes-2.2.2.rst
    release-notes-2.2.1.rst
    release-notes-2.2.0.rst
    release-notes-2.1.0.rst
    release-notes-2.0.2.rst
    release-notes-2.0.1.rst
    release-notes-2.0.0.rst
 
 |RCE| 1.x Versions
 ------------------
 
 .. toctree::
    :maxdepth: 1
 
    release-notes-1.7.2.rst
    release-notes-1.7.1.rst
    release-notes-1.7.0.rst
    release-notes-1.6.0.rst

pkgs/python-packages-overrides.nix

@@ -1,281 +1,287 b''
 # Overrides for the generated python-packages.nix
 #
 # This function is intended to be used as an extension to the generated file
 # python-packages.nix. The main objective is to add needed dependencies of C
 # libraries and tweak the build instructions where needed.
 
 { pkgs
 , basePythonPackages
 }:
 
 let
   sed = "sed -i";
 
   localLicenses = {
     repoze = {
       fullName = "Repoze License";
       url =  http://www.repoze.org/LICENSE.txt;
     };
   };
 
 in
 
 self: super: {
 
   "appenlight-client" = super."appenlight-client".override (attrs: {
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   });
 
   "beaker" = super."beaker".override (attrs: {
     patches = [
       ./patches/beaker/patch-beaker-lock-func-debug.diff
       ./patches/beaker/patch-beaker-metadata-reuse.diff
       ./patches/beaker/patch-beaker-improved-redis.diff
       ./patches/beaker/patch-beaker-improved-redis-2.diff
     ];
   });
 
   "cffi" = super."cffi".override (attrs: {
     buildInputs = [
       pkgs.libffi
     ];
   });
 
   "cryptography" = super."cryptography".override (attrs: {
     buildInputs = [
       pkgs.openssl
     ];
   });
 
   "gevent" = super."gevent".override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       # NOTE: (marcink) odd requirements from gevent aren't set properly,
       # thus we need to inject psutil manually
       self."psutil"
     ];
   });
 
   "future" = super."future".override (attrs: {
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   });
 
   "testpath" = super."testpath".override (attrs: {
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   });
 
   "gnureadline" = super."gnureadline".override (attrs: {
     buildInputs = [
       pkgs.ncurses
     ];
     patchPhase = ''
       substituteInPlace setup.py --replace "/bin/bash" "${pkgs.bash}/bin/bash"
     '';
   });
 
   "gunicorn" = super."gunicorn".override (attrs: {
     propagatedBuildInputs = [
       # johbo: futures is needed as long as we are on Python 2, otherwise
       # gunicorn explodes if used with multiple threads per worker.
       self."futures"
     ];
   });
 
   "nbconvert" = super."nbconvert".override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       # marcink: plug in jupyter-client for notebook rendering
       self."jupyter-client"
     ];
   });
 
   "ipython" = super."ipython".override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       self."gnureadline"
     ];
   });
 
   "lxml" = super."lxml".override (attrs: {
     buildInputs = [
       pkgs.libxml2
       pkgs.libxslt
     ];
     propagatedBuildInputs = [
       # Needed, so that "setup.py bdist_wheel" does work
       self."wheel"
     ];
   });
 
   "mysql-python" = super."mysql-python".override (attrs: {
     buildInputs = [
       pkgs.openssl
     ];
     propagatedBuildInputs = [
       pkgs.libmysql
       pkgs.zlib
     ];
   });
 
   "psycopg2" = super."psycopg2".override (attrs: {
     propagatedBuildInputs = [
       pkgs.postgresql
     ];
     meta = {
       license = pkgs.lib.licenses.lgpl3Plus;
     };
   });
 
   "pycurl" = super."pycurl".override (attrs: {
     propagatedBuildInputs = [
       pkgs.curl
       pkgs.openssl
     ];
 
     preConfigure = ''
       substituteInPlace setup.py --replace '--static-libs' '--libs'
       export PYCURL_SSL_LIBRARY=openssl
     '';
 
     meta = {
       license = pkgs.lib.licenses.mit;
     };
   });
 
   "pyramid" = super."pyramid".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
   "pyramid-debugtoolbar" = super."pyramid-debugtoolbar".override (attrs: {
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal localLicenses.repoze ];
     };
   });
 
   "pysqlite" = super."pysqlite".override (attrs: {
     propagatedBuildInputs = [
       pkgs.sqlite
     ];
     meta = {
       license = [ pkgs.lib.licenses.zlib pkgs.lib.licenses.libpng ];
     };
   });
 
   "python-ldap" = super."python-ldap".override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       pkgs.openldap
       pkgs.cyrus_sasl
       pkgs.openssl
     ];
   });
 
   "python-pam" = super."python-pam".override (attrs: {
     propagatedBuildInputs = [
         pkgs.pam
     ];
 
     # TODO: johbo: Check if this can be avoided, or transform into
     # a real patch
     patchPhase = ''
       substituteInPlace pam.py \
         --replace 'find_library("pam")' '"${pkgs.pam}/lib/libpam.so.0"'
     '';
 
     });
 
   "python-saml" = super."python-saml".override (attrs: {
     buildInputs = [
       pkgs.libxml2
       pkgs.libxslt
     ];
   });
 
   "dm.xmlsec.binding" = super."dm.xmlsec.binding".override (attrs: {
     buildInputs = [
       pkgs.libxml2
       pkgs.libxslt
       pkgs.xmlsec
       pkgs.libtool
     ];
   });
 
   "pyzmq" = super."pyzmq".override (attrs: {
     buildInputs = [
       pkgs.czmq
     ];
   });
 
   "urlobject" = super."urlobject".override (attrs: {
     meta = {
       license = {
         spdxId = "Unlicense";
         fullName = "The Unlicense";
         url = http://unlicense.org/;
       };
     };
   });
 
   "docutils" = super."docutils".override (attrs: {
     meta = {
       license = pkgs.lib.licenses.bsd2;
     };
   });
 
   "colander" = super."colander".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
   "pyramid-beaker"  = super."pyramid-beaker".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
   "pyramid-mako" = super."pyramid-mako".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
   "repoze.lru" = super."repoze.lru".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
   "python-editor" = super."python-editor".override (attrs: {
     meta = {
       license = pkgs.lib.licenses.asl20;
     };
   });
 
   "translationstring" = super."translationstring".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
   "venusian" = super."venusian".override (attrs: {
     meta = {
       license = localLicenses.repoze;
     };
   });
 
   "supervisor" = super."supervisor".override (attrs: {
     patches = [
       ./patches/supervisor/patch-rlimits-old-kernel.diff
     ];
   });
 
+  "pytest" = super."pytest".override (attrs: {
+    patches = [
+      ./patches/pytest/setuptools.patch
+    ];
+  });
+
   # Avoid that base packages screw up the build process
   inherit (basePythonPackages)
     setuptools;
 
 }

rhodecode/__init__.py

@@ -1,60 +1,60 b''
 # -*- 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 os
 from collections import OrderedDict
 
 import sys
 import platform
 
 VERSION = tuple(open(os.path.join(
     os.path.dirname(__file__), 'VERSION')).read().split('.'))
 
 BACKENDS = OrderedDict()
 
 BACKENDS['hg'] = 'Mercurial repository'
 BACKENDS['git'] = 'Git repository'
 BACKENDS['svn'] = 'Subversion repository'
 
 
 CELERY_ENABLED = False
 CELERY_EAGER = False
 
 # link to config for pyramid
 CONFIG = {}
 
 # Populated with the settings dictionary from application init in
 # rhodecode.conf.environment.load_pyramid_environment
 PYRAMID_SETTINGS = {}
 
 # Linked module for extensions
 EXTENSIONS = {}
 
 __version__ = ('.'.join((str(each) for each in VERSION[:3])))
-__dbversion__ = 112  # defines current db version for migrations
+__dbversion__ = 113  # defines current db version for migrations
 __platform__ = platform.system()
 __license__ = 'AGPLv3, and Commercial License'
 __author__ = 'RhodeCode GmbH'
 __url__ = 'https://code.rhodecode.com'
 
 is_windows = __platform__ in ['Windows']
 is_unix = not is_windows
 is_test = False
 disable_error_handler = False

rhodecode/apps/admin/views/settings.py

@@ -1,719 +1,720 b''
 # -*- 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 logging
 import collections
 
 import datetime
 import formencode
 import formencode.htmlfill
 
 import rhodecode
 
 from pyramid.httpexceptions import HTTPFound, HTTPNotFound
 from pyramid.renderers import render
 from pyramid.response import Response
 
 from rhodecode.apps._base import BaseAppView
 from rhodecode.apps._base.navigation import navigation_list
 from rhodecode.apps.svn_support.config_keys import generate_config
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import (
     LoginRequired, HasPermissionAllDecorator, CSRFRequired)
 from rhodecode.lib.celerylib import tasks, run_task
 from rhodecode.lib.utils import repo2db_mapper
 from rhodecode.lib.utils2 import str2bool, safe_unicode, AttributeDict
 from rhodecode.lib.index import searcher_from_config
 
 from rhodecode.model.db import RhodeCodeUi, Repository
 from rhodecode.model.forms import (ApplicationSettingsForm,
     ApplicationUiSettingsForm, ApplicationVisualisationForm,
     LabsSettingsForm, IssueTrackerPatternsForm)
 from rhodecode.model.permission import PermissionModel
 from rhodecode.model.repo_group import RepoGroupModel
 
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.notification import EmailNotificationModel
 from rhodecode.model.meta import Session
 from rhodecode.model.settings import (
     IssueTrackerSettingsModel, VcsSettingsModel, SettingNotFound,
     SettingsModel)
 
 
 log = logging.getLogger(__name__)
 
 
 class AdminSettingsView(BaseAppView):
 
     def load_default_context(self):
         c = self._get_local_tmpl_context()
         c.labs_active = str2bool(
             rhodecode.CONFIG.get('labs_settings_active', 'true'))
         c.navlist = navigation_list(self.request)
         return c
 
     @classmethod
     def _get_ui_settings(cls):
         ret = RhodeCodeUi.query().all()
 
         if not ret:
             raise Exception('Could not get application ui settings !')
         settings = {}
         for each in ret:
             k = each.ui_key
             v = each.ui_value
             if k == '/':
                 k = 'root_path'
 
             if k in ['push_ssl', 'publish', 'enabled']:
                 v = str2bool(v)
 
             if k.find('.') != -1:
                 k = k.replace('.', '_')
 
             if each.ui_section in ['hooks', 'extensions']:
                 v = each.ui_active
 
             settings[each.ui_section + '_' + k] = v
         return settings
 
     @classmethod
     def _form_defaults(cls):
         defaults = SettingsModel().get_all_settings()
         defaults.update(cls._get_ui_settings())
 
         defaults.update({
             'new_svn_branch': '',
             'new_svn_tag': '',
         })
         return defaults
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     def settings_vcs(self):
         c = self.load_default_context()
         c.active = 'vcs'
         model = VcsSettingsModel()
         c.svn_branch_patterns = model.get_global_svn_branch_patterns()
         c.svn_tag_patterns = model.get_global_svn_tag_patterns()
 
         settings = self.request.registry.settings
         c.svn_proxy_generate_config = settings[generate_config]
 
         defaults = self._form_defaults()
 
         model.create_largeobjects_dirs_if_needed(defaults['paths_root_path'])
 
         data = render('rhodecode:templates/admin/settings/settings.mako',
                       self._get_template_context(c), self.request)
         html = formencode.htmlfill.render(
             data,
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False
         )
         return Response(html)
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     @CSRFRequired()
     def settings_vcs_update(self):
         _ = self.request.translate
         c = self.load_default_context()
         c.active = 'vcs'
 
         model = VcsSettingsModel()
         c.svn_branch_patterns = model.get_global_svn_branch_patterns()
         c.svn_tag_patterns = model.get_global_svn_tag_patterns()
 
         settings = self.request.registry.settings
         c.svn_proxy_generate_config = settings[generate_config]
 
         application_form = ApplicationUiSettingsForm(self.request.translate)()
 
         try:
             form_result = application_form.to_python(dict(self.request.POST))
         except formencode.Invalid as errors:
             h.flash(
                 _("Some form inputs contain invalid data."),
                 category='error')
             data = render('rhodecode:templates/admin/settings/settings.mako',
                           self._get_template_context(c), self.request)
             html = formencode.htmlfill.render(
                 data,
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8",
                 force_defaults=False
             )
             return Response(html)
 
         try:
             if c.visual.allow_repo_location_change:
                 model.update_global_path_setting(form_result['paths_root_path'])
 
             model.update_global_ssl_setting(form_result['web_push_ssl'])
             model.update_global_hook_settings(form_result)
 
             model.create_or_update_global_svn_settings(form_result)
             model.create_or_update_global_hg_settings(form_result)
             model.create_or_update_global_git_settings(form_result)
             model.create_or_update_global_pr_settings(form_result)
         except Exception:
             log.exception("Exception while updating settings")
             h.flash(_('Error occurred during updating '
                       'application settings'), category='error')
         else:
             Session().commit()
             h.flash(_('Updated VCS settings'), category='success')
             raise HTTPFound(h.route_path('admin_settings_vcs'))
 
         data = render('rhodecode:templates/admin/settings/settings.mako',
                       self._get_template_context(c), self.request)
         html = formencode.htmlfill.render(
             data,
             defaults=self._form_defaults(),
             encoding="UTF-8",
             force_defaults=False
         )
         return Response(html)
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     @CSRFRequired()
     def settings_vcs_delete_svn_pattern(self):
         delete_pattern_id = self.request.POST.get('delete_svn_pattern')
         model = VcsSettingsModel()
         try:
             model.delete_global_svn_pattern(delete_pattern_id)
         except SettingNotFound:
             log.exception(
                 'Failed to delete svn_pattern with id %s', delete_pattern_id)
             raise HTTPNotFound()
 
         Session().commit()
         return True
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     def settings_mapping(self):
         c = self.load_default_context()
         c.active = 'mapping'
 
         data = render('rhodecode:templates/admin/settings/settings.mako',
                       self._get_template_context(c), self.request)
         html = formencode.htmlfill.render(
             data,
             defaults=self._form_defaults(),
             encoding="UTF-8",
             force_defaults=False
         )
         return Response(html)
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     @CSRFRequired()
     def settings_mapping_update(self):
         _ = self.request.translate
         c = self.load_default_context()
         c.active = 'mapping'
         rm_obsolete = self.request.POST.get('destroy', False)
         invalidate_cache = self.request.POST.get('invalidate', False)
         log.debug('rescanning repo location with destroy obsolete=%s', rm_obsolete)
 
         if invalidate_cache:
             log.debug('invalidating all repositories cache')
             for repo in Repository.get_all():
                 ScmModel().mark_for_invalidation(repo.repo_name, delete=True)
 
         filesystem_repos = ScmModel().repo_scan()
         added, removed = repo2db_mapper(filesystem_repos, rm_obsolete)
         PermissionModel().trigger_permission_flush()
 
         _repr = lambda l: ', '.join(map(safe_unicode, l)) or '-'
         h.flash(_('Repositories successfully '
                   'rescanned added: %s ; removed: %s') %
                 (_repr(added), _repr(removed)),
                 category='success')
         raise HTTPFound(h.route_path('admin_settings_mapping'))
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     def settings_global(self):
         c = self.load_default_context()
         c.active = 'global'
         c.personal_repo_group_default_pattern = RepoGroupModel()\
             .get_personal_group_name_pattern()
 
         data = render('rhodecode:templates/admin/settings/settings.mako',
                       self._get_template_context(c), self.request)
         html = formencode.htmlfill.render(
             data,
             defaults=self._form_defaults(),
             encoding="UTF-8",
             force_defaults=False
         )
         return Response(html)
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     @CSRFRequired()
     def settings_global_update(self):
         _ = self.request.translate
         c = self.load_default_context()
         c.active = 'global'
         c.personal_repo_group_default_pattern = RepoGroupModel()\
             .get_personal_group_name_pattern()
         application_form = ApplicationSettingsForm(self.request.translate)()
         try:
             form_result = application_form.to_python(dict(self.request.POST))
         except formencode.Invalid as errors:
             h.flash(
                 _("Some form inputs contain invalid data."),
                 category='error')
             data = render('rhodecode:templates/admin/settings/settings.mako',
                           self._get_template_context(c), self.request)
             html = formencode.htmlfill.render(
                 data,
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8",
                 force_defaults=False
             )
             return Response(html)
 
         settings = [
             ('title', 'rhodecode_title', 'unicode'),
             ('realm', 'rhodecode_realm', 'unicode'),
             ('pre_code', 'rhodecode_pre_code', 'unicode'),
             ('post_code', 'rhodecode_post_code', 'unicode'),
             ('captcha_public_key', 'rhodecode_captcha_public_key', 'unicode'),
             ('captcha_private_key', 'rhodecode_captcha_private_key', 'unicode'),
             ('create_personal_repo_group', 'rhodecode_create_personal_repo_group', 'bool'),
             ('personal_repo_group_pattern', 'rhodecode_personal_repo_group_pattern', 'unicode'),
         ]
         try:
             for setting, form_key, type_ in settings:
                 sett = SettingsModel().create_or_update_setting(
                     setting, form_result[form_key], type_)
                 Session().add(sett)
 
             Session().commit()
             SettingsModel().invalidate_settings_cache()
             h.flash(_('Updated application settings'), category='success')
         except Exception:
             log.exception("Exception while updating application settings")
             h.flash(
                 _('Error occurred during updating application settings'),
                 category='error')
 
         raise HTTPFound(h.route_path('admin_settings_global'))
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     def settings_visual(self):
         c = self.load_default_context()
         c.active = 'visual'
 
         data = render('rhodecode:templates/admin/settings/settings.mako',
                       self._get_template_context(c), self.request)
         html = formencode.htmlfill.render(
             data,
             defaults=self._form_defaults(),
             encoding="UTF-8",
             force_defaults=False
         )
         return Response(html)
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     @CSRFRequired()
     def settings_visual_update(self):
         _ = self.request.translate
         c = self.load_default_context()
         c.active = 'visual'
         application_form = ApplicationVisualisationForm(self.request.translate)()
         try:
             form_result = application_form.to_python(dict(self.request.POST))
         except formencode.Invalid as errors:
             h.flash(
                 _("Some form inputs contain invalid data."),
                 category='error')
             data = render('rhodecode:templates/admin/settings/settings.mako',
                           self._get_template_context(c), self.request)
             html = formencode.htmlfill.render(
                 data,
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8",
                 force_defaults=False
             )
             return Response(html)
 
         try:
             settings = [
                 ('show_public_icon', 'rhodecode_show_public_icon', 'bool'),
                 ('show_private_icon', 'rhodecode_show_private_icon', 'bool'),
                 ('stylify_metatags', 'rhodecode_stylify_metatags', 'bool'),
                 ('repository_fields', 'rhodecode_repository_fields', 'bool'),
                 ('dashboard_items', 'rhodecode_dashboard_items', 'int'),
                 ('admin_grid_items', 'rhodecode_admin_grid_items', 'int'),
                 ('show_version', 'rhodecode_show_version', 'bool'),
                 ('use_gravatar', 'rhodecode_use_gravatar', 'bool'),
                 ('markup_renderer', 'rhodecode_markup_renderer', 'unicode'),
                 ('gravatar_url', 'rhodecode_gravatar_url', 'unicode'),
                 ('clone_uri_tmpl', 'rhodecode_clone_uri_tmpl', 'unicode'),
+                ('clone_uri_id_tmpl', 'rhodecode_clone_uri_id_tmpl', 'unicode'),
                 ('clone_uri_ssh_tmpl', 'rhodecode_clone_uri_ssh_tmpl', 'unicode'),
                 ('support_url', 'rhodecode_support_url', 'unicode'),
                 ('show_revision_number', 'rhodecode_show_revision_number', 'bool'),
                 ('show_sha_length', 'rhodecode_show_sha_length', 'int'),
             ]
             for setting, form_key, type_ in settings:
                 sett = SettingsModel().create_or_update_setting(
                     setting, form_result[form_key], type_)
                 Session().add(sett)
 
             Session().commit()
             SettingsModel().invalidate_settings_cache()
             h.flash(_('Updated visualisation settings'), category='success')
         except Exception:
             log.exception("Exception updating visualization settings")
             h.flash(_('Error occurred during updating '
                       'visualisation settings'),
                     category='error')
 
         raise HTTPFound(h.route_path('admin_settings_visual'))
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     def settings_issuetracker(self):
         c = self.load_default_context()
         c.active = 'issuetracker'
         defaults = c.rc_config
 
         entry_key = 'rhodecode_issuetracker_pat_'
 
         c.issuetracker_entries = {}
         for k, v in defaults.items():
             if k.startswith(entry_key):
                 uid = k[len(entry_key):]
                 c.issuetracker_entries[uid] = None
 
         for uid in c.issuetracker_entries:
             c.issuetracker_entries[uid] = AttributeDict({
                 'pat': defaults.get('rhodecode_issuetracker_pat_' + uid),
                 'url': defaults.get('rhodecode_issuetracker_url_' + uid),
                 'pref': defaults.get('rhodecode_issuetracker_pref_' + uid),
                 'desc': defaults.get('rhodecode_issuetracker_desc_' + uid),
             })
 
         return self._get_template_context(c)
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     @CSRFRequired()
     def settings_issuetracker_test(self):
         error_container = []
 
         urlified_commit = h.urlify_commit_message(
             self.request.POST.get('test_text', ''),
             'repo_group/test_repo1', error_container=error_container)
         if error_container:
             def converter(inp):
                 return h.html_escape(unicode(inp))
 
             return 'ERRORS: ' + '\n'.join(map(converter, error_container))
 
         return urlified_commit
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     @CSRFRequired()
     def settings_issuetracker_update(self):
         _ = self.request.translate
         self.load_default_context()
         settings_model = IssueTrackerSettingsModel()
 
         try:
             form = IssueTrackerPatternsForm(self.request.translate)()
             data = form.to_python(self.request.POST)
         except formencode.Invalid as errors:
             log.exception('Failed to add new pattern')
             error = errors
             h.flash(_('Invalid issue tracker pattern: {}'.format(error)),
                     category='error')
             raise HTTPFound(h.route_path('admin_settings_issuetracker'))
 
         if data:
             for uid in data.get('delete_patterns', []):
                 settings_model.delete_entries(uid)
 
             for pattern in data.get('patterns', []):
                 for setting, value, type_ in pattern:
                     sett = settings_model.create_or_update_setting(
                         setting, value, type_)
                     Session().add(sett)
 
                 Session().commit()
 
             SettingsModel().invalidate_settings_cache()
             h.flash(_('Updated issue tracker entries'), category='success')
         raise HTTPFound(h.route_path('admin_settings_issuetracker'))
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     @CSRFRequired()
     def settings_issuetracker_delete(self):
         _ = self.request.translate
         self.load_default_context()
         uid = self.request.POST.get('uid')
         try:
             IssueTrackerSettingsModel().delete_entries(uid)
         except Exception:
             log.exception('Failed to delete issue tracker setting %s', uid)
             raise HTTPNotFound()
 
         SettingsModel().invalidate_settings_cache()
         h.flash(_('Removed issue tracker entry.'), category='success')
 
         return {'deleted': uid}
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     def settings_email(self):
         c = self.load_default_context()
         c.active = 'email'
         c.rhodecode_ini = rhodecode.CONFIG
 
         data = render('rhodecode:templates/admin/settings/settings.mako',
                       self._get_template_context(c), self.request)
         html = formencode.htmlfill.render(
             data,
             defaults=self._form_defaults(),
             encoding="UTF-8",
             force_defaults=False
         )
         return Response(html)
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     @CSRFRequired()
     def settings_email_update(self):
         _ = self.request.translate
         c = self.load_default_context()
         c.active = 'email'
 
         test_email = self.request.POST.get('test_email')
 
         if not test_email:
             h.flash(_('Please enter email address'), category='error')
             raise HTTPFound(h.route_path('admin_settings_email'))
 
         email_kwargs = {
             'date': datetime.datetime.now(),
             'user': self._rhodecode_db_user
         }
 
         (subject, email_body, email_body_plaintext) = EmailNotificationModel().render_email(
             EmailNotificationModel.TYPE_EMAIL_TEST, **email_kwargs)
 
         recipients = [test_email] if test_email else None
 
         run_task(tasks.send_email, recipients, subject,
                  email_body_plaintext, email_body)
 
         h.flash(_('Send email task created'), category='success')
         raise HTTPFound(h.route_path('admin_settings_email'))
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     def settings_hooks(self):
         c = self.load_default_context()
         c.active = 'hooks'
 
         model = SettingsModel()
         c.hooks = model.get_builtin_hooks()
         c.custom_hooks = model.get_custom_hooks()
 
         data = render('rhodecode:templates/admin/settings/settings.mako',
                       self._get_template_context(c), self.request)
         html = formencode.htmlfill.render(
             data,
             defaults=self._form_defaults(),
             encoding="UTF-8",
             force_defaults=False
         )
         return Response(html)
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     @CSRFRequired()
     def settings_hooks_update(self):
         _ = self.request.translate
         c = self.load_default_context()
         c.active = 'hooks'
         if c.visual.allow_custom_hooks_settings:
             ui_key = self.request.POST.get('new_hook_ui_key')
             ui_value = self.request.POST.get('new_hook_ui_value')
 
             hook_id = self.request.POST.get('hook_id')
             new_hook = False
 
             model = SettingsModel()
             try:
                 if ui_value and ui_key:
                     model.create_or_update_hook(ui_key, ui_value)
                     h.flash(_('Added new hook'), category='success')
                     new_hook = True
                 elif hook_id:
                     RhodeCodeUi.delete(hook_id)
                     Session().commit()
 
                 # check for edits
                 update = False
                 _d = self.request.POST.dict_of_lists()
                 for k, v in zip(_d.get('hook_ui_key', []),
                                 _d.get('hook_ui_value_new', [])):
                     model.create_or_update_hook(k, v)
                     update = True
 
                 if update and not new_hook:
                     h.flash(_('Updated hooks'), category='success')
                 Session().commit()
             except Exception:
                 log.exception("Exception during hook creation")
                 h.flash(_('Error occurred during hook creation'),
                         category='error')
 
         raise HTTPFound(h.route_path('admin_settings_hooks'))
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     def settings_search(self):
         c = self.load_default_context()
         c.active = 'search'
 
         c.searcher = searcher_from_config(self.request.registry.settings)
         c.statistics = c.searcher.statistics(self.request.translate)
 
         return self._get_template_context(c)
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     def settings_automation(self):
         c = self.load_default_context()
         c.active = 'automation'
 
         return self._get_template_context(c)
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     def settings_labs(self):
         c = self.load_default_context()
         if not c.labs_active:
             raise HTTPFound(h.route_path('admin_settings'))
 
         c.active = 'labs'
         c.lab_settings = _LAB_SETTINGS
 
         data = render('rhodecode:templates/admin/settings/settings.mako',
                       self._get_template_context(c), self.request)
         html = formencode.htmlfill.render(
             data,
             defaults=self._form_defaults(),
             encoding="UTF-8",
             force_defaults=False
         )
         return Response(html)
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     @CSRFRequired()
     def settings_labs_update(self):
         _ = self.request.translate
         c = self.load_default_context()
         c.active = 'labs'
 
         application_form = LabsSettingsForm(self.request.translate)()
         try:
             form_result = application_form.to_python(dict(self.request.POST))
         except formencode.Invalid as errors:
             h.flash(
                 _("Some form inputs contain invalid data."),
                 category='error')
             data = render('rhodecode:templates/admin/settings/settings.mako',
                           self._get_template_context(c), self.request)
             html = formencode.htmlfill.render(
                 data,
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8",
                 force_defaults=False
             )
             return Response(html)
 
         try:
             session = Session()
             for setting in _LAB_SETTINGS:
                 setting_name = setting.key[len('rhodecode_'):]
                 sett = SettingsModel().create_or_update_setting(
                     setting_name, form_result[setting.key], setting.type)
                 session.add(sett)
 
         except Exception:
             log.exception('Exception while updating lab settings')
             h.flash(_('Error occurred during updating labs settings'),
                     category='error')
         else:
             Session().commit()
             SettingsModel().invalidate_settings_cache()
             h.flash(_('Updated Labs settings'), category='success')
             raise HTTPFound(h.route_path('admin_settings_labs'))
 
         data = render('rhodecode:templates/admin/settings/settings.mako',
                       self._get_template_context(c), self.request)
         html = formencode.htmlfill.render(
             data,
             defaults=self._form_defaults(),
             encoding="UTF-8",
             force_defaults=False
         )
         return Response(html)
 
 
 # :param key: name of the setting including the 'rhodecode_' prefix
 # :param type: the RhodeCodeSetting type to use.
 # :param group: the i18ned group in which we should dispaly this setting
 # :param label: the i18ned label we should display for this setting
 # :param help: the i18ned help we should dispaly for this setting
 LabSetting = collections.namedtuple(
     'LabSetting', ('key', 'type', 'group', 'label', 'help'))
 
 
 # This list has to be kept in sync with the form
 # rhodecode.model.forms.LabsSettingsForm.
 _LAB_SETTINGS = [
 
 ]

rhodecode/apps/debug_style/views.py

@@ -1,471 +1,476 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2016-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 os
 import logging
 import datetime
 
 from pyramid.renderers import render_to_response
 from rhodecode.apps._base import BaseAppView
 from rhodecode.lib.celerylib import run_task, tasks
 from rhodecode.lib.utils2 import AttributeDict
 from rhodecode.model.db import User
 from rhodecode.model.notification import EmailNotificationModel
 
 log = logging.getLogger(__name__)
 
 
 class DebugStyleView(BaseAppView):
 
     def load_default_context(self):
         c = self._get_local_tmpl_context()
         return c
 
     def index(self):
         c = self.load_default_context()
         c.active = 'index'
 
         return render_to_response(
             'debug_style/index.html', self._get_template_context(c),
             request=self.request)
 
     def render_email(self):
         c = self.load_default_context()
         email_id = self.request.matchdict['email_id']
         c.active = 'emails'
 
         pr = AttributeDict(
             pull_request_id=123,
             title='digital_ocean: fix redis, elastic search start on boot, '
                   'fix fd limits on supervisor, set postgres 11 version',
             description='''
 Check if we should use full-topic or mini-topic.
 
 - full topic produces some problems with merge states etc
 - server-mini-topic needs probably tweeks.            
             ''',
             repo_name='foobar',
             source_ref_parts=AttributeDict(type='branch', name='fix-ticket-2000'),
             target_ref_parts=AttributeDict(type='branch', name='master'),
         )
 
         target_repo = AttributeDict(repo_name='repo_group/target_repo')
         source_repo = AttributeDict(repo_name='repo_group/source_repo')
         user = User.get_by_username(self.request.GET.get('user')) or self._rhodecode_db_user
         # file/commit changes for PR update
         commit_changes = AttributeDict({
             'added': ['aaaaaaabbbbb', 'cccccccddddddd'],
             'removed': ['eeeeeeeeeee'],
         })
 
         file_changes = AttributeDict({
             'added': ['a/file1.md', 'file2.py'],
             'modified': ['b/modified_file.rst'],
             'removed': ['.idea'],
         })
 
         exc_traceback = {
             'exc_utc_date': '2020-03-26T12:54:50.683281',
             'exc_id': 139638856342656,
             'exc_timestamp': '1585227290.683288',
             'version': 'v1',
             'exc_message': 'Traceback (most recent call last):\n  File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/tweens.py", line 41, in excview_tween\n    response = handler(request)\n  File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/router.py", line 148, in handle_request\n    registry, request, context, context_iface, view_name\n  File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/view.py", line 667, in _call_view\n    response = view_callable(context, request)\n  File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/config/views.py", line 188, in attr_view\n    return view(context, request)\n  File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/config/views.py", line 214, in predicate_wrapper\n    return view(context, request)\n  File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/viewderivers.py", line 401, in viewresult_to_response\n    result = view(context, request)\n  File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/viewderivers.py", line 132, in _class_view\n    response = getattr(inst, attr)()\n  File "/mnt/hgfs/marcink/workspace/rhodecode-enterprise-ce/rhodecode/apps/debug_style/views.py", line 355, in render_email\n    template_type, **email_kwargs.get(email_id, {}))\n  File "/mnt/hgfs/marcink/workspace/rhodecode-enterprise-ce/rhodecode/model/notification.py", line 402, in render_email\n    body = email_template.render(None, **_kwargs)\n  File "/mnt/hgfs/marcink/workspace/rhodecode-enterprise-ce/rhodecode/lib/partial_renderer.py", line 95, in render\n    return self._render_with_exc(tmpl, args, kwargs)\n  File "/mnt/hgfs/marcink/workspace/rhodecode-enterprise-ce/rhodecode/lib/partial_renderer.py", line 79, in _render_with_exc\n    return render_func.render(*args, **kwargs)\n  File "/nix/store/dakh34sxz4yfr435c0cwjz0sd6hnd5g3-python2.7-mako-1.1.0/lib/python2.7/site-packages/mako/template.py", line 476, in render\n    return runtime._render(self, self.callable_, args, data)\n  File "/nix/store/dakh34sxz4yfr435c0cwjz0sd6hnd5g3-python2.7-mako-1.1.0/lib/python2.7/site-packages/mako/runtime.py", line 883, in _render\n    **_kwargs_for_callable(callable_, data)\n  File "/nix/store/dakh34sxz4yfr435c0cwjz0sd6hnd5g3-python2.7-mako-1.1.0/lib/python2.7/site-packages/mako/runtime.py", line 920, in _render_context\n    _exec_template(inherit, lclcontext, args=args, kwargs=kwargs)\n  File "/nix/store/dakh34sxz4yfr435c0cwjz0sd6hnd5g3-python2.7-mako-1.1.0/lib/python2.7/site-packages/mako/runtime.py", line 947, in _exec_template\n    callable_(context, *args, **kwargs)\n  File "rhodecode_templates_email_templates_base_mako", line 63, in render_body\n  File "rhodecode_templates_email_templates_exception_tracker_mako", line 43, in render_body\nAttributeError: \'str\' object has no attribute \'get\'\n',
             'exc_type': 'AttributeError'
         }
 
         email_kwargs = {
             'test': {},
 
             'message': {
                 'body': 'message body !'
             },
 
             'email_test': {
                 'user': user,
                 'date': datetime.datetime.now(),
             },
 
+            'update_available': {
+                'current_ver': '4.23.0',
+                'latest_ver': '4.24.0',
+            },
+
             'exception': {
                 'email_prefix': '[RHODECODE ERROR]',
                 'exc_id': exc_traceback['exc_id'],
                 'exc_url': 'http://server-url/{}'.format(exc_traceback['exc_id']),
                 'exc_type_name': 'NameError',
                 'exc_traceback': exc_traceback,
             },
 
             'password_reset': {
                 'password_reset_url': 'http://example.com/reset-rhodecode-password/token',
 
                 'user': user,
                 'date': datetime.datetime.now(),
                 'email': '[e-mail]',
                 'first_admin_email': User.get_first_super_admin().email
             },
 
             'password_reset_confirmation': {
                 'new_password': 'new-password-example',
                 'user': user,
                 'date': datetime.datetime.now(),
                 'email': '[e-mail]',
                 'first_admin_email': User.get_first_super_admin().email
             },
 
             'registration': {
                 'user': user,
                 'date': datetime.datetime.now(),
             },
 
             'pull_request_comment': {
                 'user': user,
 
                 'status_change': None,
                 'status_change_type': None,
 
                 'pull_request': pr,
                 'pull_request_commits': [],
 
                 'pull_request_target_repo': target_repo,
                 'pull_request_target_repo_url': 'http://target-repo/url',
 
                 'pull_request_source_repo': source_repo,
                 'pull_request_source_repo_url': 'http://source-repo/url',
 
                 'pull_request_url': 'http://localhost/pr1',
                 'pr_comment_url': 'http://comment-url',
                 'pr_comment_reply_url': 'http://comment-url#reply',
 
                 'comment_file': None,
                 'comment_line': None,
                 'comment_type': 'note',
                 'comment_body': 'This is my comment body. *I like !*',
                 'comment_id': 2048,
                 'renderer_type': 'markdown',
                 'mention': True,
 
             },
 
             'pull_request_comment+status': {
                 'user': user,
 
                 'status_change': 'approved',
                 'status_change_type': 'approved',
 
                 'pull_request': pr,
                 'pull_request_commits': [],
 
                 'pull_request_target_repo': target_repo,
                 'pull_request_target_repo_url': 'http://target-repo/url',
 
                 'pull_request_source_repo': source_repo,
                 'pull_request_source_repo_url': 'http://source-repo/url',
 
                 'pull_request_url': 'http://localhost/pr1',
                 'pr_comment_url': 'http://comment-url',
                 'pr_comment_reply_url': 'http://comment-url#reply',
 
                 'comment_type': 'todo',
                 'comment_file': None,
                 'comment_line': None,
                 'comment_body': '''
 I think something like this would be better
 
 ```py
 // markdown renderer
 
 def db():
    global connection
    return connection
 
 ```
                 
                 ''',
                 'comment_id': 2048,
                 'renderer_type': 'markdown',
                 'mention': True,
 
             },
 
             'pull_request_comment+file': {
                 'user': user,
 
                 'status_change': None,
                 'status_change_type': None,
 
                 'pull_request': pr,
                 'pull_request_commits': [],
 
                 'pull_request_target_repo': target_repo,
                 'pull_request_target_repo_url': 'http://target-repo/url',
 
                 'pull_request_source_repo': source_repo,
                 'pull_request_source_repo_url': 'http://source-repo/url',
 
                 'pull_request_url': 'http://localhost/pr1',
 
                 'pr_comment_url': 'http://comment-url',
                 'pr_comment_reply_url': 'http://comment-url#reply',
 
                 'comment_file': 'rhodecode/model/get_flow_commits',
                 'comment_line': 'o1210',
                 'comment_type': 'todo',
                 'comment_body': '''
 I like this !
 
 But please check this code
 
 .. code-block:: javascript
 
   // THIS IS RST CODE
 
   this.createResolutionComment = function(commentId) {
     // hide the trigger text
     $('#resolve-comment-{0}'.format(commentId)).hide();
 
     var comment = $('#comment-'+commentId);
     var commentData = comment.data();
     if (commentData.commentInline) {
         this.createComment(comment, f_path, line_no, commentId)
     } else {
         Rhodecode.comments.createGeneralComment('general', "$placeholder", commentId)
     }
 
     return false;
   };
 
 This should work better !
                 ''',
                 'comment_id': 2048,
                 'renderer_type': 'rst',
                 'mention': True,
 
             },
 
             'pull_request_update': {
                 'updating_user': user,
 
                 'status_change': None,
                 'status_change_type': None,
 
                 'pull_request': pr,
                 'pull_request_commits': [],
 
                 'pull_request_target_repo': target_repo,
                 'pull_request_target_repo_url': 'http://target-repo/url',
 
                 'pull_request_source_repo': source_repo,
                 'pull_request_source_repo_url': 'http://source-repo/url',
 
                 'pull_request_url': 'http://localhost/pr1',
 
                 # update comment links
                 'pr_comment_url': 'http://comment-url',
                 'pr_comment_reply_url': 'http://comment-url#reply',
                 'ancestor_commit_id': 'f39bd443',
                 'added_commits': commit_changes.added,
                 'removed_commits': commit_changes.removed,
                 'changed_files': (file_changes.added + file_changes.modified + file_changes.removed),
                 'added_files': file_changes.added,
                 'modified_files': file_changes.modified,
                 'removed_files': file_changes.removed,
             },
 
             'cs_comment': {
                 'user': user,
                 'commit': AttributeDict(idx=123, raw_id='a'*40, message='Commit message'),
                 'status_change': None,
                 'status_change_type': None,
 
                 'commit_target_repo_url': 'http://foo.example.com/#comment1',
                 'repo_name': 'test-repo',
                 'comment_type': 'note',
                 'comment_file': None,
                 'comment_line': None,
                 'commit_comment_url': 'http://comment-url',
                 'commit_comment_reply_url': 'http://comment-url#reply',
                 'comment_body': 'This is my comment body. *I like !*',
                 'comment_id': 2048,
                 'renderer_type': 'markdown',
                 'mention': True,
             },
 
             'cs_comment+status': {
                 'user': user,
                 'commit': AttributeDict(idx=123, raw_id='a' * 40, message='Commit message'),
                 'status_change': 'approved',
                 'status_change_type': 'approved',
 
                 'commit_target_repo_url': 'http://foo.example.com/#comment1',
                 'repo_name': 'test-repo',
                 'comment_type': 'note',
                 'comment_file': None,
                 'comment_line': None,
                 'commit_comment_url': 'http://comment-url',
                 'commit_comment_reply_url': 'http://comment-url#reply',
                 'comment_body': '''
 Hello **world**
 
 This is a multiline comment :)
 
 - list
 - list2
                 ''',
                 'comment_id': 2048,
                 'renderer_type': 'markdown',
                 'mention': True,
             },
 
             'cs_comment+file': {
                 'user': user,
                 'commit': AttributeDict(idx=123, raw_id='a' * 40, message='Commit message'),
                 'status_change': None,
                 'status_change_type': None,
 
                 'commit_target_repo_url': 'http://foo.example.com/#comment1',
                 'repo_name': 'test-repo',
 
                 'comment_type': 'note',
                 'comment_file': 'test-file.py',
                 'comment_line': 'n100',
 
                 'commit_comment_url': 'http://comment-url',
                 'commit_comment_reply_url': 'http://comment-url#reply',
                 'comment_body': 'This is my comment body. *I like !*',
                 'comment_id': 2048,
                 'renderer_type': 'markdown',
                 'mention': True,
             },
 
             'pull_request': {
                 'user': user,
                 'pull_request': pr,
                 'pull_request_commits': [
                     ('472d1df03bf7206e278fcedc6ac92b46b01c4e21', '''\
         my-account: moved email closer to profile as it's similar data just moved outside.                    
                             '''),
                     ('cbfa3061b6de2696c7161ed15ba5c6a0045f90a7', '''\
         users: description edit fixes
 
         - tests
         - added metatags info                    
                             '''),
                 ],
 
                 'pull_request_target_repo': target_repo,
                 'pull_request_target_repo_url': 'http://target-repo/url',
 
                 'pull_request_source_repo': source_repo,
                 'pull_request_source_repo_url': 'http://source-repo/url',
 
                 'pull_request_url': 'http://code.rhodecode.com/_pull-request/123',
                 'user_role': 'reviewer',
             },
 
             'pull_request+reviewer_role': {
                 'user': user,
                 'pull_request': pr,
                 'pull_request_commits': [
                     ('472d1df03bf7206e278fcedc6ac92b46b01c4e21', '''\
 my-account: moved email closer to profile as it's similar data just moved outside.                    
                     '''),
                     ('cbfa3061b6de2696c7161ed15ba5c6a0045f90a7', '''\
 users: description edit fixes
 
 - tests
 - added metatags info                    
                     '''),
                 ],
 
                 'pull_request_target_repo': target_repo,
                 'pull_request_target_repo_url': 'http://target-repo/url',
 
                 'pull_request_source_repo': source_repo,
                 'pull_request_source_repo_url': 'http://source-repo/url',
 
                 'pull_request_url': 'http://code.rhodecode.com/_pull-request/123',
                 'user_role': 'reviewer',
             },
 
             'pull_request+observer_role': {
                 'user': user,
                 'pull_request': pr,
                 'pull_request_commits': [
                     ('472d1df03bf7206e278fcedc6ac92b46b01c4e21', '''\
         my-account: moved email closer to profile as it's similar data just moved outside.                    
                             '''),
                     ('cbfa3061b6de2696c7161ed15ba5c6a0045f90a7', '''\
         users: description edit fixes
 
         - tests
         - added metatags info                    
                             '''),
                 ],
 
                 'pull_request_target_repo': target_repo,
                 'pull_request_target_repo_url': 'http://target-repo/url',
 
                 'pull_request_source_repo': source_repo,
                 'pull_request_source_repo_url': 'http://source-repo/url',
 
                 'pull_request_url': 'http://code.rhodecode.com/_pull-request/123',
                 'user_role': 'observer'
             }
         }
 
         template_type = email_id.split('+')[0]
         (c.subject, c.email_body, c.email_body_plaintext) = EmailNotificationModel().render_email(
             template_type, **email_kwargs.get(email_id, {}))
 
         test_email = self.request.GET.get('email')
         if test_email:
             recipients = [test_email]
             run_task(tasks.send_email, recipients, c.subject,
                      c.email_body_plaintext, c.email_body)
 
         if self.request.matched_route.name == 'debug_style_email_plain_rendered':
             template = 'debug_style/email_plain_rendered.mako'
         else:
             template = 'debug_style/email.mako'
         return render_to_response(
             template, self._get_template_context(c),
             request=self.request)
 
     def template(self):
         t_path = self.request.matchdict['t_path']
         c = self.load_default_context()
         c.active = os.path.splitext(t_path)[0]
         c.came_from = ''
         # NOTE(marcink): extend the email types with variations based on data sets
         c.email_types = {
             'cs_comment+file': {},
             'cs_comment+status': {},
 
             'pull_request_comment+file': {},
             'pull_request_comment+status': {},
 
             'pull_request_update': {},
 
             'pull_request+reviewer_role': {},
             'pull_request+observer_role': {},
         }
         c.email_types.update(EmailNotificationModel.email_types)
 
         return render_to_response(
             'debug_style/' + t_path, self._get_template_context(c),
             request=self.request)

rhodecode/apps/repository/tests/test_repo_pullrequests.py

@@ -1,1658 +1,1679 b''
 # -*- 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
 
 import rhodecode
 from rhodecode.lib.vcs.backends.base import MergeResponse, MergeFailureReason
 from rhodecode.lib.vcs.nodes import FileNode
 from rhodecode.lib import helpers as h
 from rhodecode.model.changeset_status import ChangesetStatusModel
 from rhodecode.model.db import (
     PullRequest, ChangesetStatus, UserLog, Notification, ChangesetComment, Repository)
 from rhodecode.model.meta import Session
 from rhodecode.model.pull_request import PullRequestModel
 from rhodecode.model.user import UserModel
 from rhodecode.model.comment import CommentsModel
 from rhodecode.tests import (
     assert_session_flash, TEST_USER_ADMIN_LOGIN, TEST_USER_REGULAR_LOGIN)
 
 
 def route_path(name, params=None, **kwargs):
     import urllib
 
     base_url = {
         'repo_changelog': '/{repo_name}/changelog',
         'repo_changelog_file': '/{repo_name}/changelog/{commit_id}/{f_path}',
         'repo_commits': '/{repo_name}/commits',
         'repo_commits_file': '/{repo_name}/commits/{commit_id}/{f_path}',
         'pullrequest_show': '/{repo_name}/pull-request/{pull_request_id}',
         'pullrequest_show_all': '/{repo_name}/pull-request',
         'pullrequest_show_all_data': '/{repo_name}/pull-request-data',
         'pullrequest_repo_refs': '/{repo_name}/pull-request/refs/{target_repo_name:.*?[^/]}',
         'pullrequest_repo_targets': '/{repo_name}/pull-request/repo-destinations',
         'pullrequest_new': '/{repo_name}/pull-request/new',
         'pullrequest_create': '/{repo_name}/pull-request/create',
         'pullrequest_update': '/{repo_name}/pull-request/{pull_request_id}/update',
         'pullrequest_merge': '/{repo_name}/pull-request/{pull_request_id}/merge',
         'pullrequest_delete': '/{repo_name}/pull-request/{pull_request_id}/delete',
         'pullrequest_comment_create': '/{repo_name}/pull-request/{pull_request_id}/comment',
         'pullrequest_comment_delete': '/{repo_name}/pull-request/{pull_request_id}/comment/{comment_id}/delete',
         'pullrequest_comment_edit': '/{repo_name}/pull-request/{pull_request_id}/comment/{comment_id}/edit',
     }[name].format(**kwargs)
 
     if params:
         base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
     return base_url
 
 
 @pytest.mark.usefixtures('app', 'autologin_user')
 @pytest.mark.backends("git", "hg")
 class TestPullrequestsView(object):
 
     def test_index(self, backend):
         self.app.get(route_path(
             'pullrequest_new',
             repo_name=backend.repo_name))
 
     def test_option_menu_create_pull_request_exists(self, backend):
         repo_name = backend.repo_name
         response = self.app.get(h.route_path('repo_summary', repo_name=repo_name))
 
         create_pr_link = '<a href="%s">Create Pull Request</a>' % route_path(
             'pullrequest_new', repo_name=repo_name)
         response.mustcontain(create_pr_link)
 
     def test_create_pr_form_with_raw_commit_id(self, backend):
         repo = backend.repo
 
         self.app.get(
             route_path('pullrequest_new', repo_name=repo.repo_name,
                        commit=repo.get_commit().raw_id),
             status=200)
 
     @pytest.mark.parametrize('pr_merge_enabled', [True, False])
     @pytest.mark.parametrize('range_diff', ["0", "1"])
     def test_show(self, pr_util, pr_merge_enabled, range_diff):
         pull_request = pr_util.create_pull_request(
             mergeable=pr_merge_enabled, enable_notifications=False)
 
         response = self.app.get(route_path(
             'pullrequest_show',
             repo_name=pull_request.target_repo.scm_instance().name,
             pull_request_id=pull_request.pull_request_id,
             params={'range-diff': range_diff}))
 
         for commit_id in pull_request.revisions:
             response.mustcontain(commit_id)
 
         response.mustcontain(pull_request.target_ref_parts.type)
         response.mustcontain(pull_request.target_ref_parts.name)
 
         response.mustcontain('class="pull-request-merge"')
 
         if pr_merge_enabled:
             response.mustcontain('Pull request reviewer approval is pending')
         else:
             response.mustcontain('Server-side pull request merging is disabled.')
 
         if range_diff == "1":
             response.mustcontain('Turn off: Show the diff as commit range')
 
     def test_show_versions_of_pr(self, backend, csrf_token):
         commits = [
             {'message': 'initial-commit',
              'added': [FileNode('test-file.txt', 'LINE1\n')]},
 
             {'message': 'commit-1',
              'changed': [FileNode('test-file.txt', 'LINE1\nLINE2\n')]},
             # Above is the initial version of PR that changes a single line
 
             # from now on we'll add 3x commit adding a nother line on each step
             {'message': 'commit-2',
              'changed': [FileNode('test-file.txt', 'LINE1\nLINE2\nLINE3\n')]},
 
             {'message': 'commit-3',
              'changed': [FileNode('test-file.txt', 'LINE1\nLINE2\nLINE3\nLINE4\n')]},
 
             {'message': 'commit-4',
              'changed': [FileNode('test-file.txt', 'LINE1\nLINE2\nLINE3\nLINE4\nLINE5\n')]},
         ]
 
         commit_ids = backend.create_master_repo(commits)
         target = backend.create_repo(heads=['initial-commit'])
         source = backend.create_repo(heads=['commit-1'])
         source_repo_name = source.repo_name
         target_repo_name = target.repo_name
 
         target_ref = 'branch:{branch}:{commit_id}'.format(
             branch=backend.default_branch_name, commit_id=commit_ids['initial-commit'])
         source_ref = 'branch:{branch}:{commit_id}'.format(
              branch=backend.default_branch_name, commit_id=commit_ids['commit-1'])
 
         response = self.app.post(
             route_path('pullrequest_create', repo_name=source.repo_name),
             [
                 ('source_repo', source_repo_name),
                 ('source_ref', source_ref),
                 ('target_repo', target_repo_name),
                 ('target_ref',  target_ref),
                 ('common_ancestor', commit_ids['initial-commit']),
                 ('pullrequest_title', 'Title'),
                 ('pullrequest_desc', 'Description'),
                 ('description_renderer', 'markdown'),
                 ('__start__', 'review_members:sequence'),
                     ('__start__', 'reviewer:mapping'),
                         ('user_id', '1'),
                         ('__start__', 'reasons:sequence'),
                             ('reason', 'Some reason'),
                         ('__end__', 'reasons:sequence'),
                         ('__start__', 'rules:sequence'),
                         ('__end__', 'rules:sequence'),
                         ('mandatory', 'False'),
                     ('__end__', 'reviewer:mapping'),
                 ('__end__', 'review_members:sequence'),
                 ('__start__', 'revisions:sequence'),
                     ('revisions', commit_ids['commit-1']),
                 ('__end__', 'revisions:sequence'),
                 ('user', ''),
                 ('csrf_token', csrf_token),
             ],
             status=302)
 
         location = response.headers['Location']
 
         pull_request_id = location.rsplit('/', 1)[1]
         assert pull_request_id != 'new'
         pull_request = PullRequest.get(int(pull_request_id))
 
         pull_request_id = pull_request.pull_request_id
 
         # Show initial version of PR
         response = self.app.get(
             route_path('pullrequest_show',
                        repo_name=target_repo_name,
                        pull_request_id=pull_request_id))
 
         response.mustcontain('commit-1')
         response.mustcontain(no=['commit-2'])
         response.mustcontain(no=['commit-3'])
         response.mustcontain(no=['commit-4'])
 
         response.mustcontain('cb-addition"></span><span>LINE2</span>')
         response.mustcontain(no=['LINE3'])
         response.mustcontain(no=['LINE4'])
         response.mustcontain(no=['LINE5'])
 
         # update PR #1
         source_repo = Repository.get_by_repo_name(source_repo_name)
         backend.pull_heads(source_repo, heads=['commit-2'])
         response = self.app.post(
             route_path('pullrequest_update',
                        repo_name=target_repo_name, pull_request_id=pull_request_id),
             params={'update_commits': 'true', 'csrf_token': csrf_token})
 
         # update PR #2
         source_repo = Repository.get_by_repo_name(source_repo_name)
         backend.pull_heads(source_repo, heads=['commit-3'])
         response = self.app.post(
             route_path('pullrequest_update',
                        repo_name=target_repo_name, pull_request_id=pull_request_id),
             params={'update_commits': 'true', 'csrf_token': csrf_token})
 
         # update PR #3
         source_repo = Repository.get_by_repo_name(source_repo_name)
         backend.pull_heads(source_repo, heads=['commit-4'])
         response = self.app.post(
             route_path('pullrequest_update',
                        repo_name=target_repo_name, pull_request_id=pull_request_id),
             params={'update_commits': 'true', 'csrf_token': csrf_token})
 
         # Show final version !
         response = self.app.get(
             route_path('pullrequest_show',
                        repo_name=target_repo_name,
                        pull_request_id=pull_request_id))
 
         # 3 updates, and the latest == 4
         response.mustcontain('4 versions available for this pull request')
         response.mustcontain(no=['rhodecode diff rendering error'])
 
         # initial show must have 3 commits, and 3 adds
         response.mustcontain('commit-1')
         response.mustcontain('commit-2')
         response.mustcontain('commit-3')
         response.mustcontain('commit-4')
 
         response.mustcontain('cb-addition"></span><span>LINE2</span>')
         response.mustcontain('cb-addition"></span><span>LINE3</span>')
         response.mustcontain('cb-addition"></span><span>LINE4</span>')
         response.mustcontain('cb-addition"></span><span>LINE5</span>')
 
         # fetch versions
         pr = PullRequest.get(pull_request_id)
         versions = [x.pull_request_version_id for x in pr.versions.all()]
         assert len(versions) == 3
 
         # show v1,v2,v3,v4
         def cb_line(text):
             return 'cb-addition"></span><span>{}</span>'.format(text)
 
         def cb_context(text):
             return '<span class="cb-code"><span class="cb-action cb-context">' \
                    '</span><span>{}</span></span>'.format(text)
 
         commit_tests = {
             # in response, not in response
             1: (['commit-1'], ['commit-2', 'commit-3', 'commit-4']),
             2: (['commit-1', 'commit-2'], ['commit-3', 'commit-4']),
             3: (['commit-1', 'commit-2', 'commit-3'], ['commit-4']),
             4: (['commit-1', 'commit-2', 'commit-3', 'commit-4'], []),
         }
         diff_tests = {
             1: (['LINE2'], ['LINE3', 'LINE4', 'LINE5']),
             2: (['LINE2', 'LINE3'], ['LINE4', 'LINE5']),
             3: (['LINE2', 'LINE3', 'LINE4'], ['LINE5']),
             4: (['LINE2', 'LINE3', 'LINE4', 'LINE5'], []),
         }
         for idx, ver in enumerate(versions, 1):
 
             response = self.app.get(
                 route_path('pullrequest_show',
                            repo_name=target_repo_name,
                            pull_request_id=pull_request_id,
                            params={'version': ver}))
 
             response.mustcontain(no=['rhodecode diff rendering error'])
             response.mustcontain('Showing changes at v{}'.format(idx))
 
             yes, no = commit_tests[idx]
             for y in yes:
                 response.mustcontain(y)
             for n in no:
                 response.mustcontain(no=n)
 
             yes, no = diff_tests[idx]
             for y in yes:
                 response.mustcontain(cb_line(y))
             for n in no:
                 response.mustcontain(no=n)
 
         # show diff between versions
         diff_compare_tests = {
             1: (['LINE3'], ['LINE1', 'LINE2']),
             2: (['LINE3', 'LINE4'], ['LINE1', 'LINE2']),
             3: (['LINE3', 'LINE4', 'LINE5'], ['LINE1', 'LINE2']),
         }
         for idx, ver in enumerate(versions, 1):
             adds, context = diff_compare_tests[idx]
 
             to_ver = ver+1
             if idx == 3:
                 to_ver = 'latest'
 
             response = self.app.get(
                 route_path('pullrequest_show',
                            repo_name=target_repo_name,
                            pull_request_id=pull_request_id,
                            params={'from_version': versions[0], 'version': to_ver}))
 
             response.mustcontain(no=['rhodecode diff rendering error'])
 
             for a in adds:
                 response.mustcontain(cb_line(a))
             for c in context:
                 response.mustcontain(cb_context(c))
 
         # test version v2 -> v3
         response = self.app.get(
             route_path('pullrequest_show',
                        repo_name=target_repo_name,
                        pull_request_id=pull_request_id,
                        params={'from_version': versions[1], 'version': versions[2]}))
 
         response.mustcontain(cb_context('LINE1'))
         response.mustcontain(cb_context('LINE2'))
         response.mustcontain(cb_context('LINE3'))
         response.mustcontain(cb_line('LINE4'))
 
     def test_close_status_visibility(self, pr_util, user_util, csrf_token):
         # Logout
         response = self.app.post(
             h.route_path('logout'),
             params={'csrf_token': csrf_token})
         # Login as regular user
         response = self.app.post(h.route_path('login'),
                                  {'username': TEST_USER_REGULAR_LOGIN,
                                   'password': 'test12'})
 
         pull_request = pr_util.create_pull_request(
             author=TEST_USER_REGULAR_LOGIN)
 
         response = self.app.get(route_path(
             'pullrequest_show',
             repo_name=pull_request.target_repo.scm_instance().name,
             pull_request_id=pull_request.pull_request_id))
 
         response.mustcontain('Server-side pull request merging is disabled.')
 
         assert_response = response.assert_response()
         # for regular user without a merge permissions, we don't see it
         assert_response.no_element_exists('#close-pull-request-action')
 
         user_util.grant_user_permission_to_repo(
             pull_request.target_repo,
             UserModel().get_by_username(TEST_USER_REGULAR_LOGIN),
             'repository.write')
         response = self.app.get(route_path(
             'pullrequest_show',
             repo_name=pull_request.target_repo.scm_instance().name,
             pull_request_id=pull_request.pull_request_id))
 
         response.mustcontain('Server-side pull request merging is disabled.')
 
         assert_response = response.assert_response()
         # now regular user has a merge permissions, we have CLOSE button
         assert_response.one_element_exists('#close-pull-request-action')
 
     def test_show_invalid_commit_id(self, pr_util):
         # Simulating invalid revisions which will cause a lookup error
         pull_request = pr_util.create_pull_request()
         pull_request.revisions = ['invalid']
         Session().add(pull_request)
         Session().commit()
 
         response = self.app.get(route_path(
             'pullrequest_show',
             repo_name=pull_request.target_repo.scm_instance().name,
             pull_request_id=pull_request.pull_request_id))
 
         for commit_id in pull_request.revisions:
             response.mustcontain(commit_id)
 
     def test_show_invalid_source_reference(self, pr_util):
         pull_request = pr_util.create_pull_request()
         pull_request.source_ref = 'branch:b:invalid'
         Session().add(pull_request)
         Session().commit()
 
         self.app.get(route_path(
             'pullrequest_show',
             repo_name=pull_request.target_repo.scm_instance().name,
             pull_request_id=pull_request.pull_request_id))
 
     def test_edit_title_description(self, pr_util, csrf_token):
         pull_request = pr_util.create_pull_request()
         pull_request_id = pull_request.pull_request_id
 
         response = self.app.post(
             route_path('pullrequest_update',
                 repo_name=pull_request.target_repo.repo_name,
                 pull_request_id=pull_request_id),
             params={
                 'edit_pull_request': 'true',
                 'title': 'New title',
                 'description': 'New description',
                 'csrf_token': csrf_token})
 
         assert_session_flash(
             response, u'Pull request title & description updated.',
             category='success')
 
         pull_request = PullRequest.get(pull_request_id)
         assert pull_request.title == 'New title'
         assert pull_request.description == 'New description'
 
+    def test_edit_title_description(self, pr_util, csrf_token):
+        pull_request = pr_util.create_pull_request()
+        pull_request_id = pull_request.pull_request_id
+
+        response = self.app.post(
+            route_path('pullrequest_update',
+                repo_name=pull_request.target_repo.repo_name,
+                pull_request_id=pull_request_id),
+            params={
+                'edit_pull_request': 'true',
+                'title': 'New title {} {2} {foo}',
+                'description': 'New description',
+                'csrf_token': csrf_token})
+
+        assert_session_flash(
+            response, u'Pull request title & description updated.',
+            category='success')
+
+        pull_request = PullRequest.get(pull_request_id)
+        assert pull_request.title_safe == 'New title {{}} {{2}} {{foo}}'
+
     def test_edit_title_description_closed(self, pr_util, csrf_token):
         pull_request = pr_util.create_pull_request()
         pull_request_id = pull_request.pull_request_id
         repo_name = pull_request.target_repo.repo_name
         pr_util.close()
 
         response = self.app.post(
             route_path('pullrequest_update',
                        repo_name=repo_name, pull_request_id=pull_request_id),
             params={
                 'edit_pull_request': 'true',
                 'title': 'New title',
                 'description': 'New description',
                 'csrf_token': csrf_token}, status=200)
         assert_session_flash(
             response, u'Cannot update closed pull requests.',
             category='error')
 
     def test_update_invalid_source_reference(self, pr_util, csrf_token):
         from rhodecode.lib.vcs.backends.base import UpdateFailureReason
 
         pull_request = pr_util.create_pull_request()
         pull_request.source_ref = 'branch:invalid-branch:invalid-commit-id'
         Session().add(pull_request)
         Session().commit()
 
         pull_request_id = pull_request.pull_request_id
 
         response = self.app.post(
             route_path('pullrequest_update',
                 repo_name=pull_request.target_repo.repo_name,
                 pull_request_id=pull_request_id),
             params={'update_commits': 'true', 'csrf_token': csrf_token})
 
         expected_msg = str(PullRequestModel.UPDATE_STATUS_MESSAGES[
             UpdateFailureReason.MISSING_SOURCE_REF])
         assert_session_flash(response, expected_msg, category='error')
 
     def test_missing_target_reference(self, pr_util, csrf_token):
         from rhodecode.lib.vcs.backends.base import MergeFailureReason
         pull_request = pr_util.create_pull_request(
             approved=True, mergeable=True)
         unicode_reference = u'branch:invalid-branch:invalid-commit-id'
         pull_request.target_ref = unicode_reference
         Session().add(pull_request)
         Session().commit()
 
         pull_request_id = pull_request.pull_request_id
         pull_request_url = route_path(
             'pullrequest_show',
             repo_name=pull_request.target_repo.repo_name,
             pull_request_id=pull_request_id)
 
         response = self.app.get(pull_request_url)
         target_ref_id = 'invalid-branch'
         merge_resp = MergeResponse(
             True, True, '', MergeFailureReason.MISSING_TARGET_REF,
             metadata={'target_ref': PullRequest.unicode_to_reference(unicode_reference)})
         response.assert_response().element_contains(
             'div[data-role="merge-message"]', merge_resp.merge_status_message)
 
     def test_comment_and_close_pull_request_custom_message_approved(
             self, pr_util, csrf_token, xhr_header):
 
         pull_request = pr_util.create_pull_request(approved=True)
         pull_request_id = pull_request.pull_request_id
         author = pull_request.user_id
         repo = pull_request.target_repo.repo_id
 
         self.app.post(
             route_path('pullrequest_comment_create',
                        repo_name=pull_request.target_repo.scm_instance().name,
                        pull_request_id=pull_request_id),
             params={
                 'close_pull_request': '1',
                 'text': 'Closing a PR',
                 'csrf_token': csrf_token},
             extra_environ=xhr_header,)
 
         journal = UserLog.query()\
             .filter(UserLog.user_id == author)\
             .filter(UserLog.repository_id == repo) \
             .order_by(UserLog.user_log_id.asc()) \
             .all()
         assert journal[-1].action == 'repo.pull_request.close'
 
         pull_request = PullRequest.get(pull_request_id)
         assert pull_request.is_closed()
 
         status = ChangesetStatusModel().get_status(
             pull_request.source_repo, pull_request=pull_request)
         assert status == ChangesetStatus.STATUS_APPROVED
         comments = ChangesetComment().query() \
             .filter(ChangesetComment.pull_request == pull_request) \
             .order_by(ChangesetComment.comment_id.asc())\
             .all()
         assert comments[-1].text == 'Closing a PR'
 
     def test_comment_force_close_pull_request_rejected(
             self, pr_util, csrf_token, xhr_header):
         pull_request = pr_util.create_pull_request()
         pull_request_id = pull_request.pull_request_id
         PullRequestModel().update_reviewers(
             pull_request_id, [
                 (1, ['reason'], False, 'reviewer', []),
                 (2, ['reason2'], False, 'reviewer', [])],
             pull_request.author)
         author = pull_request.user_id
         repo = pull_request.target_repo.repo_id
 
         self.app.post(
             route_path('pullrequest_comment_create',
                 repo_name=pull_request.target_repo.scm_instance().name,
                 pull_request_id=pull_request_id),
             params={
                 'close_pull_request': '1',
                 'csrf_token': csrf_token},
             extra_environ=xhr_header)
 
         pull_request = PullRequest.get(pull_request_id)
 
         journal = UserLog.query()\
             .filter(UserLog.user_id == author, UserLog.repository_id == repo) \
             .order_by(UserLog.user_log_id.asc()) \
             .all()
         assert journal[-1].action == 'repo.pull_request.close'
 
         # check only the latest status, not the review status
         status = ChangesetStatusModel().get_status(
             pull_request.source_repo, pull_request=pull_request)
         assert status == ChangesetStatus.STATUS_REJECTED
 
     def test_comment_and_close_pull_request(
             self, pr_util, csrf_token, xhr_header):
         pull_request = pr_util.create_pull_request()
         pull_request_id = pull_request.pull_request_id
 
         response = self.app.post(
             route_path('pullrequest_comment_create',
                        repo_name=pull_request.target_repo.scm_instance().name,
                        pull_request_id=pull_request.pull_request_id),
             params={
                 'close_pull_request': 'true',
                 'csrf_token': csrf_token},
             extra_environ=xhr_header)
 
         assert response.json
 
         pull_request = PullRequest.get(pull_request_id)
         assert pull_request.is_closed()
 
         # check only the latest status, not the review status
         status = ChangesetStatusModel().get_status(
             pull_request.source_repo, pull_request=pull_request)
         assert status == ChangesetStatus.STATUS_REJECTED
 
     def test_comment_and_close_pull_request_try_edit_comment(
             self, pr_util, csrf_token, xhr_header
     ):
         pull_request = pr_util.create_pull_request()
         pull_request_id = pull_request.pull_request_id
         target_scm = pull_request.target_repo.scm_instance()
         target_scm_name = target_scm.name
 
         response = self.app.post(
             route_path(
                 'pullrequest_comment_create',
                 repo_name=target_scm_name,
                 pull_request_id=pull_request_id,
             ),
             params={
                 'close_pull_request': 'true',
                 'csrf_token': csrf_token,
             },
             extra_environ=xhr_header)
 
         assert response.json
 
         pull_request = PullRequest.get(pull_request_id)
         target_scm = pull_request.target_repo.scm_instance()
         target_scm_name = target_scm.name
         assert pull_request.is_closed()
 
         # check only the latest status, not the review status
         status = ChangesetStatusModel().get_status(
             pull_request.source_repo, pull_request=pull_request)
         assert status == ChangesetStatus.STATUS_REJECTED
 
         for comment_id in response.json.keys():
             test_text = 'test'
             response = self.app.post(
                 route_path(
                     'pullrequest_comment_edit',
                     repo_name=target_scm_name,
                     pull_request_id=pull_request_id,
                     comment_id=comment_id,
                 ),
                 extra_environ=xhr_header,
                 params={
                     'csrf_token': csrf_token,
                     'text': test_text,
                 },
                 status=403,
             )
             assert response.status_int == 403
 
     def test_comment_and_comment_edit(self, pr_util, csrf_token, xhr_header):
         pull_request = pr_util.create_pull_request()
         target_scm = pull_request.target_repo.scm_instance()
         target_scm_name = target_scm.name
 
         response = self.app.post(
             route_path(
                 'pullrequest_comment_create',
                 repo_name=target_scm_name,
                 pull_request_id=pull_request.pull_request_id),
             params={
                 'csrf_token': csrf_token,
                 'text': 'init',
             },
             extra_environ=xhr_header,
         )
         assert response.json
 
         for comment_id in response.json.keys():
             assert comment_id
             test_text = 'test'
             self.app.post(
                 route_path(
                     'pullrequest_comment_edit',
                     repo_name=target_scm_name,
                     pull_request_id=pull_request.pull_request_id,
                     comment_id=comment_id,
                 ),
                 extra_environ=xhr_header,
                 params={
                     'csrf_token': csrf_token,
                     'text': test_text,
                     'version': '0',
                 },
 
             )
             text_form_db = ChangesetComment.query().filter(
                 ChangesetComment.comment_id == comment_id).first().text
             assert test_text == text_form_db
 
     def test_comment_and_comment_edit(self, pr_util, csrf_token, xhr_header):
         pull_request = pr_util.create_pull_request()
         target_scm = pull_request.target_repo.scm_instance()
         target_scm_name = target_scm.name
 
         response = self.app.post(
             route_path(
                 'pullrequest_comment_create',
                 repo_name=target_scm_name,
                 pull_request_id=pull_request.pull_request_id),
             params={
                 'csrf_token': csrf_token,
                 'text': 'init',
             },
             extra_environ=xhr_header,
         )
         assert response.json
 
         for comment_id in response.json.keys():
             test_text = 'init'
             response = self.app.post(
                 route_path(
                     'pullrequest_comment_edit',
                     repo_name=target_scm_name,
                     pull_request_id=pull_request.pull_request_id,
                     comment_id=comment_id,
                 ),
                 extra_environ=xhr_header,
                 params={
                     'csrf_token': csrf_token,
                     'text': test_text,
                     'version': '0',
                 },
                 status=404,
 
             )
             assert response.status_int == 404
 
     def test_comment_and_try_edit_already_edited(self, pr_util, csrf_token, xhr_header):
         pull_request = pr_util.create_pull_request()
         target_scm = pull_request.target_repo.scm_instance()
         target_scm_name = target_scm.name
 
         response = self.app.post(
             route_path(
                 'pullrequest_comment_create',
                 repo_name=target_scm_name,
                 pull_request_id=pull_request.pull_request_id),
             params={
                 'csrf_token': csrf_token,
                 'text': 'init',
             },
             extra_environ=xhr_header,
         )
         assert response.json
         for comment_id in response.json.keys():
             test_text = 'test'
             self.app.post(
                 route_path(
                     'pullrequest_comment_edit',
                     repo_name=target_scm_name,
                     pull_request_id=pull_request.pull_request_id,
                     comment_id=comment_id,
                 ),
                 extra_environ=xhr_header,
                 params={
                     'csrf_token': csrf_token,
                     'text': test_text,
                     'version': '0',
                 },
 
             )
             test_text_v2 = 'test_v2'
             response = self.app.post(
                 route_path(
                     'pullrequest_comment_edit',
                     repo_name=target_scm_name,
                     pull_request_id=pull_request.pull_request_id,
                     comment_id=comment_id,
                 ),
                 extra_environ=xhr_header,
                 params={
                     'csrf_token': csrf_token,
                     'text': test_text_v2,
                     'version': '0',
                 },
                 status=409,
             )
             assert response.status_int == 409
 
             text_form_db = ChangesetComment.query().filter(
                 ChangesetComment.comment_id == comment_id).first().text
 
             assert test_text == text_form_db
             assert test_text_v2 != text_form_db
 
     def test_comment_and_comment_edit_permissions_forbidden(
             self, autologin_regular_user, user_regular, user_admin, pr_util,
             csrf_token, xhr_header):
         pull_request = pr_util.create_pull_request(
             author=user_admin.username, enable_notifications=False)
         comment = CommentsModel().create(
             text='test',
             repo=pull_request.target_repo.scm_instance().name,
             user=user_admin,
             pull_request=pull_request,
         )
         response = self.app.post(
             route_path(
                 'pullrequest_comment_edit',
                 repo_name=pull_request.target_repo.scm_instance().name,
                 pull_request_id=pull_request.pull_request_id,
                 comment_id=comment.comment_id,
             ),
             extra_environ=xhr_header,
             params={
                 'csrf_token': csrf_token,
                 'text': 'test_text',
             },
             status=403,
         )
         assert response.status_int == 403
 
     def test_create_pull_request(self, backend, csrf_token):
         commits = [
             {'message': 'ancestor'},
             {'message': 'change'},
             {'message': 'change2'},
         ]
         commit_ids = backend.create_master_repo(commits)
         target = backend.create_repo(heads=['ancestor'])
         source = backend.create_repo(heads=['change2'])
 
         response = self.app.post(
             route_path('pullrequest_create', repo_name=source.repo_name),
             [
                 ('source_repo', source.repo_name),
                 ('source_ref', 'branch:default:' + commit_ids['change2']),
                 ('target_repo', target.repo_name),
                 ('target_ref',  'branch:default:' + commit_ids['ancestor']),
                 ('common_ancestor', commit_ids['ancestor']),
                 ('pullrequest_title', 'Title'),
                 ('pullrequest_desc', 'Description'),
                 ('description_renderer', 'markdown'),
                 ('__start__', 'review_members:sequence'),
                     ('__start__', 'reviewer:mapping'),
                         ('user_id', '1'),
                         ('__start__', 'reasons:sequence'),
                             ('reason', 'Some reason'),
                         ('__end__', 'reasons:sequence'),
                         ('__start__', 'rules:sequence'),
                         ('__end__', 'rules:sequence'),
                         ('mandatory', 'False'),
                     ('__end__', 'reviewer:mapping'),
                 ('__end__', 'review_members:sequence'),
                 ('__start__', 'revisions:sequence'),
                     ('revisions', commit_ids['change']),
                     ('revisions', commit_ids['change2']),
                 ('__end__', 'revisions:sequence'),
                 ('user', ''),
                 ('csrf_token', csrf_token),
             ],
             status=302)
 
         location = response.headers['Location']
         pull_request_id = location.rsplit('/', 1)[1]
         assert pull_request_id != 'new'
         pull_request = PullRequest.get(int(pull_request_id))
 
         # check that we have now both revisions
         assert pull_request.revisions == [commit_ids['change2'], commit_ids['change']]
         assert pull_request.source_ref == 'branch:default:' + commit_ids['change2']
         expected_target_ref = 'branch:default:' + commit_ids['ancestor']
         assert pull_request.target_ref == expected_target_ref
 
     def test_reviewer_notifications(self, backend, csrf_token):
         # We have to use the app.post for this test so it will create the
         # notifications properly with the new PR
         commits = [
             {'message': 'ancestor',
              'added': [FileNode('file_A', content='content_of_ancestor')]},
             {'message': 'change',
              'added': [FileNode('file_a', content='content_of_change')]},
             {'message': 'change-child'},
             {'message': 'ancestor-child', 'parents': ['ancestor'],
              'added': [
                 FileNode('file_B', content='content_of_ancestor_child')]},
             {'message': 'ancestor-child-2'},
         ]
         commit_ids = backend.create_master_repo(commits)
         target = backend.create_repo(heads=['ancestor-child'])
         source = backend.create_repo(heads=['change'])
 
         response = self.app.post(
             route_path('pullrequest_create', repo_name=source.repo_name),
             [
                 ('source_repo', source.repo_name),
                 ('source_ref', 'branch:default:' + commit_ids['change']),
                 ('target_repo', target.repo_name),
                 ('target_ref',  'branch:default:' + commit_ids['ancestor-child']),
                 ('common_ancestor', commit_ids['ancestor']),
                 ('pullrequest_title', 'Title'),
                 ('pullrequest_desc', 'Description'),
                 ('description_renderer', 'markdown'),
                 ('__start__', 'review_members:sequence'),
                     ('__start__', 'reviewer:mapping'),
                         ('user_id', '2'),
                         ('__start__', 'reasons:sequence'),
                             ('reason', 'Some reason'),
                         ('__end__', 'reasons:sequence'),
                         ('__start__', 'rules:sequence'),
                         ('__end__', 'rules:sequence'),
                         ('mandatory', 'False'),
                     ('__end__', 'reviewer:mapping'),
                 ('__end__', 'review_members:sequence'),
                 ('__start__', 'revisions:sequence'),
                     ('revisions', commit_ids['change']),
                 ('__end__', 'revisions:sequence'),
                 ('user', ''),
                 ('csrf_token', csrf_token),
             ],
             status=302)
 
         location = response.headers['Location']
 
         pull_request_id = location.rsplit('/', 1)[1]
         assert pull_request_id != 'new'
         pull_request = PullRequest.get(int(pull_request_id))
 
         # Check that a notification was made
         notifications = Notification.query()\
             .filter(Notification.created_by == pull_request.author.user_id,
                     Notification.type_ == Notification.TYPE_PULL_REQUEST,
                     Notification.subject.contains(
                         "requested a pull request review. !%s" % pull_request_id))
         assert len(notifications.all()) == 1
 
         # Change reviewers and check that a notification was made
         PullRequestModel().update_reviewers(
             pull_request.pull_request_id, [
                 (1, [], False, 'reviewer', [])
             ],
             pull_request.author)
         assert len(notifications.all()) == 2
 
     def test_create_pull_request_stores_ancestor_commit_id(self, backend, csrf_token):
         commits = [
             {'message': 'ancestor',
              'added': [FileNode('file_A', content='content_of_ancestor')]},
             {'message': 'change',
              'added': [FileNode('file_a', content='content_of_change')]},
             {'message': 'change-child'},
             {'message': 'ancestor-child', 'parents': ['ancestor'],
              'added': [
                 FileNode('file_B', content='content_of_ancestor_child')]},
             {'message': 'ancestor-child-2'},
         ]
         commit_ids = backend.create_master_repo(commits)
         target = backend.create_repo(heads=['ancestor-child'])
         source = backend.create_repo(heads=['change'])
 
         response = self.app.post(
             route_path('pullrequest_create', repo_name=source.repo_name),
             [
                 ('source_repo', source.repo_name),
                 ('source_ref', 'branch:default:' + commit_ids['change']),
                 ('target_repo', target.repo_name),
                 ('target_ref',  'branch:default:' + commit_ids['ancestor-child']),
                 ('common_ancestor', commit_ids['ancestor']),
                 ('pullrequest_title', 'Title'),
                 ('pullrequest_desc', 'Description'),
                 ('description_renderer', 'markdown'),
                 ('__start__', 'review_members:sequence'),
                     ('__start__', 'reviewer:mapping'),
                         ('user_id', '1'),
                         ('__start__', 'reasons:sequence'),
                             ('reason', 'Some reason'),
                         ('__end__', 'reasons:sequence'),
                         ('__start__', 'rules:sequence'),
                         ('__end__', 'rules:sequence'),
                         ('mandatory', 'False'),
                     ('__end__', 'reviewer:mapping'),
                 ('__end__', 'review_members:sequence'),
                 ('__start__', 'revisions:sequence'),
                     ('revisions', commit_ids['change']),
                 ('__end__', 'revisions:sequence'),
                 ('user', ''),
                 ('csrf_token', csrf_token),
             ],
             status=302)
 
         location = response.headers['Location']
 
         pull_request_id = location.rsplit('/', 1)[1]
         assert pull_request_id != 'new'
         pull_request = PullRequest.get(int(pull_request_id))
 
         # target_ref has to point to the ancestor's commit_id in order to
         # show the correct diff
         expected_target_ref = 'branch:default:' + commit_ids['ancestor']
         assert pull_request.target_ref == expected_target_ref
 
         # Check generated diff contents
         response = response.follow()
         response.mustcontain(no=['content_of_ancestor'])
         response.mustcontain(no=['content_of_ancestor-child'])
         response.mustcontain('content_of_change')
 
     def test_merge_pull_request_enabled(self, pr_util, csrf_token):
         # Clear any previous calls to rcextensions
         rhodecode.EXTENSIONS.calls.clear()
 
         pull_request = pr_util.create_pull_request(
             approved=True, mergeable=True)
         pull_request_id = pull_request.pull_request_id
         repo_name = pull_request.target_repo.scm_instance().name,
 
         url = route_path('pullrequest_merge',
                          repo_name=str(repo_name[0]),
                          pull_request_id=pull_request_id)
         response = self.app.post(url, params={'csrf_token': csrf_token}).follow()
 
         pull_request = PullRequest.get(pull_request_id)
 
         assert response.status_int == 200
         assert pull_request.is_closed()
         assert_pull_request_status(
             pull_request, ChangesetStatus.STATUS_APPROVED)
 
         # Check the relevant log entries were added
         user_logs = UserLog.query().order_by(UserLog.user_log_id.desc()).limit(3)
         actions = [log.action for log in user_logs]
         pr_commit_ids = PullRequestModel()._get_commit_ids(pull_request)
         expected_actions = [
              u'repo.pull_request.close',
              u'repo.pull_request.merge',
              u'repo.pull_request.comment.create'
         ]
         assert actions == expected_actions
 
         user_logs = UserLog.query().order_by(UserLog.user_log_id.desc()).limit(4)
         actions = [log for log in user_logs]
         assert actions[-1].action == 'user.push'
         assert actions[-1].action_data['commit_ids'] == pr_commit_ids
 
         # Check post_push rcextension was really executed
         push_calls = rhodecode.EXTENSIONS.calls['_push_hook']
         assert len(push_calls) == 1
         unused_last_call_args, last_call_kwargs = push_calls[0]
         assert last_call_kwargs['action'] == 'push'
         assert last_call_kwargs['commit_ids'] == pr_commit_ids
 
     def test_merge_pull_request_disabled(self, pr_util, csrf_token):
         pull_request = pr_util.create_pull_request(mergeable=False)
         pull_request_id = pull_request.pull_request_id
         pull_request = PullRequest.get(pull_request_id)
 
         response = self.app.post(
             route_path('pullrequest_merge',
                 repo_name=pull_request.target_repo.scm_instance().name,
                 pull_request_id=pull_request.pull_request_id),
             params={'csrf_token': csrf_token}).follow()
 
         assert response.status_int == 200
         response.mustcontain(
             'Merge is not currently possible because of below failed checks.')
         response.mustcontain('Server-side pull request merging is disabled.')
 
     @pytest.mark.skip_backends('svn')
     def test_merge_pull_request_not_approved(self, pr_util, csrf_token):
         pull_request = pr_util.create_pull_request(mergeable=True)
         pull_request_id = pull_request.pull_request_id
         repo_name = pull_request.target_repo.scm_instance().name
 
         response = self.app.post(
             route_path('pullrequest_merge',
                        repo_name=repo_name, pull_request_id=pull_request_id),
             params={'csrf_token': csrf_token}).follow()
 
         assert response.status_int == 200
 
         response.mustcontain(
             'Merge is not currently possible because of below failed checks.')
         response.mustcontain('Pull request reviewer approval is pending.')
 
     def test_merge_pull_request_renders_failure_reason(
             self, user_regular, csrf_token, pr_util):
         pull_request = pr_util.create_pull_request(mergeable=True, approved=True)
         pull_request_id = pull_request.pull_request_id
         repo_name = pull_request.target_repo.scm_instance().name
 
         merge_resp = MergeResponse(True, False, 'STUB_COMMIT_ID',
                                    MergeFailureReason.PUSH_FAILED,
                                    metadata={'target': 'shadow repo',
                                              'merge_commit': 'xxx'})
         model_patcher = mock.patch.multiple(
             PullRequestModel,
             merge_repo=mock.Mock(return_value=merge_resp),
             merge_status=mock.Mock(return_value=(None, True, 'WRONG_MESSAGE')))
 
         with model_patcher:
             response = self.app.post(
                 route_path('pullrequest_merge',
                            repo_name=repo_name,
                            pull_request_id=pull_request_id),
                 params={'csrf_token': csrf_token}, status=302)
 
             merge_resp = MergeResponse(True, True, '', MergeFailureReason.PUSH_FAILED,
                                        metadata={'target': 'shadow repo',
                                                  'merge_commit': 'xxx'})
         assert_session_flash(response, merge_resp.merge_status_message)
 
     def test_update_source_revision(self, backend, csrf_token):
         commits = [
             {'message': 'ancestor'},
             {'message': 'change'},
             {'message': 'change-2'},
         ]
         commit_ids = backend.create_master_repo(commits)
         target = backend.create_repo(heads=['ancestor'])
         source = backend.create_repo(heads=['change'])
 
         # create pr from a in source to A in target
         pull_request = PullRequest()
 
         pull_request.source_repo = source
         pull_request.source_ref = 'branch:{branch}:{commit_id}'.format(
             branch=backend.default_branch_name, commit_id=commit_ids['change'])
 
         pull_request.target_repo = target
         pull_request.target_ref = 'branch:{branch}:{commit_id}'.format(
             branch=backend.default_branch_name, commit_id=commit_ids['ancestor'])
 
         pull_request.revisions = [commit_ids['change']]
         pull_request.title = u"Test"
         pull_request.description = u"Description"
         pull_request.author = UserModel().get_by_username(TEST_USER_ADMIN_LOGIN)
         pull_request.pull_request_state = PullRequest.STATE_CREATED
         Session().add(pull_request)
         Session().commit()
         pull_request_id = pull_request.pull_request_id
 
         # source has ancestor - change - change-2
         backend.pull_heads(source, heads=['change-2'])
         target_repo_name = target.repo_name
 
         # update PR
         self.app.post(
             route_path('pullrequest_update',
                        repo_name=target_repo_name, pull_request_id=pull_request_id),
             params={'update_commits': 'true', 'csrf_token': csrf_token})
 
         response = self.app.get(
             route_path('pullrequest_show',
                        repo_name=target_repo_name,
                        pull_request_id=pull_request.pull_request_id))
 
         assert response.status_int == 200
         response.mustcontain('Pull request updated to')
         response.mustcontain('with 1 added, 0 removed commits.')
 
         # check that we have now both revisions
         pull_request = PullRequest.get(pull_request_id)
         assert pull_request.revisions == [commit_ids['change-2'], commit_ids['change']]
 
     def test_update_target_revision(self, backend, csrf_token):
         commits = [
             {'message': 'ancestor'},
             {'message': 'change'},
             {'message': 'ancestor-new', 'parents': ['ancestor']},
             {'message': 'change-rebased'},
         ]
         commit_ids = backend.create_master_repo(commits)
         target = backend.create_repo(heads=['ancestor'])
         source = backend.create_repo(heads=['change'])
 
         # create pr from a in source to A in target
         pull_request = PullRequest()
 
         pull_request.source_repo = source
         pull_request.source_ref = 'branch:{branch}:{commit_id}'.format(
             branch=backend.default_branch_name, commit_id=commit_ids['change'])
 
         pull_request.target_repo = target
         pull_request.target_ref = 'branch:{branch}:{commit_id}'.format(
             branch=backend.default_branch_name, commit_id=commit_ids['ancestor'])
 
         pull_request.revisions = [commit_ids['change']]
         pull_request.title = u"Test"
         pull_request.description = u"Description"
         pull_request.author = UserModel().get_by_username(TEST_USER_ADMIN_LOGIN)
         pull_request.pull_request_state = PullRequest.STATE_CREATED
 
         Session().add(pull_request)
         Session().commit()
         pull_request_id = pull_request.pull_request_id
 
         # target has ancestor - ancestor-new
         # source has ancestor - ancestor-new - change-rebased
         backend.pull_heads(target, heads=['ancestor-new'])
         backend.pull_heads(source, heads=['change-rebased'])
         target_repo_name = target.repo_name
 
         # update PR
         url = route_path('pullrequest_update',
                          repo_name=target_repo_name,
                          pull_request_id=pull_request_id)
         self.app.post(url,
                       params={'update_commits': 'true', 'csrf_token': csrf_token},
                       status=200)
 
         # check that we have now both revisions
         pull_request = PullRequest.get(pull_request_id)
         assert pull_request.revisions == [commit_ids['change-rebased']]
         assert pull_request.target_ref == 'branch:{branch}:{commit_id}'.format(
             branch=backend.default_branch_name, commit_id=commit_ids['ancestor-new'])
 
         response = self.app.get(
             route_path('pullrequest_show',
                        repo_name=target_repo_name,
                        pull_request_id=pull_request.pull_request_id))
         assert response.status_int == 200
         response.mustcontain('Pull request updated to')
         response.mustcontain('with 1 added, 1 removed commits.')
 
     def test_update_target_revision_with_removal_of_1_commit_git(self, backend_git, csrf_token):
         backend = backend_git
         commits = [
             {'message': 'master-commit-1'},
             {'message': 'master-commit-2-change-1'},
             {'message': 'master-commit-3-change-2'},
 
             {'message': 'feat-commit-1', 'parents': ['master-commit-1']},
             {'message': 'feat-commit-2'},
         ]
         commit_ids = backend.create_master_repo(commits)
         target = backend.create_repo(heads=['master-commit-3-change-2'])
         source = backend.create_repo(heads=['feat-commit-2'])
 
         # create pr from a in source to A in target
         pull_request = PullRequest()
         pull_request.source_repo = source
 
         pull_request.source_ref = 'branch:{branch}:{commit_id}'.format(
             branch=backend.default_branch_name,
             commit_id=commit_ids['master-commit-3-change-2'])
 
         pull_request.target_repo = target
         pull_request.target_ref = 'branch:{branch}:{commit_id}'.format(
             branch=backend.default_branch_name, commit_id=commit_ids['feat-commit-2'])
 
         pull_request.revisions = [
             commit_ids['feat-commit-1'],
             commit_ids['feat-commit-2']
         ]
         pull_request.title = u"Test"
         pull_request.description = u"Description"
         pull_request.author = UserModel().get_by_username(TEST_USER_ADMIN_LOGIN)
         pull_request.pull_request_state = PullRequest.STATE_CREATED
         Session().add(pull_request)
         Session().commit()
         pull_request_id = pull_request.pull_request_id
 
         # PR is created, now we simulate a force-push into target,
         # that drops a 2 last commits
         vcsrepo = target.scm_instance()
         vcsrepo.config.clear_section('hooks')
         vcsrepo.run_git_command(['reset', '--soft', 'HEAD~2'])
         target_repo_name = target.repo_name
 
         # update PR
         url = route_path('pullrequest_update',
                          repo_name=target_repo_name,
                          pull_request_id=pull_request_id)
         self.app.post(url,
                       params={'update_commits': 'true', 'csrf_token': csrf_token},
                       status=200)
 
         response = self.app.get(route_path('pullrequest_new', repo_name=target_repo_name))
         assert response.status_int == 200
         response.mustcontain('Pull request updated to')
         response.mustcontain('with 0 added, 0 removed commits.')
 
     def test_update_of_ancestor_reference(self, backend, csrf_token):
         commits = [
             {'message': 'ancestor'},
             {'message': 'change'},
             {'message': 'change-2'},
             {'message': 'ancestor-new', 'parents': ['ancestor']},
             {'message': 'change-rebased'},
         ]
         commit_ids = backend.create_master_repo(commits)
         target = backend.create_repo(heads=['ancestor'])
         source = backend.create_repo(heads=['change'])
 
         # create pr from a in source to A in target
         pull_request = PullRequest()
         pull_request.source_repo = source
 
         pull_request.source_ref = 'branch:{branch}:{commit_id}'.format(
             branch=backend.default_branch_name, commit_id=commit_ids['change'])
         pull_request.target_repo = target
         pull_request.target_ref = 'branch:{branch}:{commit_id}'.format(
             branch=backend.default_branch_name, commit_id=commit_ids['ancestor'])
         pull_request.revisions = [commit_ids['change']]
         pull_request.title = u"Test"
         pull_request.description = u"Description"
         pull_request.author = UserModel().get_by_username(TEST_USER_ADMIN_LOGIN)
         pull_request.pull_request_state = PullRequest.STATE_CREATED
         Session().add(pull_request)
         Session().commit()
         pull_request_id = pull_request.pull_request_id
 
         # target has ancestor - ancestor-new
         # source has ancestor - ancestor-new - change-rebased
         backend.pull_heads(target, heads=['ancestor-new'])
         backend.pull_heads(source, heads=['change-rebased'])
         target_repo_name = target.repo_name
 
         # update PR
         self.app.post(
             route_path('pullrequest_update',
                        repo_name=target_repo_name, pull_request_id=pull_request_id),
             params={'update_commits': 'true', 'csrf_token': csrf_token},
             status=200)
 
         # Expect the target reference to be updated correctly
         pull_request = PullRequest.get(pull_request_id)
         assert pull_request.revisions == [commit_ids['change-rebased']]
         expected_target_ref = 'branch:{branch}:{commit_id}'.format(
             branch=backend.default_branch_name,
             commit_id=commit_ids['ancestor-new'])
         assert pull_request.target_ref == expected_target_ref
 
     def test_remove_pull_request_branch(self, backend_git, csrf_token):
         branch_name = 'development'
         commits = [
             {'message': 'initial-commit'},
             {'message': 'old-feature'},
             {'message': 'new-feature', 'branch': branch_name},
         ]
         repo = backend_git.create_repo(commits)
         repo_name = repo.repo_name
         commit_ids = backend_git.commit_ids
 
         pull_request = PullRequest()
         pull_request.source_repo = repo
         pull_request.target_repo = repo
         pull_request.source_ref = 'branch:{branch}:{commit_id}'.format(
             branch=branch_name, commit_id=commit_ids['new-feature'])
         pull_request.target_ref = 'branch:{branch}:{commit_id}'.format(
             branch=backend_git.default_branch_name, commit_id=commit_ids['old-feature'])
         pull_request.revisions = [commit_ids['new-feature']]
         pull_request.title = u"Test"
         pull_request.description = u"Description"
         pull_request.author = UserModel().get_by_username(TEST_USER_ADMIN_LOGIN)
         pull_request.pull_request_state = PullRequest.STATE_CREATED
         Session().add(pull_request)
         Session().commit()
 
         pull_request_id = pull_request.pull_request_id
 
         vcs = repo.scm_instance()
         vcs.remove_ref('refs/heads/{}'.format(branch_name))
         # NOTE(marcink): run GC to ensure the commits are gone
         vcs.run_gc()
 
         response = self.app.get(route_path(
             'pullrequest_show',
             repo_name=repo_name,
             pull_request_id=pull_request_id))
 
         assert response.status_int == 200
 
         response.assert_response().element_contains(
             '#changeset_compare_view_content .alert strong',
             'Missing commits')
         response.assert_response().element_contains(
             '#changeset_compare_view_content .alert',
             'This pull request cannot be displayed, because one or more'
             ' commits no longer exist in the source repository.')
 
     def test_strip_commits_from_pull_request(
             self, backend, pr_util, csrf_token):
         commits = [
             {'message': 'initial-commit'},
             {'message': 'old-feature'},
             {'message': 'new-feature', 'parents': ['initial-commit']},
         ]
         pull_request = pr_util.create_pull_request(
             commits, target_head='initial-commit', source_head='new-feature',
             revisions=['new-feature'])
 
         vcs = pr_util.source_repository.scm_instance()
         if backend.alias == 'git':
             vcs.strip(pr_util.commit_ids['new-feature'], branch_name='master')
         else:
             vcs.strip(pr_util.commit_ids['new-feature'])
 
         response = self.app.get(route_path(
             'pullrequest_show',
             repo_name=pr_util.target_repository.repo_name,
             pull_request_id=pull_request.pull_request_id))
 
         assert response.status_int == 200
 
         response.assert_response().element_contains(
             '#changeset_compare_view_content .alert strong',
             'Missing commits')
         response.assert_response().element_contains(
             '#changeset_compare_view_content .alert',
             'This pull request cannot be displayed, because one or more'
             ' commits no longer exist in the source repository.')
         response.assert_response().element_contains(
             '#update_commits',
             'Update commits')
 
     def test_strip_commits_and_update(
             self, backend, pr_util, csrf_token):
         commits = [
             {'message': 'initial-commit'},
             {'message': 'old-feature'},
             {'message': 'new-feature', 'parents': ['old-feature']},
         ]
         pull_request = pr_util.create_pull_request(
             commits, target_head='old-feature', source_head='new-feature',
             revisions=['new-feature'], mergeable=True)
         pr_id = pull_request.pull_request_id
         target_repo_name = pull_request.target_repo.repo_name
 
         vcs = pr_util.source_repository.scm_instance()
         if backend.alias == 'git':
             vcs.strip(pr_util.commit_ids['new-feature'], branch_name='master')
         else:
             vcs.strip(pr_util.commit_ids['new-feature'])
 
         url = route_path('pullrequest_update',
                          repo_name=target_repo_name,
                          pull_request_id=pr_id)
         response = self.app.post(url,
                                  params={'update_commits': 'true',
                                          'csrf_token': csrf_token})
 
         assert response.status_int == 200
         assert response.body == '{"response": true, "redirect_url": null}'
 
         # Make sure that after update, it won't raise 500 errors
         response = self.app.get(route_path(
             'pullrequest_show',
             repo_name=target_repo_name,
             pull_request_id=pr_id))
 
         assert response.status_int == 200
         response.assert_response().element_contains(
             '#changeset_compare_view_content .alert strong',
             'Missing commits')
 
     def test_branch_is_a_link(self, pr_util):
         pull_request = pr_util.create_pull_request()
         pull_request.source_ref = 'branch:origin:1234567890abcdef'
         pull_request.target_ref = 'branch:target:abcdef1234567890'
         Session().add(pull_request)
         Session().commit()
 
         response = self.app.get(route_path(
             'pullrequest_show',
             repo_name=pull_request.target_repo.scm_instance().name,
             pull_request_id=pull_request.pull_request_id))
         assert response.status_int == 200
 
         source = response.assert_response().get_element('.pr-source-info')
         source_parent = source.getparent()
         assert len(source_parent) == 1
 
         target = response.assert_response().get_element('.pr-target-info')
         target_parent = target.getparent()
         assert len(target_parent) == 1
 
         expected_origin_link = route_path(
             'repo_commits',
             repo_name=pull_request.source_repo.scm_instance().name,
             params=dict(branch='origin'))
         expected_target_link = route_path(
             'repo_commits',
             repo_name=pull_request.target_repo.scm_instance().name,
             params=dict(branch='target'))
         assert source_parent.attrib['href'] == expected_origin_link
         assert target_parent.attrib['href'] == expected_target_link
 
     def test_bookmark_is_not_a_link(self, pr_util):
         pull_request = pr_util.create_pull_request()
         pull_request.source_ref = 'bookmark:origin:1234567890abcdef'
         pull_request.target_ref = 'bookmark:target:abcdef1234567890'
         Session().add(pull_request)
         Session().commit()
 
         response = self.app.get(route_path(
             'pullrequest_show',
             repo_name=pull_request.target_repo.scm_instance().name,
             pull_request_id=pull_request.pull_request_id))
         assert response.status_int == 200
 
         source = response.assert_response().get_element('.pr-source-info')
         assert source.text.strip() == 'bookmark:origin'
         assert source.getparent().attrib.get('href') is None
 
         target = response.assert_response().get_element('.pr-target-info')
         assert target.text.strip() == 'bookmark:target'
         assert target.getparent().attrib.get('href') is None
 
     def test_tag_is_not_a_link(self, pr_util):
         pull_request = pr_util.create_pull_request()
         pull_request.source_ref = 'tag:origin:1234567890abcdef'
         pull_request.target_ref = 'tag:target:abcdef1234567890'
         Session().add(pull_request)
         Session().commit()
 
         response = self.app.get(route_path(
             'pullrequest_show',
             repo_name=pull_request.target_repo.scm_instance().name,
             pull_request_id=pull_request.pull_request_id))
         assert response.status_int == 200
 
         source = response.assert_response().get_element('.pr-source-info')
         assert source.text.strip() == 'tag:origin'
         assert source.getparent().attrib.get('href') is None
 
         target = response.assert_response().get_element('.pr-target-info')
         assert target.text.strip() == 'tag:target'
         assert target.getparent().attrib.get('href') is None
 
     @pytest.mark.parametrize('mergeable', [True, False])
     def test_shadow_repository_link(
             self, mergeable, pr_util, http_host_only_stub):
         """
         Check that the pull request summary page displays a link to the shadow
         repository if the pull request is mergeable. If it is not mergeable
         the link should not be displayed.
         """
         pull_request = pr_util.create_pull_request(
             mergeable=mergeable, enable_notifications=False)
         target_repo = pull_request.target_repo.scm_instance()
         pr_id = pull_request.pull_request_id
         shadow_url = '{host}/{repo}/pull-request/{pr_id}/repository'.format(
             host=http_host_only_stub, repo=target_repo.name, pr_id=pr_id)
 
         response = self.app.get(route_path(
             'pullrequest_show',
             repo_name=target_repo.name,
             pull_request_id=pr_id))
 
         if mergeable:
             response.assert_response().element_value_contains(
                 'input.pr-mergeinfo', shadow_url)
             response.assert_response().element_value_contains(
                 'input.pr-mergeinfo ', 'pr-merge')
         else:
             response.assert_response().no_element_exists('.pr-mergeinfo')
 
 
 @pytest.mark.usefixtures('app')
 @pytest.mark.backends("git", "hg")
 class TestPullrequestsControllerDelete(object):
     def test_pull_request_delete_button_permissions_admin(
             self, autologin_user, user_admin, pr_util):
         pull_request = pr_util.create_pull_request(
             author=user_admin.username, enable_notifications=False)
 
         response = self.app.get(route_path(
             'pullrequest_show',
             repo_name=pull_request.target_repo.scm_instance().name,
             pull_request_id=pull_request.pull_request_id))
 
         response.mustcontain('id="delete_pullrequest"')
         response.mustcontain('Confirm to delete this pull request')
 
     def test_pull_request_delete_button_permissions_owner(
             self, autologin_regular_user, user_regular, pr_util):
         pull_request = pr_util.create_pull_request(
             author=user_regular.username, enable_notifications=False)
 
         response = self.app.get(route_path(
             'pullrequest_show',
             repo_name=pull_request.target_repo.scm_instance().name,
             pull_request_id=pull_request.pull_request_id))
 
         response.mustcontain('id="delete_pullrequest"')
         response.mustcontain('Confirm to delete this pull request')
 
     def test_pull_request_delete_button_permissions_forbidden(
             self, autologin_regular_user, user_regular, user_admin, pr_util):
         pull_request = pr_util.create_pull_request(
             author=user_admin.username, enable_notifications=False)
 
         response = self.app.get(route_path(
             'pullrequest_show',
             repo_name=pull_request.target_repo.scm_instance().name,
             pull_request_id=pull_request.pull_request_id))
         response.mustcontain(no=['id="delete_pullrequest"'])
         response.mustcontain(no=['Confirm to delete this pull request'])
 
     def test_pull_request_delete_button_permissions_can_update_cannot_delete(
             self, autologin_regular_user, user_regular, user_admin, pr_util,
             user_util):
 
         pull_request = pr_util.create_pull_request(
             author=user_admin.username, enable_notifications=False)
 
         user_util.grant_user_permission_to_repo(
             pull_request.target_repo, user_regular,
             'repository.write')
 
         response = self.app.get(route_path(
             'pullrequest_show',
             repo_name=pull_request.target_repo.scm_instance().name,
             pull_request_id=pull_request.pull_request_id))
 
         response.mustcontain('id="open_edit_pullrequest"')
         response.mustcontain('id="delete_pullrequest"')
         response.mustcontain(no=['Confirm to delete this pull request'])
 
     def test_delete_comment_returns_404_if_comment_does_not_exist(
             self, autologin_user, pr_util, user_admin, csrf_token, xhr_header):
 
         pull_request = pr_util.create_pull_request(
             author=user_admin.username, enable_notifications=False)
 
         self.app.post(
             route_path(
             'pullrequest_comment_delete',
             repo_name=pull_request.target_repo.scm_instance().name,
             pull_request_id=pull_request.pull_request_id,
             comment_id=1024404),
             extra_environ=xhr_header,
             params={'csrf_token': csrf_token},
             status=404
         )
 
     def test_delete_comment(
             self, autologin_user, pr_util, user_admin, csrf_token, xhr_header):
 
         pull_request = pr_util.create_pull_request(
             author=user_admin.username, enable_notifications=False)
         comment = pr_util.create_comment()
         comment_id = comment.comment_id
 
         response = self.app.post(
             route_path(
             'pullrequest_comment_delete',
             repo_name=pull_request.target_repo.scm_instance().name,
             pull_request_id=pull_request.pull_request_id,
             comment_id=comment_id),
             extra_environ=xhr_header,
             params={'csrf_token': csrf_token},
             status=200
         )
         assert response.body == 'true'
 
     @pytest.mark.parametrize('url_type', [
         'pullrequest_new',
         'pullrequest_create',
         'pullrequest_update',
         'pullrequest_merge',
     ])
     def test_pull_request_is_forbidden_on_archived_repo(
             self, autologin_user, backend, xhr_header, user_util, url_type):
 
         # create a temporary repo
         source = user_util.create_repo(repo_type=backend.alias)
         repo_name = source.repo_name
         repo = Repository.get_by_repo_name(repo_name)
         repo.archived = True
         Session().commit()
 
         response = self.app.get(
             route_path(url_type, repo_name=repo_name, pull_request_id=1), status=302)
 
         msg = 'Action not supported for archived repository.'
         assert_session_flash(response, msg)
 
 
 def assert_pull_request_status(pull_request, expected_status):
     status = ChangesetStatusModel().calculated_review_status(pull_request=pull_request)
     assert status == expected_status
 
 
 @pytest.mark.parametrize('route', ['pullrequest_new', 'pullrequest_create'])
 @pytest.mark.usefixtures("autologin_user")
 def test_forbidde_to_repo_summary_for_svn_repositories(backend_svn, app, route):
     app.get(route_path(route, repo_name=backend_svn.repo_name), status=404)

rhodecode/apps/repository/views/repo_summary.py

@@ -1,293 +1,289 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2011-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 logging
 import string
 import time
 
 import rhodecode
 
 
 
 from rhodecode.lib.view_utils import get_format_ref_id
 from rhodecode.apps._base import RepoAppView
 from rhodecode.config.conf import (LANGUAGES_EXTENSIONS_MAP)
 from rhodecode.lib import helpers as h, rc_cache
 from rhodecode.lib.utils2 import safe_str, safe_int
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.vcs.backends.base import EmptyCommit
 from rhodecode.lib.vcs.exceptions import (
     CommitError, EmptyRepositoryError, CommitDoesNotExistError)
 from rhodecode.model.db import Statistics, CacheKey, User
 from rhodecode.model.meta import Session
 from rhodecode.model.scm import ScmModel
 
 log = logging.getLogger(__name__)
 
 
 class RepoSummaryView(RepoAppView):
 
     def load_default_context(self):
         c = self._get_local_tmpl_context(include_app_defaults=True)
         c.rhodecode_repo = None
         if not c.repository_requirements_missing:
             c.rhodecode_repo = self.rhodecode_vcs_repo
         return c
 
     def _load_commits_context(self, c):
         p = safe_int(self.request.GET.get('page'), 1)
         size = safe_int(self.request.GET.get('size'), 10)
 
         def url_generator(page_num):
             query_params = {
                 'page': page_num,
                 'size': size
             }
             return h.route_path(
                 'repo_summary_commits',
                 repo_name=c.rhodecode_db_repo.repo_name, _query=query_params)
 
         pre_load = ['author', 'branch', 'date', 'message']
         try:
             collection = self.rhodecode_vcs_repo.get_commits(
                 pre_load=pre_load, translate_tags=False)
         except EmptyRepositoryError:
             collection = self.rhodecode_vcs_repo
 
         c.repo_commits = h.RepoPage(
             collection, page=p, items_per_page=size, url_maker=url_generator)
         page_ids = [x.raw_id for x in c.repo_commits]
         c.comments = self.db_repo.get_comments(page_ids)
         c.statuses = self.db_repo.statuses(page_ids)
 
     def _prepare_and_set_clone_url(self, c):
         username = ''
         if self._rhodecode_user.username != User.DEFAULT_USER:
             username = safe_str(self._rhodecode_user.username)
 
-        _def_clone_uri = _def_clone_uri_id = c.clone_uri_tmpl
+        _def_clone_uri = c.clone_uri_tmpl
+        _def_clone_uri_id = c.clone_uri_id_tmpl
         _def_clone_uri_ssh = c.clone_uri_ssh_tmpl
 
-        if '{repo}' in _def_clone_uri:
-            _def_clone_uri_id = _def_clone_uri.replace('{repo}', '_{repoid}')
-        elif '{repoid}' in _def_clone_uri:
-            _def_clone_uri_id = _def_clone_uri.replace('_{repoid}', '{repo}')
-
         c.clone_repo_url = self.db_repo.clone_url(
             user=username, uri_tmpl=_def_clone_uri)
         c.clone_repo_url_id = self.db_repo.clone_url(
             user=username, uri_tmpl=_def_clone_uri_id)
         c.clone_repo_url_ssh = self.db_repo.clone_url(
             uri_tmpl=_def_clone_uri_ssh, ssh=True)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     def summary_commits(self):
         c = self.load_default_context()
         self._prepare_and_set_clone_url(c)
         self._load_commits_context(c)
         return self._get_template_context(c)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     def summary(self):
         c = self.load_default_context()
 
         # Prepare the clone URL
         self._prepare_and_set_clone_url(c)
 
         # If enabled, get statistics data
         c.show_stats = bool(self.db_repo.enable_statistics)
 
         stats = Session().query(Statistics) \
             .filter(Statistics.repository == self.db_repo) \
             .scalar()
 
         c.stats_percentage = 0
 
         if stats and stats.languages:
             c.no_data = False is self.db_repo.enable_statistics
             lang_stats_d = json.loads(stats.languages)
 
             # Sort first by decreasing count and second by the file extension,
             # so we have a consistent output.
             lang_stats_items = sorted(lang_stats_d.iteritems(),
                                       key=lambda k: (-k[1], k[0]))[:10]
             lang_stats = [(x, {"count": y,
                                "desc": LANGUAGES_EXTENSIONS_MAP.get(x)})
                           for x, y in lang_stats_items]
 
             c.trending_languages = json.dumps(lang_stats)
         else:
             c.no_data = True
             c.trending_languages = json.dumps({})
 
         scm_model = ScmModel()
         c.enable_downloads = self.db_repo.enable_downloads
         c.repository_followers = scm_model.get_followers(self.db_repo)
         c.repository_forks = scm_model.get_forks(self.db_repo)
 
         # first interaction with the VCS instance after here...
         if c.repository_requirements_missing:
             self.request.override_renderer = \
                 'rhodecode:templates/summary/missing_requirements.mako'
             return self._get_template_context(c)
 
         c.readme_data, c.readme_file = \
             self._get_readme_data(self.db_repo, c.visual.default_renderer)
 
         # loads the summary commits template context
         self._load_commits_context(c)
 
         return self._get_template_context(c)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     def repo_stats(self):
         show_stats = bool(self.db_repo.enable_statistics)
         repo_id = self.db_repo.repo_id
 
         landing_commit = self.db_repo.get_landing_commit()
         if isinstance(landing_commit, EmptyCommit):
             return {'size': 0, 'code_stats': {}}
 
         cache_seconds = safe_int(rhodecode.CONFIG.get('rc_cache.cache_repo.expiration_time'))
         cache_on = cache_seconds > 0
 
         log.debug(
             'Computing REPO STATS for repo_id %s commit_id `%s` '
             'with caching: %s[TTL: %ss]' % (
                 repo_id, landing_commit, cache_on, cache_seconds or 0))
 
         cache_namespace_uid = 'cache_repo.{}'.format(repo_id)
         region = rc_cache.get_or_create_region('cache_repo', cache_namespace_uid)
 
         @region.conditional_cache_on_arguments(namespace=cache_namespace_uid,
                                                condition=cache_on)
         def compute_stats(repo_id, commit_id, _show_stats):
             code_stats = {}
             size = 0
             try:
                 commit = self.db_repo.get_commit(commit_id)
 
                 for node in commit.get_filenodes_generator():
                     size += node.size
                     if not _show_stats:
                         continue
                     ext = string.lower(node.extension)
                     ext_info = LANGUAGES_EXTENSIONS_MAP.get(ext)
                     if ext_info:
                         if ext in code_stats:
                             code_stats[ext]['count'] += 1
                         else:
                             code_stats[ext] = {"count": 1, "desc": ext_info}
             except (EmptyRepositoryError, CommitDoesNotExistError):
                 pass
             return {'size': h.format_byte_size_binary(size),
                     'code_stats': code_stats}
 
         stats = compute_stats(self.db_repo.repo_id, landing_commit.raw_id, show_stats)
         return stats
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     def repo_refs_data(self):
         _ = self.request.translate
         self.load_default_context()
 
         repo = self.rhodecode_vcs_repo
         refs_to_create = [
             (_("Branch"), repo.branches, 'branch'),
             (_("Tag"), repo.tags, 'tag'),
             (_("Bookmark"), repo.bookmarks, 'book'),
         ]
         res = self._create_reference_data(repo, self.db_repo_name, refs_to_create)
         data = {
             'more': False,
             'results': res
         }
         return data
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     def repo_refs_changelog_data(self):
         _ = self.request.translate
         self.load_default_context()
 
         repo = self.rhodecode_vcs_repo
 
         refs_to_create = [
             (_("Branches"), repo.branches, 'branch'),
             (_("Closed branches"), repo.branches_closed, 'branch_closed'),
             # TODO: enable when vcs can handle bookmarks filters
             # (_("Bookmarks"), repo.bookmarks, "book"),
         ]
         res = self._create_reference_data(
             repo, self.db_repo_name, refs_to_create)
         data = {
             'more': False,
             'results': res
         }
         return data
 
     def _create_reference_data(self, repo, full_repo_name, refs_to_create):
         format_ref_id = get_format_ref_id(repo)
 
         result = []
         for title, refs, ref_type in refs_to_create:
             if refs:
                 result.append({
                     'text': title,
                     'children': self._create_reference_items(
                         repo, full_repo_name, refs, ref_type,
                         format_ref_id),
                 })
         return result
 
     def _create_reference_items(self, repo, full_repo_name, refs, ref_type, format_ref_id):
         result = []
         is_svn = h.is_svn(repo)
         for ref_name, raw_id in refs.iteritems():
             files_url = self._create_files_url(
                 repo, full_repo_name, ref_name, raw_id, is_svn)
             result.append({
                 'text': ref_name,
                 'id': format_ref_id(ref_name, raw_id),
                 'raw_id': raw_id,
                 'type': ref_type,
                 'files_url': files_url,
                 'idx': 0,
             })
         return result
 
     def _create_files_url(self, repo, full_repo_name, ref_name, raw_id, is_svn):
         use_commit_id = '/' in ref_name or is_svn
         return h.route_path(
             'repo_files',
             repo_name=full_repo_name,
             f_path=ref_name if is_svn else '',
             commit_id=raw_id if use_commit_id else ref_name,
             _query=dict(at=ref_name))

rhodecode/config/middleware.py

@@ -1,778 +1,782 b''
 # -*- 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 os
 import sys
 import logging
 import collections
 import tempfile
 import time
 
 from paste.gzipper import make_gzip_middleware
 import pyramid.events
 from pyramid.wsgi import wsgiapp
 from pyramid.authorization import ACLAuthorizationPolicy
 from pyramid.config import Configurator
 from pyramid.settings import asbool, aslist
 from pyramid.httpexceptions import (
     HTTPException, HTTPError, HTTPInternalServerError, HTTPFound, HTTPNotFound)
 from pyramid.renderers import render_to_response
 
 from rhodecode.model import meta
 from rhodecode.config import patches
 from rhodecode.config import utils as config_utils
 from rhodecode.config.environment import load_pyramid_environment
 
 import rhodecode.events
 from rhodecode.lib.middleware.vcs import VCSMiddleware
 from rhodecode.lib.request import Request
 from rhodecode.lib.vcs import VCSCommunicationError
 from rhodecode.lib.exceptions import VCSServerUnavailable
 from rhodecode.lib.middleware.appenlight import wrap_in_appenlight_if_enabled
 from rhodecode.lib.middleware.https_fixup import HttpsFixup
 from rhodecode.lib.plugins.utils import register_rhodecode_plugin
 from rhodecode.lib.utils2 import aslist as rhodecode_aslist, AttributeDict
 from rhodecode.lib.exc_tracking import store_exception
 from rhodecode.subscribers import (
     scan_repositories_if_enabled, write_js_routes_if_enabled,
     write_metadata_if_needed, write_usage_data)
 
 
 log = logging.getLogger(__name__)
 
 
 def is_http_error(response):
     # error which should have traceback
     return response.status_code > 499
 
 
 def should_load_all():
     """
     Returns if all application components should be loaded. In some cases it's
     desired to skip apps loading for faster shell script execution
     """
     ssh_cmd = os.environ.get('RC_CMD_SSH_WRAPPER')
     if ssh_cmd:
         return False
 
     return True
 
 
 def make_pyramid_app(global_config, **settings):
     """
     Constructs the WSGI application based on Pyramid.
 
     Specials:
 
     * The application can also be integrated like a plugin via the call to
       `includeme`. This is accompanied with the other utility functions which
       are called. Changing this should be done with great care to not break
       cases when these fragments are assembled from another place.
 
     """
 
     # Allows to use format style "{ENV_NAME}" placeholders in the configuration. It
     # will be replaced by the value of the environment variable "NAME" in this case.
     start_time = time.time()
     log.info('Pyramid app config starting')
 
     debug = asbool(global_config.get('debug'))
     if debug:
         enable_debug()
 
     environ = {'ENV_{}'.format(key): value for key, value in os.environ.items()}
 
     global_config = _substitute_values(global_config, environ)
     settings = _substitute_values(settings, environ)
 
     sanitize_settings_and_apply_defaults(global_config, settings)
 
     config = Configurator(settings=settings)
 
     # Apply compatibility patches
     patches.inspect_getargspec()
 
     load_pyramid_environment(global_config, settings)
 
     # Static file view comes first
     includeme_first(config)
 
     includeme(config)
 
     pyramid_app = config.make_wsgi_app()
     pyramid_app = wrap_app_in_wsgi_middlewares(pyramid_app, config)
     pyramid_app.config = config
 
     config.configure_celery(global_config['__file__'])
 
     # creating the app uses a connection - return it after we are done
     meta.Session.remove()
     total_time = time.time() - start_time
     log.info('Pyramid app `%s` created and configured in %.2fs',
              pyramid_app.func_name, total_time)
 
     return pyramid_app
 
 
 def not_found_view(request):
     """
     This creates the view which should be registered as not-found-view to
     pyramid.
     """
 
     if not getattr(request, 'vcs_call', None):
         # handle like regular case with our error_handler
         return error_handler(HTTPNotFound(), request)
 
     # handle not found view as a vcs call
     settings = request.registry.settings
     ae_client = getattr(request, 'ae_client', None)
     vcs_app = VCSMiddleware(
         HTTPNotFound(), request.registry, settings,
         appenlight_client=ae_client)
 
     return wsgiapp(vcs_app)(None, request)
 
 
 def error_handler(exception, request):
     import rhodecode
     from rhodecode.lib import helpers
 
     rhodecode_title = rhodecode.CONFIG.get('rhodecode_title') or 'RhodeCode'
 
     base_response = HTTPInternalServerError()
     # prefer original exception for the response since it may have headers set
     if isinstance(exception, HTTPException):
         base_response = exception
     elif isinstance(exception, VCSCommunicationError):
         base_response = VCSServerUnavailable()
 
     if is_http_error(base_response):
         log.exception(
             'error occurred handling this request for path: %s', request.path)
 
     error_explanation = base_response.explanation or str(base_response)
     if base_response.status_code == 404:
         error_explanation += " Optionally you don't have permission to access this page."
     c = AttributeDict()
     c.error_message = base_response.status
     c.error_explanation = error_explanation
     c.visual = AttributeDict()
 
     c.visual.rhodecode_support_url = (
         request.registry.settings.get('rhodecode_support_url') or
         request.route_url('rhodecode_support')
     )
     c.redirect_time = 0
     c.rhodecode_name = rhodecode_title
     if not c.rhodecode_name:
         c.rhodecode_name = 'Rhodecode'
 
     c.causes = []
     if is_http_error(base_response):
         c.causes.append('Server is overloaded.')
         c.causes.append('Server database connection is lost.')
         c.causes.append('Server expected unhandled error.')
 
     if hasattr(base_response, 'causes'):
         c.causes = base_response.causes
 
     c.messages = helpers.flash.pop_messages(request=request)
 
     exc_info = sys.exc_info()
     c.exception_id = id(exc_info)
     c.show_exception_id = isinstance(base_response, VCSServerUnavailable) \
                           or base_response.status_code > 499
     c.exception_id_url = request.route_url(
         'admin_settings_exception_tracker_show', exception_id=c.exception_id)
 
     if c.show_exception_id:
         store_exception(c.exception_id, exc_info)
 
     response = render_to_response(
         '/errors/error_document.mako', {'c': c, 'h': helpers}, request=request,
         response=base_response)
 
     return response
 
 
 def includeme_first(config):
     # redirect automatic browser favicon.ico requests to correct place
     def favicon_redirect(context, request):
         return HTTPFound(
             request.static_path('rhodecode:public/images/favicon.ico'))
 
     config.add_view(favicon_redirect, route_name='favicon')
     config.add_route('favicon', '/favicon.ico')
 
     def robots_redirect(context, request):
         return HTTPFound(
             request.static_path('rhodecode:public/robots.txt'))
 
     config.add_view(robots_redirect, route_name='robots')
     config.add_route('robots', '/robots.txt')
 
     config.add_static_view(
         '_static/deform', 'deform:static')
     config.add_static_view(
         '_static/rhodecode', path='rhodecode:public', cache_max_age=3600 * 24)
 
 
 def includeme(config, auth_resources=None):
     from rhodecode.lib.celerylib.loader import configure_celery
     log.debug('Initializing main includeme from %s', os.path.basename(__file__))
     settings = config.registry.settings
     config.set_request_factory(Request)
 
     # plugin information
     config.registry.rhodecode_plugins = collections.OrderedDict()
 
     config.add_directive(
         'register_rhodecode_plugin', register_rhodecode_plugin)
 
     config.add_directive('configure_celery', configure_celery)
 
     if asbool(settings.get('appenlight', 'false')):
         config.include('appenlight_client.ext.pyramid_tween')
 
     load_all = should_load_all()
 
     # Includes which are required. The application would fail without them.
     config.include('pyramid_mako')
     config.include('rhodecode.lib.rc_beaker')
     config.include('rhodecode.lib.rc_cache')
     config.include('rhodecode.apps._base.navigation')
     config.include('rhodecode.apps._base.subscribers')
     config.include('rhodecode.tweens')
     config.include('rhodecode.authentication')
 
     if load_all:
         ce_auth_resources = [
             'rhodecode.authentication.plugins.auth_crowd',
             'rhodecode.authentication.plugins.auth_headers',
             'rhodecode.authentication.plugins.auth_jasig_cas',
             'rhodecode.authentication.plugins.auth_ldap',
             'rhodecode.authentication.plugins.auth_pam',
             'rhodecode.authentication.plugins.auth_rhodecode',
             'rhodecode.authentication.plugins.auth_token',
         ]
 
         # load CE authentication plugins
 
         if auth_resources:
             ce_auth_resources.extend(auth_resources)
 
         for resource in ce_auth_resources:
             config.include(resource)
 
         # Auto discover authentication plugins and include their configuration.
         if asbool(settings.get('auth_plugin.import_legacy_plugins', 'true')):
             from rhodecode.authentication import discover_legacy_plugins
             discover_legacy_plugins(config)
 
     # apps
     if load_all:
         config.include('rhodecode.api')
         config.include('rhodecode.apps._base')
         config.include('rhodecode.apps.hovercards')
         config.include('rhodecode.apps.ops')
         config.include('rhodecode.apps.channelstream')
         config.include('rhodecode.apps.file_store')
         config.include('rhodecode.apps.admin')
         config.include('rhodecode.apps.login')
         config.include('rhodecode.apps.home')
         config.include('rhodecode.apps.journal')
 
         config.include('rhodecode.apps.repository')
         config.include('rhodecode.apps.repo_group')
         config.include('rhodecode.apps.user_group')
         config.include('rhodecode.apps.search')
         config.include('rhodecode.apps.user_profile')
         config.include('rhodecode.apps.user_group_profile')
         config.include('rhodecode.apps.my_account')
         config.include('rhodecode.apps.gist')
 
         config.include('rhodecode.apps.svn_support')
         config.include('rhodecode.apps.ssh_support')
         config.include('rhodecode.apps.debug_style')
 
     if load_all:
         config.include('rhodecode.integrations')
 
     config.add_route('rhodecode_support', 'https://rhodecode.com/help/', static=True)
     config.add_translation_dirs('rhodecode:i18n/')
     settings['default_locale_name'] = settings.get('lang', 'en')
 
     # Add subscribers.
     if load_all:
         config.add_subscriber(scan_repositories_if_enabled,
                               pyramid.events.ApplicationCreated)
         config.add_subscriber(write_metadata_if_needed,
                               pyramid.events.ApplicationCreated)
         config.add_subscriber(write_usage_data,
                               pyramid.events.ApplicationCreated)
         config.add_subscriber(write_js_routes_if_enabled,
                               pyramid.events.ApplicationCreated)
 
     # request custom methods
     config.add_request_method(
         'rhodecode.lib.partial_renderer.get_partial_renderer',
         'get_partial_renderer')
 
     config.add_request_method(
         'rhodecode.lib.request_counter.get_request_counter',
         'request_count')
 
+    config.add_request_method(
+        'rhodecode.lib._vendor.statsd.get_statsd_client',
+        'statsd', reify=True)
+
     # Set the authorization policy.
     authz_policy = ACLAuthorizationPolicy()
     config.set_authorization_policy(authz_policy)
 
     # Set the default renderer for HTML templates to mako.
     config.add_mako_renderer('.html')
 
     config.add_renderer(
         name='json_ext',
         factory='rhodecode.lib.ext_json_renderer.pyramid_ext_json')
 
     config.add_renderer(
         name='string_html',
         factory='rhodecode.lib.string_renderer.html')
 
     # include RhodeCode plugins
     includes = aslist(settings.get('rhodecode.includes', []))
     for inc in includes:
         config.include(inc)
 
     # custom not found view, if our pyramid app doesn't know how to handle
     # the request pass it to potential VCS handling ap
     config.add_notfound_view(not_found_view)
     if not settings.get('debugtoolbar.enabled', False):
         # disabled debugtoolbar handle all exceptions via the error_handlers
         config.add_view(error_handler, context=Exception)
 
     # all errors including 403/404/50X
     config.add_view(error_handler, context=HTTPError)
 
 
 def wrap_app_in_wsgi_middlewares(pyramid_app, config):
     """
     Apply outer WSGI middlewares around the application.
     """
     registry = config.registry
     settings = registry.settings
 
     # enable https redirects based on HTTP_X_URL_SCHEME set by proxy
     pyramid_app = HttpsFixup(pyramid_app, settings)
 
     pyramid_app, _ae_client = wrap_in_appenlight_if_enabled(
         pyramid_app, settings)
     registry.ae_client = _ae_client
 
     if settings['gzip_responses']:
         pyramid_app = make_gzip_middleware(
             pyramid_app, settings, compress_level=1)
 
     # this should be the outer most middleware in the wsgi stack since
     # middleware like Routes make database calls
     def pyramid_app_with_cleanup(environ, start_response):
         try:
             return pyramid_app(environ, start_response)
         finally:
             # Dispose current database session and rollback uncommitted
             # transactions.
             meta.Session.remove()
 
             # In a single threaded mode server, on non sqlite db we should have
             # '0 Current Checked out connections' at the end of a request,
             # if not, then something, somewhere is leaving a connection open
             pool = meta.Base.metadata.bind.engine.pool
             log.debug('sa pool status: %s', pool.status())
             log.debug('Request processing finalized')
 
     return pyramid_app_with_cleanup
 
 
 def sanitize_settings_and_apply_defaults(global_config, settings):
     """
     Applies settings defaults and does all type conversion.
 
     We would move all settings parsing and preparation into this place, so that
     we have only one place left which deals with this part. The remaining parts
     of the application would start to rely fully on well prepared settings.
 
     This piece would later be split up per topic to avoid a big fat monster
     function.
     """
 
     settings.setdefault('rhodecode.edition', 'Community Edition')
     settings.setdefault('rhodecode.edition_id', 'CE')
 
     if 'mako.default_filters' not in settings:
         # set custom default filters if we don't have it defined
         settings['mako.imports'] = 'from rhodecode.lib.base import h_filter'
         settings['mako.default_filters'] = 'h_filter'
 
     if 'mako.directories' not in settings:
         mako_directories = settings.setdefault('mako.directories', [
             # Base templates of the original application
             'rhodecode:templates',
         ])
         log.debug(
             "Using the following Mako template directories: %s",
             mako_directories)
 
     # NOTE(marcink): fix redis requirement for schema of connection since 3.X
     if 'beaker.session.type' in settings and settings['beaker.session.type'] == 'ext:redis':
         raw_url = settings['beaker.session.url']
         if not raw_url.startswith(('redis://', 'rediss://', 'unix://')):
             settings['beaker.session.url'] = 'redis://' + raw_url
 
     # Default includes, possible to change as a user
     pyramid_includes = settings.setdefault('pyramid.includes', [])
     log.debug(
         "Using the following pyramid.includes: %s",
         pyramid_includes)
 
     # TODO: johbo: Re-think this, usually the call to config.include
     # should allow to pass in a prefix.
     settings.setdefault('rhodecode.api.url', '/_admin/api')
     settings.setdefault('__file__', global_config.get('__file__'))
 
     # Sanitize generic settings.
     _list_setting(settings, 'default_encoding', 'UTF-8')
     _bool_setting(settings, 'is_test', 'false')
     _bool_setting(settings, 'gzip_responses', 'false')
 
     # Call split out functions that sanitize settings for each topic.
     _sanitize_appenlight_settings(settings)
     _sanitize_vcs_settings(settings)
     _sanitize_cache_settings(settings)
 
     # configure instance id
     config_utils.set_instance_id(settings)
 
     return settings
 
 
 def enable_debug():
     """
     Helper to enable debug on running instance
     :return:
     """
     import tempfile
     import textwrap
     import logging.config
 
     ini_template = textwrap.dedent("""
     #####################################
     ### DEBUG LOGGING CONFIGURATION  ####
     #####################################
     [loggers]
     keys = root, sqlalchemy, beaker, celery, rhodecode, ssh_wrapper
 
     [handlers]
     keys = console, console_sql
 
     [formatters]
     keys = generic, color_formatter, color_formatter_sql
 
     #############
     ## LOGGERS ##
     #############
     [logger_root]
     level = NOTSET
     handlers = console
 
     [logger_sqlalchemy]
     level = INFO
     handlers = console_sql
     qualname = sqlalchemy.engine
     propagate = 0
 
     [logger_beaker]
     level = DEBUG
     handlers =
     qualname = beaker.container
     propagate = 1
 
     [logger_rhodecode]
     level = DEBUG
     handlers =
     qualname = rhodecode
     propagate = 1
 
     [logger_ssh_wrapper]
     level = DEBUG
     handlers =
     qualname = ssh_wrapper
     propagate = 1
 
     [logger_celery]
     level = DEBUG
     handlers =
     qualname = celery
 
 
     ##############
     ## HANDLERS ##
     ##############
 
     [handler_console]
     class = StreamHandler
     args = (sys.stderr, )
     level = DEBUG
     formatter = color_formatter
 
     [handler_console_sql]
     # "level = DEBUG" logs SQL queries and results.
     # "level = INFO" logs SQL queries.
     # "level = WARN" logs neither.  (Recommended for production systems.)
     class = StreamHandler
     args = (sys.stderr, )
     level = WARN
     formatter = color_formatter_sql
 
     ################
     ## FORMATTERS ##
     ################
 
     [formatter_generic]
     class = rhodecode.lib.logging_formatter.ExceptionAwareFormatter
     format = %(asctime)s.%(msecs)03d [%(process)d] %(levelname)-5.5s [%(name)s] %(message)s | %(req_id)s
     datefmt = %Y-%m-%d %H:%M:%S
 
     [formatter_color_formatter]
     class = rhodecode.lib.logging_formatter.ColorRequestTrackingFormatter
     format = %(asctime)s.%(msecs)03d [%(process)d] %(levelname)-5.5s [%(name)s] %(message)s | %(req_id)s
     datefmt = %Y-%m-%d %H:%M:%S
 
     [formatter_color_formatter_sql]
     class = rhodecode.lib.logging_formatter.ColorFormatterSql
     format = %(asctime)s.%(msecs)03d [%(process)d] %(levelname)-5.5s [%(name)s] %(message)s
     datefmt = %Y-%m-%d %H:%M:%S    
     """)
 
     with tempfile.NamedTemporaryFile(prefix='rc_debug_logging_', suffix='.ini',
                                      delete=False) as f:
         log.info('Saved Temporary DEBUG config at %s', f.name)
         f.write(ini_template)
 
     logging.config.fileConfig(f.name)
     log.debug('DEBUG MODE ON')
     os.remove(f.name)
 
 
 def _sanitize_appenlight_settings(settings):
     _bool_setting(settings, 'appenlight', 'false')
 
 
 def _sanitize_vcs_settings(settings):
     """
     Applies settings defaults and does type conversion for all VCS related
     settings.
     """
     _string_setting(settings, 'vcs.svn.compatible_version', '')
     _string_setting(settings, 'vcs.hooks.protocol', 'http')
     _string_setting(settings, 'vcs.hooks.host', '127.0.0.1')
     _string_setting(settings, 'vcs.scm_app_implementation', 'http')
     _string_setting(settings, 'vcs.server', '')
     _string_setting(settings, 'vcs.server.protocol', 'http')
     _bool_setting(settings, 'startup.import_repos', 'false')
     _bool_setting(settings, 'vcs.hooks.direct_calls', 'false')
     _bool_setting(settings, 'vcs.server.enable', 'true')
     _bool_setting(settings, 'vcs.start_server', 'false')
     _list_setting(settings, 'vcs.backends', 'hg, git, svn')
     _int_setting(settings, 'vcs.connection_timeout', 3600)
 
     # Support legacy values of vcs.scm_app_implementation. Legacy
     # configurations may use 'rhodecode.lib.middleware.utils.scm_app_http', or
     # disabled since 4.13 'vcsserver.scm_app' which is now mapped to 'http'.
     scm_app_impl = settings['vcs.scm_app_implementation']
     if scm_app_impl in ['rhodecode.lib.middleware.utils.scm_app_http', 'vcsserver.scm_app']:
         settings['vcs.scm_app_implementation'] = 'http'
 
 
 def _sanitize_cache_settings(settings):
     temp_store = tempfile.gettempdir()
     default_cache_dir = os.path.join(temp_store, 'rc_cache')
 
     # save default, cache dir, and use it for all backends later.
     default_cache_dir = _string_setting(
         settings,
         'cache_dir',
         default_cache_dir, lower=False, default_when_empty=True)
 
     # ensure we have our dir created
     if not os.path.isdir(default_cache_dir):
         os.makedirs(default_cache_dir, mode=0o755)
 
     # exception store cache
     _string_setting(
         settings,
         'exception_tracker.store_path',
         temp_store, lower=False, default_when_empty=True)
     _bool_setting(
         settings,
         'exception_tracker.send_email',
         'false')
     _string_setting(
         settings,
         'exception_tracker.email_prefix',
         '[RHODECODE ERROR]', lower=False, default_when_empty=True)
 
     # cache_perms
     _string_setting(
         settings,
         'rc_cache.cache_perms.backend',
         'dogpile.cache.rc.file_namespace', lower=False)
     _int_setting(
         settings,
         'rc_cache.cache_perms.expiration_time',
         60)
     _string_setting(
         settings,
         'rc_cache.cache_perms.arguments.filename',
         os.path.join(default_cache_dir, 'rc_cache_1'), lower=False)
 
     # cache_repo
     _string_setting(
         settings,
         'rc_cache.cache_repo.backend',
         'dogpile.cache.rc.file_namespace', lower=False)
     _int_setting(
         settings,
         'rc_cache.cache_repo.expiration_time',
         60)
     _string_setting(
         settings,
         'rc_cache.cache_repo.arguments.filename',
         os.path.join(default_cache_dir, 'rc_cache_2'), lower=False)
 
     # cache_license
     _string_setting(
         settings,
         'rc_cache.cache_license.backend',
         'dogpile.cache.rc.file_namespace', lower=False)
     _int_setting(
         settings,
         'rc_cache.cache_license.expiration_time',
         5*60)
     _string_setting(
         settings,
         'rc_cache.cache_license.arguments.filename',
         os.path.join(default_cache_dir, 'rc_cache_3'), lower=False)
 
     # cache_repo_longterm memory, 96H
     _string_setting(
         settings,
         'rc_cache.cache_repo_longterm.backend',
         'dogpile.cache.rc.memory_lru', lower=False)
     _int_setting(
         settings,
         'rc_cache.cache_repo_longterm.expiration_time',
         345600)
     _int_setting(
         settings,
         'rc_cache.cache_repo_longterm.max_size',
         10000)
 
     # sql_cache_short
     _string_setting(
         settings,
         'rc_cache.sql_cache_short.backend',
         'dogpile.cache.rc.memory_lru', lower=False)
     _int_setting(
         settings,
         'rc_cache.sql_cache_short.expiration_time',
         30)
     _int_setting(
         settings,
         'rc_cache.sql_cache_short.max_size',
         10000)
 
 
 def _int_setting(settings, name, default):
     settings[name] = int(settings.get(name, default))
     return settings[name]
 
 
 def _bool_setting(settings, name, default):
     input_val = settings.get(name, default)
     if isinstance(input_val, unicode):
         input_val = input_val.encode('utf8')
     settings[name] = asbool(input_val)
     return settings[name]
 
 
 def _list_setting(settings, name, default):
     raw_value = settings.get(name, default)
 
     old_separator = ','
     if old_separator in raw_value:
         # If we get a comma separated list, pass it to our own function.
         settings[name] = rhodecode_aslist(raw_value, sep=old_separator)
     else:
         # Otherwise we assume it uses pyramids space/newline separation.
         settings[name] = aslist(raw_value)
     return settings[name]
 
 
 def _string_setting(settings, name, default, lower=True, default_when_empty=False):
     value = settings.get(name, default)
 
     if default_when_empty and not value:
         # use default value when value is empty
         value = default
 
     if lower:
         value = value.lower()
     settings[name] = value
     return settings[name]
 
 
 def _substitute_values(mapping, substitutions):
     result = {}
 
     try:
         for key, value in mapping.items():
             # initialize without substitution first
             result[key] = value
 
             # Note: Cannot use regular replacements, since they would clash
             # with the implementation of ConfigParser. Using "format" instead.
             try:
                 result[key] = value.format(**substitutions)
             except KeyError as e:
                 env_var = '{}'.format(e.args[0])
 
                 msg = 'Failed to substitute: `{key}={{{var}}}` with environment entry. ' \
                       'Make sure your environment has {var} set, or remove this ' \
                       'variable from config file'.format(key=key, var=env_var)
 
                 if env_var.startswith('ENV_'):
                     raise ValueError(msg)
                 else:
                     log.warning(msg)
 
     except ValueError as e:
         log.warning('Failed to substitute ENV variable: %s', e)
         result = mapping
 
     return result

rhodecode/i18n/rhodecode.pot

@@ -1,11614 +1,11666 b''
 # Translations template for rhodecode-enterprise-ce.
-# Copyright (C) 2020 RhodeCode GmbH
+# Copyright (C) 2021 RhodeCode GmbH
 # This file is distributed under the same license as the rhodecode-enterprise-ce project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rhodecode-enterprise-ce 4.23.0\n"
+"Project-Id-Version: rhodecode-enterprise-ce 4.24.0\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2020-11-23 09:00+0000\n"
+"POT-Creation-Date: 2021-01-14 15:36+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
 #: rhodecode/api/views/pull_request_api.py:646
 #: rhodecode/api/views/repo_api.py:1686
 msgid "posted a new {} comment"
 msgstr ""
 
-#: rhodecode/apps/admin/views/defaults.py:90
+#: rhodecode/apps/admin/views/defaults.py:82
 msgid "Default settings updated successfully"
 msgstr ""
 
-#: rhodecode/apps/admin/views/defaults.py:108
+#: rhodecode/apps/admin/views/defaults.py:100
 msgid "Error occurred during update of default values"
 msgstr ""
 
-#: rhodecode/apps/admin/views/exception_tracker.py:156
+#: rhodecode/apps/admin/views/exception_tracker.py:146
 msgid "Removed {} Exceptions"
 msgstr ""
 
-#: rhodecode/apps/admin/views/exception_tracker.py:173
+#: rhodecode/apps/admin/views/exception_tracker.py:160
 msgid "Removed Exception {}"
 msgstr ""
 
-#: rhodecode/apps/admin/views/permissions.py:121
+#: rhodecode/apps/admin/views/permissions.py:114
 msgid "Application permissions updated successfully"
 msgstr ""
 
-#: rhodecode/apps/admin/views/permissions.py:142
-#: rhodecode/apps/admin/views/permissions.py:218
-#: rhodecode/apps/admin/views/permissions.py:320
+#: rhodecode/apps/admin/views/permissions.py:135
+#: rhodecode/apps/admin/views/permissions.py:205
+#: rhodecode/apps/admin/views/permissions.py:298
 msgid "Error occurred during update of permissions"
 msgstr ""
 
-#: rhodecode/apps/admin/views/permissions.py:198
+#: rhodecode/apps/admin/views/permissions.py:185
 msgid "Object permissions updated successfully"
 msgstr ""
 
-#: rhodecode/apps/admin/views/permissions.py:300
+#: rhodecode/apps/admin/views/permissions.py:278
 msgid "Global permissions updated successfully"
 msgstr ""
 
-#: rhodecode/apps/admin/views/permissions.py:485
+#: rhodecode/apps/admin/views/permissions.py:448
 #: rhodecode/templates/admin/gists/gist_show.mako:50
 #: rhodecode/templates/admin/integrations/list.mako:172
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:7
 #: rhodecode/templates/base/issue_tracker_settings.mako:138
 #: rhodecode/templates/changeset/changeset_file_comment.mako:233
 #: rhodecode/templates/changeset/changeset_file_comment.mako:247
 #: rhodecode/templates/changeset/changeset_file_comment.mako:256
 #: rhodecode/templates/data_table/_dt_elements.mako:173
 #: rhodecode/templates/data_table/_dt_elements.mako:251
 #: rhodecode/templates/data_table/_dt_elements.mako:266
 #: rhodecode/templates/data_table/_dt_elements.mako:267
 #: rhodecode/templates/data_table/_dt_elements.mako:282
 #: rhodecode/templates/debug_style/buttons.html:128
 #: rhodecode/templates/files/files_add.mako:55
 #: rhodecode/templates/files/files_edit.mako:57
 #: rhodecode/templates/files/files_source.mako:39
 #: rhodecode/templates/files/files_source.mako:52
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:81
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:622
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:679
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:609
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:675
 #: rhodecode/templates/user_group/profile.mako:8
 #: rhodecode/templates/users/user_profile.mako:8
 msgid "Edit"
 msgstr ""
 
-#: rhodecode/apps/admin/views/permissions.py:513
+#: rhodecode/apps/admin/views/permissions.py:473
 msgid "Updated SSH keys file: {}"
 msgstr ""
 
-#: rhodecode/apps/admin/views/permissions.py:516
+#: rhodecode/apps/admin/views/permissions.py:476
 msgid "SSH key support is disabled in .ini file"
 msgstr ""
 
-#: rhodecode/apps/admin/views/repo_groups.py:342
+#: rhodecode/apps/admin/views/repo_groups.py:330
 #, python-format
 msgid "Created repository group %s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/repo_groups.py:360
+#: rhodecode/apps/admin/views/repo_groups.py:348
 #, python-format
 msgid "Error occurred during creation of repository group %s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/sessions.py:92
+#: rhodecode/apps/admin/views/sessions.py:86
 msgid "Cleaned up old sessions"
 msgstr ""
 
-#: rhodecode/apps/admin/views/sessions.py:97
+#: rhodecode/apps/admin/views/sessions.py:91
 msgid "Failed to cleanup up old sessions"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:163
-#: rhodecode/apps/admin/views/settings.py:319
-#: rhodecode/apps/admin/views/settings.py:394
-#: rhodecode/apps/admin/views/settings.py:736
-#: rhodecode/apps/repository/views/repo_settings_vcs.py:124
+#: rhodecode/apps/admin/views/settings.py:156
+#: rhodecode/apps/admin/views/settings.py:291
+#: rhodecode/apps/admin/views/settings.py:360
+#: rhodecode/apps/admin/views/settings.py:663
+#: rhodecode/apps/repository/views/repo_settings_vcs.py:116
 msgid "Some form inputs contain invalid data."
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:190
-#: rhodecode/apps/admin/views/settings.py:355
+#: rhodecode/apps/admin/views/settings.py:183
+#: rhodecode/apps/admin/views/settings.py:327
 msgid "Error occurred during updating application settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:194
-#: rhodecode/apps/repository/views/repo_settings_vcs.py:143
+#: rhodecode/apps/admin/views/settings.py:187
+#: rhodecode/apps/repository/views/repo_settings_vcs.py:135
 msgid "Updated VCS settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:269
+#: rhodecode/apps/admin/views/settings.py:253
 #, python-format
 msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:351
+#: rhodecode/apps/admin/views/settings.py:323
 msgid "Updated application settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:433
+#: rhodecode/apps/admin/views/settings.py:399
 msgid "Updated visualisation settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:436
+#: rhodecode/apps/admin/views/settings.py:402
 msgid "Error occurred during updating visualisation settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:507
-#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:127
+#: rhodecode/apps/admin/views/settings.py:464
+#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:115
 msgid "Invalid issue tracker pattern: {}"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:524
-#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:136
+#: rhodecode/apps/admin/views/settings.py:481
+#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:124
 msgid "Updated issue tracker entries"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:544
-#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:91
+#: rhodecode/apps/admin/views/settings.py:498
+#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:82
 msgid "Removed issue tracker entry."
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:582
+#: rhodecode/apps/admin/views/settings.py:530
 msgid "Please enter email address"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:598
+#: rhodecode/apps/admin/views/settings.py:546
 msgid "Send email task created"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:648
+#: rhodecode/apps/admin/views/settings.py:587
 msgid "Added new hook"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:663
+#: rhodecode/apps/admin/views/settings.py:602
 msgid "Updated hooks"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:667
+#: rhodecode/apps/admin/views/settings.py:606
 msgid "Error occurred during hook creation"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:760
+#: rhodecode/apps/admin/views/settings.py:687
 msgid "Error occurred during updating labs settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:765
+#: rhodecode/apps/admin/views/settings.py:692
 msgid "Updated Labs settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/svn_config.py:46
+#: rhodecode/apps/admin/views/svn_config.py:43
 msgid "Apache configuration for Subversion generated at `{}`."
 msgstr ""
 
-#: rhodecode/apps/admin/views/svn_config.py:54
+#: rhodecode/apps/admin/views/svn_config.py:51
 msgid "Failed to generate the Apache configuration for Subversion."
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:79
+#: rhodecode/apps/admin/views/system_info.py:76
 msgid "Note: please make sure this server can access `${url}` for the update link to work"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:90
+#: rhodecode/apps/admin/views/system_info.py:87
 msgid "Update info"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:92
+#: rhodecode/apps/admin/views/system_info.py:89
 msgid "Check for updates"
 msgstr ""
 
+#: rhodecode/apps/admin/views/system_info.py:94
+msgid "RhodeCode Version"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:95
+msgid "Latest version"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:96
+msgid "RhodeCode Base URL"
+msgstr ""
+
 #: rhodecode/apps/admin/views/system_info.py:97
-msgid "RhodeCode Version"
+msgid "RhodeCode Server IP"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:98
-msgid "Latest version"
+msgid "RhodeCode Server ID"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:99
-msgid "RhodeCode Base URL"
+msgid "RhodeCode Configuration"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:100
-msgid "RhodeCode Server IP"
+msgid "RhodeCode Certificate"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:101
-msgid "RhodeCode Server ID"
+msgid "Workers"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:102
-msgid "RhodeCode Configuration"
-msgstr ""
-
-#: rhodecode/apps/admin/views/system_info.py:103
-msgid "RhodeCode Certificate"
-msgstr ""
-
-#: rhodecode/apps/admin/views/system_info.py:104
-msgid "Workers"
-msgstr ""
-
-#: rhodecode/apps/admin/views/system_info.py:105
 msgid "Worker Type"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:109
+#: rhodecode/apps/admin/views/system_info.py:106
 msgid "Database"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:110
+#: rhodecode/apps/admin/views/system_info.py:107
 msgid "Database version"
 msgstr ""
 
+#: rhodecode/apps/admin/views/system_info.py:111
+msgid "Platform"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:112
+msgid "Platform UUID"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:113
+msgid "Lang"
+msgstr ""
+
 #: rhodecode/apps/admin/views/system_info.py:114
-msgid "Platform"
+msgid "Python version"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:115
-msgid "Platform UUID"
-msgstr ""
-
-#: rhodecode/apps/admin/views/system_info.py:116
-msgid "Lang"
-msgstr ""
-
-#: rhodecode/apps/admin/views/system_info.py:117
-msgid "Python version"
-msgstr ""
-
-#: rhodecode/apps/admin/views/system_info.py:118
 msgid "Python path"
 msgstr ""
 
+#: rhodecode/apps/admin/views/system_info.py:119
+msgid "CPU"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:120
+msgid "Load"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:121
+msgid "Memory"
+msgstr ""
+
 #: rhodecode/apps/admin/views/system_info.py:122
-msgid "CPU"
-msgstr ""
-
-#: rhodecode/apps/admin/views/system_info.py:123
-msgid "Load"
-msgstr ""
-
-#: rhodecode/apps/admin/views/system_info.py:124
-msgid "Memory"
-msgstr ""
-
-#: rhodecode/apps/admin/views/system_info.py:125
 msgid "Uptime"
 msgstr ""
 
+#: rhodecode/apps/admin/views/system_info.py:126
+msgid "Ulimit"
+msgstr ""
+
 #: rhodecode/apps/admin/views/system_info.py:129
-msgid "Ulimit"
-msgstr ""
-
-#: rhodecode/apps/admin/views/system_info.py:132
 msgid "Storage location"
 msgstr ""
 
+#: rhodecode/apps/admin/views/system_info.py:130
+msgid "Storage info"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:131
+msgid "Storage inodes"
+msgstr ""
+
 #: rhodecode/apps/admin/views/system_info.py:133
-msgid "Storage info"
+msgid "Gist storage location"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:134
-msgid "Storage inodes"
+msgid "Gist storage info"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:136
-msgid "Gist storage location"
+msgid "Archive cache storage location"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:137
-msgid "Gist storage info"
+msgid "Archive cache info"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:139
-msgid "Archive cache storage location"
+msgid "Temp storage location"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:140
-msgid "Archive cache info"
+msgid "Temp storage info"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:142
-msgid "Temp storage location"
+msgid "Search info"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:143
-msgid "Temp storage info"
-msgstr ""
-
-#: rhodecode/apps/admin/views/system_info.py:145
-msgid "Search info"
-msgstr ""
-
-#: rhodecode/apps/admin/views/system_info.py:146
 msgid "Search location"
 msgstr ""
 
+#: rhodecode/apps/admin/views/system_info.py:147
+msgid "VCS Backends"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:148
+#: rhodecode/templates/admin/settings/settings_system.mako:32
+msgid "VCS Server"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:149
+msgid "GIT"
+msgstr ""
+
 #: rhodecode/apps/admin/views/system_info.py:150
-msgid "VCS Backends"
+msgid "HG"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:151
-#: rhodecode/templates/admin/settings/settings_system.mako:32
-msgid "VCS Server"
-msgstr ""
-
-#: rhodecode/apps/admin/views/system_info.py:152
-msgid "GIT"
-msgstr ""
-
-#: rhodecode/apps/admin/views/system_info.py:153
-msgid "HG"
-msgstr ""
-
-#: rhodecode/apps/admin/views/system_info.py:154
 msgid "SVN"
 msgstr ""
 
-#: rhodecode/apps/admin/views/user_groups.py:238
+#: rhodecode/apps/admin/views/user_groups.py:224
 #, python-format
 msgid "Created user group %(user_group_link)s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/user_groups.py:260
+#: rhodecode/apps/admin/views/user_groups.py:246
 #, python-format
 msgid "Error occurred during creation of user group %s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:222
+#: rhodecode/apps/admin/views/users.py:208
 #, python-format
 msgid "Created user %(user_link)s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:243
+#: rhodecode/apps/admin/views/users.py:229
 #, python-format
 msgid "Error occurred during creation of user %s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:349
+#: rhodecode/apps/admin/views/users.py:332
 msgid "User updated successfully"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:367
+#: rhodecode/apps/admin/views/users.py:350
 #, python-format
 msgid "Error occurred during update of user %s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:398
+#: rhodecode/apps/admin/views/users.py:378
 #, python-format
 msgid "Detached %s repositories"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:401
+#: rhodecode/apps/admin/views/users.py:381
 #, python-format
 msgid "Deleted %s repositories"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:407
+#: rhodecode/apps/admin/views/users.py:387
 #, python-format
 msgid "Detached %s repository groups"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:410
+#: rhodecode/apps/admin/views/users.py:390
 #, python-format
 msgid "Deleted %s repository groups"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:416
+#: rhodecode/apps/admin/views/users.py:396
 #, python-format
 msgid "Detached %s user groups"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:419
+#: rhodecode/apps/admin/views/users.py:399
 #, python-format
 msgid "Deleted %s user groups"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:425
+#: rhodecode/apps/admin/views/users.py:405
 #, python-format
 msgid "Detached %s pull requests"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:428
+#: rhodecode/apps/admin/views/users.py:408
 #, python-format
 msgid "Deleted %s pull requests"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:434
+#: rhodecode/apps/admin/views/users.py:414
 #, python-format
 msgid "Detached %s artifacts"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:437
+#: rhodecode/apps/admin/views/users.py:417
 #, python-format
 msgid "Deleted %s artifacts"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:486
+#: rhodecode/apps/admin/views/users.py:466
 msgid "Successfully deleted user `{}`"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:493
+#: rhodecode/apps/admin/views/users.py:473
 msgid "An error occurred during deletion of user"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:562
+#: rhodecode/apps/admin/views/users.py:536
 msgid ""
 "The user participates as reviewer in {} pull request and cannot be deleted. \n"
 "You can set the user to \"{}\" instead of deleting it."
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:568
+#: rhodecode/apps/admin/views/users.py:542
 msgid ""
 "The user participates as reviewer in {} pull requests and cannot be deleted. \n"
 "You can set the user to \"{}\" instead of deleting it."
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:657
+#: rhodecode/apps/admin/views/users.py:625
 msgid "User global permissions updated successfully"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:675
-#: rhodecode/apps/user_group/views/__init__.py:479
+#: rhodecode/apps/admin/views/users.py:643
+#: rhodecode/apps/user_group/views/__init__.py:449
 msgid "An error occurred during permissions saving"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:698
+#: rhodecode/apps/admin/views/users.py:663
 msgid "Force password change enabled for user"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:706
-#: rhodecode/apps/admin/views/users.py:736
+#: rhodecode/apps/admin/views/users.py:671
+#: rhodecode/apps/admin/views/users.py:698
 msgid "An error occurred during password reset for user"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:727
+#: rhodecode/apps/admin/views/users.py:689
 msgid "Force password change disabled for user"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:800
+#: rhodecode/apps/admin/views/users.py:756
 #, python-format
 msgid "Linked repository group `%s` as personal"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:806
+#: rhodecode/apps/admin/views/users.py:762
 #, python-format
 msgid "Created repository group `%s`"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:810
+#: rhodecode/apps/admin/views/users.py:766
 #, python-format
 msgid "Repository group `%s` is already taken"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:815
+#: rhodecode/apps/admin/views/users.py:771
 msgid "An error occurred during repository group creation for user"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:838
-#: rhodecode/apps/my_account/views/my_account.py:161
+#: rhodecode/apps/admin/views/users.py:791
+#: rhodecode/apps/my_account/views/my_account.py:216
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:28
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:33
 msgid "Role"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:896
-#: rhodecode/apps/my_account/views/my_account.py:217
+#: rhodecode/apps/admin/views/users.py:844
+#: rhodecode/apps/my_account/views/my_account.py:267
 msgid "Auth token successfully created"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:925
-#: rhodecode/apps/my_account/views/my_account.py:241
+#: rhodecode/apps/admin/views/users.py:871
+#: rhodecode/apps/my_account/views/my_account.py:289
 msgid "Auth token successfully deleted"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1001
-#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:117
+#: rhodecode/apps/admin/views/users.py:939
+#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:106
 msgid "Ssh Key successfully created"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1007
-#: rhodecode/apps/admin/views/users.py:1011
-#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:123
-#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:127
+#: rhodecode/apps/admin/views/users.py:945
+#: rhodecode/apps/admin/views/users.py:949
+#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:112
+#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:116
 msgid "An error occurred during ssh key saving: {}"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1045
-#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:157
+#: rhodecode/apps/admin/views/users.py:981
+#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:144
 msgid "Ssh key successfully deleted"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1091
+#: rhodecode/apps/admin/views/users.py:1022
 #, python-format
 msgid "Added new email address `%s` for user account"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1097
+#: rhodecode/apps/admin/views/users.py:1028
 msgid "Email `{}` is already registered for another user."
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1101
+#: rhodecode/apps/admin/views/users.py:1032
 msgid "An error occurred during email saving"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1128
+#: rhodecode/apps/admin/views/users.py:1057
 msgid "Removed email address from user account"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1174
+#: rhodecode/apps/admin/views/users.py:1098
 #, python-format
 msgid "An error occurred during ip saving:%s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1196
+#: rhodecode/apps/admin/views/users.py:1120
 msgid "An error occurred during ip saving"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1200
+#: rhodecode/apps/admin/views/users.py:1124
 #, python-format
 msgid "Added ips %s to user whitelist"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1230
+#: rhodecode/apps/admin/views/users.py:1152
 msgid "Removed ip address from user whitelist"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1295
+#: rhodecode/apps/admin/views/users.py:1212
 msgid "Groups successfully changed"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:1415
+#: rhodecode/apps/admin/views/users.py:1315
 msgid "Deleted {} cache keys"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:57 rhodecode/model/auth_token.py:51
+#: rhodecode/apps/gist/views.py:56 rhodecode/model/auth_token.py:51
 msgid "forever"
 msgstr ""
 
+#: rhodecode/apps/gist/views.py:57
+msgid "5 minutes"
+msgstr ""
+
 #: rhodecode/apps/gist/views.py:58
-msgid "5 minutes"
+msgid "1 hour"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:59
-msgid "1 hour"
+msgid "1 day"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:60
-msgid "1 day"
-msgstr ""
-
-#: rhodecode/apps/gist/views.py:61
 msgid "1 month"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:48330
+#: rhodecode/apps/gist/views.py:63 rhodecode/public/js/scripts.js:48529
 #: rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48
 #: rhodecode/public/js/src/rhodecode.js:634
 msgid "Lifetime"
 msgstr ""
 
+#: rhodecode/apps/gist/views.py:65
+msgid "Requires registered account"
+msgstr ""
+
 #: rhodecode/apps/gist/views.py:66
-msgid "Requires registered account"
-msgstr ""
-
-#: rhodecode/apps/gist/views.py:67
 msgid "Can be accessed by anonymous users"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:218
+#: rhodecode/apps/gist/views.py:208
 msgid "Error occurred during gist creation"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:242
+#: rhodecode/apps/gist/views.py:230
 #, python-format
 msgid "Deleted gist %s"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:330
+#: rhodecode/apps/gist/views.py:303
 #: rhodecode/templates/admin/gists/gist_show.mako:76
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:50
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:55
 #: rhodecode/templates/data_table/_dt_elements.mako:341
 msgid "never"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:336
+#: rhodecode/apps/gist/views.py:309
 #, python-format
 msgid "%(expiry)s - current value"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:381
+#: rhodecode/apps/gist/views.py:351
 msgid "Successfully updated gist content"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:386
+#: rhodecode/apps/gist/views.py:356
 msgid "Successfully updated gist data"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:389
+#: rhodecode/apps/gist/views.py:359
 msgid "Error occurred during update of gist {}: {}"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:393
+#: rhodecode/apps/gist/views.py:363
 #, python-format
 msgid "Error occurred during update of gist %s"
 msgstr ""
 
-#: rhodecode/apps/home/views.py:453
-#: rhodecode/apps/repository/views/repo_pull_requests.py:983
+#: rhodecode/apps/home/views.py:442
+#: rhodecode/apps/repository/views/repo_pull_requests.py:972
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:219
 #: rhodecode/templates/admin/repos/repo_add.mako:15
 #: rhodecode/templates/admin/repos/repo_add.mako:19
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12
 #: rhodecode/templates/base/base.mako:114
 #: rhodecode/templates/base/base.mako:133
 #: rhodecode/templates/base/base.mako:1191
 msgid "Repositories"
 msgstr ""
 
-#: rhodecode/apps/home/views.py:480
+#: rhodecode/apps/home/views.py:466
 #: rhodecode/templates/admin/integrations/form.mako:17
 #: rhodecode/templates/admin/integrations/list.mako:10
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:31
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:218
 msgid "Repository Groups"
 msgstr ""
 
-#: rhodecode/apps/journal/views.py:133 rhodecode/apps/journal/views.py:179
+#: rhodecode/apps/journal/views.py:129 rhodecode/apps/journal/views.py:175
 msgid "public journal"
 msgstr ""
 
-#: rhodecode/apps/journal/views.py:137 rhodecode/apps/journal/views.py:183
+#: rhodecode/apps/journal/views.py:133 rhodecode/apps/journal/views.py:179
 msgid "journal"
 msgstr ""
 
-#: rhodecode/apps/login/views.py:304 rhodecode/apps/login/views.py:403
+#: rhodecode/apps/login/views.py:290 rhodecode/apps/login/views.py:386
 msgid "Bad captcha"
 msgstr ""
 
-#: rhodecode/apps/login/views.py:330
+#: rhodecode/apps/login/views.py:316
 msgid "You have successfully registered with RhodeCode. You can log-in now."
 msgstr ""
 
-#: rhodecode/apps/login/views.py:334
+#: rhodecode/apps/login/views.py:320
 msgid "Please use the {identity} button to log-in"
 msgstr ""
 
-#: rhodecode/apps/login/views.py:372
+#: rhodecode/apps/login/views.py:355
 msgid "If such email exists, a password reset link was sent to it."
 msgstr ""
 
-#: rhodecode/apps/login/views.py:385
+#: rhodecode/apps/login/views.py:368
 msgid "Password reset has been disabled."
 msgstr ""
 
-#: rhodecode/apps/login/views.py:474
+#: rhodecode/apps/login/views.py:455
 msgid "Given reset token is invalid"
 msgstr ""
 
-#: rhodecode/apps/login/views.py:482
+#: rhodecode/apps/login/views.py:463
 msgid "Your password reset was successful, a new password has been sent to your email"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:136
+#: rhodecode/apps/my_account/views/my_account.py:135
+msgid "Your account was updated successfully"
+msgstr ""
+
+#: rhodecode/apps/my_account/views/my_account.py:142
+msgid "Error occurred during update of user"
+msgstr ""
+
+#: rhodecode/apps/my_account/views/my_account.py:194
 msgid "Error occurred during update of user password"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:143
+#: rhodecode/apps/my_account/views/my_account.py:201
 msgid "Successfully updated password"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:305
+#: rhodecode/apps/my_account/views/my_account.py:347
 msgid "Error occurred during adding email"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:308
+#: rhodecode/apps/my_account/views/my_account.py:350
 msgid "Successfully added email"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:330
+#: rhodecode/apps/my_account/views/my_account.py:370
 msgid "Email successfully deleted"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:540
+#: rhodecode/apps/my_account/views/my_account.py:566
 msgid "Position {} is defined twice. Please correct this error."
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:553
+#: rhodecode/apps/my_account/views/my_account.py:579
 msgid "Update Bookmarks"
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:555
+#: rhodecode/apps/my_account/views/my_account.py:581
 msgid "Failed to update bookmarks. Make sure an unique position is used."
 msgstr ""
 
-#: rhodecode/apps/my_account/views/my_account.py:709
-msgid "Your account was updated successfully"
-msgstr ""
-
-#: rhodecode/apps/my_account/views/my_account.py:716
-msgid "Error occurred during update of user"
-msgstr ""
-
-#: rhodecode/apps/repo_group/views/repo_group_advanced.py:57
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:85
+#: rhodecode/apps/repo_group/views/repo_group_advanced.py:53
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:82
 msgid "updated commit cache"
 msgstr ""
 
-#: rhodecode/apps/repo_group/views/repo_group_advanced.py:105
+#: rhodecode/apps/repo_group/views/repo_group_advanced.py:98
 #, python-format
 msgid "Removed repository group `%s`"
 msgstr ""
 
-#: rhodecode/apps/repo_group/views/repo_group_advanced.py:109
+#: rhodecode/apps/repo_group/views/repo_group_advanced.py:102
 #, python-format
 msgid "Error occurred during deletion of repository group %s"
 msgstr ""
 
-#: rhodecode/apps/repo_group/views/repo_group_permissions.py:75
-#: rhodecode/apps/user_group/views/__init__.py:346
+#: rhodecode/apps/repo_group/views/repo_group_permissions.py:69
+#: rhodecode/apps/user_group/views/__init__.py:322
 msgid "Cannot change permission for yourself as admin"
 msgstr ""
 
-#: rhodecode/apps/repo_group/views/repo_group_permissions.py:99
+#: rhodecode/apps/repo_group/views/repo_group_permissions.py:93
 msgid "Repository Group permissions updated"
 msgstr ""
 
-#: rhodecode/apps/repo_group/views/repo_group_settings.py:174
+#: rhodecode/apps/repo_group/views/repo_group_settings.py:168
 msgid "Repository Group `{}` updated successfully"
 msgstr ""
 
-#: rhodecode/apps/repo_group/views/repo_group_settings.py:179
+#: rhodecode/apps/repo_group/views/repo_group_settings.py:173
 #, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_caches.py:80
+#: rhodecode/apps/repository/views/repo_caches.py:75
 msgid "Cache invalidation successful"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_caches.py:84
+#: rhodecode/apps/repository/views/repo_caches.py:79
 msgid "An error occurred during cache invalidation"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_changelog.py:66
 #: rhodecode/apps/repository/views/repo_compare.py:64
-#: rhodecode/apps/repository/views/repo_pull_requests.py:832
+#: rhodecode/apps/repository/views/repo_pull_requests.py:830
 msgid "There are no commits yet"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_changelog.py:71
 #: rhodecode/apps/repository/views/repo_files.py:205
 msgid "No such commit exists for this repository"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_checks.py:103
+#: rhodecode/apps/repository/views/repo_checks.py:94
 #, python-format
 msgid "Created repository %s from %s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_checks.py:112
+#: rhodecode/apps/repository/views/repo_checks.py:103
 #, python-format
 msgid "Forked repository %s as %s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_checks.py:115
+#: rhodecode/apps/repository/views/repo_checks.py:106
 #, python-format
 msgid "Created repository %s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_commits.py:113
+#: rhodecode/apps/repository/views/repo_commits.py:112
 msgid "No such commit exists. Org exception: `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_commits.py:404
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1620
+#: rhodecode/apps/repository/views/repo_commits.py:388
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1588
 #, python-format
 msgid "Status change %(transition_icon)s %(status)s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_commits.py:442
+#: rhodecode/apps/repository/views/repo_commits.py:426
 msgid "Changing the status of a commit associated with a closed pull request is not allowed"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_commits.py:488
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1703
+#: rhodecode/apps/repository/views/repo_commits.py:472
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1671
 msgid "posted {} new {} comment"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_commits.py:490
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1705
+#: rhodecode/apps/repository/views/repo_commits.py:474
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1673
 msgid "posted {} new {} comments"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_compare.py:102
+#: rhodecode/apps/repository/views/repo_compare.py:99
 msgid "Select commit"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_compare.py:173
+#: rhodecode/apps/repository/views/repo_compare.py:167
 msgid "Could not find the source repo: `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_compare.py:181
+#: rhodecode/apps/repository/views/repo_compare.py:175
 msgid "Could not find the target repo: `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_compare.py:192
+#: rhodecode/apps/repository/views/repo_compare.py:186
 msgid "The comparison of two different kinds of remote repos is not available"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_compare.py:225
+#: rhodecode/apps/repository/views/repo_compare.py:219
 msgid "Could not compare repos with different large file settings"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_compare.py:271
+#: rhodecode/apps/repository/views/repo_compare.py:265
 #, python-format
 msgid "Repositories unrelated. Cannot compare commit %(commit1)s from repository %(repo1)s with commit %(commit2)s from repository %(repo2)s."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_feed.py:68
+#: rhodecode/apps/repository/views/repo_feed.py:66
 #, python-format
 msgid "Changes on %s repository"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_feed.py:69
+#: rhodecode/apps/repository/views/repo_feed.py:67
 #, python-format
 msgid "%s %s feed"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:96
 #, python-format
 msgid "This repository has been locked by %s on %s"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:109
 msgid "Cannot modify file. Given commit `{}` is not head of a branch."
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:127
 msgid "Branch `{}` changes forbidden by rule {}."
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:175
 msgid "Click here to add a new file."
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:180
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:185
 msgid "No such commit exists for this repository. Commit: {}"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:361
+#: rhodecode/apps/repository/views/repo_files.py:358
 msgid "Downloads disabled"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:367
+#: rhodecode/apps/repository/views/repo_files.py:364
 msgid "Unknown archive type for: `{}`"
 msgstr ""
 
+#: rhodecode/apps/repository/views/repo_files.py:370
+msgid "Unknown commit_id {}"
+msgstr ""
+
 #: rhodecode/apps/repository/views/repo_files.py:373
-msgid "Unknown commit_id {}"
-msgstr ""
-
-#: rhodecode/apps/repository/views/repo_files.py:376
 msgid "Empty repository"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:381
+#: rhodecode/apps/repository/views/repo_files.py:378
 msgid "No node at path {} for this repository"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:432
+#: rhodecode/apps/repository/views/repo_files.py:429
 msgid "Unknown archive type"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1027
+#: rhodecode/apps/repository/views/repo_files.py:986
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1048
-#: rhodecode/apps/repository/views/repo_summary.py:264
-#: rhodecode/model/pull_request.py:1896 rhodecode/model/scm.py:999
+#: rhodecode/apps/repository/views/repo_files.py:1007
+#: rhodecode/apps/repository/views/repo_summary.py:243
+#: rhodecode/model/pull_request.py:1910 rhodecode/model/scm.py:999
 #: rhodecode/templates/base/vcs_settings.mako:235
 #: rhodecode/templates/summary/components.mako:10
 msgid "Branches"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1052
+#: rhodecode/apps/repository/views/repo_files.py:1011
 #: rhodecode/model/scm.py:1016 rhodecode/templates/base/vcs_settings.mako:260
 #: rhodecode/templates/summary/components.mako:34
 msgid "Tags"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1208
-#: rhodecode/apps/repository/views/repo_files.py:1237
+#: rhodecode/apps/repository/views/repo_files.py:1155
+#: rhodecode/apps/repository/views/repo_files.py:1181
 msgid "Deleted file {} via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1258
+#: rhodecode/apps/repository/views/repo_files.py:1202
 msgid "Successfully deleted file `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1262
-#: rhodecode/apps/repository/views/repo_files.py:1381
-#: rhodecode/apps/repository/views/repo_files.py:1514
-#: rhodecode/apps/repository/views/repo_files.py:1638
+#: rhodecode/apps/repository/views/repo_files.py:1206
+#: rhodecode/apps/repository/views/repo_files.py:1319
+#: rhodecode/apps/repository/views/repo_files.py:1443
+#: rhodecode/apps/repository/views/repo_files.py:1564
 msgid "Error occurred during commit"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1295
-#: rhodecode/apps/repository/views/repo_files.py:1327
+#: rhodecode/apps/repository/views/repo_files.py:1236
+#: rhodecode/apps/repository/views/repo_files.py:1265
 msgid "Edited file {} via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1350
+#: rhodecode/apps/repository/views/repo_files.py:1288
 msgid "No changes detected on {}"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1374
+#: rhodecode/apps/repository/views/repo_files.py:1312
 msgid "Successfully committed changes to file `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1416
-#: rhodecode/apps/repository/views/repo_files.py:1458
+#: rhodecode/apps/repository/views/repo_files.py:1348
+#: rhodecode/apps/repository/views/repo_files.py:1387
 msgid "Added file via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1474
+#: rhodecode/apps/repository/views/repo_files.py:1403
 msgid "No filename specified"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1499
+#: rhodecode/apps/repository/views/repo_files.py:1428
 msgid "Successfully committed new file `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1507
-#: rhodecode/apps/repository/views/repo_files.py:1620
+#: rhodecode/apps/repository/views/repo_files.py:1436
+#: rhodecode/apps/repository/views/repo_files.py:1546
 msgid "The location specified must be a relative path and must not contain .. in the path"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1565
+#: rhodecode/apps/repository/views/repo_files.py:1491
 msgid "Uploaded file via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1609
+#: rhodecode/apps/repository/views/repo_files.py:1535
 msgid "Successfully committed {} new files"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1611
+#: rhodecode/apps/repository/views/repo_files.py:1537
 msgid "Successfully committed 1 new file"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_forks.py:146
+#: rhodecode/apps/repository/views/repo_forks.py:140
 msgid "Compare fork"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_forks.py:251
+#: rhodecode/apps/repository/views/repo_forks.py:239
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_permissions.py:57
+#: rhodecode/apps/repository/views/repo_permissions.py:53
 msgid "Explicitly add user or user group with write or higher permission to modify their branch permissions."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_permissions.py:92
+#: rhodecode/apps/repository/views/repo_permissions.py:85
 msgid "Repository access permissions updated"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_permissions.py:126
+#: rhodecode/apps/repository/views/repo_permissions.py:116
 msgid "Repository `{}` private mode set successfully"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_permissions.py:134
-#: rhodecode/apps/repository/views/repo_settings.py:176
+#: rhodecode/apps/repository/views/repo_permissions.py:124
+#: rhodecode/apps/repository/views/repo_settings.py:169
 msgid "Error occurred during update of repository {}"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:331
+#: rhodecode/apps/repository/views/repo_pull_requests.py:326
 msgid "Pull Request state was force changed to `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:862
+#: rhodecode/apps/repository/views/repo_pull_requests.py:857
 msgid "Commit does not exist"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1142
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1119
 msgid "Error creating pull request: {}"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1162
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1139
 msgid "source_repo or target repo not found"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1173
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1150
 msgid "Not Enough permissions to source repo `{}`."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1188
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1165
 msgid "Not Enough permissions to target repo `{}`."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1258
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1235
 msgid "Successfully opened new pull request"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1261
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1238
 msgid "Error occurred during creation of this pull request."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1293
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1362
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1267
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1336
 msgid "Cannot update closed pull requests."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1325
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1299
 msgid "Cannot update pull requests commits in state other than `{}`. Current state is: `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1368
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1342
 msgid "Pull request title & description updated."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1390
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1364
 msgid "Pull request updated to \"{source_commit_id}\" with {count_added} added, {count_removed} removed commits. Source of changes: {change_source}."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1430
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1404
 msgid "Pull request reviewers updated."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1454
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1428
 msgid "Pull request observers updated."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1481
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1452
 msgid "Cannot merge pull requests in state other than `{}`. Current state is: `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1527
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1498
 msgid "Pull request was successfully merged and closed."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1558
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1526
 msgid "Successfully deleted pull request"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings.py:172
+#: rhodecode/apps/repository/views/repo_settings.py:165
 msgid "Repository `{}` updated successfully"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings.py:209
+#: rhodecode/apps/repository/views/repo_settings.py:199
 msgid "Unlocked"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings.py:214
+#: rhodecode/apps/repository/views/repo_settings.py:204
 msgid "Locked"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings.py:216
+#: rhodecode/apps/repository/views/repo_settings.py:206
 #, python-format
 msgid "Repository has been %s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings.py:220
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:305
+#: rhodecode/apps/repository/views/repo_settings.py:210
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:287
 msgid "An error occurred during unlocking"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings.py:264
+#: rhodecode/apps/repository/views/repo_settings.py:248
 msgid "An error occurred during deletion of repository stats"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:114
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:108
 #, python-format
 msgid "Archived repository `%s`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:119
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:113
 #, python-format
 msgid "An error occurred during archiving of `%s`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:157
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:148
 #, python-format
 msgid "Detached %s forks"
 msgstr ""
 
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:150
+#, python-format
+msgid "Deleted %s forks"
+msgstr ""
+
 #: rhodecode/apps/repository/views/repo_settings_advanced.py:159
 #, python-format
-msgid "Deleted %s forks"
-msgstr ""
-
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:168
-#, python-format
 msgid "Deleted repository `%s`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:175
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:166
 msgid "detach or delete"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:176
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:167
 msgid "Cannot delete `{repo}` it still contains attached forks. Try using {delete_or_detach} option."
 msgstr ""
 
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:182
+msgid "Cannot delete `{repo}` it still contains {num} attached pull requests. Consider archiving the repository instead."
+msgstr ""
+
 #: rhodecode/apps/repository/views/repo_settings_advanced.py:191
-msgid "Cannot delete `{repo}` it still contains {num} attached pull requests. Consider archiving the repository instead."
-msgstr ""
-
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:200
 #, python-format
 msgid "An error occurred during deletion of `%s`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:225
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:213
 msgid "Updated repository visibility in public journal"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:229
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:217
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:265
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:250
 msgid "Nothing"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:268
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:253
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:275
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:260
 msgid "An error occurred during this operation"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:299
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:281
 msgid "Locked repository"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:302
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:284
 msgid "Unlocked repository"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_advanced.py:322
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:301
 msgid "installed updated hooks into this repository"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_fields.py:86
+#: rhodecode/apps/repository/views/repo_settings_fields.py:79
 msgid "An error occurred during creation of field"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_fields.py:108
+#: rhodecode/apps/repository/views/repo_settings_fields.py:98
 msgid "An error occurred during removal of field"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:86
+#: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:77
 msgid "Error occurred during deleting issue tracker entry"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_remote.py:64
+#: rhodecode/apps/repository/views/repo_settings_remote.py:58
 msgid "Pulled from remote location"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_remote.py:67
+#: rhodecode/apps/repository/views/repo_settings_remote.py:61
 msgid "An error occurred during pull from remote location"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_settings_vcs.py:147
+#: rhodecode/apps/repository/views/repo_settings_vcs.py:139
 msgid "Error occurred during updating repository VCS settings"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_summary.py:240
+#: rhodecode/apps/repository/views/repo_summary.py:222
 #: rhodecode/templates/admin/permissions/permissions.mako:42
 #: rhodecode/templates/summary/components.mako:8
 msgid "Branch"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_summary.py:241
+#: rhodecode/apps/repository/views/repo_summary.py:223
 #: rhodecode/templates/summary/components.mako:32
 msgid "Tag"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_summary.py:242
+#: rhodecode/apps/repository/views/repo_summary.py:224
 #: rhodecode/templates/summary/components.mako:44
 msgid "Bookmark"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_summary.py:265
+#: rhodecode/apps/repository/views/repo_summary.py:244
 msgid "Closed branches"
 msgstr ""
 
 #: rhodecode/apps/ssh_support/events.py:29
 msgid "RhodeCode SSH Key files changed."
 msgstr ""
 
 #: rhodecode/apps/svn_support/events.py:30
 msgid "Configuration for Apache mad_dav_svn changed."
 msgstr ""
 
-#: rhodecode/apps/user_group/views/__init__.py:188
+#: rhodecode/apps/user_group/views/__init__.py:176
 #, python-format
 msgid "Updated user group %s"
 msgstr ""
 
-#: rhodecode/apps/user_group/views/__init__.py:224
+#: rhodecode/apps/user_group/views/__init__.py:212
 #, python-format
 msgid "Error occurred during update of user group %s"
 msgstr ""
 
-#: rhodecode/apps/user_group/views/__init__.py:250
+#: rhodecode/apps/user_group/views/__init__.py:235
 msgid "Successfully deleted user group"
 msgstr ""
 
-#: rhodecode/apps/user_group/views/__init__.py:255
+#: rhodecode/apps/user_group/views/__init__.py:240
 msgid "An error occurred during deletion of user group"
 msgstr ""
 
-#: rhodecode/apps/user_group/views/__init__.py:359
+#: rhodecode/apps/user_group/views/__init__.py:335
 msgid "Target group cannot be the same"
 msgstr ""
 
-#: rhodecode/apps/user_group/views/__init__.py:374
+#: rhodecode/apps/user_group/views/__init__.py:350
 msgid "User Group permissions updated"
 msgstr ""
 
-#: rhodecode/apps/user_group/views/__init__.py:459
+#: rhodecode/apps/user_group/views/__init__.py:429
 msgid "User Group global permissions updated successfully"
 msgstr ""
 
-#: rhodecode/apps/user_group/views/__init__.py:541
+#: rhodecode/apps/user_group/views/__init__.py:505
 msgid "User Group synchronization updated successfully"
 msgstr ""
 
-#: rhodecode/apps/user_group/views/__init__.py:545
+#: rhodecode/apps/user_group/views/__init__.py:509
 msgid "An error occurred during synchronization update"
 msgstr ""
 
 #: rhodecode/authentication/routes.py:61
 #: rhodecode/templates/admin/auth/plugin_settings.mako:14
 msgid "Authentication Plugins"
 msgstr ""
 
 #: rhodecode/authentication/schema.py:36
 msgid "Enable or disable this authentication plugin."
 msgstr ""
 
 #: rhodecode/authentication/schema.py:38 rhodecode/integrations/schema.py:32
 #: rhodecode/model/permission.py:110 rhodecode/model/permission.py:114
 #: rhodecode/model/permission.py:118 rhodecode/model/permission.py:122
 #: rhodecode/model/permission.py:126 rhodecode/model/permission.py:130
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:195
 #: rhodecode/templates/admin/auth/auth_settings.mako:64
 #: rhodecode/templates/admin/integrations/list.mako:71
 #: rhodecode/templates/admin/my_account/my_account_notifications.mako:23
 msgid "Enabled"
 msgstr ""
 
 #: rhodecode/authentication/schema.py:44
 msgid ""
 "Amount of seconds to cache the authentication and permissions check response call for this plugin. \n"
 "Useful for expensive calls like LDAP to improve the performance of the system (0 means disabled)."
 msgstr ""
 
 #: rhodecode/authentication/schema.py:49
 msgid "Auth Cache TTL"
 msgstr ""
 
 #: rhodecode/authentication/views.py:92
 msgid "Errors exist when saving plugin settings. Please check the form inputs."
 msgstr ""
 
 #: rhodecode/authentication/views.py:105 rhodecode/authentication/views.py:164
 msgid "Auth settings updated successfully."
 msgstr ""
 
 #: rhodecode/authentication/views.py:167
 msgid "Errors exist when saving plugin setting. Please check the form inputs."
 msgstr ""
 
 #: rhodecode/authentication/views.py:175
 msgid "Error occurred during update of auth settings."
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:60
 msgid "The FQDN or IP of the Atlassian CROWD Server"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:62
 msgid "Host"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:67
 msgid "The Port in use by the Atlassian CROWD Server"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:69
 #: rhodecode/authentication/plugins/auth_ldap.py:270
 msgid "Port"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:75
 msgid "The Application Name to authenticate to CROWD"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:77
 msgid "Application Name"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:82
 msgid "The password to authenticate to CROWD"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:84
 msgid "Application Password"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:89
 msgid "A comma separated list of group names that identify users as RhodeCode Administrators"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:93
 msgid "Admin Groups"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:217
 msgid "CROWD"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_headers.py:54
 msgid "Header to extract the user from"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_headers.py:56
 msgid "Header"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_headers.py:61
 msgid "Header to extract the user from when main one fails"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_headers.py:63
 msgid "Fallback header"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_headers.py:68
 msgid "Perform cleaning of user, if passed user has @ in username then first part before @ is taken. If there's \\ in the username only the part after  \\ is taken"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_headers.py:73
 msgid "Clean username"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_headers.py:99
 msgid "Headers"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_jasig_cas.py:62
 msgid "The url of the Jasig CAS REST service"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_jasig_cas.py:64
 msgid "URL"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_jasig_cas.py:93
 msgid "Jasig-CAS"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:258
 msgid ""
 "Host[s] of the LDAP Server \n"
 "(e.g., 192.168.2.154, or ldap-server.domain.com.\n"
 " Multiple servers can be specified using commas"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:262
 msgid "LDAP Host"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:267
 msgid "Custom port that the LDAP server is listening on. Default value is: 389, use 636 for LDAPS (SSL)"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:277
 msgid "Timeout for LDAP connection"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:279
 msgid "Connection timeout"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:286
 msgid ""
 "Optional user DN/account to connect to LDAP if authentication is required. \n"
 "e.g., cn=admin,dc=mydomain,dc=com, or uid=root,cn=users,dc=mydomain,dc=com, or [e-mail]"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:291
 msgid "Bind account"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:296
 msgid "Password to authenticate for given user DN."
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:299
 msgid "Bind account password"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:304
 msgid "TLS Type"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:305
 msgid "Connection Security"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:311
 msgid ""
 "Require Cert over TLS?. Self-signed and custom certificates can be used when\n"
 " `RhodeCode Certificate` found in admin > settings > system info page is extended."
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:314
 msgid "Certificate Checks"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:320
 msgid ""
 "This specifies the PEM-format file path containing certificates for use in TLS connection.\n"
 "If not specified `TLS Cert dir` will be used"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:323
 msgid "TLS Cert file"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:329
 msgid "This specifies the path of a directory that contains individual CA certificates in separate files."
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:331
 msgid "TLS Cert dir"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:336
 msgid ""
 "Base DN to search. Dynamic bind is supported. Add `$login` marker in it to be replaced with current user username \n"
 "(e.g., dc=mydomain,dc=com, or ou=Users,dc=mydomain,dc=com)"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:341
 msgid "Base DN"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:346
 msgid ""
 "Filter to narrow results \n"
 "(e.g., (&(objectCategory=Person)(objectClass=user)), or \n"
 "(memberof=cn=rc-login,ou=groups,ou=company,dc=mydomain,dc=com)))"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:351
 msgid "LDAP Search Filter"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:357
 msgid "How deep to search LDAP. If unsure set to SUBTREE"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:358
 msgid "LDAP Search Scope"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:364
 msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:366
 msgid "Login Attribute"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:367
 msgid "The LDAP Login attribute of the CN must be specified"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:372
 msgid ""
 "LDAP Attribute to map to email address (e.g., mail).\n"
 "Emails are a crucial part of RhodeCode. \n"
 "If possible add a valid email attribute to ldap users."
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:377
 msgid "Email Attribute"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:382
 msgid "LDAP Attribute to map to first name (e.g., givenName)"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:385
 msgid "First Name Attribute"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:390
 msgid "LDAP Attribute to map to last name (e.g., sn)"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:393
 msgid "Last Name Attribute"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:425
 msgid "LDAP"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_pam.py:60
 msgid "PAM service name to use for authentication."
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_pam.py:62
 msgid "PAM service name"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_pam.py:67
 msgid "Regular expression for extracting user name/email etc. from Unix userinfo."
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_pam.py:70
 msgid "Gecos Regex"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_pam.py:99
 msgid "PAM"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_rhodecode.py:79
 msgid "RhodeCode Internal"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_rhodecode.py:200
 msgid "Allowed user types for authentication using this plugin."
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_rhodecode.py:201
 msgid "User restriction"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_rhodecode.py:209
 msgid "Allowed protocols for authentication using this plugin. VCS means GIT/HG/SVN. HTTP is web based login."
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_rhodecode.py:211
 #: rhodecode/authentication/plugins/auth_token.py:173
 msgid "Scope restriction"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_token.py:77
 msgid "Rhodecode Token"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_token.py:172
 msgid "Choose operation scope restriction when authenticating."
 msgstr ""
 
 #: rhodecode/events/pullrequest.py:78
 msgid "pullrequest created"
 msgstr ""
 
 #: rhodecode/events/pullrequest.py:79
 msgid "Event triggered after pull request was created"
 msgstr ""
 
 #: rhodecode/events/pullrequest.py:88
 msgid "pullrequest closed"
 msgstr ""
 
 #: rhodecode/events/pullrequest.py:89
 msgid "Event triggered after pull request was closed"
 msgstr ""
 
 #: rhodecode/events/pullrequest.py:98
 msgid "pullrequest commits updated"
 msgstr ""
 
 #: rhodecode/events/pullrequest.py:99
 msgid "Event triggered after pull requests was updated"
 msgstr ""
 
 #: rhodecode/events/pullrequest.py:108
 msgid "pullrequest review changed"
 msgstr ""
 
 #: rhodecode/events/pullrequest.py:109
 msgid "Event triggered after a review status of a pull requests has changed to other."
 msgstr ""
 
 #: rhodecode/events/pullrequest.py:123
 msgid "pullrequest merged"
 msgstr ""
 
 #: rhodecode/events/pullrequest.py:124
 msgid "Event triggered after a successful merge operation was executed on a pull request"
 msgstr ""
 
 #: rhodecode/events/pullrequest.py:134
 msgid "pullrequest commented"
 msgstr ""
 
 #: rhodecode/events/pullrequest.py:135
 msgid "Event triggered after a comment was made on a code in the pull request"
 msgstr ""
 
 #: rhodecode/events/pullrequest.py:173
 msgid "pullrequest comment edited"
 msgstr ""
 
 #: rhodecode/events/pullrequest.py:174
 msgid "Event triggered after a comment was edited on a code in the pull request"
 msgstr ""
 
 #: rhodecode/events/repo.py:191
 msgid "repository commit comment"
 msgstr ""
 
 #: rhodecode/events/repo.py:192
 msgid "Event triggered after a comment was made on commit inside a repository"
 msgstr ""
 
 #: rhodecode/events/repo.py:226
 msgid "repository commit edit comment"
 msgstr ""
 
 #: rhodecode/events/repo.py:227
 msgid "Event triggered after a comment was edited on commit inside a repository"
 msgstr ""
 
 #: rhodecode/events/repo.py:260
 msgid "repository pre create"
 msgstr ""
 
 #: rhodecode/events/repo.py:261
 msgid "Event triggered before repository is created"
 msgstr ""
 
 #: rhodecode/events/repo.py:270
 msgid "repository created"
 msgstr ""
 
 #: rhodecode/events/repo.py:271
 msgid "Event triggered after repository was created"
 msgstr ""
 
 #: rhodecode/events/repo.py:280
 msgid "repository pre delete"
 msgstr ""
 
 #: rhodecode/events/repo.py:281
 msgid "Event triggered before a repository is deleted"
 msgstr ""
 
 #: rhodecode/events/repo.py:290
 msgid "repository deleted"
 msgstr ""
 
 #: rhodecode/events/repo.py:291
 msgid "Event triggered after repository was deleted"
 msgstr ""
 
 #: rhodecode/events/repo.py:331
 msgid "repository pre pull"
 msgstr ""
 
 #: rhodecode/events/repo.py:332
 msgid "Event triggered before repository code is pulled"
 msgstr ""
 
 #: rhodecode/events/repo.py:341
 msgid "repository pull"
 msgstr ""
 
 #: rhodecode/events/repo.py:342
 msgid "Event triggered after repository code was pulled"
 msgstr ""
 
 #: rhodecode/events/repo.py:351
 msgid "repository pre push"
 msgstr ""
 
 #: rhodecode/events/repo.py:352
 msgid "Event triggered before the code is pushed to a repository"
 msgstr ""
 
 #: rhodecode/events/repo.py:364
 msgid "repository push"
 msgstr ""
 
 #: rhodecode/events/repo.py:365
 msgid "Event triggered after the code was pushed to a repository"
 msgstr ""
 
 #: rhodecode/events/repo_group.py:62
 msgid "repository group created"
 msgstr ""
 
 #: rhodecode/events/repo_group.py:63
 msgid "Event triggered after a repository group was created"
 msgstr ""
 
 #: rhodecode/events/repo_group.py:72
 msgid "repository group deleted"
 msgstr ""
 
 #: rhodecode/events/repo_group.py:73
 msgid "Event triggered after a repository group was deleted"
 msgstr ""
 
 #: rhodecode/events/repo_group.py:82
 msgid "repository group update"
 msgstr ""
 
 #: rhodecode/events/repo_group.py:83
 msgid "Event triggered after a repository group was updated"
 msgstr ""
 
 #: rhodecode/events/user.py:37
 msgid "user registered"
 msgstr ""
 
 #: rhodecode/events/user.py:52
 msgid "user pre create"
 msgstr ""
 
 #: rhodecode/events/user.py:66
 msgid "user post create"
 msgstr ""
 
 #: rhodecode/events/user.py:80
 msgid "user pre update"
 msgstr ""
 
 #: rhodecode/events/user.py:100
 msgid "user permissions change"
 msgstr ""
 
 #: rhodecode/forms/__init__.py:35
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:103
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:73
 #: rhodecode/templates/admin/permissions/permissions_application.mako:60
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:64
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:60
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:227
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:78
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:66
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:207
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:251
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:252
 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:44
 #: rhodecode/templates/admin/settings/settings_global.mako:141
 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:16
 #: rhodecode/templates/admin/settings/settings_labs.mako:49
 #: rhodecode/templates/admin/settings/settings_vcs.mako:14
 #: rhodecode/templates/admin/settings/settings_visual.mako:215
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:217
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:107
 #: rhodecode/templates/admin/users/user_edit_emails.mako:66
 #: rhodecode/templates/admin/users/user_edit_ips.mako:76
 #: rhodecode/templates/admin/users/user_edit_profile.mako:155
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:72
 #: rhodecode/templates/base/default_perms_box.mako:102
 msgid "Reset"
 msgstr ""
 
 #: rhodecode/forms/__init__.py:36 rhodecode/public/js/scripts.js:38315
 #: rhodecode/public/js/scripts.min.js:1
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:29
 #: rhodecode/public/js/src/rhodecode/utils/ajax.js:165
 #: rhodecode/templates/admin/gists/gist_show.mako:59
 #: rhodecode/templates/admin/integrations/list.mako:179
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:65
 #: rhodecode/templates/admin/my_account/my_account_emails.mako:33
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:34
 #: rhodecode/templates/admin/notifications/notifications_data.mako:22
 #: rhodecode/templates/admin/notifications/notifications_show.mako:37
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:29
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25
 #: rhodecode/templates/admin/settings/settings_hooks.mako:46
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:69
 #: rhodecode/templates/admin/users/user_edit_emails.mako:34
 #: rhodecode/templates/admin/users/user_edit_ips.mako:40
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:35
 #: rhodecode/templates/base/issue_tracker_settings.mako:147
 #: rhodecode/templates/base/vcs_settings.mako:244
 #: rhodecode/templates/base/vcs_settings.mako:269
 #: rhodecode/templates/changeset/changeset_file_comment.mako:236
 #: rhodecode/templates/changeset/changeset_file_comment.mako:250
 #: rhodecode/templates/changeset/changeset_file_comment.mako:259
 #: rhodecode/templates/data_table/_dt_elements.mako:439
 #: rhodecode/templates/debug_style/buttons.html:132
 #: rhodecode/templates/files/files_source.mako:40
 #: rhodecode/templates/files/files_source.mako:47
 #: rhodecode/templates/files/files_source.mako:53
 msgid "Delete"
 msgstr ""
 
 #: rhodecode/integrations/schema.py:30
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:193
 msgid "Enable or disable this integration."
 msgstr ""
 
 #: rhodecode/integrations/schema.py:37
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:174
 msgid "Short name for this integration."
 msgstr ""
 
 #: rhodecode/integrations/schema.py:39
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:176
 msgid "Integration name"
 msgstr ""
 
 #: rhodecode/integrations/schema.py:51
 msgid "Limit integrations to to work only on the direct children repositories of this repository group (no subgroups)"
 msgstr ""
 
 #: rhodecode/integrations/schema.py:55
 msgid "Limit to childen repos only"
 msgstr ""
 
 #: rhodecode/integrations/schema.py:63
 msgid "Limit integrations to to work only on root level repositories"
 msgstr ""
 
 #: rhodecode/integrations/schema.py:66
 msgid "Root repositories only"
 msgstr ""
 
 #: rhodecode/integrations/views.py:147
 msgid "{repo_name} repository"
 msgstr ""
 
 #: rhodecode/integrations/views.py:150
 msgid "{repo_group_name} repo group"
 msgstr ""
 
 #: rhodecode/integrations/views.py:153
 #: rhodecode/templates/admin/permissions/permissions.mako:36
 msgid "Global"
 msgstr ""
 
 #: rhodecode/integrations/views.py:157
 msgid "{name} integration"
 msgstr ""
 
 #: rhodecode/integrations/views.py:172
 msgid "Integration {integration_name} deleted successfully."
 msgstr ""
 
 #: rhodecode/integrations/views.py:305
 msgid "Errors exist when saving integration settings. Please check the form inputs."
 msgstr ""
 
 #: rhodecode/integrations/views.py:330
 msgid "Integration {integration_name} updated successfully."
 msgstr ""
 
 #: rhodecode/integrations/types/email.py:157
 msgid "Recipients"
 msgstr ""
 
 #: rhodecode/integrations/types/email.py:158
 msgid "Email addresses to send push events to"
 msgstr ""
 
 #: rhodecode/integrations/types/email.py:163
 #: rhodecode/integrations/types/email.py:164
 msgid "Email address"
 msgstr ""
 
 #: rhodecode/integrations/types/email.py:175
 #: rhodecode/templates/register.mako:97
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:78
 #: rhodecode/templates/admin/users/user_add.mako:86
 #: rhodecode/templates/admin/users/user_edit_profile.mako:65
 #: rhodecode/templates/admin/users/users.mako:76
 #: rhodecode/templates/email_templates/user_registration.mako:51
 #: rhodecode/templates/users/user_profile.mako:69
 msgid "Email"
 msgstr ""
 
 #: rhodecode/integrations/types/email.py:176
 msgid "Send repo push summaries to a list of recipients via email"
 msgstr ""
 
 #: rhodecode/integrations/types/hipchat.py:63
 msgid "Yellow"
 msgstr ""
 
 #: rhodecode/integrations/types/hipchat.py:64
 msgid "Red"
 msgstr ""
 
 #: rhodecode/integrations/types/hipchat.py:65
 msgid "Green"
 msgstr ""
 
 #: rhodecode/integrations/types/hipchat.py:66
 msgid "Purple"
 msgstr ""
 
 #: rhodecode/integrations/types/hipchat.py:67
 msgid "Gray"
 msgstr ""
 
 #: rhodecode/integrations/types/hipchat.py:72
 msgid "Hipchat server URL"
 msgstr ""
 
 #: rhodecode/integrations/types/hipchat.py:73
 msgid "Hipchat integration url."
 msgstr ""
 
 #: rhodecode/integrations/types/hipchat.py:83
 msgid "Notify"
 msgstr ""
 
 #: rhodecode/integrations/types/hipchat.py:84
 msgid "Make a notification to the users in room."
 msgstr ""
 
 #: rhodecode/integrations/types/hipchat.py:90
 msgid "Color"
 msgstr ""
 
 #: rhodecode/integrations/types/hipchat.py:91
 msgid "Background color of message."
 msgstr ""
 
 #: rhodecode/integrations/types/hipchat.py:102
 msgid "Hipchat"
 msgstr ""
 
 #: rhodecode/integrations/types/hipchat.py:103
 msgid "Send events such as repo pushes and pull requests to your hipchat channel."
 msgstr ""
 
 #: rhodecode/integrations/types/slack.py:72
 msgid "Slack service URL"
 msgstr ""
 
 #: rhodecode/integrations/types/slack.py:73
 msgid "This can be setup at the <a href=\"https://my.slack.com/services/new/incoming-webhook/\">slack app manager</a>"
 msgstr ""
 
 #: rhodecode/integrations/types/slack.py:86
 #: rhodecode/integrations/types/webhook.py:81 rhodecode/templates/login.mako:44
 #: rhodecode/templates/register.mako:50
 #: rhodecode/templates/admin/admin_log_base.mako:7
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:38
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:29
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:45
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:74
 #: rhodecode/templates/admin/users/user_add.mako:35
 #: rhodecode/templates/admin/users/user_edit_profile.mako:39
 #: rhodecode/templates/admin/users/users.mako:74
 #: rhodecode/templates/debug_style/login.html:36
 #: rhodecode/templates/email_templates/user_registration.mako:43
 #: rhodecode/templates/user_group/profile.mako:61
 #: rhodecode/templates/users/user_profile.mako:29
 msgid "Username"
 msgstr ""
 
 #: rhodecode/integrations/types/slack.py:87
 msgid "Username to show notifications coming from."
 msgstr ""
 
 #: rhodecode/integrations/types/slack.py:96
 msgid "Channel"
 msgstr ""
 
 #: rhodecode/integrations/types/slack.py:97
 msgid "Channel to send notifications to."
 msgstr ""
 
 #: rhodecode/integrations/types/slack.py:106
 msgid "Emoji"
 msgstr ""
 
 #: rhodecode/integrations/types/slack.py:107
 msgid "Emoji to use eg. :studio_microphone:"
 msgstr ""
 
 #: rhodecode/integrations/types/slack.py:118
 msgid "Slack"
 msgstr ""
 
 #: rhodecode/integrations/types/slack.py:119
 msgid "Send events such as repo pushes and pull requests to your slack channel."
 msgstr ""
 
 #: rhodecode/integrations/types/webhook.py:49
 msgid "Webhook URL"
 msgstr ""
 
 #: rhodecode/integrations/types/webhook.py:51
 msgid "URL to which Webhook should submit data. If used some of the variables would trigger multiple calls, like ${branch} or ${commit_id}. Webhook will be called as many times as unique objects in data in such cases."
 msgstr ""
 
 #: rhodecode/integrations/types/webhook.py:70
 msgid "Secret Token"
 msgstr ""
 
 #: rhodecode/integrations/types/webhook.py:71
 msgid "Optional string used to validate received payloads. It will be sent together with event data in JSON"
 msgstr ""
 
 #: rhodecode/integrations/types/webhook.py:82
 msgid "Optional username to authenticate the call."
 msgstr ""
 
 #: rhodecode/integrations/types/webhook.py:91 rhodecode/templates/login.mako:51
 #: rhodecode/templates/register.mako:64
 #: rhodecode/templates/admin/my_account/my_account.mako:31
 #: rhodecode/templates/admin/users/user_add.mako:44
 #: rhodecode/templates/debug_style/login.html:45
 msgid "Password"
 msgstr ""
 
 #: rhodecode/integrations/types/webhook.py:92
 msgid "Optional password to authenticate the call."
 msgstr ""
 
 #: rhodecode/integrations/types/webhook.py:102
 msgid "Custom Header Key"
 msgstr ""
 
 #: rhodecode/integrations/types/webhook.py:103
 msgid "Custom Header name to be set when calling endpoint."
 msgstr ""
 
 #: rhodecode/integrations/types/webhook.py:112
 msgid "Custom Header Value"
 msgstr ""
 
 #: rhodecode/integrations/types/webhook.py:113
 msgid "Custom Header value to be set when calling endpoint."
 msgstr ""
 
 #: rhodecode/integrations/types/webhook.py:122
 msgid "Call Method"
 msgstr ""
 
 #: rhodecode/integrations/types/webhook.py:123
 msgid "Select a HTTP method to use when calling the Webhook."
 msgstr ""
 
 #: rhodecode/integrations/types/webhook.py:135
 msgid "Webhook"
 msgstr ""
 
 #: rhodecode/integrations/types/webhook.py:136
 msgid "send JSON data to a url endpoint"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:93
 msgid "[deleted] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:96 rhodecode/lib/action_parser.py:114
 msgid "[created] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:99
 msgid "[created] repository as fork"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:102 rhodecode/lib/action_parser.py:117
 msgid "[forked] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:105 rhodecode/lib/action_parser.py:120
 msgid "[updated] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:108
 msgid "[downloaded] archive from repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:111
 msgid "[delete] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:123
 msgid "[created] user"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:126
 msgid "[updated] user"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:129
 msgid "[created] user group"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:132
 msgid "[updated] user group"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:135
 msgid "[commented] on commit in repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:138
 msgid "[commented] on pull request for"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:141
 msgid "[closed] pull request for"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:144
 msgid "[merged] pull request for"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:147
 msgid "[pushed] into"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:150
 msgid "[committed via RhodeCode] into repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:153
 msgid "[pulled from remote] into repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:156
 msgid "[pulled] from"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:159
 msgid "[started following] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:162
 msgid "[stopped following] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:172
 #, python-format
 msgid "fork name %s"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:191
 #, python-format
 msgid "Pull request #%s"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:226
 #, python-format
 msgid "Show all combined commits %s->%s"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:231
 msgid "compare view"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:238
 #, python-format
 msgid " and %(num)s more commits"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:293
 #, python-format
 msgid "Deleted branch: %s"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:296
 #, python-format
 msgid "Created tag: %s"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:309
 msgid "Commit not found"
 msgstr ""
 
 #: rhodecode/lib/auth.py:1769
 msgid "IP {} not allowed"
 msgstr ""
 
 #: rhodecode/lib/auth.py:1861
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 
 #: rhodecode/lib/auth.py:1905
 msgid "You need to be signed in to view this page"
 msgstr ""
 
 #: rhodecode/lib/channelstream.py:318
 msgid " Reload page to load changes"
 msgstr ""
 
 #: rhodecode/lib/diffs.py:903
 msgid "Click to select line"
 msgstr ""
 
 #: rhodecode/lib/helpers.py:1878
 msgid ""
 "Example filter terms:\n"
 "     repository:vcs\n"
 "     username:marcin\n"
 "     username:(NOT marcin)\n"
 "     action:*push*\n"
 "     ip:127.0.0.1\n"
 "     date:20120101\n"
 "     date:[20120101100000 TO 20120102]\n"
 "\n"
 "Actions: {actions}\n"
 "\n"
 "Generate wildcards using '*' character:\n"
 "     \"repository:vcs*\" - search everything starting with 'vcs'\n"
 "     \"repository:*vcs*\" - search for repository containing 'vcs'\n"
 "\n"
 "Optional AND / OR operators in queries\n"
 "     \"repository:vcs OR repository:test\"\n"
 "     \"username:test AND repository:test*\"\n"
 msgstr ""
 
 #: rhodecode/lib/helpers.py:1902
 #, python-format
 msgid "%s repository is not mapped to db perhaps it was created or renamed from the filesystem please run the application again in order to rescan repositories"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:542
 msgid "in ${ago}"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:548
 msgid "${ago} ago"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:557
 msgid "${val}, ${detail}"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:559
 msgid "${val}, ${detail} ago"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:561
 msgid "in ${val}, ${detail}"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:563
 msgid "${val} and ${detail}"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:565
 msgid "${val} and ${detail} ago"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:567
 msgid "in ${val} and ${detail}"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:571 rhodecode/public/js/scripts.js:22612
 #: rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:136
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:145
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174
 msgid "just now"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:568
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:581
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:598
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:681
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:656
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:658
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:681
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:682
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:699
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:716
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:732
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:735
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:737
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:737
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:764
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:774
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:815
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:815
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:816
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:816
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:822
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:944
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2587
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2653
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2739
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2772
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2772
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2987
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3073
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3079
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3110
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2275
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2267
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2266
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2270
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2270
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2321
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2322
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2522 rhodecode/model/db.py:3111
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2522 rhodecode/model/db.py:3132
 msgid "Repository no access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:569
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:582
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:599
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:682
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:657
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:659
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:682
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:683
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:700
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:717
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:733
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:736
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:738
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:738
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:765
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:775
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:816
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:816
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:817
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:817
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:823
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:945
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:970
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2588
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2654
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2740
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2773
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2773
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2988
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3074
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3080
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3111
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2276
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2268
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2267
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2271
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2271
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2322
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2323
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2523 rhodecode/model/db.py:3112
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2523 rhodecode/model/db.py:3133
 msgid "Repository read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:583
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:600
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:683
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:658
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:660
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:683
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:684
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:701
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:718
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:734
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:737
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:739
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:739
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:766
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:776
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:817
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2589
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2655
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2741
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2774
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2774
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2989
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3075
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3081
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3112
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2277
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2269
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2268
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2272
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2272
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2323
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2324
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2524 rhodecode/model/db.py:3113
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2524 rhodecode/model/db.py:3134
 msgid "Repository write access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:584
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:601
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:684
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:659
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:661
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:684
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:685
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:702
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:719
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:735
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:738
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:740
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:740
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:767
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:777
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:818
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2590
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2656
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2742
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2775
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2775
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2990
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3076
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3082
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3113
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2278
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2270
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2269
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2273
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2273
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2324
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2325
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2525 rhodecode/model/db.py:3114
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2525 rhodecode/model/db.py:3135
 msgid "Repository admin access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:573
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:586
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:603
 msgid "Repositories Group no access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:574
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:587
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:604
 msgid "Repositories Group read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:588
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:605
 msgid "Repositories Group write access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:589
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:606
 msgid "Repositories Group admin access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:578
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:591
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:608
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:691
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:654
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:656
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:679
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:680
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:697
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:714
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:730
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:733
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:735
 msgid "RhodeCode Administrator"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:579
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:592
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:609
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:692
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:677
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:679
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:702
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:703
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:720
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:737
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:753
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:756
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:758
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:758
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:785
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:795
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:836
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:836
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:843
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:965
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2608
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2679
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2765
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2798
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2798
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3013
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3099
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3105
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3136
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2288
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2342
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2343
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 rhodecode/model/db.py:3137
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 rhodecode/model/db.py:3158
 msgid "Repository creation disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:593
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:610
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:693
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:678
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:680
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:703
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:704
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:721
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:738
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:754
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:757
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:759
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:759
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:786
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:796
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:838
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:838
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:844
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:966
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:991
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2609
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2680
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2766
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2799
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2799
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3014
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3100
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3106
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3137
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2297
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2289
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2343
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2344
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2544 rhodecode/model/db.py:3138
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2544 rhodecode/model/db.py:3159
 msgid "Repository creation enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:594
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:611
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:694
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:680
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:682
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:705
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:706
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:723
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:740
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:758
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:761
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:763
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:763
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:790
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:800
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:841
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:841
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:848
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:970
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2613
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2684
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2770
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2803
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2803
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3018
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3104
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3110
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3141
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2293
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2347
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2348
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 rhodecode/model/db.py:3142
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 rhodecode/model/db.py:3163
 msgid "Repository forking disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:595
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:612
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:695
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:681
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:683
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:706
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:707
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:724
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:741
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:759
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:762
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:764
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:764
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:791
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:801
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:843
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:843
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:849
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:971
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:996
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2614
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2685
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2771
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2804
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2804
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3019
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3105
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3111
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3142
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2302
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2294
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2348
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2349
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2549 rhodecode/model/db.py:3143
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2549 rhodecode/model/db.py:3164
 msgid "Repository forking enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:596
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:613
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:696
 msgid "Register disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:597
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:614
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:697
 msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:587
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:600
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:617
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:700
 msgid "Register new user with RhodeCode with auto activation"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:843
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:864
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:873
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:956
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:994
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:996
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1019
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1020
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1037
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1054
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1073
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1076
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:1087
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1090
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1120
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1134
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1175
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1175
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1184
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1184
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1194
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1316
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1341
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3295
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3378
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:3491
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:3524
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:3525
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3757
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3843
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3890
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3935
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2915
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2907
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2907
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2910
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2910
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3011
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3012
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3230 rhodecode/model/db.py:3972
-#: rhodecode/public/js/scripts.js:42424 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3230 rhodecode/model/db.py:3997
+#: rhodecode/public/js/scripts.js:42595 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:396
 msgid "Not Reviewed"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:844
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:865
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:874
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:957
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:995
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:997
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1020
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1021
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1038
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1055
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1074
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1077
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:1088
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1091
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1121
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1135
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1176
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1176
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1185
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1185
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1195
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1317
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1342
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3296
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3379
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:3492
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:3525
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:3526
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3758
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3844
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3891
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3936
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2916
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2908
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2908
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2911
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2911
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3012
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3013
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3231 rhodecode/model/db.py:3973
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3231 rhodecode/model/db.py:3998
 msgid "Approved"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:866
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:875
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:958
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:996
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:998
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1021
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1022
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1039
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1056
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1075
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1078
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:1089
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1092
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1122
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1136
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1177
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3297
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3380
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:3493
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:3526
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:3527
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3759
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3845
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3892
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3937
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2917
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2909
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2909
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2912
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2912
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3013
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3014
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3232 rhodecode/model/db.py:3974
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3232 rhodecode/model/db.py:3999
 msgid "Rejected"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:867
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:876
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:959
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:997
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:999
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1022
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1023
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1040
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1057
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1076
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1079
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:1090
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1093
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1123
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1137
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1178
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3298
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3381
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:3494
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:3527
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:3528
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3760
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3846
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3893
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3938
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2918
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2910
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2910
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2913
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2913
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3014
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3015
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3233 rhodecode/model/db.py:3975
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3233 rhodecode/model/db.py:4000
 msgid "Under Review"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:686
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:661
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:663
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:686
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:687
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:704
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:721
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:737
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:740
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:742
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:742
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:769
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:779
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:820
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:820
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:821
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:821
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:827
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:949
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2592
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2658
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2744
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2777
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2777
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2992
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3078
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3084
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3115
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2280
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2272
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2271
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2275
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2275
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2326
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2327
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2527 rhodecode/model/db.py:3116
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2527 rhodecode/model/db.py:3137
 msgid "Repository group no access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:687
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:662
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:664
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:687
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:688
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:705
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:722
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:738
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:741
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:743
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:743
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:770
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:780
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:821
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:821
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:822
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:822
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:950
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:975
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2593
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2659
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2745
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2778
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2778
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2993
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3079
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3085
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3116
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2281
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2273
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2272
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2276
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2276
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2327
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2328
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2528 rhodecode/model/db.py:3117
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2528 rhodecode/model/db.py:3138
 msgid "Repository group read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:688
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:663
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:665
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:688
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:689
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:706
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:723
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:739
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:742
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:744
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:744
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:771
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:781
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:822
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2594
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2660
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2746
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2779
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2779
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2994
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3080
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3086
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3117
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2282
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2274
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2273
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2277
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2277
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2328
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2329
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2529 rhodecode/model/db.py:3118
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2529 rhodecode/model/db.py:3139
 msgid "Repository group write access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:689
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:664
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:666
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:689
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:690
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:707
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:724
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:740
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:743
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:745
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:745
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:772
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:782
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:823
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2595
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2661
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2747
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2780
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2780
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2995
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3081
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3087
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3118
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2283
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2275
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2274
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2278
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2278
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2329
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2330
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2530 rhodecode/model/db.py:3119
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2530 rhodecode/model/db.py:3140
 msgid "Repository group admin access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:666
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:668
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:691
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:692
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:709
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:726
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:742
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:745
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:747
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:747
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:774
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:784
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:832
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:954
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2597
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2663
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2749
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2782
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2782
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2997
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3083
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3089
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3120
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2285
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2277
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2276
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2280
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2280
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2331
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2332
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2532 rhodecode/model/db.py:3121
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2532 rhodecode/model/db.py:3142
 msgid "User group no access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:667
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:669
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:692
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:693
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:710
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:727
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:743
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:746
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:748
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:748
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:775
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:785
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:827
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:827
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:833
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:955
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:980
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2598
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2664
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2750
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2783
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2783
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2998
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3084
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3090
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3121
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2286
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2278
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2277
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2281
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2281
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2332
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2333
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 rhodecode/model/db.py:3122
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 rhodecode/model/db.py:3143
 msgid "User group read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:668
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:670
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:693
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:694
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:711
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:728
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:744
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:747
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:749
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:749
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:776
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:786
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:827
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2599
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2665
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2751
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2784
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2784
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2999
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3085
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3091
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3122
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2287
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2279
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2278
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2282
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2282
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2333
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2334
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2534 rhodecode/model/db.py:3123
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2534 rhodecode/model/db.py:3144
 msgid "User group write access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:669
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:671
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:694
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:695
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:712
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:729
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:745
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:748
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:750
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:750
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:777
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:787
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2600
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2666
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2752
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2785
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2785
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3000
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3086
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3092
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3123
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2288
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2280
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2279
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2283
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2283
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2334
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2335
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 rhodecode/model/db.py:3124
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 rhodecode/model/db.py:3145
 msgid "User group admin access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:671
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:673
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:696
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:697
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:714
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:731
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:747
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:750
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:752
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:752
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:779
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:789
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:959
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2602
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2673
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2759
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2792
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2792
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3007
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3093
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3099
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3130
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2290
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2282
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2281
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2285
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2285
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2336
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2337
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 rhodecode/model/db.py:3131
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 rhodecode/model/db.py:3152
 msgid "Repository Group creation disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:672
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:674
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:697
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:698
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:715
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:732
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:748
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:751
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:753
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:753
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:780
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:790
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:832
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:832
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:838
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:960
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:985
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2603
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2674
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2760
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2793
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2793
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3008
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3094
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3100
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3131
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2283
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2282
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2286
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2286
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2337
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2338
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 rhodecode/model/db.py:3132
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 rhodecode/model/db.py:3153
 msgid "Repository Group creation enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:674
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:676
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:699
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:700
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:717
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:734
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:750
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:753
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:755
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:755
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:782
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:792
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:833
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:833
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:840
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:962
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2605
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2676
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2762
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2795
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2795
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3010
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3096
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3102
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3133
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2284
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2288
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2288
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 rhodecode/model/db.py:3134
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 rhodecode/model/db.py:3155
 msgid "User Group creation disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:675
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:677
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:700
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:701
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:718
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:735
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:751
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:754
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:756
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:756
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:783
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:793
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:835
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:835
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:841
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:963
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:988
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2606
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2677
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2763
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2796
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2796
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3011
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3097
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3103
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3134
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 rhodecode/model/db.py:3135
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 rhodecode/model/db.py:3156
 msgid "User Group creation enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:683
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:685
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:708
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:709
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:726
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:743
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:761
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:764
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:766
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:766
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:793
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:803
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:844
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:844
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:851
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:973
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2616
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2687
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2773
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2806
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2806
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3021
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3107
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3113
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3144
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2296
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2350
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2351
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 rhodecode/model/db.py:3145
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 rhodecode/model/db.py:3166
 msgid "Registration disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:684
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:686
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:709
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:710
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:727
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:744
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:762
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:765
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:767
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:767
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:794
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:804
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:846
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:846
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:852
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:974
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:999
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2617
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2688
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2774
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2807
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2807
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3022
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3108
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3114
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3145
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2552 rhodecode/model/db.py:3146
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2552 rhodecode/model/db.py:3167
 msgid "User Registration with manual account activation"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:685
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:687
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:710
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:711
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:728
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:745
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:763
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:766
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:768
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:768
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:795
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:805
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:846
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2618
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2689
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2775
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2808
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2808
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3023
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3109
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3115
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3146
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 rhodecode/model/db.py:3147
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 rhodecode/model/db.py:3168
 msgid "User Registration with automatic account activation"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:687
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:689
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:712
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:713
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:730
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:747
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:765
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:768
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:770
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:770
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:797
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:807
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:848
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:848
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:849
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:849
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:855
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:977
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1002
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2624
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2695
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2781
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2814
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2814
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3029
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3115
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3121
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3152
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2299
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2303
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2303
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2358
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2359
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 rhodecode/model/db.py:3153
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 rhodecode/model/db.py:3174
 #: rhodecode/model/permission.py:105
 msgid "Manual activation of external account"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:688
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:690
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:713
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:714
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:731
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:748
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:766
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:769
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:771
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:771
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:798
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:808
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:849
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:849
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:850
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:850
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:856
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:978
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1003
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2625
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2696
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2782
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2815
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2815
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3030
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3116
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3122
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3153
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2359
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2360
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2560 rhodecode/model/db.py:3154
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2560 rhodecode/model/db.py:3175
 #: rhodecode/model/permission.py:106
 msgid "Automatic activation of external account"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:755
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:758
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:760
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:760
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:787
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:797
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:838
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2610
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2681
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2767
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2800
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2800
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3015
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3101
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3107
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3138
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2289
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2293
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2293
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 rhodecode/model/db.py:3139
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 rhodecode/model/db.py:3160
 msgid "Repository creation enabled with write permission to a repository group"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:756
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:759
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:761
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:761
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:788
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:798
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2611
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2682
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2768
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2801
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2801
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3016
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3102
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3108
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3139
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 rhodecode/model/db.py:3140
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 rhodecode/model/db.py:3161
 msgid "Repository creation disabled with write permission to a repository group"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:735
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:762
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:772
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:813
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:813
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:814
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:814
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:820
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:942
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:967
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2585
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2651
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2737
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2770
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2770
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2985
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3071
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3077
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3108
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2273
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2265
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2264
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2268
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2268
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2319
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2320
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2520 rhodecode/model/db.py:3109
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2520 rhodecode/model/db.py:3130
 msgid "RhodeCode Super Administrator"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:810
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:851
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:851
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:852
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:852
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:858
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:980
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1005
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2627
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2698
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2784
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2817
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2817
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3032
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3118
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3124
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3155
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2302
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2306
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2306
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2361
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2362
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 rhodecode/model/db.py:3156
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 rhodecode/model/db.py:3177
 msgid "Inherit object permissions from default user disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:811
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:852
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:852
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:853
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:853
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:859
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:981
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1006
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2628
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2699
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2785
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2818
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2818
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3033
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3119
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3125
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3156
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2304
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2563 rhodecode/model/db.py:3157
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2563 rhodecode/model/db.py:3178
 msgid "Inherit object permissions from default user enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1103
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1107
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1118
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1120
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1120
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1137
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:1189
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:1195
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:1202
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1050 rhodecode/model/db.py:1203
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1050 rhodecode/model/db.py:1224
 msgid "all"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1104
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1108
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1119
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1121
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1121
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1138
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:1190
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:1196
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:1203
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 rhodecode/model/db.py:1204
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 rhodecode/model/db.py:1225
 msgid "http/web interface"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1105
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1109
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1120
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1122
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1122
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1139
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:1191
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:1197
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:1204
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 rhodecode/model/db.py:1205
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 rhodecode/model/db.py:1226
 msgid "vcs (git/hg/svn protocol)"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1106
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1110
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1121
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1123
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1123
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1140
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:1192
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:1198
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:1205
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 rhodecode/model/db.py:1206
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 rhodecode/model/db.py:1227
 msgid "api calls"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1107
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1111
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1122
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1124
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1124
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1141
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:1193
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:1199
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:1206
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:914
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:915
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:959
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:960
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 rhodecode/model/db.py:1207
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 rhodecode/model/db.py:1228
 msgid "feed access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2348
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2414
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2488
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2511
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2511
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2638
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:2729
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:2735
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:2766
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2051
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2043
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2042
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2046
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2046
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2090
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2091
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2284 rhodecode/model/db.py:2767
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2284 rhodecode/model/db.py:2788
 msgid "No parent"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2620
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2691
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2777
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2810
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2810
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3025
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3111
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3117
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3148
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2555 rhodecode/model/db.py:3149
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2555 rhodecode/model/db.py:3170
 msgid "Password reset enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2621
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2692
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2778
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2811
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2811
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3026
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3112
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3118
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3149
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 rhodecode/model/db.py:3150
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 rhodecode/model/db.py:3171
 msgid "Password reset hidden"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2622
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2693
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2779
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2812
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2812
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3027
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3113
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3119
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3150
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2356
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2357
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 rhodecode/model/db.py:3151
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 rhodecode/model/db.py:3172
 msgid "Password reset disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2668
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2754
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2787
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2787
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3002
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3088
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3094
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3125
-#: rhodecode/model/db.py:3126
+#: rhodecode/model/db.py:3147
 msgid "Branch no permissions"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2669
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2755
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2788
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2788
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3003
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3089
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3095
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3126
-#: rhodecode/model/db.py:3127
+#: rhodecode/model/db.py:3148
 msgid "Branch access by web merge"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2670
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2756
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2789
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2789
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3004
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3090
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3096
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3127
-#: rhodecode/model/db.py:3128
+#: rhodecode/model/db.py:3149
 msgid "Branch access by push"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2671
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2757
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2790
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2790
 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3005
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3091
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3097
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:3128
-#: rhodecode/model/db.py:3129
+#: rhodecode/model/db.py:3150
 msgid "Branch access by push with force"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:1194
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:1200
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:1207
-#: rhodecode/model/db.py:1208
+#: rhodecode/model/db.py:1229
 msgid "artifacts downloads"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:1213
-#: rhodecode/model/db.py:1214
+#: rhodecode/model/db.py:1235
 msgid "Token for all actions."
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:1214
-#: rhodecode/model/db.py:1215
+#: rhodecode/model/db.py:1236
 msgid "Token to access RhodeCode pages via web interface without login using `api_access_controllers_whitelist` functionality."
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:1216
-#: rhodecode/model/db.py:1217
+#: rhodecode/model/db.py:1238
 msgid "Token to interact over git/hg/svn protocols. Requires auth_token authentication plugin to be active. <br/>Such Token should be used then instead of a password to interact with a repository, and additionally can be limited to single repository using repo scope."
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:1221
-#: rhodecode/model/db.py:1222
+#: rhodecode/model/db.py:1243
 msgid "Token limited to api calls."
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:1222
-#: rhodecode/model/db.py:1223
+#: rhodecode/model/db.py:1244
 msgid "Token to read RSS/ATOM feed."
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py:1223
-#: rhodecode/model/db.py:1224
+#: rhodecode/model/db.py:1245
 msgid "Token for artifacts downloads."
 msgstr ""
 
 #: rhodecode/lib/index/whoosh.py:189
 msgid "Index Type"
 msgstr ""
 
 #: rhodecode/lib/index/whoosh.py:192
 msgid "File Index"
 msgstr ""
 
 #: rhodecode/lib/index/whoosh.py:193 rhodecode/lib/index/whoosh.py:199
 msgid "Indexed documents"
 msgstr ""
 
 #: rhodecode/lib/index/whoosh.py:194 rhodecode/lib/index/whoosh.py:200
 msgid "Last update"
 msgstr ""
 
 #: rhodecode/lib/index/whoosh.py:198
 msgid "Commit index"
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:186
 msgid "This pull request can be automatically merged."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:188
 msgid "This pull request cannot be merged because of an unhandled exception. {exception}"
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:191
 msgid "This pull request cannot be merged because of merge conflicts. {unresolved_files}"
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:193
 msgid "This pull request could not be merged because push to target:`{target}@{merge_commit}` failed."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:196
 msgid "This pull request cannot be merged because the target `{target_ref.name}` is not a head."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:199
 msgid "This pull request cannot be merged because the source contains more branches than the target."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:202
 msgid "This pull request cannot be merged because the target `{target_ref.name}` has multiple heads: `{heads}`."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:205
 msgid "This pull request cannot be merged because the target repository is locked by {locked_by}."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:209
 msgid "This pull request cannot be merged because the target reference `{target_ref.name}` is missing."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:212
 msgid "This pull request cannot be merged because the source reference `{source_ref.name}` is missing."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:215
 msgid "This pull request cannot be merged because of conflicts related to sub repositories."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:220
 msgid "This pull request cannot be merged because the target or the source reference is missing."
 msgstr ""
 
 #: rhodecode/model/auth_token.py:53
 msgid "5 minutes {end_date}"
 msgstr ""
 
 #: rhodecode/model/auth_token.py:55
 msgid "1 hour {end_date}"
 msgstr ""
 
 #: rhodecode/model/auth_token.py:57
 msgid "1 day {end_date}"
 msgstr ""
 
 #: rhodecode/model/auth_token.py:59
 msgid "1 month {end_date}"
 msgstr ""
 
 #: rhodecode/model/forms.py:88
 msgid "Please enter a login"
 msgstr ""
 
 #: rhodecode/model/forms.py:89
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr ""
 
 #: rhodecode/model/forms.py:99
 msgid "Please enter a password"
 msgstr ""
 
 #: rhodecode/model/forms.py:100
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr ""
 
 #: rhodecode/model/notification.py:263
 #, python-format
 msgid "%(user)s commented on commit %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:264
 #, python-format
 msgid "%(user)s commented on commit at %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:267
 #, python-format
 msgid "%(user)s sent message %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:268
 #, python-format
 msgid "%(user)s sent message at %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:271
 #, python-format
 msgid "%(user)s mentioned you %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:272
 #, python-format
 msgid "%(user)s mentioned you at %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:275
 #, python-format
 msgid "%(user)s registered in RhodeCode %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:276
 #, python-format
 msgid "%(user)s registered in RhodeCode at %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:279
 #, python-format
 msgid "%(user)s opened new pull request %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:280
 #, python-format
 msgid "%(user)s opened new pull request at %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:283
 #, python-format
 msgid "%(user)s updated pull request %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:284
 #, python-format
 msgid "%(user)s updated pull request at %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:287
 #, python-format
 msgid "%(user)s commented on pull request %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:288
 #, python-format
 msgid "%(user)s commented on pull request at %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/permission.py:71 rhodecode/model/permission.py:77
 #: rhodecode/model/permission.py:83
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:11
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:217
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:15
 msgid "None"
 msgstr ""
 
 #: rhodecode/model/permission.py:72 rhodecode/model/permission.py:78
 #: rhodecode/model/permission.py:84
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:12
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:16
 msgid "Read"
 msgstr ""
 
 #: rhodecode/model/permission.py:73 rhodecode/model/permission.py:79
 #: rhodecode/model/permission.py:85
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:13
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:17
 #: rhodecode/templates/changeset/changeset_file_comment.mako:392
 #: rhodecode/templates/changeset/changeset_file_comment.mako:443
 #: rhodecode/templates/data_table/_dt_elements.mako:453
 msgid "Write"
 msgstr ""
 
 #: rhodecode/model/permission.py:74 rhodecode/model/permission.py:80
 #: rhodecode/model/permission.py:86
 #: rhodecode/templates/admin/auth/plugin_settings.mako:12
 #: rhodecode/templates/admin/defaults/defaults.mako:12
 #: rhodecode/templates/admin/integrations/base.mako:21
 #: rhodecode/templates/admin/integrations/form.mako:15
 #: rhodecode/templates/admin/integrations/form.mako:28
 #: rhodecode/templates/admin/integrations/global.mako:12
 #: rhodecode/templates/admin/integrations/list.mako:8
 #: rhodecode/templates/admin/integrations/list.mako:14
 #: rhodecode/templates/admin/integrations/new.mako:11
 #: rhodecode/templates/admin/permissions/permissions.mako:12
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:12
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:14
 #: rhodecode/templates/admin/repos/repo_add.mako:13
 #: rhodecode/templates/admin/repos/repo_add.mako:17
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:14
 #: rhodecode/templates/admin/settings/settings.mako:12
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:11
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:12
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:18
 #: rhodecode/templates/admin/users/user_add.mako:11
 #: rhodecode/templates/admin/users/user_edit.mako:12
 #: rhodecode/templates/base/base.mako:838
 msgid "Admin"
 msgstr ""
 
 #: rhodecode/model/permission.py:89
 msgid "Protected/No Access"
 msgstr ""
 
 #: rhodecode/model/permission.py:90
 msgid "Web merge"
 msgstr ""
 
 #: rhodecode/model/permission.py:91
 msgid "Push"
 msgstr ""
 
 #: rhodecode/model/permission.py:92
 msgid "Force Push"
 msgstr ""
 
 #: rhodecode/model/permission.py:95 rhodecode/model/permission.py:109
 #: rhodecode/model/permission.py:113 rhodecode/model/permission.py:117
 #: rhodecode/model/permission.py:121 rhodecode/model/permission.py:125
 #: rhodecode/model/permission.py:129
 #: rhodecode/templates/admin/my_account/my_account_notifications.mako:27
 msgid "Disabled"
 msgstr ""
 
 #: rhodecode/model/permission.py:96
 msgid "Allowed with manual account activation"
 msgstr ""
 
 #: rhodecode/model/permission.py:97
 msgid "Allowed with automatic account activation"
 msgstr ""
 
 #: rhodecode/model/permission.py:100
 msgid "Allow password recovery"
 msgstr ""
 
 #: rhodecode/model/permission.py:101
 msgid "Hide password recovery link"
 msgstr ""
 
 #: rhodecode/model/permission.py:102
 msgid "Disable password recovery"
 msgstr ""
 
 #: rhodecode/model/pull_request.py:245
 msgid "Pull request update successful."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:247
 msgid "Pull request update failed because of an unknown error."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:249
 msgid "No update needed because the source and target have not changed."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:251
 msgid "Pull request cannot be updated because the reference type is not supported for an update. Only Branch, Tag or Bookmark is allowed."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:254
 msgid "This pull request cannot be updated because the target reference is missing."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:257
 msgid "This pull request cannot be updated because the source reference is missing."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1674
+#: rhodecode/model/pull_request.py:1688
 msgid "Server-side pull request merging is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1677
-msgid "This pull request is closed."
-msgstr ""
-
 #: rhodecode/model/pull_request.py:1691
+msgid "This pull request is closed."
+msgstr ""
+
+#: rhodecode/model/pull_request.py:1705
 msgid "Pull request merging is not supported."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1708
+#: rhodecode/model/pull_request.py:1722
 msgid "Target repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1711
+#: rhodecode/model/pull_request.py:1725
 msgid "Source repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1895 rhodecode/model/scm.py:1008
+#: rhodecode/model/pull_request.py:1909 rhodecode/model/scm.py:1008
 #: rhodecode/templates/admin/my_account/my_account.mako:32
 #: rhodecode/templates/base/base.mako:638
 #: rhodecode/templates/summary/components.mako:46
 msgid "Bookmarks"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1900
+#: rhodecode/model/pull_request.py:1914
 msgid "Commit IDs"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1903
+#: rhodecode/model/pull_request.py:1917
 #: rhodecode/templates/summary/components.mako:22
 msgid "Closed Branches"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:2089
+#: rhodecode/model/pull_request.py:2103
 msgid "WIP marker in title prevents from accidental merge."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:2099
+#: rhodecode/model/pull_request.py:2113
 msgid "User `{}` not allowed to perform merge."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:2117
+#: rhodecode/model/pull_request.py:2131
 msgid "Target branch `{}` changes rejected by rule {}."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:2132
-msgid "Pull request reviewer approval is pending."
-msgstr ""
-
 #: rhodecode/model/pull_request.py:2146
+msgid "Pull request reviewer approval is pending."
+msgstr ""
+
+#: rhodecode/model/pull_request.py:2160
 msgid "Cannot merge, {} TODO still not resolved."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:2149
+#: rhodecode/model/pull_request.py:2163
 msgid "Cannot merge, {} TODOs still not resolved."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:2204
+#: rhodecode/model/pull_request.py:2218
 msgid "Merge strategy: rebase"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:2209
+#: rhodecode/model/pull_request.py:2223
 msgid "Merge strategy: explicit merge commit"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:2217
+#: rhodecode/model/pull_request.py:2231
 msgid "Source branch will be closed before the merge."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:2219
+#: rhodecode/model/pull_request.py:2233
 msgid "Source branch will be deleted after the merge."
 msgstr ""
 
 #: rhodecode/model/validators.py:93 rhodecode/model/validators.py:94
 msgid "Value cannot be an empty list"
 msgstr ""
 
 #: rhodecode/model/validators.py:140
 msgid "Pattern already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:161
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:163
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr ""
 
 #: rhodecode/model/validators.py:165
 #: rhodecode/model/validation_schema/schemas/user_schema.py:71
 msgid "Username may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character or underscore"
 msgstr ""
 
 #: rhodecode/model/validators.py:196
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr ""
 
 #: rhodecode/model/validators.py:197
 #, python-format
 msgid "Username %(username)s is disabled"
 msgstr ""
 
 #: rhodecode/model/validators.py:222
 msgid "Invalid user group name"
 msgstr ""
 
 #: rhodecode/model/validators.py:223
 #, python-format
 msgid "User group `%(usergroup)s` already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:225
 msgid "user group name may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character"
 msgstr ""
 
 #: rhodecode/model/validators.py:265
 msgid "Cannot assign this group as parent"
 msgstr ""
 
 #: rhodecode/model/validators.py:266
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:267
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:269
 msgid "no permission to store repository groupin this location"
 msgstr ""
 
 #: rhodecode/model/validators.py:271
 msgid "no permission to store repository group in root location"
 msgstr ""
 
 #: rhodecode/model/validators.py:388
 msgid "Invalid characters (non-ascii) in password"
 msgstr ""
 
 #: rhodecode/model/validators.py:407
 msgid "Passwords do not match"
 msgstr ""
 
 #: rhodecode/model/validators.py:427
 msgid "invalid password"
 msgstr ""
 
 #: rhodecode/model/validators.py:428
 msgid "invalid user name"
 msgstr ""
 
 #: rhodecode/model/validators.py:429
 msgid "Your account is disabled"
 msgstr ""
 
 #: rhodecode/model/validators.py:465
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr ""
 
 #: rhodecode/model/validators.py:467
 #, python-format
 msgid "Repository with name %(repo)s already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:469
 #, python-format
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:472
 #, python-format
 msgid "Repository with name %(repo)s exists in group \"%(group)s\""
 msgstr ""
 
 #: rhodecode/model/validators.py:474
 #, python-format
 msgid "Repository group with name \"%(repo)s\" exists in group \"%(group)s\""
 msgstr ""
 
 #: rhodecode/model/validators.py:567
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:236
 msgid "Repository name cannot end with .git"
 msgstr ""
 
 #: rhodecode/model/validators.py:627
 #, python-format
 msgid "invalid clone url for %(rtype)s repository"
 msgstr ""
 
 #: rhodecode/model/validators.py:628
 #, python-format
 msgid "Invalid clone url, provide a valid clone url starting with one of %(allowed_prefixes)s"
 msgstr ""
 
 #: rhodecode/model/validators.py:660
 msgid "Fork have to be the same type as parent"
 msgstr ""
 
 #: rhodecode/model/validators.py:677
 msgid "You do not have the permission to create repositories in this group."
 msgstr ""
 
 #: rhodecode/model/validators.py:680
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:136
 msgid "You do not have the permission to store repositories in the root location."
 msgstr ""
 
 #: rhodecode/model/validators.py:740
 msgid "This username or user group name is not valid"
 msgstr ""
 
 #: rhodecode/model/validators.py:853
 msgid "This is not a valid path"
 msgstr ""
 
 #: rhodecode/model/validators.py:871
 #: rhodecode/model/validation_schema/schemas/user_schema.py:144
 #: rhodecode/model/validation_schema/schemas/user_schema.py:148
 msgid "This e-mail address is already taken"
 msgstr ""
 
 #: rhodecode/model/validators.py:893
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr ""
 
 #: rhodecode/model/validators.py:914
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 
 #: rhodecode/model/validators.py:947
 #: rhodecode/model/validation_schema/validators.py:41
 #: rhodecode/model/validation_schema/validators.py:54
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr ""
 
 #: rhodecode/model/validators.py:948
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
 
 #: rhodecode/model/validators.py:976
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
 
 #: rhodecode/model/validators.py:993
 #, python-format
 msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name"
 msgstr ""
 
 #: rhodecode/model/validators.py:996
 #, python-format
 msgid "The plugin \"%(plugin_id)s\" is missing an includeme function."
 msgstr ""
 
 #: rhodecode/model/validators.py:999
 #, python-format
 msgid "Can not load plugin \"%(plugin_id)s\""
 msgstr ""
 
 #: rhodecode/model/validators.py:1001
 #, python-format
 msgid "No plugin available with ID \"%(plugin_id)s\""
 msgstr ""
 
 #: rhodecode/model/validators.py:1069
 msgid "Url must start with http or /"
 msgstr ""
 
 #: rhodecode/model/validation_schema/validators.py:62
 msgid "Invalid glob pattern"
 msgstr ""
 
 #: rhodecode/model/validation_schema/validators.py:71
 msgid "Name must start with a letter or number. Got `{}`"
 msgstr ""
 
 #: rhodecode/model/validation_schema/validators.py:142
 msgid "invalid clone url for {repo_type} repository"
 msgstr ""
 
 #: rhodecode/model/validation_schema/validators.py:151
 msgid "Please enter a valid json object"
 msgstr ""
 
+#: rhodecode/model/validation_schema/validators.py:159
+msgid "Please enter a valid json object: `{}`"
+msgstr ""
+
 #: rhodecode/model/validation_schema/schemas/comment_schema.py:42
 #: rhodecode/model/validation_schema/schemas/gist_schema.py:89
 msgid "Gist with name {} already exists"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/comment_schema.py:48
 #: rhodecode/model/validation_schema/schemas/gist_schema.py:95
 msgid "Filename {} cannot be inside a directory"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/gist_schema.py:132
 msgid "Duplicated value for filename found: `{}`"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:36
 msgid "Pick a scope:"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:39
 msgid "Global (all repositories)"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:40
 msgid "Top level repositories only"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:79
 msgid "Only repo admins can create integrations"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:86
 msgid "Only repogroup admins can create integrations"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:91
 msgid "Only superadmins can create global integrations"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:181
 msgid "Scope of the integration. Recursive means the integration  runs on all repos of that group and children recursively."
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:184
 msgid "Integration scope"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:214
 msgid "General integration options"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:217
 msgid "{integration_type} settings"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52
 msgid "Parent repository group `{}` does not exist"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:56
 msgid "You do not have the permissions to store repository groups inside repository group `{}`"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:59
 msgid "You do not have the permission to store repository groups in the root location."
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:125
 msgid "Repo group owner with id `{}` does not exists"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:143
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:221
 msgid "Repository with name `{}` already exists"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:148
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:226
 msgid "Repository group with name `{}` already exists"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:60
 msgid "Repo owner with id `{}` does not exists"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:102
 msgid "Fork with id `{}` does not exists"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:105
 msgid "Cannot set fork of parameter of this repository to itself"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:130
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:134
 msgid "Repository group `{}` does not exist"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/user_group_schema.py:32
 msgid "Allowed in name are letters, numbers, and `-`, `_`, `.` Name must start with a letter or number. Got `{}`"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/user_group_schema.py:48
 msgid "User group owner with id `{}` does not exists"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/user_schema.py:39
 msgid "Password is incorrect"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/user_schema.py:62
 msgid "New password must be different to old password"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/user_schema.py:183
 msgid "Additional emails can be specified at <a href=\"{}\">extra emails</a> page."
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:19
 msgid ": , "
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:20822 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66
 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87
 msgid "No results"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:22547 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:170
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:185
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109
 msgid "{0} year"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:22548 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:158
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:171
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110
 msgid "{0} month"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:22549 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:153
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:166
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111
 msgid "{0} day"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:22550 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:155
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:168
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112
 msgid "{0} hour"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:22551 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:157
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:170
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113
 msgid "{0} min"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:22552 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:167
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:180
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114
 msgid "{0} sec"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:22572 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:133
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:142
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134
 msgid "in {0}"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:22580 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:150
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:159
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142
 msgid "{0} ago"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:22592 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:172
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:187
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154
 msgid "{0}, {1} ago"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:22594 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:135
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:144
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156
 msgid "in {0}, {1}"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:22598 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:151
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:160
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160
 msgid "{0} and {1}"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:22600 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:152
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:161
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162
 msgid "{0} and {1} ago"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:22602 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:134
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:143
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164
 msgid "in {0} and {1}"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:37600 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4
 msgid "Loading more results..."
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:37603 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7
 msgid "Searching..."
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:37606 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10
 msgid "No matches found"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:37609 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13
 msgid "Loading failed"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:37613 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:17
 msgid "One result is available, press enter to select it."
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:37615 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:166
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:179
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:19
 msgid "{0} results are available, use up and down arrow keys to navigate."
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:37620 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24
 msgid "Please enter {0} or more character"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:37622 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26
 msgid "Please enter {0} or more characters"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:37627 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31
 msgid "Please delete {0} character"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:37629 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33
 msgid "Please delete {0} characters"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:37633 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:123
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:132
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37
 msgid "You can only select {0} item"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:37635 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:124
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:133
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39
 msgid "You can only select {0} items"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:38289 rhodecode/public/js/scripts.min.js:1
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:9
 #: rhodecode/public/js/src/rhodecode/utils/ajax.js:139
 msgid "Ajax Request Error"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:38691 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:142
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:151
 #: rhodecode/public/js/src/rhodecode/changelog.js:35
 msgid "showing {0} out of {1} commit"
 msgstr ""
 
 #: rhodecode/public/js/scripts.js:38693 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:143
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:152
 #: rhodecode/public/js/src/rhodecode/changelog.js:37
 msgid "showing {0} out of {1} commits"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39232 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85
+#: rhodecode/public/js/scripts.js:39237 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88
 #: rhodecode/public/js/src/rhodecode/codemirror.js:368
 msgid "Set status to Approved"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39252 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86
+#: rhodecode/public/js/scripts.js:39257 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89
 #: rhodecode/public/js/src/rhodecode/codemirror.js:388
 msgid "Set status to Rejected"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39271 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106
+#: rhodecode/public/js/scripts.js:39276 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:112
 #: rhodecode/public/js/src/rhodecode/codemirror.js:407
 msgid "TODO comment"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39291 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71
+#: rhodecode/public/js/scripts.js:39296 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73
 #: rhodecode/public/js/src/rhodecode/codemirror.js:427
 msgid "Note Comment"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39592 rhodecode/public/js/scripts.js:39967
+#: rhodecode/public/js/scripts.js:39599 rhodecode/public/js/scripts.js:39987
 #: rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103
 #: rhodecode/public/js/src/rhodecode/codemirror.js:730
 #: rhodecode/public/js/src/rhodecode/comments.js:267
 msgid "Status Review"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39607 rhodecode/public/js/scripts.js:39982
+#: rhodecode/public/js/scripts.js:39614 rhodecode/public/js/scripts.js:40004
 #: rhodecode/public/js/scripts.min.js:1
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:24
 #: rhodecode/public/js/src/rhodecode/codemirror.js:745
 #: rhodecode/public/js/src/rhodecode/comments.js:284
 msgid "Comment text will be set automatically based on currently selected status ({0}) ..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39688 rhodecode/public/js/scripts.js:40177
-#: rhodecode/public/js/scripts.js:41535 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48
+#: rhodecode/public/js/scripts.js:39695 rhodecode/public/js/scripts.js:40213
+#: rhodecode/public/js/scripts.js:41745 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49
 #: rhodecode/public/js/src/rhodecode/codemirror.js:826
 #: rhodecode/public/js/src/rhodecode/comments.js:493
 #: rhodecode/public/js/src/rhodecode/files.js:499
 #: rhodecode/templates/files/files_browser_tree.mako:57
 msgid "Loading ..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39849 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:117
-msgid "Updated Comment"
-msgstr ""
-
-#: rhodecode/public/js/scripts.js:39873 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:141
+#: rhodecode/public/js/scripts.js:39860 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:123
+#: rhodecode/public/js/src/rhodecode/comments.js:140
+msgid "Update Comment"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:39884 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:150
 #: rhodecode/public/js/src/rhodecode/comments.js:164
 msgid "resolve comment"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40126 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102
+#: rhodecode/public/js/scripts.js:40157 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83
+#: rhodecode/public/js/src/rhodecode/comments.js:437
+msgid "Saving Draft..."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:40159 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108
 #: rhodecode/public/js/src/rhodecode/comments.js:439
 msgid "Submitting..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40423 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:122
+#: rhodecode/public/js/scripts.js:40481 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:131
 #: rhodecode/public/js/src/rhodecode/comments.js:761
 msgid "Yes, delete comment #{0}!"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40487 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46
+#: rhodecode/public/js/scripts.js:40526 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106
+#: rhodecode/public/js/src/rhodecode/comments.js:806
+msgid "Submit {0} draft comment."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:40529 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:130
+#: rhodecode/public/js/src/rhodecode/comments.js:809
+msgid "Yes"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:40621 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47
 #: rhodecode/public/js/src/rhodecode/comments.js:901
 msgid "Leave a resolution comment, or click resolve button to resolve TODO comment #{0}"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40696 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/scripts.js:40825 rhodecode/public/js/scripts.min.js:1
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:23
 #: rhodecode/public/js/src/rhodecode/comments.js:1105
 msgid "Comment body was not changed."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40875 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/scripts.js:41071 rhodecode/public/js/scripts.min.js:1
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:44
-msgid "Leave a comment on line {0}."
-msgstr ""
-
-#: rhodecode/public/js/scripts.js:41006 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:107
-#: rhodecode/public/js/src/rhodecode/comments.js:1491
+#: rhodecode/public/js/src/rhodecode/comments.js:1351
+msgid "Leave a comment on file {0} line {1}."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41212 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:113
+#: rhodecode/public/js/src/rhodecode/comments.js:1492
 msgid "TODO from comment {0} was fixed."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41284 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:145
+#: rhodecode/public/js/scripts.js:41494 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:154
 #: rhodecode/public/js/src/rhodecode/files.js:248
 msgid "truncated result"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41286 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:146
+#: rhodecode/public/js/scripts.js:41496 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:155
 #: rhodecode/public/js/src/rhodecode/files.js:250
 msgid "truncated results"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41295 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58
+#: rhodecode/public/js/scripts.js:41505 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60
 #: rhodecode/public/js/src/rhodecode/files.js:259
 msgid "No matching files"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41353 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83
+#: rhodecode/public/js/scripts.js:41563 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86
 #: rhodecode/public/js/src/rhodecode/files.js:317
 msgid "Selection link"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41450 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/scripts.js:41660 rhodecode/public/js/scripts.min.js:1
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:10
 #: rhodecode/public/js/src/rhodecode/files.js:414
 msgid "All Authors"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41600 rhodecode/public/js/scripts.js:41603
+#: rhodecode/public/js/scripts.js:41810 rhodecode/public/js/scripts.js:41813
 #: rhodecode/public/js/scripts.min.js:1
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:38
 #: rhodecode/public/js/src/rhodecode/files.js:564
 #: rhodecode/public/js/src/rhodecode/files.js:567
 msgid "File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41606 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:111
+#: rhodecode/public/js/scripts.js:41816 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:117
 #: rhodecode/public/js/src/rhodecode/files.js:570
 msgid "There is an existing path `{0}` at this commit."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41609 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110
+#: rhodecode/public/js/scripts.js:41819 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:116
 #: rhodecode/public/js/src/rhodecode/files.js:573
 msgid "There is a later version of file tree available. Click {0} to create a file at the latest tree."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41663 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101
+#: rhodecode/public/js/scripts.js:41873 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105
 #: rhodecode/public/js/src/rhodecode/followers.js:26
 msgid "Stopped watching this repository"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41664 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:121
+#: rhodecode/public/js/scripts.js:41874 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:129
 #: rhodecode/public/js/src/rhodecode/followers.js:27
 #: rhodecode/templates/base/base.mako:310
 msgid "Watch"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41667 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98
+#: rhodecode/public/js/scripts.js:41877 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102
 #: rhodecode/public/js/src/rhodecode/followers.js:30
 msgid "Started watching this repository"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41668 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:116
+#: rhodecode/public/js/scripts.js:41878 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:122
 #: rhodecode/public/js/src/rhodecode/followers.js:31
 #: rhodecode/templates/base/base.mako:308
 msgid "Unwatch"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42165 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/scripts.js:42384 rhodecode/public/js/scripts.min.js:1
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:12
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:185
 msgid "All reviewers must vote."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42174 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11
-msgid "All individual reviewers must vote."
-msgstr ""
-
-#: rhodecode/public/js/scripts.js:42179 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14
-msgid "At least {0} reviewer must vote."
-msgstr ""
-
-#: rhodecode/public/js/scripts.js:42185 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15
-msgid "At least {0} reviewers must vote."
-msgstr ""
-
-#: rhodecode/public/js/scripts.js:42201 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80
-msgid "Reviewers picked from source code changes."
-msgstr ""
-
-#: rhodecode/public/js/scripts.js:42209 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8
-msgid "Adding new reviewers is forbidden."
-msgstr ""
-
-#: rhodecode/public/js/scripts.js:42217 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17
-msgid "Author is not allowed to be a reviewer."
-msgstr ""
-
-#: rhodecode/public/js/scripts.js:42231 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25
-msgid "Commit Authors are not allowed to be a reviewer."
-msgstr ""
-
-#: rhodecode/public/js/scripts.js:42238 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65
-msgid "No review rules set."
-msgstr ""
-
-#: rhodecode/public/js/scripts.js:42283 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49
+#: rhodecode/public/js/scripts.js:42408 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:209
+msgid "No additional review rules set."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:42454 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:255
 msgid "Loading diff ..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42336 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:109
+#: rhodecode/public/js/scripts.js:42507 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:115
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:308
 msgid "There are no commits to merge."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42408 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:120
+#: rhodecode/public/js/scripts.js:42579 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:128
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:380
 msgid "User `{0}` not allowed to be a reviewer"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42414 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/scripts.js:42585 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:127
 #: rhodecode/public/js/src/rhodecode/pullrequests.js:386
 msgid "User `{0}` already in reviewers/observers"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42528 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:126
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:500
+#: rhodecode/public/js/scripts.js:42699 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:135
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:501
 msgid "added manually by \"{0}\""
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42533 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:138
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:505
+#: rhodecode/public/js/scripts.js:42704 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:147
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:506
 msgid "member of \"{0}\""
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42766 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:118
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:738
+#: rhodecode/public/js/scripts.js:42937 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:125
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:739
 msgid "Updating..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:42776 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/scripts.js:42947 rhodecode/public/js/scripts.min.js:1
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:40
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:748
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:749
 msgid "Force updating..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:47613 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94
+#: rhodecode/public/js/scripts.js:47812 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98
 #: rhodecode/public/js/src/rhodecode/users.js:54
 msgid "Show this authentication token?"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:47615 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87
+#: rhodecode/public/js/scripts.js:47814 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90
 #: rhodecode/public/js/src/rhodecode/users.js:56
 msgid "Show"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:47651 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/scripts.js:47850 rhodecode/public/js/scripts.min.js:1
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:16
 #: rhodecode/public/js/src/rhodecode/users.js:92
 msgid "Authentication Token"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:47840 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:130
+#: rhodecode/public/js/scripts.js:48039 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:139
 #: rhodecode/public/js/src/rhodecode.js:144
 msgid "file"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:47984 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52
+#: rhodecode/public/js/scripts.js:48183 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53
 #: rhodecode/public/js/src/rhodecode.js:288
 msgid "Loading..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:48366 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:127
+#: rhodecode/public/js/scripts.js:48565 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:136
 #: rhodecode/public/js/src/rhodecode.js:670
 msgid "date not in future"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:48374 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96
+#: rhodecode/public/js/scripts.js:48573 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100
 #: rhodecode/public/js/src/rhodecode.js:678
 msgid "Specified expiration date"
 msgstr ""
 
 #: rhodecode/public/js/scripts.min.js:1
 msgid "action"
 msgstr ""
 
 #: rhodecode/public/js/scripts.min.js:1
 msgid "target"
 msgstr ""
 
 #: rhodecode/public/js/scripts.min.js:1
 msgid "text"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:2
 msgid "(from usergroup {0})"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3
 msgid "<strong>, and {0} file</strong> changed."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4
 msgid "<strong>, and {0} files</strong> changed."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:5
 msgid "<strong>{0} file</strong> changed, "
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:6
 msgid "<strong>{0} files</strong> changed, "
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:7
 msgid "Add another comment"
 msgstr ""
 
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8
+msgid "Adding new reviewers is forbidden."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11
+msgid "All individual reviewers must vote."
+msgstr ""
+
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:13
 msgid "Are you sure to close this pull request without merging?"
 msgstr ""
 
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14
+msgid "At least {0} reviewer must vote."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15
+msgid "At least {0} reviewers must vote."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17
+msgid "Author is not allowed to be a reviewer."
+msgstr ""
+
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:18
 msgid "Changed files"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:19
 #: rhodecode/public/js/src/i18n_messages.js:5
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:623
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:626
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:680
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:610
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:613
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:676
 msgid "Close"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:20
 #: rhodecode/templates/codeblocks/diffs.mako:119
 msgid "Collapse all files"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:21
 msgid "Collapse {0} commit"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:22
 msgid "Collapse {0} commits"
 msgstr ""
 
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25
+msgid "Commit Authors are not allowed to be a reviewer."
+msgstr ""
+
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:26
 msgid "Compare summary: <strong>{0} commit</strong>"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:27
 msgid "Compare summary: <strong>{0} commits</strong>"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:28
 msgid "Context file: "
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:30
 msgid "Delete this comment?"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:31
 msgid "Diff to Commit "
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:32
 msgid "Error during search operation"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:33
 #: rhodecode/templates/codeblocks/diffs.mako:117
 msgid "Expand all files"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:34
 msgid "Expand {0} commit"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:35
 msgid "Expand {0} commits"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:36
 msgid "Fetching repository state failed. Error code: {0} {1}. Try <a href=\"{2}\">refreshing</a> this page."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:37
 msgid "Fetching repository state failed. Error code: {0} {1}. Try refreshing this page."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:39
 msgid "Follow"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:41
+#: rhodecode/templates/codeblocks/diffs.mako:988
 msgid "Hide full context diff"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:42
+#: rhodecode/templates/codeblocks/diffs.mako:980
 msgid "Hide whitespace changes"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:43
 #: rhodecode/public/js/src/i18n_messages.js:4
 msgid "Invite reviewers to this discussion"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:45
+msgid "Leave a comment on line {0}."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46
 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53
-msgid "No bookmarks available yet."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54
-msgid "No branches available yet."
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:55
-msgid "No forks available yet."
+msgid "No bookmarks available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:56
+msgid "No branches available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57
+msgid "No forks available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58
 msgid "No gists available yet."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59
-msgid "No pull requests available yet."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60
-msgid "No repositories available yet."
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:61
-msgid "No repositories present."
+msgid "No pull requests available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:62
-msgid "No repository groups available yet."
+msgid "No repositories available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:63
+msgid "No repositories present."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64
+msgid "No repository groups available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65
 msgid "No repository groups present."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66
-msgid "No ssh keys available yet."
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:67
-msgid "No tags available yet."
+msgid "No review rules set."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:68
-msgid "No user groups available yet."
+msgid "No ssh keys available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:69
+msgid "No tags available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70
+msgid "No user groups available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71
 msgid "No users available yet."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75
 #: rhodecode/templates/commits/changelog.mako:78
 msgid "Open new pull request"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76
 msgid "Open new pull request for selected commit"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79
-msgid "Please wait creating pull request..."
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:81
-msgid "Saving..."
+msgid "Please wait creating pull request..."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82
+msgid "Reviewers picked from source code changes."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:84
+msgid "Saving..."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87
 #: rhodecode/public/js/src/i18n_messages.js:6
 #: rhodecode/templates/admin/settings/settings_email.mako:50
 msgid "Send"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91
 msgid "Show at Commit "
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89
-msgid "Show commit range {0} ... {1}"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90
-msgid "Show full context diff"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91
-#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:40
-msgid "Show more"
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:92
-msgid "Show selected commit __S"
+msgid "Show commit range {0} ... {1}"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:93
-msgid "Show selected commits __S ... __E"
+msgid "Show commit range {0}<i class=\"icon-angle-right\"></i>{1}"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94
+#: rhodecode/templates/codeblocks/diffs.mako:990
+msgid "Show full context diff"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:95
-msgid "Show whitespace changes"
+#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:40
+msgid "Show more"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96
+msgid "Show selected commit __S"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:97
+msgid "Show selected commits __S ... __E"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99
+#: rhodecode/templates/codeblocks/diffs.mako:978
+msgid "Show whitespace changes"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101
 msgid "Start following this repository"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100
-msgid "Stop following this repository"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103
-msgid "Switch target repository with the source."
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:104
+msgid "Stop following this repository"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:107
+msgid "Submit {0} draft comments."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:109
+msgid "Switch target repository with the source."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110
 #: rhodecode/public/js/src/i18n_messages.js:7
 msgid "Switch to chat"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:111
 #: rhodecode/public/js/src/i18n_messages.js:8
 msgid "Switch to comment"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108
-msgid "There are currently no open pull requests requiring your participation."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:112
-msgid "This pull requests will consist of <strong>{0} commit</strong>."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:113
-msgid "This pull requests will consist of <strong>{0} commits</strong>."
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:114
-msgid "Toggle Wide Mode diff"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:115
-msgid "Unfollow"
+msgid "There are currently no open pull requests requiring your participation."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:118
+msgid "This pull requests will consist of <strong>{0} commit</strong>."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:119
+msgid "This pull requests will consist of <strong>{0} commits</strong>."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:120
+msgid "Toggle Wide Mode diff"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:121
+msgid "Unfollow"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:124
+msgid "Updated Comment"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:126
 msgid "User `{0}` already in reviewers"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:125
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:134
 #: rhodecode/templates/admin/auth/auth_settings.mako:69
 msgid "activated"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:128
-msgid "disabled"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:129
-msgid "enabled"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:131
-msgid "files"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:132
-msgid "go to numeric commit"
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:137
+msgid "disabled"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:138
+msgid "enabled"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:140
+msgid "files"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:141
+msgid "go to numeric commit"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:146
 #: rhodecode/templates/index_base.mako:27
 #: rhodecode/templates/pullrequests/pullrequest.mako:154
 #: rhodecode/templates/pullrequests/pullrequest.mako:178
 msgid "loading..."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:139
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:148
 msgid "no commits"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:140
-#: rhodecode/templates/admin/auth/auth_settings.mako:69
-msgid "not active"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:144
-msgid "specify commit"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:147
-msgid "{0} ({1} inactive) of {2} user groups ({3} inactive)"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:148
-msgid "{0} ({1} inactive) of {2} users ({3} inactive)"
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:149
-msgid "{0} active out of {1} users"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:154
-msgid "{0} days"
+#: rhodecode/templates/admin/auth/auth_settings.mako:69
+msgid "not active"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:153
+msgid "specify commit"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:156
-msgid "{0} hours"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:159
-msgid "{0} months"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:160
-msgid "{0} of {1} repositories"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:161
-msgid "{0} of {1} repository groups"
+msgid "{0} ({1} inactive) of {2} user groups ({3} inactive)"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:157
+msgid "{0} ({1} inactive) of {2} users ({3} inactive)"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:158
+msgid "{0} active out of {1} users"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:162
-msgid "{0} out of {1} ssh keys"
+msgid "{0} bookmark"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:163
-msgid "{0} out of {1} users"
+msgid "{0} bookmarks"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:164
-msgid "{0} repositories"
+msgid "{0} branch"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:165
-msgid "{0} repository groups"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:168
-msgid "{0} user groups ({1} inactive)"
+msgid "{0} branches"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:167
+msgid "{0} days"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:169
+msgid "{0} hours"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:172
+msgid "{0} months"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:173
+msgid "{0} of {1} repositories"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:174
+msgid "{0} of {1} repository groups"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:175
+msgid "{0} out of {1} ssh keys"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:176
+msgid "{0} out of {1} users"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:177
+msgid "{0} repositories"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:178
+msgid "{0} repository groups"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:181
+msgid "{0} tag"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:182
+msgid "{0} tags"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:183
+msgid "{0} user groups ({1} inactive)"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:184
 msgid "{0} users ({1} inactive)"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:171
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:186
 msgid "{0} years"
 msgstr ""
 
 #: rhodecode/public/js/src/math_jax/extensions/HelpDialog.js:19
 msgid "HelpDialog"
 msgstr ""
 
 #: rhodecode/public/js/src/math_jax/jax/output/HTML-CSS/autoload/mglyph.js:19
 msgid "MathML"
 msgstr ""
 
-#: rhodecode/public/js/src/rhodecode/comments.js:140
-msgid "Update Comment"
-msgstr ""
-
-#: rhodecode/public/js/src/rhodecode/comments.js:437
-msgid "Saving Draft..."
-msgstr ""
-
-#: rhodecode/public/js/src/rhodecode/comments.js:806
-msgid "Submit {0} draft comment."
-msgstr ""
-
-#: rhodecode/public/js/src/rhodecode/comments.js:809
-msgid "Yes"
-msgstr ""
-
-#: rhodecode/public/js/src/rhodecode/comments.js:1351
-msgid "Leave a comment on file {0} line {1}."
-msgstr ""
-
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:209
-msgid "No additional review rules set."
-msgstr ""
-
 #: rhodecode/templates/index.mako:5
 msgid "Dashboard"
 msgstr ""
 
 #: rhodecode/templates/index_base.mako:21
 msgid "No repositories or repositories groups exists here."
 msgstr ""
 
 #: rhodecode/templates/index_base.mako:80
 #: rhodecode/templates/index_base.mako:167
 #: rhodecode/templates/admin/gists/gist_index.mako:107
 #: rhodecode/templates/admin/integrations/list.mako:72
 #: rhodecode/templates/admin/my_account/my_account_repos.mako:28
 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:39
 #: rhodecode/templates/admin/my_account/my_account_watched.mako:28
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:74
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:16
 #: rhodecode/templates/admin/repos/repos.mako:76
 #: rhodecode/templates/admin/user_groups/user_groups.mako:76
 #: rhodecode/templates/admin/users/user_edit_groups.mako:57
 #: rhodecode/templates/base/perms_summary.mako:173
 #: rhodecode/templates/base/perms_summary.mako:247
 #: rhodecode/templates/bookmarks/bookmarks.mako:69
 #: rhodecode/templates/branches/branches.mako:68
 #: rhodecode/templates/files/files_browser_tree.mako:16
 #: rhodecode/templates/tags/tags.mako:69
 msgid "Name"
 msgstr ""
 
 #: rhodecode/templates/index_base.mako:89
 #: rhodecode/templates/index_base.mako:176
 #: rhodecode/templates/admin/gists/gist_index.mako:109
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:27
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:68
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:10
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:58
 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:44
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:49
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:58
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:55
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:77
 #: rhodecode/templates/admin/repos/repo_add_base.mako:83
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:30
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:170
 #: rhodecode/templates/admin/repos/repos.mako:84
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:42
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:46
 #: rhodecode/templates/admin/user_groups/user_groups.mako:78
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:32
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:91
 #: rhodecode/templates/admin/users/user_edit_groups.mako:62
 #: rhodecode/templates/admin/users/user_edit_ips.mako:17
 #: rhodecode/templates/admin/users/user_edit_profile.mako:74
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:15
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:57
 #: rhodecode/templates/base/issue_tracker_settings.mako:79
-#: rhodecode/templates/compare/compare_commits.mako:19
+#: rhodecode/templates/compare/compare_commits.mako:22
 #: rhodecode/templates/email_templates/pull_request_review.mako:49
 #: rhodecode/templates/email_templates/pull_request_review.mako:134
 #: rhodecode/templates/email_templates/pull_request_update.mako:45
 #: rhodecode/templates/email_templates/pull_request_update.mako:139
 #: rhodecode/templates/forks/fork.mako:56
 #: rhodecode/templates/forks/forks.mako:62
 #: rhodecode/templates/pullrequests/pullrequest.mako:104
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:398
 #: rhodecode/templates/summary/components.mako:159
 #: rhodecode/templates/user_group/profile.mako:25
 #: rhodecode/templates/users/user_profile.mako:59
 msgid "Description"
 msgstr ""
 
 #: rhodecode/templates/index_base.mako:96
 #: rhodecode/templates/index_base.mako:183
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:80
 #: rhodecode/templates/admin/repos/repos.mako:91
 msgid "Last Change"
 msgstr ""
 
 #: rhodecode/templates/index_base.mako:109
 #: rhodecode/templates/index_base.mako:196
 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:50
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:8
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:84
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:6
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:152
 #: rhodecode/templates/admin/repos/repos.mako:104
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:6
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:28
 #: rhodecode/templates/admin/user_groups/user_groups.mako:86
 #: rhodecode/templates/admin/users/user_edit_groups.mako:68
 #: rhodecode/templates/forks/forks.mako:58
 #: rhodecode/templates/summary/components.mako:148
 #: rhodecode/templates/user_group/profile.mako:35
 msgid "Owner"
 msgstr ""
 
 #: rhodecode/templates/index_base.mako:190
 #: rhodecode/templates/admin/repos/repos.mako:98
 #: rhodecode/templates/bookmarks/bookmarks.mako:76
 #: rhodecode/templates/branches/branches.mako:75
-#: rhodecode/templates/compare/compare_commits.mako:17
+#: rhodecode/templates/compare/compare_commits.mako:20
 #: rhodecode/templates/email_templates/commit_comment.mako:60
 #: rhodecode/templates/email_templates/commit_comment.mako:114
 #: rhodecode/templates/email_templates/commit_comment.mako:141
 #: rhodecode/templates/files/file_authors_box.mako:28
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:396
 #: rhodecode/templates/search/search_commit.mako:9
 #: rhodecode/templates/summary/components.mako:117
 #: rhodecode/templates/summary/components.mako:125
 #: rhodecode/templates/tags/tags.mako:76
 msgid "Commit"
 msgstr ""
 
 #: rhodecode/templates/index_repo_group.mako:5
 #, python-format
 msgid "%s Repository group dashboard"
 msgstr ""
 
 #: rhodecode/templates/index_repo_group.mako:13
 #: rhodecode/templates/base/base.mako:810
 #: rhodecode/templates/base/base.mako:811
 msgid "Home"
 msgstr ""
 
 #: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:91
 #: rhodecode/templates/debug_style/login.html:60
 msgid "Sign In"
 msgstr ""
 
 #: rhodecode/templates/login.mako:39
 msgid "Sign In using username/password"
 msgstr ""
 
 #: rhodecode/templates/login.mako:53
 msgid "Forgot your password?"
 msgstr ""
 
 #: rhodecode/templates/login.mako:66
 msgid "Remember my indefinitely"
 msgstr ""
 
 #: rhodecode/templates/login.mako:68
 msgid "Remember me for {}"
 msgstr ""
 
 #: rhodecode/templates/login.mako:74
 msgid "Create a new account."
 msgstr ""
 
 #: rhodecode/templates/login.mako:81
 msgid "Password reset is disabled."
 msgstr ""
 
 #: rhodecode/templates/login.mako:82
 msgid "Please contact "
 msgstr ""
 
 #: rhodecode/templates/login.mako:84 rhodecode/templates/password_reset.mako:40
 #: rhodecode/templates/base/base.mako:63
 msgid "Support"
 msgstr ""
 
 #: rhodecode/templates/login.mako:85 rhodecode/templates/password_reset.mako:41
 msgid "or"
 msgstr ""
 
 #: rhodecode/templates/login.mako:87 rhodecode/templates/password_reset.mako:43
 msgid "an administrator if you need help."
 msgstr ""
 
 #: rhodecode/templates/login.mako:91
 msgid "Sign in to {}"
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:5
 msgid "Reset Password"
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:38
 msgid "Password reset is disabled. Please contact "
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:50
 msgid "Reset your Password"
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:51
 msgid "Go to the login page to sign in."
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:55
 msgid "Email Address"
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:61
 msgid "Password reset link will be sent to matching email address"
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:65
 #: rhodecode/templates/register.mako:106
 msgid "Captcha"
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:76
 msgid "Send password reset email"
 msgstr ""
 
 #: rhodecode/templates/register.mako:5
 msgid "Create an Account"
 msgstr ""
 
 #: rhodecode/templates/register.mako:40
 msgid "Create an account linked with {}"
 msgstr ""
 
 #: rhodecode/templates/register.mako:42
 msgid "Create an account"
 msgstr ""
 
 #: rhodecode/templates/register.mako:45
 msgid "Go to the login page to sign in with an existing account."
 msgstr ""
 
 #: rhodecode/templates/register.mako:71
 msgid "Re-enter password"
 msgstr ""
 
 #: rhodecode/templates/register.mako:83
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:38
 #: rhodecode/templates/admin/users/user_add.mako:68
 #: rhodecode/templates/admin/users/user_edit_profile.mako:47
 #: rhodecode/templates/admin/users/users.mako:78
 msgid "First Name"
 msgstr ""
 
 #: rhodecode/templates/register.mako:90
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:58
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:47
 #: rhodecode/templates/admin/users/user_add.mako:77
 #: rhodecode/templates/admin/users/user_edit_profile.mako:56
 #: rhodecode/templates/admin/users/users.mako:80
 msgid "Last Name"
 msgstr ""
 
 #: rhodecode/templates/register.mako:118
 msgid "Account activation requires admin approval."
 msgstr ""
 
 #: rhodecode/templates/register.mako:125
 msgid "Create Account"
 msgstr ""
 
 #: rhodecode/templates/register.mako:125
 msgid "Create Account in {}"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:6
 msgid "Admin audit log entry"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:26
 msgid "Audit long entry"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:34
 #: rhodecode/templates/users/user.mako:4
 msgid "User"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:46
 #: rhodecode/templates/admin/admin_log_base.mako:11
 #: rhodecode/templates/bookmarks/bookmarks.mako:71
 #: rhodecode/templates/branches/branches.mako:70
 #: rhodecode/templates/tags/tags.mako:71
 msgid "Date"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:54
 #: rhodecode/templates/admin/admin_log_base.mako:12
 msgid "IP"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:63
 #: rhodecode/templates/admin/admin_log_base.mako:8
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:31
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:13
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:55
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:86
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:13
 #: rhodecode/templates/admin/repos/repos.mako:116
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:75
 #: rhodecode/templates/admin/user_groups/user_groups.mako:88
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:36
 #: rhodecode/templates/admin/users/user_edit_groups.mako:76
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:18
 #: rhodecode/templates/admin/users/users.mako:91
 #: rhodecode/templates/forks/forks.mako:69
 msgid "Action"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:81
 #: rhodecode/templates/admin/admin_log_base.mako:9
 msgid "Action Data"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:89
 #: rhodecode/templates/admin/admin_log_base.mako:47
 msgid "data not available for v1 entries type"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:95
 #: rhodecode/templates/admin/admin_log_base.mako:10
 #: rhodecode/templates/admin/defaults/defaults.mako:32
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:16
 #: rhodecode/templates/base/base.mako:658
 #: rhodecode/templates/base/base.mako:660
 #: rhodecode/templates/base/base.mako:662
 #: rhodecode/templates/search/search_commit.mako:8
 #: rhodecode/templates/search/search_path.mako:7
 msgid "Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_logs.mako:5
 #: rhodecode/templates/base/base.mako:113
 msgid "Admin audit logs"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_logs.mako:25
 msgid "filter..."
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_logs.mako:26
 #: rhodecode/templates/admin/repos/repo_edit_audit.mako:15
 #: rhodecode/templates/admin/users/user_edit_audit.mako:18
 #: rhodecode/templates/journal/journal.mako:13
 msgid "filter"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_logs.mako:27
 #: rhodecode/templates/admin/repos/repo_edit.mako:91
 #: rhodecode/templates/admin/users/user_edit.mako:48
 msgid "Audit logs"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_logs.mako:29
 #: rhodecode/templates/admin/repos/repo_edit_audit.mako:18
 #: rhodecode/templates/admin/users/user_edit_audit.mako:21
 #: rhodecode/templates/journal/journal.mako:16
 msgid "Example Queries"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log_base.mako:6
 msgid "Uid"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log_base.mako:42
 msgid "toggle"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log_base.mako:68
 msgid "No actions yet"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:5
 #: rhodecode/templates/admin/settings/settings.mako:5
 msgid "Settings administration"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:26
 msgid "Administration area"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:30
 msgid "Repositories under administration"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:34
 #: rhodecode/templates/admin/repos/repo_add.mako:22
 #: rhodecode/templates/admin/repos/repos.mako:31
 msgid "Add Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:39
 msgid "Repository groups under administration"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:43
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:16
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:31
 msgid "Add Repository Group"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:48
 msgid "User groups under administration"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:52
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:15
 #: rhodecode/templates/admin/user_groups/user_groups.mako:31
 msgid "Add User Group"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:5
 #: rhodecode/templates/admin/auth/plugin_settings.mako:5
 msgid "Authentication Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:42
 msgid "Enabled and Available Plugins"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:48
 msgid "Ordered Activated Plugins"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:53
 msgid ""
 "List of plugins, separated by commas.\n"
 "The order of the plugins is also the order in which RhodeCode Enterprise will try to authenticate a user."
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:60
 msgid "Activate"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:61
 msgid "Plugin Name"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:62
 #: rhodecode/templates/base/base.mako:64
 msgid "Documentation"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:63
 msgid "Plugin ID"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:85
 #: rhodecode/templates/admin/auth/plugin_settings.mako:96
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:63
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:109
 #: rhodecode/templates/admin/permissions/permissions_application.mako:59
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:59
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:226
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:77
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:66
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:84
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:206
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:250
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:251
 #: rhodecode/templates/admin/settings/settings_hooks.mako:63
 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:15
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:216
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:106
 #: rhodecode/templates/admin/users/user_edit_groups.mako:30
 #: rhodecode/templates/admin/users/user_edit_profile.mako:154
 #: rhodecode/templates/base/default_perms_box.mako:101
 msgid "Save"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/plugin_settings.mako:46
 msgid "Plugin"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.mako:5
 #: rhodecode/templates/admin/defaults/defaults.mako:14
 msgid "Repositories defaults"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:3
 msgid "Default Settings For New Repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14
 #: rhodecode/templates/admin/gists/gist_index.mako:105
 #: rhodecode/templates/admin/integrations/list.mako:73
 #: rhodecode/templates/admin/repos/repo_add_base.mako:58
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12
 msgid "Type"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:23
 #: rhodecode/templates/admin/repos/repo_add_base.mako:113
 msgid "Private Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27
 #: rhodecode/templates/admin/repos/repo_add_base.mako:117
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:199
 #: rhodecode/templates/forks/fork.mako:92
 msgid "Private repositories are only visible to people explicitly added as collaborators."
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:34
 msgid "Enable Statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:38
 msgid "Enable a statistics window on the repository summary page."
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:44
 msgid "Enable Downloads"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:48
 msgid "Enable the download option on the repository summary page."
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:54
 msgid "Enable Locking"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:58
 msgid "Enable automatic repository locking. Pulling from a repository will lock it, and it is unlocked by pushing back by the same user."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:5
 msgid "Edit Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:33
 #: rhodecode/templates/admin/gists/gist_new.mako:34
 msgid "Gist lifetime"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:36
 msgid "Gist access level"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:40
 #: rhodecode/templates/admin/gists/gist_new.mako:40
 msgid "Gist description ..."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:54
 #: rhodecode/templates/admin/gists/gist_new.mako:48
 #: rhodecode/templates/files/files_add.mako:66
 #: rhodecode/templates/files/files_edit.mako:68
 msgid "plain"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:99
 msgid "Update Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:100
 #: rhodecode/templates/base/issue_tracker_settings.mako:151
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:82
 msgid "Cancel"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:123
 #, python-format
 msgid "Gist was updated since you started editing. Copy your changes and click %(here)s to reload the new version."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:6
 msgid "Private Gists for user {}"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:8
 msgid "Public Gists for user {}"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:10
 msgid "Public Gists"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:30
 msgid "All gists"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:32
 msgid "All public"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:34
 msgid "My gists"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:35
 msgid "My private"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:36
 msgid "My public"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:43
 msgid "Create New Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:54
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:23
 #: rhodecode/templates/admin/my_account/my_account_repos.mako:7
 #: rhodecode/templates/admin/my_account/my_account_watched.mako:7
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:11
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:25
 #: rhodecode/templates/admin/repos/repos.mako:25
 #: rhodecode/templates/admin/user_groups/user_groups.mako:25
 #: rhodecode/templates/admin/users/users.mako:26
 #: rhodecode/templates/bookmarks/bookmarks.mako:39
 #: rhodecode/templates/branches/branches.mako:39
 #: rhodecode/templates/journal/journal.mako:12
 #: rhodecode/templates/pullrequests/pullrequests.mako:53
 #: rhodecode/templates/tags/tags.mako:39
 msgid "quick filter..."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:103
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:87
 #: rhodecode/templates/bookmarks/bookmarks.mako:73
 #: rhodecode/templates/branches/branches.mako:72
 #: rhodecode/templates/commits/changelog.mako:138
-#: rhodecode/templates/compare/compare_commits.mako:16
+#: rhodecode/templates/compare/compare_commits.mako:19
 #: rhodecode/templates/files/files_browser_tree.mako:20
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:395
 #: rhodecode/templates/pullrequests/pullrequests.mako:100
 #: rhodecode/templates/search/search_commit.mako:18
 #: rhodecode/templates/summary/summary_commits.mako:11
 #: rhodecode/templates/tags/tags.mako:73
 msgid "Author"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:111
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:11
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:51
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:9
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:7
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:7
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:6
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:16
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:58
 msgid "Created on"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:113
 msgid "Expires"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:5
 #: rhodecode/templates/base/base.mako:577
 msgid "New Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:31
 msgid "Gist id"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:32
 msgid "Auto generated"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:37
 msgid "Private Gist access level"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:47
 msgid "name gist file..."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:61
 msgid "Create Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:69
 #: rhodecode/templates/admin/gists/gist_new.mako:70
 #: rhodecode/templates/data_table/_dt_elements.mako:352
 msgid "Private Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:70
 msgid "Private Gists are not listed and only accessible through their secret url."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:73
 #: rhodecode/templates/admin/gists/gist_new.mako:74
 #: rhodecode/templates/data_table/_dt_elements.mako:350
 msgid "Public Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:74
 msgid "Public Gists are accessible to anyone and listed in Gists page."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_show.mako:14
 #: rhodecode/templates/admin/gists/gist_show.mako:21
 msgid "Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_show.mako:41
 msgid "Copy the url"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_show.mako:47
 #: rhodecode/templates/files/files_source.mako:116
 msgid "Copy content"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_show.mako:52
 msgid "Show as Raw"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_show.mako:73
 msgid "created"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_show.mako:74
 msgid "expires"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_show.mako:95
 #: rhodecode/templates/files/files_delete.mako:57
 #: rhodecode/templates/files/files_source.mako:138
 msgid "Show as raw"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/base.mako:14
 msgid "Integrations Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/base.mako:23
 #: rhodecode/templates/admin/integrations/form.mako:8
 #: rhodecode/templates/admin/integrations/form.mako:21
 #: rhodecode/templates/admin/integrations/form.mako:32
 #: rhodecode/templates/admin/integrations/global.mako:14
 #: rhodecode/templates/admin/integrations/list.mako:21
 #: rhodecode/templates/admin/integrations/list.mako:25
 #: rhodecode/templates/admin/integrations/list.mako:29
 #: rhodecode/templates/admin/integrations/list.mako:36
 #: rhodecode/templates/admin/integrations/new.mako:15
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:33
 #: rhodecode/templates/admin/repos/repo_edit.mako:74
 #: rhodecode/templates/base/base.mako:120
 msgid "Integrations"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/form.mako:30
 #: rhodecode/templates/admin/integrations/list.mako:16
 #: rhodecode/templates/admin/integrations/new.mako:7
 #: rhodecode/templates/admin/integrations/new.mako:9
 #: rhodecode/templates/admin/integrations/new.mako:13
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:30
 #: rhodecode/templates/admin/repos/repo_edit.mako:15
 #: rhodecode/templates/admin/repos/repo_edit.mako:42
 #: rhodecode/templates/admin/settings/settings.mako:14
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:34
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:9
 #: rhodecode/templates/base/base.mako:122
 msgid "Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/form.mako:60
 #, python-format
 msgid "Create New %(integration_type)s Integration"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/global.mako:5
 msgid "Integrations administration"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:44
 msgid "Current Integrations for Repository: {repo_name}"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:46
 msgid "Repository Group Integrations: {}"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:48
 msgid "Current Integrations"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:65
 #: rhodecode/templates/admin/integrations/new.mako:18
 msgid "Create new integration"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:74
 msgid "Scope"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:75
 #: rhodecode/templates/compare/compare_diff.mako:84
 msgid "Actions"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:85
 msgid "No {type} integrations for repo {repo} exist yet."
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:87
 msgid "No {type} integrations for repogroup {repogroup} exist yet."
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:89
 msgid "No {type} integrations exist yet."
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:103
 msgid "Create one"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:132
 #: rhodecode/templates/hovercards/hovercard_pull_request.mako:19
 msgid "repo"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:136
 msgid "repogroup"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:138
 msgid "child repos only"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:140
 msgid "cascade to all"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:145
 msgid "top level repos only"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:147
 msgid "global"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:153
 msgid "unknown integration"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/new.mako:23
 msgid "Create New Integration for repository: {repo_name}"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/new.mako:25
 msgid "Create New Integration for repository group: {repo_group_name}"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/new.mako:27
 msgid "Create New Global Integration"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/new.mako:55
 msgid "No description available"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:5
 #: rhodecode/templates/base/base.mako:622
 msgid "My account"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:12
 msgid "My Account"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:29
 #: rhodecode/templates/email_templates/user_registration.mako:55
 msgid "Profile"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:30
 #: rhodecode/templates/admin/users/user_edit.mako:45
 #: rhodecode/templates/debug_style/index.html:55
 msgid "Emails"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:33
 msgid "Auth Tokens"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:34
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:3
 #: rhodecode/templates/admin/permissions/permissions.mako:51
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:4
 #: rhodecode/templates/admin/users/user_edit.mako:41
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:7
 msgid "SSH Keys"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:35
 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:5
 msgid "User Group Membership"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:40
 msgid "External Identities"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:43
 msgid "Owned Repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:44
 msgid "Watched Repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:45
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:42
 #: rhodecode/templates/base/base.mako:385
 #: rhodecode/templates/base/base.mako:626
 msgid "Pull Requests"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:46
 #: rhodecode/templates/admin/permissions/permissions.mako:14
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:35
 #: rhodecode/templates/base/base.mako:118
 msgid "Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:47
 msgid "Live Notifications"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:9
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:13
 msgid "Authentication Tokens"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:19
 msgid "Available roles"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:26
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31
 msgid "Token"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:29
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:34
 msgid "Repository Scope"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:30
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:35
 msgid "Expiration"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:72
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:76
 msgid "No additional auth tokens specified"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:84
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:88
 msgid "New authentication token"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:98
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:102
 msgid "Repository scope works only with tokens with VCS type."
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:102
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:72
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:63
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:106
 #: rhodecode/templates/admin/users/user_edit_emails.mako:65
 #: rhodecode/templates/admin/users/user_edit_ips.mako:75
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:71
 msgid "Add"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:135
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:140
 msgid "Select or enter expiration date"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:170
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:175
 msgid "repository scope"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:7
 msgid "Position"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:17
 msgid "Bookmark title (max 30 characters, optional)"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:24
 msgid "Clear"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:30
 msgid "Server URL is available as ${server_url} variable. E.g. Redirect url: ${server_url}/_admin/exception_tracker"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:34
 msgid "Redirect URL"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:44
 msgid "Repository template"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:50
 msgid "Repository group template"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:56
 msgid "Template Repository or Repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:66
 msgid "Available as ${repo_url}  e.g. Redirect url: ${repo_url}/changelog"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:68
 msgid "Available as ${repo_group_url} e.g. Redirect url: ${repo_group_url}"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:70
 msgid "Available as full url variables in redirect url. i.e: ${repo_url}, ${repo_group_url}."
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:80
 msgid "Your Bookmarks"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:85
 msgid "Store upto 10 bookmark links to favorite repositories, external issue tracker or CI server. "
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:87
 msgid "Bookmarks are accessible from your username dropdown or by keyboard shortcut `g 0-9`"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:141
 msgid "repository"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:192
 msgid "repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_emails.mako:5
 msgid "Account Emails"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_emails.mako:17
 #: rhodecode/templates/admin/users/user_edit_emails.mako:19
 msgid "Primary"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_emails.mako:43
 #: rhodecode/templates/admin/users/user_edit_emails.mako:44
 msgid "No additional emails specified"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_emails.mako:52
 #: rhodecode/templates/admin/my_account/my_account_password.mako:6
 msgid "Your user account details are managed by an external source. Details cannot be managed here."
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_emails.mako:53
 #: rhodecode/templates/admin/my_account/my_account_password.mako:9
 msgid "Source type"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_notifications.mako:4
 msgid "Your Live Notification Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_notifications.mako:16
 msgid "Notifications Status"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_notifications.mako:40
 msgid "Test Notifications"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_password.mako:3
 msgid "Change Your Account Password"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_password.mako:7
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:18
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:19
 msgid "For VCS access please generate"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:6
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4
 msgid "My Profile"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:15
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:16
 #: rhodecode/templates/admin/users/user_edit_profile.mako:19
 #, python-format
 msgid "This user was created from external source (%s). Editing some of the settings is limited."
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:24
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:60
 #: rhodecode/templates/admin/users/user_edit_profile.mako:26
 #: rhodecode/templates/users/user_profile.mako:15
 msgid "Photo"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:82
 #: rhodecode/templates/users/user_profile.mako:73
 msgid "Missing email, please update your user email address."
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:65
 msgid "Change your avatar at"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:13
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:40
 msgid "All"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:14
 msgid "All + Closed"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:33
 msgid "Pull Requests You Participate In"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:75
 #: rhodecode/templates/pullrequests/pullrequests.mako:96
 msgid "Id"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:81
 #: rhodecode/templates/admin/settings/settings_global.mako:9
 #: rhodecode/templates/email_templates/pull_request_review.mako:47
 #: rhodecode/templates/email_templates/pull_request_update.mako:43
 #: rhodecode/templates/pullrequests/pullrequest.mako:91
 #: rhodecode/templates/pullrequests/pullrequests.mako:98
 msgid "Title"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:99
 #: rhodecode/templates/pullrequests/pullrequests.mako:104
 msgid "Last Update"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:105
 msgid "Target Repo"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_repos.mako:3
 msgid "Repositories You Own"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:9
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:47
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:14
 msgid "Fingerprint"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:12
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:53
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:17
 msgid "Accessed on"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:16
 msgid "SSH Keys usage is currently disabled, please ask your administrator to enable them."
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:41
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:42
 msgid "No additional ssh keys specified"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:55
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:54
 msgid "New ssh key"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:60
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:59
 msgid "Generate random RSA key"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:67
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:66
 msgid "Public key, begins with 'ssh-rsa', 'ssh-dss', 'ssh-ed25519', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:76
 msgid "Click add to use this generated SSH key"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:49
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:51
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:51
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:55
 #: rhodecode/templates/admin/user_groups/user_groups.mako:84
 #: rhodecode/templates/admin/users/user_add.mako:97
 #: rhodecode/templates/admin/users/user_edit_groups.mako:67
 #: rhodecode/templates/admin/users/user_edit_profile.mako:110
 #: rhodecode/templates/admin/users/users.mako:85
 #: rhodecode/templates/user_group/profile.mako:44
 msgid "Active"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_watched.mako:3
 msgid "Your Watched Repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_data.mako:5
 msgid "My notifications"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_data.mako:26
 msgid "Mark as read"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_data.mako:42
 msgid "No notifications here yet"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_show.mako:5
 #: rhodecode/templates/admin/notifications/notifications_show.mako:14
 #: rhodecode/templates/debug_style/email_plain_rendered.mako:5
 #: rhodecode/templates/debug_style/email_plain_rendered.mako:14
 msgid "Show notification"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_show.mako:12
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:5
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:20
 #: rhodecode/templates/debug_style/email_plain_rendered.mako:12
 msgid "My Notifications"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_show.mako:42
 #: rhodecode/templates/debug_style/email_plain_rendered.mako:38
 msgid "Subject"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:25
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:29
 msgid "Mark all as read"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:39
 msgid "Unread"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:41
 #: rhodecode/templates/changeset/changeset.mako:252
 #: rhodecode/templates/changeset/changeset.mako:262
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:763
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:773
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:759
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:769
 msgid "Comments"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.mako:5
 msgid "Permissions Administration"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.mako:33
 msgid "Application"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.mako:39
 msgid "Object"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.mako:45
 msgid "IP Whitelist"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.mako:48
 msgid "AuthToken Access"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.mako:54
 msgid "Overview"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:3
 msgid "System Wide Application Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:12
 msgid "Anonymous Access"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:18
 #, python-format
 msgid "Allow access to RhodeCode Enterprise without requiring users to login. Anonymous users get the %s permission settings."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:24
 msgid "Registration"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:33
 msgid "Password Reset"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:42
 msgid "Registration Page Message"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:46
 msgid "Custom message to be displayed on the registration page. HTML syntax is supported."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:52
 msgid "External Authentication Account Activation"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:5
 msgid "View whitelist"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:36
 msgid "List of views available for usage in whitelist access"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_branch.mako:3
 msgid "Default Permissions for Branches."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_branch.mako:6
 #: rhodecode/templates/admin/repos/repo_edit_automation.mako:6
 #: rhodecode/templates/admin/repos/repo_edit_permissions_branch.mako:6
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:67
 #: rhodecode/templates/admin/repos/repo_edit_reviewers.mako:6
 #: rhodecode/templates/admin/settings/settings_automation.mako:6
 #: rhodecode/templates/artifacts/artifact_list.mako:24
 #: rhodecode/templates/pullrequests/pullrequest.mako:197
 msgid "This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:5
 msgid "Default IP Whitelist For All Users"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:9
 #: rhodecode/templates/admin/users/user_edit_ips.mako:12
 msgid "Current IP address"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:30
 #: rhodecode/templates/admin/users/user_edit_ips.mako:41
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:37
 #: rhodecode/templates/admin/users/user_edit_ips.mako:49
 msgid "All IP addresses are allowed"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:52
 #: rhodecode/templates/admin/users/user_edit_ips.mako:65
 msgid "New IP Address"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:56
 #: rhodecode/templates/admin/users/user_edit_ips.mako:68
 msgid "Description..."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:57
 msgid ""
 "Enter a comma separated list of IP Addresses like 127.0.0.1,\n"
 "or use an IP Address with a mask 127.0.0.1/24, to create a network range.\n"
 "To specify multiple addresses in a range, use the 127.0.0.1-127.0.0.10 syntax"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:3
 msgid "Default Permissions for Repositories, User Groups and Repository Groups."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:7
 msgid "Default access permissions. This defines permissions for the `default` user from which other users inherit permissions."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:9
 msgid "Check the overwrite checkbox to force change all previously defined permissions for `default` user to the new selected value."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:23
 msgid "All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:24
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:38
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:52
 msgid "Overwrite Existing Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:37
 msgid "All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:45
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:14
 msgid "User Groups"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:51
 msgid "All default permissions on each user group will be reset to chosen permission, note that all custom default permission on user groups will be lost"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_perms.mako:1
 msgid "Default User Permissions Overview"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:7
 msgid "Update SSH keys file"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:5
 msgid "Add repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13
 #: rhodecode/templates/base/base.mako:115
 #: rhodecode/templates/base/base.mako:136
 msgid "Repository groups"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:35
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:15
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:34
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:19
 msgid "Group name"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:44
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:25
 #: rhodecode/templates/admin/repos/repo_add_base.mako:43
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:33
 #: rhodecode/templates/base/base.mako:671
 #: rhodecode/templates/data_table/_dt_elements.mako:217
 #: rhodecode/templates/forks/fork.mako:41
 msgid "Repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:50
 #: rhodecode/templates/admin/repos/repo_add_base.mako:49
 msgid "Select my personal group ({})"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:65
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:64
 #: rhodecode/templates/admin/repos/repo_add_base.mako:90
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:179
 #: rhodecode/templates/admin/users/user_edit_profile.mako:81
 #: rhodecode/templates/forks/fork.mako:63
 msgid "Plain text format with {metatags} support."
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:67
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:66
 #: rhodecode/templates/admin/repos/repo_add_base.mako:92
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:181
 #: rhodecode/templates/admin/users/user_edit_profile.mako:83
 #: rhodecode/templates/forks/fork.mako:65
 msgid "Plain text format."
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:79
 #: rhodecode/templates/admin/repos/repo_add_base.mako:104
 msgid "Copy Parent Group Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:83
 #: rhodecode/templates/admin/repos/repo_add_base.mako:108
 msgid "Copy permissions from parent repository group."
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:88
 msgid "Create Repository Group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:5
 #, python-format
 msgid "%s repository group settings"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:31
 #: rhodecode/templates/admin/repos/repo_edit.mako:45
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:8
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:30
 msgid "Access Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:32
 #: rhodecode/templates/admin/repos/repo_edit.mako:51
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:36
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:24
 #: rhodecode/templates/admin/users/user_edit.mako:42
 msgid "Advanced"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:7
 msgid "Repository Group ID"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:10
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:8
 msgid "Updated on"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:11
 msgid "Cached Commit source"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:12
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:9
 msgid "Cached Commit id"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:13
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:10
 msgid "Cached Commit date"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:15
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:11
 msgid "Cached Commit data"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:17
 msgid "Is Personal Group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:19
 msgid "Total repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:20
 msgid "Top level repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:22
 msgid "Children groups"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:28
 msgid "Repository Group Advanced: {}"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:38
 msgid "Delete repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:67
 #, python-format
 msgid "Confirm to delete this group: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:68
 msgid "Delete this repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:5
 msgid "Repository Group Permissions: {}"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:15
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:15
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:19
 msgid "User/User Group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:32
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:31
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:37
 msgid "super-admin"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:35
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:34
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:40
 msgid "owner"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:66
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:119
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:92
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:72
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:125
 msgid "permission for other logged in and anonymous users"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:68
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:121
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:94
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:74
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:127
 msgid "permission for other logged in users"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:74
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:127
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:100
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:80
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:133
 msgid "This entry is a duplicate, most probably left-over from previously set permission. This user has a higher permission set, so this entry is inactive. Please revoke this permission manually."
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:74
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:127
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:100
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:80
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:133
 msgid "inactive duplicate"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:87
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:177
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:121
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:170
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:46
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:93
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:182
 msgid "Remove"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:134
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:140
 msgid "delegated admin"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:172
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:165
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:177
 msgid "members"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:204
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:197
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:208
 msgid "Add user/user group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:214
 msgid "Apply to children"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:220
 msgid "Both"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:221
 msgid "Set or revoke permissions to selected types of children of this group, including non-private repositories and other groups if chosen."
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:6
 msgid "Repository Group Settings: {}"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:31
 msgid "Optional select a parent group to move this repository group into."
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:49
 msgid "Change owner of this repository group."
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:5
 msgid "Repository groups administration"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:82
 msgid "Number of top level repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add.mako:5
 msgid "Add repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:9
 msgid "Repository name"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:14
 msgid "Import Existing Repository ?"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:23
 #: rhodecode/templates/base/base.mako:332
 msgid "Clone from"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:52
 #: rhodecode/templates/forks/fork.mako:50
 msgid "Optionally select a group to put this repository into."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:78
 msgid "Set the type of repository to create."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:94
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:183
 #: rhodecode/templates/forks/fork.mako:67
 msgid "Add a README file for longer descriptions"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:121
 msgid "Create Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_creating.mako:5
 msgid "{} Creating repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_creating.mako:12
 msgid "Creating repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_creating.mako:26
 #, python-format
 msgid "Repository \"%(repo_name)s\" is being created, you will be redirected when this process is finished.repo_name"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:8
 msgid "{} repository settings"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:48
 msgid "Branch Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:54
 msgid "VCS"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:57
 msgid "Extra Fields"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:60
 msgid "Issue Tracker"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:63
 #: rhodecode/templates/admin/users/user_edit.mako:49
 #: rhodecode/templates/admin/users/user_edit_caches.mako:7
 msgid "Caches"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:67
 msgid "Remote sync"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:71
 msgid "Statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:78
 msgid "Reviewer Rules"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:82
 msgid "Automation"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:85
 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:3
 msgid "Maintenance"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:88
 msgid "Strip"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:5
 msgid "Repository ID"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:12
 msgid "Attached scoped tokens"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:13
 msgid "Pull requests source"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:14
 msgid "Pull requests target"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:15
 msgid "Attached Artifacts"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:21
 #, python-format
 msgid "Repository: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:31
 msgid "Fork Reference"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:37
 #, python-format
 msgid "This repository is a fork of %(repo_link)s"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:43
 msgid "Set"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:46
 msgid "Manually set this repository as a fork of another from the list"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:55
 msgid "Public Journal Visibility"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:62
 msgid "Remove from Public Journal"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:66
 msgid "Add to Public Journal"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:71
 msgid "All actions made on this repository will be visible to everyone following the public journal."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:80
 msgid "Locking state"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:89
 msgid "This Repository is not currently locked."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:99
 msgid "Unlock repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:107
 msgid "Lock repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:113
 msgid "Force repository locking. This only works when anonymous access is disabled. Pulling from the repository locks the repository to that user until the same user pushes to that repository again."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:123
 msgid "Hooks"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:127
 msgid "Hook type"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:128
 msgid "Hook version"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:129
 msgid "Current version"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:132
 msgid "PRE HOOK"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:137
 msgid "POST HOOK"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:143
 msgid "Unable to read hook information from VCS Server"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:149
 msgid "Confirm to reinstall hooks for this repository."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:150
 msgid "Update Hooks"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:154
 msgid "Outdated hooks detected, please update hooks using `Update Hooks` action."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:162
 msgid "Archive repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:176
 msgid "Archive this repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:183
 msgid "Archiving the repository will make it entirely read-only. The repository cannot be committed to.It is hidden from the search results and dashboard. "
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:195
 msgid "Delete repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:206
 msgid "Detach forks"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:211
 msgid "Delete forks"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:221
 msgid "Consider to archive this repository instead."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:234
 msgid "Delete this repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:239
 msgid "This repository will be renamed in a special way in order to make it inaccessible to RhodeCode Enterprise and its VCS systems. If you need to fully delete it from the file system, please do it manually, or with rhodecode-cleanup-repos command available in rhodecode-tools."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:273
 msgid "Change repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:273
 msgid "Pick repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_audit.mako:7
 msgid "Repository Audit Logs"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_audit.mako:14
 #: rhodecode/templates/admin/users/user_edit_audit.mako:17
 msgid "audit filter..."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_automation.mako:3
 msgid "Repo Automation"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:3
 msgid "Invalidate Cache for Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:7
 msgid "Manually invalidate the repository cache. On the next access a repository cache will be recreated."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:10
 msgid "Cache purge can be automated by such api call. Can be called periodically in crontab etc."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:23
 msgid "Invalidate repository cache"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:36
 msgid "Invalidation keys"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:44
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:88
 #: rhodecode/templates/admin/users/user_edit_caches.mako:22
 msgid "Show all"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:48
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:92
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:11
 msgid "Key"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:49
 msgid "State UID"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:50
 msgid "Namespace"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:69
 msgid "Cache keys"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:93
 msgid "Region"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:110
 msgid "Shadow Repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:122
 msgid "No Shadow repositories exist for this repository."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:133
 msgid "Diff Caches"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:141
 msgid "Cached diff name"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:149
 msgid "Cached diff files"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:153
 msgid "Cached diff size"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:3
 msgid "Custom extra fields for this repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:10
 msgid "Label"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:24
 #, python-format
 msgid "Confirm to delete this field: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:40
 msgid "New Field Key"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:48
 msgid "New Field Label"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:51
 msgid "Enter short label"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:57
 msgid "New Field Description"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:60
 msgid "Enter a full description for the field"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:73
 msgid "Extra fields are disabled. You can enable them from the Admin/Settings/Visual page."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:9
 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:9
 msgid "Inherit from global settings"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:14
 msgid "Select to inherit global patterns for issue tracker."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:24
 msgid "Inherited Issue Tracker Patterns"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:31
 #: rhodecode/templates/base/issue_tracker_settings.mako:80
 #: rhodecode/templates/base/perms_summary.mako:174
 msgid "Pattern"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:32
 #: rhodecode/templates/base/issue_tracker_settings.mako:81
 msgid "Url"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:33
 msgid "Prefix"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:75
 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:5
 msgid "Issue Tracker / Wiki Patterns"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:95
 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:24
 msgid "Test Patterns"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:8
 msgid "Perform maintenance tasks for this repo"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:10
 msgid "Following tasks will be performed"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:17
 msgid "Maintenance can be automated by such api call. Can be called periodically in crontab etc."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:25
 msgid "No maintenance tasks for this repo available"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:34
 msgid "Run Maintenance"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:49
 msgid "Performing Maintenance"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:5
 msgid "Repository Access Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:55
 msgid "private repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:60
 msgid "only users/user groups explicitly added here will have access"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:62
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:124
 msgid "Private repositories are only visible to people explicitly added as collaborators. Default permissions wont apply"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:63
 msgid "un-set private mode"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:109
 msgid "used by {} branch rule, requires write or higher permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:111
 msgid "used by {} branch rules, requires write or higher permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:125
 msgid "set private mode"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions_branch.mako:3
 msgid "Repository Branch Permissions."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:3
 msgid "Remote Sync"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:7
 msgid "Manually pull/push changes from/to external URLs."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:11
 msgid "Pull url"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:16
 msgid "This repository does not have any pull url set."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:17
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:60
 msgid "Set remote url."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:26
 msgid "Pull can be automated by such api call. Can be called periodically in crontab etc."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:44
 msgid "Pull changes from remote location"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:54
 msgid "Push url"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:59
 msgid "This repository does not have any push url set."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_reviewers.mako:3
 msgid "Default Reviewer Rules"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:6
 #, python-format
 msgid "Settings for Repository: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22
 msgid "permalink id"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22
 msgid "what is that ?"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:24
 msgid "URL by id"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:25
 msgid ""
 "In case this repository is renamed or moved into another group the repository url changes.\n"
 "                               Using above url guarantees that this repository will always be accessible under such url.\n"
 "                               Useful for CI systems, or any other cases that you need to hardcode the url into 3rd party service."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:41
 #, python-format
 msgid "Select my personal group (`%(repo_group_name)s`)"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:44
 msgid "Optional select a group to put this repository into."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:52
 msgid "Remote pull uri"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:60
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:102
 #: rhodecode/templates/base/perms_summary.mako:116
 #: rhodecode/templates/base/perms_summary.mako:233
 #: rhodecode/templates/base/perms_summary.mako:311
 #: rhodecode/templates/base/perms_summary.mako:313
 #: rhodecode/templates/debug_style/form-elements.html:45
 msgid "edit"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:66
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:108
 msgid "enter new value, or leave empty to remove"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:76
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:118
 msgid "cancel"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:87
 msgid "http[s] url where from repository was imported. This field can used for doing {sync_link}."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:88
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:130
 msgid "This field is stored encrypted inside Database, a format of http://user:[e-mail]/repo_name can be used and will be hidden from display."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:94
 msgid "Remote push uri"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:129
 msgid "http[s] url to sync data back. This field can used for doing {sync_link}."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:141
 msgid "Landing commit"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:146
 msgid "The default commit for file pages, downloads, full text search index, and README generation."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:164
 msgid "Change owner of this repository."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:194
 #: rhodecode/templates/data_table/_dt_elements.mako:104
 msgid "Private repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:204
 #: rhodecode/templates/summary/components.mako:262
 msgid "Enable statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:209
 msgid "Enable statistics window on summary page."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:214
 #: rhodecode/templates/summary/components.mako:184
 msgid "Enable downloads"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:219
 msgid "Enable download menu on summary page."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:224
 msgid "Enable automatic locking"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:229
 msgid "Enable automatic locking on repository. Pulling from this repository creates a lock that can be released by pushing back by the same user"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_statistics.mako:3
 msgid "Repository statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_statistics.mako:11
 msgid "Processed commits"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_statistics.mako:12
 msgid "Processed progress"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_statistics.mako:15
 msgid "Reset statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_statistics.mako:15
 msgid "Confirm to remove current statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:3
 msgid "Strip commits from repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:7
 #, python-format
 msgid "Please provide up to %d commits commits to strip"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:9
 msgid "In the first step commits will be verified for existance in the repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:10
 msgid "In the second step, correct commits will be available for stripping"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:16
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:52
 msgid "Enter full 40 character commit sha"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:18
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:54
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:95
 msgid "Add another commit"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:27
 msgid "Check commits"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:33
 msgid "Sorry this functionality is not available for SVN repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:114
 msgid "Checking commits"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:142
 msgid " commit verified positive"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:154
 msgid " commit verified negative"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:179
 msgid " commit striped successfully"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:182
 msgid " commit strip failed"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:13
 msgid "Select to inherit global vcs settings."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:43
 #: rhodecode/templates/admin/settings/settings_global.mako:140
 #: rhodecode/templates/admin/settings/settings_labs.mako:48
 #: rhodecode/templates/admin/settings/settings_vcs.mako:13
 #: rhodecode/templates/admin/settings/settings_visual.mako:214
 msgid "Save settings"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.mako:5
 msgid "Repositories administration"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.mako:110
 msgid "State"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_automation.mako:3
 msgid "Admin Automation"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:3
 msgid "Email Configuration"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:8
 msgid "Email prefix"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:9
 msgid "Email from"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:11
 msgid "SMTP server"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:12
 msgid "SMTP username"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:13
 msgid "SMTP password"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:14
 msgid "SMTP port"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:16
 msgid "SMTP use TLS"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:17
 msgid "SMTP use SSL"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:28
 msgid "You can adjust those settings in [DEFAULT] section of .ini file located at"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:36
 msgid "Test Email"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:42
 msgid "enter valid email"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:46
 msgid "Send an auto-generated email from this server to above email..."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions.mako:3
 msgid "Exceptions Tracker - Exception ID"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions.mako:8
 #: rhodecode/templates/email_templates/exception_tracker.mako:14
 msgid "Exception `{}` generated on UTC date: {}"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions.mako:21
 msgid "Unable to Read Exception. It might be removed or non-existing."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions.mako:30
 msgid "Delete this Exception"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions.mako:40
 msgid "Delete This Exception"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:3
 msgid "Exceptions Tracker "
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:7
 msgid "There is {} stored exception."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:9
 msgid "There are total {} stored exceptions."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:12
 msgid "Store directory"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:23
 msgid "Delete All `{}`"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:25
 msgid "Delete All"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:39
 msgid "Exceptions Tracker - Showing the last {} Exceptions"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:5
 msgid "Branding"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:16
 msgid "Set a custom title for your RhodeCode instance (limited to 40 characters)."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:20
 msgid "HTTP[S] authentication realm"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:27
 msgid "Set a custom text that is shown as authentication message to clients trying to connect."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:36
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:83
 msgid "Personal Repository Group"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:41
 msgid "Create Personal Repository Group"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:44
 msgid "Always create Personal Repository Groups for new users."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:45
 msgid "When creating new users from add user form or API you can still turn this off via a checkbox or flag"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:49
 msgid "Personal Repo Group Pattern"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:55
 msgid "Pattern used to create Personal Repository Groups. Prefix can be other existing repository group path[s], eg. /u/${username}"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:56
 msgid "Available variables are currently ${username} and ${user_id}"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:64
 msgid "Registration Captcha"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:68
 msgid "Google reCaptcha v2 site key."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:75
 msgid "Site key for reCaptcha v2 system."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:80
 msgid "Google reCaptcha v2 secret key."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:87
 msgid "Secret key for reCaptcha v2 system. Setting this value will enable captcha on registration and password reset forms."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:95
 msgid "Custom Header Code"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:100
 #: rhodecode/templates/admin/settings/settings_global.mako:124
 #: rhodecode/templates/debug_style/form-elements-small.html:59
 #: rhodecode/templates/debug_style/form-elements.html:57
 #: rhodecode/templates/debug_style/form-elements.html:82
 #: rhodecode/templates/debug_style/form-elements.html:225
 #: rhodecode/templates/debug_style/form-elements.html:381
 #: rhodecode/templates/debug_style/form-elements.html:407
 #: rhodecode/templates/debug_style/form-elements.html:515
 #: rhodecode/templates/debug_style/form-elements.html:519
 #: rhodecode/templates/debug_style/form-elements.html:537
 #: rhodecode/templates/debug_style/form-elements.html:581
 #: rhodecode/templates/debug_style/form-inline.html:38
 #: rhodecode/templates/debug_style/form-inline.html:139
 #: rhodecode/templates/debug_style/form-inline.html:147
 #: rhodecode/templates/debug_style/form-vertical.html:60
 #: rhodecode/templates/debug_style/forms.html:37
 #: rhodecode/templates/debug_style/forms.html:60
 #: rhodecode/templates/debug_style/forms.html:78
 #: rhodecode/templates/debug_style/forms.html:96
 #: rhodecode/templates/debug_style/layout-form-sidebar.html:44
 msgid "Templates..."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:103
 #: rhodecode/templates/admin/settings/settings_global.mako:127
 #: rhodecode/templates/debug_style/form-elements-small.html:62
 #: rhodecode/templates/debug_style/form-elements.html:60
 #: rhodecode/templates/debug_style/form-elements.html:85
 #: rhodecode/templates/debug_style/form-elements.html:228
 #: rhodecode/templates/debug_style/form-elements.html:384
 #: rhodecode/templates/debug_style/form-elements.html:410
 #: rhodecode/templates/debug_style/form-elements.html:518
 #: rhodecode/templates/debug_style/form-elements.html:522
 #: rhodecode/templates/debug_style/form-elements.html:540
 #: rhodecode/templates/debug_style/form-elements.html:584
 #: rhodecode/templates/debug_style/form-inline.html:41
 #: rhodecode/templates/debug_style/form-inline.html:142
 #: rhodecode/templates/debug_style/form-inline.html:150
 #: rhodecode/templates/debug_style/form-vertical.html:63
 #: rhodecode/templates/debug_style/forms.html:40
 #: rhodecode/templates/debug_style/forms.html:63
 #: rhodecode/templates/debug_style/forms.html:81
 #: rhodecode/templates/debug_style/forms.html:99
 #: rhodecode/templates/debug_style/layout-form-sidebar.html:47
 msgid "Server Announcement"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:104
 msgid "Flash message filtering"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:105
 msgid "Custom logos"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:111
 msgid "Custom js/css code added at the end of the <head/> tag."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:112
 msgid "Use <script/> or <style/> tags to define custom scripting or styling."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:119
 msgid "Custom Footer Code"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:133
 msgid "Custom js/css code added at the end of the <body> tag."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:134
 msgid "Use <script> or <style> tags to define custom scripting or styling."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_hooks.mako:3
 msgid "Built in Mercurial hooks - read only"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_hooks.mako:19
 msgid "Hooks can be used to trigger actions on certain events such as push / pull. They can trigger Python functions or external applications."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_hooks.mako:27
 msgid "Custom hooks"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_labs.mako:3
 msgid "Labs Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_labs.mako:10
 msgid "There are no Labs settings currently"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.mako:5
 msgid "Import New Groups or Repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.mako:10
 msgid "Destroy old data"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.mako:12
 msgid "In case a repository or a group was deleted from the filesystem and it still exists in the database, check this option to remove obsolete data from the database."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.mako:16
 msgid "Invalidate cache for all repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.mako:18
 msgid "Each cache data for repositories will be cleaned with this option selected. Use this to reload data and clear cache keys."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.mako:21
 msgid "Rescan Filesystem"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_open_source.mako:11
 msgid "Licenses of Third Party Packages"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_process_management.mako:3
 #: rhodecode/templates/admin/settings/settings_system.mako:3
 msgid "Checking for updates..."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_process_management.mako:9
 msgid "Gunicorn process management"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_process_management.mako:11
 msgid "start auto refresh"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_process_management.mako:12
 msgid "stop auto refresh"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_search.mako:3
 msgid "RhodeCode Full Text Search"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:3
 msgid "User Sessions Configuration"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:8
 msgid "Session type"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:9
 msgid "Session expiration period"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:11
 msgid "Total sessions"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:12
 msgid "Expired sessions ({} days)"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:28
 msgid "Cleanup Old Sessions"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:34
 msgid "Cleanup user sessions that were not active during chosen time frame."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:35
 msgid "After performing this action users whose session will be removed will be required to log in again."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:36
 msgid "Picking `All` will log-out you, and all users in the system."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:55
 msgid "Confirm to cleanup user sessions"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:56
 msgid "Cleanup sessions"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.mako:9
 msgid "System Info"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.mako:11
 msgid "create summary snapshot"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.mako:46
 msgid "Python Packages"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:5
 #: rhodecode/templates/base/vcs_settings.mako:10
 msgid "General"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:10
 msgid "Use repository extra fields"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:12
 msgid "Allows storing additional customized fields per repository."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:17
 msgid "Show RhodeCode version"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:19
 msgid "Shows or hides a version number of RhodeCode displayed in the footer."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:26
 msgid "Gravatars"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:31
 msgid "Use Gravatars based avatars"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:33
 msgid "Use gravatar.com as avatar system for RhodeCode accounts. If this is disabled avatars are generated based on initials and email."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:36
 msgid "Gravatar URL"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:44
 msgid ""
 "Gravatar url allows you to use other avatar server application.\n"
 "                                            Following variables of the URL will be replaced accordingly.\n"
 "                                            {scheme}    'http' or 'https' sent from running RhodeCode server,\n"
 "                                            {email}     user email,\n"
 "                                            {md5email}  md5 hash of the user email (like at gravatar.com),\n"
 "                                            {size}      size of the image that is expected from the server application,\n"
 "                                            {netloc}    network location/server host of running RhodeCode server"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:59
 msgid "Meta-Tagging"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:64
 msgid "Stylify recognised meta tags"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:66
 msgid "Parses meta tags from repository or repository group description fields and turns them into colored tags."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:77
 msgid "Dashboard Items"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:81
 msgid "Main page dashboard items"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:87
 msgid "Number of items displayed in the main page dashboard before pagination is shown."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:91
 msgid "Admin pages items"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:97
 msgid "Number of items displayed in the admin pages grids before pagination is shown."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:106
 msgid "Commit ID Style"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:110
 msgid "Commit sha length"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:117
 msgid ""
 "Number of chars to show in commit sha displayed in web interface.\n"
 "                                                By default it's shown as r123:9043a6a4c226 this value defines the\n"
 "                                                length of the sha after the `r123:` part."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:125
 msgid "Show commit ID numeric reference"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:125
 msgid "Commit show revision number"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:127
 msgid ""
 "Show revision number in commit sha displayed in web interface.\n"
 "                                        By default it's shown as r123:9043a6a4c226 this value defines the\n"
 "                                        if the `r123:` part is shown."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:136
 #: rhodecode/templates/debug_style/index.html:64
 msgid "Icons"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:141
 msgid "Show public repo icon on repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:147
 msgid "Show private repo icon on repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:149
 msgid "Show public/private icons next to repositories names."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:156
 msgid "Markup Renderer"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:163
 msgid "Default renderer used to render comments, pull request descriptions and other description elements. After change old entries will still work correctly."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:170
 msgid "Clone URL templates"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:181
 msgid ""
 "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
 "                       {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
 "                       {user}   current user username,\n"
 "                       {sys_user} current system user running this process, Useful for ssh,\n"
 "                       {hostname} hostname of this server running RhodeCode,\n"
 "                       {netloc} network location/server host of running RhodeCode server,\n"
 "                       {repo}   full repository name,\n"
 "                       {repoid} ID of repository, can be used to contruct clone-by-id"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:196
 msgid "Custom Support Link"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:204
 #, python-format
 msgid ""
 "Custom url for the support link located at the bottom.\n"
 "                    The default is set to %(default_url)s. In case there's a need\n"
 "                    to change the support link to internal issue tracker, it should be done here.\n"
 "                    "
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:5
 msgid "Add user group"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:13
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:14
 #: rhodecode/templates/base/base.mako:117
 #: rhodecode/templates/base/base.mako:139
 msgid "User groups"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:46
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:50
 msgid "Short, optional description for this user group."
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:59
 msgid "Create User Group"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:5
 msgid "{} user group settings"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:37
 #: rhodecode/templates/admin/users/user_edit.mako:43
 msgid "Global permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:38
 #: rhodecode/templates/admin/users/user_edit.mako:44
 msgid "Permissions summary"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5
 msgid "User Group ID"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:9
 #: rhodecode/templates/admin/user_groups/user_groups.mako:80
 #: rhodecode/templates/debug_style/form-elements.html:509
 #: rhodecode/templates/user_group/profile.mako:55
 msgid "Members"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:10
 msgid "Automatic member sync"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:12
 msgid "Assigned to repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:13
 msgid "Assigned to repo groups"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:15
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:19
 msgid "Assigned to review rules"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:22
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:6
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:7
 #: rhodecode/templates/data_table/_dt_elements.mako:305
 #: rhodecode/templates/user_group/user_group.mako:4
 msgid "User group"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:35
 msgid "Group members sync"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:42
 msgid "This group is set to be automatically synchronised."
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:43
 msgid "This group synchronization was set by"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:47
 msgid "This group is not set to be automatically synchronised"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:56
 msgid "Disable synchronization"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:58
 msgid "Enable synchronization"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:64
 msgid "Users will be added or removed from this group when they authenticate with RhodeCode system, based on LDAP group membership. This requires `LDAP+User group` authentication plugin to be configured and enabled. (EE only feature)"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:77
 msgid "Delete User Group"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:83
 #, python-format
 msgid "Confirm to delete user group `%(ugroup)s` with all permission assignments"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:85
 msgid "Delete This User Group"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:40
 msgid "Change owner of this user group."
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:64
 msgid "Add members"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:100
 #: rhodecode/templates/user_group/profile.mako:78
 msgid "No members yet"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_groups.mako:5
 #: rhodecode/templates/admin/users/user_edit_groups.mako:8
 msgid "User groups administration"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_groups.mako:82
 msgid "Sync"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:5
 msgid "Add user"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:13
 #: rhodecode/templates/admin/users/user_edit.mako:14
 #: rhodecode/templates/base/base.mako:116
 msgid "Users"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:15
 #: rhodecode/templates/admin/users/users.mako:31
 msgid "Add User"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:53
 msgid "Password confirmation"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:59
 msgid "Generate password"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:106
 msgid "Password change"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:110
 msgid "Force user to change his password on the next login"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:116
 msgid "Add personal repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:121
 msgid "New group will be created at: `/{path}`"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:122
 msgid "User will be automatically set as this group owner."
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:128
 msgid "Create User"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:139
 msgid "generated password:"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.mako:5
 msgid "{} user settings"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.mako:31
 msgid "This user is set as non-active and disabled."
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.mako:39
 #: rhodecode/templates/admin/users/user_edit_profile.mako:7
 #: rhodecode/templates/users/user_profile.mako:6
 msgid "User Profile"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.mako:40
 msgid "Auth tokens"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.mako:46
 msgid "Ip Whitelist"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.mako:47
 msgid "User Groups Management"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:5
 msgid "User ID"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:7
 msgid "Source of Record"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:9
 msgid "Last login"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:10
 #: rhodecode/templates/admin/users/users.mako:83
 #: rhodecode/templates/forks/forks.mako:67
 msgid "Last activity"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:16
 msgid "Owned Artifacts"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:18
 msgid "Reviewer of pull requests"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:21
 msgid "Member of User groups"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:22
 msgid "Force password change"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:49
 msgid "Force Password Reset"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:55
 msgid "Disable forced password reset"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:60
 msgid "Clear the forced password change flag."
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:67
 msgid "Confirm to enable forced password change"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:68
 msgid "Enable forced password reset"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:73
 msgid "When this is enabled user will have to change they password when they next use RhodeCode system. This will also forbid vcs operations until someone makes a password change in the web interface"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:89
 msgid "Users personal repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:92
 msgid "This user currently does not have a personal repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:94
 #, python-format
 msgid "New group will be created at: `/%(path)s`"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:99
 msgid "Create personal repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:108
 msgid "Delete User"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:119
 msgid "Detach repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:122
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:134
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:146
 msgid "Delete repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:131
 msgid "Detach repository groups"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:143
 msgid "Detach user groups"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:155
 msgid "Detach pull requests"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:158
 msgid "Delete pull requests"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:167
 msgid "Detach Artifacts"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:170
 msgid "Delete Artifacts"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:180
 msgid "New owner for detached objects"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:188
 msgid "When selecting the detach option, the depending objects owned by this user will be assigned to the above user."
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:190
 msgid "The delete option will delete the user and all his owned objects!"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:205
 msgid "Delete this user"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_audit.mako:9
 msgid "Audit Logs"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_audit.mako:12
 msgid "Download as JSON"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:68
 #, python-format
 msgid "Confirm to remove this auth token: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_caches.mako:36
 msgid "Invalidate user cache"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_caches.mako:36
 msgid "Confirm to invalidate user cache"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_emails.mako:7
 msgid "Additional Email Addresses"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_emails.mako:33
 #, python-format
 msgid "Confirm to delete this email: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_emails.mako:58
 msgid "New email address"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_groups.mako:15
 #, python-format
 msgid "Add `%s` to user group"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ips.mako:7
 msgid "Custom IP Whitelist"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ips.mako:15
 msgid "IP Address"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ips.mako:16
 msgid "IP Range"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ips.mako:25
 #, python-format
 msgid "Inherited from %s"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ips.mako:69
 msgid ""
 "Enter comma separated list of ip addresses like 10.0.0.1,10.0.0.2.\n"
 "Use a ip address with a mask 127.0.0.1/24, to create a network match pattern.\n"
 "To specify multiple entries on an address range use 127.0.0.1-127.0.0.10 syntax"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_profile.mako:31
 msgid "Change the avatar at"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_profile.mako:94
 msgid "New Password"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_profile.mako:102
 msgid "New Password Confirmation"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_profile.mako:118
 #: rhodecode/templates/admin/users/users.mako:87
 #: rhodecode/templates/base/perms_summary.mako:150
 msgid "Super-admin"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_profile.mako:126
 msgid "Authentication type"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_profile.mako:130
 msgid "When user was created using an external source. He is bound to authentication using this method."
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_profile.mako:135
 msgid "Name in Source of Record"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_profile.mako:144
 msgid "Language"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_profile.mako:150
 #, python-format
 msgid "User interface language. Help translate %(rc_link)s into your language."
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:34
 #, python-format
 msgid "Confirm to remove ssh key %s"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:75
 msgid "Click add to use this generate SSH key"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:7
 msgid "New SSH Key generation"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:13
 msgid "Below is a 2048 bit generated SSH RSA key."
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:13
 msgid "If you use older systems please try to generate a"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:13
 msgid "legacy format"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:14
 msgid "If You wish to use it to access RhodeCode via the SSH please save the private key and click `Use this generated key` at the bottom."
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:16
 msgid "Private key"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:32
 msgid "Public key"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:43
 #: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:45
 msgid "Use this generated key"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:47
 msgid "Confirmation required on the next screen"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:51
 msgid "SSH key generator has been disabled."
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.mako:5
 msgid "Users administration"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.mako:89
 msgid "Auth type"
 msgstr ""
 
 #: rhodecode/templates/artifacts/artifact_list.mako:5
 msgid "{} Artifacts"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:73
 msgid "RhodeCode instance id: {}"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:101
 msgid "Super-admin Panel"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:103
 msgid "Delegated Admin Panel"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:119
 msgid "Authentication"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:121
 msgid "Defaults"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:161
 #: rhodecode/templates/base/base.mako:201
 #: rhodecode/templates/changeset/changeset.mako:140
 #: rhodecode/templates/files/files_source_header.mako:57
 #: rhodecode/templates/files/files_tree_header.mako:44
 #: rhodecode/templates/summary/components.mako:274
 msgid "Show More"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:304
 #: rhodecode/templates/base/base.mako:315
 msgid "RSS Feed"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:306
 msgid "Watch this Repository and actions on it in your personalized journal"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:324
 msgid "Fork of"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:341
 #, python-format
 msgid "Repository locked by %(user)s"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:346
 msgid "Repository not locked. Pull repository to lock it."
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:362
 msgid "This repository has been archived. It is now read-only."
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:375
 #: rhodecode/templates/data_table/_dt_elements.mako:58
 #: rhodecode/templates/data_table/_dt_elements.mako:59
 #: rhodecode/templates/data_table/_dt_elements.mako:207
 msgid "Summary"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:376
 #: rhodecode/templates/data_table/_dt_elements.mako:63
 #: rhodecode/templates/data_table/_dt_elements.mako:64
 #: rhodecode/templates/files/file_authors_box.mako:30
 #: rhodecode/templates/search/search.mako:99
 #: rhodecode/templates/summary/components.mako:119
 #: rhodecode/templates/summary/components.mako:127
 msgid "Commits"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:377
 #: rhodecode/templates/data_table/_dt_elements.mako:68
 #: rhodecode/templates/data_table/_dt_elements.mako:69
 #: rhodecode/templates/files/files.mako:15
 #: rhodecode/templates/search/search.mako:99
 msgid "Files"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:378
 #: rhodecode/templates/bookmarks/bookmarks.mako:78
 #: rhodecode/templates/branches/branches.mako:77
 #: rhodecode/templates/tags/tags.mako:78
 msgid "Compare"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:383
 #, python-format
 msgid "Show Pull Requests for %s"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:394
 msgid "Artifacts"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:400
 msgid "Repository Settings"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:406
 msgid "Options"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:411
 msgid "Unlock Repository"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:413
 msgid "Lock Repository"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:466
 msgid "Group Home"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:470
 msgid "You have admin right to this group, and can edit it"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:470
 msgid "Group Settings"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:521
 msgid "This Repository"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:523
 msgid "Create Pull Request"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:527
 msgid "Fork this repository"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:534
 msgid "This Repository Group"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:538
 #: rhodecode/templates/base/base.mako:554
 #: rhodecode/templates/base/base.mako:566
 msgid "New Repository"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:544
 #: rhodecode/templates/base/base.mako:558
 #: rhodecode/templates/base/base.mako:572
 msgid "New Repository Group"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:599
 msgid "Sign in"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:624
 msgid "My personal group"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:630
 #: rhodecode/templates/debug_style/alerts.html:5
 #: rhodecode/templates/debug_style/buttons.html:5
 #: rhodecode/templates/debug_style/code-block.html:6
 #: rhodecode/templates/debug_style/collapsable-content.html:5
 #: rhodecode/templates/debug_style/emails.html:5
 #: rhodecode/templates/debug_style/form-elements-small.html:5
 #: rhodecode/templates/debug_style/form-elements.html:5
 #: rhodecode/templates/debug_style/form-inline.html:5
 #: rhodecode/templates/debug_style/form-vertical.html:5
 #: rhodecode/templates/debug_style/forms.html:5
 #: rhodecode/templates/debug_style/icons.html:5
 #: rhodecode/templates/debug_style/index.html:12
 #: rhodecode/templates/debug_style/labels.html:5
 #: rhodecode/templates/debug_style/layout-form-sidebar.html:5
 #: rhodecode/templates/debug_style/login.html:6
 #: rhodecode/templates/debug_style/panels.html:5
 #: rhodecode/templates/debug_style/tables-wide.html:5
 #: rhodecode/templates/debug_style/tables.html:5
 #: rhodecode/templates/debug_style/typography.html:5
 msgid "Style"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:631
 msgid "[Style]"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:648
 msgid "No Bookmarks yet."
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:686
 msgid "Sign Out"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:731
+#: rhodecode/templates/changeset/changeset_file_comment.mako:538
 msgid "dismiss"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:772
 msgid "search / go to..."
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:817
 msgid "Show activity journal"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:818
 #: rhodecode/templates/journal/journal.mako:4
 #: rhodecode/templates/journal/journal.mako:14
 msgid "Journal"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:823
 msgid "Show Public activity journal"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:824
 msgid "Public journal"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:830
 msgid "Show Gists"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:831
 msgid "Gists"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:837
 msgid "Admin settings"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:1154
 msgid "Keyboard shortcuts"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:1162
 msgid "Site-wide shortcuts"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:19
 msgid "Inherited Permissions"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:25
 msgid "Custom Permissions"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:29
 msgid "Default Global Permissions"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:36
 msgid "The following options configure the default permissions each user or group will inherit. You can override these permissions for each individual user or user group using individual permissions settings."
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:40
 msgid "Repository Creation"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:45
 msgid "Permission to create root level repositories. When disabled, users can still create repositories inside their own repository groups."
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:50
 msgid "Repository Creation With Group Write Access"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:55
 msgid "Write permission given on a repository group will allow creating repositories inside that group."
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:60
 msgid "Repository Forking"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:65
 msgid "Permission to create root level repository forks. When disabled, users can still fork repositories inside their own repository groups."
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:70
 msgid "Repository Group Creation"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:75
 msgid "Permission to create root level repository groups. When disabled, repository group admins can still create repository subgroups within their repository groups."
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:80
 msgid "User Group Creation"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:85
 msgid "Permission to allow user group creation."
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:91
 msgid "Inherit Permissions From The Default User"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:96
 msgid "Inherit default permissions from the default user. Turn off this option to force explicit permissions for users, even if they are more restrictive than the default user permissions."
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:115
 msgid "Inherit from default settings"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.mako:120
 #, python-format
 msgid ""
 "Select to inherit permissions from %s permissions settings, including default IP address whitelist and inheritance of \n"
 "permission by members of user groups."
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.mako:82
 msgid "Extra Prefix"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.mako:93
 msgid "show examples"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.mako:161
 msgid "Add new"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.mako:169
 msgid "New Entry"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.mako:173
 msgid "Confirm to remove this pattern:"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.mako:300
 #: rhodecode/templates/changeset/changeset_file_comment.mako:395
 #: rhodecode/templates/changeset/changeset_file_comment.mako:446
 #: rhodecode/templates/data_table/_dt_elements.mako:456
 #: rhodecode/templates/files/files_add.mako:59
 #: rhodecode/templates/files/files_edit.mako:61
 msgid "Preview"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.mako:301
 msgid "Test Pattern Preview"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:31
 msgid "in JSON format"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:40
 #: rhodecode/templates/base/perms_summary.mako:48
 msgid "show"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:41
 #: rhodecode/templates/base/perms_summary.mako:49
 msgid "none"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:42
 #: rhodecode/templates/commits/changelog_elements.mako:102
 #: rhodecode/templates/files/base.mako:26
 msgid "merge"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:43
 msgid "push"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:44
 msgid "push force"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:50
 msgid "read"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:51
 msgid "write"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:52
 msgid "admin"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:60
 msgid "No permissions defined"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:68
 #: rhodecode/templates/base/perms_summary.mako:175
 #: rhodecode/templates/base/perms_summary.mako:248
 msgid "Permission"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:70
 #: rhodecode/templates/base/perms_summary.mako:250
 msgid "Edit Permission"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:124
 #: rhodecode/templates/base/perms_summary.mako:133
 msgid "edit global"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:141
 msgid "Repository default permission"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:144
 msgid "Repository group default permission"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:147
 msgid "User group default permission"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:153
 msgid "Inherit permissions"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:156
 msgid "Create repositories"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:159
 msgid "Fork repositories"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:162
 msgid "Create repository groups"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:165
 msgid "Create user groups"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:177
 msgid "Edit Branch Permission"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:291
 msgid "overridden by"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.mako:326
 msgid "No matching permission defined"
 msgstr ""
 
 #: rhodecode/templates/base/root.mako:156
 msgid "Please enable JavaScript to use RhodeCode Enterprise"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:16
 msgid "Require SSL for vcs operations"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:19
 msgid "Activate to set RhodeCode to require SSL for pushing or pulling. If SSL certificate is missing it will return a HTTP Error 406: Not Acceptable."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:29
 msgid "Main Storage Location"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:37
 msgid "Click to unlock. You must restart RhodeCode in order to make this setting take effect."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:41
 msgid "Repository location change is disabled. You can enable this by changing the `allow_repo_location_change` inside .ini file."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:48
 msgid "Filesystem location where repositories should be stored. After changing this value a restart and rescan of the repository folder are required."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:57
 msgid "Internal Hooks"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:63
 msgid "Show repository size after push"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:67
 msgid "Trigger a hook that calculates repository size after each push."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:71
 msgid "Execute pre/post push hooks"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:74
 msgid "Execute Built in pre/post push hooks. This also executes rcextensions hooks."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:78
 msgid "Execute pre/post pull hooks"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:81
 msgid "Execute Built in pre/post pull hooks. This also executes rcextensions hooks."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:91
 msgid "Mercurial Settings"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:96
 msgid "Enable largefiles extension"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:100
 msgid "Enable Largefiles extensions for all repositories."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:102
 msgid "Enable Largefiles extensions for this repository."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:113
 msgid "Filesystem location where Mercurial largefile objects should be stored."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:119
 msgid "Set repositories as publishing"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:119
 msgid "Set repository as publishing"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:122
 msgid "When this is enabled all commits in the repository are seen as public commits by clients."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:127
 msgid "Enable hgsubversion extension"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:130
 msgid "Requires hgsubversion library to be installed. Allows cloning remote SVN repositories and migrates them to Mercurial type."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:136
 msgid "Enable Evolve and Topic extension"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:140
 msgid "Enable Evolve and Topic extensions for all repositories."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:142
 msgid "Enable Evolve and Topic extensions for this repository."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:153
 msgid "Git Settings"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:158
 msgid "Enable lfs extension"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:162
 msgid "Enable lfs extensions for all repositories."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:164
 msgid "Enable lfs extensions for this repository."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:175
 msgid "Filesystem location where Git lfs objects should be stored."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:186
 msgid "Global Subversion Settings"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:192
 msgid "Proxy subversion HTTP requests"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:196
 msgid "Subversion HTTP Support. Enables communication with SVN over HTTP protocol."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:197
 msgid "SVN Protocol setup Documentation"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:203
 msgid "Subversion HTTP Server URL"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:209
 msgid "Generate Apache Config"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:221
 msgid "Subversion Settings"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:226
 msgid "Repository patterns"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:230
 msgid "Patterns for identifying SVN branches and tags. For recursive search, use \"*\". Eg.: \"/branches/*\""
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:294
 msgid "Pull Request Settings"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:299
 msgid "Enable server-side merge for pull requests"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:302
 msgid "Note: when this feature is enabled, it only runs hooks defined in the rcextension package. Custom hooks added on the Admin -> Settings -> Hooks page will not be run when pull requests are automatically merged from the web interface."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:306
 msgid "Invalidate and relocate inline comments during update"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:309
 msgid "During the update of a pull request, the position of inline comments will be updated and outdated inline comments will be hidden."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:318
 msgid "Diff cache"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:323
 msgid "Enable caching diffs for pull requests cache and commits"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:332
 msgid "Mercurial Pull Request Settings"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:338
 msgid "Use rebase as merge strategy"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:341
 msgid "Use rebase instead of creating a merge commit when merging via web interface."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:346
 msgid "Close branch before merging it"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:349
 msgid "Close branch before merging it into destination branch. No effect when rebase strategy is use."
 msgstr ""
 
 #: rhodecode/templates/bookmarks/bookmarks.mako:5
 #, python-format
 msgid "%s Bookmarks"
 msgstr ""
 
 #: rhodecode/templates/bookmarks/bookmarks.mako:28
 msgid "Compare Selected Bookmarks"
 msgstr ""
 
 #: rhodecode/templates/branches/branches.mako:5
 #, python-format
 msgid "%s Branches"
 msgstr ""
 
 #: rhodecode/templates/branches/branches.mako:28
 msgid "Compare Selected Branches"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:11
 msgid "{} Commit"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:78
 #: rhodecode/templates/commits/changelog_elements.mako:56
 #: rhodecode/templates/files/files_source_header.mako:48
 #: rhodecode/templates/files/files_tree_header.mako:35
 #: rhodecode/templates/summary/summary_commits.mako:43
 msgid "Copy the full commit id"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:83
 msgid "Commit phase"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:90
 #: rhodecode/templates/changeset/changeset.mako:97
 msgid "Evolve State"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:91
 msgid "obsolete"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:98
 msgid "hidden"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:104
 msgid "Parent Commit"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:104
 msgid "parent"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:108
 msgid "Child Commit"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:108
 msgid "child"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:118
 msgid "Diff options"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:122
 msgid "Raw Diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:126
 msgid "Patch Diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:130
 msgid "Download Diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:160
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:502
 msgid "General Comments"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:201
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:619
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:605
 msgid "Reviewers"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:242
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:579
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:752
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:748
 msgid "No TODOs yet"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:274
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:803
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:799
 msgid "No Comments yet"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:330
 msgid "No Child Commits"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:377
 msgid "No Parent Commits"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:51
 msgid "Draft comments are only visible to the author until submitted"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:55
 msgid "This comment was added while you browsed this page"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:65
 msgid "Resolved by comment #{}"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:73
 msgid "Click to create resolution comment."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:82
 msgid "This comment resolves TODO #{}"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:114
 msgid "Status from pull request."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:133
 msgid "Pull request author"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:134
 msgid "author"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:187
 #: rhodecode/templates/changeset/changeset_file_comment.mako:201
 msgid "Outdated comment from pull request version v{0}, latest v{1}"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:190
 #: rhodecode/templates/changeset/changeset_file_comment.mako:206
 msgid "Comment from pull request version v{0}, latest v{1}"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:222
 #: rhodecode/templates/compare/compare_diff.mako:108
 #: rhodecode/templates/compare/compare_diff.mako:116
 #: rhodecode/templates/compare/compare_diff.mako:124
 #: rhodecode/templates/compare/compare_diff.mako:126
 msgid "Comment"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:223
 #: rhodecode/templates/files/files_source.mako:117
 msgid "Copy permalink"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:241
 msgid "Submit draft"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:247
 #: rhodecode/templates/changeset/changeset_file_comment.mako:250
 #: rhodecode/templates/changeset/changeset_file_comment.mako:256
 #: rhodecode/templates/changeset/changeset_file_comment.mako:259
 msgid "Action unavailable"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:267
 msgid "Jump to the previous outdated comment"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:268
 msgid "Jump to the next outdated comment"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:270
 msgid "Jump to the previous comment"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:271
 msgid "Jump to the next comment"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:311
 msgid "Leave a comment on this Pull Request."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:313
 msgid "Leave a comment on {} commits in this range."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:315
 msgid "Leave a comment on this Commit."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:403
 msgid "You need to be logged in to leave comments."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:404
 msgid "Login now"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:451
 msgid "Mark as"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:474
 #: rhodecode/templates/files/files_upload.mako:86
 msgid "Drag'n Drop files here or"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:474
 #: rhodecode/templates/files/files_upload.mako:86
 msgid "Choose your files"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:477
 msgid "uploading..."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:508
 msgid "Add comment"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:513
 #: rhodecode/templates/changeset/changeset_file_comment.mako:515
 msgid "Add draft"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:526
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:46
 #: rhodecode/templates/pullrequests/pullrequests.mako:31
 msgid "Closed"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:545
 msgid "{} is supported."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.mako:5
 #, python-format
 msgid "%s Commits"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.mako:33
 msgid "Commit Range"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.mako:42
 msgid "Range"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.mako:60
 msgid "Diff Option"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.mako:71
 #: rhodecode/templates/commits/changelog.mako:124
 msgid "Show combined diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.mako:7
 msgid "The requested commit is too big and content was truncated."
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.mako:7
 #: rhodecode/templates/changeset/diff_block.mako:10
 #: rhodecode/templates/changeset/diff_block.mako:25
 #: rhodecode/templates/changeset/diff_block.mako:46
 #: rhodecode/templates/codeblocks/diffs.mako:196
 #: rhodecode/templates/codeblocks/diffs.mako:327
 msgid "Showing a big diff might take some time and resources, continue?"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.mako:7
 #: rhodecode/templates/changeset/diff_block.mako:10
 #: rhodecode/templates/changeset/diff_block.mako:25
 #: rhodecode/templates/changeset/diff_block.mako:46
 #: rhodecode/templates/codeblocks/diffs.mako:196
 #: rhodecode/templates/codeblocks/diffs.mako:327
 msgid "Show full diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.mako:10
 msgid "The requested file is too big and its content is not shown."
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.mako:25
 #: rhodecode/templates/changeset/diff_block.mako:46
 msgid "Diff was truncated. File content available only in full diff."
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:129
 msgid "not available in this view"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:138
 msgid "{} unresolved"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:141
 msgid "0 unresolved"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:144
 msgid "{} Resolved"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:195
 msgid "The requested changes are too big and content was truncated."
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:212
 msgid "Some changes may be hidden"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:214
 msgid "No files"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:327
 msgid "The requested commit or file is too big and content was truncated."
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:334
 #, python-format
 msgid "This diff has been collapsed as it changes many lines, (%i lines changed)"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:336
 msgid "Show them"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:339
 msgid "Hide them"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:376
 #: rhodecode/templates/codeblocks/diffs.mako:395
 msgid "Unmatched/outdated inline comments below"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:401
 msgid "Unmatched/outdated comments below"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:475
 msgid "This file was removed from diff during updates to this pull-request."
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:476
 msgid "There are still outdated/unresolved comments attached to it."
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:582
 #: rhodecode/templates/codeblocks/diffs.mako:600
 #, python-format
 msgid "Show file at commit: %(commit_id)s"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:584
 #: rhodecode/templates/codeblocks/diffs.mako:591
 msgid "Show file before"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:589
 #: rhodecode/templates/codeblocks/diffs.mako:607
 #, python-format
 msgid "File not present at commit: %(commit_id)s"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:602
 #: rhodecode/templates/codeblocks/diffs.mako:609
 msgid "Show file after"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:616
 #: rhodecode/templates/codeblocks/diffs.mako:618
 msgid "Hide comments"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:617
 msgid "Show comments"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:726
-#: rhodecode/templates/codeblocks/diffs.mako:773
-#: rhodecode/templates/codeblocks/diffs.mako:840
+#: rhodecode/templates/codeblocks/diffs.mako:732
+#: rhodecode/templates/codeblocks/diffs.mako:779
+#: rhodecode/templates/codeblocks/diffs.mako:846
 msgid "Comments including outdated: {}. Click here to toggle them."
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:728
-#: rhodecode/templates/codeblocks/diffs.mako:775
-#: rhodecode/templates/codeblocks/diffs.mako:842
+#: rhodecode/templates/codeblocks/diffs.mako:734
+#: rhodecode/templates/codeblocks/diffs.mako:781
+#: rhodecode/templates/codeblocks/diffs.mako:848
 msgid "Comments: {}. Click to toggle them."
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:914
-msgid "Toggle wide diff"
-msgstr ""
-
-#: rhodecode/templates/codeblocks/diffs.mako:922
-msgid "View diff as side by side"
+#: rhodecode/templates/codeblocks/diffs.mako:921
+msgid "Scroll to page bottom"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:924
-msgid "Side by Side"
-msgstr ""
-
-#: rhodecode/templates/codeblocks/diffs.mako:929
-msgid "View diff as unified"
+msgid "Scroll to page top"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:930
-msgid "Unified"
-msgstr ""
-
-#: rhodecode/templates/codeblocks/diffs.mako:935
-msgid "Turn off: Show the diff as commit range"
+msgid "Toggle wide diff"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:938
+msgid "View diff as side by side"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:940
+msgid "Side by Side"
+msgstr ""
+
 #: rhodecode/templates/codeblocks/diffs.mako:945
+msgid "View diff as unified"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:946
+msgid "Unified"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:951
+msgid "Turn off: Show the diff as commit range"
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:954
+#: rhodecode/templates/codeblocks/diffs.mako:961
 msgid "Range Diff"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:942
+#: rhodecode/templates/codeblocks/diffs.mako:958
 msgid "Show the diff as commit range"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:1007
+#: rhodecode/templates/codeblocks/diffs.mako:1050
 msgid "Disabled on range diff"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:1314
-msgid "..."
-msgstr ""
-
 #: rhodecode/templates/codeblocks/source.mako:22
 msgid "view annotation from before this change"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:6
 #, python-format
 msgid "%s Changelog"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:38
 msgid "Clear filter"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:45
 msgid "Hide obsolete/hidden"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:47
 msgid "Show obsolete/hidden"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:50
 msgid "Show hidden"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:59
 #: rhodecode/templates/compare/compare_diff.mako:93
 #, python-format
 msgid "Compare fork with %s"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:69
 #, python-format
 msgid "Compare fork with Parent (%s)"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:107
 msgid "Clear selection"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:110
 msgid "Select second commit"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:135
 msgid "Commit Message"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:137
 #: rhodecode/templates/summary/summary_commits.mako:10
 msgid "Age"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:140
 #: rhodecode/templates/summary/summary_commits.mako:12
 msgid "Refs"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:289
 msgid "Branch filter"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:350
 msgid "There are no changes yet"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:8
 msgid "load previous"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:35
 #: rhodecode/templates/summary/summary_commits.mako:27
 #, python-format
 msgid ""
 "Commit status: %s\n"
 "Click to open associated pull request #%s"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:39
 #: rhodecode/templates/summary/summary_commits.mako:31
 msgid "Commit status: {}"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:45
 #: rhodecode/templates/summary/summary_commits.mako:37
 msgid "Commit status: Not Reviewed"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:63
 msgid "{} commit phase"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:69
 msgid "Obsolete Evolve State"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:74
 msgid "Hidden Evolve State"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:80
-#: rhodecode/templates/compare/compare_commits.mako:47
+#: rhodecode/templates/compare/compare_commits.mako:55
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:433
 #: rhodecode/templates/search/search_commit.mako:34
 msgid "Expand commit message"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:108
 #: rhodecode/templates/files/base.mako:51
 #: rhodecode/templates/summary/summary_commits.mako:78
 #, python-format
 msgid "Branch %s"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:116
 #: rhodecode/templates/files/base.mako:32
 #: rhodecode/templates/summary/summary_commits.mako:64
 #, python-format
 msgid "Bookmark %s"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:124
 #: rhodecode/templates/files/base.mako:42
 #: rhodecode/templates/summary/summary_commits.mako:71
 #, python-format
 msgid "Tag %s"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:135
 #: rhodecode/templates/summary/summary_commits.mako:87
 msgid "Commit has comments"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:150
 msgid "load next"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_file_history.mako:33
 msgid "Show File"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_file_history.mako:38
 msgid "Diff File"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_file_history.mako:46
 msgid "Show Full History"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_commits.mako:5
 msgid "Compare was calculated based on this common ancestor commit"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_commits.mako:15
+#: rhodecode/templates/compare/compare_commits.mako:18
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:394
 msgid "Time"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_commits.mako:65
+#: rhodecode/templates/compare/compare_commits.mako:37
+msgid "Pull request version this commit was introduced"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_commits.mako:73
 msgid "No commits in this compare"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:7
 #: rhodecode/templates/compare/compare_diff.mako:9
 #, python-format
 msgid "%s Compare"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:38
 #: rhodecode/templates/compare/compare_diff.mako:90
 #: rhodecode/templates/compare/compare_diff.mako:114
 #: rhodecode/templates/compare/compare_diff.mako:119
 msgid "Compare Commits"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:40
 msgid "for file"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:56
 msgid "Target"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:70
 #: rhodecode/templates/files/files_source.mako:110
 msgid "Source"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:102
 msgid "Compare with origin"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:107
 #: rhodecode/templates/compare/compare_diff.mako:108
 #: rhodecode/templates/compare/compare_diff.mako:114
 #: rhodecode/templates/compare/compare_diff.mako:115
 #: rhodecode/templates/compare/compare_diff.mako:116
 #: rhodecode/templates/compare/compare_diff.mako:126
 msgid "Action unavailable in current view"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:107
 #: rhodecode/templates/compare/compare_diff.mako:115
 #: rhodecode/templates/compare/compare_diff.mako:120
 msgid "Swap"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:110
 msgid "Compare commits, branches, bookmarks or tags."
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:139
 #: rhodecode/templates/email_templates/commit_comment.mako:57
 msgid "Commit status"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:73
 #: rhodecode/templates/data_table/_dt_elements.mako:74
 msgid "Fork"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:95
 msgid "Mercurial repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:97
 msgid "Git repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:99
 msgid "Subversion repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:106
 msgid "Public repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:116
 msgid "This repository is being created in a background task"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:117
 msgid "creating..."
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:149
 msgid "No commits yet"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:156
 #: rhodecode/templates/data_table/_dt_elements.mako:158
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:164
 #: rhodecode/templates/data_table/_dt_elements.mako:166
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:191
 msgid "Creating"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:193
 #: rhodecode/templates/hovercards/hovercard_pull_request.mako:10
 msgid "Created"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:236
 msgid "personal"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:387
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:57
 msgid "Pull request !{}"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:396
 msgid "Work in progress"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:432
 msgid "Info"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:473
 #, python-format
 msgid "Parsed using %s syntax"
 msgstr ""
 
 #: rhodecode/templates/debug_style/buttons.html:131
 msgid "Confirm to remove this field: Field"
 msgstr ""
 
 #: rhodecode/templates/debug_style/form-elements.html:107
 msgid "Default"
 msgstr ""
 
 #: rhodecode/templates/debug_style/form-elements.html:513
 #: rhodecode/templates/debug_style/form-elements.html:565
 #: rhodecode/templates/debug_style/forms.html:236
 msgid "Chosen group members"
 msgstr ""
 
 #: rhodecode/templates/debug_style/form-elements.html:525
 #: rhodecode/templates/debug_style/form-elements.html:569
 #: rhodecode/templates/debug_style/forms.html:240
 msgid "Remove all elements"
 msgstr ""
 
 #: rhodecode/templates/debug_style/form-elements.html:535
 #: rhodecode/templates/debug_style/form-elements.html:579
 #: rhodecode/templates/debug_style/forms.html:250
 msgid "Available members"
 msgstr ""
 
 #: rhodecode/templates/debug_style/form-elements.html:543
 #: rhodecode/templates/debug_style/form-elements.html:587
 #: rhodecode/templates/debug_style/forms.html:258
 msgid "Add all elements"
 msgstr ""
 
 #: rhodecode/templates/debug_style/forms.html:119
 msgid "Some text..."
 msgstr ""
 
 #: rhodecode/templates/debug_style/forms.html:122
 #: rhodecode/templates/debug_style/forms.html:255
 msgid "Variable Item"
 msgstr ""
 
 #: rhodecode/templates/debug_style/forms.html:252
 msgid "Some example text..."
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:5
 msgid "Debug Style"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:54
 msgid "Index"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:56
 msgid "Typography"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:57
 msgid "Forms"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:58
 msgid "Buttons"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:59
 msgid "Labels"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:60
 msgid "Alerts"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:61
 msgid "Tables"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:62
 msgid "Tables wide"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:63
 msgid "Collapsable Content"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:65
 msgid "Layout form with sidebar"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:66
 msgid "Login"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:67
 msgid "Login 2"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:68
 msgid "Code blocks"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:71
 msgid "Panels"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:74
 msgid "Form elements"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:75
 msgid "Form elements small"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:76
 msgid "Form inline elements"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:77
 msgid "Form vertical"
 msgstr ""
 
 #: rhodecode/templates/debug_style/login.html:28
 msgid "Sign in to your account"
 msgstr ""
 
 #: rhodecode/templates/debug_style/login.html:46
 msgid "(Forgot password?)"
 msgstr ""
 
 #: rhodecode/templates/debug_style/login.html:56
 msgid "Don't have an account ?"
 msgstr ""
 
 #: rhodecode/templates/email_templates/base.mako:72
 #: rhodecode/templates/email_templates/base.mako:639
 msgid "This is a notification from RhodeCode."
 msgstr ""
 
 #: rhodecode/templates/email_templates/base.mako:619
 msgid "RhodeCode"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:24
 msgid "{mention_prefix}{user} left a {comment_type} on file `{comment_file}` in commit `{commit_id}` in the `{repo_name}` repository"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:28
 msgid "{mention_prefix}[status: {status}] {user} left a {comment_type} on commit `{commit_id}` in the `{repo_name}` repository"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:31
 msgid "{mention_prefix}{user} left a {comment_type} on commit `{commit_id}` in the `{repo_name}` repository"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:54
 #: rhodecode/templates/email_templates/pull_request_comment.mako:63
 msgid "Comment link"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:57
 #: rhodecode/templates/email_templates/commit_comment.mako:135
 msgid "Status was changed to"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:62
 #: rhodecode/templates/email_templates/commit_comment.mako:147
 #: rhodecode/templates/search/search_commit.mako:12
 #: rhodecode/templates/summary/summary_commits.mako:9
 msgid "Commit message"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:65
 #: rhodecode/templates/email_templates/pull_request_comment.mako:77
 msgid "File: {comment_file} on line {comment_line}"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:69
 #: rhodecode/templates/email_templates/commit_comment.mako:161
 #: rhodecode/templates/email_templates/pull_request_comment.mako:81
 #: rhodecode/templates/email_templates/pull_request_comment.mako:191
 msgid "`TODO` number"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:71
 #: rhodecode/templates/email_templates/commit_comment.mako:163
 #: rhodecode/templates/email_templates/pull_request_comment.mako:83
 #: rhodecode/templates/email_templates/pull_request_comment.mako:193
 msgid "`Note` number"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:104
 #: rhodecode/templates/email_templates/pull_request_comment.mako:124
 msgid "left a"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:107
 msgid "{comment_type} on file `{comment_file}` in commit."
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:109
 msgid "{comment_type} on commit."
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:114
 msgid "of repository"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:133
 msgid "Commit Status"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:153
 #: rhodecode/templates/email_templates/pull_request_comment.mako:183
 #: rhodecode/templates/search/search_path.mako:9
 msgid "File"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:154
 #: rhodecode/templates/email_templates/pull_request_comment.mako:184
 msgid "`{comment_file}` on line {comment_line}"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:173
 #: rhodecode/templates/email_templates/pull_request_comment.mako:203
 msgid "Reply"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:24
 msgid "{mention_prefix}{user} left a {comment_type} on file `{comment_file}` in pull request !{pr_id}: \"{pr_title}\""
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:28
 msgid "{mention_prefix}[status: {status}] {user} left a {comment_type} on pull request !{pr_id}: \"{pr_title}\""
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:31
 msgid "{mention_prefix}{user} left a {comment_type} on pull request !{pr_id}: \"{pr_title}\""
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:65
 #: rhodecode/templates/hovercards/hovercard_pull_request.mako:24
 msgid "Pull Request"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:67
 #: rhodecode/templates/email_templates/pull_request_review.mako:45
 #: rhodecode/templates/email_templates/pull_request_update.mako:41
 msgid "Commit flow: {source_ref_type}:{source_ref_name} of {source_repo_url} into {target_ref_type}:{target_ref_name} of {target_repo_url}"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:70
 msgid "{user} submitted pull request !{pr_id} status: *{status}*"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:73
 msgid "{user} submitted pull request !{pr_id} status: *{status} and closed*"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:127
 msgid "{comment_type} on file `{comment_file}` in pull request."
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:129
 msgid "{comment_type} on pull request."
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:134
 #: rhodecode/templates/email_templates/pull_request_comment.mako:164
 #: rhodecode/templates/email_templates/pull_request_review.mako:100
 #: rhodecode/templates/email_templates/pull_request_review.mako:116
 #: rhodecode/templates/email_templates/pull_request_update.mako:104
 #: rhodecode/templates/email_templates/pull_request_update.mako:121
 msgid "Pull request"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:153
 msgid "Review Status"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:156
 msgid "Closed pull request with status"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:158
 msgid "Submitted review status"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:173
 #: rhodecode/templates/email_templates/pull_request_review.mako:125
 #: rhodecode/templates/email_templates/pull_request_update.mako:130
 msgid "Commit Flow"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:175
 #: rhodecode/templates/email_templates/pull_request_comment.mako:177
 #: rhodecode/templates/email_templates/pull_request_review.mako:127
 #: rhodecode/templates/email_templates/pull_request_review.mako:129
 #: rhodecode/templates/email_templates/pull_request_update.mako:132
 #: rhodecode/templates/email_templates/pull_request_update.mako:134
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:112
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:121
 msgid "of"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:15
 msgid "{user} added you as observer to pull request. !{pr_id}: \"{pr_title}\""
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:17
 msgid "{user} requested a pull request review. !{pr_id}: \"{pr_title}\""
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:43
 #: rhodecode/templates/email_templates/pull_request_update.mako:39
 msgid "Pull Request link"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:89
 msgid "added you as observer to"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:95
 msgid "requested a"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_update.mako:14
 msgid "{updating_user} updated pull request. !{pr_id}: \"{pr_title}\""
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_update.mako:98
 msgid "updated"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_update.mako:100
 msgid "pull request."
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_update.mako:143
 msgid "Changes"
 msgstr ""
 
 #: rhodecode/templates/email_templates/test.mako:5
 msgid "hello \"world\""
 msgstr ""
 
 #: rhodecode/templates/email_templates/test.mako:18
 msgid "Translation String"
 msgstr ""
 
 #: rhodecode/templates/email_templates/user_registration.mako:28
 msgid "New user {user} has registered on {date}"
 msgstr ""
 
 #: rhodecode/templates/email_templates/user_registration.mako:47
 msgid "Full Name"
 msgstr ""
 
 #: rhodecode/templates/errors/error_document.mako:48
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr ""
 
 #: rhodecode/templates/errors/error_document.mako:66
 msgid "Support Page"
 msgstr ""
 
 #: rhodecode/templates/feed/atom_feed_entry.mako:3
 #, python-format
 msgid "%(user)s commited on %(date)s UTC"
 msgstr ""
 
 #: rhodecode/templates/feed/atom_feed_entry.mako:30
 msgid "Commit was too big and was cut off..."
 msgstr ""
 
 #: rhodecode/templates/files/file_authors_box.mako:18
 msgid "Load All Authors"
 msgstr ""
 
 #: rhodecode/templates/files/file_authors_box.mako:20
 msgid "last author"
 msgstr ""
 
 #: rhodecode/templates/files/files.mako:4
 #: rhodecode/templates/files/files_pjax.mako:2
 msgid "{} Files"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.mako:4
 msgid "{} Files Add"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.mako:25
 msgid "Add new file"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.mako:43
 #: rhodecode/templates/files/files_edit.mako:44
 msgid "Filename e.g example.py, or docs/readme.md"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.mako:63
 #: rhodecode/templates/files/files_edit.mako:65
 msgid "Line wraps on"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.mako:63
 #: rhodecode/templates/files/files_edit.mako:65
 msgid "line wraps off"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.mako:86
 #: rhodecode/templates/files/files_delete.mako:71
 #: rhodecode/templates/files/files_edit.mako:88
 #: rhodecode/templates/files/files_upload.mako:102
 msgid "Commit changes"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.mako:9
 msgid "Previous commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.mako:15
 msgid "Next commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.mako:24
 msgid "Add File"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.mako:27
 msgid "more options"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.mako:36
 msgid "Upload File"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.mako:50
 msgid "Full tree as {}"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.mako:53
 msgid "This tree as {}"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.mako:63
 #: rhodecode/templates/summary/components.mako:196
 msgid "more download options"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.mako:106
 #: rhodecode/templates/summary/summary.mako:37
 #, python-format
 msgid "Readme file from commit %s:%s"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser_tree.mako:17
 #: rhodecode/templates/search/search_path.mako:12
 msgid "Size"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser_tree.mako:18
 msgid "Modified"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser_tree.mako:19
 msgid "Last Commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_delete.mako:4
 msgid "{} Files Delete"
 msgstr ""
 
 #: rhodecode/templates/files/files_delete.mako:25
 msgid "Delete file"
 msgstr ""
 
 #: rhodecode/templates/files/files_delete.mako:52
 #, python-format
 msgid "Binary file (%s)"
 msgstr ""
 
 #: rhodecode/templates/files/files_delete.mako:57
 #: rhodecode/templates/files/files_source.mako:138
 msgid "File size {} is bigger then allowed limit {}. "
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.mako:4
 msgid "{} Files Edit"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.mako:25
 msgid "Edit file"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:26
 msgid "Download largefile"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:30
 msgid "Download file"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:39
 msgid "Editing binary files not allowed"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:43
 msgid "Edit on branch: "
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:52
 msgid "Editing files allowed only when on branch head commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:53
 msgid "Deleting files allowed only when on branch head commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:75
 msgid "lines"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:83
 msgid "This file is a pointer to large binary file"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:83
 msgid "LargeFile"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:106
 msgid "History"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:112
 msgid "Annotation"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:114
 msgid "Raw"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:133
 msgid "Binary file ({})"
 msgstr ""
 
 #: rhodecode/templates/files/files_source_header.mako:33
 msgid "File last commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_upload.mako:4
 msgid "{} Files Upload"
 msgstr ""
 
 #: rhodecode/templates/files/files_upload.mako:36
 msgid "Uploading..."
 msgstr ""
 
 #: rhodecode/templates/files/files_upload.mako:38
 msgid "Uploaded"
 msgstr ""
 
 #: rhodecode/templates/files/files_upload.mako:52
 msgid "Upload new file"
 msgstr ""
 
 #: rhodecode/templates/files/files_upload.mako:109
 msgid "Committing..."
 msgstr ""
 
 #: rhodecode/templates/files/files_upload.mako:110
 msgid "Please wait while the files are being uploaded"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.mako:5
 #, python-format
 msgid "Fork repository %s"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.mako:30
 #: rhodecode/templates/forks/forks.mako:60
 msgid "Fork name"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.mako:47
 #, python-format
 msgid "Select my personal group (%(repo_group_name)s)"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.mako:78
 msgid "Copy permissions"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.mako:82
 msgid "Copy permissions from parent repository."
 msgstr ""
 
 #: rhodecode/templates/forks/fork.mako:88
 msgid "Private"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.mako:97
 msgid "Fork this Repository"
 msgstr ""
 
 #: rhodecode/templates/forks/forks.mako:5
 #, python-format
 msgid "%s Forks"
 msgstr ""
 
 #: rhodecode/templates/forks/forks.mako:28
 msgid "Create new fork"
 msgstr ""
 
 #: rhodecode/templates/forks/forks.mako:64
 msgid "Forked"
 msgstr ""
 
 #: rhodecode/templates/journal/journal.mako:25
 msgid "ATOM journal feed"
 msgstr ""
 
 #: rhodecode/templates/journal/journal.mako:26
 msgid "RSS journal feed"
 msgstr ""
 
 #: rhodecode/templates/journal/journal_data.mako:45
 msgid "No entries yet"
 msgstr ""
 
 #: rhodecode/templates/journal/public_journal.mako:4
 #: rhodecode/templates/journal/public_journal.mako:12
 msgid "Public Journal"
 msgstr ""
 
 #: rhodecode/templates/journal/public_journal.mako:21
 msgid "ATOM public journal feed"
 msgstr ""
 
 #: rhodecode/templates/journal/public_journal.mako:22
 msgid "RSS public journal feed"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:5
 msgid "New pull request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:33
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:102
 msgid "Commit flow"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:41
 msgid "Source repository"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:69
 msgid "Target repository"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:76
 msgid "Loading refs..."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:115
 msgid "Reviewers / Observers"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:121
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:605
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:621
 msgid "Reviewer rules"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:167
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:647
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:643
 msgid "Add reviewer or reviewer group"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:191
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:700
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:696
 msgid "Add observer or observer group"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:216
 msgid "Submit Pull Request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:392
 msgid "Show detailed compare."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:498
 #: rhodecode/templates/pullrequests/pullrequest.mako:526
 msgid "Select commit reference"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:594
 msgid "Please select source and target"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:7
 msgid "This pull request can be merged automatically."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:12
 msgid "Merge is not currently possible because of below failed checks."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:57
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:61
 msgid "Close with status {}"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:66
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:76
 msgid "Merge and close Pull Request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:70
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:75
 msgid "refresh checks"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:76
 msgid "You are not allowed to merge this pull request."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:78
 msgid "Login to Merge this Pull Request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:8
 msgid "{} Pull Request !{}"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:59
 msgid "Last updated on"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:60
 msgid "by"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:69
 msgid "Update title & description"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:75
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:78
 msgid "Delete pull request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:78
 msgid "Not allowed to delete this pull request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:88
 msgid "Rendered using {} renderer"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:135
 msgid "Common ancestor"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:139
 msgid "not available"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:151
 msgid "Pull changes from source"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:152
 msgid "Copy the pull url"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:164
 msgid "Clone repository in its merged state using shadow repository"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:164
 msgid "Clone from shadow repository"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:165
 #: rhodecode/templates/summary/components.mako:78
 msgid "Copy the clone url"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:169
 msgid "Shadow repository data not available"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:185
 msgid "Versions"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:197
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:199
 msgid "show versions"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:198
 msgid "hide versions"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:223
 msgid "Your review status at this version"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:228
 msgid "Comments from pull request version v{0}"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:246
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:250
 msgid "select versions to show changes"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:247
 msgid "show changes between versions"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:248
 msgid "show pull request for this version"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:257
 msgid "Pull request versions not available"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:277
 msgid "Cannot show diff when pull request state is changing. Current progress state"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:295
 msgid "Missing requirements:"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:296
 msgid "These commits cannot be displayed, because this repository uses the Mercurial largefiles extension, which was not enabled."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:304
 msgid "Missing commits"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:305
 msgid "This pull request cannot be displayed, because one or more commits no longer exist in the source repository."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:306
 msgid "Please update this pull request, push the commits back into the source repository, or consider closing this pull request."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:307
 msgid "Consider doing a `force update commits` in case you think this is an error."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:315
 msgid "There are new changes for `{}:{}` in source repository, please consider updating this pull request."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:326
 msgid "Showing changes at v{}, commenting is disabled."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:349
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:371
 msgid "Update commits"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:352
 msgid "more update options"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:360
 msgid "Force update commits"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:363
 msgid "Update commits and force refresh this pull request."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:371
 msgid "Update is disabled for current view"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:383
 msgid "Commits and changes between v{ver_from} and {ver_to} of this pull request, commenting is disabled"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:387
 msgid "commits added: {}, removed: {}"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:405
 msgid "Commit added in displayed changes"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:407
 msgid "Commit removed in displayed changes"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:510
 msgid "there is {num} general comment from older versions"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:511
 msgid "show it"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:513
 msgid "there are {num} general comments from older versions"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:514
 msgid "show them"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:556
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:567
 msgid "Drafts"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:569
 msgid "Submit"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:625
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:612
 msgid "Show rules"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:652
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:705
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:648
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:701
 msgid "Save Changes"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:676
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:672
 msgid "Observers"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:742
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:738
 msgid "TODOs unavailable when browsing versions"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:814
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:822
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:810
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:818
 msgid "Referenced Tickets"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:828
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:824
 msgid "In pull request description"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:842
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:861
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:838
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:857
 msgid "No Ticket data found."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:847
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:843
 msgid "In commit messages"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.mako:4
 msgid "{} Pull Requests"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.mako:27
 msgid "Opened"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.mako:28
 msgid "Opened by me"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.mako:29
 msgid "Awaiting review"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.mako:30
 msgid "Awaiting my review"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.mako:32
 msgid "From this repo"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.mako:40
 msgid "Open new Pull Request"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:6
 #: rhodecode/templates/search/search.mako:19
 msgid "Search inside repository {repo_name}"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:8
 #: rhodecode/templates/search/search.mako:21
 msgid "Search inside repository group {repo_group_name}"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:10
 #: rhodecode/templates/search/search.mako:23
 msgid "Search inside all accessible repositories"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:99
 msgid "File path"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:102
 msgid "Search"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:108
 #: rhodecode/templates/search/search.mako:110
 #: rhodecode/templates/search/search.mako:112
 msgid "Global Search"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:138
 msgid "sort"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:157
 msgid "Query Language examples"
 msgstr ""
 
 #: rhodecode/templates/search/search_commit.mako:15
 msgid "Commit date"
 msgstr ""
 
 #: rhodecode/templates/search/search_content.mako:7
 msgid "No content matched"
 msgstr ""
 
 #: rhodecode/templates/search/search_content.mako:12
 msgid "more matches in this file"
 msgstr ""
 
 #: rhodecode/templates/search/search_content.mako:112
 msgid "Narrow to this repository group"
 msgstr ""
 
 #: rhodecode/templates/search/search_content.mako:119
 msgid "Narrow to this repository"
 msgstr ""
 
 #: rhodecode/templates/search/search_path.mako:15
 msgid "Lines"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:20
 msgid "Closed Branch"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:83
 msgid "Copy the clone by id url"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:88
 msgid "Copy the clone by ssh url"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:92
 msgid "SVN Protocol is disabled. To enable it, see the"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:92
 msgid "documentation here"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:135
 msgid "Number of Repository Forks"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:172
 msgid "Downloads"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:177
 msgid "There are no downloads yet"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:181
 msgid "Downloads are disabled for this repository"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:227
 msgid "Repository size"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:239
 msgid "Calculating Repository Size..."
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:250
 msgid "Code Statistics"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:259
 msgid "Statistics are disabled for this repository"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.mako:21
 msgid "Quick start"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_base.mako:5
 msgid "{} Summary"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_base.mako:13
 #, python-format
 msgid "%s ATOM feed"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_base.mako:14
 #, python-format
 msgid "%s RSS feed"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_commits.mako:117
 msgid "Add or upload files directly via RhodeCode:"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_commits.mako:119
 msgid "Add New File"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_commits.mako:122
 msgid "Upload New File"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_commits.mako:128
 msgid "Push new repo:"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_commits.mako:151
 msgid "Existing repository?"
 msgstr ""
 
 #: rhodecode/templates/tags/tags.mako:5
 #, python-format
 msgid "%s Tags"
 msgstr ""
 
 #: rhodecode/templates/tags/tags.mako:28
 msgid "Compare Selected Tags"
 msgstr ""
 
 #: rhodecode/templates/user_group/profile.mako:6
 msgid "User Group Profile"
 msgstr ""
 
 #: rhodecode/templates/user_group/profile.mako:15
 msgid "Group Name"
 msgstr ""
 
 #: rhodecode/templates/users/user_profile.mako:39
 msgid "First name"
 msgstr ""
 
 #: rhodecode/templates/users/user_profile.mako:49
 msgid "Last name"
 msgstr ""
 
 #: rhodecode/tests/lib/test_ext_json.py:162
 msgid "hello"
 msgstr ""
 

rhodecode/lib/base.py

@@ -1,626 +1,627 b''
 # -*- 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/
 
 """
 The base Controller API
 Provides the BaseController class for subclassing. And usage in different
 controllers
 """
 
 import logging
 import socket
 
 import markupsafe
 import ipaddress
 
 from paste.auth.basic import AuthBasicAuthenticator
 from paste.httpexceptions import HTTPUnauthorized, HTTPForbidden, get_exception
 from paste.httpheaders import WWW_AUTHENTICATE, AUTHORIZATION
 
 import rhodecode
 from rhodecode.apps._base import TemplateArgs
 from rhodecode.authentication.base import VCS_TYPE
 from rhodecode.lib import auth, utils2
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import AuthUser, CookieStoreWrapper
 from rhodecode.lib.exceptions import UserCreationError
 from rhodecode.lib.utils import (password_changed, get_enabled_hook_classes)
 from rhodecode.lib.utils2 import (
     str2bool, safe_unicode, AttributeDict, safe_int, sha1, aslist, safe_str)
 from rhodecode.model.db import Repository, User, ChangesetComment, UserBookmark
 from rhodecode.model.notification import NotificationModel
 from rhodecode.model.settings import VcsSettingsModel, SettingsModel
 
 log = logging.getLogger(__name__)
 
 
 def _filter_proxy(ip):
     """
     Passed in IP addresses in HEADERS can be in a special format of multiple
     ips. Those comma separated IPs are passed from various proxies in the
     chain of request processing. The left-most being the original client.
     We only care about the first IP which came from the org. client.
 
     :param ip: ip string from headers
     """
     if ',' in ip:
         _ips = ip.split(',')
         _first_ip = _ips[0].strip()
         log.debug('Got multiple IPs %s, using %s', ','.join(_ips), _first_ip)
         return _first_ip
     return ip
 
 
 def _filter_port(ip):
     """
     Removes a port from ip, there are 4 main cases to handle here.
     - ipv4 eg. 127.0.0.1
     - ipv6 eg. ::1
     - ipv4+port eg. 127.0.0.1:8080
     - ipv6+port eg. [::1]:8080
 
     :param ip:
     """
     def is_ipv6(ip_addr):
         if hasattr(socket, 'inet_pton'):
             try:
                 socket.inet_pton(socket.AF_INET6, ip_addr)
             except socket.error:
                 return False
         else:
             # fallback to ipaddress
             try:
                 ipaddress.IPv6Address(safe_unicode(ip_addr))
             except Exception:
                 return False
         return True
 
     if ':' not in ip:  # must be ipv4 pure ip
         return ip
 
     if '[' in ip and ']' in ip:  # ipv6 with port
         return ip.split(']')[0][1:].lower()
 
     # must be ipv6 or ipv4 with port
     if is_ipv6(ip):
         return ip
     else:
         ip, _port = ip.split(':')[:2]  # means ipv4+port
         return ip
 
 
 def get_ip_addr(environ):
     proxy_key = 'HTTP_X_REAL_IP'
     proxy_key2 = 'HTTP_X_FORWARDED_FOR'
     def_key = 'REMOTE_ADDR'
     _filters = lambda x: _filter_port(_filter_proxy(x))
 
     ip = environ.get(proxy_key)
     if ip:
         return _filters(ip)
 
     ip = environ.get(proxy_key2)
     if ip:
         return _filters(ip)
 
     ip = environ.get(def_key, '0.0.0.0')
     return _filters(ip)
 
 
 def get_server_ip_addr(environ, log_errors=True):
     hostname = environ.get('SERVER_NAME')
     try:
         return socket.gethostbyname(hostname)
     except Exception as e:
         if log_errors:
             # in some cases this lookup is not possible, and we don't want to
             # make it an exception in logs
             log.exception('Could not retrieve server ip address: %s', e)
         return hostname
 
 
 def get_server_port(environ):
     return environ.get('SERVER_PORT')
 
 
 def get_access_path(environ):
     path = environ.get('PATH_INFO')
     org_req = environ.get('pylons.original_request')
     if org_req:
         path = org_req.environ.get('PATH_INFO')
     return path
 
 
 def get_user_agent(environ):
     return environ.get('HTTP_USER_AGENT')
 
 
 def vcs_operation_context(
         environ, repo_name, username, action, scm, check_locking=True,
         is_shadow_repo=False, check_branch_perms=False, detect_force_push=False):
     """
     Generate the context for a vcs operation, e.g. push or pull.
 
     This context is passed over the layers so that hooks triggered by the
     vcs operation know details like the user, the user's IP address etc.
 
     :param check_locking: Allows to switch of the computation of the locking
         data. This serves mainly the need of the simplevcs middleware to be
         able to disable this for certain operations.
 
     """
     # Tri-state value: False: unlock, None: nothing, True: lock
     make_lock = None
     locked_by = [None, None, None]
     is_anonymous = username == User.DEFAULT_USER
     user = User.get_by_username(username)
     if not is_anonymous and check_locking:
         log.debug('Checking locking on repository "%s"', repo_name)
         repo = Repository.get_by_repo_name(repo_name)
         make_lock, __, locked_by = repo.get_locking_state(
             action, user.user_id)
     user_id = user.user_id
     settings_model = VcsSettingsModel(repo=repo_name)
     ui_settings = settings_model.get_ui_settings()
 
     # NOTE(marcink): This should be also in sync with
     # rhodecode/apps/ssh_support/lib/backends/base.py:update_environment scm_data
     store = [x for x in ui_settings if x.key == '/']
     repo_store = ''
     if store:
         repo_store = store[0].value
 
     scm_data = {
         'ip': get_ip_addr(environ),
         'username': username,
         'user_id': user_id,
         'action': action,
         'repository': repo_name,
         'scm': scm,
         'config': rhodecode.CONFIG['__file__'],
         'repo_store': repo_store,
         'make_lock': make_lock,
         'locked_by': locked_by,
         'server_url': utils2.get_server_url(environ),
         'user_agent': get_user_agent(environ),
         'hooks': get_enabled_hook_classes(ui_settings),
         'is_shadow_repo': is_shadow_repo,
         'detect_force_push': detect_force_push,
         'check_branch_perms': check_branch_perms,
     }
     return scm_data
 
 
 class BasicAuth(AuthBasicAuthenticator):
 
     def __init__(self, realm, authfunc, registry, auth_http_code=None,
                  initial_call_detection=False, acl_repo_name=None, rc_realm=''):
         self.realm = realm
         self.rc_realm = rc_realm
         self.initial_call = initial_call_detection
         self.authfunc = authfunc
         self.registry = registry
         self.acl_repo_name = acl_repo_name
         self._rc_auth_http_code = auth_http_code
 
     def _get_response_from_code(self, http_code):
         try:
             return get_exception(safe_int(http_code))
         except Exception:
             log.exception('Failed to fetch response for code %s', http_code)
             return HTTPForbidden
 
     def get_rc_realm(self):
         return safe_str(self.rc_realm)
 
     def build_authentication(self):
         head = WWW_AUTHENTICATE.tuples('Basic realm="%s"' % self.realm)
         if self._rc_auth_http_code and not self.initial_call:
             # return alternative HTTP code if alternative http return code
             # is specified in RhodeCode config, but ONLY if it's not the
             # FIRST call
             custom_response_klass = self._get_response_from_code(
                 self._rc_auth_http_code)
             return custom_response_klass(headers=head)
         return HTTPUnauthorized(headers=head)
 
     def authenticate(self, environ):
         authorization = AUTHORIZATION(environ)
         if not authorization:
             return self.build_authentication()
         (authmeth, auth) = authorization.split(' ', 1)
         if 'basic' != authmeth.lower():
             return self.build_authentication()
         auth = auth.strip().decode('base64')
         _parts = auth.split(':', 1)
         if len(_parts) == 2:
             username, password = _parts
             auth_data = self.authfunc(
                     username, password, environ, VCS_TYPE,
                     registry=self.registry, acl_repo_name=self.acl_repo_name)
             if auth_data:
                 return {'username': username, 'auth_data': auth_data}
             if username and password:
                 # we mark that we actually executed authentication once, at
                 # that point we can use the alternative auth code
                 self.initial_call = False
 
         return self.build_authentication()
 
     __call__ = authenticate
 
 
 def calculate_version_hash(config):
     return sha1(
         config.get('beaker.session.secret', '') +
         rhodecode.__version__)[:8]
 
 
 def get_current_lang(request):
     # NOTE(marcink): remove after pyramid move
     try:
         return translation.get_lang()[0]
     except:
         pass
 
     return getattr(request, '_LOCALE_', request.locale_name)
 
 
 def attach_context_attributes(context, request, user_id=None, is_api=None):
     """
     Attach variables into template context called `c`.
     """
     config = request.registry.settings
 
     rc_config = SettingsModel().get_all_settings(cache=True, from_request=False)
     context.rc_config = rc_config
     context.rhodecode_version = rhodecode.__version__
     context.rhodecode_edition = config.get('rhodecode.edition')
     context.rhodecode_edition_id = config.get('rhodecode.edition_id')
     # unique secret + version does not leak the version but keep consistency
     context.rhodecode_version_hash = calculate_version_hash(config)
 
     # Default language set for the incoming request
     context.language = get_current_lang(request)
 
     # Visual options
     context.visual = AttributeDict({})
 
     # DB stored Visual Items
     context.visual.show_public_icon = str2bool(
         rc_config.get('rhodecode_show_public_icon'))
     context.visual.show_private_icon = str2bool(
         rc_config.get('rhodecode_show_private_icon'))
     context.visual.stylify_metatags = str2bool(
         rc_config.get('rhodecode_stylify_metatags'))
     context.visual.dashboard_items = safe_int(
         rc_config.get('rhodecode_dashboard_items', 100))
     context.visual.admin_grid_items = safe_int(
         rc_config.get('rhodecode_admin_grid_items', 100))
     context.visual.show_revision_number = str2bool(
         rc_config.get('rhodecode_show_revision_number', True))
     context.visual.show_sha_length = safe_int(
         rc_config.get('rhodecode_show_sha_length', 100))
     context.visual.repository_fields = str2bool(
         rc_config.get('rhodecode_repository_fields'))
     context.visual.show_version = str2bool(
         rc_config.get('rhodecode_show_version'))
     context.visual.use_gravatar = str2bool(
         rc_config.get('rhodecode_use_gravatar'))
     context.visual.gravatar_url = rc_config.get('rhodecode_gravatar_url')
     context.visual.default_renderer = rc_config.get(
         'rhodecode_markup_renderer', 'rst')
     context.visual.comment_types = ChangesetComment.COMMENT_TYPES
     context.visual.rhodecode_support_url = \
         rc_config.get('rhodecode_support_url') or h.route_url('rhodecode_support')
 
     context.visual.affected_files_cut_off = 60
 
     context.pre_code = rc_config.get('rhodecode_pre_code')
     context.post_code = rc_config.get('rhodecode_post_code')
     context.rhodecode_name = rc_config.get('rhodecode_title')
     context.default_encodings = aslist(config.get('default_encoding'), sep=',')
     # if we have specified default_encoding in the request, it has more
     # priority
     if request.GET.get('default_encoding'):
         context.default_encodings.insert(0, request.GET.get('default_encoding'))
     context.clone_uri_tmpl = rc_config.get('rhodecode_clone_uri_tmpl')
+    context.clone_uri_id_tmpl = rc_config.get('rhodecode_clone_uri_id_tmpl')
     context.clone_uri_ssh_tmpl = rc_config.get('rhodecode_clone_uri_ssh_tmpl')
 
     # INI stored
     context.labs_active = str2bool(
         config.get('labs_settings_active', 'false'))
     context.ssh_enabled = str2bool(
         config.get('ssh.generate_authorized_keyfile', 'false'))
     context.ssh_key_generator_enabled = str2bool(
         config.get('ssh.enable_ui_key_generator', 'true'))
 
     context.visual.allow_repo_location_change = str2bool(
         config.get('allow_repo_location_change', True))
     context.visual.allow_custom_hooks_settings = str2bool(
         config.get('allow_custom_hooks_settings', True))
     context.debug_style = str2bool(config.get('debug_style', False))
 
     context.rhodecode_instanceid = config.get('instance_id')
 
     context.visual.cut_off_limit_diff = safe_int(
         config.get('cut_off_limit_diff'))
     context.visual.cut_off_limit_file = safe_int(
         config.get('cut_off_limit_file'))
 
     context.license = AttributeDict({})
     context.license.hide_license_info = str2bool(
         config.get('license.hide_license_info', False))
 
     # AppEnlight
     context.appenlight_enabled = str2bool(config.get('appenlight', 'false'))
     context.appenlight_api_public_key = config.get(
         'appenlight.api_public_key', '')
     context.appenlight_server_url = config.get('appenlight.server_url', '')
 
     diffmode = {
         "unified": "unified",
         "sideside": "sideside"
     }.get(request.GET.get('diffmode'))
 
     if is_api is not None:
         is_api = hasattr(request, 'rpc_user')
     session_attrs = {
         # defaults
         "clone_url_format": "http",
         "diffmode": "sideside",
         "license_fingerprint": request.session.get('license_fingerprint')
     }
 
     if not is_api:
         # don't access pyramid session for API calls
         if diffmode and diffmode != request.session.get('rc_user_session_attr.diffmode'):
             request.session['rc_user_session_attr.diffmode'] = diffmode
 
         # session settings per user
 
         for k, v in request.session.items():
             pref = 'rc_user_session_attr.'
             if k and k.startswith(pref):
                 k = k[len(pref):]
                 session_attrs[k] = v
 
     context.user_session_attrs = session_attrs
 
     # JS template context
     context.template_context = {
         'repo_name': None,
         'repo_type': None,
         'repo_landing_commit': None,
         'rhodecode_user': {
             'username': None,
             'email': None,
             'notification_status': False
         },
         'session_attrs': session_attrs,
         'visual': {
             'default_renderer': None
         },
         'commit_data': {
             'commit_id': None
         },
         'pull_request_data': {'pull_request_id': None},
         'timeago': {
             'refresh_time': 120 * 1000,
             'cutoff_limit': 1000 * 60 * 60 * 24 * 7
         },
         'pyramid_dispatch': {
 
         },
         'extra': {'plugins': {}}
     }
     # END CONFIG VARS
     if is_api:
         csrf_token = None
     else:
         csrf_token = auth.get_csrf_token(session=request.session)
 
     context.csrf_token = csrf_token
     context.backends = rhodecode.BACKENDS.keys()
 
     unread_count = 0
     user_bookmark_list = []
     if user_id:
         unread_count = NotificationModel().get_unread_cnt_for_user(user_id)
         user_bookmark_list = UserBookmark.get_bookmarks_for_user(user_id)
     context.unread_notifications = unread_count
     context.bookmark_items = user_bookmark_list
 
     # web case
     if hasattr(request, 'user'):
         context.auth_user = request.user
         context.rhodecode_user = request.user
 
     # api case
     if hasattr(request, 'rpc_user'):
         context.auth_user = request.rpc_user
         context.rhodecode_user = request.rpc_user
 
     # attach the whole call context to the request
     request.call_context = context
 
 
 def get_auth_user(request):
     environ = request.environ
     session = request.session
 
     ip_addr = get_ip_addr(environ)
 
     # make sure that we update permissions each time we call controller
     _auth_token = (
             # ?auth_token=XXX
             request.GET.get('auth_token', '')
             # ?api_key=XXX !LEGACY
             or request.GET.get('api_key', '')
             # or headers....
             or request.headers.get('X-Rc-Auth-Token', '')
     )
     if not _auth_token and request.matchdict:
         url_auth_token = request.matchdict.get('_auth_token')
         _auth_token = url_auth_token
         if _auth_token:
             log.debug('Using URL extracted auth token `...%s`', _auth_token[-4:])
 
     if _auth_token:
         # when using API_KEY we assume user exists, and
         # doesn't need auth based on cookies.
         auth_user = AuthUser(api_key=_auth_token, ip_addr=ip_addr)
         authenticated = False
     else:
         cookie_store = CookieStoreWrapper(session.get('rhodecode_user'))
         try:
             auth_user = AuthUser(user_id=cookie_store.get('user_id', None),
                                  ip_addr=ip_addr)
         except UserCreationError as e:
             h.flash(e, 'error')
             # container auth or other auth functions that create users
             # on the fly can throw this exception signaling that there's
             # issue with user creation, explanation should be provided
             # in Exception itself. We then create a simple blank
             # AuthUser
             auth_user = AuthUser(ip_addr=ip_addr)
 
         # in case someone changes a password for user it triggers session
         # flush and forces a re-login
         if password_changed(auth_user, session):
             session.invalidate()
             cookie_store = CookieStoreWrapper(session.get('rhodecode_user'))
             auth_user = AuthUser(ip_addr=ip_addr)
 
         authenticated = cookie_store.get('is_authenticated')
 
     if not auth_user.is_authenticated and auth_user.is_user_object:
         # user is not authenticated and not empty
         auth_user.set_authenticated(authenticated)
 
     return auth_user, _auth_token
 
 
 def h_filter(s):
     """
     Custom filter for Mako templates. Mako by standard uses `markupsafe.escape`
     we wrap this with additional functionality that converts None to empty
     strings
     """
     if s is None:
         return markupsafe.Markup()
     return markupsafe.escape(s)
 
 
 def add_events_routes(config):
     """
     Adds routing that can be used in events. Because some events are triggered
     outside of pyramid context, we need to bootstrap request with some
     routing registered
     """
 
     from rhodecode.apps._base import ADMIN_PREFIX
 
     config.add_route(name='home', pattern='/')
     config.add_route(name='main_page_repos_data', pattern='/_home_repos')
     config.add_route(name='main_page_repo_groups_data', pattern='/_home_repo_groups')
 
     config.add_route(name='login', pattern=ADMIN_PREFIX + '/login')
     config.add_route(name='logout', pattern=ADMIN_PREFIX + '/logout')
     config.add_route(name='repo_summary', pattern='/{repo_name}')
     config.add_route(name='repo_summary_explicit', pattern='/{repo_name}/summary')
     config.add_route(name='repo_group_home', pattern='/{repo_group_name}')
 
     config.add_route(name='pullrequest_show',
                      pattern='/{repo_name}/pull-request/{pull_request_id}')
     config.add_route(name='pull_requests_global',
                      pattern='/pull-request/{pull_request_id}')
 
     config.add_route(name='repo_commit',
                      pattern='/{repo_name}/changeset/{commit_id}')
     config.add_route(name='repo_files',
                      pattern='/{repo_name}/files/{commit_id}/{f_path}')
 
     config.add_route(name='hovercard_user',
                      pattern='/_hovercard/user/{user_id}')
 
     config.add_route(name='hovercard_user_group',
                      pattern='/_hovercard/user_group/{user_group_id}')
 
     config.add_route(name='hovercard_pull_request',
                      pattern='/_hovercard/pull_request/{pull_request_id}')
 
     config.add_route(name='hovercard_repo_commit',
                      pattern='/_hovercard/commit/{repo_name}/{commit_id}')
 
 
 def bootstrap_config(request):
     import pyramid.testing
     registry = pyramid.testing.Registry('RcTestRegistry')
 
     config = pyramid.testing.setUp(registry=registry, request=request)
 
     # allow pyramid lookup in testing
     config.include('pyramid_mako')
     config.include('rhodecode.lib.rc_beaker')
     config.include('rhodecode.lib.rc_cache')
 
     add_events_routes(config)
 
     return config
 
 
 def bootstrap_request(**kwargs):
     import pyramid.testing
 
     class TestRequest(pyramid.testing.DummyRequest):
         application_url = kwargs.pop('application_url', 'http://example.com')
         host = kwargs.pop('host', 'example.com:80')
         domain = kwargs.pop('domain', 'example.com')
 
         def translate(self, msg):
             return msg
 
         def plularize(self, singular, plural, n):
             return singular
 
         def get_partial_renderer(self, tmpl_name):
 
             from rhodecode.lib.partial_renderer import get_partial_renderer
             return get_partial_renderer(request=self, tmpl_name=tmpl_name)
 
         _call_context = TemplateArgs()
         _call_context.visual = TemplateArgs()
         _call_context.visual.show_sha_length = 12
         _call_context.visual.show_revision_number = True
 
         @property
         def call_context(self):
             return self._call_context
 
     class TestDummySession(pyramid.testing.DummySession):
         def save(*arg, **kw):
             pass
 
     request = TestRequest(**kwargs)
     request.session = TestDummySession()
 
     return request
 

rhodecode/lib/celerylib/tasks.py

@@ -1,379 +1,403 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2012-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/
 
 """
 RhodeCode task modules, containing all task that suppose to be run
 by celery daemon
 """
 
 import os
 import time
 
 from pyramid import compat
 from pyramid_mailer.mailer import Mailer
 from pyramid_mailer.message import Message
 from email.utils import formatdate
 
 import rhodecode
 from rhodecode.lib import audit_logger
-from rhodecode.lib.celerylib import get_logger, async_task, RequestContextTask
+from rhodecode.lib.celerylib import get_logger, async_task, RequestContextTask, run_task
 from rhodecode.lib import hooks_base
-from rhodecode.lib.utils2 import safe_int, str2bool
+from rhodecode.lib.utils2 import safe_int, str2bool, aslist
 from rhodecode.model.db import (
     Session, IntegrityError, true, Repository, RepoGroup, User)
 
 
 @async_task(ignore_result=True, base=RequestContextTask)
 def send_email(recipients, subject, body='', html_body='', email_config=None,
                extra_headers=None):
     """
     Sends an email with defined parameters from the .ini files.
 
     :param recipients: list of recipients, it this is empty the defined email
         address from field 'email_to' is used instead
     :param subject: subject of the mail
     :param body: body of the mail
     :param html_body: html version of body
     :param email_config: specify custom configuration for mailer
     :param extra_headers: specify custom headers
     """
     log = get_logger(send_email)
 
     email_config = email_config or rhodecode.CONFIG
 
     mail_server = email_config.get('smtp_server') or None
     if mail_server is None:
         log.error("SMTP server information missing. Sending email failed. "
                   "Make sure that `smtp_server` variable is configured "
                   "inside the .ini file")
         return False
 
     subject = "%s %s" % (email_config.get('email_prefix', ''), subject)
 
     if recipients:
         if isinstance(recipients, compat.string_types):
             recipients = recipients.split(',')
     else:
         # if recipients are not defined we send to email_config + all admins
         admins = []
         for u in User.query().filter(User.admin == true()).all():
             if u.email:
                 admins.append(u.email)
         recipients = []
         config_email = email_config.get('email_to')
         if config_email:
             recipients += [config_email]
         recipients += admins
 
     # translate our LEGACY config into the one that pyramid_mailer supports
     email_conf = dict(
         host=mail_server,
         port=email_config.get('smtp_port', 25),
         username=email_config.get('smtp_username'),
         password=email_config.get('smtp_password'),
 
         tls=str2bool(email_config.get('smtp_use_tls')),
         ssl=str2bool(email_config.get('smtp_use_ssl')),
 
         # SSL key file
         # keyfile='',
 
         # SSL certificate file
         # certfile='',
 
         # Location of maildir
         # queue_path='',
 
         default_sender=email_config.get('app_email_from', 'RhodeCode'),
 
         debug=str2bool(email_config.get('smtp_debug')),
         # /usr/sbin/sendmail	Sendmail executable
         # sendmail_app='',
 
         # {sendmail_app} -t -i -f {sender}	Template for sendmail execution
         # sendmail_template='',
     )
 
     if extra_headers is None:
         extra_headers = {}
 
     extra_headers.setdefault('Date', formatdate(time.time()))
 
     if 'thread_ids' in extra_headers:
         thread_ids = extra_headers.pop('thread_ids')
         extra_headers['References'] = ' '.join('<{}>'.format(t) for t in thread_ids)
 
     try:
         mailer = Mailer(**email_conf)
 
         message = Message(subject=subject,
                           sender=email_conf['default_sender'],
                           recipients=recipients,
                           body=body, html=html_body,
                           extra_headers=extra_headers)
         mailer.send_immediately(message)
 
     except Exception:
         log.exception('Mail sending failed')
         return False
     return True
 
 
 @async_task(ignore_result=True, base=RequestContextTask)
 def create_repo(form_data, cur_user):
     from rhodecode.model.repo import RepoModel
     from rhodecode.model.user import UserModel
     from rhodecode.model.scm import ScmModel
     from rhodecode.model.settings import SettingsModel
 
     log = get_logger(create_repo)
 
     cur_user = UserModel()._get_user(cur_user)
     owner = cur_user
 
     repo_name = form_data['repo_name']
     repo_name_full = form_data['repo_name_full']
     repo_type = form_data['repo_type']
     description = form_data['repo_description']
     private = form_data['repo_private']
     clone_uri = form_data.get('clone_uri')
     repo_group = safe_int(form_data['repo_group'])
     copy_fork_permissions = form_data.get('copy_permissions')
     copy_group_permissions = form_data.get('repo_copy_permissions')
     fork_of = form_data.get('fork_parent_id')
     state = form_data.get('repo_state', Repository.STATE_PENDING)
 
     # repo creation defaults, private and repo_type are filled in form
     defs = SettingsModel().get_default_repo_settings(strip_prefix=True)
     enable_statistics = form_data.get(
         'enable_statistics', defs.get('repo_enable_statistics'))
     enable_locking = form_data.get(
         'enable_locking', defs.get('repo_enable_locking'))
     enable_downloads = form_data.get(
         'enable_downloads', defs.get('repo_enable_downloads'))
 
     # set landing rev based on default branches for SCM
     landing_ref, _label = ScmModel.backend_landing_ref(repo_type)
 
     try:
         RepoModel()._create_repo(
             repo_name=repo_name_full,
             repo_type=repo_type,
             description=description,
             owner=owner,
             private=private,
             clone_uri=clone_uri,
             repo_group=repo_group,
             landing_rev=landing_ref,
             fork_of=fork_of,
             copy_fork_permissions=copy_fork_permissions,
             copy_group_permissions=copy_group_permissions,
             enable_statistics=enable_statistics,
             enable_locking=enable_locking,
             enable_downloads=enable_downloads,
             state=state
         )
         Session().commit()
 
         # now create this repo on Filesystem
         RepoModel()._create_filesystem_repo(
             repo_name=repo_name,
             repo_type=repo_type,
             repo_group=RepoModel()._get_repo_group(repo_group),
             clone_uri=clone_uri,
         )
         repo = Repository.get_by_repo_name(repo_name_full)
         hooks_base.create_repository(created_by=owner.username, **repo.get_dict())
 
         # update repo commit caches initially
         repo.update_commit_cache()
 
         # set new created state
         repo.set_state(Repository.STATE_CREATED)
         repo_id = repo.repo_id
         repo_data = repo.get_api_data()
 
         audit_logger.store(
             'repo.create', action_data={'data': repo_data},
             user=cur_user,
             repo=audit_logger.RepoWrap(repo_name=repo_name, repo_id=repo_id))
 
         Session().commit()
     except Exception as e:
         log.warning('Exception occurred when creating repository, '
                     'doing cleanup...', exc_info=True)
         if isinstance(e, IntegrityError):
             Session().rollback()
 
         # rollback things manually !
         repo = Repository.get_by_repo_name(repo_name_full)
         if repo:
             Repository.delete(repo.repo_id)
             Session().commit()
             RepoModel()._delete_filesystem_repo(repo)
         log.info('Cleanup of repo %s finished', repo_name_full)
         raise
 
     return True
 
 
 @async_task(ignore_result=True, base=RequestContextTask)
 def create_repo_fork(form_data, cur_user):
     """
     Creates a fork of repository using internal VCS methods
     """
     from rhodecode.model.repo import RepoModel
     from rhodecode.model.user import UserModel
 
     log = get_logger(create_repo_fork)
 
     cur_user = UserModel()._get_user(cur_user)
     owner = cur_user
 
     repo_name = form_data['repo_name']  # fork in this case
     repo_name_full = form_data['repo_name_full']
     repo_type = form_data['repo_type']
     description = form_data['description']
     private = form_data['private']
     clone_uri = form_data.get('clone_uri')
     repo_group = safe_int(form_data['repo_group'])
     landing_ref = form_data['landing_rev']
     copy_fork_permissions = form_data.get('copy_permissions')
     fork_id = safe_int(form_data.get('fork_parent_id'))
 
     try:
         fork_of = RepoModel()._get_repo(fork_id)
         RepoModel()._create_repo(
             repo_name=repo_name_full,
             repo_type=repo_type,
             description=description,
             owner=owner,
             private=private,
             clone_uri=clone_uri,
             repo_group=repo_group,
             landing_rev=landing_ref,
             fork_of=fork_of,
             copy_fork_permissions=copy_fork_permissions
         )
 
         Session().commit()
 
         base_path = Repository.base_path()
         source_repo_path = os.path.join(base_path, fork_of.repo_name)
 
         # now create this repo on Filesystem
         RepoModel()._create_filesystem_repo(
             repo_name=repo_name,
             repo_type=repo_type,
             repo_group=RepoModel()._get_repo_group(repo_group),
             clone_uri=source_repo_path,
         )
         repo = Repository.get_by_repo_name(repo_name_full)
         hooks_base.create_repository(created_by=owner.username, **repo.get_dict())
 
         # update repo commit caches initially
         config = repo._config
         config.set('extensions', 'largefiles', '')
         repo.update_commit_cache(config=config)
 
         # set new created state
         repo.set_state(Repository.STATE_CREATED)
 
         repo_id = repo.repo_id
         repo_data = repo.get_api_data()
         audit_logger.store(
             'repo.fork', action_data={'data': repo_data},
             user=cur_user,
             repo=audit_logger.RepoWrap(repo_name=repo_name, repo_id=repo_id))
 
         Session().commit()
     except Exception as e:
         log.warning('Exception occurred when forking repository, '
                     'doing cleanup...', exc_info=True)
         if isinstance(e, IntegrityError):
             Session().rollback()
 
         # rollback things manually !
         repo = Repository.get_by_repo_name(repo_name_full)
         if repo:
             Repository.delete(repo.repo_id)
             Session().commit()
             RepoModel()._delete_filesystem_repo(repo)
         log.info('Cleanup of repo %s finished', repo_name_full)
         raise
 
     return True
 
 
 @async_task(ignore_result=True)
 def repo_maintenance(repoid):
     from rhodecode.lib import repo_maintenance as repo_maintenance_lib
     log = get_logger(repo_maintenance)
     repo = Repository.get_by_id_or_repo_name(repoid)
     if repo:
         maintenance = repo_maintenance_lib.RepoMaintenance()
         tasks = maintenance.get_tasks_for_repo(repo)
         log.debug('Executing %s tasks on repo `%s`', tasks, repoid)
         executed_types = maintenance.execute(repo)
         log.debug('Got execution results %s', executed_types)
     else:
         log.debug('Repo `%s` not found or without a clone_url', repoid)
 
 
 @async_task(ignore_result=True)
-def check_for_update():
+def check_for_update(send_email_notification=True, email_recipients=None):
     from rhodecode.model.update import UpdateModel
+    from rhodecode.model.notification import EmailNotificationModel
+
+    log = get_logger(check_for_update)
     update_url = UpdateModel().get_update_url()
     cur_ver = rhodecode.__version__
 
     try:
         data = UpdateModel().get_update_data(update_url)
-        latest = data['versions'][0]
-        UpdateModel().store_version(latest['version'])
+
+        current_ver = UpdateModel().get_stored_version(fallback=cur_ver)
+        latest_ver = data['versions'][0]['version']
+        UpdateModel().store_version(latest_ver)
+
+        if send_email_notification:
+            log.debug('Send email notification is enabled. '
+                      'Current RhodeCode version: %s, latest known: %s', current_ver, latest_ver)
+            if UpdateModel().is_outdated(current_ver, latest_ver):
+
+                email_kwargs = {
+                    'current_ver': current_ver,
+                    'latest_ver': latest_ver,
+                }
+
+                (subject, email_body, email_body_plaintext) = EmailNotificationModel().render_email(
+                    EmailNotificationModel.TYPE_UPDATE_AVAILABLE, **email_kwargs)
+
+                email_recipients = aslist(email_recipients, sep=',') or \
+                                   [user.email for user in User.get_all_super_admins()]
+                run_task(send_email, email_recipients, subject,
+                         email_body_plaintext, email_body)
+
     except Exception:
         pass
 
 
 @async_task(ignore_result=False)
 def beat_check(*args, **kwargs):
     log = get_logger(beat_check)
     log.info('%r: Got args: %r and kwargs %r', beat_check, args, kwargs)
     return time.time()
 
 
 @async_task(ignore_result=True)
 def sync_last_update(*args, **kwargs):
 
     skip_repos = kwargs.get('skip_repos')
     if not skip_repos:
         repos = Repository.query() \
             .order_by(Repository.group_id.asc())
 
         for repo in repos:
             repo.update_commit_cache()
 
     skip_groups = kwargs.get('skip_groups')
     if not skip_groups:
         repo_groups = RepoGroup.query() \
             .filter(RepoGroup.group_parent_id == None)
 
         for root_gr in repo_groups:
             for repo_gr in reversed(root_gr.recursive_groups()):
                 repo_gr.update_commit_cache()

rhodecode/lib/db_manage.py

@@ -1,678 +1,680 b''
 # -*- 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/
 
 """
 Database creation, and setup module for RhodeCode Enterprise. Used for creation
 of database as well as for migration operations
 """
 
 import os
 import sys
 import time
 import uuid
 import logging
 import getpass
 from os.path import dirname as dn, join as jn
 
 from sqlalchemy.engine import create_engine
 
 from rhodecode import __dbversion__
 from rhodecode.model import init_model
 from rhodecode.model.user import UserModel
 from rhodecode.model.db import (
     User, Permission, RhodeCodeUi, RhodeCodeSetting, UserToPerm,
     DbMigrateVersion, RepoGroup, UserRepoGroupToPerm, CacheKey, Repository)
 from rhodecode.model.meta import Session, Base
 from rhodecode.model.permission import PermissionModel
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.settings import SettingsModel
 
 
 log = logging.getLogger(__name__)
 
 
 def notify(msg):
     """
     Notification for migrations messages
     """
     ml = len(msg) + (4 * 2)
     print(('\n%s\n*** %s ***\n%s' % ('*' * ml, msg, '*' * ml)).upper())
 
 
 class DbManage(object):
 
     def __init__(self, log_sql, dbconf, root, tests=False,
                  SESSION=None, cli_args=None):
         self.dbname = dbconf.split('/')[-1]
         self.tests = tests
         self.root = root
         self.dburi = dbconf
         self.log_sql = log_sql
         self.cli_args = cli_args or {}
         self.init_db(SESSION=SESSION)
         self.ask_ok = self.get_ask_ok_func(self.cli_args.get('force_ask'))
 
     def db_exists(self):
         if not self.sa:
             self.init_db()
         try:
             self.sa.query(RhodeCodeUi)\
                 .filter(RhodeCodeUi.ui_key == '/')\
                 .scalar()
             return True
         except Exception:
             return False
         finally:
             self.sa.rollback()
 
     def get_ask_ok_func(self, param):
         if param not in [None]:
             # return a function lambda that has a default set to param
             return lambda *args, **kwargs: param
         else:
             from rhodecode.lib.utils import ask_ok
             return ask_ok
 
     def init_db(self, SESSION=None):
         if SESSION:
             self.sa = SESSION
         else:
             # init new sessions
             engine = create_engine(self.dburi, echo=self.log_sql)
             init_model(engine)
             self.sa = Session()
 
     def create_tables(self, override=False):
         """
         Create a auth database
         """
 
         log.info("Existing database with the same name is going to be destroyed.")
         log.info("Setup command will run DROP ALL command on that database.")
         if self.tests:
             destroy = True
         else:
             destroy = self.ask_ok('Are you sure that you want to destroy the old database? [y/n]')
         if not destroy:
             log.info('Nothing done.')
             sys.exit(0)
         if destroy:
             Base.metadata.drop_all()
 
         checkfirst = not override
         Base.metadata.create_all(checkfirst=checkfirst)
         log.info('Created tables for %s', self.dbname)
 
     def set_db_version(self):
         ver = DbMigrateVersion()
         ver.version = __dbversion__
         ver.repository_id = 'rhodecode_db_migrations'
         ver.repository_path = 'versions'
         self.sa.add(ver)
         log.info('db version set to: %s', __dbversion__)
 
     def run_post_migration_tasks(self):
         """
         Run various tasks before actually doing migrations
         """
         # delete cache keys on each upgrade
         total = CacheKey.query().count()
         log.info("Deleting (%s) cache keys now...", total)
         CacheKey.delete_all_cache()
 
     def upgrade(self, version=None):
         """
         Upgrades given database schema to given revision following
         all needed steps, to perform the upgrade
 
         """
 
         from rhodecode.lib.dbmigrate.migrate.versioning import api
         from rhodecode.lib.dbmigrate.migrate.exceptions import \
             DatabaseNotControlledError
 
         if 'sqlite' in self.dburi:
             print(
                '********************** WARNING **********************\n'
                'Make sure your version of sqlite is at least 3.7.X.  \n'
                'Earlier versions are known to fail on some migrations\n'
                '*****************************************************\n')
 
         upgrade = self.ask_ok(
             'You are about to perform a database upgrade. Make '
             'sure you have backed up your database. '
             'Continue ? [y/n]')
         if not upgrade:
             log.info('No upgrade performed')
             sys.exit(0)
 
         repository_path = jn(dn(dn(dn(os.path.realpath(__file__)))),
                              'rhodecode/lib/dbmigrate')
         db_uri = self.dburi
 
         if version:
             DbMigrateVersion.set_version(version)
 
         try:
             curr_version = api.db_version(db_uri, repository_path)
             msg = ('Found current database db_uri under version '
                    'control with version {}'.format(curr_version))
 
         except (RuntimeError, DatabaseNotControlledError):
             curr_version = 1
             msg = ('Current database is not under version control. Setting '
                    'as version %s' % curr_version)
             api.version_control(db_uri, repository_path, curr_version)
 
         notify(msg)
 
 
         if curr_version == __dbversion__:
             log.info('This database is already at the newest version')
             sys.exit(0)
 
         upgrade_steps = range(curr_version + 1, __dbversion__ + 1)
         notify('attempting to upgrade database from '
                'version %s to version %s' % (curr_version, __dbversion__))
 
         # CALL THE PROPER ORDER OF STEPS TO PERFORM FULL UPGRADE
         _step = None
         for step in upgrade_steps:
             notify('performing upgrade step %s' % step)
             time.sleep(0.5)
 
             api.upgrade(db_uri, repository_path, step)
             self.sa.rollback()
             notify('schema upgrade for step %s completed' % (step,))
 
             _step = step
 
         self.run_post_migration_tasks()
         notify('upgrade to version %s successful' % _step)
 
     def fix_repo_paths(self):
         """
         Fixes an old RhodeCode version path into new one without a '*'
         """
 
         paths = self.sa.query(RhodeCodeUi)\
                 .filter(RhodeCodeUi.ui_key == '/')\
                 .scalar()
 
         paths.ui_value = paths.ui_value.replace('*', '')
 
         try:
             self.sa.add(paths)
             self.sa.commit()
         except Exception:
             self.sa.rollback()
             raise
 
     def fix_default_user(self):
         """
         Fixes an old default user with some 'nicer' default values,
         used mostly for anonymous access
         """
         def_user = self.sa.query(User)\
                 .filter(User.username == User.DEFAULT_USER)\
                 .one()
 
         def_user.name = 'Anonymous'
         def_user.lastname = 'User'
         def_user.email = User.DEFAULT_USER_EMAIL
 
         try:
             self.sa.add(def_user)
             self.sa.commit()
         except Exception:
             self.sa.rollback()
             raise
 
     def fix_settings(self):
         """
         Fixes rhodecode settings and adds ga_code key for google analytics
         """
 
         hgsettings3 = RhodeCodeSetting('ga_code', '')
 
         try:
             self.sa.add(hgsettings3)
             self.sa.commit()
         except Exception:
             self.sa.rollback()
             raise
 
     def create_admin_and_prompt(self):
 
         # defaults
         defaults = self.cli_args
         username = defaults.get('username')
         password = defaults.get('password')
         email = defaults.get('email')
 
         if username is None:
             username = raw_input('Specify admin username:')
         if password is None:
             password = self._get_admin_password()
             if not password:
                 # second try
                 password = self._get_admin_password()
                 if not password:
                     sys.exit()
         if email is None:
             email = raw_input('Specify admin email:')
         api_key = self.cli_args.get('api_key')
         self.create_user(username, password, email, True,
                          strict_creation_check=False,
                          api_key=api_key)
 
     def _get_admin_password(self):
         password = getpass.getpass('Specify admin password '
                                    '(min 6 chars):')
         confirm = getpass.getpass('Confirm password:')
 
         if password != confirm:
             log.error('passwords mismatch')
             return False
         if len(password) < 6:
             log.error('password is too short - use at least 6 characters')
             return False
 
         return password
 
     def create_test_admin_and_users(self):
         log.info('creating admin and regular test users')
         from rhodecode.tests import TEST_USER_ADMIN_LOGIN, \
             TEST_USER_ADMIN_PASS, TEST_USER_ADMIN_EMAIL, \
             TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS, \
             TEST_USER_REGULAR_EMAIL, TEST_USER_REGULAR2_LOGIN, \
             TEST_USER_REGULAR2_PASS, TEST_USER_REGULAR2_EMAIL
 
         self.create_user(TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS,
                          TEST_USER_ADMIN_EMAIL, True, api_key=True)
 
         self.create_user(TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS,
                          TEST_USER_REGULAR_EMAIL, False, api_key=True)
 
         self.create_user(TEST_USER_REGULAR2_LOGIN, TEST_USER_REGULAR2_PASS,
                          TEST_USER_REGULAR2_EMAIL, False, api_key=True)
 
     def create_ui_settings(self, repo_store_path):
         """
         Creates ui settings, fills out hooks
         and disables dotencode
         """
         settings_model = SettingsModel(sa=self.sa)
         from rhodecode.lib.vcs.backends.hg import largefiles_store
         from rhodecode.lib.vcs.backends.git import lfs_store
 
         # Build HOOKS
         hooks = [
             (RhodeCodeUi.HOOK_REPO_SIZE, 'python:vcsserver.hooks.repo_size'),
 
             # HG
             (RhodeCodeUi.HOOK_PRE_PULL, 'python:vcsserver.hooks.pre_pull'),
             (RhodeCodeUi.HOOK_PULL, 'python:vcsserver.hooks.log_pull_action'),
             (RhodeCodeUi.HOOK_PRE_PUSH, 'python:vcsserver.hooks.pre_push'),
             (RhodeCodeUi.HOOK_PRETX_PUSH, 'python:vcsserver.hooks.pre_push'),
             (RhodeCodeUi.HOOK_PUSH, 'python:vcsserver.hooks.log_push_action'),
             (RhodeCodeUi.HOOK_PUSH_KEY, 'python:vcsserver.hooks.key_push'),
 
         ]
 
         for key, value in hooks:
             hook_obj = settings_model.get_ui_by_key(key)
             hooks2 = hook_obj if hook_obj else RhodeCodeUi()
             hooks2.ui_section = 'hooks'
             hooks2.ui_key = key
             hooks2.ui_value = value
             self.sa.add(hooks2)
 
         # enable largefiles
         largefiles = RhodeCodeUi()
         largefiles.ui_section = 'extensions'
         largefiles.ui_key = 'largefiles'
         largefiles.ui_value = ''
         self.sa.add(largefiles)
 
         # set default largefiles cache dir, defaults to
         # /repo_store_location/.cache/largefiles
         largefiles = RhodeCodeUi()
         largefiles.ui_section = 'largefiles'
         largefiles.ui_key = 'usercache'
         largefiles.ui_value = largefiles_store(repo_store_path)
 
         self.sa.add(largefiles)
 
         # set default lfs cache dir, defaults to
         # /repo_store_location/.cache/lfs_store
         lfsstore = RhodeCodeUi()
         lfsstore.ui_section = 'vcs_git_lfs'
         lfsstore.ui_key = 'store_location'
         lfsstore.ui_value = lfs_store(repo_store_path)
 
         self.sa.add(lfsstore)
 
         # enable hgsubversion disabled by default
         hgsubversion = RhodeCodeUi()
         hgsubversion.ui_section = 'extensions'
         hgsubversion.ui_key = 'hgsubversion'
         hgsubversion.ui_value = ''
         hgsubversion.ui_active = False
         self.sa.add(hgsubversion)
 
         # enable hgevolve disabled by default
         hgevolve = RhodeCodeUi()
         hgevolve.ui_section = 'extensions'
         hgevolve.ui_key = 'evolve'
         hgevolve.ui_value = ''
         hgevolve.ui_active = False
         self.sa.add(hgevolve)
 
         hgevolve = RhodeCodeUi()
         hgevolve.ui_section = 'experimental'
         hgevolve.ui_key = 'evolution'
         hgevolve.ui_value = ''
         hgevolve.ui_active = False
         self.sa.add(hgevolve)
 
         hgevolve = RhodeCodeUi()
         hgevolve.ui_section = 'experimental'
         hgevolve.ui_key = 'evolution.exchange'
         hgevolve.ui_value = ''
         hgevolve.ui_active = False
         self.sa.add(hgevolve)
 
         hgevolve = RhodeCodeUi()
         hgevolve.ui_section = 'extensions'
         hgevolve.ui_key = 'topic'
         hgevolve.ui_value = ''
         hgevolve.ui_active = False
         self.sa.add(hgevolve)
 
         # enable hggit disabled by default
         hggit = RhodeCodeUi()
         hggit.ui_section = 'extensions'
         hggit.ui_key = 'hggit'
         hggit.ui_value = ''
         hggit.ui_active = False
         self.sa.add(hggit)
 
         # set svn branch defaults
         branches = ["/branches/*", "/trunk"]
         tags = ["/tags/*"]
 
         for branch in branches:
             settings_model.create_ui_section_value(
                 RhodeCodeUi.SVN_BRANCH_ID, branch)
 
         for tag in tags:
             settings_model.create_ui_section_value(RhodeCodeUi.SVN_TAG_ID, tag)
 
     def create_auth_plugin_options(self, skip_existing=False):
         """
         Create default auth plugin settings, and make it active
 
         :param skip_existing:
         """
         defaults = [
             ('auth_plugins',
              'egg:rhodecode-enterprise-ce#token,egg:rhodecode-enterprise-ce#rhodecode',
              'list'),
 
             ('auth_authtoken_enabled',
              'True',
              'bool'),
 
             ('auth_rhodecode_enabled',
              'True',
              'bool'),
         ]
         for k, v, t in defaults:
             if (skip_existing and
                     SettingsModel().get_setting_by_name(k) is not None):
                 log.debug('Skipping option %s', k)
                 continue
             setting = RhodeCodeSetting(k, v, t)
             self.sa.add(setting)
 
     def create_default_options(self, skip_existing=False):
         """Creates default settings"""
 
         for k, v, t in [
             ('default_repo_enable_locking',  False, 'bool'),
             ('default_repo_enable_downloads', False, 'bool'),
             ('default_repo_enable_statistics', False, 'bool'),
             ('default_repo_private', False, 'bool'),
             ('default_repo_type', 'hg', 'unicode')]:
 
             if (skip_existing and
                     SettingsModel().get_setting_by_name(k) is not None):
                 log.debug('Skipping option %s', k)
                 continue
             setting = RhodeCodeSetting(k, v, t)
             self.sa.add(setting)
 
     def fixup_groups(self):
         def_usr = User.get_default_user()
         for g in RepoGroup.query().all():
             g.group_name = g.get_new_name(g.name)
             self.sa.add(g)
             # get default perm
             default = UserRepoGroupToPerm.query()\
                 .filter(UserRepoGroupToPerm.group == g)\
                 .filter(UserRepoGroupToPerm.user == def_usr)\
                 .scalar()
 
             if default is None:
                 log.debug('missing default permission for group %s adding', g)
                 perm_obj = RepoGroupModel()._create_default_perms(g)
                 self.sa.add(perm_obj)
 
     def reset_permissions(self, username):
         """
         Resets permissions to default state, useful when old systems had
         bad permissions, we must clean them up
 
         :param username:
         """
         default_user = User.get_by_username(username)
         if not default_user:
             return
 
         u2p = UserToPerm.query()\
             .filter(UserToPerm.user == default_user).all()
         fixed = False
         if len(u2p) != len(Permission.DEFAULT_USER_PERMISSIONS):
             for p in u2p:
                 Session().delete(p)
             fixed = True
             self.populate_default_permissions()
         return fixed
 
     def config_prompt(self, test_repo_path='', retries=3):
         defaults = self.cli_args
         _path = defaults.get('repos_location')
         if retries == 3:
             log.info('Setting up repositories config')
 
         if _path is not None:
             path = _path
         elif not self.tests and not test_repo_path:
             path = raw_input(
                  'Enter a valid absolute path to store repositories. '
                  'All repositories in that path will be added automatically:'
             )
         else:
             path = test_repo_path
         path_ok = True
 
         # check proper dir
         if not os.path.isdir(path):
             path_ok = False
             log.error('Given path %s is not a valid directory', path)
 
         elif not os.path.isabs(path):
             path_ok = False
             log.error('Given path %s is not an absolute path', path)
 
         # check if path is at least readable.
         if not os.access(path, os.R_OK):
             path_ok = False
             log.error('Given path %s is not readable', path)
 
         # check write access, warn user about non writeable paths
         elif not os.access(path, os.W_OK) and path_ok:
             log.warning('No write permission to given path %s', path)
 
             q = ('Given path %s is not writeable, do you want to '
                  'continue with read only mode ? [y/n]' % (path,))
             if not self.ask_ok(q):
                 log.error('Canceled by user')
                 sys.exit(-1)
 
         if retries == 0:
             sys.exit('max retries reached')
         if not path_ok:
             retries -= 1
             return self.config_prompt(test_repo_path, retries)
 
         real_path = os.path.normpath(os.path.realpath(path))
 
         if real_path != os.path.normpath(path):
             q = ('Path looks like a symlink, RhodeCode Enterprise will store '
                  'given path as %s ? [y/n]') % (real_path,)
             if not self.ask_ok(q):
                 log.error('Canceled by user')
                 sys.exit(-1)
 
         return real_path
 
     def create_settings(self, path):
 
         self.create_ui_settings(path)
 
         ui_config = [
             ('web', 'push_ssl', 'False'),
             ('web', 'allow_archive', 'gz zip bz2'),
             ('web', 'allow_push', '*'),
             ('web', 'baseurl', '/'),
             ('paths', '/', path),
             ('phases', 'publish', 'True')
         ]
         for section, key, value in ui_config:
             ui_conf = RhodeCodeUi()
             setattr(ui_conf, 'ui_section', section)
             setattr(ui_conf, 'ui_key', key)
             setattr(ui_conf, 'ui_value', value)
             self.sa.add(ui_conf)
 
         # rhodecode app settings
         settings = [
             ('realm', 'RhodeCode', 'unicode'),
             ('title', '', 'unicode'),
             ('pre_code', '', 'unicode'),
             ('post_code', '', 'unicode'),
 
             # Visual
             ('show_public_icon', True, 'bool'),
             ('show_private_icon', True, 'bool'),
-            ('stylify_metatags', False, 'bool'),
+            ('stylify_metatags', True, 'bool'),
             ('dashboard_items', 100, 'int'),
             ('admin_grid_items', 25, 'int'),
 
             ('markup_renderer', 'markdown', 'unicode'),
 
+            ('repository_fields', True, 'bool'),
             ('show_version', True, 'bool'),
             ('show_revision_number', True, 'bool'),
             ('show_sha_length', 12, 'int'),
 
             ('use_gravatar', False, 'bool'),
             ('gravatar_url', User.DEFAULT_GRAVATAR_URL, 'unicode'),
 
             ('clone_uri_tmpl', Repository.DEFAULT_CLONE_URI, 'unicode'),
+            ('clone_uri_id_tmpl', Repository.DEFAULT_CLONE_URI_ID, 'unicode'),
             ('clone_uri_ssh_tmpl', Repository.DEFAULT_CLONE_URI_SSH, 'unicode'),
             ('support_url', '', 'unicode'),
             ('update_url', RhodeCodeSetting.DEFAULT_UPDATE_URL, 'unicode'),
 
             # VCS Settings
             ('pr_merge_enabled', True, 'bool'),
             ('use_outdated_comments', True, 'bool'),
             ('diff_cache', True, 'bool'),
         ]
 
         for key, val, type_ in settings:
             sett = RhodeCodeSetting(key, val, type_)
             self.sa.add(sett)
 
         self.create_auth_plugin_options()
         self.create_default_options()
 
         log.info('created ui config')
 
     def create_user(self, username, password, email='', admin=False,
                     strict_creation_check=True, api_key=None):
         log.info('creating user `%s`', username)
         user = UserModel().create_or_update(
             username, password, email, firstname=u'RhodeCode', lastname=u'Admin',
             active=True, admin=admin, extern_type="rhodecode",
             strict_creation_check=strict_creation_check)
 
         if api_key:
             log.info('setting a new default auth token for user `%s`', username)
             UserModel().add_auth_token(
                 user=user, lifetime_minutes=-1,
                 role=UserModel.auth_token_role.ROLE_ALL,
                 description=u'BUILTIN TOKEN')
 
     def create_default_user(self):
         log.info('creating default user')
         # create default user for handling default permissions.
         user = UserModel().create_or_update(username=User.DEFAULT_USER,
                                             password=str(uuid.uuid1())[:20],
                                             email=User.DEFAULT_USER_EMAIL,
                                             firstname=u'Anonymous',
                                             lastname=u'User',
                                             strict_creation_check=False)
         # based on configuration options activate/de-activate this user which
         # controlls anonymous access
         if self.cli_args.get('public_access') is False:
             log.info('Public access disabled')
             user.active = False
             Session().add(user)
             Session().commit()
 
     def create_permissions(self):
         """
         Creates all permissions defined in the system
         """
         # module.(access|create|change|delete)_[name]
         # module.(none|read|write|admin)
         log.info('creating permissions')
         PermissionModel(self.sa).create_permissions()
 
     def populate_default_permissions(self):
         """
         Populate default permissions. It will create only the default
         permissions that are missing, and not alter already defined ones
         """
         log.info('creating default user permissions')
         PermissionModel(self.sa).create_default_user_permissions(user=User.DEFAULT_USER)

rhodecode/lib/middleware/request_wrapper.py

@@ -1,65 +1,73 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2016-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 time
 import logging
 
 import rhodecode
 from rhodecode.lib.auth import AuthUser
 from rhodecode.lib.base import get_ip_addr, get_access_path, get_user_agent
 from rhodecode.lib.utils2 import safe_str, get_current_rhodecode_user
 
 
 log = logging.getLogger(__name__)
 
 
 class RequestWrapperTween(object):
     def __init__(self, handler, registry):
         self.handler = handler
         self.registry = registry
 
         # one-time configuration code goes here
 
+    def _get_user_info(self, request):
+        user = get_current_rhodecode_user(request)
+        if not user:
+            user = AuthUser.repr_user(ip=get_ip_addr(request.environ))
+        return user
+
     def __call__(self, request):
         start = time.time()
         log.debug('Starting request time measurement')
         try:
             response = self.handler(request)
         finally:
-            end = time.time()
-            total = end - start
             count = request.request_count()
             _ver_ = rhodecode.__version__
-            default_user_info = AuthUser.repr_user(ip=get_ip_addr(request.environ))
-            user_info = get_current_rhodecode_user(request) or default_user_info
+            statsd = request.statsd
+            total = time.time() - start
+            if statsd:
+                statsd.timing('rhodecode.req.timing', total)
+                statsd.incr('rhodecode.req.count')
+
             log.info(
                 'Req[%4s] %s %s Request to %s time: %.4fs [%s], RhodeCode %s',
-                count, user_info, request.environ.get('REQUEST_METHOD'),
+                count, self._get_user_info(request), request.environ.get('REQUEST_METHOD'),
                 safe_str(get_access_path(request.environ)), total,
                 get_user_agent(request. environ), _ver_
             )
 
         return response
 
 
 def includeme(config):
     config.add_tween(
         'rhodecode.lib.middleware.request_wrapper.RequestWrapperTween',
     )

rhodecode/lib/vcs/backends/hg/repository.py

@@ -1,996 +1,1012 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2014-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/
 
 """
 HG repository module
 """
 import os
 import logging
 import binascii
 import urllib
 
 from zope.cachedescriptors.property import Lazy as LazyProperty
 
 from rhodecode.lib.compat import OrderedDict
 from rhodecode.lib.datelib import (
     date_to_timestamp_plus_offset, utcdate_fromtimestamp, makedate)
 from rhodecode.lib.utils import safe_unicode, safe_str
 from rhodecode.lib.utils2 import CachedProperty
 from rhodecode.lib.vcs import connection, exceptions
 from rhodecode.lib.vcs.backends.base import (
     BaseRepository, CollectionGenerator, Config, MergeResponse,
     MergeFailureReason, Reference, BasePathPermissionChecker)
 from rhodecode.lib.vcs.backends.hg.commit import MercurialCommit
 from rhodecode.lib.vcs.backends.hg.diff import MercurialDiff
 from rhodecode.lib.vcs.backends.hg.inmemory import MercurialInMemoryCommit
 from rhodecode.lib.vcs.exceptions import (
     EmptyRepositoryError, RepositoryError, TagAlreadyExistError,
     TagDoesNotExistError, CommitDoesNotExistError, SubrepoMergeError, UnresolvedFilesInRepo)
 from rhodecode.lib.vcs.compat import configparser
 
 hexlify = binascii.hexlify
 nullid = "\0" * 20
 
 log = logging.getLogger(__name__)
 
 
 class MercurialRepository(BaseRepository):
     """
     Mercurial repository backend
     """
     DEFAULT_BRANCH_NAME = 'default'
 
     def __init__(self, repo_path, config=None, create=False, src_url=None,
                  do_workspace_checkout=False, with_wire=None, bare=False):
         """
         Raises RepositoryError if repository could not be find at the given
         ``repo_path``.
 
         :param repo_path: local path of the repository
         :param config: config object containing the repo configuration
         :param create=False: if set to True, would try to create repository if
            it does not exist rather than raising exception
         :param src_url=None: would try to clone repository from given location
         :param do_workspace_checkout=False: sets update of working copy after
            making a clone
         :param bare: not used, compatible with other VCS
         """
 
         self.path = safe_str(os.path.abspath(repo_path))
         # mercurial since 4.4.X requires certain configuration to be present
         # because sometimes we init the repos with config we need to meet
         # special requirements
         self.config = config if config else self.get_default_config(
             default=[('extensions', 'largefiles', '1')])
         self.with_wire = with_wire or {"cache": False}  # default should not use cache
 
         self._init_repo(create, src_url, do_workspace_checkout)
 
         # caches
         self._commit_ids = {}
 
     @LazyProperty
     def _remote(self):
         repo_id = self.path
         return connection.Hg(self.path, repo_id, self.config, with_wire=self.with_wire)
 
     @CachedProperty
     def commit_ids(self):
         """
         Returns list of commit ids, in ascending order.  Being lazy
         attribute allows external tools to inject shas from cache.
         """
         commit_ids = self._get_all_commit_ids()
         self._rebuild_cache(commit_ids)
         return commit_ids
 
     def _rebuild_cache(self, commit_ids):
         self._commit_ids = dict((commit_id, index)
                                 for index, commit_id in enumerate(commit_ids))
 
     @CachedProperty
     def branches(self):
         return self._get_branches()
 
     @CachedProperty
     def branches_closed(self):
         return self._get_branches(active=False, closed=True)
 
     @CachedProperty
     def branches_all(self):
         all_branches = {}
         all_branches.update(self.branches)
         all_branches.update(self.branches_closed)
         return all_branches
 
     def _get_branches(self, active=True, closed=False):
         """
         Gets branches for this repository
         Returns only not closed active branches by default
 
         :param active: return also active branches
         :param closed: return also closed branches
 
         """
         if self.is_empty():
             return {}
 
         def get_name(ctx):
             return ctx[0]
 
         _branches = [(safe_unicode(n), hexlify(h),) for n, h in
                      self._remote.branches(active, closed).items()]
 
         return OrderedDict(sorted(_branches, key=get_name, reverse=False))
 
     @CachedProperty
     def tags(self):
         """
         Gets tags for this repository
         """
         return self._get_tags()
 
     def _get_tags(self):
         if self.is_empty():
             return {}
 
         def get_name(ctx):
             return ctx[0]
 
         _tags = [(safe_unicode(n), hexlify(h),) for n, h in
                  self._remote.tags().items()]
 
         return OrderedDict(sorted(_tags, key=get_name, reverse=True))
 
     def tag(self, name, user, commit_id=None, message=None, date=None, **kwargs):
         """
         Creates and returns a tag for the given ``commit_id``.
 
         :param name: name for new tag
         :param user: full username, i.e.: "Joe Doe <[e-mail]>"
         :param commit_id: commit id for which new tag would be created
         :param message: message of the tag's commit
         :param date: date of tag's commit
 
         :raises TagAlreadyExistError: if tag with same name already exists
         """
         if name in self.tags:
             raise TagAlreadyExistError("Tag %s already exists" % name)
 
         commit = self.get_commit(commit_id=commit_id)
         local = kwargs.setdefault('local', False)
 
         if message is None:
             message = "Added tag %s for commit %s" % (name, commit.short_id)
 
         date, tz = date_to_timestamp_plus_offset(date)
 
         self._remote.tag(name, commit.raw_id, message, local, user, date, tz)
         self._remote.invalidate_vcs_cache()
 
         # Reinitialize tags
         self._invalidate_prop_cache('tags')
         tag_id = self.tags[name]
 
         return self.get_commit(commit_id=tag_id)
 
     def remove_tag(self, name, user, message=None, date=None):
         """
         Removes tag with the given `name`.
 
         :param name: name of the tag to be removed
         :param user: full username, i.e.: "Joe Doe <[e-mail]>"
         :param message: message of the tag's removal commit
         :param date: date of tag's removal commit
 
         :raises TagDoesNotExistError: if tag with given name does not exists
         """
         if name not in self.tags:
             raise TagDoesNotExistError("Tag %s does not exist" % name)
 
         if message is None:
             message = "Removed tag %s" % name
         local = False
 
         date, tz = date_to_timestamp_plus_offset(date)
 
         self._remote.tag(name, nullid, message, local, user, date, tz)
         self._remote.invalidate_vcs_cache()
         self._invalidate_prop_cache('tags')
 
     @LazyProperty
     def bookmarks(self):
         """
         Gets bookmarks for this repository
         """
         return self._get_bookmarks()
 
     def _get_bookmarks(self):
         if self.is_empty():
             return {}
 
         def get_name(ctx):
             return ctx[0]
 
         _bookmarks = [
             (safe_unicode(n), hexlify(h)) for n, h in
             self._remote.bookmarks().items()]
 
         return OrderedDict(sorted(_bookmarks, key=get_name))
 
     def _get_all_commit_ids(self):
         return self._remote.get_all_commit_ids('visible')
 
     def get_diff(
             self, commit1, commit2, path='', ignore_whitespace=False,
             context=3, path1=None):
         """
         Returns (git like) *diff*, as plain text. Shows changes introduced by
         `commit2` since `commit1`.
 
         :param commit1: Entry point from which diff is shown. Can be
           ``self.EMPTY_COMMIT`` - in this case, patch showing all
           the changes since empty state of the repository until `commit2`
         :param commit2: Until which commit changes should be shown.
         :param ignore_whitespace: If set to ``True``, would not show whitespace
           changes. Defaults to ``False``.
         :param context: How many lines before/after changed lines should be
           shown. Defaults to ``3``.
         """
         self._validate_diff_commits(commit1, commit2)
         if path1 is not None and path1 != path:
             raise ValueError("Diff of two different paths not supported.")
 
         if path:
             file_filter = [self.path, path]
         else:
             file_filter = None
 
         diff = self._remote.diff(
             commit1.raw_id, commit2.raw_id, file_filter=file_filter,
             opt_git=True, opt_ignorews=ignore_whitespace,
             context=context)
         return MercurialDiff(diff)
 
     def strip(self, commit_id, branch=None):
         self._remote.strip(commit_id, update=False, backup="none")
 
         self._remote.invalidate_vcs_cache()
         # clear cache
         self._invalidate_prop_cache('commit_ids')
 
         return len(self.commit_ids)
 
     def verify(self):
         verify = self._remote.verify()
 
         self._remote.invalidate_vcs_cache()
         return verify
 
     def hg_update_cache(self):
         update_cache = self._remote.hg_update_cache()
 
         self._remote.invalidate_vcs_cache()
         return update_cache
 
     def hg_rebuild_fn_cache(self):
         update_cache = self._remote.hg_rebuild_fn_cache()
 
         self._remote.invalidate_vcs_cache()
         return update_cache
 
     def get_common_ancestor(self, commit_id1, commit_id2, repo2):
         log.debug('Calculating common ancestor between %sc1:%s and %sc2:%s',
                   self, commit_id1, repo2, commit_id2)
 
         if commit_id1 == commit_id2:
             return commit_id1
 
         ancestors = self._remote.revs_from_revspec(
             "ancestor(id(%s), id(%s))", commit_id1, commit_id2,
             other_path=repo2.path)
 
         ancestor_id = repo2[ancestors[0]].raw_id if ancestors else None
 
         log.debug('Found common ancestor with sha: %s', ancestor_id)
         return ancestor_id
 
     def compare(self, commit_id1, commit_id2, repo2, merge, pre_load=None):
         if commit_id1 == commit_id2:
             commits = []
         else:
             if merge:
                 indexes = self._remote.revs_from_revspec(
                     "ancestors(id(%s)) - ancestors(id(%s)) - id(%s)",
                     commit_id2, commit_id1, commit_id1, other_path=repo2.path)
             else:
                 indexes = self._remote.revs_from_revspec(
                     "id(%s)..id(%s) - id(%s)", commit_id1, commit_id2,
                     commit_id1, other_path=repo2.path)
 
             commits = [repo2.get_commit(commit_idx=idx, pre_load=pre_load)
                        for idx in indexes]
 
         return commits
 
     @staticmethod
     def check_url(url, config):
         """
         Function will check given url and try to verify if it's a valid
         link. Sometimes it may happened that mercurial will issue basic
         auth request that can cause whole API to hang when used from python
         or other external calls.
 
         On failures it'll raise urllib2.HTTPError, exception is also thrown
         when the return code is non 200
         """
         # check first if it's not an local url
         if os.path.isdir(url) or url.startswith('file:'):
             return True
 
         # Request the _remote to verify the url
         return connection.Hg.check_url(url, config.serialize())
 
     @staticmethod
     def is_valid_repository(path):
         return os.path.isdir(os.path.join(path, '.hg'))
 
     def _init_repo(self, create, src_url=None, do_workspace_checkout=False):
         """
         Function will check for mercurial repository in given path. If there
         is no repository in that path it will raise an exception unless
         `create` parameter is set to True - in that case repository would
         be created.
 
         If `src_url` is given, would try to clone repository from the
         location at given clone_point. Additionally it'll make update to
         working copy accordingly to `do_workspace_checkout` flag.
         """
         if create and os.path.exists(self.path):
             raise RepositoryError(
                 "Cannot create repository at %s, location already exist"
                 % self.path)
 
         if src_url:
             url = str(self._get_url(src_url))
             MercurialRepository.check_url(url, self.config)
 
             self._remote.clone(url, self.path, do_workspace_checkout)
 
             # Don't try to create if we've already cloned repo
             create = False
 
         if create:
             os.makedirs(self.path, mode=0o755)
         self._remote.localrepository(create)
 
     @LazyProperty
     def in_memory_commit(self):
         return MercurialInMemoryCommit(self)
 
     @LazyProperty
     def description(self):
         description = self._remote.get_config_value(
             'web', 'description', untrusted=True)
         return safe_unicode(description or self.DEFAULT_DESCRIPTION)
 
     @LazyProperty
     def contact(self):
         contact = (
             self._remote.get_config_value("web", "contact") or
             self._remote.get_config_value("ui", "username"))
         return safe_unicode(contact or self.DEFAULT_CONTACT)
 
     @LazyProperty
     def last_change(self):
         """
         Returns last change made on this repository as
         `datetime.datetime` object.
         """
         try:
             return self.get_commit().date
         except RepositoryError:
             tzoffset = makedate()[1]
             return utcdate_fromtimestamp(self._get_fs_mtime(), tzoffset)
 
     def _get_fs_mtime(self):
         # fallback to filesystem
         cl_path = os.path.join(self.path, '.hg', "00changelog.i")
         st_path = os.path.join(self.path, '.hg', "store")
         if os.path.exists(cl_path):
             return os.stat(cl_path).st_mtime
         else:
             return os.stat(st_path).st_mtime
 
     def _get_url(self, url):
         """
         Returns normalized url. If schema is not given, would fall
         to filesystem
         (``file:///``) schema.
         """
         url = url.encode('utf8')
         if url != 'default' and '://' not in url:
             url = "file:" + urllib.pathname2url(url)
         return url
 
     def get_hook_location(self):
         """
         returns absolute path to location where hooks are stored
         """
         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):
         """
         Returns ``MercurialCommit`` object representing repository's
         commit at the given `commit_id` or `commit_idx`.
         """
         if self.is_empty():
             raise EmptyRepositoryError("There are no commits yet")
 
         if commit_id is not None:
             self._validate_commit_id(commit_id)
             try:
                 # we have cached idx, use it without contacting the remote
                 idx = self._commit_ids[commit_id]
                 return MercurialCommit(self, commit_id, idx, pre_load=pre_load)
             except KeyError:
                 pass
 
         elif commit_idx is not None:
             self._validate_commit_idx(commit_idx)
             try:
                 _commit_id = self.commit_ids[commit_idx]
                 if commit_idx < 0:
                     commit_idx = self.commit_ids.index(_commit_id)
 
                 return MercurialCommit(self, _commit_id, commit_idx, pre_load=pre_load)
             except IndexError:
                 commit_id = commit_idx
         else:
             commit_id = "tip"
 
         if isinstance(commit_id, unicode):
             commit_id = safe_str(commit_id)
 
         try:
             raw_id, idx = self._remote.lookup(commit_id, both=True)
         except CommitDoesNotExistError:
             msg = "Commit {} does not exist for `{}`".format(
                 *map(safe_str, [commit_id, self.name]))
             raise CommitDoesNotExistError(msg)
 
         return MercurialCommit(self, raw_id, idx, pre_load=pre_load)
 
     def get_commits(
             self, start_id=None, end_id=None, start_date=None, end_date=None,
             branch_name=None, show_hidden=False, pre_load=None, translate_tags=None):
         """
         Returns generator of ``MercurialCommit`` objects from start to end
         (both are inclusive)
 
         :param start_id: None, str(commit_id)
         :param end_id: None, str(commit_id)
         :param start_date: if specified, commits with commit date less than
           ``start_date`` would be filtered out from returned set
         :param end_date: if specified, commits with commit date greater than
           ``end_date`` would be filtered out from returned set
         :param branch_name: if specified, commits not reachable from given
           branch would be filtered out from returned set
         :param show_hidden: Show hidden commits such as obsolete or hidden from
             Mercurial evolve
         :raise BranchDoesNotExistError: If given ``branch_name`` does not
             exist.
         :raise CommitDoesNotExistError: If commit for given ``start`` or
           ``end`` could not be found.
         """
         # actually we should check now if it's not an empty repo
         if self.is_empty():
             raise EmptyRepositoryError("There are no commits yet")
         self._validate_branch_name(branch_name)
 
         branch_ancestors = False
         if start_id is not None:
             self._validate_commit_id(start_id)
             c_start = self.get_commit(commit_id=start_id)
             start_pos = self._commit_ids[c_start.raw_id]
         else:
             start_pos = None
 
         if end_id is not None:
             self._validate_commit_id(end_id)
             c_end = self.get_commit(commit_id=end_id)
             end_pos = max(0, self._commit_ids[c_end.raw_id])
         else:
             end_pos = None
 
         if None not in [start_id, end_id] and start_pos > end_pos:
             raise RepositoryError(
                 "Start commit '%s' cannot be after end commit '%s'" %
                 (start_id, end_id))
 
         if end_pos is not None:
             end_pos += 1
 
         commit_filter = []
 
         if branch_name and not branch_ancestors:
             commit_filter.append('branch("%s")' % (branch_name,))
         elif branch_name and branch_ancestors:
             commit_filter.append('ancestors(branch("%s"))' % (branch_name,))
 
         if start_date and not end_date:
             commit_filter.append('date(">%s")' % (start_date,))
         if end_date and not start_date:
             commit_filter.append('date("<%s")' % (end_date,))
         if start_date and end_date:
             commit_filter.append(
                 'date(">%s") and date("<%s")' % (start_date, end_date))
 
         if not show_hidden:
             commit_filter.append('not obsolete()')
             commit_filter.append('not hidden()')
 
         # TODO: johbo: Figure out a simpler way for this solution
         collection_generator = CollectionGenerator
         if commit_filter:
             commit_filter = ' and '.join(map(safe_str, commit_filter))
             revisions = self._remote.rev_range([commit_filter])
             collection_generator = MercurialIndexBasedCollectionGenerator
         else:
             revisions = self.commit_ids
 
         if start_pos or end_pos:
             revisions = revisions[start_pos:end_pos]
 
         return collection_generator(self, revisions, pre_load=pre_load)
 
     def pull(self, url, commit_ids=None):
         """
         Pull changes from external location.
 
         :param commit_ids: Optional. Can be set to a list of commit ids
            which shall be pulled from the other repository.
         """
         url = self._get_url(url)
         self._remote.pull(url, commit_ids=commit_ids)
         self._remote.invalidate_vcs_cache()
 
     def fetch(self, url, commit_ids=None):
         """
         Backward compatibility with GIT fetch==pull
         """
         return self.pull(url, commit_ids=commit_ids)
 
     def push(self, url):
         url = self._get_url(url)
         self._remote.sync_push(url)
 
     def _local_clone(self, clone_path):
         """
         Create a local clone of the current repo.
         """
         self._remote.clone(self.path, clone_path, update_after_clone=True,
                            hooks=False)
 
     def _update(self, revision, clean=False):
         """
         Update the working copy to the specified revision.
         """
         log.debug('Doing checkout to commit: `%s` for %s', revision, self)
         self._remote.update(revision, clean=clean)
 
     def _identify(self):
         """
         Return the current state of the working directory.
         """
         return self._remote.identify().strip().rstrip('+')
 
     def _heads(self, branch=None):
         """
         Return the commit ids of the repository heads.
         """
         return self._remote.heads(branch=branch).strip().split(' ')
 
     def _ancestor(self, revision1, revision2):
         """
         Return the common ancestor of the two revisions.
         """
         return self._remote.ancestor(revision1, revision2)
 
     def _local_push(
             self, revision, repository_path, push_branches=False,
             enable_hooks=False):
         """
         Push the given revision to the specified repository.
 
         :param push_branches: allow to create branches in the target repo.
         """
         self._remote.push(
             [revision], repository_path, hooks=enable_hooks,
             push_branches=push_branches)
 
     def _local_merge(self, target_ref, merge_message, user_name, user_email,
                      source_ref, use_rebase=False, close_commit_id=None, dry_run=False):
         """
         Merge the given source_revision into the checked out revision.
 
         Returns the commit id of the merge and a boolean indicating if the
         commit needs to be pushed.
         """
         source_ref_commit_id = source_ref.commit_id
         target_ref_commit_id = target_ref.commit_id
 
         # update our workdir to target ref, for proper merge
         self._update(target_ref_commit_id, clean=True)
 
         ancestor = self._ancestor(target_ref_commit_id, source_ref_commit_id)
         is_the_same_branch = self._is_the_same_branch(target_ref, source_ref)
 
         if close_commit_id:
             # NOTE(marcink): if we get the close commit, this is our new source
             # which will include the close commit itself.
             source_ref_commit_id = close_commit_id
 
         if ancestor == source_ref_commit_id:
             # Nothing to do, the changes were already integrated
             return target_ref_commit_id, False
 
         elif ancestor == target_ref_commit_id and is_the_same_branch:
             # In this case we should force a commit message
             return source_ref_commit_id, True
 
         unresolved = None
         if use_rebase:
             try:
                 bookmark_name = 'rcbook%s%s' % (source_ref_commit_id, target_ref_commit_id)
                 self.bookmark(bookmark_name, revision=source_ref.commit_id)
                 self._remote.rebase(
                     source=source_ref_commit_id, dest=target_ref_commit_id)
                 self._remote.invalidate_vcs_cache()
                 self._update(bookmark_name, clean=True)
                 return self._identify(), True
             except RepositoryError as e:
                 # The rebase-abort may raise another exception which 'hides'
                 # the original one, therefore we log it here.
                 log.exception('Error while rebasing shadow repo during merge.')
                 if 'unresolved conflicts' in safe_str(e):
                     unresolved = self._remote.get_unresolved_files()
                     log.debug('unresolved files: %s', unresolved)
 
                 # Cleanup any rebase leftovers
                 self._remote.invalidate_vcs_cache()
                 self._remote.rebase(abort=True)
                 self._remote.invalidate_vcs_cache()
                 self._remote.update(clean=True)
                 if unresolved:
                     raise UnresolvedFilesInRepo(unresolved)
                 else:
                     raise
         else:
             try:
                 self._remote.merge(source_ref_commit_id)
                 self._remote.invalidate_vcs_cache()
                 self._remote.commit(
                     message=safe_str(merge_message),
                     username=safe_str('%s <%s>' % (user_name, user_email)))
                 self._remote.invalidate_vcs_cache()
                 return self._identify(), True
             except RepositoryError as e:
                 # The merge-abort may raise another exception which 'hides'
                 # the original one, therefore we log it here.
                 log.exception('Error while merging shadow repo during merge.')
                 if 'unresolved merge conflicts' in safe_str(e):
                     unresolved = self._remote.get_unresolved_files()
                     log.debug('unresolved files: %s', unresolved)
 
                 # Cleanup any merge leftovers
                 self._remote.update(clean=True)
                 if unresolved:
                     raise UnresolvedFilesInRepo(unresolved)
                 else:
                     raise
 
     def _local_close(self, target_ref, user_name, user_email,
                      source_ref, close_message=''):
         """
         Close the branch of the given source_revision
 
         Returns the commit id of the close and a boolean indicating if the
         commit needs to be pushed.
         """
         self._update(source_ref.commit_id)
         message = close_message or "Closing branch: `{}`".format(source_ref.name)
         try:
             self._remote.commit(
                 message=safe_str(message),
                 username=safe_str('%s <%s>' % (user_name, user_email)),
                 close_branch=True)
             self._remote.invalidate_vcs_cache()
             return self._identify(), True
         except RepositoryError:
             # Cleanup any commit leftovers
             self._remote.update(clean=True)
             raise
 
     def _is_the_same_branch(self, target_ref, source_ref):
         return (
             self._get_branch_name(target_ref) ==
             self._get_branch_name(source_ref))
 
     def _get_branch_name(self, ref):
         if ref.type == 'branch':
             return ref.name
         return self._remote.ctx_branch(ref.commit_id)
 
     def _maybe_prepare_merge_workspace(
             self, repo_id, workspace_id, unused_target_ref, unused_source_ref):
         shadow_repository_path = self._get_shadow_repository_path(
             self.path, repo_id, workspace_id)
         if not os.path.exists(shadow_repository_path):
             self._local_clone(shadow_repository_path)
             log.debug(
                 'Prepared shadow repository in %s', shadow_repository_path)
 
         return shadow_repository_path
 
     def _merge_repo(self, repo_id, workspace_id, target_ref,
                     source_repo, source_ref, merge_message,
                     merger_name, merger_email, dry_run=False,
                     use_rebase=False, close_branch=False):
 
         log.debug('Executing merge_repo with %s strategy, dry_run mode:%s',
                   'rebase' if use_rebase else 'merge', dry_run)
         if target_ref.commit_id not in self._heads():
             return MergeResponse(
                 False, False, None, MergeFailureReason.TARGET_IS_NOT_HEAD,
                 metadata={'target_ref': target_ref})
 
         try:
             if target_ref.type == 'branch' and len(self._heads(target_ref.name)) != 1:
-                heads = '\n,'.join(self._heads(target_ref.name))
+                heads_all = self._heads(target_ref.name)
+                max_heads = 10
+                if len(heads_all) > max_heads:
+                    heads = '\n,'.join(
+                        heads_all[:max_heads] +
+                        ['and {} more.'.format(len(heads_all)-max_heads)])
+                else:
+                    heads = '\n,'.join(heads_all)
                 metadata = {
                     'target_ref': target_ref,
                     'source_ref': source_ref,
                     'heads': heads
                 }
                 return MergeResponse(
                     False, False, None,
                     MergeFailureReason.HG_TARGET_HAS_MULTIPLE_HEADS,
                     metadata=metadata)
         except CommitDoesNotExistError:
             log.exception('Failure when looking up branch heads on hg target')
             return MergeResponse(
                 False, False, None, MergeFailureReason.MISSING_TARGET_REF,
                 metadata={'target_ref': target_ref})
 
         shadow_repository_path = self._maybe_prepare_merge_workspace(
             repo_id, workspace_id, target_ref, source_ref)
         shadow_repo = self.get_shadow_instance(shadow_repository_path)
 
         log.debug('Pulling in target reference %s', target_ref)
         self._validate_pull_reference(target_ref)
         shadow_repo._local_pull(self.path, target_ref)
 
         try:
             log.debug('Pulling in source reference %s', source_ref)
             source_repo._validate_pull_reference(source_ref)
             shadow_repo._local_pull(source_repo.path, source_ref)
         except CommitDoesNotExistError:
             log.exception('Failure when doing local pull on hg shadow repo')
             return MergeResponse(
                 False, False, None, MergeFailureReason.MISSING_SOURCE_REF,
                 metadata={'source_ref': source_ref})
 
         merge_ref = None
         merge_commit_id = None
         close_commit_id = None
         merge_failure_reason = MergeFailureReason.NONE
         metadata = {}
 
         # enforce that close branch should be used only in case we source from
         # an actual Branch
         close_branch = close_branch and source_ref.type == 'branch'
 
         # don't allow to close branch if source and target are the same
         close_branch = close_branch and source_ref.name != target_ref.name
 
         needs_push_on_close = False
         if close_branch and not use_rebase and not dry_run:
             try:
                 close_commit_id, needs_push_on_close = shadow_repo._local_close(
                     target_ref, merger_name, merger_email, source_ref)
                 merge_possible = True
             except RepositoryError:
                 log.exception('Failure when doing close branch on '
                               'shadow repo: %s', shadow_repo)
                 merge_possible = False
                 merge_failure_reason = MergeFailureReason.MERGE_FAILED
         else:
             merge_possible = True
 
         needs_push = False
         if merge_possible:
 
             try:
                 merge_commit_id, needs_push = shadow_repo._local_merge(
                     target_ref, merge_message, merger_name, merger_email,
                     source_ref, use_rebase=use_rebase,
                     close_commit_id=close_commit_id, dry_run=dry_run)
                 merge_possible = True
 
                 # read the state of the close action, if it
                 # maybe required a push
                 needs_push = needs_push or needs_push_on_close
 
                 # Set a bookmark pointing to the merge commit. This bookmark
                 # may be used to easily identify the last successful merge
                 # commit in the shadow repository.
                 shadow_repo.bookmark('pr-merge', revision=merge_commit_id)
                 merge_ref = Reference('book', 'pr-merge', merge_commit_id)
             except SubrepoMergeError:
                 log.exception(
                     'Subrepo merge error during local merge on hg shadow repo.')
                 merge_possible = False
                 merge_failure_reason = MergeFailureReason.SUBREPO_MERGE_FAILED
                 needs_push = False
             except RepositoryError as e:
                 log.exception('Failure when doing local merge on hg shadow repo')
                 if isinstance(e, UnresolvedFilesInRepo):
-                    metadata['unresolved_files'] = '\n* conflict: ' + ('\n * conflict: '.join(e.args[0]))
+                    all_conflicts = list(e.args[0])
+                    max_conflicts = 20
+                    if len(all_conflicts) > max_conflicts:
+                        conflicts = all_conflicts[:max_conflicts] \
+                                    + ['and {} more.'.format(len(all_conflicts)-max_conflicts)]
+                    else:
+                        conflicts = all_conflicts
+                    metadata['unresolved_files'] = \
+                        '\n* conflict: ' + \
+                        ('\n * conflict: '.join(conflicts))
 
                 merge_possible = False
                 merge_failure_reason = MergeFailureReason.MERGE_FAILED
                 needs_push = False
 
         if merge_possible and not dry_run:
             if needs_push:
                 # In case the target is a bookmark, update it, so after pushing
                 # the bookmarks is also updated in the target.
                 if target_ref.type == 'book':
                     shadow_repo.bookmark(
                         target_ref.name, revision=merge_commit_id)
                 try:
                     shadow_repo_with_hooks = self.get_shadow_instance(
                         shadow_repository_path,
                         enable_hooks=True)
                     # This is the actual merge action, we push from shadow
                     # into origin.
                     # Note: the push_branches option will push any new branch
                     # defined in the source repository to the target. This may
                     # be dangerous as branches are permanent in Mercurial.
                     # This feature was requested in issue #441.
                     shadow_repo_with_hooks._local_push(
                         merge_commit_id, self.path, push_branches=True,
                         enable_hooks=True)
 
                     # maybe we also need to push the close_commit_id
                     if close_commit_id:
                         shadow_repo_with_hooks._local_push(
                             close_commit_id, self.path, push_branches=True,
                             enable_hooks=True)
                     merge_succeeded = True
                 except RepositoryError:
                     log.exception(
                         'Failure when doing local push from the shadow '
                         'repository to the target repository at %s.', self.path)
                     merge_succeeded = False
                     merge_failure_reason = MergeFailureReason.PUSH_FAILED
                     metadata['target'] = 'hg shadow repo'
                     metadata['merge_commit'] = merge_commit_id
             else:
                 merge_succeeded = True
         else:
             merge_succeeded = False
 
         return MergeResponse(
             merge_possible, merge_succeeded, merge_ref, merge_failure_reason,
             metadata=metadata)
 
     def get_shadow_instance(self, shadow_repository_path, enable_hooks=False, cache=False):
         config = self.config.copy()
         if not enable_hooks:
             config.clear_section('hooks')
         return MercurialRepository(shadow_repository_path, config, with_wire={"cache": cache})
 
     def _validate_pull_reference(self, reference):
         if not (reference.name in self.bookmarks or
                 reference.name in self.branches or
                 self.get_commit(reference.commit_id)):
             raise CommitDoesNotExistError(
                 'Unknown branch, bookmark or commit id')
 
     def _local_pull(self, repository_path, reference):
         """
         Fetch a branch, bookmark or commit from a local repository.
         """
         repository_path = os.path.abspath(repository_path)
         if repository_path == self.path:
             raise ValueError('Cannot pull from the same repository')
 
         reference_type_to_option_name = {
             'book': 'bookmark',
             'branch': 'branch',
         }
         option_name = reference_type_to_option_name.get(
             reference.type, 'revision')
 
         if option_name == 'revision':
             ref = reference.commit_id
         else:
             ref = reference.name
 
         options = {option_name: [ref]}
         self._remote.pull_cmd(repository_path, hooks=False, **options)
         self._remote.invalidate_vcs_cache()
 
     def bookmark(self, bookmark, revision=None):
         if isinstance(bookmark, unicode):
             bookmark = safe_str(bookmark)
         self._remote.bookmark(bookmark, revision=revision)
         self._remote.invalidate_vcs_cache()
 
     def get_path_permissions(self, username):
         hgacl_file = os.path.join(self.path, '.hg/hgacl')
 
         def read_patterns(suffix):
             svalue = None
             for section, option in [
                 ('narrowacl', username + suffix),
                 ('narrowacl', 'default' + suffix),
                 ('narrowhgacl', username + suffix),
                 ('narrowhgacl', 'default' + suffix)
             ]:
                 try:
                     svalue = hgacl.get(section, option)
                     break  # stop at the first value we find
                 except configparser.NoOptionError:
                     pass
             if not svalue:
                 return None
             result = ['/']
             for pattern in svalue.split():
                 result.append(pattern)
                 if '*' not in pattern and '?' not in pattern:
                     result.append(pattern + '/*')
             return result
 
         if os.path.exists(hgacl_file):
             try:
                 hgacl = configparser.RawConfigParser()
                 hgacl.read(hgacl_file)
 
                 includes = read_patterns('.includes')
                 excludes = read_patterns('.excludes')
                 return BasePathPermissionChecker.create_from_patterns(
                     includes, excludes)
             except BaseException as e:
                 msg = 'Cannot read ACL settings from {} on {}: {}'.format(
                     hgacl_file, self.name, e)
                 raise exceptions.RepositoryRequirementError(msg)
         else:
             return None
 
 
 class MercurialIndexBasedCollectionGenerator(CollectionGenerator):
 
     def _commit_factory(self, commit_id):
         return self.repo.get_commit(
             commit_idx=commit_id, pre_load=self.pre_load)

rhodecode/lib/vcs/exceptions.py

@@ -1,234 +1,234 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2014-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/
 
 """
 Custom vcs exceptions module.
 """
 import logging
 import functools
 import urllib2
 import rhodecode
 from pyramid import compat
 
 log = logging.getLogger(__name__)
 
 
 class VCSCommunicationError(Exception):
     pass
 
 
 class HttpVCSCommunicationError(VCSCommunicationError):
     pass
 
 
 class VCSError(Exception):
     pass
 
 
 class RepositoryError(VCSError):
     pass
 
 
 class RepositoryRequirementError(RepositoryError):
     pass
 
 
 class UnresolvedFilesInRepo(RepositoryError):
     pass
 
 
 class VCSBackendNotSupportedError(VCSError):
     """
     Exception raised when VCSServer does not support requested backend
     """
 
 
 class EmptyRepositoryError(RepositoryError):
     pass
 
 
 class TagAlreadyExistError(RepositoryError):
     pass
 
 
 class TagDoesNotExistError(RepositoryError):
     pass
 
 
 class BranchAlreadyExistError(RepositoryError):
     pass
 
 
 class BranchDoesNotExistError(RepositoryError):
     pass
 
 
 class CommitError(RepositoryError):
     """
     Exceptions related to an existing commit
     """
 
 
 class CommitDoesNotExistError(CommitError):
     pass
 
 
 class CommittingError(RepositoryError):
     """
     Exceptions happening while creating a new commit
     """
 
 
 class NothingChangedError(CommittingError):
     pass
 
 
 class NodeError(VCSError):
     pass
 
 
 class RemovedFileNodeError(NodeError):
     pass
 
 
 class NodeAlreadyExistsError(CommittingError):
     pass
 
 
 class NodeAlreadyChangedError(CommittingError):
     pass
 
 
 class NodeDoesNotExistError(CommittingError):
     pass
 
 
 class NodeNotChangedError(CommittingError):
     pass
 
 
 class NodeAlreadyAddedError(CommittingError):
     pass
 
 
 class NodeAlreadyRemovedError(CommittingError):
     pass
 
 
 class SubrepoMergeError(RepositoryError):
     """
     This happens if we try to merge a repository which contains subrepos and
     the subrepos cannot be merged. The subrepos are not merged itself but
     their references in the root repo are merged.
     """
 
 
 class ImproperArchiveTypeError(VCSError):
     pass
 
 
 class CommandError(VCSError):
     pass
 
 
 class UnhandledException(VCSError):
     """
     Signals that something unexpected went wrong.
 
     This usually means we have a programming error on the side of the VCSServer
     and should inspect the logfile of the VCSServer to find more details.
     """
 
 
 _EXCEPTION_MAP = {
     'abort': RepositoryError,
     'archive': ImproperArchiveTypeError,
     'error': RepositoryError,
     'lookup': CommitDoesNotExistError,
     'repo_locked': RepositoryError,
     'requirement': RepositoryRequirementError,
     'unhandled': UnhandledException,
     # TODO: johbo: Define our own exception for this and stop abusing
     # urllib's exception class.
     'url_error': urllib2.URLError,
     'subrepo_merge_error': SubrepoMergeError,
 }
 
 
 def map_vcs_exceptions(func):
     """
     Utility to decorate functions so that plain exceptions are translated.
 
     The translation is based on `exc_map` which maps a `str` indicating
     the error type into an exception class representing this error inside
     of the vcs layer.
     """
 
     @functools.wraps(func)
     def wrapper(*args, **kwargs):
         try:
             return func(*args, **kwargs)
         except Exception as e:
             from rhodecode.lib.utils2 import str2bool
             debug = str2bool(rhodecode.CONFIG.get('debug'))
 
             # The error middleware adds information if it finds
             # __traceback_info__ in a frame object. This way the remote
             # traceback information is made available in error reports.
             remote_tb = getattr(e, '_vcs_server_traceback', None)
             org_remote_tb = getattr(e, '_vcs_server_org_exc_tb', '')
             __traceback_info__ = None
             if remote_tb:
                 if isinstance(remote_tb, compat.string_types):
                     remote_tb = [remote_tb]
                 __traceback_info__ = (
                     'Found VCSServer remote traceback information:\n'
                     '{}\n'
                     '+++ BEG SOURCE EXCEPTION +++\n\n'
                     '{}\n'
                     '+++ END SOURCE EXCEPTION +++\n'
                     ''.format('\n'.join(remote_tb), org_remote_tb)
                 )
 
                 # Avoid that remote_tb also appears in the frame
                 del remote_tb
 
             # Special vcs errors had an attribute "_vcs_kind" which is used
             # to translate them to the proper exception class in the vcs
             # client layer.
             kind = getattr(e, '_vcs_kind', None)
             exc_name = getattr(e, '_vcs_server_org_exc_name', None)
 
             if kind:
                 if any(e.args):
                     _args = [a for a in e.args]
                     # replace the first argument with a prefix exc name
-                    args = ['{}:'.format(exc_name, _args[0] if _args else '?')] + _args[1:]
+                    args = ['{}:{}'.format(exc_name, _args[0] if _args else '?')] + _args[1:]
                 else:
                     args = [__traceback_info__ or '{}: UnhandledException'.format(exc_name)]
                 if debug or __traceback_info__ and kind not in ['unhandled', 'lookup']:
                     # for other than unhandled errors also log the traceback
                     # can be useful for debugging
                     log.error(__traceback_info__)
 
                 raise _EXCEPTION_MAP[kind](*args)
             else:
                 raise
     return wrapper

rhodecode/model/comment.py

@@ -1,852 +1,857 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2011-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/
 
 """
 comments model for RhodeCode
 """
 import datetime
 
 import logging
 import traceback
 import collections
 
 from pyramid.threadlocal import get_current_registry, get_current_request
 from sqlalchemy.sql.expression import null
 from sqlalchemy.sql.functions import coalesce
 
 from rhodecode.lib import helpers as h, diffs, channelstream, hooks_utils
 from rhodecode.lib import audit_logger
 from rhodecode.lib.exceptions import CommentVersionMismatch
 from rhodecode.lib.utils2 import extract_mentioned_users, safe_str, safe_int
 from rhodecode.model import BaseModel
 from rhodecode.model.db import (
     false, true,
     ChangesetComment,
     User,
     Notification,
     PullRequest,
     AttributeDict,
     ChangesetCommentHistory,
 )
 from rhodecode.model.notification import NotificationModel
 from rhodecode.model.meta import Session
 from rhodecode.model.settings import VcsSettingsModel
 from rhodecode.model.notification import EmailNotificationModel
 from rhodecode.model.validation_schema.schemas import comment_schema
 
 
 log = logging.getLogger(__name__)
 
 
 class CommentsModel(BaseModel):
 
     cls = ChangesetComment
 
     DIFF_CONTEXT_BEFORE = 3
     DIFF_CONTEXT_AFTER = 3
 
     def __get_commit_comment(self, changeset_comment):
         return self._get_instance(ChangesetComment, changeset_comment)
 
     def __get_pull_request(self, pull_request):
         return self._get_instance(PullRequest, pull_request)
 
     def _extract_mentions(self, s):
         user_objects = []
         for username in extract_mentioned_users(s):
             user_obj = User.get_by_username(username, case_insensitive=True)
             if user_obj:
                 user_objects.append(user_obj)
         return user_objects
 
     def _get_renderer(self, global_renderer='rst', request=None):
         request = request or get_current_request()
 
         try:
             global_renderer = request.call_context.visual.default_renderer
         except AttributeError:
             log.debug("Renderer not set, falling back "
                       "to default renderer '%s'", global_renderer)
         except Exception:
             log.error(traceback.format_exc())
         return global_renderer
 
     def aggregate_comments(self, comments, versions, show_version, inline=False):
         # group by versions, and count until, and display objects
 
         comment_groups = collections.defaultdict(list)
         [comment_groups[_co.pull_request_version_id].append(_co) for _co in comments]
 
         def yield_comments(pos):
             for co in comment_groups[pos]:
                 yield co
 
         comment_versions = collections.defaultdict(
             lambda: collections.defaultdict(list))
         prev_prvid = -1
         # fake last entry with None, to aggregate on "latest" version which
         # doesn't have an pull_request_version_id
         for ver in versions + [AttributeDict({'pull_request_version_id': None})]:
             prvid = ver.pull_request_version_id
             if prev_prvid == -1:
                 prev_prvid = prvid
 
             for co in yield_comments(prvid):
                 comment_versions[prvid]['at'].append(co)
 
             # save until
             current = comment_versions[prvid]['at']
             prev_until = comment_versions[prev_prvid]['until']
             cur_until = prev_until + current
             comment_versions[prvid]['until'].extend(cur_until)
 
             # save outdated
             if inline:
                 outdated = [x for x in cur_until
                             if x.outdated_at_version(show_version)]
             else:
                 outdated = [x for x in cur_until
                             if x.older_than_version(show_version)]
             display = [x for x in cur_until if x not in outdated]
 
             comment_versions[prvid]['outdated'] = outdated
             comment_versions[prvid]['display'] = display
 
             prev_prvid = prvid
 
         return comment_versions
 
     def get_repository_comments(self, repo, comment_type=None, user=None, commit_id=None):
         qry = Session().query(ChangesetComment) \
             .filter(ChangesetComment.repo == repo)
 
         if comment_type and comment_type in ChangesetComment.COMMENT_TYPES:
             qry = qry.filter(ChangesetComment.comment_type == comment_type)
 
         if user:
             user = self._get_user(user)
             if user:
                 qry = qry.filter(ChangesetComment.user_id == user.user_id)
 
         if commit_id:
             qry = qry.filter(ChangesetComment.revision == commit_id)
 
         qry = qry.order_by(ChangesetComment.created_on)
         return qry.all()
 
     def get_repository_unresolved_todos(self, repo):
         todos = Session().query(ChangesetComment) \
             .filter(ChangesetComment.repo == repo) \
             .filter(ChangesetComment.resolved_by == None) \
             .filter(ChangesetComment.comment_type
                     == ChangesetComment.COMMENT_TYPE_TODO)
         todos = todos.all()
 
         return todos
 
     def get_pull_request_unresolved_todos(self, pull_request, show_outdated=True, include_drafts=True):
 
         todos = Session().query(ChangesetComment) \
             .filter(ChangesetComment.pull_request == pull_request) \
             .filter(ChangesetComment.resolved_by == None) \
             .filter(ChangesetComment.comment_type
                     == ChangesetComment.COMMENT_TYPE_TODO)
 
         if not include_drafts:
             todos = todos.filter(ChangesetComment.draft == false())
 
         if not show_outdated:
             todos = todos.filter(
                 coalesce(ChangesetComment.display_state, '') !=
                 ChangesetComment.COMMENT_OUTDATED)
 
         todos = todos.all()
 
         return todos
 
     def get_pull_request_resolved_todos(self, pull_request, show_outdated=True, include_drafts=True):
 
         todos = Session().query(ChangesetComment) \
             .filter(ChangesetComment.pull_request == pull_request) \
             .filter(ChangesetComment.resolved_by != None) \
             .filter(ChangesetComment.comment_type
                     == ChangesetComment.COMMENT_TYPE_TODO)
 
         if not include_drafts:
             todos = todos.filter(ChangesetComment.draft == false())
 
         if not show_outdated:
             todos = todos.filter(
                 coalesce(ChangesetComment.display_state, '') !=
                 ChangesetComment.COMMENT_OUTDATED)
 
         todos = todos.all()
 
         return todos
 
     def get_pull_request_drafts(self, user_id, pull_request):
         drafts = Session().query(ChangesetComment) \
             .filter(ChangesetComment.pull_request == pull_request) \
             .filter(ChangesetComment.user_id == user_id) \
             .filter(ChangesetComment.draft == true())
         return drafts.all()
 
     def get_commit_unresolved_todos(self, commit_id, show_outdated=True, include_drafts=True):
 
         todos = Session().query(ChangesetComment) \
             .filter(ChangesetComment.revision == commit_id) \
             .filter(ChangesetComment.resolved_by == None) \
             .filter(ChangesetComment.comment_type
                     == ChangesetComment.COMMENT_TYPE_TODO)
 
         if not include_drafts:
             todos = todos.filter(ChangesetComment.draft == false())
 
         if not show_outdated:
             todos = todos.filter(
                 coalesce(ChangesetComment.display_state, '') !=
                 ChangesetComment.COMMENT_OUTDATED)
 
         todos = todos.all()
 
         return todos
 
     def get_commit_resolved_todos(self, commit_id, show_outdated=True, include_drafts=True):
 
         todos = Session().query(ChangesetComment) \
             .filter(ChangesetComment.revision == commit_id) \
             .filter(ChangesetComment.resolved_by != None) \
             .filter(ChangesetComment.comment_type
                     == ChangesetComment.COMMENT_TYPE_TODO)
 
         if not include_drafts:
             todos = todos.filter(ChangesetComment.draft == false())
 
         if not show_outdated:
             todos = todos.filter(
                 coalesce(ChangesetComment.display_state, '') !=
                 ChangesetComment.COMMENT_OUTDATED)
 
         todos = todos.all()
 
         return todos
 
     def get_commit_inline_comments(self, commit_id, include_drafts=True):
         inline_comments = Session().query(ChangesetComment) \
             .filter(ChangesetComment.line_no != None) \
             .filter(ChangesetComment.f_path != None) \
             .filter(ChangesetComment.revision == commit_id)
 
         if not include_drafts:
             inline_comments = inline_comments.filter(ChangesetComment.draft == false())
 
         inline_comments = inline_comments.all()
         return inline_comments
 
     def _log_audit_action(self, action, action_data, auth_user, comment):
         audit_logger.store(
             action=action,
             action_data=action_data,
             user=auth_user,
             repo=comment.repo)
 
     def create(self, text, repo, user, commit_id=None, pull_request=None,
                f_path=None, line_no=None, status_change=None,
                status_change_type=None, comment_type=None, is_draft=False,
                resolves_comment_id=None, closing_pr=False, send_email=True,
                renderer=None, auth_user=None, extra_recipients=None):
         """
         Creates new comment for commit or pull request.
         IF status_change is not none this comment is associated with a
         status change of commit or commit associated with pull request
 
         :param text:
         :param repo:
         :param user:
         :param commit_id:
         :param pull_request:
         :param f_path:
         :param line_no:
         :param status_change: Label for status change
         :param comment_type: Type of comment
         :param is_draft: is comment a draft only
         :param resolves_comment_id: id of comment which this one will resolve
         :param status_change_type: type of status change
         :param closing_pr:
         :param send_email:
         :param renderer: pick renderer for this comment
         :param auth_user: current authenticated user calling this method
         :param extra_recipients: list of extra users to be added to recipients
         """
 
         if not text:
             log.warning('Missing text for comment, skipping...')
             return
         request = get_current_request()
         _ = request.translate
 
         if not renderer:
             renderer = self._get_renderer(request=request)
 
         repo = self._get_repo(repo)
         user = self._get_user(user)
         auth_user = auth_user or user
 
         schema = comment_schema.CommentSchema()
         validated_kwargs = schema.deserialize(dict(
             comment_body=text,
             comment_type=comment_type,
             is_draft=is_draft,
             comment_file=f_path,
             comment_line=line_no,
             renderer_type=renderer,
             status_change=status_change_type,
             resolves_comment_id=resolves_comment_id,
             repo=repo.repo_id,
             user=user.user_id,
         ))
         is_draft = validated_kwargs['is_draft']
 
         comment = ChangesetComment()
         comment.renderer = validated_kwargs['renderer_type']
         comment.text = validated_kwargs['comment_body']
         comment.f_path = validated_kwargs['comment_file']
         comment.line_no = validated_kwargs['comment_line']
         comment.comment_type = validated_kwargs['comment_type']
         comment.draft = is_draft
 
         comment.repo = repo
         comment.author = user
         resolved_comment = self.__get_commit_comment(
             validated_kwargs['resolves_comment_id'])
+
         # check if the comment actually belongs to this PR
         if resolved_comment and resolved_comment.pull_request and \
                 resolved_comment.pull_request != pull_request:
             log.warning('Comment tried to resolved unrelated todo comment: %s',
                         resolved_comment)
             # comment not bound to this pull request, forbid
             resolved_comment = None
 
         elif resolved_comment and resolved_comment.repo and \
                 resolved_comment.repo != repo:
             log.warning('Comment tried to resolved unrelated todo comment: %s',
                         resolved_comment)
             # comment not bound to this repo, forbid
             resolved_comment = None
 
+        if resolved_comment and resolved_comment.resolved_by:
+            # if this comment is already resolved, don't mark it again!
+            resolved_comment = None
+
         comment.resolved_comment = resolved_comment
 
         pull_request_id = pull_request
 
         commit_obj = None
         pull_request_obj = None
 
         if commit_id:
             notification_type = EmailNotificationModel.TYPE_COMMIT_COMMENT
             # do a lookup, so we don't pass something bad here
             commit_obj = repo.scm_instance().get_commit(commit_id=commit_id)
             comment.revision = commit_obj.raw_id
 
         elif pull_request_id:
             notification_type = EmailNotificationModel.TYPE_PULL_REQUEST_COMMENT
             pull_request_obj = self.__get_pull_request(pull_request_id)
             comment.pull_request = pull_request_obj
         else:
             raise Exception('Please specify commit or pull_request_id')
 
         Session().add(comment)
         Session().flush()
         kwargs = {
             'user': user,
             'renderer_type': renderer,
             'repo_name': repo.repo_name,
             'status_change': status_change,
             'status_change_type': status_change_type,
             'comment_body': text,
             'comment_file': f_path,
             'comment_line': line_no,
             'comment_type': comment_type or 'note',
             'comment_id': comment.comment_id
         }
 
         if commit_obj:
             recipients = ChangesetComment.get_users(
                 revision=commit_obj.raw_id)
             # add commit author if it's in RhodeCode system
             cs_author = User.get_from_cs_author(commit_obj.author)
             if not cs_author:
                 # use repo owner if we cannot extract the author correctly
                 cs_author = repo.user
             recipients += [cs_author]
 
             commit_comment_url = self.get_url(comment, request=request)
             commit_comment_reply_url = self.get_url(
                 comment, request=request,
                 anchor='comment-{}/?/ReplyToComment'.format(comment.comment_id))
 
             target_repo_url = h.link_to(
                 repo.repo_name,
                 h.route_url('repo_summary', repo_name=repo.repo_name))
 
             commit_url = h.route_url('repo_commit', repo_name=repo.repo_name,
                                      commit_id=commit_id)
 
             # commit specifics
             kwargs.update({
                 'commit': commit_obj,
                 'commit_message': commit_obj.message,
                 'commit_target_repo_url': target_repo_url,
                 'commit_comment_url': commit_comment_url,
                 'commit_comment_reply_url': commit_comment_reply_url,
                 'commit_url': commit_url,
                 'thread_ids': [commit_url, commit_comment_url],
             })
 
         elif pull_request_obj:
             # get the current participants of this pull request
             recipients = ChangesetComment.get_users(
                 pull_request_id=pull_request_obj.pull_request_id)
             # add pull request author
             recipients += [pull_request_obj.author]
 
             # add the reviewers to notification
             recipients += [x.user for x in pull_request_obj.get_pull_request_reviewers()]
 
             pr_target_repo = pull_request_obj.target_repo
             pr_source_repo = pull_request_obj.source_repo
 
             pr_comment_url = self.get_url(comment, request=request)
             pr_comment_reply_url = self.get_url(
                 comment, request=request,
                 anchor='comment-{}/?/ReplyToComment'.format(comment.comment_id))
 
             pr_url = h.route_url(
                 'pullrequest_show',
                 repo_name=pr_target_repo.repo_name,
                 pull_request_id=pull_request_obj.pull_request_id, )
 
             # set some variables for email notification
             pr_target_repo_url = h.route_url(
                 'repo_summary', repo_name=pr_target_repo.repo_name)
 
             pr_source_repo_url = h.route_url(
                 'repo_summary', repo_name=pr_source_repo.repo_name)
 
             # pull request specifics
             kwargs.update({
                 'pull_request': pull_request_obj,
                 'pr_id': pull_request_obj.pull_request_id,
                 'pull_request_url': pr_url,
                 'pull_request_target_repo': pr_target_repo,
                 'pull_request_target_repo_url': pr_target_repo_url,
                 'pull_request_source_repo': pr_source_repo,
                 'pull_request_source_repo_url': pr_source_repo_url,
                 'pr_comment_url': pr_comment_url,
                 'pr_comment_reply_url': pr_comment_reply_url,
                 'pr_closing': closing_pr,
                 'thread_ids': [pr_url, pr_comment_url],
             })
 
         if send_email:
             recipients += [self._get_user(u) for u in (extra_recipients or [])]
 
             mention_recipients = set(
                 self._extract_mentions(text)).difference(recipients)
 
             # create notification objects, and emails
             NotificationModel().create(
                 created_by=user,
                 notification_subject='',  # Filled in based on the notification_type
                 notification_body='',  # Filled in based on the notification_type
                 notification_type=notification_type,
                 recipients=recipients,
                 mention_recipients=mention_recipients,
                 email_kwargs=kwargs,
             )
 
         Session().flush()
         if comment.pull_request:
             action = 'repo.pull_request.comment.create'
         else:
             action = 'repo.commit.comment.create'
 
         if not is_draft:
             comment_data = comment.get_api_data()
 
             self._log_audit_action(
                 action, {'data': comment_data}, auth_user, comment)
 
         return comment
 
     def edit(self, comment_id, text, auth_user, version):
         """
         Change existing comment for commit or pull request.
 
         :param comment_id:
         :param text:
         :param auth_user: current authenticated user calling this method
         :param version: last comment version
         """
         if not text:
             log.warning('Missing text for comment, skipping...')
             return
 
         comment = ChangesetComment.get(comment_id)
         old_comment_text = comment.text
         comment.text = text
         comment.modified_at = datetime.datetime.now()
         version = safe_int(version)
 
         # NOTE(marcink): this returns initial comment + edits, so v2 from ui
         # would return 3 here
         comment_version = ChangesetCommentHistory.get_version(comment_id)
 
         if isinstance(version, (int, long)) and (comment_version - version) != 1:
             log.warning(
                 'Version mismatch comment_version {} submitted {}, skipping'.format(
                     comment_version-1,  # -1 since note above
                     version
                 )
             )
             raise CommentVersionMismatch()
 
         comment_history = ChangesetCommentHistory()
         comment_history.comment_id = comment_id
         comment_history.version = comment_version
         comment_history.created_by_user_id = auth_user.user_id
         comment_history.text = old_comment_text
         # TODO add email notification
         Session().add(comment_history)
         Session().add(comment)
         Session().flush()
 
         if comment.pull_request:
             action = 'repo.pull_request.comment.edit'
         else:
             action = 'repo.commit.comment.edit'
 
         comment_data = comment.get_api_data()
         comment_data['old_comment_text'] = old_comment_text
         self._log_audit_action(
             action, {'data': comment_data}, auth_user, comment)
 
         return comment_history
 
     def delete(self, comment, auth_user):
         """
         Deletes given comment
         """
         comment = self.__get_commit_comment(comment)
         old_data = comment.get_api_data()
         Session().delete(comment)
 
         if comment.pull_request:
             action = 'repo.pull_request.comment.delete'
         else:
             action = 'repo.commit.comment.delete'
 
         self._log_audit_action(
             action, {'old_data': old_data}, auth_user, comment)
 
         return comment
 
     def get_all_comments(self, repo_id, revision=None, pull_request=None,
                          include_drafts=True, count_only=False):
         q = ChangesetComment.query()\
                 .filter(ChangesetComment.repo_id == repo_id)
         if revision:
             q = q.filter(ChangesetComment.revision == revision)
         elif pull_request:
             pull_request = self.__get_pull_request(pull_request)
             q = q.filter(ChangesetComment.pull_request_id == pull_request.pull_request_id)
         else:
             raise Exception('Please specify commit or pull_request')
         if not include_drafts:
             q = q.filter(ChangesetComment.draft == false())
         q = q.order_by(ChangesetComment.created_on)
         if count_only:
             return q.count()
 
         return q.all()
 
     def get_url(self, comment, request=None, permalink=False, anchor=None):
         if not request:
             request = get_current_request()
 
         comment = self.__get_commit_comment(comment)
         if anchor is None:
             anchor = 'comment-{}'.format(comment.comment_id)
 
         if comment.pull_request:
             pull_request = comment.pull_request
             if permalink:
                 return request.route_url(
                     'pull_requests_global',
                     pull_request_id=pull_request.pull_request_id,
                     _anchor=anchor)
             else:
                 return request.route_url(
                     'pullrequest_show',
                     repo_name=safe_str(pull_request.target_repo.repo_name),
                     pull_request_id=pull_request.pull_request_id,
                     _anchor=anchor)
 
         else:
             repo = comment.repo
             commit_id = comment.revision
 
             if permalink:
                 return request.route_url(
                     'repo_commit', repo_name=safe_str(repo.repo_id),
                     commit_id=commit_id,
                     _anchor=anchor)
 
             else:
                 return request.route_url(
                     'repo_commit', repo_name=safe_str(repo.repo_name),
                     commit_id=commit_id,
                     _anchor=anchor)
 
     def get_comments(self, repo_id, revision=None, pull_request=None):
         """
         Gets main comments based on revision or pull_request_id
 
         :param repo_id:
         :param revision:
         :param pull_request:
         """
 
         q = ChangesetComment.query()\
                 .filter(ChangesetComment.repo_id == repo_id)\
                 .filter(ChangesetComment.line_no == None)\
                 .filter(ChangesetComment.f_path == None)
         if revision:
             q = q.filter(ChangesetComment.revision == revision)
         elif pull_request:
             pull_request = self.__get_pull_request(pull_request)
             q = q.filter(ChangesetComment.pull_request == pull_request)
         else:
             raise Exception('Please specify commit or pull_request')
         q = q.order_by(ChangesetComment.created_on)
         return q.all()
 
     def get_inline_comments(self, repo_id, revision=None, pull_request=None):
         q = self._get_inline_comments_query(repo_id, revision, pull_request)
         return self._group_comments_by_path_and_line_number(q)
 
     def get_inline_comments_as_list(self, inline_comments, skip_outdated=True,
                                     version=None):
         inline_comms = []
         for fname, per_line_comments in inline_comments.iteritems():
             for lno, comments in per_line_comments.iteritems():
                 for comm in comments:
                     if not comm.outdated_at_version(version) and skip_outdated:
                         inline_comms.append(comm)
 
         return inline_comms
 
     def get_outdated_comments(self, repo_id, pull_request):
         # TODO: johbo: Remove `repo_id`, it is not needed to find the comments
         # of a pull request.
         q = self._all_inline_comments_of_pull_request(pull_request)
         q = q.filter(
             ChangesetComment.display_state ==
             ChangesetComment.COMMENT_OUTDATED
         ).order_by(ChangesetComment.comment_id.asc())
 
         return self._group_comments_by_path_and_line_number(q)
 
     def _get_inline_comments_query(self, repo_id, revision, pull_request):
         # TODO: johbo: Split this into two methods: One for PR and one for
         # commit.
         if revision:
             q = Session().query(ChangesetComment).filter(
                 ChangesetComment.repo_id == repo_id,
                 ChangesetComment.line_no != null(),
                 ChangesetComment.f_path != null(),
                 ChangesetComment.revision == revision)
 
         elif pull_request:
             pull_request = self.__get_pull_request(pull_request)
             if not CommentsModel.use_outdated_comments(pull_request):
                 q = self._visible_inline_comments_of_pull_request(pull_request)
             else:
                 q = self._all_inline_comments_of_pull_request(pull_request)
 
         else:
             raise Exception('Please specify commit or pull_request_id')
         q = q.order_by(ChangesetComment.comment_id.asc())
         return q
 
     def _group_comments_by_path_and_line_number(self, q):
         comments = q.all()
         paths = collections.defaultdict(lambda: collections.defaultdict(list))
         for co in comments:
             paths[co.f_path][co.line_no].append(co)
         return paths
 
     @classmethod
     def needed_extra_diff_context(cls):
         return max(cls.DIFF_CONTEXT_BEFORE, cls.DIFF_CONTEXT_AFTER)
 
     def outdate_comments(self, pull_request, old_diff_data, new_diff_data):
         if not CommentsModel.use_outdated_comments(pull_request):
             return
 
         comments = self._visible_inline_comments_of_pull_request(pull_request)
         comments_to_outdate = comments.all()
 
         for comment in comments_to_outdate:
             self._outdate_one_comment(comment, old_diff_data, new_diff_data)
 
     def _outdate_one_comment(self, comment, old_diff_proc, new_diff_proc):
         diff_line = _parse_comment_line_number(comment.line_no)
 
         try:
             old_context = old_diff_proc.get_context_of_line(
                 path=comment.f_path, diff_line=diff_line)
             new_context = new_diff_proc.get_context_of_line(
                 path=comment.f_path, diff_line=diff_line)
         except (diffs.LineNotInDiffException,
                 diffs.FileNotInDiffException):
             if not comment.draft:
                 comment.display_state = ChangesetComment.COMMENT_OUTDATED
             return
 
         if old_context == new_context:
             return
 
         if self._should_relocate_diff_line(diff_line):
             new_diff_lines = new_diff_proc.find_context(
                 path=comment.f_path, context=old_context,
                 offset=self.DIFF_CONTEXT_BEFORE)
             if not new_diff_lines and not comment.draft:
                 comment.display_state = ChangesetComment.COMMENT_OUTDATED
             else:
                 new_diff_line = self._choose_closest_diff_line(
                     diff_line, new_diff_lines)
                 comment.line_no = _diff_to_comment_line_number(new_diff_line)
         else:
             if not comment.draft:
                 comment.display_state = ChangesetComment.COMMENT_OUTDATED
 
     def _should_relocate_diff_line(self, diff_line):
         """
         Checks if relocation shall be tried for the given `diff_line`.
 
         If a comment points into the first lines, then we can have a situation
         that after an update another line has been added on top. In this case
         we would find the context still and move the comment around. This
         would be wrong.
         """
         should_relocate = (
             (diff_line.new and diff_line.new > self.DIFF_CONTEXT_BEFORE) or
             (diff_line.old and diff_line.old > self.DIFF_CONTEXT_BEFORE))
         return should_relocate
 
     def _choose_closest_diff_line(self, diff_line, new_diff_lines):
         candidate = new_diff_lines[0]
         best_delta = _diff_line_delta(diff_line, candidate)
         for new_diff_line in new_diff_lines[1:]:
             delta = _diff_line_delta(diff_line, new_diff_line)
             if delta < best_delta:
                 candidate = new_diff_line
                 best_delta = delta
         return candidate
 
     def _visible_inline_comments_of_pull_request(self, pull_request):
         comments = self._all_inline_comments_of_pull_request(pull_request)
         comments = comments.filter(
             coalesce(ChangesetComment.display_state, '') !=
             ChangesetComment.COMMENT_OUTDATED)
         return comments
 
     def _all_inline_comments_of_pull_request(self, pull_request):
         comments = Session().query(ChangesetComment)\
             .filter(ChangesetComment.line_no != None)\
             .filter(ChangesetComment.f_path != None)\
             .filter(ChangesetComment.pull_request == pull_request)
         return comments
 
     def _all_general_comments_of_pull_request(self, pull_request):
         comments = Session().query(ChangesetComment)\
             .filter(ChangesetComment.line_no == None)\
             .filter(ChangesetComment.f_path == None)\
             .filter(ChangesetComment.pull_request == pull_request)
 
         return comments
 
     @staticmethod
     def use_outdated_comments(pull_request):
         settings_model = VcsSettingsModel(repo=pull_request.target_repo)
         settings = settings_model.get_general_settings()
         return settings.get('rhodecode_use_outdated_comments', False)
 
     def trigger_commit_comment_hook(self, repo, user, action, data=None):
         repo = self._get_repo(repo)
         target_scm = repo.scm_instance()
         if action == 'create':
             trigger_hook = hooks_utils.trigger_comment_commit_hooks
         elif action == 'edit':
             trigger_hook = hooks_utils.trigger_comment_commit_edit_hooks
         else:
             return
 
         log.debug('Handling repo %s trigger_commit_comment_hook with action %s: %s',
                   repo, action, trigger_hook)
         trigger_hook(
             username=user.username,
             repo_name=repo.repo_name,
             repo_type=target_scm.alias,
             repo=repo,
             data=data)
 
 
 def _parse_comment_line_number(line_no):
     """
     Parses line numbers of the form "(o|n)\d+" and returns them in a tuple.
     """
     old_line = None
     new_line = None
     if line_no.startswith('o'):
         old_line = int(line_no[1:])
     elif line_no.startswith('n'):
         new_line = int(line_no[1:])
     else:
         raise ValueError("Comment lines have to start with either 'o' or 'n'.")
     return diffs.DiffLineNumber(old_line, new_line)
 
 
 def _diff_to_comment_line_number(diff_line):
     if diff_line.new is not None:
         return u'n{}'.format(diff_line.new)
     elif diff_line.old is not None:
         return u'o{}'.format(diff_line.old)
     return u''
 
 
 def _diff_line_delta(a, b):
     if None not in (a.new, b.new):
         return abs(a.new - b.new)
     elif None not in (a.old, b.old):
         return abs(a.old - b.old)
     else:
         raise ValueError(
             "Cannot compute delta between {} and {}".format(a, b))

rhodecode/model/db.py

@@ -1,5830 +1,5836 b''
 # -*- 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/
 
 """
 Database Models for RhodeCode Enterprise
 """
 
 import re
 import os
 import time
 import string
 import hashlib
 import logging
 import datetime
 import uuid
 import warnings
 import ipaddress
 import functools
 import traceback
 import collections
 
 from sqlalchemy import (
     or_, and_, not_, func, cast, TypeDecorator, event,
     Index, Sequence, UniqueConstraint, ForeignKey, CheckConstraint, Column,
     Boolean, String, Unicode, UnicodeText, DateTime, Integer, LargeBinary,
     Text, Float, PickleType, BigInteger)
 from sqlalchemy.sql.expression import true, false, case
 from sqlalchemy.sql.functions import coalesce, count  # pragma: no cover
 from sqlalchemy.orm import (
     relationship, joinedload, class_mapper, validates, aliased)
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.exc import IntegrityError  # pragma: no cover
 from sqlalchemy.dialects.mysql import LONGTEXT
 from zope.cachedescriptors.property import Lazy as LazyProperty
 from pyramid import compat
 from pyramid.threadlocal import get_current_request
 from webhelpers2.text import remove_formatting
 
 from rhodecode.translation import _
 from rhodecode.lib.vcs import get_vcs_instance, VCSError
 from rhodecode.lib.vcs.backends.base import (
     EmptyCommit, Reference, unicode_to_reference, reference_to_unicode)
 from rhodecode.lib.utils2 import (
     str2bool, safe_str, get_commit_safe, safe_unicode, sha1_safe,
     time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict,
     glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time, OrderedDefaultDict)
 from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType, \
     JsonRaw
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.lib.encrypt import AESCipher, validate_and_get_enc_data
 from rhodecode.lib.encrypt2 import Encryptor
 from rhodecode.lib.exceptions import (
     ArtifactMetadataDuplicate, ArtifactMetadataBadValueType)
 from rhodecode.model.meta import Base, Session
 
 URL_SEP = '/'
 log = logging.getLogger(__name__)
 
 # =============================================================================
 # BASE CLASSES
 # =============================================================================
 
 # this is propagated from .ini file rhodecode.encrypted_values.secret or
 # beaker.session.secret if first is not set.
 # and initialized at environment.py
 ENCRYPTION_KEY = None
 
 # used to sort permissions by types, '#' used here is not allowed to be in
 # usernames, and it's very early in sorted string.printable table.
 PERMISSION_TYPE_SORT = {
     'admin': '####',
     'write': '###',
     'read':  '##',
     'none':  '#',
 }
 
 
 def display_user_sort(obj):
     """
     Sort function used to sort permissions in .permissions() function of
     Repository, RepoGroup, UserGroup. Also it put the default user in front
     of all other resources
     """
 
     if obj.username == User.DEFAULT_USER:
         return '#####'
     prefix = PERMISSION_TYPE_SORT.get(obj.permission.split('.')[-1], '')
     extra_sort_num = '1'  # default
 
     # NOTE(dan): inactive duplicates goes last
     if getattr(obj, 'duplicate_perm', None):
         extra_sort_num = '9'
     return prefix + extra_sort_num + obj.username
 
 
 def display_user_group_sort(obj):
     """
     Sort function used to sort permissions in .permissions() function of
     Repository, RepoGroup, UserGroup. Also it put the default user in front
     of all other resources
     """
 
     prefix = PERMISSION_TYPE_SORT.get(obj.permission.split('.')[-1], '')
     return prefix + obj.users_group_name
 
 
 def _hash_key(k):
     return sha1_safe(k)
 
 
 def in_filter_generator(qry, items, limit=500):
     """
     Splits IN() into multiple with OR
     e.g.::
     cnt = Repository.query().filter(
         or_(
             *in_filter_generator(Repository.repo_id, range(100000))
         )).count()
     """
     if not items:
         # empty list will cause empty query which might cause security issues
         # this can lead to hidden unpleasant results
         items = [-1]
 
     parts = []
     for chunk in xrange(0, len(items), limit):
         parts.append(
             qry.in_(items[chunk: chunk + limit])
         )
 
     return parts
 
 
 base_table_args = {
     'extend_existing': True,
     'mysql_engine': 'InnoDB',
     'mysql_charset': 'utf8',
     'sqlite_autoincrement': True
 }
 
 
 class EncryptedTextValue(TypeDecorator):
     """
     Special column for encrypted long text data, use like::
 
         value = Column("encrypted_value", EncryptedValue(), nullable=False)
 
     This column is intelligent so if value is in unencrypted form it return
     unencrypted form, but on save it always encrypts
     """
     impl = Text
 
     def process_bind_param(self, value, dialect):
         """
         Setter for storing value
         """
         import rhodecode
         if not value:
             return value
 
         # protect against double encrypting if values is already encrypted
         if value.startswith('enc$aes$') \
                 or value.startswith('enc$aes_hmac$') \
                 or value.startswith('enc2$'):
             raise ValueError('value needs to be in unencrypted format, '
                              'ie. not starting with enc$ or enc2$')
 
         algo = rhodecode.CONFIG.get('rhodecode.encrypted_values.algorithm') or 'aes'
         if algo == 'aes':
             return 'enc$aes_hmac$%s' % AESCipher(ENCRYPTION_KEY, hmac=True).encrypt(value)
         elif algo == 'fernet':
             return Encryptor(ENCRYPTION_KEY).encrypt(value)
         else:
             ValueError('Bad encryption algorithm, should be fernet or aes, got: {}'.format(algo))
 
     def process_result_value(self, value, dialect):
         """
         Getter for retrieving value
         """
 
         import rhodecode
         if not value:
             return value
 
         algo = rhodecode.CONFIG.get('rhodecode.encrypted_values.algorithm') or 'aes'
         enc_strict_mode = str2bool(rhodecode.CONFIG.get('rhodecode.encrypted_values.strict') or True)
         if algo == 'aes':
             decrypted_data = validate_and_get_enc_data(value, ENCRYPTION_KEY, enc_strict_mode)
         elif algo == 'fernet':
             return Encryptor(ENCRYPTION_KEY).decrypt(value)
         else:
             ValueError('Bad encryption algorithm, should be fernet or aes, got: {}'.format(algo))
         return decrypted_data
 
 
 class BaseModel(object):
     """
     Base Model for all classes
     """
 
     @classmethod
     def _get_keys(cls):
         """return column names for this model """
         return class_mapper(cls).c.keys()
 
     def get_dict(self):
         """
         return dict with keys and values corresponding
         to this model data """
 
         d = {}
         for k in self._get_keys():
             d[k] = getattr(self, k)
 
         # also use __json__() if present to get additional fields
         _json_attr = getattr(self, '__json__', None)
         if _json_attr:
             # update with attributes from __json__
             if callable(_json_attr):
                 _json_attr = _json_attr()
             for k, val in _json_attr.iteritems():
                 d[k] = val
         return d
 
     def get_appstruct(self):
         """return list with keys and values tuples corresponding
         to this model data """
 
         lst = []
         for k in self._get_keys():
             lst.append((k, getattr(self, k),))
         return lst
 
     def populate_obj(self, populate_dict):
         """populate model with data from given populate_dict"""
 
         for k in self._get_keys():
             if k in populate_dict:
                 setattr(self, k, populate_dict[k])
 
     @classmethod
     def query(cls):
         return Session().query(cls)
 
     @classmethod
     def get(cls, id_):
         if id_:
             return cls.query().get(id_)
 
     @classmethod
     def get_or_404(cls, id_):
         from pyramid.httpexceptions import HTTPNotFound
 
         try:
             id_ = int(id_)
         except (TypeError, ValueError):
             raise HTTPNotFound()
 
         res = cls.query().get(id_)
         if not res:
             raise HTTPNotFound()
         return res
 
     @classmethod
     def getAll(cls):
         # deprecated and left for backward compatibility
         return cls.get_all()
 
     @classmethod
     def get_all(cls):
         return cls.query().all()
 
     @classmethod
     def delete(cls, id_):
         obj = cls.query().get(id_)
         Session().delete(obj)
 
     @classmethod
     def identity_cache(cls, session, attr_name, value):
         exist_in_session = []
         for (item_cls, pkey), instance in session.identity_map.items():
             if cls == item_cls and getattr(instance, attr_name) == value:
                 exist_in_session.append(instance)
         if exist_in_session:
             if len(exist_in_session) == 1:
                 return exist_in_session[0]
             log.exception(
                 'multiple objects with attr %s and '
                 'value %s found with same name: %r',
                 attr_name, value, exist_in_session)
 
     def __repr__(self):
         if hasattr(self, '__unicode__'):
             # python repr needs to return str
             try:
                 return safe_str(self.__unicode__())
             except UnicodeDecodeError:
                 pass
         return '<DB:%s>' % (self.__class__.__name__)
 
 
 class RhodeCodeSetting(Base, BaseModel):
     __tablename__ = 'rhodecode_settings'
     __table_args__ = (
         UniqueConstraint('app_settings_name'),
         base_table_args
     )
 
     SETTINGS_TYPES = {
         'str': safe_str,
         'int': safe_int,
         'unicode': safe_unicode,
         'bool': str2bool,
         'list': functools.partial(aslist, sep=',')
     }
     DEFAULT_UPDATE_URL = 'https://rhodecode.com/api/v1/info/versions'
     GLOBAL_CONF_KEY = 'app_settings'
 
     app_settings_id = Column("app_settings_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     app_settings_name = Column("app_settings_name", String(255), nullable=True, unique=None, default=None)
     _app_settings_value = Column("app_settings_value", String(4096), nullable=True, unique=None, default=None)
     _app_settings_type = Column("app_settings_type", String(255), nullable=True, unique=None, default=None)
 
     def __init__(self, key='', val='', type='unicode'):
         self.app_settings_name = key
         self.app_settings_type = type
         self.app_settings_value = val
 
     @validates('_app_settings_value')
     def validate_settings_value(self, key, val):
         assert type(val) == unicode
         return val
 
     @hybrid_property
     def app_settings_value(self):
         v = self._app_settings_value
         _type = self.app_settings_type
         if _type:
             _type = self.app_settings_type.split('.')[0]
             # decode the encrypted value
             if 'encrypted' in self.app_settings_type:
                 cipher = EncryptedTextValue()
                 v = safe_unicode(cipher.process_result_value(v, None))
 
         converter = self.SETTINGS_TYPES.get(_type) or \
             self.SETTINGS_TYPES['unicode']
         return converter(v)
 
     @app_settings_value.setter
     def app_settings_value(self, val):
         """
         Setter that will always make sure we use unicode in app_settings_value
 
         :param val:
         """
         val = safe_unicode(val)
         # encode the encrypted value
         if 'encrypted' in self.app_settings_type:
             cipher = EncryptedTextValue()
             val = safe_unicode(cipher.process_bind_param(val, None))
         self._app_settings_value = val
 
     @hybrid_property
     def app_settings_type(self):
         return self._app_settings_type
 
     @app_settings_type.setter
     def app_settings_type(self, val):
         if val.split('.')[0] not in self.SETTINGS_TYPES:
             raise Exception('type must be one of %s got %s'
                             % (self.SETTINGS_TYPES.keys(), val))
         self._app_settings_type = val
 
     @classmethod
     def get_by_prefix(cls, prefix):
         return RhodeCodeSetting.query()\
             .filter(RhodeCodeSetting.app_settings_name.startswith(prefix))\
             .all()
 
     def __unicode__(self):
         return u"<%s('%s:%s[%s]')>" % (
             self.__class__.__name__,
             self.app_settings_name, self.app_settings_value,
             self.app_settings_type
         )
 
 
 class RhodeCodeUi(Base, BaseModel):
     __tablename__ = 'rhodecode_ui'
     __table_args__ = (
         UniqueConstraint('ui_key'),
         base_table_args
     )
 
     HOOK_REPO_SIZE = 'changegroup.repo_size'
     # HG
     HOOK_PRE_PULL = 'preoutgoing.pre_pull'
     HOOK_PULL = 'outgoing.pull_logger'
     HOOK_PRE_PUSH = 'prechangegroup.pre_push'
     HOOK_PRETX_PUSH = 'pretxnchangegroup.pre_push'
     HOOK_PUSH = 'changegroup.push_logger'
     HOOK_PUSH_KEY = 'pushkey.key_push'
 
     HOOKS_BUILTIN = [
         HOOK_PRE_PULL,
         HOOK_PULL,
         HOOK_PRE_PUSH,
         HOOK_PRETX_PUSH,
         HOOK_PUSH,
         HOOK_PUSH_KEY,
     ]
 
     # TODO: johbo: Unify way how hooks are configured for git and hg,
     # git part is currently hardcoded.
 
     # SVN PATTERNS
     SVN_BRANCH_ID = 'vcs_svn_branch'
     SVN_TAG_ID = 'vcs_svn_tag'
 
     ui_id = Column(
         "ui_id", Integer(), nullable=False, unique=True, default=None,
         primary_key=True)
     ui_section = Column(
         "ui_section", String(255), nullable=True, unique=None, default=None)
     ui_key = Column(
         "ui_key", String(255), nullable=True, unique=None, default=None)
     ui_value = Column(
         "ui_value", String(255), nullable=True, unique=None, default=None)
     ui_active = Column(
         "ui_active", Boolean(), nullable=True, unique=None, default=True)
 
     def __repr__(self):
         return '<%s[%s]%s=>%s]>' % (self.__class__.__name__, self.ui_section,
                                     self.ui_key, self.ui_value)
 
 
 class RepoRhodeCodeSetting(Base, BaseModel):
     __tablename__ = 'repo_rhodecode_settings'
     __table_args__ = (
         UniqueConstraint(
             'app_settings_name', 'repository_id',
             name='uq_repo_rhodecode_setting_name_repo_id'),
         base_table_args
     )
 
     repository_id = Column(
         "repository_id", Integer(), ForeignKey('repositories.repo_id'),
         nullable=False)
     app_settings_id = Column(
         "app_settings_id", Integer(), nullable=False, unique=True,
         default=None, primary_key=True)
     app_settings_name = Column(
         "app_settings_name", String(255), nullable=True, unique=None,
         default=None)
     _app_settings_value = Column(
         "app_settings_value", String(4096), nullable=True, unique=None,
         default=None)
     _app_settings_type = Column(
         "app_settings_type", String(255), nullable=True, unique=None,
         default=None)
 
     repository = relationship('Repository')
 
     def __init__(self, repository_id, key='', val='', type='unicode'):
         self.repository_id = repository_id
         self.app_settings_name = key
         self.app_settings_type = type
         self.app_settings_value = val
 
     @validates('_app_settings_value')
     def validate_settings_value(self, key, val):
         assert type(val) == unicode
         return val
 
     @hybrid_property
     def app_settings_value(self):
         v = self._app_settings_value
         type_ = self.app_settings_type
         SETTINGS_TYPES = RhodeCodeSetting.SETTINGS_TYPES
         converter = SETTINGS_TYPES.get(type_) or SETTINGS_TYPES['unicode']
         return converter(v)
 
     @app_settings_value.setter
     def app_settings_value(self, val):
         """
         Setter that will always make sure we use unicode in app_settings_value
 
         :param val:
         """
         self._app_settings_value = safe_unicode(val)
 
     @hybrid_property
     def app_settings_type(self):
         return self._app_settings_type
 
     @app_settings_type.setter
     def app_settings_type(self, val):
         SETTINGS_TYPES = RhodeCodeSetting.SETTINGS_TYPES
         if val not in SETTINGS_TYPES:
             raise Exception('type must be one of %s got %s'
                             % (SETTINGS_TYPES.keys(), val))
         self._app_settings_type = val
 
     def __unicode__(self):
         return u"<%s('%s:%s:%s[%s]')>" % (
             self.__class__.__name__, self.repository.repo_name,
             self.app_settings_name, self.app_settings_value,
             self.app_settings_type
         )
 
 
 class RepoRhodeCodeUi(Base, BaseModel):
     __tablename__ = 'repo_rhodecode_ui'
     __table_args__ = (
         UniqueConstraint(
             'repository_id', 'ui_section', 'ui_key',
             name='uq_repo_rhodecode_ui_repository_id_section_key'),
         base_table_args
     )
 
     repository_id = Column(
         "repository_id", Integer(), ForeignKey('repositories.repo_id'),
         nullable=False)
     ui_id = Column(
         "ui_id", Integer(), nullable=False, unique=True, default=None,
         primary_key=True)
     ui_section = Column(
         "ui_section", String(255), nullable=True, unique=None, default=None)
     ui_key = Column(
         "ui_key", String(255), nullable=True, unique=None, default=None)
     ui_value = Column(
         "ui_value", String(255), nullable=True, unique=None, default=None)
     ui_active = Column(
         "ui_active", Boolean(), nullable=True, unique=None, default=True)
 
     repository = relationship('Repository')
 
     def __repr__(self):
         return '<%s[%s:%s]%s=>%s]>' % (
             self.__class__.__name__, self.repository.repo_name,
             self.ui_section, self.ui_key, self.ui_value)
 
 
 class User(Base, BaseModel):
     __tablename__ = 'users'
     __table_args__ = (
         UniqueConstraint('username'), UniqueConstraint('email'),
         Index('u_username_idx', 'username'),
         Index('u_email_idx', 'email'),
         base_table_args
     )
 
     DEFAULT_USER = 'default'
     DEFAULT_USER_EMAIL = '[e-mail]'
     DEFAULT_GRAVATAR_URL = 'https://secure.gravatar.com/avatar/{md5email}?d=identicon&s={size}'
 
     user_id = Column("user_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     username = Column("username", String(255), nullable=True, unique=None, default=None)
     password = Column("password", String(255), nullable=True, unique=None, default=None)
     active = Column("active", Boolean(), nullable=True, unique=None, default=True)
     admin = Column("admin", Boolean(), nullable=True, unique=None, default=False)
     name = Column("firstname", String(255), nullable=True, unique=None, default=None)
     lastname = Column("lastname", String(255), nullable=True, unique=None, default=None)
     _email = Column("email", String(255), nullable=True, unique=None, default=None)
     last_login = Column("last_login", DateTime(timezone=False), nullable=True, unique=None, default=None)
     last_activity = Column('last_activity', DateTime(timezone=False), nullable=True, unique=None, default=None)
     description = Column('description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))
 
     extern_type = Column("extern_type", String(255), nullable=True, unique=None, default=None)
     extern_name = Column("extern_name", String(255), nullable=True, unique=None, default=None)
     _api_key = Column("api_key", String(255), nullable=True, unique=None, default=None)
     inherit_default_permissions = Column("inherit_default_permissions", Boolean(), nullable=False, unique=None, default=True)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     _user_data = Column("user_data", LargeBinary(), nullable=True)  # JSON data
 
     user_log = relationship('UserLog')
     user_perms = relationship('UserToPerm', primaryjoin="User.user_id==UserToPerm.user_id", cascade='all, delete-orphan')
 
     repositories = relationship('Repository')
     repository_groups = relationship('RepoGroup')
     user_groups = relationship('UserGroup')
 
     user_followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_user_id==User.user_id', cascade='all')
     followings = relationship('UserFollowing', primaryjoin='UserFollowing.user_id==User.user_id', cascade='all')
 
     repo_to_perm = relationship('UserRepoToPerm', primaryjoin='UserRepoToPerm.user_id==User.user_id', cascade='all, delete-orphan')
     repo_group_to_perm = relationship('UserRepoGroupToPerm', primaryjoin='UserRepoGroupToPerm.user_id==User.user_id', cascade='all, delete-orphan')
     user_group_to_perm = relationship('UserUserGroupToPerm', primaryjoin='UserUserGroupToPerm.user_id==User.user_id', cascade='all, delete-orphan')
 
     group_member = relationship('UserGroupMember', cascade='all')
 
     notifications = relationship('UserNotification', cascade='all')
     # notifications assigned to this user
     user_created_notifications = relationship('Notification', cascade='all')
     # comments created by this user
     user_comments = relationship('ChangesetComment', cascade='all')
     # user profile extra info
     user_emails = relationship('UserEmailMap', cascade='all')
     user_ip_map = relationship('UserIpMap', cascade='all')
     user_auth_tokens = relationship('UserApiKeys', cascade='all')
     user_ssh_keys = relationship('UserSshKeys', cascade='all')
 
     # gists
     user_gists = relationship('Gist', cascade='all')
     # user pull requests
     user_pull_requests = relationship('PullRequest', cascade='all')
 
     # external identities
     external_identities = relationship(
         'ExternalIdentity',
         primaryjoin="User.user_id==ExternalIdentity.local_user_id",
         cascade='all')
     # review rules
     user_review_rules = relationship('RepoReviewRuleUser', cascade='all')
 
     # artifacts owned
     artifacts = relationship('FileStore', primaryjoin='FileStore.user_id==User.user_id')
 
     # no cascade, set NULL
     scope_artifacts = relationship('FileStore', primaryjoin='FileStore.scope_user_id==User.user_id')
 
     def __unicode__(self):
         return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
                                       self.user_id, self.username)
 
     @hybrid_property
     def email(self):
         return self._email
 
     @email.setter
     def email(self, val):
         self._email = val.lower() if val else None
 
     @hybrid_property
     def first_name(self):
         from rhodecode.lib import helpers as h
         if self.name:
             return h.escape(self.name)
         return self.name
 
     @hybrid_property
     def last_name(self):
         from rhodecode.lib import helpers as h
         if self.lastname:
             return h.escape(self.lastname)
         return self.lastname
 
     @hybrid_property
     def api_key(self):
         """
         Fetch if exist an auth-token with role ALL connected to this user
         """
         user_auth_token = UserApiKeys.query()\
             .filter(UserApiKeys.user_id == self.user_id)\
             .filter(or_(UserApiKeys.expires == -1,
                             UserApiKeys.expires >= time.time()))\
             .filter(UserApiKeys.role == UserApiKeys.ROLE_ALL).first()
         if user_auth_token:
             user_auth_token = user_auth_token.api_key
 
         return user_auth_token
 
     @api_key.setter
     def api_key(self, val):
         # don't allow to set API key this is deprecated for now
         self._api_key = None
 
     @property
     def reviewer_pull_requests(self):
         return PullRequestReviewers.query() \
             .options(joinedload(PullRequestReviewers.pull_request)) \
             .filter(PullRequestReviewers.user_id == self.user_id) \
             .all()
 
     @property
     def firstname(self):
         # alias for future
         return self.name
 
     @property
     def emails(self):
         other = UserEmailMap.query()\
             .filter(UserEmailMap.user == self) \
             .order_by(UserEmailMap.email_id.asc()) \
             .all()
         return [self.email] + [x.email for x in other]
 
     def emails_cached(self):
         emails = UserEmailMap.query()\
             .filter(UserEmailMap.user == self) \
             .order_by(UserEmailMap.email_id.asc())
 
         emails = emails.options(
             FromCache("sql_cache_short", "get_user_{}_emails".format(self.user_id))
         )
 
         return [self.email] + [x.email for x in emails]
 
     @property
     def auth_tokens(self):
         auth_tokens = self.get_auth_tokens()
         return [x.api_key for x in auth_tokens]
 
     def get_auth_tokens(self):
         return UserApiKeys.query()\
             .filter(UserApiKeys.user == self)\
             .order_by(UserApiKeys.user_api_key_id.asc())\
             .all()
 
     @LazyProperty
     def feed_token(self):
         return self.get_feed_token()
 
     def get_feed_token(self, cache=True):
         feed_tokens = UserApiKeys.query()\
             .filter(UserApiKeys.user == self)\
             .filter(UserApiKeys.role == UserApiKeys.ROLE_FEED)
         if cache:
             feed_tokens = feed_tokens.options(
                 FromCache("sql_cache_short", "get_user_feed_token_%s" % self.user_id))
 
         feed_tokens = feed_tokens.all()
         if feed_tokens:
             return feed_tokens[0].api_key
         return 'NO_FEED_TOKEN_AVAILABLE'
 
     @LazyProperty
     def artifact_token(self):
         return self.get_artifact_token()
 
     def get_artifact_token(self, cache=True):
         artifacts_tokens = UserApiKeys.query()\
             .filter(UserApiKeys.user == self) \
             .filter(or_(UserApiKeys.expires == -1,
                         UserApiKeys.expires >= time.time())) \
             .filter(UserApiKeys.role == UserApiKeys.ROLE_ARTIFACT_DOWNLOAD)
 
         if cache:
             artifacts_tokens = artifacts_tokens.options(
                 FromCache("sql_cache_short", "get_user_artifact_token_%s" % self.user_id))
 
         artifacts_tokens = artifacts_tokens.all()
         if artifacts_tokens:
             return artifacts_tokens[0].api_key
         return 'NO_ARTIFACT_TOKEN_AVAILABLE'
 
     def get_or_create_artifact_token(self):
         artifacts_tokens = UserApiKeys.query()\
             .filter(UserApiKeys.user == self) \
             .filter(or_(UserApiKeys.expires == -1,
                         UserApiKeys.expires >= time.time())) \
             .filter(UserApiKeys.role == UserApiKeys.ROLE_ARTIFACT_DOWNLOAD)
 
         artifacts_tokens = artifacts_tokens.all()
         if artifacts_tokens:
             return artifacts_tokens[0].api_key
         else:
             from rhodecode.model.auth_token import AuthTokenModel
             artifact_token = AuthTokenModel().create(
                 self, 'auto-generated-artifact-token',
                 lifetime=-1, role=UserApiKeys.ROLE_ARTIFACT_DOWNLOAD)
             Session.commit()
             return artifact_token.api_key
 
     @classmethod
     def get(cls, user_id, cache=False):
         if not user_id:
             return
 
         user = cls.query()
         if cache:
             user = user.options(
                 FromCache("sql_cache_short", "get_users_%s" % user_id))
         return user.get(user_id)
 
     @classmethod
     def extra_valid_auth_tokens(cls, user, role=None):
         tokens = UserApiKeys.query().filter(UserApiKeys.user == user)\
                 .filter(or_(UserApiKeys.expires == -1,
                             UserApiKeys.expires >= time.time()))
         if role:
             tokens = tokens.filter(or_(UserApiKeys.role == role,
                                        UserApiKeys.role == UserApiKeys.ROLE_ALL))
         return tokens.all()
 
     def authenticate_by_token(self, auth_token, roles=None, scope_repo_id=None):
         from rhodecode.lib import auth
 
         log.debug('Trying to authenticate user: %s via auth-token, '
                   'and roles: %s', self, roles)
 
         if not auth_token:
             return False
 
         roles = (roles or []) + [UserApiKeys.ROLE_ALL]
         tokens_q = UserApiKeys.query()\
             .filter(UserApiKeys.user_id == self.user_id)\
             .filter(or_(UserApiKeys.expires == -1,
                         UserApiKeys.expires >= time.time()))
 
         tokens_q = tokens_q.filter(UserApiKeys.role.in_(roles))
 
         crypto_backend = auth.crypto_backend()
         enc_token_map = {}
         plain_token_map = {}
         for token in tokens_q:
             if token.api_key.startswith(crypto_backend.ENC_PREF):
                 enc_token_map[token.api_key] = token
             else:
                 plain_token_map[token.api_key] = token
         log.debug(
             'Found %s plain and %s encrypted tokens to check for authentication for this user',
             len(plain_token_map), len(enc_token_map))
 
         # plain token match comes first
         match = plain_token_map.get(auth_token)
 
         # check encrypted tokens now
         if not match:
             for token_hash, token in enc_token_map.items():
                 # NOTE(marcink): this is expensive to calculate, but most secure
                 if crypto_backend.hash_check(auth_token, token_hash):
                     match = token
                     break
 
         if match:
             log.debug('Found matching token %s', match)
             if match.repo_id:
                 log.debug('Found scope, checking for scope match of token %s', match)
                 if match.repo_id == scope_repo_id:
                     return True
                 else:
                     log.debug(
                         'AUTH_TOKEN: scope mismatch, token has a set repo scope: %s, '
                         'and calling scope is:%s, skipping further checks',
                          match.repo, scope_repo_id)
                     return False
             else:
                 return True
 
         return False
 
     @property
     def ip_addresses(self):
         ret = UserIpMap.query().filter(UserIpMap.user == self).all()
         return [x.ip_addr for x in ret]
 
     @property
     def username_and_name(self):
         return '%s (%s %s)' % (self.username, self.first_name, self.last_name)
 
     @property
     def username_or_name_or_email(self):
         full_name = self.full_name if self.full_name is not ' ' else None
         return self.username or full_name or self.email
 
     @property
     def full_name(self):
         return '%s %s' % (self.first_name, self.last_name)
 
     @property
     def full_name_or_username(self):
         return ('%s %s' % (self.first_name, self.last_name)
                 if (self.first_name and self.last_name) else self.username)
 
     @property
     def full_contact(self):
         return '%s %s <%s>' % (self.first_name, self.last_name, self.email)
 
     @property
     def short_contact(self):
         return '%s %s' % (self.first_name, self.last_name)
 
     @property
     def is_admin(self):
         return self.admin
 
     @property
     def language(self):
         return self.user_data.get('language')
 
     def AuthUser(self, **kwargs):
         """
         Returns instance of AuthUser for this user
         """
         from rhodecode.lib.auth import AuthUser
         return AuthUser(user_id=self.user_id, username=self.username, **kwargs)
 
     @hybrid_property
     def user_data(self):
         if not self._user_data:
             return {}
 
         try:
             return json.loads(self._user_data)
         except TypeError:
             return {}
 
     @user_data.setter
     def user_data(self, val):
         if not isinstance(val, dict):
             raise Exception('user_data must be dict, got %s' % type(val))
         try:
             self._user_data = json.dumps(val)
         except Exception:
             log.error(traceback.format_exc())
 
     @classmethod
     def get_by_username(cls, username, case_insensitive=False,
                         cache=False, identity_cache=False):
         session = Session()
 
         if case_insensitive:
             q = cls.query().filter(
                 func.lower(cls.username) == func.lower(username))
         else:
             q = cls.query().filter(cls.username == username)
 
         if cache:
             if identity_cache:
                 val = cls.identity_cache(session, 'username', username)
                 if val:
                     return val
             else:
                 cache_key = "get_user_by_name_%s" % _hash_key(username)
                 q = q.options(
                     FromCache("sql_cache_short", cache_key))
 
         return q.scalar()
 
     @classmethod
     def get_by_auth_token(cls, auth_token, cache=False):
         q = UserApiKeys.query()\
             .filter(UserApiKeys.api_key == auth_token)\
             .filter(or_(UserApiKeys.expires == -1,
                         UserApiKeys.expires >= time.time()))
         if cache:
             q = q.options(
                 FromCache("sql_cache_short", "get_auth_token_%s" % auth_token))
 
         match = q.first()
         if match:
             return match.user
 
     @classmethod
     def get_by_email(cls, email, case_insensitive=False, cache=False):
 
         if case_insensitive:
             q = cls.query().filter(func.lower(cls.email) == func.lower(email))
 
         else:
             q = cls.query().filter(cls.email == email)
 
         email_key = _hash_key(email)
         if cache:
             q = q.options(
                 FromCache("sql_cache_short", "get_email_key_%s" % email_key))
 
         ret = q.scalar()
         if ret is None:
             q = UserEmailMap.query()
             # try fetching in alternate email map
             if case_insensitive:
                 q = q.filter(func.lower(UserEmailMap.email) == func.lower(email))
             else:
                 q = q.filter(UserEmailMap.email == email)
             q = q.options(joinedload(UserEmailMap.user))
             if cache:
                 q = q.options(
                     FromCache("sql_cache_short", "get_email_map_key_%s" % email_key))
             ret = getattr(q.scalar(), 'user', None)
 
         return ret
 
     @classmethod
     def get_from_cs_author(cls, author):
         """
         Tries to get User objects out of commit author string
 
         :param author:
         """
         from rhodecode.lib.helpers import email, author_name
         # Valid email in the attribute passed, see if they're in the system
         _email = email(author)
         if _email:
             user = cls.get_by_email(_email, case_insensitive=True)
             if user:
                 return user
         # Maybe we can match by username?
         _author = author_name(author)
         user = cls.get_by_username(_author, case_insensitive=True)
         if user:
             return user
 
     def update_userdata(self, **kwargs):
         usr = self
         old = usr.user_data
         old.update(**kwargs)
         usr.user_data = old
         Session().add(usr)
         log.debug('updated userdata with %s', kwargs)
 
     def update_lastlogin(self):
         """Update user lastlogin"""
         self.last_login = datetime.datetime.now()
         Session().add(self)
         log.debug('updated user %s lastlogin', self.username)
 
     def update_password(self, new_password):
         from rhodecode.lib.auth import get_crypt_password
 
         self.password = get_crypt_password(new_password)
         Session().add(self)
 
     @classmethod
     def get_first_super_admin(cls):
         user = User.query()\
             .filter(User.admin == true()) \
             .order_by(User.user_id.asc()) \
             .first()
 
         if user is None:
             raise Exception('FATAL: Missing administrative account!')
         return user
 
     @classmethod
     def get_all_super_admins(cls, only_active=False):
         """
         Returns all admin accounts sorted by username
         """
         qry = User.query().filter(User.admin == true()).order_by(User.username.asc())
         if only_active:
             qry = qry.filter(User.active == true())
         return qry.all()
 
     @classmethod
     def get_all_user_ids(cls, only_active=True):
         """
         Returns all users IDs
         """
         qry = Session().query(User.user_id)
 
         if only_active:
             qry = qry.filter(User.active == true())
         return [x.user_id for x in qry]
 
     @classmethod
     def get_default_user(cls, cache=False, refresh=False):
         user = User.get_by_username(User.DEFAULT_USER, cache=cache)
         if user is None:
             raise Exception('FATAL: Missing default account!')
         if refresh:
             # The default user might be based on outdated state which
             # has been loaded from the cache.
             # A call to refresh() ensures that the
             # latest state from the database is used.
             Session().refresh(user)
         return user
 
     @classmethod
     def get_default_user_id(cls):
         import rhodecode
         return rhodecode.CONFIG['default_user_id']
 
     def _get_default_perms(self, user, suffix=''):
         from rhodecode.model.permission import PermissionModel
         return PermissionModel().get_default_perms(user.user_perms, suffix)
 
     def get_default_perms(self, suffix=''):
         return self._get_default_perms(self, suffix)
 
     def get_api_data(self, include_secrets=False, details='full'):
         """
         Common function for generating user related data for API
 
         :param include_secrets: By default secrets in the API data will be replaced
            by a placeholder value to prevent exposing this data by accident. In case
            this data shall be exposed, set this flag to ``True``.
 
         :param details: details can be 'basic|full' basic gives only a subset of
            the available user information that includes user_id, name and emails.
         """
         user = self
         user_data = self.user_data
         data = {
             'user_id': user.user_id,
             'username': user.username,
             'firstname': user.name,
             'lastname': user.lastname,
             'description': user.description,
             'email': user.email,
             'emails': user.emails,
         }
         if details == 'basic':
             return data
 
         auth_token_length = 40
         auth_token_replacement = '*' * auth_token_length
 
         extras = {
             'auth_tokens': [auth_token_replacement],
             'active': user.active,
             'admin': user.admin,
             'extern_type': user.extern_type,
             'extern_name': user.extern_name,
             'last_login': user.last_login,
             'last_activity': user.last_activity,
             'ip_addresses': user.ip_addresses,
             'language': user_data.get('language')
         }
         data.update(extras)
 
         if include_secrets:
             data['auth_tokens'] = user.auth_tokens
         return data
 
     def __json__(self):
         data = {
             'full_name': self.full_name,
             'full_name_or_username': self.full_name_or_username,
             'short_contact': self.short_contact,
             'full_contact': self.full_contact,
         }
         data.update(self.get_api_data())
         return data
 
 
 class UserApiKeys(Base, BaseModel):
     __tablename__ = 'user_api_keys'
     __table_args__ = (
         Index('uak_api_key_idx', 'api_key'),
         Index('uak_api_key_expires_idx', 'api_key', 'expires'),
         base_table_args
     )
     __mapper_args__ = {}
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
     ROLE_VCS = 'token_role_vcs'
     ROLE_API = 'token_role_api'
     ROLE_HTTP = 'token_role_http'
     ROLE_FEED = 'token_role_feed'
     ROLE_ARTIFACT_DOWNLOAD = 'role_artifact_download'
     # The last one is ignored in the list as we only
     # use it for one action, and cannot be created by users
     ROLE_PASSWORD_RESET = 'token_password_reset'
 
     ROLES = [ROLE_ALL, ROLE_VCS, ROLE_API, ROLE_HTTP, ROLE_FEED, ROLE_ARTIFACT_DOWNLOAD]
 
     user_api_key_id = Column("user_api_key_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
     api_key = Column("api_key", String(255), nullable=False, unique=True)
     description = Column('description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))
     expires = Column('expires', Float(53), nullable=False)
     role = Column('role', String(255), nullable=True)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
 
     # scope columns
     repo_id = Column(
         'repo_id', Integer(), ForeignKey('repositories.repo_id'),
         nullable=True, unique=None, default=None)
     repo = relationship('Repository', lazy='joined')
 
     repo_group_id = Column(
         'repo_group_id', Integer(), ForeignKey('groups.group_id'),
         nullable=True, unique=None, default=None)
     repo_group = relationship('RepoGroup', lazy='joined')
 
     user = relationship('User', lazy='joined')
 
     def __unicode__(self):
         return u"<%s('%s')>" % (self.__class__.__name__, self.role)
 
     def __json__(self):
         data = {
             'auth_token': self.api_key,
             'role': self.role,
             'scope': self.scope_humanized,
             'expired': self.expired
         }
         return data
 
     def get_api_data(self, include_secrets=False):
         data = self.__json__()
         if include_secrets:
             return data
         else:
             data['auth_token'] = self.token_obfuscated
             return data
 
     @hybrid_property
     def description_safe(self):
         from rhodecode.lib import helpers as h
         return h.escape(self.description)
 
     @property
     def expired(self):
         if self.expires == -1:
             return False
         return time.time() > self.expires
 
     @classmethod
     def _get_role_name(cls, role):
         return {
             cls.ROLE_ALL: _('all'),
             cls.ROLE_HTTP: _('http/web interface'),
             cls.ROLE_VCS: _('vcs (git/hg/svn protocol)'),
             cls.ROLE_API: _('api calls'),
             cls.ROLE_FEED: _('feed access'),
             cls.ROLE_ARTIFACT_DOWNLOAD: _('artifacts downloads'),
         }.get(role, role)
 
     @classmethod
     def _get_role_description(cls, role):
         return {
             cls.ROLE_ALL: _('Token for all actions.'),
             cls.ROLE_HTTP: _('Token to access RhodeCode pages via web interface without '
                              'login using `api_access_controllers_whitelist` functionality.'),
             cls.ROLE_VCS: _('Token to interact over git/hg/svn protocols. '
                             'Requires auth_token authentication plugin to be active. <br/>'
                             'Such Token should be used then instead of a password to '
                             'interact with a repository, and additionally can be '
                             'limited to single repository using repo scope.'),
             cls.ROLE_API: _('Token limited to api calls.'),
             cls.ROLE_FEED: _('Token to read RSS/ATOM feed.'),
             cls.ROLE_ARTIFACT_DOWNLOAD: _('Token for artifacts downloads.'),
         }.get(role, role)
 
     @property
     def role_humanized(self):
         return self._get_role_name(self.role)
 
     def _get_scope(self):
         if self.repo:
             return 'Repository: {}'.format(self.repo.repo_name)
         if self.repo_group:
             return 'RepositoryGroup: {} (recursive)'.format(self.repo_group.group_name)
         return 'Global'
 
     @property
     def scope_humanized(self):
         return self._get_scope()
 
     @property
     def token_obfuscated(self):
         if self.api_key:
             return self.api_key[:4] + "****"
 
 
 class UserEmailMap(Base, BaseModel):
     __tablename__ = 'user_email_map'
     __table_args__ = (
         Index('uem_email_idx', 'email'),
         UniqueConstraint('email'),
         base_table_args
     )
     __mapper_args__ = {}
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
     _email = Column("email", String(255), nullable=True, unique=False, default=None)
     user = relationship('User', lazy='joined')
 
     @validates('_email')
     def validate_email(self, key, email):
         # check if this email is not main one
         main_email = Session().query(User).filter(User.email == email).scalar()
         if main_email is not None:
             raise AttributeError('email %s is present is user table' % email)
         return email
 
     @hybrid_property
     def email(self):
         return self._email
 
     @email.setter
     def email(self, val):
         self._email = val.lower() if val else None
 
 
 class UserIpMap(Base, BaseModel):
     __tablename__ = 'user_ip_map'
     __table_args__ = (
         UniqueConstraint('user_id', 'ip_addr'),
         base_table_args
     )
     __mapper_args__ = {}
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
     ip_addr = Column("ip_addr", String(255), nullable=True, unique=False, default=None)
     active = Column("active", Boolean(), nullable=True, unique=None, default=True)
     description = Column("description", String(10000), nullable=True, unique=None, default=None)
     user = relationship('User', lazy='joined')
 
     @hybrid_property
     def description_safe(self):
         from rhodecode.lib import helpers as h
         return h.escape(self.description)
 
     @classmethod
     def _get_ip_range(cls, ip_addr):
         net = ipaddress.ip_network(safe_unicode(ip_addr), strict=False)
         return [str(net.network_address), str(net.broadcast_address)]
 
     def __json__(self):
         return {
           'ip_addr': self.ip_addr,
           'ip_range': self._get_ip_range(self.ip_addr),
         }
 
     def __unicode__(self):
         return u"<%s('user_id:%s=>%s')>" % (self.__class__.__name__,
                                             self.user_id, self.ip_addr)
 
 
 class UserSshKeys(Base, BaseModel):
     __tablename__ = 'user_ssh_keys'
     __table_args__ = (
         Index('usk_ssh_key_fingerprint_idx', 'ssh_key_fingerprint'),
 
         UniqueConstraint('ssh_key_fingerprint'),
 
         base_table_args
     )
     __mapper_args__ = {}
 
     ssh_key_id = Column('ssh_key_id', Integer(), nullable=False, unique=True, default=None, primary_key=True)
     ssh_key_data = Column('ssh_key_data', String(10240), nullable=False, unique=None, default=None)
     ssh_key_fingerprint = Column('ssh_key_fingerprint', String(255), nullable=False, unique=None, default=None)
 
     description = Column('description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))
 
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     accessed_on = Column('accessed_on', DateTime(timezone=False), nullable=True, default=None)
     user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
 
     user = relationship('User', lazy='joined')
 
     def __json__(self):
         data = {
             'ssh_fingerprint': self.ssh_key_fingerprint,
             'description': self.description,
             'created_on': self.created_on
         }
         return data
 
     def get_api_data(self):
         data = self.__json__()
         return data
 
 
 class UserLog(Base, BaseModel):
     __tablename__ = 'user_logs'
     __table_args__ = (
         base_table_args,
     )
 
     VERSION_1 = 'v1'
     VERSION_2 = 'v2'
     VERSIONS = [VERSION_1, VERSION_2]
 
     user_log_id = Column("user_log_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id',ondelete='SET NULL'), nullable=True, unique=None, default=None)
     username = Column("username", String(255), nullable=True, unique=None, default=None)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id', ondelete='SET NULL'), nullable=True, unique=None, default=None)
     repository_name = Column("repository_name", String(255), nullable=True, unique=None, default=None)
     user_ip = Column("user_ip", String(255), nullable=True, unique=None, default=None)
     action = Column("action", Text().with_variant(Text(1200000), 'mysql'), nullable=True, unique=None, default=None)
     action_date = Column("action_date", DateTime(timezone=False), nullable=True, unique=None, default=None)
 
     version = Column("version", String(255), nullable=True, default=VERSION_1)
     user_data = Column('user_data_json', MutationObj.as_mutable(JsonType(dialect_map=dict(mysql=LONGTEXT()))))
     action_data = Column('action_data_json', MutationObj.as_mutable(JsonType(dialect_map=dict(mysql=LONGTEXT()))))
 
     def __unicode__(self):
         return u"<%s('id:%s:%s')>" % (
             self.__class__.__name__, self.repository_name, self.action)
 
     def __json__(self):
         return {
             'user_id': self.user_id,
             'username': self.username,
             'repository_id': self.repository_id,
             'repository_name': self.repository_name,
             'user_ip': self.user_ip,
             'action_date': self.action_date,
             'action': self.action,
         }
 
     @hybrid_property
     def entry_id(self):
         return self.user_log_id
 
     @property
     def action_as_day(self):
         return datetime.date(*self.action_date.timetuple()[:3])
 
     user = relationship('User')
     repository = relationship('Repository', cascade='')
 
 
 class UserGroup(Base, BaseModel):
     __tablename__ = 'users_groups'
     __table_args__ = (
         base_table_args,
     )
 
     users_group_id = Column("users_group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_name = Column("users_group_name", String(255), nullable=False, unique=True, default=None)
     user_group_description = Column("user_group_description", String(10000), nullable=True, unique=None, default=None)
     users_group_active = Column("users_group_active", Boolean(), nullable=True, unique=None, default=None)
     inherit_default_permissions = Column("users_group_inherit_default_permissions", Boolean(), nullable=False, unique=None, default=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     _group_data = Column("group_data", LargeBinary(), nullable=True)  # JSON data
 
     members = relationship('UserGroupMember', cascade="all, delete-orphan", lazy="joined")
     users_group_to_perm = relationship('UserGroupToPerm', cascade='all')
     users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
     users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
     user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
     user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
 
     user_group_review_rules = relationship('RepoReviewRuleUserGroup', cascade='all')
     user = relationship('User', primaryjoin="User.user_id==UserGroup.user_id")
 
     @classmethod
     def _load_group_data(cls, column):
         if not column:
             return {}
 
         try:
             return json.loads(column) or {}
         except TypeError:
             return {}
 
     @hybrid_property
     def description_safe(self):
         from rhodecode.lib import helpers as h
         return h.escape(self.user_group_description)
 
     @hybrid_property
     def group_data(self):
         return self._load_group_data(self._group_data)
 
     @group_data.expression
     def group_data(self, **kwargs):
         return self._group_data
 
     @group_data.setter
     def group_data(self, val):
         try:
             self._group_data = json.dumps(val)
         except Exception:
             log.error(traceback.format_exc())
 
     @classmethod
     def _load_sync(cls, group_data):
         if group_data:
             return group_data.get('extern_type')
 
     @property
     def sync(self):
         return self._load_sync(self.group_data)
 
     def __unicode__(self):
         return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
                                       self.users_group_id,
                                       self.users_group_name)
 
     @classmethod
     def get_by_group_name(cls, group_name, cache=False,
                           case_insensitive=False):
         if case_insensitive:
             q = cls.query().filter(func.lower(cls.users_group_name) ==
                                    func.lower(group_name))
 
         else:
             q = cls.query().filter(cls.users_group_name == group_name)
         if cache:
             q = q.options(
                 FromCache("sql_cache_short", "get_group_%s" % _hash_key(group_name)))
         return q.scalar()
 
     @classmethod
     def get(cls, user_group_id, cache=False):
         if not user_group_id:
             return
 
         user_group = cls.query()
         if cache:
             user_group = user_group.options(
                 FromCache("sql_cache_short", "get_users_group_%s" % user_group_id))
         return user_group.get(user_group_id)
 
     def permissions(self, with_admins=True, with_owner=True,
                     expand_from_user_groups=False):
         """
         Permissions for user groups
         """
         _admin_perm = 'usergroup.admin'
 
         owner_row = []
         if with_owner:
             usr = AttributeDict(self.user.get_dict())
             usr.owner_row = True
             usr.permission = _admin_perm
             owner_row.append(usr)
 
         super_admin_ids = []
         super_admin_rows = []
         if with_admins:
             for usr in User.get_all_super_admins():
                 super_admin_ids.append(usr.user_id)
                 # if this admin is also owner, don't double the record
                 if usr.user_id == owner_row[0].user_id:
                     owner_row[0].admin_row = True
                 else:
                     usr = AttributeDict(usr.get_dict())
                     usr.admin_row = True
                     usr.permission = _admin_perm
                     super_admin_rows.append(usr)
 
         q = UserUserGroupToPerm.query().filter(UserUserGroupToPerm.user_group == self)
         q = q.options(joinedload(UserUserGroupToPerm.user_group),
                       joinedload(UserUserGroupToPerm.user),
                       joinedload(UserUserGroupToPerm.permission),)
 
         # get owners and admins and permissions. We do a trick of re-writing
         # objects from sqlalchemy to named-tuples due to sqlalchemy session
         # has a global reference and changing one object propagates to all
         # others. This means if admin is also an owner admin_row that change
         # would propagate to both objects
         perm_rows = []
         for _usr in q.all():
             usr = AttributeDict(_usr.user.get_dict())
             # if this user is also owner/admin, mark as duplicate record
             if usr.user_id == owner_row[0].user_id or usr.user_id in super_admin_ids:
                 usr.duplicate_perm = True
             usr.permission = _usr.permission.permission_name
             perm_rows.append(usr)
 
         # filter the perm rows by 'default' first and then sort them by
         # admin,write,read,none permissions sorted again alphabetically in
         # each group
         perm_rows = sorted(perm_rows, key=display_user_sort)
 
         user_groups_rows = []
         if expand_from_user_groups:
             for ug in self.permission_user_groups(with_members=True):
                 for user_data in ug.members:
                     user_groups_rows.append(user_data)
 
         return super_admin_rows + owner_row + perm_rows + user_groups_rows
 
     def permission_user_groups(self, with_members=False):
         q = UserGroupUserGroupToPerm.query()\
             .filter(UserGroupUserGroupToPerm.target_user_group == self)
         q = q.options(joinedload(UserGroupUserGroupToPerm.user_group),
                       joinedload(UserGroupUserGroupToPerm.target_user_group),
                       joinedload(UserGroupUserGroupToPerm.permission),)
 
         perm_rows = []
         for _user_group in q.all():
             entry = AttributeDict(_user_group.user_group.get_dict())
             entry.permission = _user_group.permission.permission_name
             if with_members:
                 entry.members = [x.user.get_dict()
                                  for x in _user_group.user_group.members]
             perm_rows.append(entry)
 
         perm_rows = sorted(perm_rows, key=display_user_group_sort)
         return perm_rows
 
     def _get_default_perms(self, user_group, suffix=''):
         from rhodecode.model.permission import PermissionModel
         return PermissionModel().get_default_perms(user_group.users_group_to_perm, suffix)
 
     def get_default_perms(self, suffix=''):
         return self._get_default_perms(self, suffix)
 
     def get_api_data(self, with_group_members=True, include_secrets=False):
         """
         :param include_secrets: See :meth:`User.get_api_data`, this parameter is
            basically forwarded.
 
         """
         user_group = self
         data = {
             'users_group_id': user_group.users_group_id,
             'group_name': user_group.users_group_name,
             'group_description': user_group.user_group_description,
             'active': user_group.users_group_active,
             'owner': user_group.user.username,
             'sync': user_group.sync,
             'owner_email': user_group.user.email,
         }
 
         if with_group_members:
             users = []
             for user in user_group.members:
                 user = user.user
                 users.append(user.get_api_data(include_secrets=include_secrets))
             data['users'] = users
 
         return data
 
 
 class UserGroupMember(Base, BaseModel):
     __tablename__ = 'users_groups_members'
     __table_args__ = (
         base_table_args,
     )
 
     users_group_member_id = Column("users_group_member_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
 
     user = relationship('User', lazy='joined')
     users_group = relationship('UserGroup')
 
     def __init__(self, gr_id='', u_id=''):
         self.users_group_id = gr_id
         self.user_id = u_id
 
 
 class RepositoryField(Base, BaseModel):
     __tablename__ = 'repositories_fields'
     __table_args__ = (
         UniqueConstraint('repository_id', 'field_key'),  # no-multi field
         base_table_args,
     )
 
     PREFIX = 'ex_'  # prefix used in form to not conflict with already existing fields
 
     repo_field_id = Column("repo_field_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
     field_key = Column("field_key", String(250))
     field_label = Column("field_label", String(1024), nullable=False)
     field_value = Column("field_value", String(10000), nullable=False)
     field_desc = Column("field_desc", String(1024), nullable=False)
     field_type = Column("field_type", String(255), nullable=False, unique=None)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
 
     repository = relationship('Repository')
 
     @property
     def field_key_prefixed(self):
         return 'ex_%s' % self.field_key
 
     @classmethod
     def un_prefix_key(cls, key):
         if key.startswith(cls.PREFIX):
             return key[len(cls.PREFIX):]
         return key
 
     @classmethod
     def get_by_key_name(cls, key, repo):
         row = cls.query()\
                 .filter(cls.repository == repo)\
                 .filter(cls.field_key == key).scalar()
         return row
 
 
 class Repository(Base, BaseModel):
     __tablename__ = 'repositories'
     __table_args__ = (
         Index('r_repo_name_idx', 'repo_name', mysql_length=255),
         base_table_args,
     )
     DEFAULT_CLONE_URI = '{scheme}://{user}@{netloc}/{repo}'
     DEFAULT_CLONE_URI_ID = '{scheme}://{user}@{netloc}/_{repoid}'
     DEFAULT_CLONE_URI_SSH = 'ssh://{sys_user}@{hostname}/{repo}'
 
     STATE_CREATED = 'repo_state_created'
     STATE_PENDING = 'repo_state_pending'
     STATE_ERROR = 'repo_state_error'
 
     LOCK_AUTOMATIC = 'lock_auto'
     LOCK_API = 'lock_api'
     LOCK_WEB = 'lock_web'
     LOCK_PULL = 'lock_pull'
 
     NAME_SEP = URL_SEP
 
     repo_id = Column(
         "repo_id", Integer(), nullable=False, unique=True, default=None,
         primary_key=True)
     _repo_name = Column(
         "repo_name", Text(), nullable=False, default=None)
     repo_name_hash = Column(
         "repo_name_hash", String(255), nullable=False, unique=True)
     repo_state = Column("repo_state", String(255), nullable=True)
 
     clone_uri = Column(
         "clone_uri", EncryptedTextValue(), nullable=True, unique=False,
         default=None)
     push_uri = Column(
         "push_uri", EncryptedTextValue(), nullable=True, unique=False,
         default=None)
     repo_type = Column(
         "repo_type", String(255), nullable=False, unique=False, default=None)
     user_id = Column(
         "user_id", Integer(), ForeignKey('users.user_id'), nullable=False,
         unique=False, default=None)
     private = Column(
         "private", Boolean(), nullable=True, unique=None, default=None)
     archived = Column(
         "archived", Boolean(), nullable=True, unique=None, default=None)
     enable_statistics = Column(
         "statistics", Boolean(), nullable=True, unique=None, default=True)
     enable_downloads = Column(
         "downloads", Boolean(), nullable=True, unique=None, default=True)
     description = Column(
         "description", String(10000), nullable=True, unique=None, default=None)
     created_on = Column(
         'created_on', DateTime(timezone=False), nullable=True, unique=None,
         default=datetime.datetime.now)
     updated_on = Column(
         'updated_on', DateTime(timezone=False), nullable=True, unique=None,
         default=datetime.datetime.now)
     _landing_revision = Column(
         "landing_revision", String(255), nullable=False, unique=False,
         default=None)
     enable_locking = Column(
         "enable_locking", Boolean(), nullable=False, unique=None,
         default=False)
     _locked = Column(
         "locked", String(255), nullable=True, unique=False, default=None)
     _changeset_cache = Column(
         "changeset_cache", LargeBinary(), nullable=True)  # JSON data
 
     fork_id = Column(
         "fork_id", Integer(), ForeignKey('repositories.repo_id'),
         nullable=True, unique=False, default=None)
     group_id = Column(
         "group_id", Integer(), ForeignKey('groups.group_id'), nullable=True,
         unique=False, default=None)
 
     user = relationship('User', lazy='joined')
     fork = relationship('Repository', remote_side=repo_id, lazy='joined')
     group = relationship('RepoGroup', lazy='joined')
     repo_to_perm = relationship(
         'UserRepoToPerm', cascade='all',
         order_by='UserRepoToPerm.repo_to_perm_id')
     users_group_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
     stats = relationship('Statistics', cascade='all', uselist=False)
 
     followers = relationship(
         'UserFollowing',
         primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id',
         cascade='all')
     extra_fields = relationship(
         'RepositoryField', cascade="all, delete-orphan")
     logs = relationship('UserLog')
     comments = relationship(
         'ChangesetComment', cascade="all, delete-orphan")
     pull_requests_source = relationship(
         'PullRequest',
         primaryjoin='PullRequest.source_repo_id==Repository.repo_id',
         cascade="all, delete-orphan")
     pull_requests_target = relationship(
         'PullRequest',
         primaryjoin='PullRequest.target_repo_id==Repository.repo_id',
         cascade="all, delete-orphan")
     ui = relationship('RepoRhodeCodeUi', cascade="all")
     settings = relationship('RepoRhodeCodeSetting', cascade="all")
     integrations = relationship('Integration', cascade="all, delete-orphan")
 
     scoped_tokens = relationship('UserApiKeys', cascade="all")
 
     # no cascade, set NULL
     artifacts = relationship('FileStore', primaryjoin='FileStore.scope_repo_id==Repository.repo_id')
 
     def __unicode__(self):
         return u"<%s('%s:%s')>" % (self.__class__.__name__, self.repo_id,
                                    safe_unicode(self.repo_name))
 
     @hybrid_property
     def description_safe(self):
         from rhodecode.lib import helpers as h
         return h.escape(self.description)
 
     @hybrid_property
     def landing_rev(self):
         # always should return [rev_type, rev], e.g ['branch', 'master']
         if self._landing_revision:
             _rev_info = self._landing_revision.split(':')
             if len(_rev_info) < 2:
                 _rev_info.insert(0, 'rev')
             return [_rev_info[0], _rev_info[1]]
         return [None, None]
 
     @property
     def landing_ref_type(self):
         return self.landing_rev[0]
 
     @property
     def landing_ref_name(self):
         return self.landing_rev[1]
 
     @landing_rev.setter
     def landing_rev(self, val):
         if ':' not in val:
             raise ValueError('value must be delimited with `:` and consist '
                              'of <rev_type>:<rev>, got %s instead' % val)
         self._landing_revision = val
 
     @hybrid_property
     def locked(self):
         if self._locked:
             user_id, timelocked, reason = self._locked.split(':')
             lock_values = int(user_id), timelocked, reason
         else:
             lock_values = [None, None, None]
         return lock_values
 
     @locked.setter
     def locked(self, val):
         if val and isinstance(val, (list, tuple)):
             self._locked = ':'.join(map(str, val))
         else:
             self._locked = None
 
     @classmethod
     def _load_changeset_cache(cls, repo_id, changeset_cache_raw):
         from rhodecode.lib.vcs.backends.base import EmptyCommit
         dummy = EmptyCommit().__json__()
         if not changeset_cache_raw:
             dummy['source_repo_id'] = repo_id
             return json.loads(json.dumps(dummy))
 
         try:
             return json.loads(changeset_cache_raw)
         except TypeError:
             return dummy
         except Exception:
             log.error(traceback.format_exc())
             return dummy
 
     @hybrid_property
     def changeset_cache(self):
         return self._load_changeset_cache(self.repo_id, self._changeset_cache)
 
     @changeset_cache.setter
     def changeset_cache(self, val):
         try:
             self._changeset_cache = json.dumps(val)
         except Exception:
             log.error(traceback.format_exc())
 
     @hybrid_property
     def repo_name(self):
         return self._repo_name
 
     @repo_name.setter
     def repo_name(self, value):
         self._repo_name = value
         self.repo_name_hash = hashlib.sha1(safe_str(value)).hexdigest()
 
     @classmethod
     def normalize_repo_name(cls, repo_name):
         """
         Normalizes os specific repo_name to the format internally stored inside
         database using URL_SEP
 
         :param cls:
         :param repo_name:
         """
         return cls.NAME_SEP.join(repo_name.split(os.sep))
 
     @classmethod
     def get_by_repo_name(cls, repo_name, cache=False, identity_cache=False):
         session = Session()
         q = session.query(cls).filter(cls.repo_name == repo_name)
 
         if cache:
             if identity_cache:
                 val = cls.identity_cache(session, 'repo_name', repo_name)
                 if val:
                     return val
             else:
                 cache_key = "get_repo_by_name_%s" % _hash_key(repo_name)
                 q = q.options(
                     FromCache("sql_cache_short", cache_key))
 
         return q.scalar()
 
     @classmethod
     def get_by_id_or_repo_name(cls, repoid):
         if isinstance(repoid, (int, long)):
             try:
                 repo = cls.get(repoid)
             except ValueError:
                 repo = None
         else:
             repo = cls.get_by_repo_name(repoid)
         return repo
 
     @classmethod
     def get_by_full_path(cls, repo_full_path):
         repo_name = repo_full_path.split(cls.base_path(), 1)[-1]
         repo_name = cls.normalize_repo_name(repo_name)
         return cls.get_by_repo_name(repo_name.strip(URL_SEP))
 
     @classmethod
     def get_repo_forks(cls, repo_id):
         return cls.query().filter(Repository.fork_id == repo_id)
 
     @classmethod
     def base_path(cls):
         """
         Returns base path when all repos are stored
 
         :param cls:
         """
         q = Session().query(RhodeCodeUi)\
             .filter(RhodeCodeUi.ui_key == cls.NAME_SEP)
         q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
         return q.one().ui_value
 
     @classmethod
     def get_all_repos(cls, user_id=Optional(None), group_id=Optional(None),
                       case_insensitive=True, archived=False):
         q = Repository.query()
 
         if not archived:
             q = q.filter(Repository.archived.isnot(true()))
 
         if not isinstance(user_id, Optional):
             q = q.filter(Repository.user_id == user_id)
 
         if not isinstance(group_id, Optional):
             q = q.filter(Repository.group_id == group_id)
 
         if case_insensitive:
             q = q.order_by(func.lower(Repository.repo_name))
         else:
             q = q.order_by(Repository.repo_name)
 
         return q.all()
 
     @property
     def repo_uid(self):
         return '_{}'.format(self.repo_id)
 
     @property
     def forks(self):
         """
         Return forks of this repo
         """
         return Repository.get_repo_forks(self.repo_id)
 
     @property
     def parent(self):
         """
         Returns fork parent
         """
         return self.fork
 
     @property
     def just_name(self):
         return self.repo_name.split(self.NAME_SEP)[-1]
 
     @property
     def groups_with_parents(self):
         groups = []
         if self.group is None:
             return groups
 
         cur_gr = self.group
         groups.insert(0, cur_gr)
         while 1:
             gr = getattr(cur_gr, 'parent_group', None)
             cur_gr = cur_gr.parent_group
             if gr is None:
                 break
             groups.insert(0, gr)
 
         return groups
 
     @property
     def groups_and_repo(self):
         return self.groups_with_parents, self
 
     @LazyProperty
     def repo_path(self):
         """
         Returns base full path for that repository means where it actually
         exists on a filesystem
         """
         q = Session().query(RhodeCodeUi).filter(
             RhodeCodeUi.ui_key == self.NAME_SEP)
         q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
         return q.one().ui_value
 
     @property
     def repo_full_path(self):
         p = [self.repo_path]
         # we need to split the name by / since this is how we store the
         # names in the database, but that eventually needs to be converted
         # into a valid system path
         p += self.repo_name.split(self.NAME_SEP)
         return os.path.join(*map(safe_unicode, p))
 
     @property
     def cache_keys(self):
         """
         Returns associated cache keys for that repo
         """
         invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
             repo_id=self.repo_id)
         return CacheKey.query()\
             .filter(CacheKey.cache_args == invalidation_namespace)\
             .order_by(CacheKey.cache_key)\
             .all()
 
     @property
     def cached_diffs_relative_dir(self):
         """
         Return a relative to the repository store path of cached diffs
         used for safe display for users, who shouldn't know the absolute store
         path
         """
         return os.path.join(
             os.path.dirname(self.repo_name),
             self.cached_diffs_dir.split(os.path.sep)[-1])
 
     @property
     def cached_diffs_dir(self):
         path = self.repo_full_path
         return os.path.join(
             os.path.dirname(path),
             '.__shadow_diff_cache_repo_{}'.format(self.repo_id))
 
     def cached_diffs(self):
         diff_cache_dir = self.cached_diffs_dir
         if os.path.isdir(diff_cache_dir):
             return os.listdir(diff_cache_dir)
         return []
 
     def shadow_repos(self):
         shadow_repos_pattern = '.__shadow_repo_{}'.format(self.repo_id)
         return [
             x for x in os.listdir(os.path.dirname(self.repo_full_path))
             if x.startswith(shadow_repos_pattern)]
 
     def get_new_name(self, repo_name):
         """
         returns new full repository name based on assigned group and new new
 
         :param group_name:
         """
         path_prefix = self.group.full_path_splitted if self.group else []
         return self.NAME_SEP.join(path_prefix + [repo_name])
 
     @property
     def _config(self):
         """
         Returns db based config object.
         """
         from rhodecode.lib.utils import make_db_config
         return make_db_config(clear_session=False, repo=self)
 
     def permissions(self, with_admins=True, with_owner=True,
                     expand_from_user_groups=False):
         """
         Permissions for repositories
         """
         _admin_perm = 'repository.admin'
 
         owner_row = []
         if with_owner:
             usr = AttributeDict(self.user.get_dict())
             usr.owner_row = True
             usr.permission = _admin_perm
             usr.permission_id = None
             owner_row.append(usr)
 
         super_admin_ids = []
         super_admin_rows = []
         if with_admins:
             for usr in User.get_all_super_admins():
                 super_admin_ids.append(usr.user_id)
                 # if this admin is also owner, don't double the record
                 if usr.user_id == owner_row[0].user_id:
                     owner_row[0].admin_row = True
                 else:
                     usr = AttributeDict(usr.get_dict())
                     usr.admin_row = True
                     usr.permission = _admin_perm
                     usr.permission_id = None
                     super_admin_rows.append(usr)
 
         q = UserRepoToPerm.query().filter(UserRepoToPerm.repository == self)
         q = q.options(joinedload(UserRepoToPerm.repository),
                       joinedload(UserRepoToPerm.user),
                       joinedload(UserRepoToPerm.permission),)
 
         # get owners and admins and permissions. We do a trick of re-writing
         # objects from sqlalchemy to named-tuples due to sqlalchemy session
         # has a global reference and changing one object propagates to all
         # others. This means if admin is also an owner admin_row that change
         # would propagate to both objects
         perm_rows = []
         for _usr in q.all():
             usr = AttributeDict(_usr.user.get_dict())
             # if this user is also owner/admin, mark as duplicate record
             if usr.user_id == owner_row[0].user_id or usr.user_id in super_admin_ids:
                 usr.duplicate_perm = True
             # also check if this permission is maybe used by branch_permissions
             if _usr.branch_perm_entry:
                 usr.branch_rules = [x.branch_rule_id for x in _usr.branch_perm_entry]
 
             usr.permission = _usr.permission.permission_name
             usr.permission_id = _usr.repo_to_perm_id
             perm_rows.append(usr)
 
         # filter the perm rows by 'default' first and then sort them by
         # admin,write,read,none permissions sorted again alphabetically in
         # each group
         perm_rows = sorted(perm_rows, key=display_user_sort)
 
         user_groups_rows = []
         if expand_from_user_groups:
             for ug in self.permission_user_groups(with_members=True):
                 for user_data in ug.members:
                     user_groups_rows.append(user_data)
 
         return super_admin_rows + owner_row + perm_rows + user_groups_rows
 
     def permission_user_groups(self, with_members=True):
         q = UserGroupRepoToPerm.query()\
             .filter(UserGroupRepoToPerm.repository == self)
         q = q.options(joinedload(UserGroupRepoToPerm.repository),
                       joinedload(UserGroupRepoToPerm.users_group),
                       joinedload(UserGroupRepoToPerm.permission),)
 
         perm_rows = []
         for _user_group in q.all():
             entry = AttributeDict(_user_group.users_group.get_dict())
             entry.permission = _user_group.permission.permission_name
             if with_members:
                 entry.members = [x.user.get_dict()
                                  for x in _user_group.users_group.members]
             perm_rows.append(entry)
 
         perm_rows = sorted(perm_rows, key=display_user_group_sort)
         return perm_rows
 
     def get_api_data(self, include_secrets=False):
         """
         Common function for generating repo api data
 
         :param include_secrets: See :meth:`User.get_api_data`.
 
         """
         # TODO: mikhail: Here there is an anti-pattern, we probably need to
         # move this methods on models level.
         from rhodecode.model.settings import SettingsModel
         from rhodecode.model.repo import RepoModel
 
         repo = self
         _user_id, _time, _reason = self.locked
 
         data = {
             'repo_id': repo.repo_id,
             'repo_name': repo.repo_name,
             'repo_type': repo.repo_type,
             'clone_uri': repo.clone_uri or '',
             'push_uri': repo.push_uri or '',
             'url': RepoModel().get_url(self),
             'private': repo.private,
             'created_on': repo.created_on,
             'description': repo.description_safe,
             'landing_rev': repo.landing_rev,
             'owner': repo.user.username,
             'fork_of': repo.fork.repo_name if repo.fork else None,
             'fork_of_id': repo.fork.repo_id if repo.fork else None,
             'enable_statistics': repo.enable_statistics,
             'enable_locking': repo.enable_locking,
             'enable_downloads': repo.enable_downloads,
             'last_changeset': repo.changeset_cache,
             'locked_by': User.get(_user_id).get_api_data(
                 include_secrets=include_secrets) if _user_id else None,
             'locked_date': time_to_datetime(_time) if _time else None,
             'lock_reason': _reason if _reason else None,
         }
 
         # TODO: mikhail: should be per-repo settings here
         rc_config = SettingsModel().get_all_settings()
         repository_fields = str2bool(
             rc_config.get('rhodecode_repository_fields'))
         if repository_fields:
             for f in self.extra_fields:
                 data[f.field_key_prefixed] = f.field_value
 
         return data
 
     @classmethod
     def lock(cls, repo, user_id, lock_time=None, lock_reason=None):
         if not lock_time:
             lock_time = time.time()
         if not lock_reason:
             lock_reason = cls.LOCK_AUTOMATIC
         repo.locked = [user_id, lock_time, lock_reason]
         Session().add(repo)
         Session().commit()
 
     @classmethod
     def unlock(cls, repo):
         repo.locked = None
         Session().add(repo)
         Session().commit()
 
     @classmethod
     def getlock(cls, repo):
         return repo.locked
 
     def is_user_lock(self, user_id):
         if self.lock[0]:
             lock_user_id = safe_int(self.lock[0])
             user_id = safe_int(user_id)
             # both are ints, and they are equal
             return all([lock_user_id, user_id]) and lock_user_id == user_id
 
         return False
 
     def get_locking_state(self, action, user_id, only_when_enabled=True):
         """
         Checks locking on this repository, if locking is enabled and lock is
         present returns a tuple of make_lock, locked, locked_by.
         make_lock can have 3 states None (do nothing) True, make lock
         False release lock, This value is later propagated to hooks, which
         do the locking. Think about this as signals passed to hooks what to do.
 
         """
         # TODO: johbo: This is part of the business logic and should be moved
         # into the RepositoryModel.
 
         if action not in ('push', 'pull'):
             raise ValueError("Invalid action value: %s" % repr(action))
 
         # defines if locked error should be thrown to user
         currently_locked = False
         # defines if new lock should be made, tri-state
         make_lock = None
         repo = self
         user = User.get(user_id)
 
         lock_info = repo.locked
 
         if repo and (repo.enable_locking or not only_when_enabled):
             if action == 'push':
                 # check if it's already locked !, if it is compare users
                 locked_by_user_id = lock_info[0]
                 if user.user_id == locked_by_user_id:
                     log.debug(
                         'Got `push` action from user %s, now unlocking', user)
                     # unlock if we have push from user who locked
                     make_lock = False
                 else:
                     # we're not the same user who locked, ban with
                     # code defined in settings (default is 423 HTTP Locked) !
                     log.debug('Repo %s is currently locked by %s', repo, user)
                     currently_locked = True
             elif action == 'pull':
                 # [0] user [1] date
                 if lock_info[0] and lock_info[1]:
                     log.debug('Repo %s is currently locked by %s', repo, user)
                     currently_locked = True
                 else:
                     log.debug('Setting lock on repo %s by %s', repo, user)
                     make_lock = True
 
         else:
             log.debug('Repository %s do not have locking enabled', repo)
 
         log.debug('FINAL locking values make_lock:%s,locked:%s,locked_by:%s',
                   make_lock, currently_locked, lock_info)
 
         from rhodecode.lib.auth import HasRepoPermissionAny
         perm_check = HasRepoPermissionAny('repository.write', 'repository.admin')
         if make_lock and not perm_check(repo_name=repo.repo_name, user=user):
             # if we don't have at least write permission we cannot make a lock
             log.debug('lock state reset back to FALSE due to lack '
                       'of at least read permission')
             make_lock = False
 
         return make_lock, currently_locked, lock_info
 
     @property
     def last_commit_cache_update_diff(self):
         return time.time() - (safe_int(self.changeset_cache.get('updated_on')) or 0)
 
     @classmethod
     def _load_commit_change(cls, last_commit_cache):
         from rhodecode.lib.vcs.utils.helpers import parse_datetime
         empty_date = datetime.datetime.fromtimestamp(0)
         date_latest = last_commit_cache.get('date', empty_date)
         try:
             return parse_datetime(date_latest)
         except Exception:
             return empty_date
 
     @property
     def last_commit_change(self):
         return self._load_commit_change(self.changeset_cache)
 
     @property
     def last_db_change(self):
         return self.updated_on
 
     @property
     def clone_uri_hidden(self):
         clone_uri = self.clone_uri
         if clone_uri:
             import urlobject
             url_obj = urlobject.URLObject(cleaned_uri(clone_uri))
             if url_obj.password:
                 clone_uri = url_obj.with_password('*****')
         return clone_uri
 
     @property
     def push_uri_hidden(self):
         push_uri = self.push_uri
         if push_uri:
             import urlobject
             url_obj = urlobject.URLObject(cleaned_uri(push_uri))
             if url_obj.password:
                 push_uri = url_obj.with_password('*****')
         return push_uri
 
     def clone_url(self, **override):
         from rhodecode.model.settings import SettingsModel
 
         uri_tmpl = None
         if 'with_id' in override:
             uri_tmpl = self.DEFAULT_CLONE_URI_ID
             del override['with_id']
 
         if 'uri_tmpl' in override:
             uri_tmpl = override['uri_tmpl']
             del override['uri_tmpl']
 
         ssh = False
         if 'ssh' in override:
             ssh = True
             del override['ssh']
 
         # we didn't override our tmpl from **overrides
         request = get_current_request()
         if not uri_tmpl:
             if hasattr(request, 'call_context') and hasattr(request.call_context, 'rc_config'):
                 rc_config = request.call_context.rc_config
             else:
                 rc_config = SettingsModel().get_all_settings(cache=True)
 
             if ssh:
                 uri_tmpl = rc_config.get(
                     'rhodecode_clone_uri_ssh_tmpl') or self.DEFAULT_CLONE_URI_SSH
 
             else:
                 uri_tmpl = rc_config.get(
                     'rhodecode_clone_uri_tmpl') or self.DEFAULT_CLONE_URI
 
         return get_clone_url(request=request,
                              uri_tmpl=uri_tmpl,
                              repo_name=self.repo_name,
                              repo_id=self.repo_id,
                              repo_type=self.repo_type,
                              **override)
 
     def set_state(self, state):
         self.repo_state = state
         Session().add(self)
     #==========================================================================
     # SCM PROPERTIES
     #==========================================================================
 
     def get_commit(self, commit_id=None, commit_idx=None, pre_load=None, maybe_unreachable=False):
         return get_commit_safe(
             self.scm_instance(), commit_id, commit_idx, pre_load=pre_load,
             maybe_unreachable=maybe_unreachable)
 
     def get_changeset(self, rev=None, pre_load=None):
         warnings.warn("Use get_commit", DeprecationWarning)
         commit_id = None
         commit_idx = None
         if isinstance(rev, compat.string_types):
             commit_id = rev
         else:
             commit_idx = rev
         return self.get_commit(commit_id=commit_id, commit_idx=commit_idx,
                                pre_load=pre_load)
 
     def get_landing_commit(self):
         """
         Returns landing commit, or if that doesn't exist returns the tip
         """
         _rev_type, _rev = self.landing_rev
         commit = self.get_commit(_rev)
         if isinstance(commit, EmptyCommit):
             return self.get_commit()
         return commit
 
     def flush_commit_cache(self):
         self.update_commit_cache(cs_cache={'raw_id':'0'})
         self.update_commit_cache()
 
     def update_commit_cache(self, cs_cache=None, config=None):
         """
         Update cache of last commit for repository
         cache_keys should be::
 
             source_repo_id
             short_id
             raw_id
             revision
             parents
             message
             date
             author
             updated_on
 
         """
         from rhodecode.lib.vcs.backends.base import BaseChangeset
         from rhodecode.lib.vcs.utils.helpers import parse_datetime
         empty_date = datetime.datetime.fromtimestamp(0)
 
         if cs_cache is None:
             # use no-cache version here
             try:
                 scm_repo = self.scm_instance(cache=False, config=config)
             except VCSError:
                 scm_repo = None
             empty = scm_repo is None or scm_repo.is_empty()
 
             if not empty:
                 cs_cache = scm_repo.get_commit(
                     pre_load=["author", "date", "message", "parents", "branch"])
             else:
                 cs_cache = EmptyCommit()
 
         if isinstance(cs_cache, BaseChangeset):
             cs_cache = cs_cache.__json__()
 
         def is_outdated(new_cs_cache):
             if (new_cs_cache['raw_id'] != self.changeset_cache['raw_id'] or
                 new_cs_cache['revision'] != self.changeset_cache['revision']):
                 return True
             return False
 
         # check if we have maybe already latest cached revision
         if is_outdated(cs_cache) or not self.changeset_cache:
             _current_datetime = datetime.datetime.utcnow()
             last_change = cs_cache.get('date') or _current_datetime
             # we check if last update is newer than the new value
             # if yes, we use the current timestamp instead. Imagine you get
             # old commit pushed 1y ago, we'd set last update 1y to ago.
             last_change_timestamp = datetime_to_time(last_change)
             current_timestamp = datetime_to_time(last_change)
             if last_change_timestamp > current_timestamp and not empty:
                 cs_cache['date'] = _current_datetime
 
             _date_latest = parse_datetime(cs_cache.get('date') or empty_date)
             cs_cache['updated_on'] = time.time()
             self.changeset_cache = cs_cache
             self.updated_on = last_change
             Session().add(self)
             Session().commit()
 
         else:
             if empty:
                 cs_cache = EmptyCommit().__json__()
             else:
                 cs_cache = self.changeset_cache
 
             _date_latest = parse_datetime(cs_cache.get('date') or empty_date)
 
             cs_cache['updated_on'] = time.time()
             self.changeset_cache = cs_cache
             self.updated_on = _date_latest
             Session().add(self)
             Session().commit()
 
         log.debug('updated repo `%s` with new commit cache %s, and last update_date: %s',
                   self.repo_name, cs_cache, _date_latest)
 
     @property
     def tip(self):
         return self.get_commit('tip')
 
     @property
     def author(self):
         return self.tip.author
 
     @property
     def last_change(self):
         return self.scm_instance().last_change
 
     def get_comments(self, revisions=None):
         """
         Returns comments for this repository grouped by revisions
 
         :param revisions: filter query by revisions only
         """
         cmts = ChangesetComment.query()\
             .filter(ChangesetComment.repo == self)
         if revisions:
             cmts = cmts.filter(ChangesetComment.revision.in_(revisions))
         grouped = collections.defaultdict(list)
         for cmt in cmts.all():
             grouped[cmt.revision].append(cmt)
         return grouped
 
     def statuses(self, revisions=None):
         """
         Returns statuses for this repository
 
         :param revisions: list of revisions to get statuses for
         """
         statuses = ChangesetStatus.query()\
             .filter(ChangesetStatus.repo == self)\
             .filter(ChangesetStatus.version == 0)
 
         if revisions:
             # Try doing the filtering in chunks to avoid hitting limits
             size = 500
             status_results = []
             for chunk in xrange(0, len(revisions), size):
                 status_results += statuses.filter(
                     ChangesetStatus.revision.in_(
                         revisions[chunk: chunk+size])
                 ).all()
         else:
             status_results = statuses.all()
 
         grouped = {}
 
         # maybe we have open new pullrequest without a status?
         stat = ChangesetStatus.STATUS_UNDER_REVIEW
         status_lbl = ChangesetStatus.get_status_lbl(stat)
         for pr in PullRequest.query().filter(PullRequest.source_repo == self).all():
             for rev in pr.revisions:
                 pr_id = pr.pull_request_id
                 pr_repo = pr.target_repo.repo_name
                 grouped[rev] = [stat, status_lbl, pr_id, pr_repo]
 
         for stat in status_results:
             pr_id = pr_repo = None
             if stat.pull_request:
                 pr_id = stat.pull_request.pull_request_id
                 pr_repo = stat.pull_request.target_repo.repo_name
             grouped[stat.revision] = [str(stat.status), stat.status_lbl,
                                       pr_id, pr_repo]
         return grouped
 
     # ==========================================================================
     # SCM CACHE INSTANCE
     # ==========================================================================
 
     def scm_instance(self, **kwargs):
         import rhodecode
 
         # Passing a config will not hit the cache currently only used
         # for repo2dbmapper
         config = kwargs.pop('config', None)
         cache = kwargs.pop('cache', None)
         vcs_full_cache = kwargs.pop('vcs_full_cache', None)
         if vcs_full_cache is not None:
             # allows override global config
             full_cache = vcs_full_cache
         else:
             full_cache = str2bool(rhodecode.CONFIG.get('vcs_full_cache'))
         # if cache is NOT defined use default global, else we have a full
         # control over cache behaviour
         if cache is None and full_cache and not config:
             log.debug('Initializing pure cached instance for %s', self.repo_path)
             return self._get_instance_cached()
 
         # cache here is sent to the "vcs server"
         return self._get_instance(cache=bool(cache), config=config)
 
     def _get_instance_cached(self):
         from rhodecode.lib import rc_cache
 
         cache_namespace_uid = 'cache_repo_instance.{}'.format(self.repo_id)
         invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
             repo_id=self.repo_id)
         region = rc_cache.get_or_create_region('cache_repo_longterm', cache_namespace_uid)
 
         @region.conditional_cache_on_arguments(namespace=cache_namespace_uid)
         def get_instance_cached(repo_id, context_id, _cache_state_uid):
             return self._get_instance(repo_state_uid=_cache_state_uid)
 
         # we must use thread scoped cache here,
         # because each thread of gevent needs it's own not shared connection and cache
         # we also alter `args` so the cache key is individual for every green thread.
         inv_context_manager = rc_cache.InvalidationContext(
             uid=cache_namespace_uid, invalidation_namespace=invalidation_namespace,
             thread_scoped=True)
         with inv_context_manager as invalidation_context:
             cache_state_uid = invalidation_context.cache_data['cache_state_uid']
             args = (self.repo_id, inv_context_manager.cache_key, cache_state_uid)
 
             # re-compute and store cache if we get invalidate signal
             if invalidation_context.should_invalidate():
                 instance = get_instance_cached.refresh(*args)
             else:
                 instance = get_instance_cached(*args)
 
             log.debug('Repo instance fetched in %.4fs', inv_context_manager.compute_time)
             return instance
 
     def _get_instance(self, cache=True, config=None, repo_state_uid=None):
         log.debug('Initializing %s instance `%s` with cache flag set to: %s',
                   self.repo_type, self.repo_path, cache)
         config = config or self._config
         custom_wire = {
             'cache': cache,  # controls the vcs.remote cache
             'repo_state_uid': repo_state_uid
         }
         repo = get_vcs_instance(
             repo_path=safe_str(self.repo_full_path),
             config=config,
             with_wire=custom_wire,
             create=False,
             _vcs_alias=self.repo_type)
         if repo is not None:
             repo.count()  # cache rebuild
         return repo
 
     def get_shadow_repository_path(self, workspace_id):
         from rhodecode.lib.vcs.backends.base import BaseRepository
         shadow_repo_path = BaseRepository._get_shadow_repository_path(
             self.repo_full_path, self.repo_id, workspace_id)
         return shadow_repo_path
 
     def __json__(self):
         return {'landing_rev': self.landing_rev}
 
     def get_dict(self):
 
         # Since we transformed `repo_name` to a hybrid property, we need to
         # keep compatibility with the code which uses `repo_name` field.
 
         result = super(Repository, self).get_dict()
         result['repo_name'] = result.pop('_repo_name', None)
         return result
 
 
 class RepoGroup(Base, BaseModel):
     __tablename__ = 'groups'
     __table_args__ = (
         UniqueConstraint('group_name', 'group_parent_id'),
         base_table_args,
     )
     __mapper_args__ = {'order_by': 'group_name'}
 
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     _group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
     group_name_hash = Column("repo_group_name_hash", String(1024), nullable=False, unique=False)
     group_parent_id = Column("group_parent_id", Integer(), ForeignKey('groups.group_id'), nullable=True, unique=None, default=None)
     group_description = Column("group_description", String(10000), nullable=True, unique=None, default=None)
     enable_locking = Column("enable_locking", Boolean(), nullable=False, unique=None, default=False)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     updated_on = Column('updated_on', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)
     personal = Column('personal', Boolean(), nullable=True, unique=None, default=None)
     _changeset_cache = Column("changeset_cache", LargeBinary(), nullable=True)  # JSON data
 
     repo_group_to_perm = relationship('UserRepoGroupToPerm', cascade='all', order_by='UserRepoGroupToPerm.group_to_perm_id')
     users_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
     parent_group = relationship('RepoGroup', remote_side=group_id)
     user = relationship('User')
     integrations = relationship('Integration', cascade="all, delete-orphan")
 
     # no cascade, set NULL
     scope_artifacts = relationship('FileStore', primaryjoin='FileStore.scope_repo_group_id==RepoGroup.group_id')
 
     def __init__(self, group_name='', parent_group=None):
         self.group_name = group_name
         self.parent_group = parent_group
 
     def __unicode__(self):
         return u"<%s('id:%s:%s')>" % (
             self.__class__.__name__, self.group_id, self.group_name)
 
     @hybrid_property
     def group_name(self):
         return self._group_name
 
     @group_name.setter
     def group_name(self, value):
         self._group_name = value
         self.group_name_hash = self.hash_repo_group_name(value)
 
     @classmethod
     def _load_changeset_cache(cls, repo_id, changeset_cache_raw):
         from rhodecode.lib.vcs.backends.base import EmptyCommit
         dummy = EmptyCommit().__json__()
         if not changeset_cache_raw:
             dummy['source_repo_id'] = repo_id
             return json.loads(json.dumps(dummy))
 
         try:
             return json.loads(changeset_cache_raw)
         except TypeError:
             return dummy
         except Exception:
             log.error(traceback.format_exc())
             return dummy
 
     @hybrid_property
     def changeset_cache(self):
         return self._load_changeset_cache('', self._changeset_cache)
 
     @changeset_cache.setter
     def changeset_cache(self, val):
         try:
             self._changeset_cache = json.dumps(val)
         except Exception:
             log.error(traceback.format_exc())
 
     @validates('group_parent_id')
     def validate_group_parent_id(self, key, val):
         """
         Check cycle references for a parent group to self
         """
         if self.group_id and val:
             assert val != self.group_id
 
         return val
 
     @hybrid_property
     def description_safe(self):
         from rhodecode.lib import helpers as h
         return h.escape(self.group_description)
 
     @classmethod
     def hash_repo_group_name(cls, repo_group_name):
         val = remove_formatting(repo_group_name)
         val = safe_str(val).lower()
         chars = []
         for c in val:
             if c not in string.ascii_letters:
                 c = str(ord(c))
             chars.append(c)
 
         return ''.join(chars)
 
     @classmethod
     def _generate_choice(cls, repo_group):
         from webhelpers2.html import literal as _literal
         _name = lambda k: _literal(cls.CHOICES_SEPARATOR.join(k))
         return repo_group.group_id, _name(repo_group.full_path_splitted)
 
     @classmethod
     def groups_choices(cls, groups=None, show_empty_group=True):
         if not groups:
             groups = cls.query().all()
 
         repo_groups = []
         if show_empty_group:
             repo_groups = [(-1, u'-- %s --' % _('No parent'))]
 
         repo_groups.extend([cls._generate_choice(x) for x in groups])
 
         repo_groups = sorted(
             repo_groups, key=lambda t: t[1].split(cls.CHOICES_SEPARATOR)[0])
         return repo_groups
 
     @classmethod
     def url_sep(cls):
         return URL_SEP
 
     @classmethod
     def get_by_group_name(cls, group_name, cache=False, case_insensitive=False):
         if case_insensitive:
             gr = cls.query().filter(func.lower(cls.group_name)
                                     == func.lower(group_name))
         else:
             gr = cls.query().filter(cls.group_name == group_name)
         if cache:
             name_key = _hash_key(group_name)
             gr = gr.options(
                 FromCache("sql_cache_short", "get_group_%s" % name_key))
         return gr.scalar()
 
     @classmethod
     def get_user_personal_repo_group(cls, user_id):
         user = User.get(user_id)
         if user.username == User.DEFAULT_USER:
             return None
 
         return cls.query()\
             .filter(cls.personal == true()) \
             .filter(cls.user == user) \
             .order_by(cls.group_id.asc()) \
             .first()
 
     @classmethod
     def get_all_repo_groups(cls, user_id=Optional(None), group_id=Optional(None),
                             case_insensitive=True):
         q = RepoGroup.query()
 
         if not isinstance(user_id, Optional):
             q = q.filter(RepoGroup.user_id == user_id)
 
         if not isinstance(group_id, Optional):
             q = q.filter(RepoGroup.group_parent_id == group_id)
 
         if case_insensitive:
             q = q.order_by(func.lower(RepoGroup.group_name))
         else:
             q = q.order_by(RepoGroup.group_name)
         return q.all()
 
     @property
     def parents(self, parents_recursion_limit=10):
         groups = []
         if self.parent_group is None:
             return groups
         cur_gr = self.parent_group
         groups.insert(0, cur_gr)
         cnt = 0
         while 1:
             cnt += 1
             gr = getattr(cur_gr, 'parent_group', None)
             cur_gr = cur_gr.parent_group
             if gr is None:
                 break
             if cnt == parents_recursion_limit:
                 # this will prevent accidental infinit loops
                 log.error('more than %s parents found for group %s, stopping '
                           'recursive parent fetching', parents_recursion_limit, self)
                 break
 
             groups.insert(0, gr)
         return groups
 
     @property
     def last_commit_cache_update_diff(self):
         return time.time() - (safe_int(self.changeset_cache.get('updated_on')) or 0)
 
     @classmethod
     def _load_commit_change(cls, last_commit_cache):
         from rhodecode.lib.vcs.utils.helpers import parse_datetime
         empty_date = datetime.datetime.fromtimestamp(0)
         date_latest = last_commit_cache.get('date', empty_date)
         try:
             return parse_datetime(date_latest)
         except Exception:
             return empty_date
 
     @property
     def last_commit_change(self):
         return self._load_commit_change(self.changeset_cache)
 
     @property
     def last_db_change(self):
         return self.updated_on
 
     @property
     def children(self):
         return RepoGroup.query().filter(RepoGroup.parent_group == self)
 
     @property
     def name(self):
         return self.group_name.split(RepoGroup.url_sep())[-1]
 
     @property
     def full_path(self):
         return self.group_name
 
     @property
     def full_path_splitted(self):
         return self.group_name.split(RepoGroup.url_sep())
 
     @property
     def repositories(self):
         return Repository.query()\
                 .filter(Repository.group == self)\
                 .order_by(Repository.repo_name)
 
     @property
     def repositories_recursive_count(self):
         cnt = self.repositories.count()
 
         def children_count(group):
             cnt = 0
             for child in group.children:
                 cnt += child.repositories.count()
                 cnt += children_count(child)
             return cnt
 
         return cnt + children_count(self)
 
     def _recursive_objects(self, include_repos=True, include_groups=True):
         all_ = []
 
         def _get_members(root_gr):
             if include_repos:
                 for r in root_gr.repositories:
                     all_.append(r)
             childs = root_gr.children.all()
             if childs:
                 for gr in childs:
                     if include_groups:
                         all_.append(gr)
                     _get_members(gr)
 
         root_group = []
         if include_groups:
             root_group = [self]
 
         _get_members(self)
         return root_group + all_
 
     def recursive_groups_and_repos(self):
         """
         Recursive return all groups, with repositories in those groups
         """
         return self._recursive_objects()
 
     def recursive_groups(self):
         """
         Returns all children groups for this group including children of children
         """
         return self._recursive_objects(include_repos=False)
 
     def recursive_repos(self):
         """
         Returns all children repositories for this group
         """
         return self._recursive_objects(include_groups=False)
 
     def get_new_name(self, group_name):
         """
         returns new full group name based on parent and new name
 
         :param group_name:
         """
         path_prefix = (self.parent_group.full_path_splitted if
                        self.parent_group else [])
         return RepoGroup.url_sep().join(path_prefix + [group_name])
 
     def update_commit_cache(self, config=None):
         """
         Update cache of last commit for newest repository inside this repository group.
         cache_keys should be::
 
             source_repo_id
             short_id
             raw_id
             revision
             parents
             message
             date
             author
 
         """
         from rhodecode.lib.vcs.utils.helpers import parse_datetime
         empty_date = datetime.datetime.fromtimestamp(0)
 
         def repo_groups_and_repos(root_gr):
             for _repo in root_gr.repositories:
                 yield _repo
             for child_group in root_gr.children.all():
                 yield child_group
 
         latest_repo_cs_cache = {}
         for obj in repo_groups_and_repos(self):
             repo_cs_cache = obj.changeset_cache
             date_latest = latest_repo_cs_cache.get('date', empty_date)
             date_current = repo_cs_cache.get('date', empty_date)
             current_timestamp = datetime_to_time(parse_datetime(date_latest))
             if current_timestamp < datetime_to_time(parse_datetime(date_current)):
                 latest_repo_cs_cache = repo_cs_cache
                 if hasattr(obj, 'repo_id'):
                     latest_repo_cs_cache['source_repo_id'] = obj.repo_id
                 else:
                     latest_repo_cs_cache['source_repo_id'] = repo_cs_cache.get('source_repo_id')
 
         _date_latest = parse_datetime(latest_repo_cs_cache.get('date') or empty_date)
 
         latest_repo_cs_cache['updated_on'] = time.time()
         self.changeset_cache = latest_repo_cs_cache
         self.updated_on = _date_latest
         Session().add(self)
         Session().commit()
 
         log.debug('updated repo group `%s` with new commit cache %s, and last update_date: %s',
                   self.group_name, latest_repo_cs_cache, _date_latest)
 
     def permissions(self, with_admins=True, with_owner=True,
                     expand_from_user_groups=False):
         """
         Permissions for repository groups
         """
         _admin_perm = 'group.admin'
 
         owner_row = []
         if with_owner:
             usr = AttributeDict(self.user.get_dict())
             usr.owner_row = True
             usr.permission = _admin_perm
             owner_row.append(usr)
 
         super_admin_ids = []
         super_admin_rows = []
         if with_admins:
             for usr in User.get_all_super_admins():
                 super_admin_ids.append(usr.user_id)
                 # if this admin is also owner, don't double the record
                 if usr.user_id == owner_row[0].user_id:
                     owner_row[0].admin_row = True
                 else:
                     usr = AttributeDict(usr.get_dict())
                     usr.admin_row = True
                     usr.permission = _admin_perm
                     super_admin_rows.append(usr)
 
         q = UserRepoGroupToPerm.query().filter(UserRepoGroupToPerm.group == self)
         q = q.options(joinedload(UserRepoGroupToPerm.group),
                       joinedload(UserRepoGroupToPerm.user),
                       joinedload(UserRepoGroupToPerm.permission),)
 
         # get owners and admins and permissions. We do a trick of re-writing
         # objects from sqlalchemy to named-tuples due to sqlalchemy session
         # has a global reference and changing one object propagates to all
         # others. This means if admin is also an owner admin_row that change
         # would propagate to both objects
         perm_rows = []
         for _usr in q.all():
             usr = AttributeDict(_usr.user.get_dict())
             # if this user is also owner/admin, mark as duplicate record
             if usr.user_id == owner_row[0].user_id or usr.user_id in super_admin_ids:
                 usr.duplicate_perm = True
             usr.permission = _usr.permission.permission_name
             perm_rows.append(usr)
 
         # filter the perm rows by 'default' first and then sort them by
         # admin,write,read,none permissions sorted again alphabetically in
         # each group
         perm_rows = sorted(perm_rows, key=display_user_sort)
 
         user_groups_rows = []
         if expand_from_user_groups:
             for ug in self.permission_user_groups(with_members=True):
                 for user_data in ug.members:
                     user_groups_rows.append(user_data)
 
         return super_admin_rows + owner_row + perm_rows + user_groups_rows
 
     def permission_user_groups(self, with_members=False):
         q = UserGroupRepoGroupToPerm.query()\
             .filter(UserGroupRepoGroupToPerm.group == self)
         q = q.options(joinedload(UserGroupRepoGroupToPerm.group),
                       joinedload(UserGroupRepoGroupToPerm.users_group),
                       joinedload(UserGroupRepoGroupToPerm.permission),)
 
         perm_rows = []
         for _user_group in q.all():
             entry = AttributeDict(_user_group.users_group.get_dict())
             entry.permission = _user_group.permission.permission_name
             if with_members:
                 entry.members = [x.user.get_dict()
                                  for x in _user_group.users_group.members]
             perm_rows.append(entry)
 
         perm_rows = sorted(perm_rows, key=display_user_group_sort)
         return perm_rows
 
     def get_api_data(self):
         """
         Common function for generating api data
 
         """
         group = self
         data = {
             'group_id': group.group_id,
             'group_name': group.group_name,
             'group_description': group.description_safe,
             'parent_group': group.parent_group.group_name if group.parent_group else None,
             'repositories': [x.repo_name for x in group.repositories],
             'owner': group.user.username,
         }
         return data
 
     def get_dict(self):
         # Since we transformed `group_name` to a hybrid property, we need to
         # keep compatibility with the code which uses `group_name` field.
         result = super(RepoGroup, self).get_dict()
         result['group_name'] = result.pop('_group_name', None)
         return result
 
 
 class Permission(Base, BaseModel):
     __tablename__ = 'permissions'
     __table_args__ = (
         Index('p_perm_name_idx', 'permission_name'),
         base_table_args,
     )
 
     PERMS = [
         ('hg.admin', _('RhodeCode Super Administrator')),
 
         ('repository.none', _('Repository no access')),
         ('repository.read', _('Repository read access')),
         ('repository.write', _('Repository write access')),
         ('repository.admin', _('Repository admin access')),
 
         ('group.none', _('Repository group no access')),
         ('group.read', _('Repository group read access')),
         ('group.write', _('Repository group write access')),
         ('group.admin', _('Repository group admin access')),
 
         ('usergroup.none', _('User group no access')),
         ('usergroup.read', _('User group read access')),
         ('usergroup.write', _('User group write access')),
         ('usergroup.admin', _('User group admin access')),
 
         ('branch.none', _('Branch no permissions')),
         ('branch.merge', _('Branch access by web merge')),
         ('branch.push', _('Branch access by push')),
         ('branch.push_force', _('Branch access by push with force')),
 
         ('hg.repogroup.create.false', _('Repository Group creation disabled')),
         ('hg.repogroup.create.true', _('Repository Group creation enabled')),
 
         ('hg.usergroup.create.false', _('User Group creation disabled')),
         ('hg.usergroup.create.true', _('User Group creation enabled')),
 
         ('hg.create.none', _('Repository creation disabled')),
         ('hg.create.repository', _('Repository creation enabled')),
         ('hg.create.write_on_repogroup.true', _('Repository creation enabled with write permission to a repository group')),
         ('hg.create.write_on_repogroup.false', _('Repository creation disabled with write permission to a repository group')),
 
         ('hg.fork.none', _('Repository forking disabled')),
         ('hg.fork.repository', _('Repository forking enabled')),
 
         ('hg.register.none', _('Registration disabled')),
         ('hg.register.manual_activate', _('User Registration with manual account activation')),
         ('hg.register.auto_activate', _('User Registration with automatic account activation')),
 
         ('hg.password_reset.enabled', _('Password reset enabled')),
         ('hg.password_reset.hidden', _('Password reset hidden')),
         ('hg.password_reset.disabled', _('Password reset disabled')),
 
         ('hg.extern_activate.manual', _('Manual activation of external account')),
         ('hg.extern_activate.auto', _('Automatic activation of external account')),
 
         ('hg.inherit_default_perms.false', _('Inherit object permissions from default user disabled')),
         ('hg.inherit_default_perms.true', _('Inherit object permissions from default user enabled')),
     ]
 
     # definition of system default permissions for DEFAULT user, created on
     # system setup
     DEFAULT_USER_PERMISSIONS = [
         # object perms
         'repository.read',
         'group.read',
         'usergroup.read',
         # branch, for backward compat we need same value as before so forced pushed
         'branch.push_force',
         # global
         'hg.create.repository',
         'hg.repogroup.create.false',
         'hg.usergroup.create.false',
         'hg.create.write_on_repogroup.true',
         'hg.fork.repository',
         'hg.register.manual_activate',
         'hg.password_reset.enabled',
         'hg.extern_activate.auto',
         'hg.inherit_default_perms.true',
     ]
 
     # defines which permissions are more important higher the more important
     # Weight defines which permissions are more important.
     # The higher number the more important.
     PERM_WEIGHTS = {
         'repository.none': 0,
         'repository.read': 1,
         'repository.write': 3,
         'repository.admin': 4,
 
         'group.none': 0,
         'group.read': 1,
         'group.write': 3,
         'group.admin': 4,
 
         'usergroup.none': 0,
         'usergroup.read': 1,
         'usergroup.write': 3,
         'usergroup.admin': 4,
 
         'branch.none': 0,
         'branch.merge': 1,
         'branch.push': 3,
         'branch.push_force': 4,
 
         'hg.repogroup.create.false': 0,
         'hg.repogroup.create.true': 1,
 
         'hg.usergroup.create.false': 0,
         'hg.usergroup.create.true': 1,
 
         'hg.fork.none': 0,
         'hg.fork.repository': 1,
         'hg.create.none': 0,
         'hg.create.repository': 1
     }
 
     permission_id = Column("permission_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     permission_name = Column("permission_name", String(255), nullable=True, unique=None, default=None)
     permission_longname = Column("permission_longname", String(255), nullable=True, unique=None, default=None)
 
     def __unicode__(self):
         return u"<%s('%s:%s')>" % (
             self.__class__.__name__, self.permission_id, self.permission_name
         )
 
     @classmethod
     def get_by_key(cls, key):
         return cls.query().filter(cls.permission_name == key).scalar()
 
     @classmethod
     def get_default_repo_perms(cls, user_id, repo_id=None):
         q = Session().query(UserRepoToPerm, Repository, Permission)\
             .join((Permission, UserRepoToPerm.permission_id == Permission.permission_id))\
             .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\
             .filter(UserRepoToPerm.user_id == user_id)
         if repo_id:
             q = q.filter(UserRepoToPerm.repository_id == repo_id)
         return q.all()
 
     @classmethod
     def get_default_repo_branch_perms(cls, user_id, repo_id=None):
         q = Session().query(UserToRepoBranchPermission, UserRepoToPerm, Permission) \
             .join(
                 Permission,
                 UserToRepoBranchPermission.permission_id == Permission.permission_id) \
             .join(
                 UserRepoToPerm,
                 UserToRepoBranchPermission.rule_to_perm_id == UserRepoToPerm.repo_to_perm_id) \
             .filter(UserRepoToPerm.user_id == user_id)
 
         if repo_id:
             q = q.filter(UserToRepoBranchPermission.repository_id == repo_id)
         return q.order_by(UserToRepoBranchPermission.rule_order).all()
 
     @classmethod
     def get_default_repo_perms_from_user_group(cls, user_id, repo_id=None):
         q = Session().query(UserGroupRepoToPerm, Repository, Permission)\
             .join(
                 Permission,
                 UserGroupRepoToPerm.permission_id == Permission.permission_id)\
             .join(
                 Repository,
                 UserGroupRepoToPerm.repository_id == Repository.repo_id)\
             .join(
                 UserGroup,
                 UserGroupRepoToPerm.users_group_id ==
                 UserGroup.users_group_id)\
             .join(
                 UserGroupMember,
                 UserGroupRepoToPerm.users_group_id ==
                 UserGroupMember.users_group_id)\
             .filter(
                 UserGroupMember.user_id == user_id,
                 UserGroup.users_group_active == true())
         if repo_id:
             q = q.filter(UserGroupRepoToPerm.repository_id == repo_id)
         return q.all()
 
     @classmethod
     def get_default_repo_branch_perms_from_user_group(cls, user_id, repo_id=None):
         q = Session().query(UserGroupToRepoBranchPermission, UserGroupRepoToPerm, Permission) \
             .join(
                 Permission,
                 UserGroupToRepoBranchPermission.permission_id == Permission.permission_id) \
             .join(
                 UserGroupRepoToPerm,
                 UserGroupToRepoBranchPermission.rule_to_perm_id == UserGroupRepoToPerm.users_group_to_perm_id) \
             .join(
                 UserGroup,
                 UserGroupRepoToPerm.users_group_id == UserGroup.users_group_id) \
             .join(
                 UserGroupMember,
                 UserGroupRepoToPerm.users_group_id == UserGroupMember.users_group_id) \
             .filter(
                 UserGroupMember.user_id == user_id,
                 UserGroup.users_group_active == true())
 
         if repo_id:
             q = q.filter(UserGroupToRepoBranchPermission.repository_id == repo_id)
         return q.order_by(UserGroupToRepoBranchPermission.rule_order).all()
 
     @classmethod
     def get_default_group_perms(cls, user_id, repo_group_id=None):
         q = Session().query(UserRepoGroupToPerm, RepoGroup, Permission)\
             .join(
                 Permission,
                 UserRepoGroupToPerm.permission_id == Permission.permission_id)\
             .join(
                 RepoGroup,
                 UserRepoGroupToPerm.group_id == RepoGroup.group_id)\
             .filter(UserRepoGroupToPerm.user_id == user_id)
         if repo_group_id:
             q = q.filter(UserRepoGroupToPerm.group_id == repo_group_id)
         return q.all()
 
     @classmethod
     def get_default_group_perms_from_user_group(
             cls, user_id, repo_group_id=None):
         q = Session().query(UserGroupRepoGroupToPerm, RepoGroup, Permission)\
             .join(
                 Permission,
                 UserGroupRepoGroupToPerm.permission_id ==
                 Permission.permission_id)\
             .join(
                 RepoGroup,
                 UserGroupRepoGroupToPerm.group_id == RepoGroup.group_id)\
             .join(
                 UserGroup,
                 UserGroupRepoGroupToPerm.users_group_id ==
                 UserGroup.users_group_id)\
             .join(
                 UserGroupMember,
                 UserGroupRepoGroupToPerm.users_group_id ==
                 UserGroupMember.users_group_id)\
             .filter(
                 UserGroupMember.user_id == user_id,
                 UserGroup.users_group_active == true())
         if repo_group_id:
             q = q.filter(UserGroupRepoGroupToPerm.group_id == repo_group_id)
         return q.all()
 
     @classmethod
     def get_default_user_group_perms(cls, user_id, user_group_id=None):
         q = Session().query(UserUserGroupToPerm, UserGroup, Permission)\
             .join((Permission, UserUserGroupToPerm.permission_id == Permission.permission_id))\
             .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id))\
             .filter(UserUserGroupToPerm.user_id == user_id)
         if user_group_id:
             q = q.filter(UserUserGroupToPerm.user_group_id == user_group_id)
         return q.all()
 
     @classmethod
     def get_default_user_group_perms_from_user_group(
             cls, user_id, user_group_id=None):
         TargetUserGroup = aliased(UserGroup, name='target_user_group')
         q = Session().query(UserGroupUserGroupToPerm, UserGroup, Permission)\
             .join(
                 Permission,
                 UserGroupUserGroupToPerm.permission_id ==
                 Permission.permission_id)\
             .join(
                 TargetUserGroup,
                 UserGroupUserGroupToPerm.target_user_group_id ==
                 TargetUserGroup.users_group_id)\
             .join(
                 UserGroup,
                 UserGroupUserGroupToPerm.user_group_id ==
                 UserGroup.users_group_id)\
             .join(
                 UserGroupMember,
                 UserGroupUserGroupToPerm.user_group_id ==
                 UserGroupMember.users_group_id)\
             .filter(
                 UserGroupMember.user_id == user_id,
                 UserGroup.users_group_active == true())
         if user_group_id:
             q = q.filter(
                 UserGroupUserGroupToPerm.user_group_id == user_group_id)
 
         return q.all()
 
 
 class UserRepoToPerm(Base, BaseModel):
     __tablename__ = 'repo_to_perm'
     __table_args__ = (
         UniqueConstraint('user_id', 'repository_id', 'permission_id'),
         base_table_args
     )
 
     repo_to_perm_id = Column("repo_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
 
     user = relationship('User')
     repository = relationship('Repository')
     permission = relationship('Permission')
 
     branch_perm_entry = relationship('UserToRepoBranchPermission', cascade="all, delete-orphan", lazy='joined')
 
     @classmethod
     def create(cls, user, repository, permission):
         n = cls()
         n.user = user
         n.repository = repository
         n.permission = permission
         Session().add(n)
         return n
 
     def __unicode__(self):
         return u'<%s => %s >' % (self.user, self.repository)
 
 
 class UserUserGroupToPerm(Base, BaseModel):
     __tablename__ = 'user_user_group_to_perm'
     __table_args__ = (
         UniqueConstraint('user_id', 'user_group_id', 'permission_id'),
         base_table_args
     )
 
     user_user_group_to_perm_id = Column("user_user_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     user_group_id = Column("user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
 
     user = relationship('User')
     user_group = relationship('UserGroup')
     permission = relationship('Permission')
 
     @classmethod
     def create(cls, user, user_group, permission):
         n = cls()
         n.user = user
         n.user_group = user_group
         n.permission = permission
         Session().add(n)
         return n
 
     def __unicode__(self):
         return u'<%s => %s >' % (self.user, self.user_group)
 
 
 class UserToPerm(Base, BaseModel):
     __tablename__ = 'user_to_perm'
     __table_args__ = (
         UniqueConstraint('user_id', 'permission_id'),
         base_table_args
     )
 
     user_to_perm_id = Column("user_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
 
     user = relationship('User')
     permission = relationship('Permission', lazy='joined')
 
     def __unicode__(self):
         return u'<%s => %s >' % (self.user, self.permission)
 
 
 class UserGroupRepoToPerm(Base, BaseModel):
     __tablename__ = 'users_group_repo_to_perm'
     __table_args__ = (
         UniqueConstraint('repository_id', 'users_group_id', 'permission_id'),
         base_table_args
     )
 
     users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
 
     users_group = relationship('UserGroup')
     permission = relationship('Permission')
     repository = relationship('Repository')
     user_group_branch_perms = relationship('UserGroupToRepoBranchPermission', cascade='all')
 
     @classmethod
     def create(cls, users_group, repository, permission):
         n = cls()
         n.users_group = users_group
         n.repository = repository
         n.permission = permission
         Session().add(n)
         return n
 
     def __unicode__(self):
         return u'<UserGroupRepoToPerm:%s => %s >' % (self.users_group, self.repository)
 
 
 class UserGroupUserGroupToPerm(Base, BaseModel):
     __tablename__ = 'user_group_user_group_to_perm'
     __table_args__ = (
         UniqueConstraint('target_user_group_id', 'user_group_id', 'permission_id'),
         CheckConstraint('target_user_group_id != user_group_id'),
         base_table_args
     )
 
     user_group_user_group_to_perm_id = Column("user_group_user_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     target_user_group_id = Column("target_user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     user_group_id = Column("user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
 
     target_user_group = relationship('UserGroup', primaryjoin='UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id')
     user_group = relationship('UserGroup', primaryjoin='UserGroupUserGroupToPerm.user_group_id==UserGroup.users_group_id')
     permission = relationship('Permission')
 
     @classmethod
     def create(cls, target_user_group, user_group, permission):
         n = cls()
         n.target_user_group = target_user_group
         n.user_group = user_group
         n.permission = permission
         Session().add(n)
         return n
 
     def __unicode__(self):
         return u'<UserGroupUserGroup:%s => %s >' % (self.target_user_group, self.user_group)
 
 
 class UserGroupToPerm(Base, BaseModel):
     __tablename__ = 'users_group_to_perm'
     __table_args__ = (
         UniqueConstraint('users_group_id', 'permission_id',),
         base_table_args
     )
 
     users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
 
     users_group = relationship('UserGroup')
     permission = relationship('Permission')
 
 
 class UserRepoGroupToPerm(Base, BaseModel):
     __tablename__ = 'user_repo_group_to_perm'
     __table_args__ = (
         UniqueConstraint('user_id', 'group_id', 'permission_id'),
         base_table_args
     )
 
     group_to_perm_id = Column("group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
 
     user = relationship('User')
     group = relationship('RepoGroup')
     permission = relationship('Permission')
 
     @classmethod
     def create(cls, user, repository_group, permission):
         n = cls()
         n.user = user
         n.group = repository_group
         n.permission = permission
         Session().add(n)
         return n
 
 
 class UserGroupRepoGroupToPerm(Base, BaseModel):
     __tablename__ = 'users_group_repo_group_to_perm'
     __table_args__ = (
         UniqueConstraint('users_group_id', 'group_id'),
         base_table_args
     )
 
     users_group_repo_group_to_perm_id = Column("users_group_repo_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
 
     users_group = relationship('UserGroup')
     permission = relationship('Permission')
     group = relationship('RepoGroup')
 
     @classmethod
     def create(cls, user_group, repository_group, permission):
         n = cls()
         n.users_group = user_group
         n.group = repository_group
         n.permission = permission
         Session().add(n)
         return n
 
     def __unicode__(self):
         return u'<UserGroupRepoGroupToPerm:%s => %s >' % (self.users_group, self.group)
 
 
 class Statistics(Base, BaseModel):
     __tablename__ = 'statistics'
     __table_args__ = (
          base_table_args
     )
 
     stat_id = Column("stat_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=True, default=None)
     stat_on_revision = Column("stat_on_revision", Integer(), nullable=False)
     commit_activity = Column("commit_activity", LargeBinary(1000000), nullable=False)#JSON data
     commit_activity_combined = Column("commit_activity_combined", LargeBinary(), nullable=False)#JSON data
     languages = Column("languages", LargeBinary(1000000), nullable=False)#JSON data
 
     repository = relationship('Repository', single_parent=True)
 
 
 class UserFollowing(Base, BaseModel):
     __tablename__ = 'user_followings'
     __table_args__ = (
         UniqueConstraint('user_id', 'follows_repository_id'),
         UniqueConstraint('user_id', 'follows_user_id'),
         base_table_args
     )
 
     user_following_id = Column("user_following_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     follows_repo_id = Column("follows_repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True, unique=None, default=None)
     follows_user_id = Column("follows_user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
     follows_from = Column('follows_from', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)
 
     user = relationship('User', primaryjoin='User.user_id==UserFollowing.user_id')
 
     follows_user = relationship('User', primaryjoin='User.user_id==UserFollowing.follows_user_id')
     follows_repository = relationship('Repository', order_by='Repository.repo_name')
 
     @classmethod
     def get_repo_followers(cls, repo_id):
         return cls.query().filter(cls.follows_repo_id == repo_id)
 
 
 class CacheKey(Base, BaseModel):
     __tablename__ = 'cache_invalidation'
     __table_args__ = (
         UniqueConstraint('cache_key'),
         Index('key_idx', 'cache_key'),
         base_table_args,
     )
 
     CACHE_TYPE_FEED = 'FEED'
 
     # namespaces used to register process/thread aware caches
     REPO_INVALIDATION_NAMESPACE = 'repo_cache:{repo_id}'
     SETTINGS_INVALIDATION_NAMESPACE = 'system_settings'
 
     cache_id = Column("cache_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     cache_key = Column("cache_key", String(255), nullable=True, unique=None, default=None)
     cache_args = Column("cache_args", String(255), nullable=True, unique=None, default=None)
     cache_state_uid = Column("cache_state_uid", String(255), nullable=True, unique=None, default=None)
     cache_active = Column("cache_active", Boolean(), nullable=True, unique=None, default=False)
 
     def __init__(self, cache_key, cache_args='', cache_state_uid=None):
         self.cache_key = cache_key
         self.cache_args = cache_args
         self.cache_active = False
         # first key should be same for all entries, since all workers should share it
         self.cache_state_uid = cache_state_uid or self.generate_new_state_uid()
 
     def __unicode__(self):
         return u"<%s('%s:%s[%s]')>" % (
             self.__class__.__name__,
             self.cache_id, self.cache_key, self.cache_active)
 
     def _cache_key_partition(self):
         prefix, repo_name, suffix = self.cache_key.partition(self.cache_args)
         return prefix, repo_name, suffix
 
     def get_prefix(self):
         """
         Try to extract prefix from existing cache key. The key could consist
         of prefix, repo_name, suffix
         """
         # this returns prefix, repo_name, suffix
         return self._cache_key_partition()[0]
 
     def get_suffix(self):
         """
         get suffix that might have been used in _get_cache_key to
         generate self.cache_key. Only used for informational purposes
         in repo_edit.mako.
         """
         # prefix, repo_name, suffix
         return self._cache_key_partition()[2]
 
     @classmethod
     def generate_new_state_uid(cls, based_on=None):
         if based_on:
             return str(uuid.uuid5(uuid.NAMESPACE_URL, safe_str(based_on)))
         else:
             return str(uuid.uuid4())
 
     @classmethod
     def delete_all_cache(cls):
         """
         Delete all cache keys from database.
         Should only be run when all instances are down and all entries
         thus stale.
         """
         cls.query().delete()
         Session().commit()
 
     @classmethod
     def set_invalidate(cls, cache_uid, delete=False):
         """
         Mark all caches of a repo as invalid in the database.
         """
 
         try:
             qry = Session().query(cls).filter(cls.cache_args == cache_uid)
             if delete:
                 qry.delete()
                 log.debug('cache objects deleted for cache args %s',
                           safe_str(cache_uid))
             else:
                 qry.update({"cache_active": False,
                             "cache_state_uid": cls.generate_new_state_uid()})
                 log.debug('cache objects marked as invalid for cache args %s',
                           safe_str(cache_uid))
 
             Session().commit()
         except Exception:
             log.exception(
                 'Cache key invalidation failed for cache args %s',
                 safe_str(cache_uid))
             Session().rollback()
 
     @classmethod
     def get_active_cache(cls, cache_key):
         inv_obj = cls.query().filter(cls.cache_key == cache_key).scalar()
         if inv_obj:
             return inv_obj
         return None
 
     @classmethod
     def get_namespace_map(cls, namespace):
         return {
             x.cache_key: x
             for x in cls.query().filter(cls.cache_args == namespace)}
 
 
 class ChangesetComment(Base, BaseModel):
     __tablename__ = 'changeset_comments'
     __table_args__ = (
         Index('cc_revision_idx', 'revision'),
         base_table_args,
     )
 
     COMMENT_OUTDATED = u'comment_outdated'
     COMMENT_TYPE_NOTE = u'note'
     COMMENT_TYPE_TODO = u'todo'
     COMMENT_TYPES = [COMMENT_TYPE_NOTE, COMMENT_TYPE_TODO]
 
     OP_IMMUTABLE = u'immutable'
     OP_CHANGEABLE = u'changeable'
 
     comment_id = Column('comment_id', Integer(), nullable=False, primary_key=True)
     repo_id = Column('repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
     revision = Column('revision', String(40), nullable=True)
     pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True)
     pull_request_version_id = Column("pull_request_version_id", Integer(), ForeignKey('pull_request_versions.pull_request_version_id'), nullable=True)
     line_no = Column('line_no', Unicode(10), nullable=True)
     hl_lines = Column('hl_lines', Unicode(512), nullable=True)
     f_path = Column('f_path', Unicode(1000), nullable=True)
     user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False)
     text = Column('text', UnicodeText().with_variant(UnicodeText(25000), 'mysql'), nullable=False)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     modified_at = Column('modified_at', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     renderer = Column('renderer', Unicode(64), nullable=True)
     display_state = Column('display_state',  Unicode(128), nullable=True)
     immutable_state = Column('immutable_state', Unicode(128), nullable=True, default=OP_CHANGEABLE)
     draft = Column('draft', Boolean(), nullable=True, default=False)
 
     comment_type = Column('comment_type',  Unicode(128), nullable=True, default=COMMENT_TYPE_NOTE)
     resolved_comment_id = Column('resolved_comment_id', Integer(), ForeignKey('changeset_comments.comment_id'), nullable=True)
 
     resolved_comment = relationship('ChangesetComment', remote_side=comment_id, back_populates='resolved_by')
     resolved_by = relationship('ChangesetComment', back_populates='resolved_comment')
 
     author = relationship('User', lazy='select')
     repo = relationship('Repository')
     status_change = relationship('ChangesetStatus', cascade="all, delete-orphan", lazy='select')
     pull_request = relationship('PullRequest', lazy='select')
     pull_request_version = relationship('PullRequestVersion', lazy='select')
     history = relationship('ChangesetCommentHistory', cascade='all, delete-orphan', lazy='select', order_by='ChangesetCommentHistory.version')
 
     @classmethod
     def get_users(cls, revision=None, pull_request_id=None):
         """
         Returns user associated with this ChangesetComment. ie those
         who actually commented
 
         :param cls:
         :param revision:
         """
         q = Session().query(User)\
                 .join(ChangesetComment.author)
         if revision:
             q = q.filter(cls.revision == revision)
         elif pull_request_id:
             q = q.filter(cls.pull_request_id == pull_request_id)
         return q.all()
 
     @classmethod
     def get_index_from_version(cls, pr_version, versions=None, num_versions=None):
 
         if versions is not None:
             num_versions = [x.pull_request_version_id for x in versions]
 
         num_versions = num_versions or []
         try:
             return num_versions.index(pr_version) + 1
         except (IndexError, ValueError):
             return
 
     @property
     def outdated(self):
         return self.display_state == self.COMMENT_OUTDATED
 
     @property
     def outdated_js(self):
         return json.dumps(self.display_state == self.COMMENT_OUTDATED)
 
     @property
     def immutable(self):
         return self.immutable_state == self.OP_IMMUTABLE
 
     def outdated_at_version(self, version):
         """
         Checks if comment is outdated for given pull request version
         """
         def version_check():
             return self.pull_request_version_id and self.pull_request_version_id != version
 
         if self.is_inline:
             return self.outdated and version_check()
         else:
             # general comments don't have .outdated set, also latest don't have a version
             return version_check()
 
     def outdated_at_version_js(self, version):
         """
         Checks if comment is outdated for given pull request version
         """
         return json.dumps(self.outdated_at_version(version))
 
     def older_than_version(self, version):
         """
         Checks if comment is made from previous version than given
         """
         if version is None:
             return self.pull_request_version != version
 
         return self.pull_request_version < version
 
     def older_than_version_js(self, version):
         """
         Checks if comment is made from previous version than given
         """
         return json.dumps(self.older_than_version(version))
 
     @property
     def commit_id(self):
         """New style naming to stop using .revision"""
         return self.revision
 
     @property
     def resolved(self):
         return self.resolved_by[0] if self.resolved_by else None
 
     @property
     def is_todo(self):
         return self.comment_type == self.COMMENT_TYPE_TODO
 
     @property
     def is_inline(self):
         if self.line_no and self.f_path:
             return True
         return False
 
     @property
     def last_version(self):
         version = 0
         if self.history:
             version = self.history[-1].version
         return version
 
     def get_index_version(self, versions):
         return self.get_index_from_version(
             self.pull_request_version_id, versions)
 
     @property
     def review_status(self):
         if self.status_change:
             return self.status_change[0].status
 
     @property
     def review_status_lbl(self):
         if self.status_change:
             return self.status_change[0].status_lbl
 
     def __repr__(self):
         if self.comment_id:
             return '<DB:Comment #%s>' % self.comment_id
         else:
             return '<DB:Comment at %#x>' % id(self)
 
     def get_api_data(self):
         comment = self
 
         data = {
             'comment_id': comment.comment_id,
             'comment_type': comment.comment_type,
             'comment_text': comment.text,
             'comment_status': comment.status_change,
             'comment_f_path': comment.f_path,
             'comment_lineno': comment.line_no,
             'comment_author': comment.author,
             'comment_created_on': comment.created_on,
             'comment_resolved_by': self.resolved,
             'comment_commit_id': comment.revision,
             'comment_pull_request_id': comment.pull_request_id,
             'comment_last_version': self.last_version
         }
         return data
 
     def __json__(self):
         data = dict()
         data.update(self.get_api_data())
         return data
 
 
 class ChangesetCommentHistory(Base, BaseModel):
     __tablename__ = 'changeset_comments_history'
     __table_args__ = (
         Index('cch_comment_id_idx', 'comment_id'),
         base_table_args,
     )
 
     comment_history_id = Column('comment_history_id', Integer(), nullable=False, primary_key=True)
     comment_id = Column('comment_id', Integer(), ForeignKey('changeset_comments.comment_id'), nullable=False)
     version = Column("version", Integer(), nullable=False, default=0)
     created_by_user_id = Column('created_by_user_id', Integer(), ForeignKey('users.user_id'), nullable=False)
     text = Column('text', UnicodeText().with_variant(UnicodeText(25000), 'mysql'), nullable=False)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     deleted = Column('deleted', Boolean(), default=False)
 
     author = relationship('User', lazy='joined')
     comment = relationship('ChangesetComment', cascade="all, delete")
 
     @classmethod
     def get_version(cls, comment_id):
         q = Session().query(ChangesetCommentHistory).filter(
             ChangesetCommentHistory.comment_id == comment_id).order_by(ChangesetCommentHistory.version.desc())
         if q.count() == 0:
             return 1
         elif q.count() >= q[0].version:
             return q.count() + 1
         else:
             return q[0].version + 1
 
 
 class ChangesetStatus(Base, BaseModel):
     __tablename__ = 'changeset_statuses'
     __table_args__ = (
         Index('cs_revision_idx', 'revision'),
         Index('cs_version_idx', 'version'),
         UniqueConstraint('repo_id', 'revision', 'version'),
         base_table_args
     )
 
     STATUS_NOT_REVIEWED = DEFAULT = 'not_reviewed'
     STATUS_APPROVED = 'approved'
     STATUS_REJECTED = 'rejected'
     STATUS_UNDER_REVIEW = 'under_review'
     CheckConstraint,
     STATUSES = [
         (STATUS_NOT_REVIEWED, _("Not Reviewed")),  # (no icon) and default
         (STATUS_APPROVED, _("Approved")),
         (STATUS_REJECTED, _("Rejected")),
         (STATUS_UNDER_REVIEW, _("Under Review")),
     ]
 
     changeset_status_id = Column('changeset_status_id', Integer(), nullable=False, primary_key=True)
     repo_id = Column('repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None)
     revision = Column('revision', String(40), nullable=False)
     status = Column('status', String(128), nullable=False, default=DEFAULT)
     changeset_comment_id = Column('changeset_comment_id', Integer(), ForeignKey('changeset_comments.comment_id'))
     modified_at = Column('modified_at', DateTime(), nullable=False, default=datetime.datetime.now)
     version = Column('version', Integer(), nullable=False, default=0)
     pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True)
 
     author = relationship('User', lazy='select')
     repo = relationship('Repository', lazy='select')
     comment = relationship('ChangesetComment', lazy='select')
     pull_request = relationship('PullRequest', lazy='select')
 
     def __unicode__(self):
         return u"<%s('%s[v%s]:%s')>" % (
             self.__class__.__name__,
             self.status, self.version, self.author
         )
 
     @classmethod
     def get_status_lbl(cls, value):
         return dict(cls.STATUSES).get(value)
 
     @property
     def status_lbl(self):
         return ChangesetStatus.get_status_lbl(self.status)
 
     def get_api_data(self):
         status = self
         data = {
             'status_id': status.changeset_status_id,
             'status': status.status,
         }
         return data
 
     def __json__(self):
         data = dict()
         data.update(self.get_api_data())
         return data
 
 
 class _SetState(object):
     """
     Context processor allowing changing state for sensitive operation such as
     pull request update or merge
     """
 
     def __init__(self, pull_request, pr_state, back_state=None):
         self._pr = pull_request
         self._org_state = back_state or pull_request.pull_request_state
         self._pr_state = pr_state
         self._current_state = None
 
     def __enter__(self):
         log.debug('StateLock: entering set state context of pr %s, setting state to: `%s`',
                   self._pr, self._pr_state)
         self.set_pr_state(self._pr_state)
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         if exc_val is not None:
             log.error(traceback.format_exc(exc_tb))
             return None
 
         self.set_pr_state(self._org_state)
         log.debug('StateLock: exiting set state context of pr %s, setting state to: `%s`',
                   self._pr, self._org_state)
 
     @property
     def state(self):
         return self._current_state
 
     def set_pr_state(self, pr_state):
         try:
             self._pr.pull_request_state = pr_state
             Session().add(self._pr)
             Session().commit()
             self._current_state = pr_state
         except Exception:
             log.exception('Failed to set PullRequest %s state to %s', self._pr, pr_state)
             raise
 
 
 class _PullRequestBase(BaseModel):
     """
     Common attributes of pull request and version entries.
     """
 
     # .status values
     STATUS_NEW = u'new'
     STATUS_OPEN = u'open'
     STATUS_CLOSED = u'closed'
 
     # available states
     STATE_CREATING = u'creating'
     STATE_UPDATING = u'updating'
     STATE_MERGING = u'merging'
     STATE_CREATED = u'created'
 
     title = Column('title', Unicode(255), nullable=True)
     description = Column(
         'description', UnicodeText().with_variant(UnicodeText(10240), 'mysql'),
         nullable=True)
     description_renderer = Column('description_renderer', Unicode(64), nullable=True)
 
     # new/open/closed status of pull request (not approve/reject/etc)
     status = Column('status', Unicode(255), nullable=False, default=STATUS_NEW)
     created_on = Column(
         'created_on', DateTime(timezone=False), nullable=False,
         default=datetime.datetime.now)
     updated_on = Column(
         'updated_on', DateTime(timezone=False), nullable=False,
         default=datetime.datetime.now)
 
     pull_request_state = Column("pull_request_state", String(255), nullable=True)
 
     @declared_attr
     def user_id(cls):
         return Column(
             "user_id", Integer(), ForeignKey('users.user_id'), nullable=False,
             unique=None)
 
     # 500 revisions max
     _revisions = Column(
         'revisions', UnicodeText().with_variant(UnicodeText(20500), 'mysql'))
 
     common_ancestor_id = Column('common_ancestor_id', Unicode(255), nullable=True)
 
     @declared_attr
     def source_repo_id(cls):
         # TODO: dan: rename column to source_repo_id
         return Column(
             'org_repo_id', Integer(), ForeignKey('repositories.repo_id'),
             nullable=False)
 
     _source_ref = Column('org_ref', Unicode(255), nullable=False)
 
     @hybrid_property
     def source_ref(self):
         return self._source_ref
 
     @source_ref.setter
     def source_ref(self, val):
         parts = (val or '').split(':')
         if len(parts) != 3:
             raise ValueError(
                 'Invalid reference format given: {}, expected X:Y:Z'.format(val))
         self._source_ref = safe_unicode(val)
 
     _target_ref = Column('other_ref', Unicode(255), nullable=False)
 
     @hybrid_property
     def target_ref(self):
         return self._target_ref
 
     @target_ref.setter
     def target_ref(self, val):
         parts = (val or '').split(':')
         if len(parts) != 3:
             raise ValueError(
                 'Invalid reference format given: {}, expected X:Y:Z'.format(val))
         self._target_ref = safe_unicode(val)
 
     @declared_attr
     def target_repo_id(cls):
         # TODO: dan: rename column to target_repo_id
         return Column(
             'other_repo_id', Integer(), ForeignKey('repositories.repo_id'),
             nullable=False)
 
     _shadow_merge_ref = Column('shadow_merge_ref', Unicode(255), nullable=True)
 
     # TODO: dan: rename column to last_merge_source_rev
     _last_merge_source_rev = Column(
         'last_merge_org_rev', String(40), nullable=True)
     # TODO: dan: rename column to last_merge_target_rev
     _last_merge_target_rev = Column(
         'last_merge_other_rev', String(40), nullable=True)
     _last_merge_status = Column('merge_status', Integer(), nullable=True)
     last_merge_metadata = Column(
         'last_merge_metadata', MutationObj.as_mutable(
             JsonType(dialect_map=dict(mysql=UnicodeText(16384)))))
 
     merge_rev = Column('merge_rev', String(40), nullable=True)
 
     reviewer_data = Column(
         'reviewer_data_json', MutationObj.as_mutable(
             JsonType(dialect_map=dict(mysql=UnicodeText(16384)))))
 
     @property
     def reviewer_data_json(self):
         return json.dumps(self.reviewer_data)
 
     @property
     def last_merge_metadata_parsed(self):
         metadata = {}
         if not self.last_merge_metadata:
             return metadata
 
         if hasattr(self.last_merge_metadata, 'de_coerce'):
             for k, v in self.last_merge_metadata.de_coerce().items():
                 if k in ['target_ref', 'source_ref']:
                     metadata[k] = Reference(v['type'], v['name'], v['commit_id'])
                 else:
                     if hasattr(v, 'de_coerce'):
                         metadata[k] = v.de_coerce()
                     else:
                         metadata[k] = v
         return metadata
 
     @property
     def work_in_progress(self):
         """checks if pull request is work in progress by checking the title"""
         title = self.title.upper()
         if re.match(r'^(\[WIP\]\s*|WIP:\s*|WIP\s+)', title):
             return True
         return False
 
+    @property
+    def title_safe(self):
+        return self.title\
+            .replace('{', '{{')\
+            .replace('}', '}}')
+
     @hybrid_property
     def description_safe(self):
         from rhodecode.lib import helpers as h
         return h.escape(self.description)
 
     @hybrid_property
     def revisions(self):
         return self._revisions.split(':') if self._revisions else []
 
     @revisions.setter
     def revisions(self, val):
         self._revisions = u':'.join(val)
 
     @hybrid_property
     def last_merge_status(self):
         return safe_int(self._last_merge_status)
 
     @last_merge_status.setter
     def last_merge_status(self, val):
         self._last_merge_status = val
 
     @declared_attr
     def author(cls):
         return relationship('User', lazy='joined')
 
     @declared_attr
     def source_repo(cls):
         return relationship(
             'Repository',
             primaryjoin='%s.source_repo_id==Repository.repo_id' % cls.__name__)
 
     @property
     def source_ref_parts(self):
         return self.unicode_to_reference(self.source_ref)
 
     @declared_attr
     def target_repo(cls):
         return relationship(
             'Repository',
             primaryjoin='%s.target_repo_id==Repository.repo_id' % cls.__name__)
 
     @property
     def target_ref_parts(self):
         return self.unicode_to_reference(self.target_ref)
 
     @property
     def shadow_merge_ref(self):
         return self.unicode_to_reference(self._shadow_merge_ref)
 
     @shadow_merge_ref.setter
     def shadow_merge_ref(self, ref):
         self._shadow_merge_ref = self.reference_to_unicode(ref)
 
     @staticmethod
     def unicode_to_reference(raw):
         return unicode_to_reference(raw)
 
     @staticmethod
     def reference_to_unicode(ref):
         return reference_to_unicode(ref)
 
     def get_api_data(self, with_merge_state=True):
         from rhodecode.model.pull_request import PullRequestModel
 
         pull_request = self
         if with_merge_state:
             merge_response, merge_status, msg = \
                 PullRequestModel().merge_status(pull_request)
             merge_state = {
                 'status': merge_status,
                 'message': safe_unicode(msg),
             }
         else:
             merge_state = {'status': 'not_available',
                            'message': 'not_available'}
 
         merge_data = {
             'clone_url': PullRequestModel().get_shadow_clone_url(pull_request),
             'reference': (
                 pull_request.shadow_merge_ref._asdict()
                 if pull_request.shadow_merge_ref else None),
         }
 
         data = {
             'pull_request_id': pull_request.pull_request_id,
             'url': PullRequestModel().get_url(pull_request),
             'title': pull_request.title,
             'description': pull_request.description,
             'status': pull_request.status,
             'state': pull_request.pull_request_state,
             'created_on': pull_request.created_on,
             'updated_on': pull_request.updated_on,
             'commit_ids': pull_request.revisions,
             'review_status': pull_request.calculated_review_status(),
             'mergeable': merge_state,
             'source': {
                 'clone_url': pull_request.source_repo.clone_url(),
                 'repository': pull_request.source_repo.repo_name,
                 'reference': {
                     'name': pull_request.source_ref_parts.name,
                     'type': pull_request.source_ref_parts.type,
                     'commit_id': pull_request.source_ref_parts.commit_id,
                 },
             },
             'target': {
                 'clone_url': pull_request.target_repo.clone_url(),
                 'repository': pull_request.target_repo.repo_name,
                 'reference': {
                     'name': pull_request.target_ref_parts.name,
                     'type': pull_request.target_ref_parts.type,
                     'commit_id': pull_request.target_ref_parts.commit_id,
                 },
             },
             'merge': merge_data,
             'author': pull_request.author.get_api_data(include_secrets=False,
                                                        details='basic'),
             'reviewers': [
                 {
                     'user': reviewer.get_api_data(include_secrets=False,
                                                   details='basic'),
                     'reasons': reasons,
                     'review_status': st[0][1].status if st else 'not_reviewed',
                 }
                 for obj, reviewer, reasons, mandatory, st in
                 pull_request.reviewers_statuses()
             ]
         }
 
         return data
 
     def set_state(self, pull_request_state, final_state=None):
         """
         # goes from initial state to updating to initial state.
         # initial state can be changed by specifying back_state=
         with pull_request_obj.set_state(PullRequest.STATE_UPDATING):
            pull_request.merge()
 
         :param pull_request_state:
         :param final_state:
 
         """
 
         return _SetState(self, pull_request_state, back_state=final_state)
 
 
 class PullRequest(Base, _PullRequestBase):
     __tablename__ = 'pull_requests'
     __table_args__ = (
         base_table_args,
     )
     LATEST_VER = 'latest'
 
     pull_request_id = Column(
         'pull_request_id', Integer(), nullable=False, primary_key=True)
 
     def __repr__(self):
         if self.pull_request_id:
             return '<DB:PullRequest #%s>' % self.pull_request_id
         else:
             return '<DB:PullRequest at %#x>' % id(self)
 
     reviewers = relationship('PullRequestReviewers', cascade="all, delete-orphan")
     statuses = relationship('ChangesetStatus', cascade="all, delete-orphan")
     comments = relationship('ChangesetComment', cascade="all, delete-orphan")
     versions = relationship('PullRequestVersion', cascade="all, delete-orphan",
                             lazy='dynamic')
 
     @classmethod
     def get_pr_display_object(cls, pull_request_obj, org_pull_request_obj,
                               internal_methods=None):
 
         class PullRequestDisplay(object):
             """
             Special object wrapper for showing PullRequest data via Versions
             It mimics PR object as close as possible. This is read only object
             just for display
             """
 
             def __init__(self, attrs, internal=None):
                 self.attrs = attrs
                 # internal have priority over the given ones via attrs
                 self.internal = internal or ['versions']
 
             def __getattr__(self, item):
                 if item in self.internal:
                     return getattr(self, item)
                 try:
                     return self.attrs[item]
                 except KeyError:
                     raise AttributeError(
                         '%s object has no attribute %s' % (self, item))
 
             def __repr__(self):
                 return '<DB:PullRequestDisplay #%s>' % self.attrs.get('pull_request_id')
 
             def versions(self):
                 return pull_request_obj.versions.order_by(
                     PullRequestVersion.pull_request_version_id).all()
 
             def is_closed(self):
                 return pull_request_obj.is_closed()
 
             def is_state_changing(self):
                 return pull_request_obj.is_state_changing()
 
             @property
             def pull_request_version_id(self):
                 return getattr(pull_request_obj, 'pull_request_version_id', None)
 
             @property
             def pull_request_last_version(self):
                 return pull_request_obj.pull_request_last_version
 
         attrs = StrictAttributeDict(pull_request_obj.get_api_data(with_merge_state=False))
 
         attrs.author = StrictAttributeDict(
             pull_request_obj.author.get_api_data())
         if pull_request_obj.target_repo:
             attrs.target_repo = StrictAttributeDict(
                 pull_request_obj.target_repo.get_api_data())
             attrs.target_repo.clone_url = pull_request_obj.target_repo.clone_url
 
         if pull_request_obj.source_repo:
             attrs.source_repo = StrictAttributeDict(
                 pull_request_obj.source_repo.get_api_data())
             attrs.source_repo.clone_url = pull_request_obj.source_repo.clone_url
 
         attrs.source_ref_parts = pull_request_obj.source_ref_parts
         attrs.target_ref_parts = pull_request_obj.target_ref_parts
         attrs.revisions = pull_request_obj.revisions
         attrs.common_ancestor_id = pull_request_obj.common_ancestor_id
         attrs.shadow_merge_ref = org_pull_request_obj.shadow_merge_ref
         attrs.reviewer_data = org_pull_request_obj.reviewer_data
         attrs.reviewer_data_json = org_pull_request_obj.reviewer_data_json
 
         return PullRequestDisplay(attrs, internal=internal_methods)
 
     def is_closed(self):
         return self.status == self.STATUS_CLOSED
 
     def is_state_changing(self):
         return self.pull_request_state != PullRequest.STATE_CREATED
 
     def __json__(self):
         return {
             'revisions': self.revisions,
             'versions': self.versions_count
         }
 
     def calculated_review_status(self):
         from rhodecode.model.changeset_status import ChangesetStatusModel
         return ChangesetStatusModel().calculated_review_status(self)
 
     def reviewers_statuses(self):
         from rhodecode.model.changeset_status import ChangesetStatusModel
         return ChangesetStatusModel().reviewers_statuses(self)
 
     def get_pull_request_reviewers(self, role=None):
         qry = PullRequestReviewers.query()\
             .filter(PullRequestReviewers.pull_request_id == self.pull_request_id)
         if role:
             qry = qry.filter(PullRequestReviewers.role == role)
 
         return qry.all()
 
     @property
     def reviewers_count(self):
         qry = PullRequestReviewers.query()\
             .filter(PullRequestReviewers.pull_request_id == self.pull_request_id)\
             .filter(PullRequestReviewers.role == PullRequestReviewers.ROLE_REVIEWER)
         return qry.count()
 
     @property
     def observers_count(self):
         qry = PullRequestReviewers.query()\
             .filter(PullRequestReviewers.pull_request_id == self.pull_request_id)\
             .filter(PullRequestReviewers.role == PullRequestReviewers.ROLE_OBSERVER)
         return qry.count()
 
     def observers(self):
         qry = PullRequestReviewers.query()\
             .filter(PullRequestReviewers.pull_request_id == self.pull_request_id)\
             .filter(PullRequestReviewers.role == PullRequestReviewers.ROLE_OBSERVER)\
             .all()
 
         for entry in qry:
             yield entry, entry.user
 
     @property
     def workspace_id(self):
         from rhodecode.model.pull_request import PullRequestModel
         return PullRequestModel()._workspace_id(self)
 
     def get_shadow_repo(self):
         workspace_id = self.workspace_id
         shadow_repository_path = self.target_repo.get_shadow_repository_path(workspace_id)
         if os.path.isdir(shadow_repository_path):
             vcs_obj = self.target_repo.scm_instance()
             return vcs_obj.get_shadow_instance(shadow_repository_path)
 
     @property
     def versions_count(self):
         """
         return number of versions this PR have, e.g a PR that once been
         updated will have 2 versions
         """
         return self.versions.count() + 1
 
     @property
     def pull_request_last_version(self):
         return self.versions_count
 
 
 class PullRequestVersion(Base, _PullRequestBase):
     __tablename__ = 'pull_request_versions'
     __table_args__ = (
         base_table_args,
     )
 
     pull_request_version_id = Column(
         'pull_request_version_id', Integer(), nullable=False, primary_key=True)
     pull_request_id = Column(
         'pull_request_id', Integer(),
         ForeignKey('pull_requests.pull_request_id'), nullable=False)
     pull_request = relationship('PullRequest')
 
     def __repr__(self):
         if self.pull_request_version_id:
             return '<DB:PullRequestVersion #%s>' % self.pull_request_version_id
         else:
             return '<DB:PullRequestVersion at %#x>' % id(self)
 
     @property
     def reviewers(self):
         return self.pull_request.reviewers
     @property
     def reviewers(self):
         return self.pull_request.reviewers
 
     @property
     def versions(self):
         return self.pull_request.versions
 
     def is_closed(self):
         # calculate from original
         return self.pull_request.status == self.STATUS_CLOSED
 
     def is_state_changing(self):
         return self.pull_request.pull_request_state != PullRequest.STATE_CREATED
 
     def calculated_review_status(self):
         return self.pull_request.calculated_review_status()
 
     def reviewers_statuses(self):
         return self.pull_request.reviewers_statuses()
 
     def observers(self):
         return self.pull_request.observers()
 
 
 class PullRequestReviewers(Base, BaseModel):
     __tablename__ = 'pull_request_reviewers'
     __table_args__ = (
         base_table_args,
     )
     ROLE_REVIEWER = u'reviewer'
     ROLE_OBSERVER = u'observer'
     ROLES = [ROLE_REVIEWER, ROLE_OBSERVER]
 
     @hybrid_property
     def reasons(self):
         if not self._reasons:
             return []
         return self._reasons
 
     @reasons.setter
     def reasons(self, val):
         val = val or []
         if any(not isinstance(x, compat.string_types) for x in val):
             raise Exception('invalid reasons type, must be list of strings')
         self._reasons = val
 
     pull_requests_reviewers_id = Column(
         'pull_requests_reviewers_id', Integer(), nullable=False,
         primary_key=True)
     pull_request_id = Column(
         "pull_request_id", Integer(),
         ForeignKey('pull_requests.pull_request_id'), nullable=False)
     user_id = Column(
         "user_id", Integer(), ForeignKey('users.user_id'), nullable=True)
     _reasons = Column(
         'reason', MutationList.as_mutable(
             JsonType('list', dialect_map=dict(mysql=UnicodeText(16384)))))
 
     mandatory = Column("mandatory", Boolean(), nullable=False, default=False)
     role = Column('role', Unicode(255), nullable=True, default=ROLE_REVIEWER)
 
     user = relationship('User')
     pull_request = relationship('PullRequest')
 
     rule_data = Column(
         'rule_data_json',
         JsonType(dialect_map=dict(mysql=UnicodeText(16384))))
 
     def rule_user_group_data(self):
         """
         Returns the voting user group rule data for this reviewer
         """
 
         if self.rule_data and 'vote_rule' in self.rule_data:
             user_group_data = {}
             if 'rule_user_group_entry_id' in self.rule_data:
                 # means a group with voting rules !
                 user_group_data['id'] = self.rule_data['rule_user_group_entry_id']
                 user_group_data['name'] = self.rule_data['rule_name']
                 user_group_data['vote_rule'] = self.rule_data['vote_rule']
 
             return user_group_data
 
     @classmethod
     def get_pull_request_reviewers(cls, pull_request_id, role=None):
         qry = PullRequestReviewers.query()\
             .filter(PullRequestReviewers.pull_request_id == pull_request_id)
         if role:
             qry = qry.filter(PullRequestReviewers.role == role)
 
         return qry.all()
 
     def __unicode__(self):
         return u"<%s('id:%s')>" % (self.__class__.__name__,
                                    self.pull_requests_reviewers_id)
 
 
 class Notification(Base, BaseModel):
     __tablename__ = 'notifications'
     __table_args__ = (
         Index('notification_type_idx', 'type'),
         base_table_args,
     )
 
     TYPE_CHANGESET_COMMENT = u'cs_comment'
     TYPE_MESSAGE = u'message'
     TYPE_MENTION = u'mention'
     TYPE_REGISTRATION = u'registration'
     TYPE_PULL_REQUEST = u'pull_request'
     TYPE_PULL_REQUEST_COMMENT = u'pull_request_comment'
     TYPE_PULL_REQUEST_UPDATE = u'pull_request_update'
 
     notification_id = Column('notification_id', Integer(), nullable=False, primary_key=True)
     subject = Column('subject', Unicode(512), nullable=True)
     body = Column('body', UnicodeText().with_variant(UnicodeText(50000), 'mysql'), nullable=True)
     created_by = Column("created_by", Integer(), ForeignKey('users.user_id'), nullable=True)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     type_ = Column('type', Unicode(255))
 
     created_by_user = relationship('User')
     notifications_to_users = relationship('UserNotification', lazy='joined',
                                           cascade="all, delete-orphan")
 
     @property
     def recipients(self):
         return [x.user for x in UserNotification.query()\
                 .filter(UserNotification.notification == self)\
                 .order_by(UserNotification.user_id.asc()).all()]
 
     @classmethod
     def create(cls, created_by, subject, body, recipients, type_=None):
         if type_ is None:
             type_ = Notification.TYPE_MESSAGE
 
         notification = cls()
         notification.created_by_user = created_by
         notification.subject = subject
         notification.body = body
         notification.type_ = type_
         notification.created_on = datetime.datetime.now()
 
         # For each recipient link the created notification to his account
         for u in recipients:
             assoc = UserNotification()
             assoc.user_id = u.user_id
             assoc.notification = notification
 
             # if created_by is inside recipients mark his notification
             # as read
             if u.user_id == created_by.user_id:
                 assoc.read = True
             Session().add(assoc)
 
         Session().add(notification)
 
         return notification
 
 
 class UserNotification(Base, BaseModel):
     __tablename__ = 'user_to_notification'
     __table_args__ = (
         UniqueConstraint('user_id', 'notification_id'),
         base_table_args
     )
 
     user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), primary_key=True)
     notification_id = Column("notification_id", Integer(), ForeignKey('notifications.notification_id'), primary_key=True)
     read = Column('read', Boolean, default=False)
     sent_on = Column('sent_on', DateTime(timezone=False), nullable=True, unique=None)
 
     user = relationship('User', lazy="joined")
     notification = relationship('Notification', lazy="joined",
                                 order_by=lambda: Notification.created_on.desc(),)
 
     def mark_as_read(self):
         self.read = True
         Session().add(self)
 
 
 class UserNotice(Base, BaseModel):
     __tablename__ = 'user_notices'
     __table_args__ = (
         base_table_args
     )
 
     NOTIFICATION_TYPE_MESSAGE = 'message'
     NOTIFICATION_TYPE_NOTICE = 'notice'
 
     NOTIFICATION_LEVEL_INFO = 'info'
     NOTIFICATION_LEVEL_WARNING = 'warning'
     NOTIFICATION_LEVEL_ERROR = 'error'
 
     user_notice_id = Column('gist_id', Integer(), primary_key=True)
 
     notice_subject = Column('notice_subject', Unicode(512), nullable=True)
     notice_body = Column('notice_body', UnicodeText().with_variant(UnicodeText(50000), 'mysql'), nullable=True)
 
     notice_read = Column('notice_read', Boolean, default=False)
 
     notification_level = Column('notification_level', String(1024), default=NOTIFICATION_LEVEL_INFO)
     notification_type = Column('notification_type', String(1024), default=NOTIFICATION_TYPE_NOTICE)
 
     notice_created_by = Column('notice_created_by', Integer(), ForeignKey('users.user_id'), nullable=True)
     notice_created_on = Column('notice_created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
 
     user_id = Column('user_id', Integer(), ForeignKey('users.user_id'))
     user = relationship('User', lazy="joined", primaryjoin='User.user_id==UserNotice.user_id')
 
     @classmethod
     def create_for_user(cls, user, subject, body, notice_level=NOTIFICATION_LEVEL_INFO, allow_duplicate=False):
 
         if notice_level not in [cls.NOTIFICATION_LEVEL_ERROR,
                                 cls.NOTIFICATION_LEVEL_WARNING,
                                 cls.NOTIFICATION_LEVEL_INFO]:
             return
 
         from rhodecode.model.user import UserModel
         user = UserModel().get_user(user)
 
         new_notice = UserNotice()
         if not allow_duplicate:
             existing_msg = UserNotice().query() \
                 .filter(UserNotice.user == user) \
                 .filter(UserNotice.notice_body == body) \
                 .filter(UserNotice.notice_read == false()) \
                 .scalar()
             if existing_msg:
                 log.warning('Ignoring duplicate notice for user %s', user)
                 return
 
         new_notice.user = user
         new_notice.notice_subject = subject
         new_notice.notice_body = body
         new_notice.notification_level = notice_level
         Session().add(new_notice)
         Session().commit()
 
 
 class Gist(Base, BaseModel):
     __tablename__ = 'gists'
     __table_args__ = (
         Index('g_gist_access_id_idx', 'gist_access_id'),
         Index('g_created_on_idx', 'created_on'),
         base_table_args
     )
 
     GIST_PUBLIC = u'public'
     GIST_PRIVATE = u'private'
     DEFAULT_FILENAME = u'gistfile1.txt'
 
     ACL_LEVEL_PUBLIC = u'acl_public'
     ACL_LEVEL_PRIVATE = u'acl_private'
 
     gist_id = Column('gist_id', Integer(), primary_key=True)
     gist_access_id = Column('gist_access_id', Unicode(250))
     gist_description = Column('gist_description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))
     gist_owner = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=True)
     gist_expires = Column('gist_expires', Float(53), nullable=False)
     gist_type = Column('gist_type', Unicode(128), nullable=False)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     modified_at = Column('modified_at', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     acl_level = Column('acl_level', Unicode(128), nullable=True)
 
     owner = relationship('User')
 
     def __repr__(self):
         return '<Gist:[%s]%s>' % (self.gist_type, self.gist_access_id)
 
     @hybrid_property
     def description_safe(self):
         from rhodecode.lib import helpers as h
         return h.escape(self.gist_description)
 
     @classmethod
     def get_or_404(cls, id_):
         from pyramid.httpexceptions import HTTPNotFound
 
         res = cls.query().filter(cls.gist_access_id == id_).scalar()
         if not res:
             log.debug('WARN: No DB entry with id %s', id_)
             raise HTTPNotFound()
         return res
 
     @classmethod
     def get_by_access_id(cls, gist_access_id):
         return cls.query().filter(cls.gist_access_id == gist_access_id).scalar()
 
     def gist_url(self):
         from rhodecode.model.gist import GistModel
         return GistModel().get_url(self)
 
     @classmethod
     def base_path(cls):
         """
         Returns base path when all gists are stored
 
         :param cls:
         """
         from rhodecode.model.gist import GIST_STORE_LOC
         q = Session().query(RhodeCodeUi)\
             .filter(RhodeCodeUi.ui_key == URL_SEP)
         q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
         return os.path.join(q.one().ui_value, GIST_STORE_LOC)
 
     def get_api_data(self):
         """
         Common function for generating gist related data for API
         """
         gist = self
         data = {
             'gist_id': gist.gist_id,
             'type': gist.gist_type,
             'access_id': gist.gist_access_id,
             'description': gist.gist_description,
             'url': gist.gist_url(),
             'expires': gist.gist_expires,
             'created_on': gist.created_on,
             'modified_at': gist.modified_at,
             'content': None,
             'acl_level': gist.acl_level,
         }
         return data
 
     def __json__(self):
         data = dict(
         )
         data.update(self.get_api_data())
         return data
     # SCM functions
 
     def scm_instance(self, **kwargs):
         """
         Get an instance of VCS Repository
 
         :param kwargs:
         """
         from rhodecode.model.gist import GistModel
         full_repo_path = os.path.join(self.base_path(), self.gist_access_id)
         return get_vcs_instance(
             repo_path=safe_str(full_repo_path), create=False,
             _vcs_alias=GistModel.vcs_backend)
 
 
 class ExternalIdentity(Base, BaseModel):
     __tablename__ = 'external_identities'
     __table_args__ = (
         Index('local_user_id_idx', 'local_user_id'),
         Index('external_id_idx', 'external_id'),
         base_table_args
     )
 
     external_id = Column('external_id', Unicode(255), default=u'', primary_key=True)
     external_username = Column('external_username', Unicode(1024), default=u'')
     local_user_id = Column('local_user_id', Integer(), ForeignKey('users.user_id'), primary_key=True)
     provider_name = Column('provider_name', Unicode(255), default=u'', primary_key=True)
     access_token = Column('access_token', String(1024), default=u'')
     alt_token = Column('alt_token', String(1024), default=u'')
     token_secret = Column('token_secret', String(1024), default=u'')
 
     @classmethod
     def by_external_id_and_provider(cls, external_id, provider_name, local_user_id=None):
         """
         Returns ExternalIdentity instance based on search params
 
         :param external_id:
         :param provider_name:
         :return: ExternalIdentity
         """
         query = cls.query()
         query = query.filter(cls.external_id == external_id)
         query = query.filter(cls.provider_name == provider_name)
         if local_user_id:
             query = query.filter(cls.local_user_id == local_user_id)
         return query.first()
 
     @classmethod
     def user_by_external_id_and_provider(cls, external_id, provider_name):
         """
         Returns User instance based on search params
 
         :param external_id:
         :param provider_name:
         :return: User
         """
         query = User.query()
         query = query.filter(cls.external_id == external_id)
         query = query.filter(cls.provider_name == provider_name)
         query = query.filter(User.user_id == cls.local_user_id)
         return query.first()
 
     @classmethod
     def by_local_user_id(cls, local_user_id):
         """
         Returns all tokens for user
 
         :param local_user_id:
         :return: ExternalIdentity
         """
         query = cls.query()
         query = query.filter(cls.local_user_id == local_user_id)
         return query
 
     @classmethod
     def load_provider_plugin(cls, plugin_id):
         from rhodecode.authentication.base import loadplugin
         _plugin_id = 'egg:rhodecode-enterprise-ee#{}'.format(plugin_id)
         auth_plugin = loadplugin(_plugin_id)
         return auth_plugin
 
 
 class Integration(Base, BaseModel):
     __tablename__ = 'integrations'
     __table_args__ = (
         base_table_args
     )
 
     integration_id = Column('integration_id', Integer(), primary_key=True)
     integration_type = Column('integration_type', String(255))
     enabled = Column('enabled', Boolean(), nullable=False)
     name = Column('name', String(255), nullable=False)
     child_repos_only = Column('child_repos_only', Boolean(), nullable=False,
         default=False)
 
     settings = Column(
         'settings_json', MutationObj.as_mutable(
             JsonType(dialect_map=dict(mysql=UnicodeText(16384)))))
     repo_id = Column(
         'repo_id', Integer(), ForeignKey('repositories.repo_id'),
         nullable=True, unique=None, default=None)
     repo = relationship('Repository', lazy='joined')
 
     repo_group_id = Column(
         'repo_group_id', Integer(), ForeignKey('groups.group_id'),
         nullable=True, unique=None, default=None)
     repo_group = relationship('RepoGroup', lazy='joined')
 
     @property
     def scope(self):
         if self.repo:
             return repr(self.repo)
         if self.repo_group:
             if self.child_repos_only:
                 return repr(self.repo_group) + ' (child repos only)'
             else:
                 return repr(self.repo_group) + ' (recursive)'
         if self.child_repos_only:
             return 'root_repos'
         return 'global'
 
     def __repr__(self):
         return '<Integration(%r, %r)>' % (self.integration_type, self.scope)
 
 
 class RepoReviewRuleUser(Base, BaseModel):
     __tablename__ = 'repo_review_rules_users'
     __table_args__ = (
         base_table_args
     )
     ROLE_REVIEWER = u'reviewer'
     ROLE_OBSERVER = u'observer'
     ROLES = [ROLE_REVIEWER, ROLE_OBSERVER]
 
     repo_review_rule_user_id = Column('repo_review_rule_user_id', Integer(), primary_key=True)
     repo_review_rule_id = Column("repo_review_rule_id", Integer(), ForeignKey('repo_review_rules.repo_review_rule_id'))
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False)
     mandatory = Column("mandatory", Boolean(), nullable=False, default=False)
     role = Column('role', Unicode(255), nullable=True, default=ROLE_REVIEWER)
     user = relationship('User')
 
     def rule_data(self):
         return {
             'mandatory': self.mandatory,
             'role': self.role,
         }
 
 
 class RepoReviewRuleUserGroup(Base, BaseModel):
     __tablename__ = 'repo_review_rules_users_groups'
     __table_args__ = (
         base_table_args
     )
 
     VOTE_RULE_ALL = -1
     ROLE_REVIEWER = u'reviewer'
     ROLE_OBSERVER = u'observer'
     ROLES = [ROLE_REVIEWER, ROLE_OBSERVER]
 
     repo_review_rule_users_group_id = Column('repo_review_rule_users_group_id', Integer(), primary_key=True)
     repo_review_rule_id = Column("repo_review_rule_id", Integer(), ForeignKey('repo_review_rules.repo_review_rule_id'))
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False)
     mandatory = Column("mandatory", Boolean(), nullable=False, default=False)
     role = Column('role', Unicode(255), nullable=True, default=ROLE_REVIEWER)
     vote_rule = Column("vote_rule", Integer(), nullable=True, default=VOTE_RULE_ALL)
     users_group = relationship('UserGroup')
 
     def rule_data(self):
         return {
             'mandatory': self.mandatory,
             'role': self.role,
             'vote_rule': self.vote_rule
         }
 
     @property
     def vote_rule_label(self):
         if not self.vote_rule or self.vote_rule == self.VOTE_RULE_ALL:
             return 'all must vote'
         else:
             return 'min. vote {}'.format(self.vote_rule)
 
 
 class RepoReviewRule(Base, BaseModel):
     __tablename__ = 'repo_review_rules'
     __table_args__ = (
         base_table_args
     )
 
     repo_review_rule_id = Column(
         'repo_review_rule_id', Integer(), primary_key=True)
     repo_id = Column(
         "repo_id", Integer(), ForeignKey('repositories.repo_id'))
     repo = relationship('Repository', backref='review_rules')
 
     review_rule_name = Column('review_rule_name', String(255))
     _branch_pattern = Column("branch_pattern", UnicodeText().with_variant(UnicodeText(255), 'mysql'), default=u'*')  # glob
     _target_branch_pattern = Column("target_branch_pattern", UnicodeText().with_variant(UnicodeText(255), 'mysql'), default=u'*')  # glob
     _file_pattern = Column("file_pattern", UnicodeText().with_variant(UnicodeText(255), 'mysql'), default=u'*')  # glob
 
     use_authors_for_review = Column("use_authors_for_review", Boolean(), nullable=False, default=False)
 
     # Legacy fields, just for backward compat
     _forbid_author_to_review = Column("forbid_author_to_review", Boolean(), nullable=False, default=False)
     _forbid_commit_author_to_review = Column("forbid_commit_author_to_review", Boolean(), nullable=False, default=False)
 
     pr_author = Column("pr_author", UnicodeText().with_variant(UnicodeText(255), 'mysql'), nullable=True)
     commit_author = Column("commit_author", UnicodeText().with_variant(UnicodeText(255), 'mysql'), nullable=True)
 
     forbid_adding_reviewers = Column("forbid_adding_reviewers", Boolean(), nullable=False, default=False)
 
     rule_users = relationship('RepoReviewRuleUser')
     rule_user_groups = relationship('RepoReviewRuleUserGroup')
 
     def _validate_pattern(self, value):
         re.compile('^' + glob2re(value) + '$')
 
     @hybrid_property
     def source_branch_pattern(self):
         return self._branch_pattern or '*'
 
     @source_branch_pattern.setter
     def source_branch_pattern(self, value):
         self._validate_pattern(value)
         self._branch_pattern = value or '*'
 
     @hybrid_property
     def target_branch_pattern(self):
         return self._target_branch_pattern or '*'
 
     @target_branch_pattern.setter
     def target_branch_pattern(self, value):
         self._validate_pattern(value)
         self._target_branch_pattern = value or '*'
 
     @hybrid_property
     def file_pattern(self):
         return self._file_pattern or '*'
 
     @file_pattern.setter
     def file_pattern(self, value):
         self._validate_pattern(value)
         self._file_pattern = value or '*'
 
     @hybrid_property
     def forbid_pr_author_to_review(self):
         return self.pr_author == 'forbid_pr_author'
 
     @hybrid_property
     def include_pr_author_to_review(self):
         return self.pr_author == 'include_pr_author'
 
     @hybrid_property
     def forbid_commit_author_to_review(self):
         return self.commit_author == 'forbid_commit_author'
 
     @hybrid_property
     def include_commit_author_to_review(self):
         return self.commit_author == 'include_commit_author'
 
     def matches(self, source_branch, target_branch, files_changed):
         """
         Check if this review rule matches a branch/files in a pull request
 
         :param source_branch: source branch name for the commit
         :param target_branch: target branch name for the commit
         :param files_changed: list of file paths changed in the pull request
         """
 
         source_branch = source_branch or ''
         target_branch = target_branch or ''
         files_changed = files_changed or []
 
         branch_matches = True
         if source_branch or target_branch:
             if self.source_branch_pattern == '*':
                 source_branch_match = True
             else:
                 if self.source_branch_pattern.startswith('re:'):
                     source_pattern = self.source_branch_pattern[3:]
                 else:
                     source_pattern = '^' + glob2re(self.source_branch_pattern) + '$'
                 source_branch_regex = re.compile(source_pattern)
                 source_branch_match = bool(source_branch_regex.search(source_branch))
             if self.target_branch_pattern == '*':
                 target_branch_match = True
             else:
                 if self.target_branch_pattern.startswith('re:'):
                     target_pattern = self.target_branch_pattern[3:]
                 else:
                     target_pattern = '^' + glob2re(self.target_branch_pattern) + '$'
                 target_branch_regex = re.compile(target_pattern)
                 target_branch_match = bool(target_branch_regex.search(target_branch))
 
             branch_matches = source_branch_match and target_branch_match
 
         files_matches = True
         if self.file_pattern != '*':
             files_matches = False
             if self.file_pattern.startswith('re:'):
                 file_pattern = self.file_pattern[3:]
             else:
                 file_pattern = glob2re(self.file_pattern)
             file_regex = re.compile(file_pattern)
             for file_data in files_changed:
                 filename = file_data.get('filename')
 
                 if file_regex.search(filename):
                     files_matches = True
                     break
 
         return branch_matches and files_matches
 
     @property
     def review_users(self):
         """ Returns the users which this rule applies to """
 
         users = collections.OrderedDict()
 
         for rule_user in self.rule_users:
             if rule_user.user.active:
                 if rule_user.user not in users:
                     users[rule_user.user.username] = {
                         'user': rule_user.user,
                         'source': 'user',
                         'source_data': {},
                         'data': rule_user.rule_data()
                     }
 
         for rule_user_group in self.rule_user_groups:
             source_data = {
                 'user_group_id': rule_user_group.users_group.users_group_id,
                 'name': rule_user_group.users_group.users_group_name,
                 'members': len(rule_user_group.users_group.members)
             }
             for member in rule_user_group.users_group.members:
                 if member.user.active:
                     key = member.user.username
                     if key in users:
                         # skip this member as we have him already
                         # this prevents from override the "first" matched
                         # users with duplicates in multiple groups
                         continue
 
                     users[key] = {
                         'user': member.user,
                         'source': 'user_group',
                         'source_data': source_data,
                         'data': rule_user_group.rule_data()
                     }
 
         return users
 
     def user_group_vote_rule(self, user_id):
 
         rules = []
         if not self.rule_user_groups:
             return rules
 
         for user_group in self.rule_user_groups:
             user_group_members = [x.user_id for x in user_group.users_group.members]
             if user_id in user_group_members:
                 rules.append(user_group)
         return rules
 
     def __repr__(self):
         return '<RepoReviewerRule(id=%r, repo=%r)>' % (
             self.repo_review_rule_id, self.repo)
 
 
 class ScheduleEntry(Base, BaseModel):
     __tablename__ = 'schedule_entries'
     __table_args__ = (
         UniqueConstraint('schedule_name', name='s_schedule_name_idx'),
         UniqueConstraint('task_uid', name='s_task_uid_idx'),
         base_table_args,
     )
 
     schedule_types = ['crontab', 'timedelta', 'integer']
     schedule_entry_id = Column('schedule_entry_id', Integer(), primary_key=True)
 
     schedule_name = Column("schedule_name", String(255), nullable=False, unique=None, default=None)
     schedule_description = Column("schedule_description", String(10000), nullable=True, unique=None, default=None)
     schedule_enabled = Column("schedule_enabled", Boolean(), nullable=False, unique=None, default=True)
 
     _schedule_type = Column("schedule_type", String(255), nullable=False, unique=None, default=None)
     schedule_definition = Column('schedule_definition_json', MutationObj.as_mutable(JsonType(default=lambda: "", dialect_map=dict(mysql=LONGTEXT()))))
 
     schedule_last_run = Column('schedule_last_run', DateTime(timezone=False), nullable=True, unique=None, default=None)
     schedule_total_run_count = Column('schedule_total_run_count', Integer(), nullable=True, unique=None, default=0)
 
     # task
     task_uid = Column("task_uid", String(255), nullable=False, unique=None, default=None)
     task_dot_notation = Column("task_dot_notation", String(4096), nullable=False, unique=None, default=None)
     task_args = Column('task_args_json', MutationObj.as_mutable(JsonType(default=list, dialect_map=dict(mysql=LONGTEXT()))))
     task_kwargs = Column('task_kwargs_json', MutationObj.as_mutable(JsonType(default=dict, dialect_map=dict(mysql=LONGTEXT()))))
 
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     updated_on = Column('updated_on', DateTime(timezone=False), nullable=True, unique=None, default=None)
 
     @hybrid_property
     def schedule_type(self):
         return self._schedule_type
 
     @schedule_type.setter
     def schedule_type(self, val):
         if val not in self.schedule_types:
             raise ValueError('Value must be on of `{}` and got `{}`'.format(
                 val, self.schedule_type))
 
         self._schedule_type = val
 
     @classmethod
     def get_uid(cls, obj):
         args = obj.task_args
         kwargs = obj.task_kwargs
         if isinstance(args, JsonRaw):
             try:
                 args = json.loads(args)
             except ValueError:
                 args = tuple()
 
         if isinstance(kwargs, JsonRaw):
             try:
                 kwargs = json.loads(kwargs)
             except ValueError:
                 kwargs = dict()
 
         dot_notation = obj.task_dot_notation
         val = '.'.join(map(safe_str, [
             sorted(dot_notation), args, sorted(kwargs.items())]))
         return hashlib.sha1(val).hexdigest()
 
     @classmethod
     def get_by_schedule_name(cls, schedule_name):
         return cls.query().filter(cls.schedule_name == schedule_name).scalar()
 
     @classmethod
     def get_by_schedule_id(cls, schedule_id):
         return cls.query().filter(cls.schedule_entry_id == schedule_id).scalar()
 
     @property
     def task(self):
         return self.task_dot_notation
 
     @property
     def schedule(self):
         from rhodecode.lib.celerylib.utils import raw_2_schedule
         schedule = raw_2_schedule(self.schedule_definition, self.schedule_type)
         return schedule
 
     @property
     def args(self):
         try:
             return list(self.task_args or [])
         except ValueError:
             return list()
 
     @property
     def kwargs(self):
         try:
             return dict(self.task_kwargs or {})
         except ValueError:
             return dict()
 
     def _as_raw(self, val, indent=None):
         if hasattr(val, 'de_coerce'):
             val = val.de_coerce()
             if val:
                 val = json.dumps(val, indent=indent, sort_keys=True)
 
         return val
 
     @property
     def schedule_definition_raw(self):
         return self._as_raw(self.schedule_definition)
 
     def args_raw(self, indent=None):
         return self._as_raw(self.task_args, indent)
 
     def kwargs_raw(self, indent=None):
         return self._as_raw(self.task_kwargs, indent)
 
     def __repr__(self):
         return '<DB:ScheduleEntry({}:{})>'.format(
             self.schedule_entry_id, self.schedule_name)
 
 
 @event.listens_for(ScheduleEntry, 'before_update')
 def update_task_uid(mapper, connection, target):
     target.task_uid = ScheduleEntry.get_uid(target)
 
 
 @event.listens_for(ScheduleEntry, 'before_insert')
 def set_task_uid(mapper, connection, target):
     target.task_uid = ScheduleEntry.get_uid(target)
 
 
 class _BaseBranchPerms(BaseModel):
     @classmethod
     def compute_hash(cls, value):
         return sha1_safe(value)
 
     @hybrid_property
     def branch_pattern(self):
         return self._branch_pattern or '*'
 
     @hybrid_property
     def branch_hash(self):
         return self._branch_hash
 
     def _validate_glob(self, value):
         re.compile('^' + glob2re(value) + '$')
 
     @branch_pattern.setter
     def branch_pattern(self, value):
         self._validate_glob(value)
         self._branch_pattern = value or '*'
         # set the Hash when setting the branch pattern
         self._branch_hash = self.compute_hash(self._branch_pattern)
 
     def matches(self, branch):
         """
         Check if this the branch matches entry
 
         :param branch: branch name for the commit
         """
 
         branch = branch or ''
 
         branch_matches = True
         if branch:
             branch_regex = re.compile('^' + glob2re(self.branch_pattern) + '$')
             branch_matches = bool(branch_regex.search(branch))
 
         return branch_matches
 
 
 class UserToRepoBranchPermission(Base, _BaseBranchPerms):
     __tablename__ = 'user_to_repo_branch_permissions'
     __table_args__ = (
         base_table_args
     )
 
     branch_rule_id = Column('branch_rule_id', Integer(), primary_key=True)
 
     repository_id = Column('repository_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
     repo = relationship('Repository', backref='user_branch_perms')
 
     permission_id = Column('permission_id', Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     permission = relationship('Permission')
 
     rule_to_perm_id = Column('rule_to_perm_id', Integer(), ForeignKey('repo_to_perm.repo_to_perm_id'), nullable=False, unique=None, default=None)
     user_repo_to_perm = relationship('UserRepoToPerm')
 
     rule_order = Column('rule_order', Integer(), nullable=False)
     _branch_pattern = Column('branch_pattern', UnicodeText().with_variant(UnicodeText(2048), 'mysql'), default=u'*')  # glob
     _branch_hash = Column('branch_hash', UnicodeText().with_variant(UnicodeText(2048), 'mysql'))
 
     def __unicode__(self):
         return u'<UserBranchPermission(%s => %r)>' % (
             self.user_repo_to_perm, self.branch_pattern)
 
 
 class UserGroupToRepoBranchPermission(Base, _BaseBranchPerms):
     __tablename__ = 'user_group_to_repo_branch_permissions'
     __table_args__ = (
         base_table_args
     )
 
     branch_rule_id = Column('branch_rule_id', Integer(), primary_key=True)
 
     repository_id = Column('repository_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
     repo = relationship('Repository', backref='user_group_branch_perms')
 
     permission_id = Column('permission_id', Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     permission = relationship('Permission')
 
     rule_to_perm_id = Column('rule_to_perm_id', Integer(), ForeignKey('users_group_repo_to_perm.users_group_to_perm_id'), nullable=False, unique=None, default=None)
     user_group_repo_to_perm = relationship('UserGroupRepoToPerm')
 
     rule_order = Column('rule_order', Integer(), nullable=False)
     _branch_pattern = Column('branch_pattern', UnicodeText().with_variant(UnicodeText(2048), 'mysql'), default=u'*')  # glob
     _branch_hash = Column('branch_hash', UnicodeText().with_variant(UnicodeText(2048), 'mysql'))
 
     def __unicode__(self):
         return u'<UserBranchPermission(%s => %r)>' % (
             self.user_group_repo_to_perm, self.branch_pattern)
 
 
 class UserBookmark(Base, BaseModel):
     __tablename__ = 'user_bookmarks'
     __table_args__ = (
         UniqueConstraint('user_id', 'bookmark_repo_id'),
         UniqueConstraint('user_id', 'bookmark_repo_group_id'),
         UniqueConstraint('user_id', 'bookmark_position'),
         base_table_args
     )
 
     user_bookmark_id = Column("user_bookmark_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     position = Column("bookmark_position", Integer(), nullable=False)
     title = Column("bookmark_title", String(255), nullable=True, unique=None, default=None)
     redirect_url = Column("bookmark_redirect_url", String(10240), nullable=True, unique=None, default=None)
     created_on = Column("created_on", DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
 
     bookmark_repo_id = Column("bookmark_repo_id", Integer(), ForeignKey("repositories.repo_id"), nullable=True, unique=None, default=None)
     bookmark_repo_group_id = Column("bookmark_repo_group_id", Integer(), ForeignKey("groups.group_id"), nullable=True, unique=None, default=None)
 
     user = relationship("User")
 
     repository = relationship("Repository")
     repository_group = relationship("RepoGroup")
 
     @classmethod
     def get_by_position_for_user(cls, position, user_id):
         return cls.query() \
             .filter(UserBookmark.user_id == user_id) \
             .filter(UserBookmark.position == position).scalar()
 
     @classmethod
     def get_bookmarks_for_user(cls, user_id, cache=True):
         bookmarks = cls.query() \
             .filter(UserBookmark.user_id == user_id) \
             .options(joinedload(UserBookmark.repository)) \
             .options(joinedload(UserBookmark.repository_group)) \
             .order_by(UserBookmark.position.asc())
 
         if cache:
             bookmarks = bookmarks.options(
                 FromCache("sql_cache_short", "get_user_{}_bookmarks".format(user_id))
             )
 
         return bookmarks.all()
 
     def __unicode__(self):
         return u'<UserBookmark(%s @ %r)>' % (self.position, self.redirect_url)
 
 
 class FileStore(Base, BaseModel):
     __tablename__ = 'file_store'
     __table_args__ = (
         base_table_args
     )
 
     file_store_id = Column('file_store_id', Integer(), primary_key=True)
     file_uid = Column('file_uid', String(1024), nullable=False)
     file_display_name = Column('file_display_name', UnicodeText().with_variant(UnicodeText(2048), 'mysql'), nullable=True)
     file_description = Column('file_description', UnicodeText().with_variant(UnicodeText(10240), 'mysql'), nullable=True)
     file_org_name = Column('file_org_name', UnicodeText().with_variant(UnicodeText(10240), 'mysql'), nullable=False)
 
     # sha256 hash
     file_hash = Column('file_hash', String(512), nullable=False)
     file_size = Column('file_size', BigInteger(), nullable=False)
 
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     accessed_on = Column('accessed_on', DateTime(timezone=False), nullable=True)
     accessed_count = Column('accessed_count', Integer(), default=0)
 
     enabled = Column('enabled', Boolean(), nullable=False, default=True)
 
     # if repo/repo_group reference is set, check for permissions
     check_acl = Column('check_acl', Boolean(), nullable=False, default=True)
 
     # hidden defines an attachment that should be hidden from showing in artifact listing
     hidden = Column('hidden', Boolean(), nullable=False, default=False)
 
     user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False)
     upload_user = relationship('User', lazy='joined', primaryjoin='User.user_id==FileStore.user_id')
 
     file_metadata = relationship('FileStoreMetadata', lazy='joined')
 
     # scope limited to user, which requester have access to
     scope_user_id = Column(
         'scope_user_id', Integer(), ForeignKey('users.user_id'),
         nullable=True, unique=None, default=None)
     user = relationship('User', lazy='joined', primaryjoin='User.user_id==FileStore.scope_user_id')
 
     # scope limited to user group, which requester have access to
     scope_user_group_id = Column(
         'scope_user_group_id', Integer(), ForeignKey('users_groups.users_group_id'),
         nullable=True, unique=None, default=None)
     user_group = relationship('UserGroup', lazy='joined')
 
     # scope limited to repo, which requester have access to
     scope_repo_id = Column(
         'scope_repo_id', Integer(), ForeignKey('repositories.repo_id'),
         nullable=True, unique=None, default=None)
     repo = relationship('Repository', lazy='joined')
 
     # scope limited to repo group, which requester have access to
     scope_repo_group_id = Column(
         'scope_repo_group_id', Integer(), ForeignKey('groups.group_id'),
         nullable=True, unique=None, default=None)
     repo_group = relationship('RepoGroup', lazy='joined')
 
     @classmethod
     def get_by_store_uid(cls, file_store_uid, safe=False):
         if safe:
             return FileStore.query().filter(FileStore.file_uid == file_store_uid).first()
         else:
             return FileStore.query().filter(FileStore.file_uid == file_store_uid).scalar()
 
     @classmethod
     def create(cls, file_uid, filename, file_hash, file_size, file_display_name='',
                file_description='', enabled=True, hidden=False, check_acl=True,
                user_id=None, scope_user_id=None, scope_repo_id=None, scope_repo_group_id=None):
 
         store_entry = FileStore()
         store_entry.file_uid = file_uid
         store_entry.file_display_name = file_display_name
         store_entry.file_org_name = filename
         store_entry.file_size = file_size
         store_entry.file_hash = file_hash
         store_entry.file_description = file_description
 
         store_entry.check_acl = check_acl
         store_entry.enabled = enabled
         store_entry.hidden = hidden
 
         store_entry.user_id = user_id
         store_entry.scope_user_id = scope_user_id
         store_entry.scope_repo_id = scope_repo_id
         store_entry.scope_repo_group_id = scope_repo_group_id
 
         return store_entry
 
     @classmethod
     def store_metadata(cls, file_store_id, args, commit=True):
         file_store = FileStore.get(file_store_id)
         if file_store is None:
             return
 
         for section, key, value, value_type in args:
             has_key = FileStoreMetadata().query() \
                 .filter(FileStoreMetadata.file_store_id == file_store.file_store_id) \
                 .filter(FileStoreMetadata.file_store_meta_section == section) \
                 .filter(FileStoreMetadata.file_store_meta_key == key) \
                 .scalar()
             if has_key:
                 msg = 'key `{}` already defined under section `{}` for this file.'\
                     .format(key, section)
                 raise ArtifactMetadataDuplicate(msg, err_section=section, err_key=key)
 
             # NOTE(marcink): raises ArtifactMetadataBadValueType
             FileStoreMetadata.valid_value_type(value_type)
 
             meta_entry = FileStoreMetadata()
             meta_entry.file_store = file_store
             meta_entry.file_store_meta_section = section
             meta_entry.file_store_meta_key = key
             meta_entry.file_store_meta_value_type = value_type
             meta_entry.file_store_meta_value = value
 
             Session().add(meta_entry)
 
         try:
             if commit:
                 Session().commit()
         except IntegrityError:
             Session().rollback()
             raise ArtifactMetadataDuplicate('Duplicate section/key found for this file.')
 
     @classmethod
     def bump_access_counter(cls, file_uid, commit=True):
         FileStore().query()\
             .filter(FileStore.file_uid == file_uid)\
             .update({FileStore.accessed_count: (FileStore.accessed_count + 1),
                      FileStore.accessed_on: datetime.datetime.now()})
         if commit:
             Session().commit()
 
     def __json__(self):
         data = {
             'filename': self.file_display_name,
             'filename_org': self.file_org_name,
             'file_uid': self.file_uid,
             'description': self.file_description,
             'hidden': self.hidden,
             'size': self.file_size,
             'created_on': self.created_on,
             'uploaded_by': self.upload_user.get_api_data(details='basic'),
             'downloaded_times': self.accessed_count,
             'sha256': self.file_hash,
             'metadata': self.file_metadata,
         }
 
         return data
 
     def __repr__(self):
         return '<FileStore({})>'.format(self.file_store_id)
 
 
 class FileStoreMetadata(Base, BaseModel):
     __tablename__ = 'file_store_metadata'
     __table_args__ = (
         UniqueConstraint('file_store_id', 'file_store_meta_section_hash', 'file_store_meta_key_hash'),
         Index('file_store_meta_section_idx', 'file_store_meta_section', mysql_length=255),
         Index('file_store_meta_key_idx', 'file_store_meta_key', mysql_length=255),
         base_table_args
     )
     SETTINGS_TYPES = {
         'str': safe_str,
         'int': safe_int,
         'unicode': safe_unicode,
         'bool': str2bool,
         'list': functools.partial(aslist, sep=',')
     }
 
     file_store_meta_id = Column(
         "file_store_meta_id", Integer(), nullable=False, unique=True, default=None,
         primary_key=True)
     _file_store_meta_section = Column(
         "file_store_meta_section", UnicodeText().with_variant(UnicodeText(1024), 'mysql'),
         nullable=True, unique=None, default=None)
     _file_store_meta_section_hash = Column(
         "file_store_meta_section_hash", String(255),
         nullable=True, unique=None, default=None)
     _file_store_meta_key = Column(
         "file_store_meta_key", UnicodeText().with_variant(UnicodeText(1024), 'mysql'),
         nullable=True, unique=None, default=None)
     _file_store_meta_key_hash = Column(
         "file_store_meta_key_hash", String(255), nullable=True, unique=None, default=None)
     _file_store_meta_value = Column(
         "file_store_meta_value", UnicodeText().with_variant(UnicodeText(20480), 'mysql'),
         nullable=True, unique=None, default=None)
     _file_store_meta_value_type = Column(
         "file_store_meta_value_type", String(255), nullable=True, unique=None,
         default='unicode')
 
     file_store_id = Column(
         'file_store_id', Integer(), ForeignKey('file_store.file_store_id'),
         nullable=True, unique=None, default=None)
 
     file_store = relationship('FileStore', lazy='joined')
 
     @classmethod
     def valid_value_type(cls, value):
         if value.split('.')[0] not in cls.SETTINGS_TYPES:
             raise ArtifactMetadataBadValueType(
                 'value_type must be one of %s got %s' % (cls.SETTINGS_TYPES.keys(), value))
 
     @hybrid_property
     def file_store_meta_section(self):
         return self._file_store_meta_section
 
     @file_store_meta_section.setter
     def file_store_meta_section(self, value):
         self._file_store_meta_section = value
         self._file_store_meta_section_hash = _hash_key(value)
 
     @hybrid_property
     def file_store_meta_key(self):
         return self._file_store_meta_key
 
     @file_store_meta_key.setter
     def file_store_meta_key(self, value):
         self._file_store_meta_key = value
         self._file_store_meta_key_hash = _hash_key(value)
 
     @hybrid_property
     def file_store_meta_value(self):
         val = self._file_store_meta_value
 
         if self._file_store_meta_value_type:
             # e.g unicode.encrypted == unicode
             _type = self._file_store_meta_value_type.split('.')[0]
             # decode the encrypted value if it's encrypted field type
             if '.encrypted' in self._file_store_meta_value_type:
                 cipher = EncryptedTextValue()
                 val = safe_unicode(cipher.process_result_value(val, None))
             # do final type conversion
             converter = self.SETTINGS_TYPES.get(_type) or self.SETTINGS_TYPES['unicode']
             val = converter(val)
 
         return val
 
     @file_store_meta_value.setter
     def file_store_meta_value(self, val):
         val = safe_unicode(val)
         # encode the encrypted value
         if '.encrypted' in self.file_store_meta_value_type:
             cipher = EncryptedTextValue()
             val = safe_unicode(cipher.process_bind_param(val, None))
         self._file_store_meta_value = val
 
     @hybrid_property
     def file_store_meta_value_type(self):
         return self._file_store_meta_value_type
 
     @file_store_meta_value_type.setter
     def file_store_meta_value_type(self, val):
         # e.g unicode.encrypted
         self.valid_value_type(val)
         self._file_store_meta_value_type = val
 
     def __json__(self):
         data = {
             'artifact': self.file_store.file_uid,
             'section': self.file_store_meta_section,
             'key': self.file_store_meta_key,
             'value': self.file_store_meta_value,
         }
 
         return data
 
     def __repr__(self):
         return '<%s[%s]%s=>%s]>' % (self.__class__.__name__, self.file_store_meta_section,
                                     self.file_store_meta_key, self.file_store_meta_value)
 
 
 class DbMigrateVersion(Base, BaseModel):
     __tablename__ = 'db_migrate_version'
     __table_args__ = (
         base_table_args,
     )
 
     repository_id = Column('repository_id', String(250), primary_key=True)
     repository_path = Column('repository_path', Text)
     version = Column('version', Integer)
 
     @classmethod
     def set_version(cls, version):
         """
         Helper for forcing a different version, usually for debugging purposes via ishell.
         """
         ver = DbMigrateVersion.query().first()
         ver.version = version
         Session().commit()
 
 
 class DbSession(Base, BaseModel):
     __tablename__ = 'db_session'
     __table_args__ = (
         base_table_args,
     )
 
     def __repr__(self):
         return '<DB:DbSession({})>'.format(self.id)
 
     id = Column('id', Integer())
     namespace = Column('namespace', String(255), primary_key=True)
     accessed = Column('accessed', DateTime, nullable=False)
     created = Column('created', DateTime, nullable=False)
     data = Column('data', PickleType, nullable=False)

rhodecode/model/forms.py

@@ -1,640 +1,641 b''
 # -*- 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/
 
 """
 this is forms validation classes
 http://formencode.org/module-formencode.validators.html
 for list off all availible validators
 
 we can create our own validators
 
 The table below outlines the options which can be used in a schema in addition to the validators themselves
 pre_validators          []     These validators will be applied before the schema
 chained_validators      []     These validators will be applied after the schema
 allow_extra_fields      False     If True, then it is not an error when keys that aren't associated with a validator are present
 filter_extra_fields     False     If True, then keys that aren't associated with a validator are removed
 if_key_missing          NoDefault If this is given, then any keys that aren't available but are expected will be replaced with this value (and then validated). This does not override a present .if_missing attribute on validators. NoDefault is a special FormEncode class to mean that no default values has been specified and therefore missing keys shouldn't take a default value.
 ignore_key_missing      False     If True, then missing keys will be missing in the result, if the validator doesn't have .if_missing on it already
 
 
 <name> = formencode.validators.<name of validator>
 <name> must equal form name
 list=[1,2,3,4,5]
 for SELECT use formencode.All(OneOf(list), Int())
 
 """
 
 import deform
 import logging
 import formencode
 
 from pkg_resources import resource_filename
 from formencode import All, Pipe
 
 from pyramid.threadlocal import get_current_request
 
 from rhodecode import BACKENDS
 from rhodecode.lib import helpers
 from rhodecode.model import validators as v
 
 log = logging.getLogger(__name__)
 
 
 deform_templates = resource_filename('deform', 'templates')
 rhodecode_templates = resource_filename('rhodecode', 'templates/forms')
 search_path = (rhodecode_templates, deform_templates)
 
 
 class RhodecodeFormZPTRendererFactory(deform.ZPTRendererFactory):
     """ Subclass of ZPTRendererFactory to add rhodecode context variables """
     def __call__(self, template_name, **kw):
         kw['h'] = helpers
         kw['request'] = get_current_request()
         return self.load(template_name)(**kw)
 
 
 form_renderer = RhodecodeFormZPTRendererFactory(search_path)
 deform.Form.set_default_renderer(form_renderer)
 
 
 def LoginForm(localizer):
     _ = localizer
 
     class _LoginForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
         username = v.UnicodeString(
             strip=True,
             min=1,
             not_empty=True,
             messages={
                 'empty': _(u'Please enter a login'),
                 'tooShort': _(u'Enter a value %(min)i characters long or more')
             }
         )
 
         password = v.UnicodeString(
             strip=False,
             min=3,
             max=72,
             not_empty=True,
             messages={
                 'empty': _(u'Please enter a password'),
                 'tooShort': _(u'Enter %(min)i characters or more')}
         )
 
         remember = v.StringBoolean(if_missing=False)
 
         chained_validators = [v.ValidAuth(localizer)]
     return _LoginForm
 
 
 def UserForm(localizer, edit=False, available_languages=None, old_data=None):
     old_data = old_data or {}
     available_languages = available_languages or []
     _ = localizer
 
     class _UserForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
         username = All(v.UnicodeString(strip=True, min=1, not_empty=True),
                        v.ValidUsername(localizer, edit, old_data))
         if edit:
             new_password = All(
                 v.ValidPassword(localizer),
                 v.UnicodeString(strip=False, min=6, max=72, not_empty=False)
             )
             password_confirmation = All(
                 v.ValidPassword(localizer),
                 v.UnicodeString(strip=False, min=6, max=72, not_empty=False),
             )
             admin = v.StringBoolean(if_missing=False)
         else:
             password = All(
                 v.ValidPassword(localizer),
                 v.UnicodeString(strip=False, min=6, max=72, not_empty=True)
             )
             password_confirmation = All(
                 v.ValidPassword(localizer),
                 v.UnicodeString(strip=False, min=6, max=72, not_empty=False)
             )
 
         password_change = v.StringBoolean(if_missing=False)
         create_repo_group = v.StringBoolean(if_missing=False)
 
         active = v.StringBoolean(if_missing=False)
         firstname = v.UnicodeString(strip=True, min=1, not_empty=False)
         lastname = v.UnicodeString(strip=True, min=1, not_empty=False)
         email = All(v.UniqSystemEmail(localizer, old_data), v.Email(not_empty=True))
         description = v.UnicodeString(strip=True, min=1, max=250, not_empty=False,
                                       if_missing='')
         extern_name = v.UnicodeString(strip=True)
         extern_type = v.UnicodeString(strip=True)
         language = v.OneOf(available_languages, hideList=False,
                            testValueList=True, if_missing=None)
         chained_validators = [v.ValidPasswordsMatch(localizer)]
     return _UserForm
 
 
 def UserGroupForm(localizer, edit=False, old_data=None, allow_disabled=False):
     old_data = old_data or {}
     _ = localizer
 
     class _UserGroupForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
 
         users_group_name = All(
             v.UnicodeString(strip=True, min=1, not_empty=True),
             v.ValidUserGroup(localizer, edit, old_data)
         )
         user_group_description = v.UnicodeString(strip=True, min=1,
                                                  not_empty=False)
 
         users_group_active = v.StringBoolean(if_missing=False)
 
         if edit:
             # this is user group owner
             user = All(
                 v.UnicodeString(not_empty=True),
                 v.ValidRepoUser(localizer, allow_disabled))
     return _UserGroupForm
 
 
 def RepoGroupForm(localizer, edit=False, old_data=None, available_groups=None,
                   can_create_in_root=False, allow_disabled=False):
     _ = localizer
     old_data = old_data or {}
     available_groups = available_groups or []
 
     class _RepoGroupForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
 
         group_name = All(v.UnicodeString(strip=True, min=1, not_empty=True),
                          v.SlugifyName(localizer),)
         group_description = v.UnicodeString(strip=True, min=1,
                                             not_empty=False)
         group_copy_permissions = v.StringBoolean(if_missing=False)
 
         group_parent_id = v.OneOf(available_groups, hideList=False,
                                   testValueList=True, not_empty=True)
         enable_locking = v.StringBoolean(if_missing=False)
         chained_validators = [
             v.ValidRepoGroup(localizer, edit, old_data, can_create_in_root)]
 
         if edit:
             # this is repo group owner
             user = All(
                 v.UnicodeString(not_empty=True),
                 v.ValidRepoUser(localizer, allow_disabled))
     return _RepoGroupForm
 
 
 def RegisterForm(localizer, edit=False, old_data=None):
     _ = localizer
     old_data = old_data or {}
 
     class _RegisterForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
         username = All(
             v.ValidUsername(localizer, edit, old_data),
             v.UnicodeString(strip=True, min=1, not_empty=True)
         )
         password = All(
             v.ValidPassword(localizer),
             v.UnicodeString(strip=False, min=6, max=72, not_empty=True)
         )
         password_confirmation = All(
             v.ValidPassword(localizer),
             v.UnicodeString(strip=False, min=6, max=72, not_empty=True)
         )
         active = v.StringBoolean(if_missing=False)
         firstname = v.UnicodeString(strip=True, min=1, not_empty=False)
         lastname = v.UnicodeString(strip=True, min=1, not_empty=False)
         email = All(v.UniqSystemEmail(localizer, old_data), v.Email(not_empty=True))
 
         chained_validators = [v.ValidPasswordsMatch(localizer)]
     return _RegisterForm
 
 
 def PasswordResetForm(localizer):
     _ = localizer
 
     class _PasswordResetForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
         email = All(v.ValidSystemEmail(localizer), v.Email(not_empty=True))
     return _PasswordResetForm
 
 
 def RepoForm(localizer, edit=False, old_data=None, repo_groups=None, allow_disabled=False):
     _ = localizer
     old_data = old_data or {}
     repo_groups = repo_groups or []
     supported_backends = BACKENDS.keys()
 
     class _RepoForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         repo_name = All(v.UnicodeString(strip=True, min=1, not_empty=True),
                         v.SlugifyName(localizer), v.CannotHaveGitSuffix(localizer))
         repo_group = All(v.CanWriteGroup(localizer, old_data),
                          v.OneOf(repo_groups, hideList=True))
         repo_type = v.OneOf(supported_backends, required=False,
                             if_missing=old_data.get('repo_type'))
         repo_description = v.UnicodeString(strip=True, min=1, not_empty=False)
         repo_private = v.StringBoolean(if_missing=False)
         repo_copy_permissions = v.StringBoolean(if_missing=False)
         clone_uri = All(v.UnicodeString(strip=True, min=1, not_empty=False))
 
         repo_enable_statistics = v.StringBoolean(if_missing=False)
         repo_enable_downloads = v.StringBoolean(if_missing=False)
         repo_enable_locking = v.StringBoolean(if_missing=False)
 
         if edit:
             # this is repo owner
             user = All(
                 v.UnicodeString(not_empty=True),
                 v.ValidRepoUser(localizer, allow_disabled))
             clone_uri_change = v.UnicodeString(
                 not_empty=False, if_missing=v.Missing)
 
         chained_validators = [v.ValidCloneUri(localizer),
                               v.ValidRepoName(localizer, edit, old_data)]
     return _RepoForm
 
 
 def RepoPermsForm(localizer):
     _ = localizer
 
     class _RepoPermsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         chained_validators = [v.ValidPerms(localizer, type_='repo')]
     return _RepoPermsForm
 
 
 def RepoGroupPermsForm(localizer, valid_recursive_choices):
     _ = localizer
 
     class _RepoGroupPermsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         recursive = v.OneOf(valid_recursive_choices)
         chained_validators = [v.ValidPerms(localizer, type_='repo_group')]
     return _RepoGroupPermsForm
 
 
 def UserGroupPermsForm(localizer):
     _ = localizer
 
     class _UserPermsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         chained_validators = [v.ValidPerms(localizer, type_='user_group')]
     return _UserPermsForm
 
 
 def RepoFieldForm(localizer):
     _ = localizer
 
     class _RepoFieldForm(formencode.Schema):
         filter_extra_fields = True
         allow_extra_fields = True
 
         new_field_key = All(v.FieldKey(localizer),
                             v.UnicodeString(strip=True, min=3, not_empty=True))
         new_field_value = v.UnicodeString(not_empty=False, if_missing=u'')
         new_field_type = v.OneOf(['str', 'unicode', 'list', 'tuple'],
                                  if_missing='str')
         new_field_label = v.UnicodeString(not_empty=False)
         new_field_desc = v.UnicodeString(not_empty=False)
     return _RepoFieldForm
 
 
 def RepoForkForm(localizer, edit=False, old_data=None,
                  supported_backends=BACKENDS.keys(), repo_groups=None):
     _ = localizer
     old_data = old_data or {}
     repo_groups = repo_groups or []
 
     class _RepoForkForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         repo_name = All(v.UnicodeString(strip=True, min=1, not_empty=True),
                         v.SlugifyName(localizer))
         repo_group = All(v.CanWriteGroup(localizer, ),
                          v.OneOf(repo_groups, hideList=True))
         repo_type = All(v.ValidForkType(localizer, old_data), v.OneOf(supported_backends))
         description = v.UnicodeString(strip=True, min=1, not_empty=True)
         private = v.StringBoolean(if_missing=False)
         copy_permissions = v.StringBoolean(if_missing=False)
         fork_parent_id = v.UnicodeString()
         chained_validators = [v.ValidForkName(localizer, edit, old_data)]
     return _RepoForkForm
 
 
 def ApplicationSettingsForm(localizer):
     _ = localizer
 
     class _ApplicationSettingsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         rhodecode_title = v.UnicodeString(strip=True, max=40, not_empty=False)
         rhodecode_realm = v.UnicodeString(strip=True, min=1, not_empty=True)
         rhodecode_pre_code = v.UnicodeString(strip=True, min=1, not_empty=False)
         rhodecode_post_code = v.UnicodeString(strip=True, min=1, not_empty=False)
         rhodecode_captcha_public_key = v.UnicodeString(strip=True, min=1, not_empty=False)
         rhodecode_captcha_private_key = v.UnicodeString(strip=True, min=1, not_empty=False)
         rhodecode_create_personal_repo_group = v.StringBoolean(if_missing=False)
         rhodecode_personal_repo_group_pattern = v.UnicodeString(strip=True, min=1, not_empty=False)
     return _ApplicationSettingsForm
 
 
 def ApplicationVisualisationForm(localizer):
     from rhodecode.model.db import Repository
     _ = localizer
 
     class _ApplicationVisualisationForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         rhodecode_show_public_icon = v.StringBoolean(if_missing=False)
         rhodecode_show_private_icon = v.StringBoolean(if_missing=False)
         rhodecode_stylify_metatags = v.StringBoolean(if_missing=False)
 
         rhodecode_repository_fields = v.StringBoolean(if_missing=False)
         rhodecode_lightweight_journal = v.StringBoolean(if_missing=False)
         rhodecode_dashboard_items = v.Int(min=5, not_empty=True)
         rhodecode_admin_grid_items = v.Int(min=5, not_empty=True)
         rhodecode_show_version = v.StringBoolean(if_missing=False)
         rhodecode_use_gravatar = v.StringBoolean(if_missing=False)
         rhodecode_markup_renderer = v.OneOf(['markdown', 'rst'])
         rhodecode_gravatar_url = v.UnicodeString(min=3)
         rhodecode_clone_uri_tmpl = v.UnicodeString(not_empty=False, if_empty=Repository.DEFAULT_CLONE_URI)
+        rhodecode_clone_uri_id_tmpl = v.UnicodeString(not_empty=False, if_empty=Repository.DEFAULT_CLONE_URI_ID)
         rhodecode_clone_uri_ssh_tmpl = v.UnicodeString(not_empty=False, if_empty=Repository.DEFAULT_CLONE_URI_SSH)
         rhodecode_support_url = v.UnicodeString()
         rhodecode_show_revision_number = v.StringBoolean(if_missing=False)
         rhodecode_show_sha_length = v.Int(min=4, not_empty=True)
     return _ApplicationVisualisationForm
 
 
 class _BaseVcsSettingsForm(formencode.Schema):
 
     allow_extra_fields = True
     filter_extra_fields = False
     hooks_changegroup_repo_size = v.StringBoolean(if_missing=False)
     hooks_changegroup_push_logger = v.StringBoolean(if_missing=False)
     hooks_outgoing_pull_logger = v.StringBoolean(if_missing=False)
 
     # PR/Code-review
     rhodecode_pr_merge_enabled = v.StringBoolean(if_missing=False)
     rhodecode_use_outdated_comments = v.StringBoolean(if_missing=False)
 
     # hg
     extensions_largefiles = v.StringBoolean(if_missing=False)
     extensions_evolve = v.StringBoolean(if_missing=False)
     phases_publish = v.StringBoolean(if_missing=False)
 
     rhodecode_hg_use_rebase_for_merging = v.StringBoolean(if_missing=False)
     rhodecode_hg_close_branch_before_merging = v.StringBoolean(if_missing=False)
 
     # git
     vcs_git_lfs_enabled = v.StringBoolean(if_missing=False)
     rhodecode_git_use_rebase_for_merging = v.StringBoolean(if_missing=False)
     rhodecode_git_close_branch_before_merging = v.StringBoolean(if_missing=False)
 
     # svn
     vcs_svn_proxy_http_requests_enabled = v.StringBoolean(if_missing=False)
     vcs_svn_proxy_http_server_url = v.UnicodeString(strip=True, if_missing=None)
 
     # cache
     rhodecode_diff_cache = v.StringBoolean(if_missing=False)
 
 
 def ApplicationUiSettingsForm(localizer):
     _ = localizer
 
     class _ApplicationUiSettingsForm(_BaseVcsSettingsForm):
         web_push_ssl = v.StringBoolean(if_missing=False)
         paths_root_path = All(
             v.ValidPath(localizer),
             v.UnicodeString(strip=True, min=1, not_empty=True)
         )
         largefiles_usercache = All(
             v.ValidPath(localizer),
             v.UnicodeString(strip=True, min=2, not_empty=True))
         vcs_git_lfs_store_location = All(
             v.ValidPath(localizer),
             v.UnicodeString(strip=True, min=2, not_empty=True))
         extensions_hgsubversion = v.StringBoolean(if_missing=False)
         extensions_hggit = v.StringBoolean(if_missing=False)
         new_svn_branch = v.ValidSvnPattern(localizer, section='vcs_svn_branch')
         new_svn_tag = v.ValidSvnPattern(localizer, section='vcs_svn_tag')
     return _ApplicationUiSettingsForm
 
 
 def RepoVcsSettingsForm(localizer, repo_name):
     _ = localizer
 
     class _RepoVcsSettingsForm(_BaseVcsSettingsForm):
         inherit_global_settings = v.StringBoolean(if_missing=False)
         new_svn_branch = v.ValidSvnPattern(localizer,
             section='vcs_svn_branch', repo_name=repo_name)
         new_svn_tag = v.ValidSvnPattern(localizer,
             section='vcs_svn_tag', repo_name=repo_name)
     return _RepoVcsSettingsForm
 
 
 def LabsSettingsForm(localizer):
     _ = localizer
 
     class _LabSettingsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
     return _LabSettingsForm
 
 
 def ApplicationPermissionsForm(
         localizer, register_choices, password_reset_choices,
         extern_activate_choices):
     _ = localizer
 
     class _DefaultPermissionsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
 
         anonymous = v.StringBoolean(if_missing=False)
         default_register = v.OneOf(register_choices)
         default_register_message = v.UnicodeString()
         default_password_reset = v.OneOf(password_reset_choices)
         default_extern_activate = v.OneOf(extern_activate_choices)
     return _DefaultPermissionsForm
 
 
 def ObjectPermissionsForm(localizer, repo_perms_choices, group_perms_choices,
                           user_group_perms_choices):
     _ = localizer
 
     class _ObjectPermissionsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
         overwrite_default_repo = v.StringBoolean(if_missing=False)
         overwrite_default_group = v.StringBoolean(if_missing=False)
         overwrite_default_user_group = v.StringBoolean(if_missing=False)
 
         default_repo_perm = v.OneOf(repo_perms_choices)
         default_group_perm = v.OneOf(group_perms_choices)
         default_user_group_perm = v.OneOf(user_group_perms_choices)
 
     return _ObjectPermissionsForm
 
 
 def BranchPermissionsForm(localizer, branch_perms_choices):
     _ = localizer
 
     class _BranchPermissionsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
         overwrite_default_branch = v.StringBoolean(if_missing=False)
         default_branch_perm = v.OneOf(branch_perms_choices)
 
     return _BranchPermissionsForm
 
 
 def UserPermissionsForm(localizer, create_choices, create_on_write_choices,
                         repo_group_create_choices, user_group_create_choices,
                         fork_choices, inherit_default_permissions_choices):
     _ = localizer
 
     class _DefaultPermissionsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
 
         anonymous = v.StringBoolean(if_missing=False)
 
         default_repo_create = v.OneOf(create_choices)
         default_repo_create_on_write = v.OneOf(create_on_write_choices)
         default_user_group_create = v.OneOf(user_group_create_choices)
         default_repo_group_create = v.OneOf(repo_group_create_choices)
         default_fork_create = v.OneOf(fork_choices)
         default_inherit_default_permissions = v.OneOf(inherit_default_permissions_choices)
     return _DefaultPermissionsForm
 
 
 def UserIndividualPermissionsForm(localizer):
     _ = localizer
 
     class _DefaultPermissionsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
 
         inherit_default_permissions = v.StringBoolean(if_missing=False)
     return _DefaultPermissionsForm
 
 
 def DefaultsForm(localizer, edit=False, old_data=None, supported_backends=BACKENDS.keys()):
     _ = localizer
     old_data = old_data or {}
 
     class _DefaultsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
         default_repo_type = v.OneOf(supported_backends)
         default_repo_private = v.StringBoolean(if_missing=False)
         default_repo_enable_statistics = v.StringBoolean(if_missing=False)
         default_repo_enable_downloads = v.StringBoolean(if_missing=False)
         default_repo_enable_locking = v.StringBoolean(if_missing=False)
     return _DefaultsForm
 
 
 def AuthSettingsForm(localizer):
     _ = localizer
 
     class _AuthSettingsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
         auth_plugins = All(v.ValidAuthPlugins(localizer),
                            v.UniqueListFromString(localizer)(not_empty=True))
     return _AuthSettingsForm
 
 
 def UserExtraEmailForm(localizer):
     _ = localizer
 
     class _UserExtraEmailForm(formencode.Schema):
         email = All(v.UniqSystemEmail(localizer), v.Email(not_empty=True))
     return _UserExtraEmailForm
 
 
 def UserExtraIpForm(localizer):
     _ = localizer
 
     class _UserExtraIpForm(formencode.Schema):
         ip = v.ValidIp(localizer)(not_empty=True)
     return _UserExtraIpForm
 
 
 def PullRequestForm(localizer, repo_id):
     _ = localizer
 
     class ReviewerForm(formencode.Schema):
         user_id = v.Int(not_empty=True)
         reasons = All()
         rules = All(v.UniqueList(localizer, convert=int)())
         mandatory = v.StringBoolean()
         role = v.String(if_missing='reviewer')
 
     class ObserverForm(formencode.Schema):
         user_id = v.Int(not_empty=True)
         reasons = All()
         rules = All(v.UniqueList(localizer, convert=int)())
         mandatory = v.StringBoolean()
         role = v.String(if_missing='observer')
 
     class _PullRequestForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
 
         common_ancestor = v.UnicodeString(strip=True, required=True)
         source_repo = v.UnicodeString(strip=True, required=True)
         source_ref = v.UnicodeString(strip=True, required=True)
         target_repo = v.UnicodeString(strip=True, required=True)
         target_ref = v.UnicodeString(strip=True, required=True)
         revisions = All(#v.NotReviewedRevisions(localizer, repo_id)(),
                         v.UniqueList(localizer)(not_empty=True))
         review_members = formencode.ForEach(ReviewerForm())
         observer_members = formencode.ForEach(ObserverForm())
         pullrequest_title = v.UnicodeString(strip=True, required=True, min=1, max=255)
         pullrequest_desc = v.UnicodeString(strip=True, required=False)
         description_renderer = v.UnicodeString(strip=True, required=False)
 
     return _PullRequestForm
 
 
 def IssueTrackerPatternsForm(localizer):
     _ = localizer
 
     class _IssueTrackerPatternsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         chained_validators = [v.ValidPattern(localizer)]
     return _IssueTrackerPatternsForm

rhodecode/model/notification.py

@@ -1,450 +1,453 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2011-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/
 
 
 """
 Model for notifications
 """
 
 import logging
 import traceback
 
 import premailer
 from pyramid.threadlocal import get_current_request
 from sqlalchemy.sql.expression import false, true
 
 import rhodecode
 from rhodecode.lib import helpers as h
 from rhodecode.model import BaseModel
 from rhodecode.model.db import Notification, User, UserNotification
 from rhodecode.model.meta import Session
 from rhodecode.translation import TranslationString
 
 log = logging.getLogger(__name__)
 
 
 class NotificationModel(BaseModel):
 
     cls = Notification
 
     def __get_notification(self, notification):
         if isinstance(notification, Notification):
             return notification
         elif isinstance(notification, (int, long)):
             return Notification.get(notification)
         else:
             if notification:
                 raise Exception('notification must be int, long or Instance'
                                 ' of Notification got %s' % type(notification))
 
     def create(
             self, created_by, notification_subject='', notification_body='',
             notification_type=Notification.TYPE_MESSAGE, recipients=None,
             mention_recipients=None, with_email=True, email_kwargs=None):
         """
 
         Creates notification of given type
 
         :param created_by: int, str or User instance. User who created this
             notification
         :param notification_subject: subject of notification itself,
             it will be generated automatically from notification_type if not specified
         :param notification_body: body of notification text
             it will be generated automatically from notification_type if not specified
         :param notification_type: type of notification, based on that we
             pick templates
         :param recipients: list of int, str or User objects, when None
             is given send to all admins
         :param mention_recipients: list of int, str or User objects,
             that were mentioned
         :param with_email: send email with this notification
         :param email_kwargs: dict with arguments to generate email
         """
 
         from rhodecode.lib.celerylib import tasks, run_task
 
         if recipients and not getattr(recipients, '__iter__', False):
             raise Exception('recipients must be an iterable object')
 
         if not (notification_subject and notification_body) and not notification_type:
             raise ValueError('notification_subject, and notification_body '
                              'cannot be empty when notification_type is not specified')
 
         created_by_obj = self._get_user(created_by)
 
         if not created_by_obj:
             raise Exception('unknown user %s' % created_by)
 
         # default MAIN body if not given
         email_kwargs = email_kwargs or {'body': notification_body}
         mention_recipients = mention_recipients or set()
 
         if recipients is None:
             # recipients is None means to all admins
             recipients_objs = User.query().filter(User.admin == true()).all()
             log.debug('sending notifications %s to admins: %s',
                       notification_type, recipients_objs)
         else:
             recipients_objs = set()
             for u in recipients:
                 obj = self._get_user(u)
                 if obj:
                     recipients_objs.add(obj)
                 else:  # we didn't find this user, log the error and carry on
                     log.error('cannot notify unknown user %r', u)
 
             if not recipients_objs:
                 raise Exception('no valid recipients specified')
 
             log.debug('sending notifications %s to %s',
                       notification_type, recipients_objs)
 
         # add mentioned users into recipients
         final_recipients = set(recipients_objs).union(mention_recipients)
 
         (subject, email_body, email_body_plaintext) = \
             EmailNotificationModel().render_email(notification_type, **email_kwargs)
 
         if not notification_subject:
             notification_subject = subject
 
         if not notification_body:
             notification_body = email_body_plaintext
 
         notification = Notification.create(
             created_by=created_by_obj, subject=notification_subject,
             body=notification_body, recipients=final_recipients,
             type_=notification_type
         )
 
         if not with_email:  # skip sending email, and just create notification
             return notification
 
         # don't send email to person who created this comment
         rec_objs = set(recipients_objs).difference({created_by_obj})
 
         # now notify all recipients in question
 
         for recipient in rec_objs.union(mention_recipients):
             # inject current recipient
             email_kwargs['recipient'] = recipient
             email_kwargs['mention'] = recipient in mention_recipients
             (subject, email_body, email_body_plaintext) = EmailNotificationModel().render_email(
                 notification_type, **email_kwargs)
 
             extra_headers = None
             if 'thread_ids' in email_kwargs:
                 extra_headers = {'thread_ids': email_kwargs.pop('thread_ids')}
 
             log.debug('Creating notification email task for user:`%s`', recipient)
             task = run_task(
                 tasks.send_email, recipient.email, subject,
                 email_body_plaintext, email_body, extra_headers=extra_headers)
             log.debug('Created email task: %s', task)
 
         return notification
 
     def delete(self, user, notification):
         # we don't want to remove actual notification just the assignment
         try:
             notification = self.__get_notification(notification)
             user = self._get_user(user)
             if notification and user:
                 obj = UserNotification.query()\
                     .filter(UserNotification.user == user)\
                     .filter(UserNotification.notification == notification)\
                     .one()
                 Session().delete(obj)
                 return True
         except Exception:
             log.error(traceback.format_exc())
             raise
 
     def get_for_user(self, user, filter_=None):
         """
         Get mentions for given user, filter them if filter dict is given
         """
         user = self._get_user(user)
 
         q = UserNotification.query()\
             .filter(UserNotification.user == user)\
             .join((
                 Notification, UserNotification.notification_id ==
                 Notification.notification_id))
         if filter_ == ['all']:
             q = q  # no filter
         elif filter_ == ['unread']:
             q = q.filter(UserNotification.read == false())
         elif filter_:
             q = q.filter(Notification.type_.in_(filter_))
 
         return q
 
     def mark_read(self, user, notification):
         try:
             notification = self.__get_notification(notification)
             user = self._get_user(user)
             if notification and user:
                 obj = UserNotification.query()\
                     .filter(UserNotification.user == user)\
                     .filter(UserNotification.notification == notification)\
                     .one()
                 obj.read = True
                 Session().add(obj)
                 return True
         except Exception:
             log.error(traceback.format_exc())
             raise
 
     def mark_all_read_for_user(self, user, filter_=None):
         user = self._get_user(user)
         q = UserNotification.query()\
             .filter(UserNotification.user == user)\
             .filter(UserNotification.read == false())\
             .join((
                 Notification, UserNotification.notification_id ==
                 Notification.notification_id))
         if filter_ == ['unread']:
             q = q.filter(UserNotification.read == false())
         elif filter_:
             q = q.filter(Notification.type_.in_(filter_))
 
         # this is a little inefficient but sqlalchemy doesn't support
         # update on joined tables :(
         for obj in q.all():
             obj.read = True
             Session().add(obj)
 
     def get_unread_cnt_for_user(self, user):
         user = self._get_user(user)
         return UserNotification.query()\
             .filter(UserNotification.read == false())\
             .filter(UserNotification.user == user).count()
 
     def get_unread_for_user(self, user):
         user = self._get_user(user)
         return [x.notification for x in UserNotification.query()
                 .filter(UserNotification.read == false())
                 .filter(UserNotification.user == user).all()]
 
     def get_user_notification(self, user, notification):
         user = self._get_user(user)
         notification = self.__get_notification(notification)
 
         return UserNotification.query()\
             .filter(UserNotification.notification == notification)\
             .filter(UserNotification.user == user).scalar()
 
     def make_description(self, notification, translate, show_age=True):
         """
         Creates a human readable description based on properties
         of notification object
         """
         _ = translate
         _map = {
             notification.TYPE_CHANGESET_COMMENT: [
                 _('%(user)s commented on commit %(date_or_age)s'),
                 _('%(user)s commented on commit at %(date_or_age)s'),
                 ],
             notification.TYPE_MESSAGE: [
                 _('%(user)s sent message %(date_or_age)s'),
                 _('%(user)s sent message at %(date_or_age)s'),
                 ],
             notification.TYPE_MENTION: [
                 _('%(user)s mentioned you %(date_or_age)s'),
                 _('%(user)s mentioned you at %(date_or_age)s'),
                 ],
             notification.TYPE_REGISTRATION: [
                 _('%(user)s registered in RhodeCode %(date_or_age)s'),
                 _('%(user)s registered in RhodeCode at %(date_or_age)s'),
                 ],
             notification.TYPE_PULL_REQUEST: [
                 _('%(user)s opened new pull request %(date_or_age)s'),
                 _('%(user)s opened new pull request at %(date_or_age)s'),
                 ],
             notification.TYPE_PULL_REQUEST_UPDATE: [
                 _('%(user)s updated pull request %(date_or_age)s'),
                 _('%(user)s updated pull request at %(date_or_age)s'),
             ],
             notification.TYPE_PULL_REQUEST_COMMENT: [
                 _('%(user)s commented on pull request %(date_or_age)s'),
                 _('%(user)s commented on pull request at %(date_or_age)s'),
                 ],
         }
 
         templates = _map[notification.type_]
 
         if show_age:
             template = templates[0]
             date_or_age = h.age(notification.created_on)
             if translate:
                 date_or_age = translate(date_or_age)
 
             if isinstance(date_or_age, TranslationString):
                 date_or_age = date_or_age.interpolate()
 
         else:
             template = templates[1]
             date_or_age = h.format_date(notification.created_on)
 
         return template % {
             'user': notification.created_by_user.username,
             'date_or_age': date_or_age,
         }
 
 
 # Templates for Titles, that could be overwritten by rcextensions
 # Title of email for pull-request update
 EMAIL_PR_UPDATE_SUBJECT_TEMPLATE = ''
 # Title of email for request for pull request review
 EMAIL_PR_REVIEW_SUBJECT_TEMPLATE = ''
 
 # Title of email for general comment on pull request
 EMAIL_PR_COMMENT_SUBJECT_TEMPLATE = ''
 # Title of email for general comment which includes status change on pull request
 EMAIL_PR_COMMENT_STATUS_CHANGE_SUBJECT_TEMPLATE = ''
 # Title of email for inline comment on a file in pull request
 EMAIL_PR_COMMENT_FILE_SUBJECT_TEMPLATE = ''
 
 # Title of email for general comment on commit
 EMAIL_COMMENT_SUBJECT_TEMPLATE = ''
 # Title of email for general comment which includes status change on commit
 EMAIL_COMMENT_STATUS_CHANGE_SUBJECT_TEMPLATE = ''
 # Title of email for inline comment on a file in commit
 EMAIL_COMMENT_FILE_SUBJECT_TEMPLATE = ''
 
 
 class EmailNotificationModel(BaseModel):
     TYPE_COMMIT_COMMENT = Notification.TYPE_CHANGESET_COMMENT
     TYPE_REGISTRATION = Notification.TYPE_REGISTRATION
     TYPE_PULL_REQUEST = Notification.TYPE_PULL_REQUEST
     TYPE_PULL_REQUEST_COMMENT = Notification.TYPE_PULL_REQUEST_COMMENT
     TYPE_PULL_REQUEST_UPDATE = Notification.TYPE_PULL_REQUEST_UPDATE
     TYPE_MAIN = Notification.TYPE_MESSAGE
 
     TYPE_PASSWORD_RESET = 'password_reset'
     TYPE_PASSWORD_RESET_CONFIRMATION = 'password_reset_confirmation'
     TYPE_EMAIL_TEST = 'email_test'
     TYPE_EMAIL_EXCEPTION = 'exception'
+    TYPE_UPDATE_AVAILABLE = 'update_available'
     TYPE_TEST = 'test'
 
     email_types = {
         TYPE_MAIN:
             'rhodecode:templates/email_templates/main.mako',
         TYPE_TEST:
             'rhodecode:templates/email_templates/test.mako',
         TYPE_EMAIL_EXCEPTION:
             'rhodecode:templates/email_templates/exception_tracker.mako',
+        TYPE_UPDATE_AVAILABLE:
+            'rhodecode:templates/email_templates/update_available.mako',
         TYPE_EMAIL_TEST:
             'rhodecode:templates/email_templates/email_test.mako',
         TYPE_REGISTRATION:
             'rhodecode:templates/email_templates/user_registration.mako',
         TYPE_PASSWORD_RESET:
             'rhodecode:templates/email_templates/password_reset.mako',
         TYPE_PASSWORD_RESET_CONFIRMATION:
             'rhodecode:templates/email_templates/password_reset_confirmation.mako',
         TYPE_COMMIT_COMMENT:
             'rhodecode:templates/email_templates/commit_comment.mako',
         TYPE_PULL_REQUEST:
             'rhodecode:templates/email_templates/pull_request_review.mako',
         TYPE_PULL_REQUEST_COMMENT:
             'rhodecode:templates/email_templates/pull_request_comment.mako',
         TYPE_PULL_REQUEST_UPDATE:
             'rhodecode:templates/email_templates/pull_request_update.mako',
     }
 
     premailer_instance = premailer.Premailer(
         cssutils_logging_level=logging.ERROR,
         cssutils_logging_handler=logging.getLogger().handlers[0]
         if logging.getLogger().handlers else None,
     )
 
     def __init__(self):
         """
         Example usage::
 
             (subject, email_body, email_body_plaintext) = EmailNotificationModel().render_email(
                 EmailNotificationModel.TYPE_TEST, **email_kwargs)
 
         """
         super(EmailNotificationModel, self).__init__()
         self.rhodecode_instance_name = rhodecode.CONFIG.get('rhodecode_title')
 
     def _update_kwargs_for_render(self, kwargs):
         """
         Inject params required for Mako rendering
 
         :param kwargs:
         """
 
         kwargs['rhodecode_instance_name'] = self.rhodecode_instance_name
         kwargs['rhodecode_version'] = rhodecode.__version__
         instance_url = h.route_url('home')
         _kwargs = {
             'instance_url': instance_url,
             'whitespace_filter': self.whitespace_filter,
             'email_pr_update_subject_template': EMAIL_PR_UPDATE_SUBJECT_TEMPLATE,
             'email_pr_review_subject_template': EMAIL_PR_REVIEW_SUBJECT_TEMPLATE,
             'email_pr_comment_subject_template': EMAIL_PR_COMMENT_SUBJECT_TEMPLATE,
             'email_pr_comment_status_change_subject_template': EMAIL_PR_COMMENT_STATUS_CHANGE_SUBJECT_TEMPLATE,
             'email_pr_comment_file_subject_template': EMAIL_PR_COMMENT_FILE_SUBJECT_TEMPLATE,
             'email_comment_subject_template': EMAIL_COMMENT_SUBJECT_TEMPLATE,
             'email_comment_status_change_subject_template': EMAIL_COMMENT_STATUS_CHANGE_SUBJECT_TEMPLATE,
             'email_comment_file_subject_template': EMAIL_COMMENT_FILE_SUBJECT_TEMPLATE,
         }
         _kwargs.update(kwargs)
         return _kwargs
 
     def whitespace_filter(self, text):
         return text.replace('\n', '').replace('\t', '')
 
     def get_renderer(self, type_, request):
         template_name = self.email_types[type_]
         return request.get_partial_renderer(template_name)
 
     def render_email(self, type_, **kwargs):
         """
         renders template for email, and returns a tuple of
         (subject, email_headers, email_html_body, email_plaintext_body)
         """
         # translator and helpers inject
         _kwargs = self._update_kwargs_for_render(kwargs)
         request = get_current_request()
         email_template = self.get_renderer(type_, request=request)
 
         subject = email_template.render('subject', **_kwargs)
 
         try:
             body_plaintext = email_template.render('body_plaintext', **_kwargs)
         except AttributeError:
             # it's not defined in template, ok we can skip it
             body_plaintext = ''
 
         # render WHOLE template
         body = email_template.render(None, **_kwargs)
 
         try:
             # Inline CSS styles and conversion
             body = self.premailer_instance.transform(body)
         except Exception:
             log.exception('Failed to parse body with premailer')
             pass
 
         return subject, body, body_plaintext

rhodecode/model/update.py

@@ -1,83 +1,83 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2013-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 logging
 import urllib2
 from packaging.version import Version
 
 import rhodecode
 from rhodecode.lib.ext_json import json
 from rhodecode.model import BaseModel
 from rhodecode.model.meta import Session
 from rhodecode.model.settings import SettingsModel
 
 
 log = logging.getLogger(__name__)
 
 
 class UpdateModel(BaseModel):
     UPDATE_SETTINGS_KEY = 'update_version'
     UPDATE_URL_SETTINGS_KEY = 'rhodecode_update_url'
 
     @staticmethod
     def get_update_data(update_url):
         """Return the JSON update data."""
         ver = rhodecode.__version__
         log.debug('Checking for upgrade on `%s` server', update_url)
         opener = urllib2.build_opener()
         opener.addheaders = [('User-agent', 'RhodeCode-SCM/%s' % ver)]
         response = opener.open(update_url)
         response_data = response.read()
         data = json.loads(response_data)
         log.debug('update server returned data')
         return data
 
     def get_update_url(self):
         settings = SettingsModel().get_all_settings()
         return settings.get(self.UPDATE_URL_SETTINGS_KEY)
 
     def store_version(self, version):
         log.debug('Storing version %s into settings', version)
         setting = SettingsModel().create_or_update_setting(
             self.UPDATE_SETTINGS_KEY, version)
         Session().add(setting)
         Session().commit()
 
-    def get_stored_version(self):
+    def get_stored_version(self, fallback=None):
         obj = SettingsModel().get_setting_by_name(self.UPDATE_SETTINGS_KEY)
         if obj:
             return obj.app_settings_value
-        return '0.0.0'
+        return fallback or '0.0.0'
 
     def _sanitize_version(self, version):
         """
         Cleanup our custom ver.
         e.g 4.11.0_20171204_204825_CE_default_EE_default to 4.11.0
         """
         return version.split('_')[0]
 
     def is_outdated(self, cur_version, latest_version=None):
         latest_version = latest_version or self.get_stored_version()
         try:
             cur_version = self._sanitize_version(cur_version)
             return Version(latest_version) > Version(cur_version)
         except Exception:
             # could be invalid version, etc
             return False

rhodecode/public/js/src/rhodecode/comments.js

@@ -1,1502 +1,1639 b''
 // # 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/
 
 var firefoxAnchorFix = function() {
   // hack to make anchor links behave properly on firefox, in our inline
   // comments generation when comments are injected firefox is misbehaving
   // when jumping to anchor links
   if (location.href.indexOf('#') > -1) {
     location.href += '';
   }
 };
 
+
 var linkifyComments = function(comments) {
   var firstCommentId = null;
   if (comments) {
       firstCommentId = $(comments[0]).data('comment-id');
   }
 
   if (firstCommentId){
     $('#inline-comments-counter').attr('href', '#comment-' + firstCommentId);
   }
 };
 
+
 var bindToggleButtons = function() {
   $('.comment-toggle').on('click', function() {
         $(this).parent().nextUntil('tr.line').toggle('inline-comments');
   });
 };
 
 
-
 var _submitAjaxPOST = function(url, postData, successHandler, failHandler) {
     failHandler = failHandler || function() {};
     postData = toQueryString(postData);
     var request = $.ajax({
         url: url,
         type: 'POST',
         data: postData,
         headers: {'X-PARTIAL-XHR': true}
     })
     .done(function (data) {
         successHandler(data);
     })
     .fail(function (data, textStatus, errorThrown) {
         failHandler(data, textStatus, errorThrown)
     });
     return request;
 };
 
 
-
-
 /* Comment form for main and inline comments */
 (function(mod) {
 
     if (typeof exports == "object" && typeof module == "object") {
         // CommonJS
         module.exports = mod();
     }
     else {
         // Plain browser env
         (this || window).CommentForm = mod();
     }
 
 })(function() {
     "use strict";
 
     function CommentForm(formElement, commitId, pullRequestId, lineNo, initAutocompleteActions, resolvesCommentId, edit, comment_id) {
 
         if (!(this instanceof CommentForm)) {
             return new CommentForm(formElement, commitId, pullRequestId, lineNo, initAutocompleteActions, resolvesCommentId, edit, comment_id);
         }
 
         // bind the element instance to our Form
         $(formElement).get(0).CommentForm = this;
 
         this.withLineNo = function(selector) {
             var lineNo = this.lineNo;
             if (lineNo === undefined) {
                 return selector
             } else {
                 return selector + '_' + lineNo;
             }
         };
 
         this.commitId = commitId;
         this.pullRequestId = pullRequestId;
         this.lineNo = lineNo;
         this.initAutocompleteActions = initAutocompleteActions;
 
         this.previewButton = this.withLineNo('#preview-btn');
         this.previewContainer = this.withLineNo('#preview-container');
 
         this.previewBoxSelector = this.withLineNo('#preview-box');
 
         this.editButton = this.withLineNo('#edit-btn');
         this.editContainer = this.withLineNo('#edit-container');
         this.cancelButton = this.withLineNo('#cancel-btn');
         this.commentType = this.withLineNo('#comment_type');
 
         this.resolvesId = null;
         this.resolvesActionId = null;
 
         this.closesPr = '#close_pull_request';
 
         this.cmBox = this.withLineNo('#text');
         this.cm = initCommentBoxCodeMirror(this, this.cmBox, this.initAutocompleteActions);
 
         this.statusChange = this.withLineNo('#change_status');
 
         this.submitForm = formElement;
 
         this.submitButton = $(this.submitForm).find('.submit-comment-action');
         this.submitButtonText = this.submitButton.val();
 
         this.submitDraftButton = $(this.submitForm).find('.submit-draft-action');
         this.submitDraftButtonText = this.submitDraftButton.val();
 
         this.previewUrl = pyroutes.url('repo_commit_comment_preview',
             {'repo_name': templateContext.repo_name,
              'commit_id': templateContext.commit_data.commit_id});
 
         if (edit){
             this.submitDraftButton.hide();
             this.submitButtonText = _gettext('Update Comment');
             $(this.commentType).prop('disabled', true);
             $(this.commentType).addClass('disabled');
             var editInfo =
                 '';
             $(editInfo).insertBefore($(this.editButton).parent());
         }
 
         if (resolvesCommentId){
             this.resolvesId = '#resolve_comment_{0}'.format(resolvesCommentId);
             this.resolvesActionId = '#resolve_comment_action_{0}'.format(resolvesCommentId);
             $(this.commentType).prop('disabled', true);
             $(this.commentType).addClass('disabled');
 
             // disable select
             setTimeout(function() {
                 $(self.statusChange).select2('readonly', true);
             }, 10);
 
             var resolvedInfo = (
                 '<li class="resolve-action">' +
                 '<input type="hidden" id="resolve_comment_{0}" name="resolve_comment_{0}" value="{0}">' +
                 '<button id="resolve_comment_action_{0}" class="resolve-text btn btn-sm" onclick="return Rhodecode.comments.submitResolution({0})">{1} #{0}</button>' +
                 '</li>'
             ).format(resolvesCommentId, _gettext('resolve comment'));
             $(resolvedInfo).insertAfter($(this.commentType).parent());
         }
 
         // based on commitId, or pullRequestId decide where do we submit
         // out data
         if (this.commitId){
             var pyurl = 'repo_commit_comment_create';
             if(edit){
                 pyurl = 'repo_commit_comment_edit';
             }
             this.submitUrl = pyroutes.url(pyurl,
                 {'repo_name': templateContext.repo_name,
                  'commit_id': this.commitId,
                  'comment_id': comment_id});
             this.selfUrl = pyroutes.url('repo_commit',
                 {'repo_name': templateContext.repo_name,
                  'commit_id': this.commitId});
 
         } else if (this.pullRequestId) {
             var pyurl = 'pullrequest_comment_create';
             if(edit){
                 pyurl = 'pullrequest_comment_edit';
             }
             this.submitUrl = pyroutes.url(pyurl,
                 {'repo_name': templateContext.repo_name,
                  'pull_request_id': this.pullRequestId,
                  'comment_id': comment_id});
             this.selfUrl = pyroutes.url('pullrequest_show',
                 {'repo_name': templateContext.repo_name,
                  'pull_request_id': this.pullRequestId});
 
         } else {
             throw new Error(
                 'CommentForm requires pullRequestId, or commitId to be specified.')
         }
 
         // FUNCTIONS and helpers
         var self = this;
 
         this.isInline = function(){
             return this.lineNo && this.lineNo != 'general';
         };
 
         this.getCmInstance = function(){
             return this.cm
         };
 
         this.setPlaceholder = function(placeholder) {
             var cm = this.getCmInstance();
             if (cm){
                 cm.setOption('placeholder', placeholder);
             }
         };
 
         this.getCommentStatus = function() {
           return $(this.submitForm).find(this.statusChange).val();
         };
 
         this.getCommentType = function() {
           return $(this.submitForm).find(this.commentType).val();
         };
 
         this.getDraftState = function () {
             var submitterElem = $(this.submitForm).find('input[type="submit"].submitter');
             var data = $(submitterElem).data('isDraft');
             return data
         }
 
         this.getResolvesId = function() {
             return $(this.submitForm).find(this.resolvesId).val() || null;
         };
 
         this.getClosePr = function() {
             return $(this.submitForm).find(this.closesPr).val() || null;
         };
 
         this.markCommentResolved = function(resolvedCommentId){
-            $('#comment-label-{0}'.format(resolvedCommentId)).find('.resolved').show();
-            $('#comment-label-{0}'.format(resolvedCommentId)).find('.resolve').hide();
+            Rhodecode.comments.markCommentResolved(resolvedCommentId)
         };
 
         this.isAllowedToSubmit = function() {
             var commentDisabled = $(this.submitButton).prop('disabled');
             var draftDisabled = $(this.submitDraftButton).prop('disabled');
             return !commentDisabled && !draftDisabled;
         };
 
         this.initStatusChangeSelector = function(){
             var formatChangeStatus = function(state, escapeMarkup) {
                 var originalOption = state.element;
                 var tmpl = '<i class="icon-circle review-status-{0}"></i><span>{1}</span>'.format($(originalOption).data('status'), escapeMarkup(state.text));
                 return tmpl
             };
             var formatResult = function(result, container, query, escapeMarkup) {
                 return formatChangeStatus(result, escapeMarkup);
             };
 
             var formatSelection = function(data, container, escapeMarkup) {
                 return formatChangeStatus(data, escapeMarkup);
             };
 
             $(this.submitForm).find(this.statusChange).select2({
                 placeholder: _gettext('Status Review'),
                 formatResult: formatResult,
                 formatSelection: formatSelection,
                 containerCssClass: "drop-menu status_box_menu",
                 dropdownCssClass: "drop-menu-dropdown",
                 dropdownAutoWidth: true,
                 minimumResultsForSearch: -1
             });
 
             $(this.submitForm).find(this.statusChange).on('change', function() {
                 var status = self.getCommentStatus();
 
                 if (status && !self.isInline()) {
                     $(self.submitButton).prop('disabled', false);
                     $(self.submitDraftButton).prop('disabled', false);
                 }
 
                 var placeholderText = _gettext('Comment text will be set automatically based on currently selected status ({0}) ...').format(status);
                 self.setPlaceholder(placeholderText)
             })
         };
 
         // reset the comment form into it's original state
         this.resetCommentFormState = function(content) {
             content = content || '';
 
             $(this.editContainer).show();
             $(this.editButton).parent().addClass('active');
 
             $(this.previewContainer).hide();
             $(this.previewButton).parent().removeClass('active');
 
             this.setActionButtonsDisabled(true);
             self.cm.setValue(content);
             self.cm.setOption("readOnly", false);
 
             if (this.resolvesId) {
                 // destroy the resolve action
                 $(this.resolvesId).parent().remove();
             }
             // reset closingPR flag
             $('.close-pr-input').remove();
 
             $(this.statusChange).select2('readonly', false);
         };
 
         this.globalSubmitSuccessCallback = function(comment){
             // default behaviour is to call GLOBAL hook, if it's registered.
             if (window.commentFormGlobalSubmitSuccessCallback !== undefined){
                 commentFormGlobalSubmitSuccessCallback(comment);
             }
         };
 
         this.submitAjaxPOST = function(url, postData, successHandler, failHandler) {
             return _submitAjaxPOST(url, postData, successHandler, failHandler);
         };
 
         // overwrite a submitHandler, we need to do it for inline comments
         this.setHandleFormSubmit = function(callback) {
             this.handleFormSubmit = callback;
         };
 
         // overwrite a submitSuccessHandler
         this.setGlobalSubmitSuccessCallback = function(callback) {
             this.globalSubmitSuccessCallback = callback;
         };
 
         // default handler for for submit for main comments
         this.handleFormSubmit = function() {
             var text = self.cm.getValue();
             var status = self.getCommentStatus();
             var commentType = self.getCommentType();
             var isDraft = self.getDraftState();
             var resolvesCommentId = self.getResolvesId();
             var closePullRequest = self.getClosePr();
 
             if (text === "" && !status) {
                 return;
             }
 
             var excludeCancelBtn = false;
             var submitEvent = true;
             self.setActionButtonsDisabled(true, excludeCancelBtn, submitEvent);
             self.cm.setOption("readOnly", true);
 
             var postData = {
                 'text': text,
                 'changeset_status': status,
                 'comment_type': commentType,
                 'csrf_token': CSRF_TOKEN
             };
 
             if (resolvesCommentId) {
                 postData['resolves_comment_id'] = resolvesCommentId;
             }
 
             if (closePullRequest) {
                 postData['close_pull_request'] = true;
             }
 
             // submitSuccess for general comments
             var submitSuccessCallback = function(json_data) {
                 // reload page if we change status for single commit.
                 if (status && self.commitId) {
                     location.reload(true);
                 } else {
                     // inject newly created comments, json_data is {<comment_id>: {}}
                     Rhodecode.comments.attachGeneralComment(json_data)
 
                     self.resetCommentFormState();
                     timeagoActivate();
                     tooltipActivate();
 
                     // mark visually which comment was resolved
                     if (resolvesCommentId) {
                         self.markCommentResolved(resolvesCommentId);
                     }
                 }
 
                 // run global callback on submit
                 self.globalSubmitSuccessCallback({draft: isDraft, comment_id: comment_id});
 
             };
             var submitFailCallback = function(jqXHR, textStatus, errorThrown) {
                 var prefix = "Error while submitting comment.\n"
                 var message = formatErrorMessage(jqXHR, textStatus, errorThrown, prefix);
                 ajaxErrorSwal(message);
                 self.resetCommentFormState(text);
             };
             self.submitAjaxPOST(
                 self.submitUrl, postData, submitSuccessCallback, submitFailCallback);
         };
 
         this.previewSuccessCallback = function(o) {
             $(self.previewBoxSelector).html(o);
             $(self.previewBoxSelector).removeClass('unloaded');
 
             // swap buttons, making preview active
             $(self.previewButton).parent().addClass('active');
             $(self.editButton).parent().removeClass('active');
 
             // unlock buttons
             self.setActionButtonsDisabled(false);
         };
 
         this.setActionButtonsDisabled = function(state, excludeCancelBtn, submitEvent) {
             excludeCancelBtn = excludeCancelBtn || false;
             submitEvent = submitEvent || false;
 
             $(this.editButton).prop('disabled', state);
             $(this.previewButton).prop('disabled', state);
 
             if (!excludeCancelBtn) {
                 $(this.cancelButton).prop('disabled', state);
             }
 
             var submitState = state;
             if (!submitEvent && this.getCommentStatus() && !self.isInline()) {
                 // if the value of commit review status is set, we allow
                 // submit button, but only on Main form, isInline means inline
                 submitState = false
             }
 
             $(this.submitButton).prop('disabled', submitState);
             $(this.submitDraftButton).prop('disabled', submitState);
 
             if (submitEvent) {
               var isDraft = self.getDraftState();
 
               if (isDraft) {
                 $(this.submitDraftButton).val(_gettext('Saving Draft...'));
               }  else {
                 $(this.submitButton).val(_gettext('Submitting...'));
               }
 
             } else {
               $(this.submitButton).val(this.submitButtonText);
               $(this.submitDraftButton).val(this.submitDraftButtonText);
             }
 
         };
 
         // lock preview/edit/submit buttons on load, but exclude cancel button
         var excludeCancelBtn = true;
         this.setActionButtonsDisabled(true, excludeCancelBtn);
 
         // anonymous users don't have access to initialized CM instance
         if (this.cm !== undefined){
             this.cm.on('change', function(cMirror) {
                 if (cMirror.getValue() === "") {
                     self.setActionButtonsDisabled(true, excludeCancelBtn)
                 } else {
                     self.setActionButtonsDisabled(false, excludeCancelBtn)
                 }
             });
         }
 
         $(this.editButton).on('click', function(e) {
             e.preventDefault();
 
             $(self.previewButton).parent().removeClass('active');
             $(self.previewContainer).hide();
 
             $(self.editButton).parent().addClass('active');
             $(self.editContainer).show();
 
         });
 
         $(this.previewButton).on('click', function(e) {
             e.preventDefault();
             var text = self.cm.getValue();
 
             if (text === "") {
                 return;
             }
 
             var postData = {
                 'text': text,
                 'renderer': templateContext.visual.default_renderer,
                 'csrf_token': CSRF_TOKEN
             };
 
             // lock ALL buttons on preview
             self.setActionButtonsDisabled(true);
 
             $(self.previewBoxSelector).addClass('unloaded');
             $(self.previewBoxSelector).html(_gettext('Loading ...'));
 
             $(self.editContainer).hide();
             $(self.previewContainer).show();
 
             // by default we reset state of comment preserving the text
             var previewFailCallback = function(jqXHR, textStatus, errorThrown) {
                 var prefix = "Error while preview of comment.\n"
                 var message = formatErrorMessage(jqXHR, textStatus, errorThrown, prefix);
                 ajaxErrorSwal(message);
 
                 self.resetCommentFormState(text)
             };
             self.submitAjaxPOST(
                 self.previewUrl, postData, self.previewSuccessCallback,
                 previewFailCallback);
 
             $(self.previewButton).parent().addClass('active');
             $(self.editButton).parent().removeClass('active');
         });
 
         $(this.submitForm).submit(function(e) {
             e.preventDefault();
             var allowedToSubmit = self.isAllowedToSubmit();
             if (!allowedToSubmit){
                return false;
             }
 
             self.handleFormSubmit();
         });
 
     }
 
     return CommentForm;
 });
 
 /* selector for comment versions */
 var initVersionSelector = function(selector, initialData) {
 
     var formatResult = function(result, container, query, escapeMarkup) {
 
         return renderTemplate('commentVersion', {
             show_disabled: true,
             version: result.comment_version,
             user_name: result.comment_author_username,
             gravatar_url: result.comment_author_gravatar,
             size: 16,
             timeago_component: result.comment_created_on,
         })
     };
 
     $(selector).select2({
         placeholder: "Edited",
         containerCssClass: "drop-menu-comment-history",
         dropdownCssClass: "drop-menu-dropdown",
         dropdownAutoWidth: true,
         minimumResultsForSearch: -1,
         data: initialData,
         formatResult: formatResult,
     });
 
     $(selector).on('select2-selecting', function (e) {
         // hide the mast as we later do preventDefault()
         $("#select2-drop-mask").click();
         e.preventDefault();
         e.choice.action();
     });
 
     $(selector).on("select2-open", function() {
         timeagoActivate();
     });
 };
 
 /* comments controller */
 var CommentsController = function() {
   var mainComment = '#text';
   var self = this;
 
   this.showVersion = function (comment_id, comment_history_id) {
 
        var historyViewUrl = pyroutes.url(
            'repo_commit_comment_history_view',
            {
                'repo_name': templateContext.repo_name,
                'commit_id': comment_id,
                'comment_history_id': comment_history_id,
            }
        );
        successRenderCommit = function (data) {
            SwalNoAnimation.fire({
                html: data,
                title: '',
            });
        };
        failRenderCommit = function () {
            SwalNoAnimation.fire({
                html: 'Error while loading comment history',
                title: '',
            });
        };
        _submitAjaxPOST(
            historyViewUrl, {'csrf_token': CSRF_TOKEN},
            successRenderCommit,
            failRenderCommit
        );
   };
 
   this.getLineNumber = function(node) {
       var $node = $(node);
       var lineNo = $node.closest('td').attr('data-line-no');
       if (lineNo === undefined && $node.data('commentInline')){
           lineNo = $node.data('commentLineNo')
       }
 
       return lineNo
   };
 
   this.scrollToComment = function(node, offset, outdated) {
     if (offset === undefined) {
       offset = 0;
     }
     var outdated = outdated || false;
     var klass = outdated ? 'div.comment-outdated' : 'div.comment-current';
 
     if (!node) {
       node = $('.comment-selected');
       if (!node.length) {
         node = $('comment-current')
       }
     }
 
     $wrapper = $(node).closest('div.comment');
 
     // show hidden comment when referenced.
     if (!$wrapper.is(':visible')){
         $wrapper.show();
     }
 
     $comment = $(node).closest(klass);
     $comments = $(klass);
 
     $('.comment-selected').removeClass('comment-selected');
 
     var nextIdx = $(klass).index($comment) + offset;
     if (nextIdx >= $comments.length) {
       nextIdx = 0;
     }
     var $next = $(klass).eq(nextIdx);
 
     var $cb = $next.closest('.cb');
     $cb.removeClass('cb-collapsed');
 
     var $filediffCollapseState = $cb.closest('.filediff').prev();
     $filediffCollapseState.prop('checked', false);
     $next.addClass('comment-selected');
     scrollToElement($next);
     return false;
   };
 
   this.nextComment = function(node) {
     return self.scrollToComment(node, 1);
   };
 
   this.prevComment = function(node) {
     return self.scrollToComment(node, -1);
   };
 
   this.nextOutdatedComment = function(node) {
     return self.scrollToComment(node, 1, true);
   };
 
   this.prevOutdatedComment = function(node) {
     return self.scrollToComment(node, -1, true);
   };
 
   this.cancelComment = function (node) {
       var $node = $(node);
       var edit = $(this).attr('edit');
       var $inlineComments = $node.closest('div.inline-comments');
 
       if (edit) {
           var $general_comments = null;
           if (!$inlineComments.length) {
               $general_comments = $('#comments');
               var $comment = $general_comments.parent().find('div.comment:hidden');
               // show hidden general comment form
               $('#cb-comment-general-form-placeholder').show();
           } else {
               var $comment = $inlineComments.find('div.comment:hidden');
           }
           $comment.show();
       }
       var $replyWrapper = $node.closest('.comment-inline-form').closest('.reply-thread-container-wrapper')
       $replyWrapper.removeClass('comment-form-active');
 
       var lastComment = $inlineComments.find('.comment-inline').last();
       if ($(lastComment).hasClass('comment-outdated')) {
         $replyWrapper.hide();
       }
 
       $node.closest('.comment-inline-form').remove();
       return false;
   };
 
   this._deleteComment = function(node) {
       var $node = $(node);
       var $td = $node.closest('td');
       var $comment = $node.closest('.comment');
       var comment_id = $($comment).data('commentId');
       var isDraft = $($comment).data('commentDraft');
 
       var pullRequestId = templateContext.pull_request_data.pull_request_id;
       var commitId = templateContext.commit_data.commit_id;
 
       if (pullRequestId) {
           var url = pyroutes.url('pullrequest_comment_delete', {"comment_id": comment_id, "repo_name": templateContext.repo_name, "pull_request_id": pullRequestId})
       } else if (commitId) {
           var url = pyroutes.url('repo_commit_comment_delete', {"comment_id": comment_id, "repo_name": templateContext.repo_name, "commit_id": commitId})
       }
 
       var postData = {
         'csrf_token': CSRF_TOKEN
       };
 
       $comment.addClass('comment-deleting');
       $comment.hide('fast');
 
       var success = function(response) {
         $comment.remove();
 
         if (window.updateSticky !== undefined) {
             // potentially our comments change the active window size, so we
             // notify sticky elements
             updateSticky()
         }
 
         if (window.refreshAllComments !== undefined && !isDraft) {
           // if we have this handler, run it, and refresh all comments boxes
           refreshAllComments()
         }
         else if (window.refreshDraftComments !== undefined && isDraft) {
           // if we have this handler, run it, and refresh all comments boxes
           refreshDraftComments();
         }
         return false;
       };
 
       var failure = function(jqXHR, textStatus, errorThrown) {
         var prefix = "Error while deleting this comment.\n"
         var message = formatErrorMessage(jqXHR, textStatus, errorThrown, prefix);
         ajaxErrorSwal(message);
 
         $comment.show('fast');
         $comment.removeClass('comment-deleting');
         return false;
       };
       ajaxPOST(url, postData, success, failure);
 
   }
 
   this.deleteComment = function(node) {
     var $comment = $(node).closest('.comment');
     var comment_id = $comment.attr('data-comment-id');
 
     SwalNoAnimation.fire({
       title: 'Delete this comment?',
       icon: 'warning',
       showCancelButton: true,
       confirmButtonText: _gettext('Yes, delete comment #{0}!').format(comment_id),
 
     }).then(function(result) {
       if (result.value) {
         self._deleteComment(node);
       }
     })
   };
 
   this._finalizeDrafts = function(commentIds) {
 
     var pullRequestId = templateContext.pull_request_data.pull_request_id;
     var commitId = templateContext.commit_data.commit_id;
 
     if (pullRequestId) {
           var url = pyroutes.url('pullrequest_draft_comments_submit', {"repo_name": templateContext.repo_name, "pull_request_id": pullRequestId})
     } else if (commitId) {
           var url = pyroutes.url('commit_draft_comments_submit', {"repo_name": templateContext.repo_name, "commit_id": commitId})
     }
 
     // remove the drafts so we can lock them before submit.
     $.each(commentIds, function(idx, val){
         $('#comment-{0}'.format(val)).remove();
     })
 
     var postData = {'comments': commentIds, 'csrf_token': CSRF_TOKEN};
 
     var submitSuccessCallback = function(json_data) {
         self.attachInlineComment(json_data);
 
         if (window.refreshDraftComments !== undefined) {
           // if we have this handler, run it, and refresh all comments boxes
           refreshDraftComments()
         }
 
         return false;
     };
 
     ajaxPOST(url, postData, submitSuccessCallback)
 
   }
 
   this.finalizeDrafts = function(commentIds, callback) {
 
     SwalNoAnimation.fire({
       title: _ngettext('Submit {0} draft comment.', 'Submit {0} draft comments.', commentIds.length).format(commentIds.length),
       icon: 'warning',
       showCancelButton: true,
       confirmButtonText: _gettext('Yes'),
 
     }).then(function(result) {
       if (result.value) {
         if (callback !== undefined) {
             callback(result)
         }
         self._finalizeDrafts(commentIds);
       }
     })
   };
 
   this.toggleWideMode = function (node) {
 
       if ($('#content').hasClass('wrapper')) {
           $('#content').removeClass("wrapper");
           $('#content').addClass("wide-mode-wrapper");
           $(node).addClass('btn-success');
           return true
       } else {
           $('#content').removeClass("wide-mode-wrapper");
           $('#content').addClass("wrapper");
           $(node).removeClass('btn-success');
           return false
       }
 
   };
 
   /**
    * Turn off/on all comments in file diff
    */
   this.toggleDiffComments = function(node) {
     // Find closes filediff container
     var $filediff = $(node).closest('.filediff');
     if ($(node).hasClass('toggle-on')) {
         var show = false;
     } else if ($(node).hasClass('toggle-off')) {
         var show = true;
     }
 
     // Toggle each individual comment block, so we can un-toggle single ones
     $.each($filediff.find('.toggle-comment-action'), function(idx, val) {
         self.toggleLineComments($(val), show)
     })
 
     // since we change the height of the diff container that has anchor points for upper
     // sticky header, we need to tell it to re-calculate those
     if (window.updateSticky !== undefined) {
         // potentially our comments change the active window size, so we
         // notify sticky elements
         updateSticky()
     }
 
     return false;
   }
 
   this.toggleLineComments = function(node, show) {
 
     var trElem = $(node).closest('tr')
 
     if (show === true) {
         // mark outdated comments as visible before the toggle;
         $(trElem).find('.comment-outdated').show();
         $(trElem).removeClass('hide-line-comments');
     } else if (show === false) {
         $(trElem).find('.comment-outdated').hide();
         $(trElem).addClass('hide-line-comments');
     } else {
         // mark outdated comments as visible before the toggle;
         $(trElem).find('.comment-outdated').show();
         $(trElem).toggleClass('hide-line-comments');
     }
 
     // since we change the height of the diff container that has anchor points for upper
     // sticky header, we need to tell it to re-calculate those
     if (window.updateSticky !== undefined) {
         // potentially our comments change the active window size, so we
         // notify sticky elements
         updateSticky()
     }
 
   };
 
   this.createCommentForm = function(formElement, lineno, placeholderText, initAutocompleteActions, resolvesCommentId, edit, comment_id){
       var pullRequestId = templateContext.pull_request_data.pull_request_id;
       var commitId = templateContext.commit_data.commit_id;
 
       var commentForm = new CommentForm(
           formElement, commitId, pullRequestId, lineno, initAutocompleteActions, resolvesCommentId, edit, comment_id);
       var cm = commentForm.getCmInstance();
 
       if (resolvesCommentId){
         placeholderText = _gettext('Leave a resolution comment, or click resolve button to resolve TODO comment #{0}').format(resolvesCommentId);
       }
 
       setTimeout(function() {
           // callbacks
           if (cm !== undefined) {
               commentForm.setPlaceholder(placeholderText);
               if (commentForm.isInline()) {
                 cm.focus();
                 cm.refresh();
               }
           }
       }, 10);
 
       // trigger scrolldown to the resolve comment, since it might be away
       // from the clicked
       if (resolvesCommentId){
         var actionNode = $(commentForm.resolvesActionId).offset();
 
         setTimeout(function() {
             if (actionNode) {
                 $('body, html').animate({scrollTop: actionNode.top}, 10);
             }
         }, 100);
       }
 
         // add dropzone support
         var insertAttachmentText = function (cm, attachmentName, attachmentStoreUrl, isRendered) {
             var renderer = templateContext.visual.default_renderer;
             if (renderer == 'rst') {
                 var attachmentUrl = '`#{0} <{1}>`_'.format(attachmentName, attachmentStoreUrl);
                 if (isRendered){
                     attachmentUrl = '\n.. image:: {0}'.format(attachmentStoreUrl);
                 }
             } else if (renderer == 'markdown') {
                 var attachmentUrl = '[{0}]({1})'.format(attachmentName, attachmentStoreUrl);
                 if (isRendered){
                     attachmentUrl = '!' + attachmentUrl;
                 }
             } else {
                 var attachmentUrl = '{}'.format(attachmentStoreUrl);
             }
             cm.replaceRange(attachmentUrl+'\n', CodeMirror.Pos(cm.lastLine()));
 
             return false;
         };
 
         //see: https://www.dropzonejs.com/#configuration
         var storeUrl = pyroutes.url('repo_commit_comment_attachment_upload',
             {'repo_name': templateContext.repo_name,
                      'commit_id': templateContext.commit_data.commit_id})
 
         var previewTmpl = $(formElement).find('.comment-attachment-uploader-template').get(0);
         if (previewTmpl !== undefined){
             var selectLink = $(formElement).find('.pick-attachment').get(0);
             $(formElement).find('.comment-attachment-uploader').dropzone({
                 url: storeUrl,
                 headers: {"X-CSRF-Token": CSRF_TOKEN},
                 paramName: function () {
                     return "attachment"
                 }, // The name that will be used to transfer the file
                 clickable: selectLink,
                 parallelUploads: 1,
                 maxFiles: 10,
                 maxFilesize: templateContext.attachment_store.max_file_size_mb,
                 uploadMultiple: false,
                 autoProcessQueue: true, // if false queue will not be processed automatically.
                 createImageThumbnails: false,
                 previewTemplate: previewTmpl.innerHTML,
 
                 accept: function (file, done) {
                     done();
                 },
                 init: function () {
 
                     this.on("sending", function (file, xhr, formData) {
                         $(formElement).find('.comment-attachment-uploader').find('.dropzone-text').hide();
                         $(formElement).find('.comment-attachment-uploader').find('.dropzone-upload').show();
                     });
 
                     this.on("success", function (file, response) {
                         $(formElement).find('.comment-attachment-uploader').find('.dropzone-text').show();
                         $(formElement).find('.comment-attachment-uploader').find('.dropzone-upload').hide();
 
                         var isRendered = false;
                         var ext = file.name.split('.').pop();
                         var imageExts = templateContext.attachment_store.image_ext;
                         if (imageExts.indexOf(ext) !== -1){
                             isRendered = true;
                         }
 
                         insertAttachmentText(cm, file.name, response.repo_fqn_access_path, isRendered)
                     });
 
                     this.on("error", function (file, errorMessage, xhr) {
                         $(formElement).find('.comment-attachment-uploader').find('.dropzone-upload').hide();
 
                         var error = null;
 
                         if (xhr !== undefined){
                             var httpStatus = xhr.status + " " + xhr.statusText;
                             if (xhr !== undefined && xhr.status >= 500) {
                                 error = httpStatus;
                             }
                         }
 
                         if (error === null) {
                             error = errorMessage.error || errorMessage || httpStatus;
                         }
                         $(file.previewElement).find('.dz-error-message').html('ERROR: {0}'.format(error));
 
                     });
                 }
             });
         }
       return commentForm;
   };
 
   this.createGeneralComment = function (lineNo, placeholderText, resolvesCommentId) {
 
       var tmpl = $('#cb-comment-general-form-template').html();
       tmpl = tmpl.format(null, 'general');
       var $form = $(tmpl);
 
       var $formPlaceholder = $('#cb-comment-general-form-placeholder');
       var curForm = $formPlaceholder.find('form');
       if (curForm){
           curForm.remove();
       }
       $formPlaceholder.append($form);
 
       var _form = $($form[0]);
       var autocompleteActions = ['approve', 'reject', 'as_note', 'as_todo'];
       var edit = false;
       var comment_id = null;
       var commentForm = this.createCommentForm(
           _form, lineNo, placeholderText, autocompleteActions, resolvesCommentId, edit, comment_id);
       commentForm.initStatusChangeSelector();
 
       return commentForm;
   };
 
   this.editComment = function(node, line_no, f_path) {
       self.edit = true;
       var $node = $(node);
       var $td = $node.closest('td');
 
       var $comment = $(node).closest('.comment');
       var comment_id = $($comment).data('commentId');
       var isDraft = $($comment).data('commentDraft');
       var $editForm = null
 
       var $comments = $node.closest('div.inline-comments');
       var $general_comments = null;
 
       if($comments.length){
           // inline comments setup
           $editForm = $comments.find('.comment-inline-form');
           line_no = self.getLineNumber(node)
       }
       else{
           // general comments setup
           $comments = $('#comments');
           $editForm = $comments.find('.comment-inline-form');
           line_no = $comment[0].id
           $('#cb-comment-general-form-placeholder').hide();
       }
 
       if ($editForm.length === 0) {
 
           // unhide all comments if they are hidden for a proper REPLY mode
           var $filediff = $node.closest('.filediff');
           $filediff.removeClass('hide-comments');
 
           $editForm = self.createNewFormWrapper(f_path, line_no);
           if(f_path && line_no) {
             $editForm.addClass('comment-inline-form-edit')
           }
 
           $comment.after($editForm)
 
           var _form = $($editForm[0]).find('form');
           var autocompleteActions = ['as_note',];
           var commentForm = this.createCommentForm(
               _form, line_no, '', autocompleteActions, resolvesCommentId,
               this.edit, comment_id);
           var old_comment_text_binary = $comment.attr('data-comment-text');
           var old_comment_text = b64DecodeUnicode(old_comment_text_binary);
           commentForm.cm.setValue(old_comment_text);
           $comment.hide();
           tooltipActivate();
 
            // set a CUSTOM submit handler for inline comment edit action.
            commentForm.setHandleFormSubmit(function(o) {
               var text = commentForm.cm.getValue();
               var commentType = commentForm.getCommentType();
 
               if (text === "") {
                 return;
               }
 
               if (old_comment_text == text) {
                   SwalNoAnimation.fire({
                       title: 'Unable to edit comment',
                       html: _gettext('Comment body was not changed.'),
                   });
                   return;
               }
               var excludeCancelBtn = false;
               var submitEvent = true;
               commentForm.setActionButtonsDisabled(true, excludeCancelBtn, submitEvent);
               commentForm.cm.setOption("readOnly", true);
 
               // Read last version known
               var versionSelector = $('#comment_versions_{0}'.format(comment_id));
               var version = versionSelector.data('lastVersion');
 
               if (!version) {
                 version = 0;
               }
 
               var postData = {
                   'text': text,
                   'f_path': f_path,
                   'line': line_no,
                   'comment_type': commentType,
                   'draft': isDraft,
                   'version': version,
                   'csrf_token': CSRF_TOKEN
               };
 
               var submitSuccessCallback = function(json_data) {
                 $editForm.remove();
                 $comment.show();
                 var postData = {
                     'text': text,
                     'renderer': $comment.attr('data-comment-renderer'),
                     'csrf_token': CSRF_TOKEN
                 };
 
                 /* Inject new edited version selector */
                 var updateCommentVersionDropDown = function () {
                     var versionSelectId = '#comment_versions_'+comment_id;
                     var preLoadVersionData = [
                         {
                             id: json_data['comment_version'],
                             text: "v{0}".format(json_data['comment_version']),
                             action: function () {
                                 Rhodecode.comments.showVersion(
                                     json_data['comment_id'],
                                     json_data['comment_history_id']
                                 )
                             },
                             comment_version: json_data['comment_version'],
                             comment_author_username: json_data['comment_author_username'],
                             comment_author_gravatar: json_data['comment_author_gravatar'],
                             comment_created_on: json_data['comment_created_on'],
                         },
                     ]
 
 
                     if ($(versionSelectId).data('select2')) {
                         var oldData = $(versionSelectId).data('select2').opts.data.results;
                         $(versionSelectId).select2("destroy");
                         preLoadVersionData = oldData.concat(preLoadVersionData)
                     }
 
                     initVersionSelector(versionSelectId, {results: preLoadVersionData});
 
                     $comment.attr('data-comment-text', utf8ToB64(text));
 
                     var versionSelector = $('#comment_versions_'+comment_id);
 
                     // set lastVersion so we know our last edit version
                     versionSelector.data('lastVersion', json_data['comment_version'])
                     versionSelector.parent().show();
                 }
                 updateCommentVersionDropDown();
 
                 // by default we reset state of comment preserving the text
                 var failRenderCommit = function(jqXHR, textStatus, errorThrown) {
                     var prefix = "Error while editing this comment.\n"
                     var message = formatErrorMessage(jqXHR, textStatus, errorThrown, prefix);
                     ajaxErrorSwal(message);
                 };
 
                 var successRenderCommit = function(o){
                     $comment.show();
                     $comment[0].lastElementChild.innerHTML = o;
                 };
 
                 var previewUrl = pyroutes.url(
                     'repo_commit_comment_preview',
              {'repo_name': templateContext.repo_name,
                     'commit_id': templateContext.commit_data.commit_id});
 
                 _submitAjaxPOST(
                     previewUrl, postData, successRenderCommit, failRenderCommit
                 );
 
                 try {
                   var html = json_data.rendered_text;
                   var lineno = json_data.line_no;
                   var target_id = json_data.target_id;
 
                   $comments.find('.cb-comment-add-button').before(html);
 
                  //  run global callback on submit
                   commentForm.globalSubmitSuccessCallback({draft: isDraft, comment_id: comment_id});
 
                 } catch (e) {
                   console.error(e);
                 }
 
                 // re trigger the linkification of next/prev navigation
                 linkifyComments($('.inline-comment-injected'));
                 timeagoActivate();
                 tooltipActivate();
 
                 if (window.updateSticky !== undefined) {
                     // potentially our comments change the active window size, so we
                     // notify sticky elements
                     updateSticky()
                 }
 
                 if (window.refreshAllComments !== undefined && !isDraft) {
                       // if we have this handler, run it, and refresh all comments boxes
                       refreshAllComments()
                 }
                else if (window.refreshDraftComments !== undefined && isDraft) {
                   // if we have this handler, run it, and refresh all comments boxes
                   refreshDraftComments();
                }
 
                 commentForm.setActionButtonsDisabled(false);
 
               };
 
               var submitFailCallback = function(jqXHR, textStatus, errorThrown) {
                   var prefix = "Error while editing comment.\n"
                   var message = formatErrorMessage(jqXHR, textStatus, errorThrown, prefix);
                   if (jqXHR.status == 409){
                     message = 'This comment was probably changed somewhere else. Please reload the content of this comment.'
                     ajaxErrorSwal(message, 'Comment version mismatch.');
                   } else {
                     ajaxErrorSwal(message);
                   }
 
                   commentForm.resetCommentFormState(text)
               };
               commentForm.submitAjaxPOST(
                   commentForm.submitUrl, postData,
                   submitSuccessCallback,
                   submitFailCallback);
             });
       }
 
       $editForm.addClass('comment-inline-form-open');
   };
 
   this.attachComment = function(json_data) {
     var self = this;
     $.each(json_data, function(idx, val) {
         var json_data_elem = [val]
         var isInline = val.comment_f_path && val.comment_lineno
 
         if (isInline) {
             self.attachInlineComment(json_data_elem)
         }  else {
             self.attachGeneralComment(json_data_elem)
         }
     })
 
   }
 
   this.attachGeneralComment = function(json_data) {
     $.each(json_data, function(idx, val) {
         $('#injected_page_comments').append(val.rendered_text);
     })
   }
 
   this.attachInlineComment = function(json_data) {
 
     $.each(json_data, function (idx, val) {
         var line_qry = '*[data-line-no="{0}"]'.format(val.line_no);
         var html = val.rendered_text;
         var $inlineComments = $('#' + val.target_id)
                 .find(line_qry)
                 .find('.inline-comments');
 
         var lastComment = $inlineComments.find('.comment-inline').last();
 
         if (lastComment.length === 0) {
             // first comment, we append simply
             $inlineComments.find('.reply-thread-container-wrapper').before(html);
         } else {
             $(lastComment).after(html)
         }
 
     })
 
   };
 
   this.createNewFormWrapper = function(f_path, line_no) {
       // create a new reply HTML form from template
       var tmpl = $('#cb-comment-inline-form-template').html();
       tmpl = tmpl.format(escapeHtml(f_path), line_no);
       return $(tmpl);
   }
 
+  this.markCommentResolved = function(commentId) {
+    $('#comment-label-{0}'.format(commentId)).find('.resolved').show();
+    $('#comment-label-{0}'.format(commentId)).find('.resolve').hide();
+  };
+
   this.createComment = function(node, f_path, line_no, resolutionComment) {
       self.edit = false;
       var $node = $(node);
       var $td = $node.closest('td');
       var resolvesCommentId = resolutionComment || null;
 
       var $replyForm = $td.find('.comment-inline-form');
 
       // if form isn't existing, we're generating a new one and injecting it.
       if ($replyForm.length === 0) {
 
           // unhide/expand all comments if they are hidden for a proper REPLY mode
           self.toggleLineComments($node, true);
 
           $replyForm = self.createNewFormWrapper(f_path, line_no);
 
           var $comments = $td.find('.inline-comments');
 
           // 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 $reply_container = $('#cb-comments-inline-container-template')
             $reply_container.find('button.cb-comment-add-button').replaceWith(replBtn);
             $td.append($($reply_container).html());
           }
 
           // default comment button exists, so we prepend the form for leaving initial comment
           $td.find('.cb-comment-add-button').before($replyForm);
           // set marker, that we have a open form
           var $replyWrapper = $td.find('.reply-thread-container-wrapper')
           $replyWrapper.addClass('comment-form-active');
 
           var lastComment = $comments.find('.comment-inline').last();
           if ($(lastComment).hasClass('comment-outdated')) {
             $replyWrapper.show();
           }
 
           var _form = $($replyForm[0]).find('form');
           var autocompleteActions = ['as_note', 'as_todo'];
           var comment_id=null;
           var placeholderText = _gettext('Leave a comment on file {0} line {1}.').format(f_path, line_no);
           var commentForm = self.createCommentForm(
               _form, line_no, placeholderText, autocompleteActions, resolvesCommentId,
               self.edit, comment_id);
 
           // set a CUSTOM submit handler for inline comments.
           commentForm.setHandleFormSubmit(function(o) {
             var text = commentForm.cm.getValue();
             var commentType = commentForm.getCommentType();
             var resolvesCommentId = commentForm.getResolvesId();
             var isDraft = commentForm.getDraftState();
 
             if (text === "") {
               return;
             }
 
             if (line_no === undefined) {
               alert('Error: unable to fetch line number for this inline comment !');
               return;
             }
 
             if (f_path === undefined) {
               alert('Error: unable to fetch file path for this inline comment !');
               return;
             }
 
             var excludeCancelBtn = false;
             var submitEvent = true;
             commentForm.setActionButtonsDisabled(true, excludeCancelBtn, submitEvent);
             commentForm.cm.setOption("readOnly", true);
             var postData = {
                 'text': text,
                 'f_path': f_path,
                 'line': line_no,
                 'comment_type': commentType,
                 'draft': isDraft,
                 'csrf_token': CSRF_TOKEN
             };
             if (resolvesCommentId){
                 postData['resolves_comment_id'] = resolvesCommentId;
             }
 
             // submitSuccess for inline commits
             var submitSuccessCallback = function(json_data) {
 
                 $replyForm.remove();
                 $td.find('.reply-thread-container-wrapper').removeClass('comment-form-active');
 
                 try {
 
                     // inject newly created comments, json_data is {<comment_id>: {}}
                     self.attachInlineComment(json_data)
 
                     //mark visually which comment was resolved
                     if (resolvesCommentId) {
-                        commentForm.markCommentResolved(resolvesCommentId);
+                        self.markCommentResolved(resolvesCommentId);
                     }
 
                     // run global callback on submit
                     commentForm.globalSubmitSuccessCallback({
                         draft: isDraft,
                         comment_id: comment_id
                     });
 
                 } catch (e) {
                     console.error(e);
                 }
 
               if (window.updateSticky !== undefined) {
                   // potentially our comments change the active window size, so we
                   // notify sticky elements
                   updateSticky()
               }
 
               if (window.refreshAllComments !== undefined && !isDraft) {
                   // if we have this handler, run it, and refresh all comments boxes
                   refreshAllComments()
               }
               else if (window.refreshDraftComments !== undefined && isDraft) {
                   // if we have this handler, run it, and refresh all comments boxes
                   refreshDraftComments();
               }
 
               commentForm.setActionButtonsDisabled(false);
 
               // re trigger the linkification of next/prev navigation
               linkifyComments($('.inline-comment-injected'));
               timeagoActivate();
               tooltipActivate();
             };
 
             var submitFailCallback = function(jqXHR, textStatus, errorThrown) {
                 var prefix = "Error while submitting comment.\n"
                 var message = formatErrorMessage(jqXHR, textStatus, errorThrown, prefix);
                 ajaxErrorSwal(message);
                 commentForm.resetCommentFormState(text)
             };
 
             commentForm.submitAjaxPOST(
                 commentForm.submitUrl, postData, submitSuccessCallback, submitFailCallback);
           });
       }
 
       // Finally "open" our reply form, since we know there are comments and we have the "attached" old form
       $replyForm.addClass('comment-inline-form-open');
       tooltipActivate();
   };
 
   this.createResolutionComment = function(commentId){
     // hide the trigger text
     $('#resolve-comment-{0}'.format(commentId)).hide();
 
     var comment = $('#comment-'+commentId);
     var commentData = comment.data();
-    console.log(commentData);
 
     if (commentData.commentInline) {
         var f_path = commentData.commentFPath;
         var line_no = commentData.commentLineNo;
         this.createComment(comment, f_path, line_no, commentId)
     } else {
         this.createGeneralComment('general', "$placeholder", commentId)
     }
 
     return false;
   };
 
   this.submitResolution = function(commentId){
     var form = $('#resolve_comment_{0}'.format(commentId)).closest('form');
     var commentForm = form.get(0).CommentForm;
 
     var cm = commentForm.getCmInstance();
     var renderer = templateContext.visual.default_renderer;
     if (renderer == 'rst'){
         var commentUrl = '`#{0} <{1}#comment-{0}>`_'.format(commentId, commentForm.selfUrl);
     } else if (renderer == 'markdown') {
         var commentUrl = '[#{0}]({1}#comment-{0})'.format(commentId, commentForm.selfUrl);
     } else {
         var commentUrl = '{1}#comment-{0}'.format(commentId, commentForm.selfUrl);
     }
 
     cm.setValue(_gettext('TODO from comment {0} was fixed.').format(commentUrl));
     form.submit();
     return false;
   };
 
+  this.resolveTodo = function (elem, todoId) {
+      var commentId = todoId;
+
+      SwalNoAnimation.fire({
+          title: 'Resolve TODO {0}'.format(todoId),
+          showCancelButton: true,
+          confirmButtonText: _gettext('Yes'),
+          showLoaderOnConfirm: true,
+
+          allowOutsideClick: function () {
+              !Swal.isLoading()
+          },
+          preConfirm: function () {
+              var comment = $('#comment-' + commentId);
+              var commentData = comment.data();
+
+              var f_path = null
+              var line_no = null
+              if (commentData.commentInline) {
+                  f_path = commentData.commentFPath;
+                  line_no = commentData.commentLineNo;
+              }
+
+              var renderer = templateContext.visual.default_renderer;
+              var commentBoxUrl = '{1}#comment-{0}'.format(commentId);
+
+              // Pull request case
+              if (templateContext.pull_request_data.pull_request_id !== null) {
+                  var commentUrl = pyroutes.url('pullrequest_comment_create',
+                          {
+                              'repo_name': templateContext.repo_name,
+                              'pull_request_id': templateContext.pull_request_data.pull_request_id,
+                              'comment_id': commentId
+                          });
+              } else {
+                  var commentUrl = pyroutes.url('repo_commit_comment_create',
+                          {
+                              'repo_name': templateContext.repo_name,
+                              'commit_id': templateContext.commit_data.commit_id,
+                              'comment_id': commentId
+                          });
+              }
+
+              if (renderer === 'rst') {
+                  commentBoxUrl = '`#{0} <{1}#comment-{0}>`_'.format(commentId, commentUrl);
+              } else if (renderer === 'markdown') {
+                  commentBoxUrl = '[#{0}]({1}#comment-{0})'.format(commentId, commentUrl);
+              }
+              var resolveText = _gettext('TODO from comment {0} was fixed.').format(commentBoxUrl);
+
+              var postData = {
+                  text: resolveText,
+                  comment_type: 'note',
+                  draft: false,
+                  csrf_token: CSRF_TOKEN,
+                  resolves_comment_id: commentId
+              }
+              if (commentData.commentInline) {
+                  postData['f_path'] = f_path;
+                  postData['line'] = line_no;
+              }
+
+              return new Promise(function (resolve, reject) {
+                  $.ajax({
+                      type: 'POST',
+                      data: postData,
+                      url: commentUrl,
+                      headers: {'X-PARTIAL-XHR': true}
+                  })
+                  .done(function (data) {
+                      resolve(data);
+                  })
+                  .fail(function (jqXHR, textStatus, errorThrown) {
+                      var prefix = "Error while resolving TODO.\n"
+                      var message = formatErrorMessage(jqXHR, textStatus, errorThrown, prefix);
+                      ajaxErrorSwal(message);
+                  });
+              })
+          }
+
+      })
+      .then(function (result) {
+          var success = function (json_data) {
+              resolvesCommentId = commentId;
+              var commentResolved = json_data[Object.keys(json_data)[0]]
+
+              try {
+
+                  if (commentResolved.f_path) {
+                      // inject newly created comments, json_data is {<comment_id>: {}}
+                      self.attachInlineComment(json_data)
+                  } else {
+                      self.attachGeneralComment(json_data)
+                  }
+
+                  //mark visually which comment was resolved
+                  if (resolvesCommentId) {
+                      self.markCommentResolved(resolvesCommentId);
+                  }
+
+                  // run global callback on submit
+                  if (window.commentFormGlobalSubmitSuccessCallback !== undefined) {
+                      commentFormGlobalSubmitSuccessCallback({
+                          draft: false,
+                          comment_id: commentId
+                      });
+                  }
+
+              } catch (e) {
+                  console.error(e);
+              }
+
+              if (window.updateSticky !== undefined) {
+                  // potentially our comments change the active window size, so we
+                  // notify sticky elements
+                  updateSticky()
+              }
+
+              if (window.refreshAllComments !== undefined) {
+                  // if we have this handler, run it, and refresh all comments boxes
+                  refreshAllComments()
+              }
+              // re trigger the linkification of next/prev navigation
+              linkifyComments($('.inline-comment-injected'));
+              timeagoActivate();
+              tooltipActivate();
+          };
+
+          if (result.value) {
+            $(elem).remove();
+            success(result.value)
+          }
+      })
+  };
+
 };
 
 window.commentHelp = function(renderer) {
     var funcData = {'renderer': renderer}
     return renderTemplate('commentHelpHovercard', funcData)
-}
  No newline at end of file
+}

rhodecode/templates/admin/settings/settings_visual.mako

@@ -1,230 +1,233 b''
 ${h.secure_form(h.route_path('admin_settings_visual_update'), request=request)}
 
 <div class="panel panel-default">
     <div class="panel-heading" id="general">
         <h3 class="panel-title">${_('General')}</h3>
     </div>
     <div class="panel-body">
         <div class="checkbox">
             ${h.checkbox('rhodecode_repository_fields','True')}
             <label for="rhodecode_repository_fields">${_('Use repository extra fields')}</label>
         </div>
         <span class="help-block">${_('Allows storing additional customized fields per repository.')}</span>
 
         <div></div>
         <div class="checkbox">
             ${h.checkbox('rhodecode_show_version','True')}
             <label for="rhodecode_show_version">${_('Show RhodeCode version')}</label>
         </div>
         <span class="help-block">${_('Shows or hides a version number of RhodeCode displayed in the footer.')}</span>
     </div>
 </div>
 
 
 <div class="panel panel-default">
     <div class="panel-heading" id="gravatars">
         <h3 class="panel-title">${_('Gravatars')}</h3>
     </div>
     <div class="panel-body">
         <div class="checkbox">
             ${h.checkbox('rhodecode_use_gravatar','True')}
             <label for="rhodecode_use_gravatar">${_('Use Gravatars based avatars')}</label>
         </div>
         <span class="help-block">${_('Use gravatar.com as avatar system for RhodeCode accounts. If this is disabled avatars are generated based on initials and email.')}</span>
 
         <div class="label">
             <label for="rhodecode_gravatar_url">${_('Gravatar URL')}</label>
         </div>
         <div class="input">
             <div class="field">
                 ${h.text('rhodecode_gravatar_url', size='100%')}
             </div>
 
             <div class="field">
             <span class="help-block">${_('''Gravatar url allows you to use other avatar server application.
                                             Following variables of the URL will be replaced accordingly.
                                             {scheme}    'http' or 'https' sent from running RhodeCode server,
                                             {email}     user email,
                                             {md5email}  md5 hash of the user email (like at gravatar.com),
                                             {size}      size of the image that is expected from the server application,
                                             {netloc}    network location/server host of running RhodeCode server''')}</span>
             </div>
         </div>
     </div>
 </div>
 
 
 <div class="panel panel-default">
     <div class="panel-heading" id="meta-tagging">
         <h3 class="panel-title">${_('Meta-Tagging')}</h3>
     </div>
     <div class="panel-body">
         <div class="checkbox">
             ${h.checkbox('rhodecode_stylify_metatags','True')}
             <label for="rhodecode_stylify_metatags">${_('Stylify recognised meta tags')}</label>
         </div>
         <span class="help-block">${_('Parses meta tags from repository or repository group description fields and turns them into colored tags.')}</span>
         <div>
             <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
             ${dt.metatags_help()}
         </div>
     </div>
 </div>
 
 
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">${_('Dashboard Items')}</h3>
     </div>
     <div class="panel-body">
         <div class="label">
             <label for="rhodecode_dashboard_items">${_('Main page dashboard items')}</label>
         </div>
         <div class="field input">
             ${h.text('rhodecode_dashboard_items',size=5)}
         </div>
         <div class="field">
             <span class="help-block">${_('Number of items displayed in the main page dashboard before pagination is shown.')}</span>
         </div>
 
         <div class="label">
             <label for="rhodecode_admin_grid_items">${_('Admin pages items')}</label>
         </div>
         <div class="field input">
             ${h.text('rhodecode_admin_grid_items',size=5)}
         </div>
         <div class="field">
             <span class="help-block">${_('Number of items displayed in the admin pages grids before pagination is shown.')}</span>
         </div>
     </div>
 </div>
 
 
 
 <div class="panel panel-default">
     <div class="panel-heading" id="commit-id">
         <h3 class="panel-title">${_('Commit ID Style')}</h3>
     </div>
     <div class="panel-body">
         <div class="label">
             <label for="rhodecode_show_sha_length">${_('Commit sha length')}</label>
         </div>
         <div class="input">
             <div class="field">
                 ${h.text('rhodecode_show_sha_length',size=5)}
             </div>
             <div class="field">
                 <span class="help-block">${_('''Number of chars to show in commit sha displayed in web interface.
                                                 By default it's shown as r123:9043a6a4c226 this value defines the
                                                 length of the sha after the `r123:` part.''')}</span>
             </div>
         </div>
 
         <div class="checkbox">
             ${h.checkbox('rhodecode_show_revision_number','True')}
             <label for="rhodecode_show_revision_number">${_('Show commit ID numeric reference')} / ${_('Commit show revision number')}</label>
         </div>
         <span class="help-block">${_('''Show revision number in commit sha displayed in web interface.
                                         By default it's shown as r123:9043a6a4c226 this value defines the
                                         if the `r123:` part is shown.''')}</span>
     </div>
 </div>
 
 
 <div class="panel panel-default">
     <div class="panel-heading" id="icons">
         <h3 class="panel-title">${_('Icons')}</h3>
     </div>
     <div class="panel-body">
         <div class="checkbox">
             ${h.checkbox('rhodecode_show_public_icon','True')}
             <label for="rhodecode_show_public_icon">${_('Show public repo icon on repositories')}</label>
         </div>
         <div></div>
 
         <div class="checkbox">
             ${h.checkbox('rhodecode_show_private_icon','True')}
             <label for="rhodecode_show_private_icon">${_('Show private repo icon on repositories')}</label>
         </div>
         <span class="help-block">${_('Show public/private icons next to repositories names.')}</span>
     </div>
 </div>
 
 
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">${_('Markup Renderer')}</h3>
     </div>
     <div class="panel-body">
         <div class="field select">
             ${h.select('rhodecode_markup_renderer', '', ['rst', 'markdown'])}
         </div>
         <div class="field">
             <span class="help-block">${_('Default renderer used to render comments, pull request descriptions and other description elements. After change old entries will still work correctly.')}</span>
         </div>
     </div>
 </div>
 
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">${_('Clone URL templates')}</h3>
     </div>
     <div class="panel-body">
         <div class="field">
            ${h.text('rhodecode_clone_uri_tmpl', size=60)} HTTP[S]
         </div>
         <div class="field">
+            ${h.text('rhodecode_clone_uri_id_tmpl', size=60)} HTTP UID
+        </div>
+        <div class="field">
            ${h.text('rhodecode_clone_uri_ssh_tmpl', size=60)} SSH
         </div>
         <div class="field">
             <span class="help-block">
                 ${_('''Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:
                        {scheme} 'http' or 'https' sent from running RhodeCode server,
                        {user}   current user username,
                        {sys_user} current system user running this process, Useful for ssh,
                        {hostname} hostname of this server running RhodeCode,
                        {netloc} network location/server host of running RhodeCode server,
                        {repo}   full repository name,
                        {repoid} ID of repository, can be used to contruct clone-by-id''')}
             </span>
         </div>
     </div>
 </div>
 
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">${_('Custom Support Link')}</h3>
     </div>
     <div class="panel-body">
         <div class="field">
             ${h.text('rhodecode_support_url', size=60)}
         </div>
         <div class="field">
             <span class="help-block">
                 ${_('''Custom url for the support link located at the bottom.
                     The default is set to %(default_url)s. In case there's a need
                     to change the support link to internal issue tracker, it should be done here.
                     ''') % {'default_url': h.route_url('rhodecode_support')}}
             </span>
         </div>
     </div>
 </div>
 
 <div class="buttons">
     ${h.submit('save',_('Save settings'),class_="btn")}
     ${h.reset('reset',_('Reset'),class_="btn")}
 </div>
 
 
 ${h.end_form()}
 
 <script>
 $(document).ready(function() {
     $('#rhodecode_markup_renderer').select2({
         containerCssClass: 'drop-menu',
         dropdownCssClass: 'drop-menu-dropdown',
         dropdownAutoWidth: true,
         minimumResultsForSearch: -1
     });
 });
 </script>

rhodecode/templates/ejs_templates/templates.html

@@ -1,270 +1,278 b''
 <%text>
 <div style="display: none">
 
 <script>
 var CG = new ColorGenerator();
 </script>
 
 <script id="ejs_gravatarWithUser" type="text/template" class="ejsTemplate">
 
 <%
 if (size > 16) {
     var gravatar_class = 'gravatar gravatar-large';
 } else {
     var gravatar_class = 'gravatar';
 }
 
 if (tooltip) {
     var gravatar_class = gravatar_class + ' tooltip-hovercard';
 }
 
 var data_hovercard_alt = username;
 
 %>
 
 <%
 if (show_disabled) {
     var user_cls = 'user user-disabled';
 } else {
     var user_cls = 'user';
 }
 var data_hovercard_url = pyroutes.url('hovercard_user', {"user_id": user_id})
 %>
 
 <div class="rc-user">
     <img class="<%= gravatar_class %>" height="<%= size %>" width="<%= size %>" data-hovercard-url="<%= data_hovercard_url %>" data-hovercard-alt="<%= data_hovercard_alt %>" src="<%- gravatar_url -%>">
     <span class="<%= user_cls %>"> <%- user_link -%> </span>
 </div>
 
 </script>
 
 <script id="ejs_reviewMemberEntry" type="text/template" class="ejsTemplate">
     <%
         if (create) {
             var edit_visibility = 'visible';
         } else {
             var edit_visibility = 'hidden';
         }
 
         if (member.user_group && member.user_group.vote_rule) {
             var reviewGroup = '<i class="icon-user-group"></i>';
             var reviewGroupColor = CG.asRGB(CG.getColor(member.user_group.vote_rule));
         } else {
             var reviewGroup = null;
             var reviewGroupColor = 'transparent';
         }
         var rule_show = rule_show || false;
 
         if (rule_show) {
             var rule_visibility = 'table-cell';
         } else {
             var rule_visibility = 'none';
         }
 
     %>
 
 <tr id="reviewer_<%= member.user_id %>" class="reviewer_entry" tooltip="Review Group" data-reviewer-user-id="<%= member.user_id %>">
 
     <% if (create) { %>
     <td style="width: 1px"></td>
     <% } else { %>
     <td style="width: 20px">
         <div class="tooltip presence-state" style="display: none; position: absolute; left: 2px" title="This users is currently at this page">
           <i class="icon-eye" style="color: #0ac878"></i>
         </div>
         <% if (role === 'reviewer') { %>
         <div class="reviewer_status tooltip" title="<%= review_status_label %>">
           <i class="icon-circle review-status-<%= review_status %>"></i>
         </div>
         <% }  else if (role === 'observer') { %>
         <div class="tooltip" title="Observer without voting right.">
         <i class="icon-circle-thin"></i>
         </div>
         <% } %>
     </td>
     <% } %>
 
 
     <% if (mandatory) { %>
     <td style="text-align: right;width: 10px;">
         <div class="reviewer_member_mandatory tooltip" title="Mandatory reviewer">
             <i class="icon-lock"></i>
         </div>
     </td>
 
     <% } else { %>
     <td style="text-align: right;width: 10px;">
         <% if (allowed_to_update) { %>
           <div class="<%=role %>_member_remove" onclick="reviewersController.removeMember(<%= member.user_id %>, true)" style="visibility: <%= edit_visibility %>;">
               <i class="icon-remove" style="color: #e85e4d;"></i>
           </div>
         <% } %>
     </td>
     <% } %>
 
     <td>
       <div id="reviewer_<%= member.user_id %>_name" class="reviewer_name">
         <%-
           renderTemplate('gravatarWithUser', {
             'size': 16,
             'show_disabled': false,
             'tooltip': true,
             'username': member.username,
             'user_id': member.user_id,
             'user_link': member.user_link,
             'gravatar_url':  member.gravatar_link
             })
         %>
       </div>
     <% if (reviewGroup !== null) { %>
         <span class="tooltip" title="Member of review group from rule: `<%= member.user_group.name %>`" style="color: <%= reviewGroupColor %>">
         <%- reviewGroup %>
         </span>
     <% } %>
     </td>
 
 </tr>
 
 <tr id="reviewer_<%= member.user_id %>_rules">
     <td colspan="4" style="display: <%= rule_visibility %>" class="pr-user-rule-container">
       <input type="hidden" name="__start__" value="reviewer:mapping">
 
         <%if (member.user_group && member.user_group.vote_rule) { %>
             <div class="reviewer_reason">
 
               <%if (member.user_group.vote_rule == -1) {%>
                - group votes required: ALL
               <%} else {%>
                - group votes required: <%= member.user_group.vote_rule %>
               <%}%>
             </div>
         <%} %>
 
         <input type="hidden" name="__start__" value="reasons:sequence">
           <% for (var i = 0; i < reasons.length; i++) { %>
               <% var reason = reasons[i] %>
               <div class="reviewer_reason">- <%= reason %></div>
               <input type="hidden" name="reason" value="<%= reason %>">
           <% } %>
           <input type="hidden" name="__end__" value="reasons:sequence">
 
           <input type="hidden" name="__start__" value="rules:sequence">
           <% for (var i = 0; i < member.rules.length; i++) { %>
               <% var rule = member.rules[i] %>
               <input type="hidden" name="rule_id" value="<%= rule %>">
           <% } %>
           <input type="hidden" name="__end__" value="rules:sequence">
 
           <input id="reviewer_<%= member.user_id %>_input" type="hidden" value="<%= member.user_id %>" name="user_id" />
           <input type="hidden" name="mandatory" value="<%= mandatory %>"/>
           <input type="hidden" name="role" value="<%= role %>"/>
 
       <input type="hidden" name="__end__" value="reviewer:mapping">
     </td>
 </tr>
 
 </script>
 
 <script id="ejs_commentVersion" type="text/template" class="ejsTemplate">
 
 <%
 if (size > 16) {
     var gravatar_class = 'gravatar gravatar-large';
 } else {
     var gravatar_class = 'gravatar';
 }
 
 %>
 
 <%
 if (show_disabled) {
     var user_cls = 'user user-disabled';
 } else {
     var user_cls = 'user';
 }
 
 %>
 
 <div style='line-height: 20px'>
     <img style="margin: -3px 0" class="<%= gravatar_class %>" height="<%= size %>" width="<%= size %>" src="<%- gravatar_url -%>">
     <strong><%- user_name -%></strong>, <code>v<%- version -%></code> edited <%- timeago_component -%>
 </div>
 
 </script>
 
 
 <script id="ejs_sideBarCommentHovercard" type="text/template" class="ejsTemplate">
 
 <div>
 
     <% if (is_todo) { %>
         <% if (inline) { %>
             <strong>Inline</strong> TODO (<code>#<%- comment_id -%></code>) on line: <%= line_no %>
             <% if (version_info) { %>
                 <%= version_info %>
             <% } %>
             <br/>
             File: <code><%- file_name -%></code>
         <% } else { %>
             <% if (review_status) { %>
                 <i class="icon-circle review-status-<%= review_status %>"></i>
             <% } %>
             <strong>General</strong> TODO (<code>#<%- comment_id -%></code>)
             <% if (version_info) { %>
                 <%= version_info %>
             <% } %>
         <% } %>
     <% } else { %>
         <% if (inline) { %>
             <strong>Inline</strong> comment (<code>#<%- comment_id -%></code>) on line: <%= line_no %>
             <% if (version_info) { %>
                 <%= version_info %>
             <% } %>
             <br/>
             File: <code><%- file_name -%></code>
         <% } else { %>
             <% if (review_status) { %>
                 <i class="icon-circle review-status-<%= review_status %>"></i>
             <% } %>
             <strong>General</strong> comment (<code>#<%- comment_id -%></code>)
             <% if (version_info) { %>
                 <%= version_info %>
             <% } %>
         <% } %>
     <% } %>
     <br/>
     Created:
     <time class="timeago" title="<%= created_on %>" datetime="<%= datetime %>"><%= $.timeago(datetime) %></time>
 
+    <% if (is_todo) { %>
+    <div style="text-align: center; padding-top: 5px">
+    <a class="btn btn-sm" href="#resolveTodo<%- comment_id -%>" onclick="Rhodecode.comments.resolveTodo(this, '<%- comment_id -%>'); return false">
+        <strong>Resolve TODO</strong>
+    </a>
+    </div>
+    <% } %>
+
 </div>
 
 </script>
 
 <script id="ejs_commentHelpHovercard" type="text/template" class="ejsTemplate">
 
 <div>
 Use <strong>@username</strong> mention syntax to send direct notification to this RhodeCode user.<br/>
 Typing / starts autocomplete for certain action, e.g set review status, or comment type. <br/>
 <br/>
 Use <strong>Cmd/ctrl+enter</strong> to submit comment, or <strong>Shift+Cmd/ctrl+enter</strong> to submit a draft.<br/>
 <br/>
 <strong>Draft comments</strong> are private to the author, and trigger no notification to others.<br/>
 They are permanent until deleted, or converted to regular comments.<br/>
 <br/>
 <br/>
 </div>
 
 </script>
 
 
 
 ##// END OF EJS Templates
 </div>
 
 
 <script>
     // registers the templates into global cache
     registerTemplates();
 </script>
 
 </%text>

rhodecode/templates/email_templates/pull_request_comment.mako

@@ -1,206 +1,205 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 <%namespace name="base" file="base.mako"/>
 
 ## EMAIL SUBJECT
 <%def name="subject()" filter="n,trim,whitespace_filter">
 <%
 data = {
     'user': '@'+h.person(user),
     'repo_name': repo_name,
     'status': status_change,
     'comment_file': comment_file,
     'comment_line': comment_line,
     'comment_type': comment_type,
     'comment_id': comment_id,
 
-    'pr_title': pull_request.title,
+    'pr_title': pull_request.title_safe,
     'pr_id': pull_request.pull_request_id,
     'mention_prefix': '[mention] ' if mention else '',
 }
 
 if comment_file:
     subject_template = email_pr_comment_file_subject_template or \
     _('{mention_prefix}{user} left a {comment_type} on file `{comment_file}` in pull request !{pr_id}: "{pr_title}"').format(**data)
 else:
     if status_change:
         subject_template = email_pr_comment_status_change_subject_template or \
         _('{mention_prefix}[status: {status}] {user} left a {comment_type} on pull request !{pr_id}: "{pr_title}"').format(**data)
     else:
         subject_template = email_pr_comment_subject_template or \
         _('{mention_prefix}{user} left a {comment_type} on pull request !{pr_id}: "{pr_title}"').format(**data)
 %>
 
-
 ${subject_template.format(**data) |n}
 </%def>
 
 ## PLAINTEXT VERSION OF BODY
 <%def name="body_plaintext()" filter="n,trim">
 <%
 data = {
     'user': h.person(user),
     'repo_name': repo_name,
     'status': status_change,
     'comment_file': comment_file,
     'comment_line': comment_line,
     'comment_type': comment_type,
     'comment_id': comment_id,
 
-    'pr_title': pull_request.title,
+    'pr_title': pull_request.title_safe,
     'pr_id': pull_request.pull_request_id,
     'source_ref_type': pull_request.source_ref_parts.type,
     'source_ref_name': pull_request.source_ref_parts.name,
     'target_ref_type': pull_request.target_ref_parts.type,
     'target_ref_name': pull_request.target_ref_parts.name,
     'source_repo': pull_request_source_repo.repo_name,
     'target_repo': pull_request_target_repo.repo_name,
     'source_repo_url': pull_request_source_repo_url,
     'target_repo_url': pull_request_target_repo_url,
 }
 %>
 
 * ${_('Comment link')}: ${pr_comment_url}
 
 * ${_('Pull Request')}: !${pull_request.pull_request_id}
 
 * ${h.literal(_('Commit flow: {source_ref_type}:{source_ref_name} of {source_repo_url} into {target_ref_type}:{target_ref_name} of {target_repo_url}').format(**data))}
 
 %if status_change and not closing_pr:
 * ${_('{user} submitted pull request !{pr_id} status: *{status}*').format(**data)}
 
 %elif status_change and closing_pr:
 * ${_('{user} submitted pull request !{pr_id} status: *{status} and closed*').format(**data)}
 
 %endif
 %if comment_file:
 * ${_('File: {comment_file} on line {comment_line}').format(**data)}
 
 %endif
 % if comment_type == 'todo':
 ${('Inline' if comment_file else 'General')} ${_('`TODO` number')} ${comment_id}:
 % else:
 ${('Inline' if comment_file else 'General')} ${_('`Note` number')} ${comment_id}:
 % endif
 
 ${comment_body |n, trim}
 
 ---
 ${self.plaintext_footer()}
 </%def>
 
 
 <%
 data = {
     'user': h.person(user),
     'comment_file': comment_file,
     'comment_line': comment_line,
     'comment_type': comment_type,
     'comment_id': comment_id,
     'renderer_type': renderer_type or 'plain',
 
-    'pr_title': pull_request.title,
+    'pr_title': pull_request.title_safe,
     'pr_id': pull_request.pull_request_id,
     'status': status_change,
     'source_ref_type': pull_request.source_ref_parts.type,
     'source_ref_name': pull_request.source_ref_parts.name,
     'target_ref_type': pull_request.target_ref_parts.type,
     'target_ref_name': pull_request.target_ref_parts.name,
     'source_repo': pull_request_source_repo.repo_name,
     'target_repo': pull_request_target_repo.repo_name,
     'source_repo_url': h.link_to(pull_request_source_repo.repo_name, pull_request_source_repo_url),
     'target_repo_url': h.link_to(pull_request_target_repo.repo_name, pull_request_target_repo_url),
 }
 %>
 
 ## header
 <table style="text-align:left;vertical-align:middle;width: 100%">
     <tr>
     <td style="width:100%;border-bottom:1px solid #dbd9da;">
 
         <div style="margin: 0; font-weight: bold">
             <div class="clear-both" style="margin-bottom: 4px">
                 <span style="color:#7E7F7F">@${h.person(user.username)}</span>
                 ${_('left a')}
                 <a href="${pr_comment_url}" style="${base.link_css()}">
                     % if comment_file:
                         ${_('{comment_type} on file `{comment_file}` in pull request.').format(**data)}
                     % else:
                         ${_('{comment_type} on pull request.').format(**data) |n}
                     % endif
                 </a>
             </div>
             <div style="margin-top: 10px"></div>
             ${_('Pull request')} <code>!${data['pr_id']}: ${data['pr_title']}</code>
         </div>
 
     </td>
     </tr>
 
 </table>
 <div class="clear-both"></div>
 ## main body
 <table style="text-align:left;vertical-align:middle;width: 100%">
 
     ## spacing def
     <tr>
         <td style="width: 130px"></td>
         <td></td>
     </tr>
 
     % if status_change:
     <tr>
         <td style="padding-right:20px;">${_('Review Status')}:</td>
         <td>
             % if closing_pr:
                ${_('Closed pull request with status')}: ${base.status_text(status_change, tag_type=status_change_type)}
             % else:
                ${_('Submitted review status')}: ${base.status_text(status_change, tag_type=status_change_type)}
             % endif
         </td>
     </tr>
     % endif
     <tr>
         <td style="padding-right:20px;">${_('Pull request')}:</td>
         <td>
             <a href="${pull_request_url}" style="${base.link_css()}">
             !${pull_request.pull_request_id}
             </a>
         </td>
     </tr>
 
     <tr>
         <td style="padding-right:20px;line-height:20px;">${_('Commit Flow')}:</td>
         <td style="line-height:20px;">
             <code>${'{}:{}'.format(data['source_ref_type'], pull_request.source_ref_parts.name)}</code> ${_('of')} ${data['source_repo_url']}
             &rarr;
             <code>${'{}:{}'.format(data['target_ref_type'], pull_request.target_ref_parts.name)}</code> ${_('of')}  ${data['target_repo_url']}
         </td>
     </tr>
 
     % if comment_file:
         <tr>
             <td style="padding-right:20px;">${_('File')}:</td>
             <td><a href="${pr_comment_url}" style="${base.link_css()}">${_('`{comment_file}` on line {comment_line}').format(**data)}</a></td>
         </tr>
     % endif
 
     <tr style="border-bottom:1px solid #dbd9da;">
         <td colspan="2" style="padding-right:20px;">
             % if comment_type == 'todo':
                 ${('Inline' if comment_file else 'General')} ${_('`TODO` number')} ${comment_id}:
             % else:
                 ${('Inline' if comment_file else 'General')} ${_('`Note` number')} ${comment_id}:
             % endif
         </td>
     </tr>
 
     <tr>
         <td colspan="2" style="background: #F7F7F7">${h.render(comment_body, renderer=data['renderer_type'], mentions=True)}</td>
     </tr>
 
     <tr>
         <td><a href="${pr_comment_reply_url}">${_('Reply')}</a></td>
         <td></td>
     </tr>
 </table>

rhodecode/templates/email_templates/pull_request_review.mako

@@ -1,154 +1,154 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 <%namespace name="base" file="base.mako"/>
 
 ## EMAIL SUBJECT
 <%def name="subject()" filter="n,trim,whitespace_filter">
 <%
 data = {
     'user': '@'+h.person(user),
     'pr_id': pull_request.pull_request_id,
-    'pr_title': pull_request.title,
+    'pr_title': pull_request.title_safe,
 }
 
 if user_role == 'observer':
     subject_template = email_pr_review_subject_template or _('{user} added you as observer to pull request. !{pr_id}: "{pr_title}"')
 else:
     subject_template = email_pr_review_subject_template or _('{user} requested a pull request review. !{pr_id}: "{pr_title}"')
 %>
 
 ${subject_template.format(**data) |n}
 </%def>
 
 ## PLAINTEXT VERSION OF BODY
 <%def name="body_plaintext()" filter="n,trim">
 <%
 data = {
     'user': h.person(user),
     'pr_id': pull_request.pull_request_id,
-    'pr_title': pull_request.title,
+    'pr_title': pull_request.title_safe,
     'source_ref_type': pull_request.source_ref_parts.type,
     'source_ref_name': pull_request.source_ref_parts.name,
     'target_ref_type': pull_request.target_ref_parts.type,
     'target_ref_name': pull_request.target_ref_parts.name,
     'repo_url': pull_request_source_repo_url,
     'source_repo': pull_request_source_repo.repo_name,
     'target_repo': pull_request_target_repo.repo_name,
     'source_repo_url': pull_request_source_repo_url,
     'target_repo_url': pull_request_target_repo_url,
 }
 
 %>
 
 * ${_('Pull Request link')}: ${pull_request_url}
 
 * ${h.literal(_('Commit flow: {source_ref_type}:{source_ref_name} of {source_repo_url} into {target_ref_type}:{target_ref_name} of {target_repo_url}').format(**data))}
 
 * ${_('Title')}: ${pull_request.title}
 
 * ${_('Description')}:
 
 ${pull_request.description | trim}
 
 
 * ${_ungettext('Commit (%(num)s)', 'Commits (%(num)s)', len(pull_request_commits) ) % {'num': len(pull_request_commits)}}:
 
 % for commit_id, message in pull_request_commits:
     - ${h.short_id(commit_id)}
     ${h.chop_at_smart(message.lstrip(), '\n', suffix_if_chopped='...')}
 
 % endfor
 
 ---
 ${self.plaintext_footer()}
 </%def>
 <%
 data = {
     'user': h.person(user),
     'pr_id': pull_request.pull_request_id,
-    'pr_title': pull_request.title,
+    'pr_title': pull_request.title_safe,
     'source_ref_type': pull_request.source_ref_parts.type,
     'source_ref_name': pull_request.source_ref_parts.name,
     'target_ref_type': pull_request.target_ref_parts.type,
     'target_ref_name': pull_request.target_ref_parts.name,
     'repo_url': pull_request_source_repo_url,
     'source_repo': pull_request_source_repo.repo_name,
     'target_repo': pull_request_target_repo.repo_name,
     'source_repo_url': h.link_to(pull_request_source_repo.repo_name, pull_request_source_repo_url),
     'target_repo_url': h.link_to(pull_request_target_repo.repo_name, pull_request_target_repo_url),
 }
 %>
 ## header
 <table style="text-align:left;vertical-align:middle;width: 100%">
     <tr>
     <td style="width:100%;border-bottom:1px solid #dbd9da;">
         <div style="margin: 0; font-weight: bold">
             % if user_role == 'observer':
             <div class="clear-both" class="clear-both" style="margin-bottom: 4px">
                 <span style="color:#7E7F7F">@${h.person(user.username)}</span>
                 ${_('added you as observer to')}
                 <a href="${pull_request_url}" style="${base.link_css()}">pull request</a>.
             </div>
             % else:
             <div class="clear-both" class="clear-both" style="margin-bottom: 4px">
                 <span style="color:#7E7F7F">@${h.person(user.username)}</span>
                 ${_('requested a')}
                 <a href="${pull_request_url}" style="${base.link_css()}">pull request</a> review.
             </div>
             % endif
             <div style="margin-top: 10px"></div>
             ${_('Pull request')} <code>!${data['pr_id']}: ${data['pr_title']}</code>
         </div>
     </td>
     </tr>
 
 </table>
 <div class="clear-both"></div>
 ## main body
 <table style="text-align:left;vertical-align:middle;width: 100%">
     ## spacing def
     <tr>
         <td style="width: 130px"></td>
         <td></td>
     </tr>
 
     <tr>
         <td style="padding-right:20px;">${_('Pull request')}:</td>
         <td>
             <a href="${pull_request_url}" style="${base.link_css()}">
             !${pull_request.pull_request_id}
             </a>
         </td>
     </tr>
 
     <tr>
         <td style="padding-right:20px;line-height:20px;">${_('Commit Flow')}:</td>
         <td style="line-height:20px;">
             <code>${'{}:{}'.format(data['source_ref_type'], pull_request.source_ref_parts.name)}</code> ${_('of')} ${data['source_repo_url']}
             &rarr;
             <code>${'{}:{}'.format(data['target_ref_type'], pull_request.target_ref_parts.name)}</code> ${_('of')}  ${data['target_repo_url']}
         </td>
     </tr>
 
     <tr>
         <td style="padding-right:20px;">${_('Description')}:</td>
         <td style="white-space:pre-wrap"><code>${pull_request.description | trim}</code></td>
     </tr>
     <tr>
         <td style="padding-right:20px;">${_ungettext('Commit (%(num)s)', 'Commits (%(num)s)', len(pull_request_commits)) % {'num': len(pull_request_commits)}}:</td>
         <td></td>
     </tr>
 
     <tr>
         <td colspan="2">
             <ol style="margin:0 0 0 1em;padding:0;text-align:left;">
                 % for commit_id, message in pull_request_commits:
                     <li style="margin:0 0 1em;">
                         <pre style="margin:0 0 .5em"><a href="${h.route_path('repo_commit', repo_name=pull_request_source_repo.repo_name, commit_id=commit_id)}" style="${base.link_css()}">${h.short_id(commit_id)}</a></pre>
                         ${h.chop_at_smart(message, '\n', suffix_if_chopped='...')}
                     </li>
                 % endfor
             </ol>
         </td>
     </tr>
 </table>

rhodecode/templates/email_templates/pull_request_update.mako

@@ -1,172 +1,172 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 <%namespace name="base" file="base.mako"/>
 
 ## EMAIL SUBJECT
 <%def name="subject()" filter="n,trim,whitespace_filter">
 <%
 data = {
     'updating_user': '@'+h.person(updating_user),
     'pr_id': pull_request.pull_request_id,
-    'pr_title': pull_request.title,
+    'pr_title': pull_request.title_safe,
 }
 
 subject_template = email_pr_update_subject_template or _('{updating_user} updated pull request. !{pr_id}: "{pr_title}"')
 %>
 
 ${subject_template.format(**data) |n}
 </%def>
 
 ## PLAINTEXT VERSION OF BODY
 <%def name="body_plaintext()" filter="n,trim">
 <%
 data = {
     'updating_user': h.person(updating_user),
     'pr_id': pull_request.pull_request_id,
-    'pr_title': pull_request.title,
+    'pr_title': pull_request.title_safe,
     'source_ref_type': pull_request.source_ref_parts.type,
     'source_ref_name': pull_request.source_ref_parts.name,
     'target_ref_type': pull_request.target_ref_parts.type,
     'target_ref_name': pull_request.target_ref_parts.name,
     'repo_url': pull_request_source_repo_url,
     'source_repo': pull_request_source_repo.repo_name,
     'target_repo': pull_request_target_repo.repo_name,
     'source_repo_url': pull_request_source_repo_url,
     'target_repo_url': pull_request_target_repo_url,
 }
 %>
 
 * ${_('Pull Request link')}: ${pull_request_url}
 
 * ${h.literal(_('Commit flow: {source_ref_type}:{source_ref_name} of {source_repo_url} into {target_ref_type}:{target_ref_name} of {target_repo_url}').format(**data))}
 
 * ${_('Title')}: ${pull_request.title}
 
 * ${_('Description')}:
 
 ${pull_request.description | trim}
 
 * Changed commits:
 
  - Added: ${len(added_commits)}
  - Removed: ${len(removed_commits)}
 
 * Changed files:
 
 %if not changed_files:
  No file changes found
 %else:
 %for file_name in added_files:
  - A `${file_name}`
 %endfor
 %for file_name in modified_files:
  - M `${file_name}`
 %endfor
 %for file_name in removed_files:
  - R `${file_name}`
 %endfor
 %endif
 
 ---
 ${self.plaintext_footer()}
 </%def>
 <%
 data = {
     'updating_user': h.person(updating_user),
     'pr_id': pull_request.pull_request_id,
-    'pr_title': pull_request.title,
+    'pr_title': pull_request.title_safe,
     'source_ref_type': pull_request.source_ref_parts.type,
     'source_ref_name': pull_request.source_ref_parts.name,
     'target_ref_type': pull_request.target_ref_parts.type,
     'target_ref_name': pull_request.target_ref_parts.name,
     'repo_url': pull_request_source_repo_url,
     'source_repo': pull_request_source_repo.repo_name,
     'target_repo': pull_request_target_repo.repo_name,
     'source_repo_url': h.link_to(pull_request_source_repo.repo_name, pull_request_source_repo_url),
     'target_repo_url': h.link_to(pull_request_target_repo.repo_name, pull_request_target_repo_url),
 }
 %>
 
 ## header
 <table style="text-align:left;vertical-align:middle;width: 100%">
     <tr>
     <td style="width:100%;border-bottom:1px solid #dbd9da;">
 
         <div style="margin: 0; font-weight: bold">
             <div class="clear-both" style="margin-bottom: 4px">
                 <span style="color:#7E7F7F">@${h.person(updating_user.username)}</span>
                 ${_('updated')}
                 <a href="${pull_request_url}" style="${base.link_css()}">
                 ${_('pull request.').format(**data) }
                 </a>
             </div>
             <div style="margin-top: 10px"></div>
             ${_('Pull request')} <code>!${data['pr_id']}: ${data['pr_title']}</code>
         </div>
 
     </td>
     </tr>
 
 </table>
 <div class="clear-both"></div>
 ## main body
 <table style="text-align:left;vertical-align:middle;width: 100%">
     ## spacing def
     <tr>
         <td style="width: 130px"></td>
         <td></td>
     </tr>
 
     <tr>
         <td style="padding-right:20px;">${_('Pull request')}:</td>
         <td>
             <a href="${pull_request_url}" style="${base.link_css()}">
             !${pull_request.pull_request_id}
             </a>
         </td>
     </tr>
 
     <tr>
         <td style="padding-right:20px;line-height:20px;">${_('Commit Flow')}:</td>
         <td style="line-height:20px;">
             <code>${'{}:{}'.format(data['source_ref_type'], pull_request.source_ref_parts.name)}</code> ${_('of')} ${data['source_repo_url']}
             &rarr;
             <code>${'{}:{}'.format(data['target_ref_type'], pull_request.target_ref_parts.name)}</code> ${_('of')}  ${data['target_repo_url']}
         </td>
     </tr>
 
     <tr>
         <td style="padding-right:20px;">${_('Description')}:</td>
         <td style="white-space:pre-wrap"><code>${pull_request.description | trim}</code></td>
     </tr>
     <tr>
         <td style="padding-right:20px;">${_('Changes')}:</td>
         <td>
             <strong>Changed commits:</strong>
             <ul class="changes-ul">
                 <li>- Added: ${len(added_commits)}</li>
                 <li>- Removed: ${len(removed_commits)}</li>
             </ul>
 
             <strong>Changed files:</strong>
             <ul class="changes-ul">
 
             %if not changed_files:
                 <li>No file changes found</li>
             %else:
                 %for file_name in added_files:
                  <li>- A <a href="${pull_request_url + '#a_' + h.FID(ancestor_commit_id, file_name)}">${file_name}</a></li>
                 %endfor
                 %for file_name in modified_files:
                  <li>-  M <a href="${pull_request_url + '#a_' + h.FID(ancestor_commit_id, file_name)}">${file_name}</a></li>
                 %endfor
                 %for file_name in removed_files:
                  <li>-  R <a href="${pull_request_url + '#a_' + h.FID(ancestor_commit_id, file_name)}">${file_name}</a></li>
                 %endfor
             %endif
 
             </ul>
         </td>
     </tr>
 
 </table>

rhodecode/tests/lib/test_mako_emails.py

@@ -1,195 +1,197 b''
 # -*- 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 pytest
 import collections
 
 from rhodecode.lib.partial_renderer import PyramidPartialRenderer
 from rhodecode.lib.utils2 import AttributeDict
 from rhodecode.model.db import User, PullRequestReviewers
 from rhodecode.model.notification import EmailNotificationModel
 
 
[e-mail]()
+def pr():
+    def factory(ref):
+        return collections.namedtuple(
+            'PullRequest',
+            'pull_request_id, title, title_safe, description, source_ref_parts, source_ref_name, target_ref_parts, target_ref_name')\
+            (200, 'Example Pull Request', 'Example Pull Request', 'Desc of PR', ref, 'bookmark', ref, 'Branch')
+    return factory
+
+
 def test_get_template_obj(app, request_stub):
     template = EmailNotificationModel().get_renderer(
         EmailNotificationModel.TYPE_TEST, request_stub)
     assert isinstance(template, PyramidPartialRenderer)
 
 
 def test_render_email(app, http_host_only_stub):
     kwargs = {}
     subject, body, body_plaintext = EmailNotificationModel().render_email(
         EmailNotificationModel.TYPE_TEST, **kwargs)
 
     # subject
     assert subject == 'Test "Subject" hello "world"'
 
     # body plaintext
     assert body_plaintext == 'Email Plaintext Body'
 
     # body
     notification_footer1 = 'This is a notification from RhodeCode.'
     notification_footer2 = 'http://{}/'.format(http_host_only_stub)
     assert notification_footer1 in body
     assert notification_footer2 in body
     assert 'Email Body' in body
 
 
 @pytest.mark.parametrize('role', PullRequestReviewers.ROLES)
-def test_render_pr_email(app, user_admin, role):
+def test_render_pr_email(app, user_admin, role, pr):
     ref = collections.namedtuple(
         'Ref', 'name, type')('fxies123', 'book')
-
-    pr = collections.namedtuple('PullRequest',
-        'pull_request_id, title, description, source_ref_parts, source_ref_name, target_ref_parts, target_ref_name')(
-        200, 'Example Pull Request', 'Desc of PR', ref, 'bookmark', ref, 'Branch')
-
+    pr = pr(ref)
     source_repo = target_repo = collections.namedtuple(
         'Repo', 'type, repo_name')('hg', 'pull_request_1')
 
     kwargs = {
         'user': User.get_first_super_admin(),
         'pull_request': pr,
         'pull_request_commits': [],
 
         'pull_request_target_repo': target_repo,
         'pull_request_target_repo_url': 'x',
 
         'pull_request_source_repo': source_repo,
         'pull_request_source_repo_url': 'x',
 
         'pull_request_url': 'http://localhost/pr1',
         'user_role': role,
     }
 
     subject, body, body_plaintext = EmailNotificationModel().render_email(
         EmailNotificationModel.TYPE_PULL_REQUEST, **kwargs)
 
     # subject
     if role == PullRequestReviewers.ROLE_REVIEWER:
         assert subject == '@test_admin (RhodeCode Admin) requested a pull request review. !200: "Example Pull Request"'
     elif role == PullRequestReviewers.ROLE_OBSERVER:
         assert subject == '@test_admin (RhodeCode Admin) added you as observer to pull request. !200: "Example Pull Request"'
 
 
-def test_render_pr_update_email(app, user_admin):
+def test_render_pr_update_email(app, user_admin, pr):
     ref = collections.namedtuple(
         'Ref', 'name, type')('fxies123', 'book')
 
-    pr = collections.namedtuple('PullRequest',
-        'pull_request_id, title, description, source_ref_parts, source_ref_name, target_ref_parts, target_ref_name')(
-        200, 'Example Pull Request', 'Desc of PR', ref, 'bookmark', ref, 'Branch')
+    pr = pr(ref)
 
     source_repo = target_repo = collections.namedtuple(
         'Repo', 'type, repo_name')('hg', 'pull_request_1')
 
     commit_changes = AttributeDict({
         'added': ['aaaaaaabbbbb', 'cccccccddddddd'],
         'removed': ['eeeeeeeeeee'],
     })
     file_changes = AttributeDict({
         'added': ['a/file1.md', 'file2.py'],
         'modified': ['b/modified_file.rst'],
         'removed': ['.idea'],
     })
 
     kwargs = {
         'updating_user': User.get_first_super_admin(),
 
         'pull_request': pr,
         'pull_request_commits': [],
 
         'pull_request_target_repo': target_repo,
         'pull_request_target_repo_url': 'x',
 
         'pull_request_source_repo': source_repo,
         'pull_request_source_repo_url': 'x',
 
         'pull_request_url': 'http://localhost/pr1',
 
         'pr_comment_url': 'http://comment-url',
         'pr_comment_reply_url': 'http://comment-url#reply',
         'ancestor_commit_id': 'f39bd443',
         'added_commits': commit_changes.added,
         'removed_commits': commit_changes.removed,
         'changed_files': (file_changes.added + file_changes.modified + file_changes.removed),
         'added_files': file_changes.added,
         'modified_files': file_changes.modified,
         'removed_files': file_changes.removed,
     }
 
     subject, body, body_plaintext = EmailNotificationModel().render_email(
         EmailNotificationModel.TYPE_PULL_REQUEST_UPDATE, **kwargs)
 
     # subject
     assert subject == '@test_admin (RhodeCode Admin) updated pull request. !200: "Example Pull Request"'
 
 
 @pytest.mark.parametrize('mention', [
     True,
     False
 ])
 @pytest.mark.parametrize('email_type', [
     EmailNotificationModel.TYPE_COMMIT_COMMENT,
     EmailNotificationModel.TYPE_PULL_REQUEST_COMMENT
 ])
-def test_render_comment_subject_no_newlines(app, mention, email_type):
+def test_render_comment_subject_no_newlines(app, mention, email_type, pr):
     ref = collections.namedtuple(
         'Ref', 'name, type')('fxies123', 'book')
 
-    pr = collections.namedtuple('PullRequest',
-        'pull_request_id, title, description, source_ref_parts, source_ref_name, target_ref_parts, target_ref_name')(
-        200, 'Example Pull Request', 'Desc of PR', ref, 'bookmark', ref, 'Branch')
+    pr = pr(ref)
 
     source_repo = target_repo = collections.namedtuple(
         'Repo', 'type, repo_name')('hg', 'pull_request_1')
 
     kwargs = {
         'user': User.get_first_super_admin(),
         'commit': AttributeDict(raw_id='a'*40, message='Commit message'),
         'status_change': 'approved',
         'commit_target_repo_url': 'http://foo.example.com/#comment1',
         'repo_name': 'test-repo',
         'comment_file': 'test-file.py',
         'comment_line': 'n100',
         'comment_type': 'note',
         'comment_id': 2048,
         'commit_comment_url': 'http://comment-url',
         'commit_comment_reply_url': 'http://comment-url/#Reply',
         'instance_url': 'http://rc-instance',
         'comment_body': 'hello world',
         'mention': mention,
 
         'pr_comment_url': 'http://comment-url',
         'pr_comment_reply_url': 'http://comment-url/#Reply',
         'pull_request': pr,
         'pull_request_commits': [],
 
         'pull_request_target_repo': target_repo,
         'pull_request_target_repo_url': 'x',
 
         'pull_request_source_repo': source_repo,
         'pull_request_source_repo_url': 'x',
 
         'pull_request_url': 'http://code.rc.com/_pr/123'
     }
     subject, body, body_plaintext = EmailNotificationModel().render_email(email_type, **kwargs)
 
     assert '\n' not in subject