From cb686cef7f69d07d8ef0c88a8f83237781e9b790 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 7 Apr 2017 13:12:39 +0200
Subject: [PATCH 001/211] release: Bump version 4.7.0 to 4.8.0

---
 .bumpversion.cfg  | 2 +-
 rhodecode/VERSION | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 79bcc0c9..cbe58b8b 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4.7.0
+current_version = 4.8.0
 message = release: Bump version {current_version} to {new_version}
 
 [bumpversion:file:rhodecode/VERSION]
diff --git a/rhodecode/VERSION b/rhodecode/VERSION
index 1163055e..6ca6df11 100644
--- a/rhodecode/VERSION
+++ b/rhodecode/VERSION
@@ -1 +1 @@
-4.7.0
\ No newline at end of file
+4.8.0
\ No newline at end of file

From d74292255aa3930a08a52799eeb74e8c5c9f2c6c Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 10 Apr 2017 16:52:30 +0200
Subject: [PATCH 002/211] nix: bumped internal version inside default.nix

---
 pkgs/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix
index 0e292c7c..2e32125c 100644
--- a/pkgs/python-packages.nix
+++ b/pkgs/python-packages.nix
@@ -1641,7 +1641,7 @@
     };
   };
   rhodecode-enterprise-ce = super.buildPythonPackage {
-    name = "rhodecode-enterprise-ce-4.7.0";
+    name = "rhodecode-enterprise-ce-4.8.0";
     buildInputs = with self; [pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage configobj];
     doCheck = true;
     propagatedBuildInputs = with self; [Babel Beaker FormEncode Mako Markdown MarkupSafe MySQL-python Paste PasteDeploy PasteScript Pygments pygments-markdown-lexer Pylons Routes SQLAlchemy Tempita URLObject WebError WebHelpers WebHelpers2 WebOb WebTest Whoosh alembic amqplib anyjson appenlight-client authomatic backport-ipaddress cssselect celery channelstream colander decorator deform docutils gevent gunicorn infrae.cache ipython iso8601 kombu lxml msgpack-python nbconvert packaging psycopg2 py-gfm pycrypto pycurl pyparsing pyramid pyramid-debugtoolbar pyramid-mako pyramid-beaker pysqlite python-dateutil python-ldap python-memcached python-pam recaptcha-client repoze.lru requests simplejson subprocess32 waitress zope.cachedescriptors dogpile.cache dogpile.core psutil py-bcrypt];

From e820f43be3609a210109f2d5c094aa22df688840 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 10 Apr 2017 16:53:01 +0200
Subject: [PATCH 003/211] dependencies: bumped external libraries to latest
 versions

- mistune
- ipython-genutils
- prompt-toolkit
---
 pkgs/python-packages.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix
index 2e32125c..9fdeed87 100644
--- a/pkgs/python-packages.nix
+++ b/pkgs/python-packages.nix
@@ -887,13 +887,13 @@
     };
   };
   ipython-genutils = super.buildPythonPackage {
-    name = "ipython-genutils-0.1.0";
+    name = "ipython-genutils-0.2.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/71/b7/a64c71578521606edbbce15151358598f3dfb72a3431763edc2baf19e71f/ipython_genutils-0.1.0.tar.gz";
-      md5 = "9a8afbe0978adbcbfcb3b35b2d015a56";
+      url = "https://pypi.python.org/packages/e8/69/fbeffffc05236398ebfcfb512b6d2511c622871dca1746361006da310399/ipython_genutils-0.2.0.tar.gz";
+      md5 = "5a4f9781f78466da0ea1a648f3e1f79f";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -1004,13 +1004,13 @@
     };
   };
   mistune = super.buildPythonPackage {
-    name = "mistune-0.7.3";
+    name = "mistune-0.7.4";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/88/1e/be99791262b3a794332fda598a07c2749a433b9378586361ba9d8e824607/mistune-0.7.3.tar.gz";
-      md5 = "4eba50bd121b83716fa4be6a4049004b";
+      url = "https://pypi.python.org/packages/25/a4/12a584c0c59c9fed529f8b3c47ca8217c0cf8bcc5e1089d3256410cfbdbc/mistune-0.7.4.tar.gz";
+      md5 = "92d01cb717e9e74429e9bde9d29ac43b";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -1186,13 +1186,13 @@
     };
   };
   prompt-toolkit = super.buildPythonPackage {
-    name = "prompt-toolkit-1.0.13";
+    name = "prompt-toolkit-1.0.14";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [six wcwidth];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/23/be/4876b52d5cc159cbd4b0ff6e7aa419a26470849a43a8f647857a4a24467b/prompt_toolkit-1.0.13.tar.gz";
-      md5 = "427b496d2c147bd3819bc3a7f6e0d493";
+      url = "https://pypi.python.org/packages/55/56/8c39509b614bda53e638b7500f12577d663ac1b868aef53426fc6a26c3f5/prompt_toolkit-1.0.14.tar.gz";
+      md5 = "f24061ae133ed32c6b764e92bd48c496";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];

From 662dda4aa70b06ba166dcab0ee87c86d6510ef15 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 10 Apr 2017 17:13:09 +0200
Subject: [PATCH 004/211] auth-plugins: remove dead code

---
 rhodecode/authentication/base.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/rhodecode/authentication/base.py b/rhodecode/authentication/base.py
index 2212f85e..1dff506b 100644
--- a/rhodecode/authentication/base.py
+++ b/rhodecode/authentication/base.py
@@ -549,8 +549,6 @@ def authenticate(username, password, environ=None, auth_type=None,
     for plugin in authn_registry.get_plugins_for_authentication():
         plugin.set_auth_type(auth_type)
         plugin.set_calling_scope_repo(acl_repo_name)
-        user = plugin.get_user(username)
-        display_user = user.username if user else username
 
         if headers_only and not plugin.is_headers_auth:
             log.debug('Auth type is for headers only and plugin `%s` is not '

From 8417882de56ae5c0c667f2614aedc2f51a1feda2 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 10 Apr 2017 17:14:07 +0200
Subject: [PATCH 005/211] auth-plugins: add mechanismy to remove secrets from
 plugin logs.

- it's not recommended to log things like ldap access passwords or
other credentials.
-  we expose a machanismy for each plugin to define a unsafe keys to be
removed.
---
 rhodecode/authentication/base.py | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/rhodecode/authentication/base.py b/rhodecode/authentication/base.py
index 1dff506b..052482d3 100644
--- a/rhodecode/authentication/base.py
+++ b/rhodecode/authentication/base.py
@@ -23,6 +23,7 @@ Authentication modules
 """
 
 import colander
+import copy
 import logging
 import time
 import traceback
@@ -109,6 +110,10 @@ class RhodeCodeAuthPluginBase(object):
         colander.List: 'list',
     }
 
+    # list of keys in settings that are unsafe to be logged, should be passwords
+    # or other crucial credentials
+    _settings_unsafe_keys = []
+
     def __init__(self, plugin_id):
         self._plugin_id = plugin_id
 
@@ -199,13 +204,23 @@ class RhodeCodeAuthPluginBase(object):
             settings[node.name] = self.get_setting_by_name(node.name)
         return settings
 
+    def log_safe_settings(self, settings):
+        """
+        returns a log safe representation of settings, without any secrets
+        """
+        settings_copy = copy.deepcopy(settings)
+        for k in self._settings_unsafe_keys:
+            if k in settings_copy:
+                del settings_copy[k]
+        return settings_copy
+
     @property
     def validators(self):
         """
         Exposes RhodeCode validators modules
         """
         # this is a hack to overcome issues with pylons threadlocals and
-        # translator object _() not beein registered properly.
+        # translator object _() not being registered properly.
         class LazyCaller(object):
             def __init__(self, name):
                 self.validator_name = name
@@ -557,7 +572,8 @@ def authenticate(username, password, environ=None, auth_type=None,
 
         # load plugin settings from RhodeCode database
         plugin_settings = plugin.get_settings()
-        log.debug('Plugin settings:%s', plugin_settings)
+        plugin_sanitized_settings = plugin.log_safe_settings(plugin_settings)
+        log.debug('Plugin settings:%s', plugin_sanitized_settings)
 
         log.debug('Trying authentication using ** %s **', plugin.get_id())
         # use plugin's method of user extraction.

From 5fc5ee4d356bb987be39d22b0ff2084a1c702c12 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 10 Apr 2017 17:16:17 +0200
Subject: [PATCH 006/211] auth-plugins: define unsafe settings

---
 rhodecode/authentication/plugins/auth_crowd.py | 1 +
 rhodecode/authentication/plugins/auth_ldap.py  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/rhodecode/authentication/plugins/auth_crowd.py b/rhodecode/authentication/plugins/auth_crowd.py
index c4bca529..3db5251c 100644
--- a/rhodecode/authentication/plugins/auth_crowd.py
+++ b/rhodecode/authentication/plugins/auth_crowd.py
@@ -189,6 +189,7 @@ class CrowdServer(object):
 
 
 class RhodeCodeAuthPlugin(RhodeCodeExternalAuthPlugin):
+    _settings_unsafe_keys = ['app_password']
 
     def includeme(self, config):
         config.add_authn_plugin(self)
diff --git a/rhodecode/authentication/plugins/auth_ldap.py b/rhodecode/authentication/plugins/auth_ldap.py
index 9951c71f..1eaaac6e 100644
--- a/rhodecode/authentication/plugins/auth_ldap.py
+++ b/rhodecode/authentication/plugins/auth_ldap.py
@@ -334,6 +334,7 @@ class AuthLdap(object):
 class RhodeCodeAuthPlugin(RhodeCodeExternalAuthPlugin):
     # used to define dynamic binding in the
     DYNAMIC_BIND_VAR = '$login'
+    _settings_unsafe_keys = ['dn_pass']
 
     def includeme(self, config):
         config.add_authn_plugin(self)

From 01ba8bee6da6ff3be9c84d708123748238e3d211 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 11 Apr 2017 22:20:10 +0200
Subject: [PATCH 007/211] user-journal: prepare new datastructure for v2 of
 user logs.

- fixes #5259
---
 rhodecode/__init__.py                         |  2 +-
 .../dbmigrate/versions/072_version_4_8_0.py   | 61 +++++++++++++++++++
 rhodecode/model/db.py                         |  4 ++
 3 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 rhodecode/lib/dbmigrate/versions/072_version_4_8_0.py

diff --git a/rhodecode/__init__.py b/rhodecode/__init__.py
index 32e97a6a..e4be6a1a 100644
--- a/rhodecode/__init__.py
+++ b/rhodecode/__init__.py
@@ -51,7 +51,7 @@ PYRAMID_SETTINGS = {}
 EXTENSIONS = {}
 
 __version__ = ('.'.join((str(each) for each in VERSION[:3])))
-__dbversion__ = 71  # defines current db version for migrations
+__dbversion__ = 72  # defines current db version for migrations
 __platform__ = platform.system()
 __license__ = 'AGPLv3, and Commercial License'
 __author__ = 'RhodeCode GmbH'
diff --git a/rhodecode/lib/dbmigrate/versions/072_version_4_8_0.py b/rhodecode/lib/dbmigrate/versions/072_version_4_8_0.py
new file mode 100644
index 00000000..bd54b8a1
--- /dev/null
+++ b/rhodecode/lib/dbmigrate/versions/072_version_4_8_0.py
@@ -0,0 +1,61 @@
+import os
+import logging
+import datetime
+
+from sqlalchemy import *
+from sqlalchemy.exc import DatabaseError
+from sqlalchemy.orm import relation, backref, class_mapper, joinedload
+from sqlalchemy.orm.session import Session
+from sqlalchemy.ext.declarative import declarative_base
+
+from rhodecode.lib.dbmigrate.migrate import *
+from rhodecode.lib.dbmigrate.migrate.changeset import *
+from rhodecode.lib.utils2 import str2bool
+
+from rhodecode.model.meta import Base
+from rhodecode.model import meta
+from rhodecode.lib.dbmigrate.versions import _reset_base, notify
+
+log = logging.getLogger(__name__)
+
+
+def get_by_key(cls, key):
+    return cls.query().filter(cls.ui_key == key).scalar()
+
+
+def get_repos_location(cls):
+    return get_by_key(cls, '/').ui_value
+
+
+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_7_0_1 as db
+
+    # add last_activity
+    user_log_table = db.UserLog.__table__
+
+    user_data = Column('user_data_json', db.JsonType(dialect_map=dict(mysql=UnicodeText(16384))))
+    user_data.create(table=user_log_table)
+
+    version = Column("version", String(255), nullable=True, default='v2')
+    version.create(table=user_log_table)
+
+    action_data = Column('action_data_json', db.JsonType(dialect_map=dict(mysql=UnicodeText(16384))))
+    action_data.create(table=user_log_table)
+
+    # issue fixups
+    fixups(db, meta.Session)
+
+
+def downgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine
+
+
+def fixups(models, _SESSION):
+    pass
+
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index 54daf44d..f8949854 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -1107,6 +1107,10 @@ class UserLog(Base, BaseModel):
     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='v2')
+    user_data = Column('user_data_json', MutationObj.as_mutable(JsonType(dialect_map=dict(mysql=UnicodeText(16384)))))
+    action_data = Column('action_data_json', MutationObj.as_mutable(JsonType(dialect_map=dict(mysql=UnicodeText(16384)))))
+
     def __unicode__(self):
         return u"<%s('id:%s:%s')>" % (
             self.__class__.__name__, self.repository_name, self.action)

From 6bb3bd78bb3f9b8a8ce85c66906dae48b846145e Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 12 Apr 2017 10:52:13 +0200
Subject: [PATCH 008/211] user-log: change version default to v1 as currently
 we only use old format.

---
 rhodecode/model/db.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index f8949854..e7aea727 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -1107,7 +1107,7 @@ class UserLog(Base, BaseModel):
     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='v2')
+    version = Column("version", String(255), nullable=True, default='v1')
     user_data = Column('user_data_json', MutationObj.as_mutable(JsonType(dialect_map=dict(mysql=UnicodeText(16384)))))
     action_data = Column('action_data_json', MutationObj.as_mutable(JsonType(dialect_map=dict(mysql=UnicodeText(16384)))))
 

From 7ab84fa13024e759d1ba1aa217d21b5a7b61b746 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 12 Apr 2017 20:53:28 +0200
Subject: [PATCH 009/211] auth: the correct prefixes for python bcrypt are $2a
 or $2b. handle the 2b too for consistency.

---
 rhodecode/lib/auth.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rhodecode/lib/auth.py b/rhodecode/lib/auth.py
index 5f7c568c..d647ad9a 100644
--- a/rhodecode/lib/auth.py
+++ b/rhodecode/lib/auth.py
@@ -138,7 +138,7 @@ class _RhodeCodeCryptoBase(object):
 
 
 class _RhodeCodeCryptoBCrypt(_RhodeCodeCryptoBase):
-    ENC_PREF = '$2a$10'
+    ENC_PREF = ('$2a$10', '$2b$10')
 
     def hash_create(self, str_):
         self._assert_bytes(str_)

From d321c7d65dbaadef59c92ff9c660a8095ec94207 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 12 Apr 2017 20:54:32 +0200
Subject: [PATCH 010/211] nodes: fetching largefiles content is commit
 independent because the pointes is unique id itself.

---
 rhodecode/lib/vcs/nodes.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/rhodecode/lib/vcs/nodes.py b/rhodecode/lib/vcs/nodes.py
index 415411a7..2ee9b24d 100644
--- a/rhodecode/lib/vcs/nodes.py
+++ b/rhodecode/lib/vcs/nodes.py
@@ -785,11 +785,8 @@ class LargeFileNode(FileNode):
 
     @LazyProperty
     def raw_bytes(self):
-        if self.commit:
-            with open(self.path, 'rb') as f:
-                content = f.read()
-        else:
-            content = self._content
+        with open(self.path, 'rb') as f:
+            content = f.read()
         return content
 
     @LazyProperty

From cf3ef7e2956fb0bea504307117acc5341c697861 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 12 Apr 2017 22:48:21 +0200
Subject: [PATCH 011/211] admin-users: remove nullslast() as it's generally not
 mysql compatible.

- fixes #5277
---
 rhodecode/apps/admin/views/users.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rhodecode/apps/admin/views/users.py b/rhodecode/apps/admin/views/users.py
index 3c50ace5..499daec1 100644
--- a/rhodecode/apps/admin/views/users.py
+++ b/rhodecode/apps/admin/views/users.py
@@ -126,9 +126,9 @@ class AdminUsersView(BaseAppView):
 
         sort_col = getattr(User, order_by, None)
         if sort_col and order_dir == 'asc':
-            base_q = base_q.order_by(sort_col.asc().nullslast())
+            base_q = base_q.order_by(sort_col.asc())
         elif sort_col:
-            base_q = base_q.order_by(sort_col.desc().nullslast())
+            base_q = base_q.order_by(sort_col.desc())
 
         base_q = base_q.offset(start).limit(limit)
         users_list = base_q.all()

From 4ae1367cb30b865e4d56d8f64ce6fdf1e7302bcd Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 12 Apr 2017 23:24:48 +0200
Subject: [PATCH 012/211] users: last_activity should be null if user haven't
 performed any actions.

---
 rhodecode/model/db.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index e7aea727..9034a7ca 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -514,7 +514,7 @@ class User(Base, BaseModel):
     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=datetime.datetime.now)
+    last_activity = Column('last_activity', DateTime(timezone=False), nullable=True, unique=None, default=None)
 
     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)

From 7b460b77f2d8bac968d270aa0c6a397a60af5e9b Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 12 Apr 2017 23:26:16 +0200
Subject: [PATCH 013/211] admin-users: replace the previous nullslast() with db
 independent solution.

ref #5277
---
 rhodecode/apps/admin/views/users.py | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/rhodecode/apps/admin/views/users.py b/rhodecode/apps/admin/views/users.py
index 499daec1..b0a63315 100644
--- a/rhodecode/apps/admin/views/users.py
+++ b/rhodecode/apps/admin/views/users.py
@@ -19,9 +19,11 @@
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import logging
+import datetime
 
 from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config
+from sqlalchemy.sql.functions import coalesce
 
 from rhodecode.lib.helpers import Page
 from rhodecode_tools.lib.ext_json import json
@@ -125,12 +127,21 @@ class AdminUsersView(BaseAppView):
         users_data_total_filtered_count = base_q.count()
 
         sort_col = getattr(User, order_by, None)
-        if sort_col and order_dir == 'asc':
-            base_q = base_q.order_by(sort_col.asc())
-        elif sort_col:
-            base_q = base_q.order_by(sort_col.desc())
+        if sort_col:
+            if order_dir == 'asc':
+                # handle null values properly to order by NULL last
+                if order_by in ['last_activity']:
+                    sort_col = coalesce(sort_col, datetime.date.max)
+                sort_col = sort_col.asc()
+            else:
+                # handle null values properly to order by NULL last
+                if order_by in ['last_activity']:
+                    sort_col = coalesce(sort_col, datetime.date.min)
+                sort_col = sort_col.desc()
 
+        base_q = base_q.order_by(sort_col)
         base_q = base_q.offset(start).limit(limit)
+
         users_list = base_q.all()
 
         users_data = []

From 479c7863586f0306ab38d4dbf7f3883c2ab63fba Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 18 Apr 2017 09:31:49 +0200
Subject: [PATCH 014/211] http-app: simplify detection of chunked encoding.

- since we now properly use chunked requests git client reports this in nicer way.
we no longer need to rely on hacks to detect chunked streams.
---
 rhodecode/lib/middleware/utils/scm_app_http.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/rhodecode/lib/middleware/utils/scm_app_http.py b/rhodecode/lib/middleware/utils/scm_app_http.py
index 6904b056..046fb7f3 100644
--- a/rhodecode/lib/middleware/utils/scm_app_http.py
+++ b/rhodecode/lib/middleware/utils/scm_app_http.py
@@ -126,6 +126,11 @@ class VcsHttpProxy(object):
         return _maybe_stream_response(response)
 
 
+def _is_request_chunked(environ):
+    stream = environ.get('HTTP_TRANSFER_ENCODING', '') == 'chunked'
+    return stream
+
+
 def _maybe_stream_request(environ):
     path = environ['PATH_INFO']
     stream = _is_request_chunked(environ)
@@ -137,15 +142,6 @@ def _maybe_stream_request(environ):
         return environ['wsgi.input'].read()
 
 
-def _is_request_chunked(environ):
-    stream = environ.get('HTTP_TRANSFER_ENCODING', '') == 'chunked'
-    if not stream:
-        # git lfs should stream for PUT requests which are upload
-        stream = ('git-lfs' in environ.get('HTTP_USER_AGENT', '')
-                  and environ['REQUEST_METHOD'] == 'PUT')
-    return stream
-
-
 def _maybe_stream_response(response):
     """
     Try to generate chunks from the response if it is chunked.

From b4b97b1b4e20dadd646a62c6ae49f386e1ddb6cd Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 18 Apr 2017 12:23:14 +0200
Subject: [PATCH 015/211] repo-creation: validate and forbid creating .git
 suffixed repository names.

- because of git-lfs support, and also becuase to support the clone of git bare repositories
we cannot allow creating such repositories.
---
 rhodecode/model/forms.py                      |  2 +-
 .../validation_schema/schemas/repo_schema.py  |  7 +++-
 rhodecode/model/validators.py                 | 20 +++++++++++
 .../tests/functional/test_admin_repos.py      | 36 +++++++++++++------
 4 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/rhodecode/model/forms.py b/rhodecode/model/forms.py
index 1a711ac2..a2e54b8f 100644
--- a/rhodecode/model/forms.py
+++ b/rhodecode/model/forms.py
@@ -242,7 +242,7 @@ def RepoForm(edit=False, old_data=None, repo_groups=None, landing_revs=None,
         allow_extra_fields = True
         filter_extra_fields = False
         repo_name = All(v.UnicodeString(strip=True, min=1, not_empty=True),
-                        v.SlugifyName())
+                        v.SlugifyName(), v.CannotHaveGitSuffix())
         repo_group = All(v.CanWriteGroup(old_data),
                          v.OneOf(repo_groups, hideList=True))
         repo_type = v.OneOf(supported_backends, required=False,
diff --git a/rhodecode/model/validation_schema/schemas/repo_schema.py b/rhodecode/model/validation_schema/schemas/repo_schema.py
index 4af21db1..754d2133 100644
--- a/rhodecode/model/validation_schema/schemas/repo_schema.py
+++ b/rhodecode/model/validation_schema/schemas/repo_schema.py
@@ -191,7 +191,12 @@ def deferred_unique_name_validator(node, kw):
 
 @colander.deferred
 def deferred_repo_name_validator(node, kw):
-    return validators.valid_name_validator
+    def no_git_suffix_validator(node, value):
+        if value.endswith('.git'):
+            msg = _('Repository name cannot end with .git')
+            raise colander.Invalid(node, msg)
+    return colander.All(
+        no_git_suffix_validator, validators.valid_name_validator)
 
 
 class GroupType(colander.Mapping):
diff --git a/rhodecode/model/validators.py b/rhodecode/model/validators.py
index 77cec20e..412c0dad 100644
--- a/rhodecode/model/validators.py
+++ b/rhodecode/model/validators.py
@@ -574,6 +574,26 @@ def SlugifyName():
     return _validator
 
 
+def CannotHaveGitSuffix():
+    class _validator(formencode.validators.FancyValidator):
+        messages = {
+            'has_git_suffix':
+                _(u'Repository name cannot end with .git'),
+        }
+
+        def _to_python(self, value, state):
+            return value
+
+        def validate_python(self, value, state):
+            if value and value.endswith('.git'):
+                msg = M(
+                    self, 'has_git_suffix', state)
+                raise formencode.Invalid(
+                    msg, value, state, error_dict={'repo_name': msg})
+
+    return _validator
+
+
 def ValidCloneUri():
     class InvalidCloneUrl(Exception):
         allowed_prefixes = ()
diff --git a/rhodecode/tests/functional/test_admin_repos.py b/rhodecode/tests/functional/test_admin_repos.py
index 8f5aeab2..aaa7fa72 100644
--- a/rhodecode/tests/functional/test_admin_repos.py
+++ b/rhodecode/tests/functional/test_admin_repos.py
@@ -24,7 +24,7 @@ import mock
 import pytest
 
 from rhodecode.lib import auth
-from rhodecode.lib.utils2 import safe_str, str2bool
+from rhodecode.lib.utils2 import safe_str, str2bool, safe_unicode
 from rhodecode.lib.vcs.exceptions import RepositoryRequirementError
 from rhodecode.model.db import Repository, RepoGroup, UserRepoToPerm, User,\
     Permission
@@ -44,7 +44,7 @@ fixture = Fixture()
 
 
 @pytest.mark.usefixtures("app")
-class TestAdminRepos:
+class TestAdminRepos(object):
 
     def test_index(self):
         self.app.get(url('repos'))
@@ -63,13 +63,14 @@ class TestAdminRepos:
         assert_response.element_contains('#repo_type', 'svn')
         assert_response.element_contains('#repo_type', 'hg')
 
-    @pytest.mark.parametrize("suffix", [u'', u''], ids=['', 'non-ascii'])
+    @pytest.mark.parametrize("suffix",
+                             [u'', u'xxa'], ids=['', 'non-ascii'])
     def test_create(self, autologin_user, backend, suffix, csrf_token):
         repo_name_unicode = backend.new_repo_name(suffix=suffix)
         repo_name = repo_name_unicode.encode('utf8')
         description_unicode = u'description for newly created repo' + suffix
         description = description_unicode.encode('utf8')
-        self.app.post(
+        response = self.app.post(
             url('repos'),
             fixture._get_repo_create_params(
                 repo_private=False,
@@ -77,8 +78,7 @@ class TestAdminRepos:
                 repo_type=backend.alias,
                 repo_description=description,
                 csrf_token=csrf_token),
-            status=302
-            )
+            status=302)
 
         self.assert_repository_is_created_correctly(
             repo_name, description, backend)
@@ -368,6 +368,20 @@ class TestAdminRepos:
                 csrf_token=csrf_token))
         response.mustcontain('invalid clone url')
 
+    def test_create_with_git_suffix(
+            self, autologin_user, backend, csrf_token):
+        repo_name = backend.new_repo_name() + ".git"
+        description = 'description for newly created repo'
+        response = self.app.post(
+            url('repos'),
+            fixture._get_repo_create_params(
+                repo_private=False,
+                repo_name=repo_name,
+                repo_type=backend.alias,
+                repo_description=description,
+                csrf_token=csrf_token))
+        response.mustcontain('Repository name cannot end with .git')
+
     @pytest.mark.parametrize("suffix", [u'', u'ąęł'], ids=['', 'non-ascii'])
     def test_delete(self, autologin_user, backend, suffix, csrf_token):
         repo = backend.create_repo(name_suffix=suffix)
@@ -596,15 +610,15 @@ class TestAdminRepos:
 
     def assert_repository_is_created_correctly(
             self, repo_name, description, backend):
-        repo_name_utf8 = repo_name.encode('utf-8')
+        repo_name_utf8 = safe_str(repo_name)
 
         # run the check page that triggers the flash message
         response = self.app.get(url('repo_check_home', repo_name=repo_name))
         assert response.json == {u'result': True}
-        assert_session_flash(
-            response,
-            u'Created repository <a href="/%s">%s</a>'
-            % (urllib.quote(repo_name_utf8), repo_name))
+
+        flash_msg = u'Created repository <a href="/{}">{}</a>'.format(
+            urllib.quote(repo_name_utf8), repo_name)
+        assert_session_flash(response, flash_msg)
 
         # test if the repo was created in the database
         new_repo = RepoModel().get_by_repo_name(repo_name)

From 90a7661dde8ea5560ab9c54e1182001a8ce988ae Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 18 Apr 2017 14:34:05 +0200
Subject: [PATCH 016/211] emails: fix url for user registration to be a fully
 qualified path.

---
 rhodecode/lib/helpers.py                                   | 6 +++---
 rhodecode/templates/email_templates/user_registration.mako | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py
index f8539ebd..29086624 100644
--- a/rhodecode/lib/helpers.py
+++ b/rhodecode/lib/helpers.py
@@ -1916,9 +1916,9 @@ def get_last_path_part(file_node):
 
 def route_url(*args, **kwds):
     """
-    Wrapper around pyramids `route_url` function. It is used to generate
-    URLs from within pylons views or templates. This will be removed when
-    pyramid migration if finished.
+    Wrapper around pyramids `route_url` (fully qualified url) function. 
+    It is used to generate URLs from within pylons views or templates. 
+    This will be removed when pyramid migration if finished.
     """
     req = get_current_request()
     return req.route_url(*args, **kwds)
diff --git a/rhodecode/templates/email_templates/user_registration.mako b/rhodecode/templates/email_templates/user_registration.mako
index b1875085..1ce5784a 100644
--- a/rhodecode/templates/email_templates/user_registration.mako
+++ b/rhodecode/templates/email_templates/user_registration.mako
@@ -19,9 +19,9 @@ ${self.plaintext_footer()}
 
 ## BODY GOES BELOW
 <table style="text-align:left;vertical-align:middle;">
-    <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;"><h4><a href="${h.route_path('user_profile', username=user.username, qualified=True)}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('New user %(user)s has registered on %(date)s') % {'user': user.username, 'date': h.format_date(date)}}</a></h4></td></tr>
+    <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;"><h4><a href="${h.route_url('user_profile', username=user.username)}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('New user %(user)s has registered on %(date)s') % {'user': user.username, 'date': h.format_date(date)}}</a></h4></td></tr>
     <tr><td style="padding-right:20px;padding-top:20px;">${_('Username')}</td><td style="line-height:1;padding-top:20px;"><img style="margin-bottom:-5px;text-align:left;border:1px solid #dbd9da" src="${h.gravatar_url(user.email, 16)}" height="16" width="16">&nbsp;${user.username}</td></tr>
     <tr><td style="padding-right:20px;">${_('Full Name')}</td><td>${user.firstname} ${user.lastname}</td></tr>
     <tr><td style="padding-right:20px;">${_('Email')}</td><td>${user.email}</td></tr>
-    <tr><td style="padding-right:20px;">${_('Profile')}</td><td><a href="${h.route_path('user_profile', username=user.username, qualified=True)}">${h.route_path('user_profile', username=user.username, qualified=True)}</a></td></tr>
+    <tr><td style="padding-right:20px;">${_('Profile')}</td><td><a href="${h.route_url('user_profile', username=user.username)}">${h.route_url('user_profile', username=user.username)}</a></td></tr>
 </table>
\ No newline at end of file

From 482cb6cd2317ee329a168a018b7c4cf7e85beaa5 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 13 Apr 2017 12:15:02 +0200
Subject: [PATCH 017/211] data-grid: create a common re-usable app with
 datagrid rendering helpers

---
 rhodecode/apps/_base/__init__.py    | 28 ++++++++++++++++++++++++++++
 rhodecode/apps/admin/views/users.py | 26 ++------------------------
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/rhodecode/apps/_base/__init__.py b/rhodecode/apps/_base/__init__.py
index 3cef1f49..7ba88a3f 100644
--- a/rhodecode/apps/_base/__init__.py
+++ b/rhodecode/apps/_base/__init__.py
@@ -130,6 +130,34 @@ class RepoAppView(BaseAppView):
         return c
 
 
+class DataGridAppView(object):
+    """
+    Common class to have re-usable grid rendering components
+    """
+
+    def _extract_ordering(self, request):
+        column_index = safe_int(request.GET.get('order[0][column]'))
+        order_dir = request.GET.get(
+            'order[0][dir]', 'desc')
+        order_by = request.GET.get(
+            'columns[%s][data][sort]' % column_index, 'name_raw')
+
+        # translate datatable to DB columns
+        order_by = {
+            'first_name': 'name',
+            'last_name': 'lastname',
+        }.get(order_by) or order_by
+
+        search_q = request.GET.get('search[value]')
+        return search_q, order_by, order_dir
+
+    def _extract_chunk(self, request):
+        start = safe_int(request.GET.get('start'), 0)
+        length = safe_int(request.GET.get('length'), 25)
+        draw = safe_int(request.GET.get('draw'))
+        return draw, start, length
+
+
 class RepoRoutePredicate(object):
     def __init__(self, val, config):
         self.val = val
diff --git a/rhodecode/apps/admin/views/users.py b/rhodecode/apps/admin/views/users.py
index b0a63315..f801ca36 100644
--- a/rhodecode/apps/admin/views/users.py
+++ b/rhodecode/apps/admin/views/users.py
@@ -28,7 +28,7 @@ from sqlalchemy.sql.functions import coalesce
 from rhodecode.lib.helpers import Page
 from rhodecode_tools.lib.ext_json import json
 
-from rhodecode.apps._base import BaseAppView
+from rhodecode.apps._base import BaseAppView, DataGridAppView
 from rhodecode.lib.auth import (
     LoginRequired, HasPermissionAllDecorator, CSRFRequired)
 from rhodecode.lib import helpers as h
@@ -43,7 +43,7 @@ from rhodecode.model.meta import Session
 log = logging.getLogger(__name__)
 
 
-class AdminUsersView(BaseAppView):
+class AdminUsersViewData(BaseAppView, DataGridAppView):
     ALLOW_SCOPED_TOKENS = False
     """
     This view has alternative version inside EE, if modified please take a look
@@ -64,28 +64,6 @@ class AdminUsersView(BaseAppView):
             # is a pyramid view
             raise HTTPFound('/')
 
-    def _extract_ordering(self, request):
-        column_index = safe_int(request.GET.get('order[0][column]'))
-        order_dir = request.GET.get(
-            'order[0][dir]', 'desc')
-        order_by = request.GET.get(
-            'columns[%s][data][sort]' % column_index, 'name_raw')
-
-        # translate datatable to DB columns
-        order_by = {
-            'first_name': 'name',
-            'last_name': 'lastname',
-        }.get(order_by) or order_by
-
-        search_q = request.GET.get('search[value]')
-        return search_q, order_by, order_dir
-
-    def _extract_chunk(self, request):
-        start = safe_int(request.GET.get('start'), 0)
-        length = safe_int(request.GET.get('length'), 25)
-        draw = safe_int(request.GET.get('draw'))
-        return draw, start, length
-
     @HasPermissionAllDecorator('hg.admin')
     @view_config(
         route_name='users', request_method='GET',

From 7726d5131da6b16b63be3a196423dccb76af3b28 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 13 Apr 2017 17:13:24 +0200
Subject: [PATCH 018/211] dataGrid: fixed loading CSS to prevent page flicker.

---
 rhodecode/public/css/navigation.less | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rhodecode/public/css/navigation.less b/rhodecode/public/css/navigation.less
index 7c0a199d..a2f4ee74 100644
--- a/rhodecode/public/css/navigation.less
+++ b/rhodecode/public/css/navigation.less
@@ -558,6 +558,8 @@ ul#context-pages {
 .dataTables_processing {
     text-align: center;
     font-size: 1.1em;
+    position: relative;
+    top: 95px;
 }
 
 .dataTables_paginate, .pagination-wh {

From 602967a547a31abc1555d200170f1c3361687535 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 13 Apr 2017 17:14:05 +0200
Subject: [PATCH 019/211] admin-users: cleanup JS code.

---
 rhodecode/templates/admin/users/users.mako | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/rhodecode/templates/admin/users/users.mako b/rhodecode/templates/admin/users/users.mako
index 4dfe0ee0..58575eb9 100644
--- a/rhodecode/templates/admin/users/users.mako
+++ b/rhodecode/templates/admin/users/users.mako
@@ -38,9 +38,10 @@
 <script type="text/javascript">
 
 $(document).ready(function() {
+    var $userListTable = $('#user_list_table');
 
     var getDatatableCount = function(){
-      var table = $('#user_list_table').dataTable();
+      var table = $userListTable.dataTable();
       var page = table.api().page.info();
       var  active = page.recordsDisplay;
       var  total = page.recordsTotal;
@@ -50,7 +51,7 @@ $(document).ready(function() {
     };
 
     // user list
-    $('#user_list_table').DataTable({
+    $userListTable.DataTable({
       processing: true,
       serverSide: true,
       ajax: "${h.route_path('users_data')}",
@@ -76,7 +77,7 @@ $(document).ready(function() {
          { data: {"_": "extern_type",
                   "sort": "extern_type"}, title: "${_('Auth type')}", className: "td-type"  },
          { data: {"_": "action",
-                  "sort": "action"}, title: "${_('Action')}", className: "td-action" }
+                  "sort": "action"}, title: "${_('Action')}", className: "td-action", orderable: false }
       ],
       language: {
           paginate: DEFAULT_GRID_PAGINATION,
@@ -91,23 +92,23 @@ $(document).ready(function() {
       }
     });
 
-    $('#user_list_table').on('xhr.dt', function(e, settings, json, xhr){
-        $('#user_list_table').css('opacity', 1);
+    $userListTable.on('xhr.dt', function(e, settings, json, xhr){
+        $userListTable.css('opacity', 1);
     });
 
-    $('#user_list_table').on('preXhr.dt', function(e, settings, data){
-        $('#user_list_table').css('opacity', 0.3);
+    $userListTable.on('preXhr.dt', function(e, settings, data){
+        $userListTable.css('opacity', 0.3);
     });
 
     // refresh counters on draw
-    $('#user_list_table').on('draw.dt', function(){
+    $userListTable.on('draw.dt', function(){
         getDatatableCount();
     });
 
     // filter
     $('#q_filter').on('keyup',
         $.debounce(250, function() {
-            $('#user_list_table').DataTable().search(
+            $userListTable.DataTable().search(
                 $('#q_filter').val()
             ).draw();
         })

From 93e855bd4ad0a010faeb664715f06f963ef80bf9 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 13 Apr 2017 17:16:26 +0200
Subject: [PATCH 020/211] base-grid-view: allow specifing custom mapping for
 sort columns.

---
 rhodecode/apps/_base/__init__.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/rhodecode/apps/_base/__init__.py b/rhodecode/apps/_base/__init__.py
index 7ba88a3f..a2a082e7 100644
--- a/rhodecode/apps/_base/__init__.py
+++ b/rhodecode/apps/_base/__init__.py
@@ -135,7 +135,8 @@ class DataGridAppView(object):
     Common class to have re-usable grid rendering components
     """
 
-    def _extract_ordering(self, request):
+    def _extract_ordering(self, request, column_map=None):
+        column_map = column_map or {}
         column_index = safe_int(request.GET.get('order[0][column]'))
         order_dir = request.GET.get(
             'order[0][dir]', 'desc')
@@ -143,10 +144,7 @@ class DataGridAppView(object):
             'columns[%s][data][sort]' % column_index, 'name_raw')
 
         # translate datatable to DB columns
-        order_by = {
-            'first_name': 'name',
-            'last_name': 'lastname',
-        }.get(order_by) or order_by
+        order_by = column_map.get(order_by) or order_by
 
         search_q = request.GET.get('search[value]')
         return search_q, order_by, order_dir

From 6b2cf3a69b966148ff1e74d1392cb07eb53e7dac Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 18 Apr 2017 16:22:03 +0200
Subject: [PATCH 021/211] tests: added test for cloning a git bare repo.

---
 .../tests/other/vcs_operations/test_vcs_operations.py      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/rhodecode/tests/other/vcs_operations/test_vcs_operations.py b/rhodecode/tests/other/vcs_operations/test_vcs_operations.py
index 49877914..6bcb1986 100644
--- a/rhodecode/tests/other/vcs_operations/test_vcs_operations.py
+++ b/rhodecode/tests/other/vcs_operations/test_vcs_operations.py
@@ -62,6 +62,13 @@ class TestVCSOperations(object):
         _check_proper_clone(stdout, stderr, 'git')
         cmd.assert_returncode_success()
 
+    def test_clone_git_repo_by_admin_with_git_suffix(self, rc_web_server, tmpdir):
+        clone_url = rc_web_server.repo_clone_url(GIT_REPO)
+        cmd = Command('/tmp')
+        stdout, stderr = cmd.execute('git clone', clone_url+".git", tmpdir.strpath)
+        _check_proper_clone(stdout, stderr, 'git')
+        cmd.assert_returncode_success()
+
     def test_clone_hg_repo_by_id_by_admin(self, rc_web_server, tmpdir):
         repo_id = Repository.get_by_repo_name(HG_REPO).repo_id
         clone_url = rc_web_server.repo_clone_url('_%s' % repo_id)

From b42a7f0e20ed14bd6fb3eeb303d4303736bc32fb Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 18 Apr 2017 17:05:31 +0200
Subject: [PATCH 022/211] app: ensure largefile dirs are created on application
 startup.

---
 rhodecode/config/middleware.py |  3 ++-
 rhodecode/subscribers.py       | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py
index 47c7a1de..ea233422 100644
--- a/rhodecode/config/middleware.py
+++ b/rhodecode/config/middleware.py
@@ -54,7 +54,7 @@ from rhodecode.lib.plugins.utils import register_rhodecode_plugin
 from rhodecode.lib.utils2 import aslist as rhodecode_aslist
 from rhodecode.subscribers import (
     scan_repositories_if_enabled, write_metadata_if_needed,
-    write_js_routes_if_enabled)
+    write_js_routes_if_enabled, create_largeobjects_dirs_if_needed)
 
 
 log = logging.getLogger(__name__)
@@ -303,6 +303,7 @@ def includeme(config):
     settings['default_locale_name'] = settings.get('lang', 'en')
 
     # Add subscribers.
+    config.add_subscriber(create_largeobjects_dirs_if_needed, ApplicationCreated)
     config.add_subscriber(scan_repositories_if_enabled, ApplicationCreated)
     config.add_subscriber(write_metadata_if_needed, ApplicationCreated)
     config.add_subscriber(write_js_routes_if_enabled, ApplicationCreated)
diff --git a/rhodecode/subscribers.py b/rhodecode/subscribers.py
index 03f62481..11f02ac1 100644
--- a/rhodecode/subscribers.py
+++ b/rhodecode/subscribers.py
@@ -229,6 +229,33 @@ def write_js_routes_if_enabled(event):
             f.write(jsroutes_file_content)
 
 
+def create_largeobjects_dirs_if_needed(event):
+    """
+    This is subscribed to the `pyramid.events.ApplicationCreated` event. It
+    does a repository scan if enabled in the settings.
+    """
+    from rhodecode.lib.utils import get_rhodecode_base_path
+    from rhodecode.lib.vcs.backends.hg import largefiles_store
+    from rhodecode.lib.vcs.backends.git import lfs_store
+
+    repo_store_path = get_rhodecode_base_path()
+
+    paths = [
+        largefiles_store(repo_store_path),
+        lfs_store(repo_store_path)]
+
+    for path in paths:
+        if os.path.isdir(path):
+            continue
+        if os.path.isfile(path):
+            continue
+        # not a file nor dir, we try to create it
+        try:
+            os.makedirs(path)
+        except Exception:
+            log.warning('Failed to create largefiles dir:%s', path)
+
+
 class Subscriber(object):
     """
     Base class for subscribers to the pyramid event system.

From 4cf5918e7722325b33b81fd0ab334f927424be4e Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 18 Apr 2017 17:40:33 +0200
Subject: [PATCH 023/211] dependencies: bumped rhodecode tools to version
 0.12.0

---
 pkgs/python-packages.nix                      | 6 +++---
 requirements.txt                              | 2 +-
 rhodecode/tests/other/example_rcextensions.py | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix
index 9fdeed87..4d70f03a 100644
--- a/pkgs/python-packages.nix
+++ b/pkgs/python-packages.nix
@@ -1651,13 +1651,13 @@
     };
   };
   rhodecode-tools = super.buildPythonPackage {
-    name = "rhodecode-tools-0.11.0";
+    name = "rhodecode-tools-0.12.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [click future six Mako MarkupSafe requests elasticsearch elasticsearch-dsl urllib3 Whoosh];
     src = fetchurl {
-      url = "https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.11.0.tar.gz?md5=e5fd0a8363af08a0ced71b50ca9cce15";
-      md5 = "e5fd0a8363af08a0ced71b50ca9cce15";
+      url = "https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.12.0.tar.gz?md5=9ca040356fa7e38d3f64529a4cffdca4";
+      md5 = "9ca040356fa7e38d3f64529a4cffdca4";
     };
     meta = {
       license = [ { fullName = "AGPLv3 and Proprietary"; } ];
diff --git a/requirements.txt b/requirements.txt
index 6fe58c69..4acd78ed 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -127,7 +127,7 @@ CProfileV==1.0.6
 bottle==0.12.8
 
 ## rhodecode-tools, special case
-https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.11.0.tar.gz?md5=e5fd0a8363af08a0ced71b50ca9cce15#egg=rhodecode-tools==0.11.0
+https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.12.0.tar.gz?md5=9ca040356fa7e38d3f64529a4cffdca4#egg=rhodecode-tools==0.12.0
 
 ## appenlight
 appenlight-client==0.6.14
diff --git a/rhodecode/tests/other/example_rcextensions.py b/rhodecode/tests/other/example_rcextensions.py
index a594f3aa..11bdc846 100644
--- a/rhodecode/tests/other/example_rcextensions.py
+++ b/rhodecode/tests/other/example_rcextensions.py
@@ -344,6 +344,7 @@ def _prepushhook(*args, **kwargs):
       :param action: push
       :param repository: repository name
       :param repo_store_path: full path to where repositories are stored
+      :param commit_ids: list of pushed commit ids
     """
 
     expected_parameters = (

From 0934da14b2656446ebe1cba598ee660b73d52b72 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 18 Apr 2017 18:27:28 +0200
Subject: [PATCH 024/211] admin-users: fix wrong class name used.

---
 rhodecode/apps/admin/views/users.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rhodecode/apps/admin/views/users.py b/rhodecode/apps/admin/views/users.py
index f801ca36..2fb255b9 100644
--- a/rhodecode/apps/admin/views/users.py
+++ b/rhodecode/apps/admin/views/users.py
@@ -43,7 +43,7 @@ from rhodecode.model.meta import Session
 log = logging.getLogger(__name__)
 
 
-class AdminUsersViewData(BaseAppView, DataGridAppView):
+class AdminUsersView(BaseAppView, DataGridAppView):
     ALLOW_SCOPED_TOKENS = False
     """
     This view has alternative version inside EE, if modified please take a look

From 3f4e34ad07a6ac7d98fa6119cc844a431ef640ee Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 19 Apr 2017 00:48:45 +0200
Subject: [PATCH 025/211] strip: improved html output.

- consistent formatting
- nicer messages on success/errors
---
 .../admin/repos/repo_edit_strip.mako          | 59 +++++++++++++------
 1 file changed, 42 insertions(+), 17 deletions(-)

diff --git a/rhodecode/templates/admin/repos/repo_edit_strip.mako b/rhodecode/templates/admin/repos/repo_edit_strip.mako
index 1ca24b4a..ccec32f2 100644
--- a/rhodecode/templates/admin/repos/repo_edit_strip.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_strip.mako
@@ -23,7 +23,7 @@
                 <div id="results" style="display:none; padding: 10px 0px;"></div>
 
                 <div class="buttons">
-                   <button class="btn btn-small btn-primary" onclick="checkCommits();return false">
+                   <button id="strip_action" class="btn btn-small btn-primary" onclick="checkCommits();return false">
                    ${_('Check commits')}
                    </button>
                 </div>
@@ -111,27 +111,49 @@ checkCommits = function() {
     $('#results').show();
     $('#results').html('<h4>${_('Checking commits')}...</h4>');
     var url = "${h.route_path('strip_check', repo_name=c.repo_info.repo_name)}";
-    var btn = $('button');
+    var btn = $('#strip_action');
     btn.attr('disabled', 'disabled');
     btn.addClass('disabled');
 
     var success = function (data) {
         result_data = {};
         var i = 0;
-        result ='';
+        var result = '<ol>';
         $.each(data, function(index, value){
             i= index;
             var box = $('#box-'+index);
             if (value.rev){
                 result_data[index] = JSON.stringify(value);
-                msg = '${_("author")}: ' + value.author + ' ${_("comment")}: ' + value.comment;
-                result += '<h4><code>' +value.rev+ '</code>${_(' commit verified positive')}</br> '+ msg + '</h4>';
+
+                var verifiedHtml = (
+                        '<li style="line-height:1.2em">' +
+                            '<code>{0}</code>' +
+                            '{1}' +
+                            '<div style="white-space:pre">' +
+                            'author: {2}\n' +
+                            'description: {3}' +
+                            '</div>' +
+                        '</li>').format(
+                            value.rev,
+                            "${_(' commit verified positive')}",
+                            value.author, value.comment
+                            );
+                result += verifiedHtml;
             }
-            else{
-                result += '<h4><code>' +value.commit+ '</code>${_(' commit verified negative')}' + '</h4>';
+            else {
+                var verifiedHtml = (
+                        '<li style="line-height:1.2em">' +
+                            '<code><strike>{0}</strike></code>' +
+                            '{1}' +
+                        '</li>').format(
+                            value.commit,
+                            "${_(' commit verified negative')}"
+                            );
+                result += verifiedHtml;
             }
             box.remove();
         });
+        result += '</ol>';
         var box = $('#box-'+(parseInt(i)+1));
         box.remove();
         $('#results').html(result);
@@ -144,25 +166,28 @@ checkCommits = function() {
     ajaxPOST(url, postData, success, null);
 };
 
-strip = function(){
+strip = function() {
     var url = "${h.route_path('strip_execute', repo_name=c.repo_info.repo_name)}";
-    var success = function(data){
-        result = '';
+    var success = function(data) {
+        var result = '<h4>Strip executed</h4><ol>';
         $.each(data, function(index, value){
-             if(data[index]){
-                 result += '<h4>' +index+ '${_(' commit striped successful')}' + '</h4>';
+             if(data[index]) {
+                 result += '<li><code>' +index+ '</code> ${_(' commit striped successfully')}' + '</li>';
              }
-             else{
-                 result += '<h4>' +index+ '${_(' commit striped failed')}' + '</h4>';
+             else {
+                 result += '<li><code>' +index+ '</code> ${_(' commit strip failed')}' + '</li>';
              }
         });
+        if ($.isEmptyObject(data)) {
+            result += '<li>Nothing done...</li>'
+        }
+        result += '</ol>';
         $('#results').html(result);
 
     };
     ajaxPOST(url, result_data, success, null);
-    var btn = $('button');
-    btn.attr('disabled', 'disabled');
-    btn.addClass('disabled');
+    var btn = $('#strip_action');
+    btn.remove();
 
 };
 </script>

From 59ace831c05cb83a853712c64a36a05d6f79ecc5 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 19 Apr 2017 11:21:15 +0200
Subject: [PATCH 026/211] license: updated license information

---
 rhodecode/config/licenses.json | 200 ++++++++++++++++++++++++++++-----
 1 file changed, 169 insertions(+), 31 deletions(-)

diff --git a/rhodecode/config/licenses.json b/rhodecode/config/licenses.json
index 0548ebc3..14183b80 100644
--- a/rhodecode/config/licenses.json
+++ b/rhodecode/config/licenses.json
@@ -1,11 +1,11 @@
 {
-  "nodejs-4.3.1": {
+  "libnghttp2-1.7.1": {
     "MIT License": "http://spdx.org/licenses/MIT"
   }, 
-  "postgresql-9.5.1": {
-    "PostgreSQL License": "http://spdx.org/licenses/PostgreSQL"
-  }, 
-  "python-2.7.11": {
+  "nodejs-4.3.1": {
+    "MIT License": "http://spdx.org/licenses/MIT"
+  },
+  "python-2.7.12": {
     "Python Software Foundation License version 2": "http://spdx.org/licenses/Python-2.0"
   }, 
   "python2.7-Babel-1.3": {
@@ -14,19 +14,25 @@
   "python2.7-Beaker-1.7.0": {
     "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
+  "python2.7-Chameleon-2.24": {
+    "BSD-like": "http://repoze.org/license.html"
+  },
   "python2.7-FormEncode-1.2.4": {
     "Python Software Foundation License version 2": "http://spdx.org/licenses/Python-2.0"
   }, 
-  "python2.7-Mako-1.0.1": {
+  "python2.7-Jinja2-2.7.3": {
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+  }, 
+  "python2.7-Mako-1.0.6": {
     "MIT License": "http://spdx.org/licenses/MIT"
   }, 
-  "python2.7-Markdown-2.6.2": {
+  "python2.7-Markdown-2.6.7": {
     "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
   "python2.7-MarkupSafe-0.23": {
     "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
-  "python2.7-Paste-2.0.2": {
+  "python2.7-Paste-2.0.3": {
     "MIT License": "http://spdx.org/licenses/MIT"
   }, 
   "python2.7-PasteDeploy-1.5.2": {
@@ -35,12 +41,12 @@
   "python2.7-PasteScript-1.7.5": {
     "MIT License": "http://spdx.org/licenses/MIT"
   }, 
-  "python2.7-Pygments-2.0.2": {
+  "python2.7-Pygments-2.2.0": {
     "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
-  "python2.7-Pylons-1.0.1-patch1": {
+  "python2.7-Pylons-1.0.2.rhodecode-patch1": {
     "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
-  },
+  }, 
   "python2.7-Routes-1.13": {
     "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
@@ -65,7 +71,7 @@
   "python2.7-WebOb-1.3.1": {
     "MIT License": "http://spdx.org/licenses/MIT"
   }, 
-  "python2.7-Whoosh-2.7.0": {
+  "python2.7-Whoosh-2.7.4": {
     "BSD 2-clause \"Simplified\" License": "http://spdx.org/licenses/BSD-2-Clause", 
     "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
@@ -87,9 +93,18 @@
   "python2.7-backport-ipaddress-0.1": {
     "Python Software Foundation License version 2": "http://spdx.org/licenses/Python-2.0"
   }, 
+  "python2.7-backports.shutil-get-terminal-size-1.0.0": {
+    "MIT License": "http://spdx.org/licenses/MIT"
+  }, 
+  "python2.7-bleach-1.5.0": {
+    "Apache License 2.0": "http://spdx.org/licenses/Apache-2.0"
+  }, 
   "python2.7-celery-2.2.10": {
     "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
+  "python2.7-channelstream-0.5.2": {
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+  }, 
   "python2.7-click-5.1": {
     "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
@@ -99,82 +114,169 @@
   "python2.7-configobj-5.0.6": {
     "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
-  "python2.7-cssselect-0.9.1": {
+  "python2.7-configparser-3.5.0": {
+    "MIT License": "http://spdx.org/licenses/MIT"
+  }, 
+  "python2.7-cssselect-1.0.1": {
     "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
-  "python2.7-decorator-3.4.2": {
+  "python2.7-decorator-4.0.11": {
     "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
+  "python2.7-deform-2.0a2": {
+    "BSD-derived": "http://www.repoze.org/LICENSE.txt"
+  }, 
   "python2.7-docutils-0.12": {
     "BSD 2-clause \"Simplified\" License": "http://spdx.org/licenses/BSD-2-Clause"
   }, 
+  "python2.7-dogpile.cache-0.6.1": {
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+  }, 
+  "python2.7-dogpile.core-0.4.1": {
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+  }, 
   "python2.7-elasticsearch-2.3.0": {
     "Apache License 2.0": "http://spdx.org/licenses/Apache-2.0"
   }, 
-  "python2.7-elasticsearch-dsl-2.0.0": {
+  "python2.7-elasticsearch-dsl-2.2.0": {
     "Apache License 2.0": "http://spdx.org/licenses/Apache-2.0"
   }, 
+  "python2.7-entrypoints-0.2.2": {
+    "MIT License": "http://spdx.org/licenses/MIT"
+  }, 
+  "python2.7-enum34-1.1.6": {
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+  }, 
+  "python2.7-functools32-3.2.3.post2": {
+    "Python Software Foundation License version 2": "http://spdx.org/licenses/Python-2.0"
+  }, 
   "python2.7-future-0.14.3": {
     "MIT License": "http://spdx.org/licenses/MIT"
   }, 
   "python2.7-futures-3.0.2": {
     "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
+  "python2.7-gevent-1.1.2": {
+    "MIT License": "http://spdx.org/licenses/MIT"
+  }, 
   "python2.7-gnureadline-6.3.3": {
     "GNU General Public License v1.0 only": "http://spdx.org/licenses/GPL-1.0"
   }, 
+  "python2.7-gprof2dot-2016.10.13": {
+    "GNU Lesser General Public License v3.0 or later": "http://spdx.org/licenses/LGPL-3.0+"
+  }, 
+  "python2.7-greenlet-0.4.10": {
+    "MIT License": "http://spdx.org/licenses/MIT"
+  }, 
   "python2.7-gunicorn-19.6.0": {
     "MIT License": "http://spdx.org/licenses/MIT"
   }, 
+  "python2.7-html5lib-0.9999999": {
+    "MIT License": "http://spdx.org/licenses/MIT"
+  }, 
   "python2.7-infrae.cache-1.0.1": {
     "Zope Public License 2.1": "http://spdx.org/licenses/ZPL-2.1"
   }, 
-  "python2.7-ipython-3.1.0": {
+  "python2.7-ipython-5.1.0": {
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+  }, 
+  "python2.7-ipython-genutils-0.2.0": {
     "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
   "python2.7-iso8601-0.1.11": {
     "MIT License": "http://spdx.org/licenses/MIT"
   }, 
+  "python2.7-itsdangerous-0.24": {
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+  }, 
+  "python2.7-jsonschema-2.6.0": {
+    "MIT License": "http://spdx.org/licenses/MIT"
+  }, 
+  "python2.7-jupyter-client-5.0.0": {
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+  }, 
+  "python2.7-jupyter-core-4.3.0": {
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+  }, 
   "python2.7-kombu-1.5.1": {
     "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
-  "python2.7-msgpack-python-0.4.6": {
+  "python2.7-mistune-0.7.4": {
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+  }, 
+  "python2.7-msgpack-python-0.4.8": {
     "Apache License 2.0": "http://spdx.org/licenses/Apache-2.0"
   }, 
+  "python2.7-nbconvert-5.1.1": {
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+  }, 
+  "python2.7-nbformat-4.3.0": {
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+  }, 
   "python2.7-packaging-15.2": {
     "Apache License 2.0": "http://spdx.org/licenses/Apache-2.0"
   }, 
-  "python2.7-psutil-2.2.1": {
+  "python2.7-pandocfilters-1.4.1": {
     "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
-  "python2.7-psycopg2-2.6": {
+  "python2.7-pathlib2-2.1.0": {
+    "MIT License": "http://spdx.org/licenses/MIT"
+  }, 
+  "python2.7-peppercorn-0.5": {
+    "BSD-derived": "http://www.repoze.org/LICENSE.txt"
+  }, 
+  "python2.7-pexpect-4.2.1": {
+    "ISC License": "http://spdx.org/licenses/ISC"
+  }, 
+  "python2.7-pickleshare-0.7.4": {
+    "MIT License": "http://spdx.org/licenses/MIT"
+  }, 
+  "python2.7-prompt-toolkit-1.0.14": {
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+  }, 
+  "python2.7-psutil-4.3.1": {
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+  }, 
+  "python2.7-psycopg2-2.6.1": {
     "GNU Lesser General Public License v3.0 or later": "http://spdx.org/licenses/LGPL-3.0+"
   }, 
-  "python2.7-py-1.4.29": {
+  "python2.7-ptyprocess-0.5.1": {
+    "ISC License": "http://opensource.org/licenses/ISC"
+  },
+  "python2.7-py-1.4.31": {
     "MIT License": "http://spdx.org/licenses/MIT"
   }, 
   "python2.7-py-bcrypt-0.4": {
     "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
+  "python2.7-py-gfm-0.1.3.rhodecode-upstream1": {
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+  }, 
   "python2.7-pycrypto-2.6.1": {
     "Public Domain": null
   }, 
   "python2.7-pycurl-7.19.5": {
     "MIT License": "http://spdx.org/licenses/MIT"
   }, 
+  "python2.7-pygments-markdown-lexer-0.1.0.dev39": {
+    "Apache License 2.0": "http://spdx.org/licenses/Apache-2.0"
+  }, 
   "python2.7-pyparsing-1.5.7": {
     "MIT License": "http://spdx.org/licenses/MIT"
   }, 
-  "python2.7-pyramid-1.6.1": {
+  "python2.7-pyramid-1.7.4": {
     "Repoze License": "http://www.repoze.org/LICENSE.txt"
   }, 
   "python2.7-pyramid-beaker-0.8": {
     "Repoze License": "http://www.repoze.org/LICENSE.txt"
   }, 
-  "python2.7-pyramid-debugtoolbar-2.4.2": {
+  "python2.7-pyramid-debugtoolbar-3.0.5": {
     "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause", 
     "Repoze License": "http://www.repoze.org/LICENSE.txt"
   }, 
+  "python2.7-pyramid-jinja2-2.5": {
+    "BSD-derived": "http://www.repoze.org/LICENSE.txt"
+  }, 
   "python2.7-pyramid-mako-1.0.2": {
     "Repoze License": "http://www.repoze.org/LICENSE.txt"
   }, 
@@ -182,16 +284,25 @@
     "libpng License": "http://spdx.org/licenses/Libpng", 
     "zlib License": "http://spdx.org/licenses/Zlib"
   }, 
-  "python2.7-pytest-2.8.5": {
+  "python2.7-pytest-3.0.5": {
     "MIT License": "http://spdx.org/licenses/MIT"
   }, 
-  "python2.7-pytest-runner-2.7.1": {
+  "python2.7-pytest-profiling-1.2.2": {
     "MIT License": "http://spdx.org/licenses/MIT"
   }, 
-  "python2.7-python-dateutil-1.5": {
-    "Python Software Foundation License version 2": "http://spdx.org/licenses/Python-2.0"
+  "python2.7-pytest-runner-2.9": {
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
-  "python2.7-python-editor-1.0.1": {
+  "python2.7-pytest-sugar-0.7.1": {
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+  }, 
+  "python2.7-pytest-timeout-1.2.0": {
+    "MIT License": "http://spdx.org/licenses/MIT"
+  }, 
+  "python2.7-python-dateutil-2.1": {
+    "Simplified BSD": null
+  }, 
+  "python2.7-python-editor-1.0.3": {
     "Apache License 2.0": "http://spdx.org/licenses/Apache-2.0"
   }, 
   "python2.7-python-ldap-2.4.19": {
@@ -203,6 +314,9 @@
   "python2.7-pytz-2015.4": {
     "MIT License": "http://spdx.org/licenses/MIT"
   }, 
+  "python2.7-pyzmq-14.6.0": {
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+  },
   "python2.7-recaptcha-client-1.0.6": {
     "MIT License": "http://spdx.org/licenses/MIT"
   }, 
@@ -211,21 +325,35 @@
   }, 
   "python2.7-requests-2.9.1": {
     "Apache License 2.0": "http://spdx.org/licenses/Apache-2.0"
-  },
+  }, 
   "python2.7-setuptools-19.4": {
     "Python Software Foundation License version 2": "http://spdx.org/licenses/Python-2.0", 
     "Zope Public License 2.0": "http://spdx.org/licenses/ZPL-2.0"
   }, 
-  "python2.7-setuptools-scm-1.11.0": {
+  "python2.7-setuptools-scm-1.15.0": {
     "MIT License": "http://spdx.org/licenses/MIT"
   }, 
+  "python2.7-simplegeneric-0.8.1": {
+    "Zope Public License 2.1": "http://spdx.org/licenses/ZPL-2.1"
+  }, 
   "python2.7-simplejson-3.7.2": {
-    "Academic Free License": "http://spdx.org/licenses/AFL-2.1", 
     "MIT License": "http://spdx.org/licenses/MIT"
   }, 
   "python2.7-six-1.9.0": {
     "MIT License": "http://spdx.org/licenses/MIT"
   }, 
+  "python2.7-subprocess32-3.2.6": {
+    "Python Software Foundation License version 2": "http://spdx.org/licenses/Python-2.0"
+  }, 
+  "python2.7-termcolor-1.1.0": {
+    "MIT License": "http://spdx.org/licenses/MIT"
+  }, 
+  "python2.7-testpath-0.1": {
+    "MIT License": "http://spdx.org/licenses/MIT"
+  }, 
+  "python2.7-traitlets-4.3.2": {
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+  }, 
   "python2.7-translationstring-1.3": {
     "Repoze License": "http://www.repoze.org/LICENSE.txt"
   }, 
@@ -235,9 +363,15 @@
   "python2.7-venusian-1.0": {
     "Repoze License": "http://www.repoze.org/LICENSE.txt"
   }, 
-  "python2.7-waitress-0.8.9": {
+  "python2.7-waitress-1.0.1": {
     "Zope Public License 2.1": "http://spdx.org/licenses/ZPL-2.1"
   }, 
+  "python2.7-wcwidth-0.1.7": {
+    "MIT License": "http://spdx.org/licenses/MIT"
+  }, 
+  "python2.7-ws4py-0.3.5": {
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+  }, 
   "python2.7-zope.cachedescriptors-4.0.0": {
     "Zope Public License 2.1": "http://spdx.org/licenses/ZPL-2.1"
   }, 
@@ -246,5 +380,9 @@
   }, 
   "python2.7-zope.interface-4.1.3": {
     "Zope Public License 2.1": "http://spdx.org/licenses/ZPL-2.1"
+  }, 
+  "xz-5.2.2": {
+    "GNU General Public License v2.0 or later": "http://spdx.org/licenses/GPL-2.0+", 
+    "GNU Library General Public License v2.1 or later": "http://spdx.org/licenses/LGPL-2.1+"
   }
 }
\ No newline at end of file

From b59ba6a5f2bde788f2d66e6c10bf6dac674dcc53 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 19 Apr 2017 14:27:17 +0200
Subject: [PATCH 027/211] core: added ext_json as custom renderer using our
 ext_json lib for pyramid.

---
 rhodecode/config/middleware.py     |  4 ++++
 rhodecode/lib/ext_json_renderer.py | 37 ++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 rhodecode/lib/ext_json_renderer.py

diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py
index ea233422..c9863f46 100644
--- a/rhodecode/config/middleware.py
+++ b/rhodecode/config/middleware.py
@@ -315,6 +315,10 @@ def includeme(config):
     # 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')
+
     # include RhodeCode plugins
     includes = aslist(settings.get('rhodecode.includes', []))
     for inc in includes:
diff --git a/rhodecode/lib/ext_json_renderer.py b/rhodecode/lib/ext_json_renderer.py
new file mode 100644
index 00000000..805c2065
--- /dev/null
+++ b/rhodecode/lib/ext_json_renderer.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2017 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/
+
+from rhodecode.lib.ext_json import json
+
+
+def pyramid_ext_json(info):
+    """
+    Custom json renderer for pyramid to use our ext_json lib
+    """
+    def _render(value, system):
+        request = system.get('request')
+        if request is not None:
+            response = request.response
+            ct = response.content_type
+            if ct == response.default_content_type:
+                response.content_type = 'application/json'
+        return json.dumps(value)
+
+    return _render

From 0cf9a675679a5726767f7aef1fb4ab64a68399bb Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 19 Apr 2017 14:34:19 +0200
Subject: [PATCH 028/211] admin-users: use new json_ext renderer

---
 rhodecode/apps/admin/views/users.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rhodecode/apps/admin/views/users.py b/rhodecode/apps/admin/views/users.py
index 2fb255b9..ba42e413 100644
--- a/rhodecode/apps/admin/views/users.py
+++ b/rhodecode/apps/admin/views/users.py
@@ -75,8 +75,8 @@ class AdminUsersView(BaseAppView, DataGridAppView):
     @HasPermissionAllDecorator('hg.admin')
     @view_config(
         # renderer defined below
-        route_name='users_data', request_method='GET', renderer='json',
-        xhr=True)
+        route_name='users_data', request_method='GET',
+        renderer='json_ext', xhr=True)
     def users_list_data(self):
         draw, start, limit = self._extract_chunk(self.request)
         search_q, order_by, order_dir = self._extract_ordering(self.request)

From 5627c638be1b68b185a72ce3b2b4fa74de491242 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 19 Apr 2017 14:34:57 +0200
Subject: [PATCH 029/211] core: moved users and user groups autocomplete into
 pyramid.

- added more tests
- added some logging
---
 rhodecode/apps/home/__init__.py               |  33 +++++
 rhodecode/apps/home/tests/__init__.py         |  19 +++
 .../apps/home/tests/test_get_user_data.py     | 112 +++++++++++++++++
 .../home/tests/test_get_user_group_data.py    | 117 ++++++++++++++++++
 rhodecode/apps/home/views.py                  |  81 ++++++++++++
 rhodecode/config/middleware.py                |   1 +
 rhodecode/config/routing.py                   |   5 -
 rhodecode/controllers/home.py                 |  33 -----
 rhodecode/tests/fixture.py                    |   4 +
 rhodecode/tests/functional/test_home.py       |  71 -----------
 10 files changed, 367 insertions(+), 109 deletions(-)
 create mode 100644 rhodecode/apps/home/__init__.py
 create mode 100644 rhodecode/apps/home/tests/__init__.py
 create mode 100644 rhodecode/apps/home/tests/test_get_user_data.py
 create mode 100644 rhodecode/apps/home/tests/test_get_user_group_data.py
 create mode 100644 rhodecode/apps/home/views.py

diff --git a/rhodecode/apps/home/__init__.py b/rhodecode/apps/home/__init__.py
new file mode 100644
index 00000000..802e6774
--- /dev/null
+++ b/rhodecode/apps/home/__init__.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017 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/
+
+
+def includeme(config):
+
+    config.add_route(
+        name='user_autocomplete_data',
+        pattern='/_users')
+
+    config.add_route(
+        name='user_group_autocomplete_data',
+        pattern='/_user_groups')
+
+    # Scan module for configuration decorators.
+    config.scan()
diff --git a/rhodecode/apps/home/tests/__init__.py b/rhodecode/apps/home/tests/__init__.py
new file mode 100644
index 00000000..7cb7ec08
--- /dev/null
+++ b/rhodecode/apps/home/tests/__init__.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017 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/
diff --git a/rhodecode/apps/home/tests/test_get_user_data.py b/rhodecode/apps/home/tests/test_get_user_data.py
new file mode 100644
index 00000000..ab1f1dd9
--- /dev/null
+++ b/rhodecode/apps/home/tests/test_get_user_data.py
@@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017 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 json
+import pytest
+
+from rhodecode.tests import TestController
+from rhodecode.tests.fixture import Fixture
+
+
+fixture = Fixture()
+
+
+def route_path(name, params=None, **kwargs):
+    import urllib
+
+    base_url = {
+        'user_autocomplete_data': '/_users',
+        'user_group_autocomplete_data': '/_user_groups'
+    }[name].format(**kwargs)
+
+    if params:
+        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+    return base_url
+
+
+class TestUserAutocompleteData(TestController):
+
+    def test_returns_list_of_users(self, user_util, xhr_header):
+        self.log_user()
+        user = user_util.create_user(active=True)
+        user_name = user.username
+        response = self.app.get(
+            route_path('user_autocomplete_data'),
+            extra_environ=xhr_header, status=200)
+        result = json.loads(response.body)
+        values = [suggestion['value'] for suggestion in result['suggestions']]
+        assert user_name in values
+
+    def test_returns_inactive_users_when_active_flag_sent(
+            self, user_util, xhr_header):
+        self.log_user()
+        user = user_util.create_user(active=False)
+        user_name = user.username
+
+        response = self.app.get(
+            route_path('user_autocomplete_data',
+                       params=dict(user_groups='true', active='0')),
+            extra_environ=xhr_header, status=200)
+        result = json.loads(response.body)
+        values = [suggestion['value'] for suggestion in result['suggestions']]
+        assert user_name in values
+
+        response = self.app.get(
+            route_path('user_autocomplete_data',
+                       params=dict(user_groups='true', active='1')),
+            extra_environ=xhr_header, status=200)
+        result = json.loads(response.body)
+        values = [suggestion['value'] for suggestion in result['suggestions']]
+        assert user_name not in values
+
+    def test_returns_groups_when_user_groups_flag_sent(
+            self, user_util, xhr_header):
+        self.log_user()
+        group = user_util.create_user_group(user_groups_active=True)
+        group_name = group.users_group_name
+        response = self.app.get(
+            route_path('user_autocomplete_data',
+                       params=dict(user_groups='true')),
+            extra_environ=xhr_header, status=200)
+        result = json.loads(response.body)
+        values = [suggestion['value'] for suggestion in result['suggestions']]
+        assert group_name in values
+
+    @pytest.mark.parametrize('query, count', [
+        ('hello1', 0),
+        ('dev', 2),
+    ])
+    def test_result_is_limited_when_query_is_sent(self, user_util, xhr_header,
+                                                  query, count):
+        self.log_user()
+
+        user_util._test_name = 'dev-test'
+        user_util.create_user()
+
+        user_util._test_name = 'dev-group-test'
+        user_util.create_user_group()
+
+        response = self.app.get(
+            route_path('user_autocomplete_data',
+                       params=dict(user_groups='true', query=query)),
+            extra_environ=xhr_header, status=200)
+
+        result = json.loads(response.body)
+        assert len(result['suggestions']) == count
diff --git a/rhodecode/apps/home/tests/test_get_user_group_data.py b/rhodecode/apps/home/tests/test_get_user_group_data.py
new file mode 100644
index 00000000..fc03648d
--- /dev/null
+++ b/rhodecode/apps/home/tests/test_get_user_group_data.py
@@ -0,0 +1,117 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017 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/
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017 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 json
+
+import pytest
+
+from rhodecode.tests import TestController
+from rhodecode.tests.fixture import Fixture
+
+
+fixture = Fixture()
+
+
+def route_path(name, params=None, **kwargs):
+    import urllib
+
+    base_url = {
+        'user_autocomplete_data': '/_users',
+        'user_group_autocomplete_data': '/_user_groups'
+    }[name].format(**kwargs)
+
+    if params:
+        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+    return base_url
+
+
+class TestUserGroupAutocompleteData(TestController):
+
+    def test_returns_list_of_user_groups(self, user_util, xhr_header):
+        self.log_user()
+        user_group = user_util.create_user_group(active=True)
+        user_group_name = user_group.users_group_name
+        response = self.app.get(
+            route_path('user_group_autocomplete_data'),
+            extra_environ=xhr_header, status=200)
+        result = json.loads(response.body)
+        values = [suggestion['value'] for suggestion in result['suggestions']]
+        assert user_group_name in values
+
+    def test_returns_inactive_user_groups_when_active_flag_sent(
+            self, user_util, xhr_header):
+        self.log_user()
+        user_group = user_util.create_user_group(active=False)
+        user_group_name = user_group.users_group_name
+
+        response = self.app.get(
+            route_path('user_group_autocomplete_data',
+                       params=dict(active='0')),
+            extra_environ=xhr_header, status=200)
+        result = json.loads(response.body)
+        values = [suggestion['value'] for suggestion in result['suggestions']]
+        assert user_group_name in values
+
+        response = self.app.get(
+            route_path('user_group_autocomplete_data',
+                       params=dict(active='1')),
+            extra_environ=xhr_header, status=200)
+        result = json.loads(response.body)
+        values = [suggestion['value'] for suggestion in result['suggestions']]
+        assert user_group_name not in values
+
+    @pytest.mark.parametrize('query, count', [
+        ('hello1', 0),
+        ('dev', 1),
+    ])
+    def test_result_is_limited_when_query_is_sent(self, user_util, xhr_header, query, count):
+        self.log_user()
+
+        user_util._test_name = 'dev-test'
+        user_util.create_user_group()
+
+        response = self.app.get(
+            route_path('user_group_autocomplete_data',
+                       params=dict(user_groups='true',
+                                   query=query)),
+            extra_environ=xhr_header, status=200)
+
+        result = json.loads(response.body)
+
+        assert len(result['suggestions']) == count
diff --git a/rhodecode/apps/home/views.py b/rhodecode/apps/home/views.py
new file mode 100644
index 00000000..68f9ae7c
--- /dev/null
+++ b/rhodecode/apps/home/views.py
@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017 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
+
+from pyramid.view import view_config
+
+from rhodecode.apps._base import BaseAppView
+from rhodecode.lib.auth import LoginRequired, NotAnonymous
+from rhodecode.lib.utils2 import str2bool
+from rhodecode.model.repo import RepoModel
+
+log = logging.getLogger(__name__)
+
+
+class HomeView(BaseAppView):
+
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+        c.user = c.auth_user.get_instance()
+        self._register_global_c(c)
+        return c
+
+    @LoginRequired()
+    @view_config(
+        route_name='user_autocomplete_data', request_method='GET',
+        renderer='json_ext', xhr=True)
+    def user_autocomplete_data(self):
+        query = self.request.GET.get('query')
+        active = str2bool(self.request.GET.get('active') or True)
+        include_groups = str2bool(self.request.GET.get('user_groups'))
+
+        log.debug('generating user list, query:%s, active:%s, with_groups:%s',
+                  query, active, include_groups)
+
+        repo_model = RepoModel()
+        _users = repo_model.get_users(
+            name_contains=query, only_active=active)
+
+        if include_groups:
+            # extend with user groups
+            _user_groups = repo_model.get_user_groups(
+                name_contains=query, only_active=active)
+            _users = _users + _user_groups
+
+        return {'suggestions': _users}
+
+    @LoginRequired()
+    @NotAnonymous()
+    @view_config(
+        route_name='user_group_autocomplete_data', request_method='GET',
+        renderer='json_ext', xhr=True)
+    def user_group_autocomplete_data(self):
+        query = self.request.GET.get('query')
+        active = str2bool(self.request.GET.get('active') or True)
+        log.debug('generating user group list, query:%s, active:%s',
+                  query, active)
+
+        repo_model = RepoModel()
+        _user_groups = repo_model.get_user_groups(
+            name_contains=query, only_active=active)
+        _user_groups = _user_groups
+
+        return {'suggestions': _user_groups}
diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py
index c9863f46..be2a54ad 100644
--- a/rhodecode/config/middleware.py
+++ b/rhodecode/config/middleware.py
@@ -288,6 +288,7 @@ def includeme(config):
     config.include('rhodecode.apps.admin')
     config.include('rhodecode.apps.channelstream')
     config.include('rhodecode.apps.login')
+    config.include('rhodecode.apps.home')
     config.include('rhodecode.apps.repository')
     config.include('rhodecode.apps.user_profile')
     config.include('rhodecode.apps.my_account')
diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py
index 96dc2a62..3cf4b6f4 100644
--- a/rhodecode/config/routing.py
+++ b/rhodecode/config/routing.py
@@ -193,11 +193,6 @@ def make_map(config):
     rmap.connect('repo_list_data', '/_repos', controller='home',
                  action='repo_list_data')
 
-    rmap.connect('user_autocomplete_data', '/_users', controller='home',
-                 action='user_autocomplete_data', jsroute=True)
-    rmap.connect('user_group_autocomplete_data', '/_user_groups', controller='home',
-                 action='user_group_autocomplete_data', jsroute=True)
-
     # TODO: johbo: Static links, to be replaced by our redirection mechanism
     rmap.connect('rst_help',
                  'http://docutils.sourceforge.net/docs/user/rst/quickref.html',
diff --git a/rhodecode/controllers/home.py b/rhodecode/controllers/home.py
index 5a5c075e..9a5698d6 100644
--- a/rhodecode/controllers/home.py
+++ b/rhodecode/controllers/home.py
@@ -255,36 +255,3 @@ class HomeController(BaseController):
             'results': res
         }
         return data
-
-    @LoginRequired()
-    @XHRRequired()
-    @jsonify
-    def user_autocomplete_data(self):
-        query = request.GET.get('query')
-        active = str2bool(request.GET.get('active') or True)
-
-        repo_model = RepoModel()
-        _users = repo_model.get_users(
-            name_contains=query, only_active=active)
-
-        if request.GET.get('user_groups'):
-            # extend with user groups
-            _user_groups = repo_model.get_user_groups(
-                name_contains=query, only_active=active)
-            _users = _users + _user_groups
-
-        return {'suggestions': _users}
-
-    @LoginRequired()
-    @XHRRequired()
-    @jsonify
-    def user_group_autocomplete_data(self):
-        query = request.GET.get('query')
-        active = str2bool(request.GET.get('active') or True)
-
-        repo_model = RepoModel()
-        _user_groups = repo_model.get_user_groups(
-            name_contains=query, only_active=active)
-        _user_groups = _user_groups
-
-        return {'suggestions': _user_groups}
diff --git a/rhodecode/tests/fixture.py b/rhodecode/tests/fixture.py
index 644386b6..983d7f31 100644
--- a/rhodecode/tests/fixture.py
+++ b/rhodecode/tests/fixture.py
@@ -286,6 +286,10 @@ class Fixture(object):
             gr = UserGroup.get_by_group_name(group_name=name)
             if gr:
                 return gr
+        # map active flag to the real attribute. For API consistency of fixtures
+        if 'active' in kwargs:
+            kwargs['users_group_active'] = kwargs['active']
+            del kwargs['active']
         form_data = self._get_user_group_create_params(name, **kwargs)
         owner = kwargs.get('cur_user', TEST_USER_ADMIN_LOGIN)
         user_group = UserGroupModel().create(
diff --git a/rhodecode/tests/functional/test_home.py b/rhodecode/tests/functional/test_home.py
index 1bb8a318..c1846822 100644
--- a/rhodecode/tests/functional/test_home.py
+++ b/rhodecode/tests/functional/test_home.py
@@ -132,77 +132,6 @@ class TestHomeController(TestController):
             response.mustcontain(no=[version_string])
 
 
-class TestUserAutocompleteData(TestController):
-    def test_returns_list_of_users(self, user_util):
-        self.log_user()
-        user = user_util.create_user(is_active=True)
-        user_name = user.username
-        response = self.app.get(
-            url(controller='home', action='user_autocomplete_data'),
-            headers={'X-REQUESTED-WITH': 'XMLHttpRequest', }, status=200)
-        result = json.loads(response.body)
-        values = [suggestion['value'] for suggestion in result['suggestions']]
-        assert user_name in values
-
-    def test_returns_inactive_users_when_active_flag_sent(self, user_util):
-        self.log_user()
-        user = user_util.create_user(is_active=False)
-        user_name = user.username
-        response = self.app.get(
-            url(controller='home', action='user_autocomplete_data',
-                user_groups='true', active='0'),
-            headers={'X-REQUESTED-WITH': 'XMLHttpRequest', }, status=200)
-        result = json.loads(response.body)
-        values = [suggestion['value'] for suggestion in result['suggestions']]
-        assert user_name in values
-
-    def test_returns_groups_when_user_groups_sent(self, user_util):
-        self.log_user()
-        group = user_util.create_user_group(user_groups_active=True)
-        group_name = group.users_group_name
-        response = self.app.get(
-            url(controller='home', action='user_autocomplete_data',
-                user_groups='true'),
-            headers={'X-REQUESTED-WITH': 'XMLHttpRequest', }, status=200)
-        result = json.loads(response.body)
-        values = [suggestion['value'] for suggestion in result['suggestions']]
-        assert group_name in values
-
-    def test_result_is_limited_when_query_is_sent(self):
-        self.log_user()
-        fake_result = [
-            {
-                'first_name': 'John',
-                'value_display': 'hello{} (John Smith)'.format(i),
-                'icon_link': '/images/user14.png',
-                'value': 'hello{}'.format(i),
-                'last_name': 'Smith',
-                'username': 'hello{}'.format(i),
-                'id': i,
-                'value_type': u'user'
-            }
-            for i in range(10)
-        ]
-        users_patcher = patch.object(
-            RepoModel, 'get_users', return_value=fake_result)
-        groups_patcher = patch.object(
-            RepoModel, 'get_user_groups', return_value=fake_result)
-
-        query = 'hello'
-        with users_patcher as users_mock, groups_patcher as groups_mock:
-            response = self.app.get(
-                url(controller='home', action='user_autocomplete_data',
-                    user_groups='true', query=query),
-                headers={'X-REQUESTED-WITH': 'XMLHttpRequest', }, status=200)
-
-        result = json.loads(response.body)
-        users_mock.assert_called_once_with(
-            name_contains=query, only_active=True)
-        groups_mock.assert_called_once_with(
-            name_contains=query, only_active=True)
-        assert len(result['suggestions']) == 20
-
-
 def assert_and_get_content(result):
     repos = []
     groups = []

From d3041b73d64f8eed1f1457db8be0b67c742c49aa Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 19 Apr 2017 14:40:29 +0200
Subject: [PATCH 030/211] core: moved repo_list data to pyramid.

---
 rhodecode/apps/home/__init__.py               |   4 +
 rhodecode/apps/home/tests/__init__.py         |  21 ++++
 .../home/tests/test_get_repo_list_data.py     | 103 ++++++++++++++++++
 rhodecode/apps/home/views.py                  |  59 +++++++++-
 rhodecode/config/routing.py                   |   2 -
 rhodecode/controllers/home.py                 |  22 ----
 rhodecode/public/js/rhodecode/routes.js       |   5 +-
 .../my_account/my_account_auth_tokens.mako    |   2 +-
 .../admin/repos/repo_edit_advanced.mako       |   2 +-
 .../admin/users/user_edit_auth_tokens.mako    |   2 +-
 rhodecode/tests/functional/test_home.py       |  62 -----------
 11 files changed, 192 insertions(+), 92 deletions(-)
 create mode 100644 rhodecode/apps/home/tests/test_get_repo_list_data.py

diff --git a/rhodecode/apps/home/__init__.py b/rhodecode/apps/home/__init__.py
index 802e6774..c9a6b974 100644
--- a/rhodecode/apps/home/__init__.py
+++ b/rhodecode/apps/home/__init__.py
@@ -29,5 +29,9 @@ def includeme(config):
         name='user_group_autocomplete_data',
         pattern='/_user_groups')
 
+    config.add_route(
+        name='repo_list_data',
+        pattern='/_repos')
+
     # Scan module for configuration decorators.
     config.scan()
diff --git a/rhodecode/apps/home/tests/__init__.py b/rhodecode/apps/home/tests/__init__.py
index 7cb7ec08..4a1eca8d 100644
--- a/rhodecode/apps/home/tests/__init__.py
+++ b/rhodecode/apps/home/tests/__init__.py
@@ -17,3 +17,24 @@
 # 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/
+
+
+def assert_and_get_content(result):
+    repos = []
+    groups = []
+    commits = []
+    for data in result:
+        for data_item in data['children']:
+            assert data_item['id']
+            assert data_item['text']
+            assert data_item['url']
+            if data_item['type'] == 'repo':
+                repos.append(data_item)
+            elif data_item['type'] == 'group':
+                groups.append(data_item)
+            elif data_item['type'] == 'commit':
+                commits.append(data_item)
+            else:
+                raise Exception('invalid type %s' % data_item['type'])
+
+    return repos, groups, commits
\ No newline at end of file
diff --git a/rhodecode/apps/home/tests/test_get_repo_list_data.py b/rhodecode/apps/home/tests/test_get_repo_list_data.py
new file mode 100644
index 00000000..7c51bd8b
--- /dev/null
+++ b/rhodecode/apps/home/tests/test_get_repo_list_data.py
@@ -0,0 +1,103 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017 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 json
+
+from . import assert_and_get_content
+from rhodecode.tests import TestController
+from rhodecode.tests.fixture import Fixture
+from rhodecode.model.db import Repository
+
+fixture = Fixture()
+
+
+def route_path(name, params=None, **kwargs):
+    import urllib
+
+    base_url = {
+        'repo_list_data': '/_repos',
+    }[name].format(**kwargs)
+
+    if params:
+        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+    return base_url
+
+
+class TestRepoListData(TestController):
+
+    def test_returns_list_of_repos_and_groups(self, xhr_header):
+        self.log_user()
+
+        response = self.app.get(
+            route_path('repo_list_data'),
+            extra_environ=xhr_header, status=200)
+        result = json.loads(response.body)['results']
+
+        repos, groups, commits = assert_and_get_content(result)
+
+        assert len(repos) == len(Repository.get_all())
+        assert len(groups) == 0
+        assert len(commits) == 0
+
+    def test_returns_list_of_repos_and_groups_filtered(self, xhr_header):
+        self.log_user()
+
+        response = self.app.get(
+            route_path('repo_list_data'),
+            params={'query': 'vcs_test_git'},
+            extra_environ=xhr_header, status=200)
+        result = json.loads(response.body)['results']
+
+        repos, groups, commits = assert_and_get_content(result)
+
+        assert len(repos) == len(Repository.query().filter(
+            Repository.repo_name.ilike('%vcs_test_git%')).all())
+        assert len(groups) == 0
+        assert len(commits) == 0
+
+    def test_returns_list_of_repos_and_groups_filtered_with_type(self, xhr_header):
+        self.log_user()
+
+        response = self.app.get(
+            route_path('repo_list_data'),
+            params={'query': 'vcs_test_git', 'repo_type': 'git'},
+            extra_environ=xhr_header, status=200)
+        result = json.loads(response.body)['results']
+
+        repos, groups, commits = assert_and_get_content(result)
+
+        assert len(repos) == len(Repository.query().filter(
+            Repository.repo_name.ilike('%vcs_test_git%')).all())
+        assert len(groups) == 0
+        assert len(commits) == 0
+
+    def test_returns_list_of_repos_non_ascii_query(self, xhr_header):
+        self.log_user()
+        response = self.app.get(
+            route_path('repo_list_data'),
+            params={'query': 'ć_vcs_test_ą', 'repo_type': 'git'},
+            extra_environ=xhr_header, status=200)
+        result = json.loads(response.body)['results']
+
+        repos, groups, commits = assert_and_get_content(result)
+
+        assert len(repos) == 0
+        assert len(groups) == 0
+        assert len(commits) == 0
diff --git a/rhodecode/apps/home/views.py b/rhodecode/apps/home/views.py
index 68f9ae7c..79bf1ff2 100644
--- a/rhodecode/apps/home/views.py
+++ b/rhodecode/apps/home/views.py
@@ -23,9 +23,13 @@ import logging
 from pyramid.view import view_config
 
 from rhodecode.apps._base import BaseAppView
+from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, NotAnonymous
-from rhodecode.lib.utils2 import str2bool
+from rhodecode.lib.utils2 import safe_unicode, str2bool
+from rhodecode.model.db import func, Repository
 from rhodecode.model.repo import RepoModel
+from rhodecode.model.scm import ScmModel
+
 
 log = logging.getLogger(__name__)
 
@@ -79,3 +83,56 @@ class HomeView(BaseAppView):
         _user_groups = _user_groups
 
         return {'suggestions': _user_groups}
+
+    def _get_repo_list(self, name_contains=None, repo_type=None, limit=20):
+        query = Repository.query()\
+            .order_by(func.length(Repository.repo_name))\
+            .order_by(Repository.repo_name)
+
+        if repo_type:
+            query = query.filter(Repository.repo_type == repo_type)
+
+        if name_contains:
+            ilike_expression = u'%{}%'.format(safe_unicode(name_contains))
+            query = query.filter(
+                Repository.repo_name.ilike(ilike_expression))
+            query = query.limit(limit)
+
+        all_repos = query.all()
+        # permission checks are inside this function
+        repo_iter = ScmModel().get_repos(all_repos)
+        return [
+            {
+                'id': obj['name'],
+                'text': obj['name'],
+                'type': 'repo',
+                'obj': obj['dbrepo'],
+                'url': h.url('summary_home', repo_name=obj['name'])
+            }
+            for obj in repo_iter]
+
+    @LoginRequired()
+    @view_config(
+        route_name='repo_list_data', request_method='GET',
+        renderer='json_ext', xhr=True)
+    def repo_list_data(self):
+        _ = self.request.translate
+
+        query = self.request.GET.get('query')
+        repo_type = self.request.GET.get('repo_type')
+        log.debug('generating repo list, query:%s, repo_type:%s',
+                  query, repo_type)
+
+        res = []
+        repos = self._get_repo_list(query, repo_type=repo_type)
+        if repos:
+            res.append({
+                'text': _('Repositories'),
+                'children': repos
+            })
+
+        data = {
+            'more': False,
+            'results': res
+        }
+        return data
diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py
index 3cf4b6f4..1cfa2c88 100644
--- a/rhodecode/config/routing.py
+++ b/rhodecode/config/routing.py
@@ -190,8 +190,6 @@ def make_map(config):
     rmap.connect('home', '/', controller='home', action='index', jsroute=True)
     rmap.connect('goto_switcher_data', '/_goto_data', controller='home',
                  action='goto_switcher_data')
-    rmap.connect('repo_list_data', '/_repos', controller='home',
-                 action='repo_list_data')
 
     # TODO: johbo: Static links, to be replaced by our redirection mechanism
     rmap.connect('rst_help',
diff --git a/rhodecode/controllers/home.py b/rhodecode/controllers/home.py
index 9a5698d6..c8f48972 100644
--- a/rhodecode/controllers/home.py
+++ b/rhodecode/controllers/home.py
@@ -233,25 +233,3 @@ class HomeController(BaseController):
             'results': res
         }
         return data
-
-    @LoginRequired()
-    @XHRRequired()
-    @jsonify
-    def repo_list_data(self):
-        query = request.GET.get('query')
-        repo_type = request.GET.get('repo_type')
-        log.debug('generating repo list, query:%s', query)
-
-        res = []
-        repos = self._get_repo_list(query, repo_type=repo_type)
-        if repos:
-            res.append({
-                'text': _('Repositories'),
-                'children': repos
-            })
-
-        data = {
-            'more': False,
-            'results': res
-        }
-        return data
diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js
index 490e8dfe..833d9c4c 100644
--- a/rhodecode/public/js/rhodecode/routes.js
+++ b/rhodecode/public/js/rhodecode/routes.js
@@ -13,8 +13,6 @@
 function registerRCRoutes() {
     // routes registration
     pyroutes.register('home', '/', []);
-    pyroutes.register('user_autocomplete_data', '/_users', []);
-    pyroutes.register('user_group_autocomplete_data', '/_user_groups', []);
     pyroutes.register('new_repo', '/_admin/create_repository', []);
     pyroutes.register('edit_user', '/_admin/users/%(user_id)s/edit', ['user_id']);
     pyroutes.register('edit_user_group_members', '/_admin/user_groups/%(user_group_id)s/edit/members', ['user_group_id']);
@@ -95,6 +93,9 @@ function registerRCRoutes() {
     pyroutes.register('register', '/_admin/register', []);
     pyroutes.register('reset_password', '/_admin/password_reset', []);
     pyroutes.register('reset_password_confirmation', '/_admin/password_reset_confirmation', []);
+    pyroutes.register('user_autocomplete_data', '/_users', []);
+    pyroutes.register('user_group_autocomplete_data', '/_user_groups', []);
+    pyroutes.register('repo_list_data', '/_repos', []);
     pyroutes.register('repo_maintenance', '/%(repo_name)s/maintenance', ['repo_name']);
     pyroutes.register('repo_maintenance_execute', '/%(repo_name)s/maintenance/execute', ['repo_name']);
     pyroutes.register('strip', '/%(repo_name)s/strip', ['repo_name']);
diff --git a/rhodecode/templates/admin/my_account/my_account_auth_tokens.mako b/rhodecode/templates/admin/my_account/my_account_auth_tokens.mako
index 3ec2b083..4daa2dc3 100644
--- a/rhodecode/templates/admin/my_account/my_account_auth_tokens.mako
+++ b/rhodecode/templates/admin/my_account/my_account_auth_tokens.mako
@@ -139,7 +139,7 @@ $("#scope_repo_id").select2({
             query.callback({results: cachedData.results});
         } else {
             $.ajax({
-                url: "${h.url('repo_list_data')}",
+                url: pyroutes.url('repo_list_data'),
                 data: {'query': query.term},
                 dataType: 'json',
                 type: 'GET',
diff --git a/rhodecode/templates/admin/repos/repo_edit_advanced.mako b/rhodecode/templates/admin/repos/repo_edit_advanced.mako
index be0a3300..f71c8d5c 100644
--- a/rhodecode/templates/admin/repos/repo_edit_advanced.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_advanced.mako
@@ -191,7 +191,7 @@ $("#id_fork_of").select2({
             query.callback({results: cachedData.results});
         } else {
             $.ajax({
-                url: "${h.url('repo_list_data')}",
+                url: pyroutes.url('repo_list_data'),
                 data: {'query': query.term, repo_type: '${c.repo_info.repo_type}'},
                 dataType: 'json',
                 type: 'GET',
diff --git a/rhodecode/templates/admin/users/user_edit_auth_tokens.mako b/rhodecode/templates/admin/users/user_edit_auth_tokens.mako
index cc514b5e..a38d4ff9 100644
--- a/rhodecode/templates/admin/users/user_edit_auth_tokens.mako
+++ b/rhodecode/templates/admin/users/user_edit_auth_tokens.mako
@@ -136,7 +136,7 @@ $("#scope_repo_id").select2({
             query.callback({results: cachedData.results});
         } else {
             $.ajax({
-                url: "${h.url('repo_list_data')}",
+                url: pyroutes.url('repo_list_data'),
                 data: {'query': query.term},
                 dataType: 'json',
                 type: 'GET',
diff --git a/rhodecode/tests/functional/test_home.py b/rhodecode/tests/functional/test_home.py
index c1846822..3123ae66 100644
--- a/rhodecode/tests/functional/test_home.py
+++ b/rhodecode/tests/functional/test_home.py
@@ -255,65 +255,3 @@ class TestGotoSwitcherData(TestController):
         test_groups = [x['text'] for x in groups[:4]]
         assert ['abc_repos', 'repos_abc',
                 'forked-abc', 'forked-abc/a'] == test_groups
-
-
-class TestRepoListData(TestController):
-    def test_returns_list_of_repos_and_groups(self, user_util):
-        self.log_user()
-
-        response = self.app.get(
-            url(controller='home', action='repo_list_data'),
-            headers={'X-REQUESTED-WITH': 'XMLHttpRequest', }, status=200)
-        result = json.loads(response.body)['results']
-
-        repos, groups, commits = assert_and_get_content(result)
-
-        assert len(repos) == len(Repository.get_all())
-        assert len(groups) == 0
-        assert len(commits) == 0
-
-    def test_returns_list_of_repos_and_groups_filtered(self):
-        self.log_user()
-
-        response = self.app.get(
-            url(controller='home', action='repo_list_data'),
-            headers={'X-REQUESTED-WITH': 'XMLHttpRequest', },
-            params={'query': 'vcs_test_git'}, status=200)
-        result = json.loads(response.body)['results']
-
-        repos, groups, commits = assert_and_get_content(result)
-
-        assert len(repos) == len(Repository.query().filter(
-            Repository.repo_name.ilike('%vcs_test_git%')).all())
-        assert len(groups) == 0
-        assert len(commits) == 0
-
-    def test_returns_list_of_repos_and_groups_filtered_with_type(self):
-        self.log_user()
-
-        response = self.app.get(
-            url(controller='home', action='repo_list_data'),
-            headers={'X-REQUESTED-WITH': 'XMLHttpRequest', },
-            params={'query': 'vcs_test_git', 'repo_type': 'git'}, status=200)
-        result = json.loads(response.body)['results']
-
-        repos, groups, commits = assert_and_get_content(result)
-
-        assert len(repos) == len(Repository.query().filter(
-            Repository.repo_name.ilike('%vcs_test_git%')).all())
-        assert len(groups) == 0
-        assert len(commits) == 0
-
-    def test_returns_list_of_repos_non_ascii_query(self):
-        self.log_user()
-        response = self.app.get(
-            url(controller='home', action='repo_list_data'),
-            headers={'X-REQUESTED-WITH': 'XMLHttpRequest', },
-            params={'query': 'ć_vcs_test_ą', 'repo_type': 'git'}, status=200)
-        result = json.loads(response.body)['results']
-
-        repos, groups, commits = assert_and_get_content(result)
-
-        assert len(repos) == 0
-        assert len(groups) == 0
-        assert len(commits) == 0

From e6137d85f41fbfec91e35b7241603e27eb484280 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 19 Apr 2017 15:12:58 +0200
Subject: [PATCH 031/211] core: moved goto_switcher views into pyramid.

---
 rhodecode/apps/home/__init__.py               |   4 +
 .../home/tests/test_get_goto_switched_data.py | 151 ++++++++++++++++++
 rhodecode/apps/home/views.py                  | 101 +++++++++++-
 rhodecode/config/routing.py                   |   2 -
 rhodecode/controllers/home.py                 | 133 +--------------
 rhodecode/public/js/rhodecode/routes.js       |   1 +
 rhodecode/templates/base/base.mako            |   2 +-
 rhodecode/tests/functional/test_home.py       | 132 +--------------
 8 files changed, 263 insertions(+), 263 deletions(-)
 create mode 100644 rhodecode/apps/home/tests/test_get_goto_switched_data.py

diff --git a/rhodecode/apps/home/__init__.py b/rhodecode/apps/home/__init__.py
index c9a6b974..d0ecad0f 100644
--- a/rhodecode/apps/home/__init__.py
+++ b/rhodecode/apps/home/__init__.py
@@ -33,5 +33,9 @@ def includeme(config):
         name='repo_list_data',
         pattern='/_repos')
 
+    config.add_route(
+        name='goto_switcher_data',
+        pattern='/_goto_data')
+
     # Scan module for configuration decorators.
     config.scan()
diff --git a/rhodecode/apps/home/tests/test_get_goto_switched_data.py b/rhodecode/apps/home/tests/test_get_goto_switched_data.py
new file mode 100644
index 00000000..bca1c1a1
--- /dev/null
+++ b/rhodecode/apps/home/tests/test_get_goto_switched_data.py
@@ -0,0 +1,151 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017 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 json
+
+import pytest
+
+from . import assert_and_get_content
+from rhodecode.tests import TestController, TEST_USER_ADMIN_LOGIN
+from rhodecode.tests.fixture import Fixture
+
+from rhodecode.lib.utils import map_groups
+from rhodecode.model.repo import RepoModel
+from rhodecode.model.repo_group import RepoGroupModel
+from rhodecode.model.db import Session, Repository, RepoGroup
+
+fixture = Fixture()
+
+
+def route_path(name, params=None, **kwargs):
+    import urllib
+
+    base_url = {
+        'goto_switcher_data': '/_goto_data',
+    }[name].format(**kwargs)
+
+    if params:
+        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+    return base_url
+
+
+class TestGotoSwitcherData(TestController):
+
+    required_repos_with_groups = [
+        'abc',
+        'abc-fork',
+        'forks/abcd',
+        'abcd',
+        'abcde',
+        'a/abc',
+        'aa/abc',
+        'aaa/abc',
+        'aaaa/abc',
+        'repos_abc/aaa/abc',
+        'abc_repos/abc',
+        'abc_repos/abcd',
+        'xxx/xyz',
+        'forked-abc/a/abc'
+    ]
+
+    @pytest.fixture(autouse=True, scope='class')
+    def prepare(self, request, pylonsapp):
+        for repo_and_group in self.required_repos_with_groups:
+            # create structure of groups and return the last group
+
+            repo_group = map_groups(repo_and_group)
+
+            RepoModel()._create_repo(
+                repo_and_group, 'hg', 'test-ac', TEST_USER_ADMIN_LOGIN,
+                repo_group=getattr(repo_group, 'group_id', None))
+
+            Session().commit()
+
+        request.addfinalizer(self.cleanup)
+
+    def cleanup(self):
+        # first delete all repos
+        for repo_and_groups in self.required_repos_with_groups:
+            repo = Repository.get_by_repo_name(repo_and_groups)
+            if repo:
+                RepoModel().delete(repo)
+                Session().commit()
+
+        # then delete all empty groups
+        for repo_and_groups in self.required_repos_with_groups:
+            if '/' in repo_and_groups:
+                r_group = repo_and_groups.rsplit('/', 1)[0]
+                repo_group = RepoGroup.get_by_group_name(r_group)
+                if not repo_group:
+                    continue
+                parents = repo_group.parents
+                RepoGroupModel().delete(repo_group, force_delete=True)
+                Session().commit()
+
+                for el in reversed(parents):
+                    RepoGroupModel().delete(el, force_delete=True)
+                    Session().commit()
+
+    def test_returns_list_of_repos_and_groups(self, xhr_header):
+        self.log_user()
+
+        response = self.app.get(
+            route_path('goto_switcher_data'),
+            extra_environ=xhr_header, status=200)
+        result = json.loads(response.body)['results']
+
+        repos, groups, commits = assert_and_get_content(result)
+
+        assert len(repos) == len(Repository.get_all())
+        assert len(groups) == len(RepoGroup.get_all())
+        assert len(commits) == 0
+
+    def test_returns_list_of_repos_and_groups_filtered(self, xhr_header):
+        self.log_user()
+
+        response = self.app.get(
+            route_path('goto_switcher_data'),
+            params={'query': 'abc'},
+            extra_environ=xhr_header, status=200)
+        result = json.loads(response.body)['results']
+
+        repos, groups, commits = assert_and_get_content(result)
+
+        assert len(repos) == 13
+        assert len(groups) == 5
+        assert len(commits) == 0
+
+    def test_returns_list_of_properly_sorted_and_filtered(self, xhr_header):
+        self.log_user()
+
+        response = self.app.get(
+            route_path('goto_switcher_data'),
+            params={'query': 'abc'},
+            extra_environ=xhr_header, status=200)
+        result = json.loads(response.body)['results']
+
+        repos, groups, commits = assert_and_get_content(result)
+
+        test_repos = [x['text'] for x in repos[:4]]
+        assert ['abc', 'abcd', 'a/abc', 'abcde'] == test_repos
+
+        test_groups = [x['text'] for x in groups[:4]]
+        assert ['abc_repos', 'repos_abc',
+                'forked-abc', 'forked-abc/a'] == test_groups
diff --git a/rhodecode/apps/home/views.py b/rhodecode/apps/home/views.py
index 79bf1ff2..df505c39 100644
--- a/rhodecode/apps/home/views.py
+++ b/rhodecode/apps/home/views.py
@@ -18,6 +18,7 @@
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
+import re
 import logging
 
 from pyramid.view import view_config
@@ -25,8 +26,9 @@ from pyramid.view import view_config
 from rhodecode.apps._base import BaseAppView
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, NotAnonymous
+from rhodecode.lib.index import searcher_from_config
 from rhodecode.lib.utils2 import safe_unicode, str2bool
-from rhodecode.model.db import func, Repository
+from rhodecode.model.db import func, Repository, RepoGroup
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.scm import ScmModel
 
@@ -111,6 +113,57 @@ class HomeView(BaseAppView):
             }
             for obj in repo_iter]
 
+    def _get_repo_group_list(self, name_contains=None, limit=20):
+        query = RepoGroup.query()\
+            .order_by(func.length(RepoGroup.group_name))\
+            .order_by(RepoGroup.group_name)
+
+        if name_contains:
+            ilike_expression = u'%{}%'.format(safe_unicode(name_contains))
+            query = query.filter(
+                RepoGroup.group_name.ilike(ilike_expression))
+            query = query.limit(limit)
+
+        all_groups = query.all()
+        repo_groups_iter = ScmModel().get_repo_groups(all_groups)
+        return [
+            {
+                'id': obj.group_name,
+                'text': obj.group_name,
+                'type': 'group',
+                'obj': {},
+                'url': h.url('repo_group_home', group_name=obj.group_name)
+            }
+            for obj in repo_groups_iter]
+
+    def _get_hash_commit_list(self, auth_user, hash_starts_with=None):
+        if not hash_starts_with or len(hash_starts_with) < 3:
+            return []
+
+        commit_hashes = re.compile('([0-9a-f]{2,40})').findall(hash_starts_with)
+
+        if len(commit_hashes) != 1:
+            return []
+
+        commit_hash_prefix = commit_hashes[0]
+
+        searcher = searcher_from_config(self.request.registry.settings)
+        result = searcher.search(
+            'commit_id:%s*' % commit_hash_prefix, 'commit', auth_user,
+            raise_on_exc=False)
+
+        return [
+            {
+                'id': entry['commit_id'],
+                'text': entry['commit_id'],
+                'type': 'commit',
+                'obj': {'repo': entry['repository']},
+                'url': h.url('changeset_home',
+                             repo_name=entry['repository'],
+                             revision=entry['commit_id'])
+            }
+            for entry in result['results']]
+
     @LoginRequired()
     @view_config(
         route_name='repo_list_data', request_method='GET',
@@ -136,3 +189,49 @@ class HomeView(BaseAppView):
             'results': res
         }
         return data
+
+    @LoginRequired()
+    @view_config(
+        route_name='goto_switcher_data', request_method='GET',
+        renderer='json_ext', xhr=True)
+    def goto_switcher_data(self):
+        c = self.load_default_context()
+
+        _ = self.request.translate
+
+        query = self.request.GET.get('query')
+        log.debug('generating goto switcher list, query %s', query)
+
+        res = []
+        repo_groups = self._get_repo_group_list(query)
+        if repo_groups:
+            res.append({
+                'text': _('Groups'),
+                'children': repo_groups
+            })
+
+        repos = self._get_repo_list(query)
+        if repos:
+            res.append({
+                'text': _('Repositories'),
+                'children': repos
+            })
+
+        commits = self._get_hash_commit_list(c.auth_user, query)
+        if commits:
+            unique_repos = {}
+            for commit in commits:
+                unique_repos.setdefault(commit['obj']['repo'], []
+                    ).append(commit)
+
+            for repo in unique_repos:
+                res.append({
+                    'text': _('Commits in %(repo)s') % {'repo': repo},
+                    'children': unique_repos[repo]
+                })
+
+        data = {
+            'more': False,
+            'results': res
+        }
+        return data
diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py
index 1cfa2c88..9ec2a1e2 100644
--- a/rhodecode/config/routing.py
+++ b/rhodecode/config/routing.py
@@ -188,8 +188,6 @@ def make_map(config):
 
     # MAIN PAGE
     rmap.connect('home', '/', controller='home', action='index', jsroute=True)
-    rmap.connect('goto_switcher_data', '/_goto_data', controller='home',
-                 action='goto_switcher_data')
 
     # TODO: johbo: Static links, to be replaced by our redirection mechanism
     rmap.connect('rst_help',
diff --git a/rhodecode/controllers/home.py b/rhodecode/controllers/home.py
index c8f48972..fb8198e7 100644
--- a/rhodecode/controllers/home.py
+++ b/rhodecode/controllers/home.py
@@ -24,20 +24,15 @@ Home controller for RhodeCode Enterprise
 
 import logging
 import time
-import re
 
-from pylons import tmpl_context as c, request, url, config
-from pylons.i18n.translation import _
-from sqlalchemy.sql import func
+from pylons import tmpl_context as c
 
 from rhodecode.lib.auth import (
-    LoginRequired, HasPermissionAllDecorator, AuthUser,
-    HasRepoGroupPermissionAnyDecorator, XHRRequired)
+    LoginRequired, HasPermissionAllDecorator,
+    HasRepoGroupPermissionAnyDecorator)
 from rhodecode.lib.base import BaseController, render
-from rhodecode.lib.index import searcher_from_config
+
 from rhodecode.lib.ext_json import json
-from rhodecode.lib.utils import jsonify
-from rhodecode.lib.utils2 import safe_unicode, str2bool
 from rhodecode.model.db import Repository, RepoGroup
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.repo_group import RepoGroupModel
@@ -113,123 +108,3 @@ class HomeController(BaseController):
         c.repo_groups_data = json.dumps(repo_group_data)
 
         return render('index_repo_group.mako')
-
-    def _get_repo_list(self, name_contains=None, repo_type=None, limit=20):
-        query = Repository.query()\
-            .order_by(func.length(Repository.repo_name))\
-            .order_by(Repository.repo_name)
-
-        if repo_type:
-            query = query.filter(Repository.repo_type == repo_type)
-
-        if name_contains:
-            ilike_expression = u'%{}%'.format(safe_unicode(name_contains))
-            query = query.filter(
-                Repository.repo_name.ilike(ilike_expression))
-            query = query.limit(limit)
-
-        all_repos = query.all()
-        repo_iter = self.scm_model.get_repos(all_repos)
-        return [
-            {
-                'id': obj['name'],
-                'text': obj['name'],
-                'type': 'repo',
-                'obj': obj['dbrepo'],
-                'url': url('summary_home', repo_name=obj['name'])
-            }
-            for obj in repo_iter]
-
-    def _get_repo_group_list(self, name_contains=None, limit=20):
-        query = RepoGroup.query()\
-            .order_by(func.length(RepoGroup.group_name))\
-            .order_by(RepoGroup.group_name)
-
-        if name_contains:
-            ilike_expression = u'%{}%'.format(safe_unicode(name_contains))
-            query = query.filter(
-                RepoGroup.group_name.ilike(ilike_expression))
-            query = query.limit(limit)
-
-        all_groups = query.all()
-        repo_groups_iter = self.scm_model.get_repo_groups(all_groups)
-        return [
-            {
-                'id': obj.group_name,
-                'text': obj.group_name,
-                'type': 'group',
-                'obj': {},
-                'url': url('repo_group_home', group_name=obj.group_name)
-            }
-            for obj in repo_groups_iter]
-
-    def _get_hash_commit_list(self, hash_starts_with=None, limit=20):
-        if not hash_starts_with or len(hash_starts_with) < 3:
-            return []
-
-        commit_hashes = re.compile('([0-9a-f]{2,40})').findall(hash_starts_with)
-
-        if len(commit_hashes) != 1:
-            return []
-
-        commit_hash_prefix = commit_hashes[0]
-
-        auth_user = AuthUser(
-            user_id=c.rhodecode_user.user_id, ip_addr=self.ip_addr)
-        searcher = searcher_from_config(config)
-        result = searcher.search(
-            'commit_id:%s*' % commit_hash_prefix, 'commit', auth_user,
-            raise_on_exc=False)
-
-        return [
-            {
-                'id': entry['commit_id'],
-                'text': entry['commit_id'],
-                'type': 'commit',
-                'obj': {'repo': entry['repository']},
-                'url': url('changeset_home',
-                           repo_name=entry['repository'],
-                           revision=entry['commit_id'])
-            }
-            for entry in result['results']]
-
-    @LoginRequired()
-    @XHRRequired()
-    @jsonify
-    def goto_switcher_data(self):
-        query = request.GET.get('query')
-        log.debug('generating goto switcher list, query %s', query)
-
-        res = []
-        repo_groups = self._get_repo_group_list(query)
-        if repo_groups:
-            res.append({
-                'text': _('Groups'),
-                'children': repo_groups
-            })
-
-        repos = self._get_repo_list(query)
-        if repos:
-            res.append({
-                'text': _('Repositories'),
-                'children': repos
-            })
-
-        commits = self._get_hash_commit_list(query)
-        if commits:
-            unique_repos = {}
-            for commit in commits:
-                unique_repos.setdefault(commit['obj']['repo'], []
-                    ).append(commit)
-
-            for repo in unique_repos:
-                res.append({
-                    'text': _('Commits in %(repo)s') % {'repo': repo},
-                    'children': unique_repos[repo]
-                })
-
-        data = {
-            'more': False,
-            'results': res
-        }
-        return data
diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js
index 833d9c4c..89334d52 100644
--- a/rhodecode/public/js/rhodecode/routes.js
+++ b/rhodecode/public/js/rhodecode/routes.js
@@ -96,6 +96,7 @@ function registerRCRoutes() {
     pyroutes.register('user_autocomplete_data', '/_users', []);
     pyroutes.register('user_group_autocomplete_data', '/_user_groups', []);
     pyroutes.register('repo_list_data', '/_repos', []);
+    pyroutes.register('goto_switcher_data', '/_goto_data', []);
     pyroutes.register('repo_maintenance', '/%(repo_name)s/maintenance', ['repo_name']);
     pyroutes.register('repo_maintenance_execute', '/%(repo_name)s/maintenance/execute', ['repo_name']);
     pyroutes.register('strip', '/%(repo_name)s/strip', ['repo_name']);
diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako
index 764d672d..7e1ce201 100644
--- a/rhodecode/templates/base/base.mako
+++ b/rhodecode/templates/base/base.mako
@@ -503,7 +503,7 @@
                     query.callback({results: cachedData.results});
                 } else {
                     $.ajax({
-                        url: "${h.url('goto_switcher_data')}",
+                        url: pyroutes.url('goto_switcher_data'),
                         data: {'query': query.term},
                         dataType: 'json',
                         type: 'GET',
diff --git a/rhodecode/tests/functional/test_home.py b/rhodecode/tests/functional/test_home.py
index 3123ae66..dcadb243 100644
--- a/rhodecode/tests/functional/test_home.py
+++ b/rhodecode/tests/functional/test_home.py
@@ -18,20 +18,17 @@
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
-import json
 
-from mock import patch
 import pytest
 from pylons import tmpl_context as c
 
 import rhodecode
-from rhodecode.lib.utils import map_groups
-from rhodecode.model.db import Repository, User, RepoGroup
+from rhodecode.model.db import Repository, User
 from rhodecode.model.meta import Session
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.settings import SettingsModel
-from rhodecode.tests import TestController, url, TEST_USER_ADMIN_LOGIN
+from rhodecode.tests import TestController, url
 from rhodecode.tests.fixture import Fixture
 
 
@@ -130,128 +127,3 @@ class TestHomeController(TestController):
             response.mustcontain(version_string)
         if state is False:
             response.mustcontain(no=[version_string])
-
-
-def assert_and_get_content(result):
-    repos = []
-    groups = []
-    commits = []
-    for data in result:
-        for data_item in data['children']:
-            assert data_item['id']
-            assert data_item['text']
-            assert data_item['url']
-            if data_item['type'] == 'repo':
-                repos.append(data_item)
-            elif data_item['type'] == 'group':
-                groups.append(data_item)
-            elif data_item['type'] == 'commit':
-                commits.append(data_item)
-            else:
-                raise Exception('invalid type %s' % data_item['type'])
-
-    return repos, groups, commits
-
-
-class TestGotoSwitcherData(TestController):
-    required_repos_with_groups = [
-        'abc',
-        'abc-fork',
-        'forks/abcd',
-        'abcd',
-        'abcde',
-        'a/abc',
-        'aa/abc',
-        'aaa/abc',
-        'aaaa/abc',
-        'repos_abc/aaa/abc',
-        'abc_repos/abc',
-        'abc_repos/abcd',
-        'xxx/xyz',
-        'forked-abc/a/abc'
-    ]
-
-    @pytest.fixture(autouse=True, scope='class')
-    def prepare(self, request, pylonsapp):
-        for repo_and_group in self.required_repos_with_groups:
-            # create structure of groups and return the last group
-
-            repo_group = map_groups(repo_and_group)
-
-            RepoModel()._create_repo(
-                repo_and_group, 'hg', 'test-ac', TEST_USER_ADMIN_LOGIN,
-                repo_group=getattr(repo_group, 'group_id', None))
-
-            Session().commit()
-
-        request.addfinalizer(self.cleanup)
-
-    def cleanup(self):
-        # first delete all repos
-        for repo_and_groups in self.required_repos_with_groups:
-            repo = Repository.get_by_repo_name(repo_and_groups)
-            if repo:
-                RepoModel().delete(repo)
-                Session().commit()
-
-        # then delete all empty groups
-        for repo_and_groups in self.required_repos_with_groups:
-            if '/' in repo_and_groups:
-                r_group = repo_and_groups.rsplit('/', 1)[0]
-                repo_group = RepoGroup.get_by_group_name(r_group)
-                if not repo_group:
-                    continue
-                parents = repo_group.parents
-                RepoGroupModel().delete(repo_group, force_delete=True)
-                Session().commit()
-
-                for el in reversed(parents):
-                    RepoGroupModel().delete(el, force_delete=True)
-                    Session().commit()
-
-    def test_returns_list_of_repos_and_groups(self):
-        self.log_user()
-
-        response = self.app.get(
-            url(controller='home', action='goto_switcher_data'),
-            headers={'X-REQUESTED-WITH': 'XMLHttpRequest', }, status=200)
-        result = json.loads(response.body)['results']
-
-        repos, groups, commits = assert_and_get_content(result)
-
-        assert len(repos) == len(Repository.get_all())
-        assert len(groups) == len(RepoGroup.get_all())
-        assert len(commits) == 0
-
-    def test_returns_list_of_repos_and_groups_filtered(self):
-        self.log_user()
-
-        response = self.app.get(
-            url(controller='home', action='goto_switcher_data'),
-            headers={'X-REQUESTED-WITH': 'XMLHttpRequest', },
-            params={'query': 'abc'}, status=200)
-        result = json.loads(response.body)['results']
-
-        repos, groups, commits = assert_and_get_content(result)
-
-        assert len(repos) == 13
-        assert len(groups) == 5
-        assert len(commits) == 0
-
-    def test_returns_list_of_properly_sorted_and_filtered(self):
-        self.log_user()
-
-        response = self.app.get(
-            url(controller='home', action='goto_switcher_data'),
-            headers={'X-REQUESTED-WITH': 'XMLHttpRequest', },
-            params={'query': 'abc'}, status=200)
-        result = json.loads(response.body)['results']
-
-        repos, groups, commits = assert_and_get_content(result)
-
-        test_repos = [x['text'] for x in repos[:4]]
-        assert ['abc', 'abcd', 'a/abc', 'abcde'] == test_repos
-
-        test_groups = [x['text'] for x in groups[:4]]
-        assert ['abc_repos', 'repos_abc',
-                'forked-abc', 'forked-abc/a'] == test_groups

From 81cfa0f5855182f8a6bb02aed9cadaa4ad59afb3 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 19 Apr 2017 15:32:57 +0200
Subject: [PATCH 032/211] core: added ops view to pyramid to have a PING
 command with pure pyramid.

---
 rhodecode/apps/ops/__init__.py          | 35 ++++++++++++++++
 rhodecode/apps/ops/views.py             | 54 +++++++++++++++++++++++++
 rhodecode/config/middleware.py          |  1 +
 rhodecode/model/settings.py             |  1 +
 rhodecode/public/js/rhodecode/routes.js |  1 +
 5 files changed, 92 insertions(+)
 create mode 100644 rhodecode/apps/ops/__init__.py
 create mode 100644 rhodecode/apps/ops/views.py

diff --git a/rhodecode/apps/ops/__init__.py b/rhodecode/apps/ops/__init__.py
new file mode 100644
index 00000000..6824f298
--- /dev/null
+++ b/rhodecode/apps/ops/__init__.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017 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/
+
+from rhodecode.config.routing import ADMIN_PREFIX
+
+
+def admin_routes(config):
+    config.add_route(
+        name='ops_ping',
+        pattern='/ping')
+
+
+def includeme(config):
+
+    config.include(admin_routes, route_prefix=ADMIN_PREFIX + '/ops')
+
+    # Scan module for configuration decorators.
+    config.scan()
diff --git a/rhodecode/apps/ops/views.py b/rhodecode/apps/ops/views.py
new file mode 100644
index 00000000..853fdb1c
--- /dev/null
+++ b/rhodecode/apps/ops/views.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017 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
+
+from pyramid.view import view_config
+
+from rhodecode.apps._base import BaseAppView
+
+
+log = logging.getLogger(__name__)
+
+
+class OpsView(BaseAppView):
+
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+        c.user = c.auth_user.get_instance()
+        self._register_global_c(c)
+        return c
+
+    @view_config(
+        route_name='ops_ping', request_method='GET',
+        renderer='json_ext')
+    def ops_ping(self):
+        data = {
+            'instance': self.request.registry.settings.get('instance_id'),
+        }
+        if getattr(self.request, 'user'):
+            data.update({
+                'caller_ip': self.request.user.ip_addr,
+                'caller_name': self.request.user.username,
+            })
+        return {'ok': data}
+
+
+
diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py
index be2a54ad..3da53646 100644
--- a/rhodecode/config/middleware.py
+++ b/rhodecode/config/middleware.py
@@ -284,6 +284,7 @@ def includeme(config):
 
     # apps
     config.include('rhodecode.apps._base')
+    config.include('rhodecode.apps.ops')
 
     config.include('rhodecode.apps.admin')
     config.include('rhodecode.apps.channelstream')
diff --git a/rhodecode/model/settings.py b/rhodecode/model/settings.py
index dc0d2552..9241441f 100644
--- a/rhodecode/model/settings.py
+++ b/rhodecode/model/settings.py
@@ -207,6 +207,7 @@ class SettingsModel(BaseModel):
         caches.clear_cache_manager(cache_manager)
 
     def get_all_settings(self, cache=False):
+
         def _compute():
             q = self._get_settings_query()
             if not q:
diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js
index 89334d52..ad587034 100644
--- a/rhodecode/public/js/rhodecode/routes.js
+++ b/rhodecode/public/js/rhodecode/routes.js
@@ -71,6 +71,7 @@ function registerRCRoutes() {
     pyroutes.register('repo_integrations_new', '%(repo_name)s/settings/integrations/new', ['repo_name']);
     pyroutes.register('repo_integrations_create', '%(repo_name)s/settings/integrations/%(integration)s/new', ['repo_name', 'integration']);
     pyroutes.register('repo_integrations_edit', '%(repo_name)s/settings/integrations/%(integration)s/%(integration_id)s', ['repo_name', 'integration', 'integration_id']);
+    pyroutes.register('ops_ping', '_admin/ops/ping', []);
     pyroutes.register('admin_settings_open_source', '_admin/settings/open_source', []);
     pyroutes.register('admin_settings_vcs_svn_generate_cfg', '_admin/settings/vcs/svn_generate_cfg', []);
     pyroutes.register('admin_settings_system', '_admin/settings/system', []);

From d39b003e227d27840914bf5a896b6f4aad79befc Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 20 Apr 2017 11:02:47 +0200
Subject: [PATCH 033/211] user: show your current IP in ip whitelist page

---
 rhodecode/templates/admin/users/user_edit_ips.mako | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/rhodecode/templates/admin/users/user_edit_ips.mako b/rhodecode/templates/admin/users/user_edit_ips.mako
index ab1b39e0..6d80c1e7 100644
--- a/rhodecode/templates/admin/users/user_edit_ips.mako
+++ b/rhodecode/templates/admin/users/user_edit_ips.mako
@@ -4,11 +4,12 @@
     </div>
     <div class="panel-body">
         <div class="ips_wrap">
+        <h5>${_('Current IP address')}: <code>${c.rhodecode_user.ip_addr}</code></h5>
   <table class="rctable ip-whitelist">
     <tr>
-      <th>IP Address</th>
-      <th>IP Range</th>
-      <th>Description</th>
+      <th>${_('IP Address')}</th>
+      <th>${_('IP Range')}</th>
+      <th>${_('Description')}</th>
       <th></th>
     </tr>
     %if c.default_user_ip_map and c.inherit_default_ips:

From d3bd2c622980074f3268a78b2ca8ac77ff7ad3ab Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 20 Apr 2017 14:23:34 +0200
Subject: [PATCH 034/211] comments: show author tag in pull request comments.

- to easier identify who is the author of the pull request we now
show an label in comments box.
---
 rhodecode/templates/changeset/changeset_file_comment.mako | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rhodecode/templates/changeset/changeset_file_comment.mako b/rhodecode/templates/changeset/changeset_file_comment.mako
index f908564a..9e627716 100644
--- a/rhodecode/templates/changeset/changeset_file_comment.mako
+++ b/rhodecode/templates/changeset/changeset_file_comment.mako
@@ -92,7 +92,12 @@
           <a class="permalink" href="#comment-${comment.comment_id}"> &para;</a>
 
           <div class="comment-links-block">
-
+              % if comment.pull_request and comment.pull_request.author.user_id == comment.author.user_id:
+                <span class="tag authortag tooltip" title="${_('Pull request author')}">
+                ${_('author')}
+                </span>
+                |
+              % endif
             % if inline:
                   <div class="pr-version-inline">
                     <a href="${h.url.current(version=comment.pull_request_version_id, anchor='comment-{}'.format(comment.comment_id))}">

From ecea35f018545a94778c8e437639498212f4abf7 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 20 Apr 2017 16:26:15 +0200
Subject: [PATCH 035/211] comments: allow parsing the issue tracker patterns
 inside the markup language for comments.

- need to pass in repo name to renderer helper to activate it.
---
 rhodecode/lib/helpers.py            | 42 ++++++++++++---
 rhodecode/tests/lib/test_helpers.py | 79 ++++++++++++++++-------------
 2 files changed, 77 insertions(+), 44 deletions(-)

diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py
index 29086624..daa446df 100644
--- a/rhodecode/lib/helpers.py
+++ b/rhodecode/lib/helpers.py
@@ -1602,16 +1602,24 @@ def urlify_commits(text_, repository):
 
 
 def _process_url_func(match_obj, repo_name, uid, entry,
-                      return_raw_data=False):
+                      return_raw_data=False, link_format='html'):
     pref = ''
     if match_obj.group().startswith(' '):
         pref = ' '
 
     issue_id = ''.join(match_obj.groups())
-    tmpl = (
-        '%(pref)s<a class="%(cls)s" href="%(url)s">'
-        '%(issue-prefix)s%(id-repr)s'
-        '</a>')
+
+    if link_format == 'html':
+        tmpl = (
+            '%(pref)s<a class="%(cls)s" href="%(url)s">'
+            '%(issue-prefix)s%(id-repr)s'
+            '</a>')
+    elif link_format == 'rst':
+        tmpl = '`%(issue-prefix)s%(id-repr)s <%(url)s>`_'
+    elif link_format == 'markdown':
+        tmpl = '[%(issue-prefix)s%(id-repr)s](%(url)s)'
+    else:
+        raise ValueError('Bad link_format:{}'.format(link_format))
 
     (repo_name_cleaned,
      parent_group_name) = RepoGroupModel().\
@@ -1644,7 +1652,12 @@ def _process_url_func(match_obj, repo_name, uid, entry,
     return tmpl % data
 
 
-def process_patterns(text_string, repo_name, config=None):
+def process_patterns(text_string, repo_name, link_format='html'):
+    allowed_formats = ['html', 'rst', 'markdown']
+    if link_format not in allowed_formats:
+        raise ValueError('Link format can be only one of:{} got {}'.format(
+                         allowed_formats, link_format))
+
     repo = None
     if repo_name:
         # Retrieving repo_name to avoid invalid repo_name to explode on
@@ -1656,6 +1669,7 @@ def process_patterns(text_string, repo_name, config=None):
 
     issues_data = []
     newtext = text_string
+
     for uid, entry in active_entries.items():
         log.debug('found issue tracker entry with uid %s' % (uid,))
 
@@ -1682,7 +1696,8 @@ def process_patterns(text_string, repo_name, config=None):
             issues_data.append(data_func(match_obj))
 
         url_func = partial(
-            _process_url_func, repo_name=repo_name, entry=entry, uid=uid)
+            _process_url_func, repo_name=repo_name, entry=entry, uid=uid,
+            link_format=link_format)
 
         newtext = pattern.sub(url_func, newtext)
         log.debug('processed prefix:uid `%s`' % (uid,))
@@ -1750,7 +1765,8 @@ def renderer_from_filename(filename, exclude=None):
     return None
 
 
-def render(source, renderer='rst', mentions=False, relative_url=None):
+def render(source, renderer='rst', mentions=False, relative_url=None,
+           repo_name=None):
 
     def maybe_convert_relative_links(html_source):
         if relative_url:
@@ -1758,11 +1774,21 @@ def render(source, renderer='rst', mentions=False, relative_url=None):
         return html_source
 
     if renderer == 'rst':
+        if repo_name:
+            # process patterns on comments if we pass in repo name
+            source, issues = process_patterns(
+                source, repo_name, link_format='rst')
+
         return literal(
             '<div class="rst-block">%s</div>' %
             maybe_convert_relative_links(
                 MarkupRenderer.rst(source, mentions=mentions)))
     elif renderer == 'markdown':
+        if repo_name:
+            # process patterns on comments if we pass in repo name
+            source, issues = process_patterns(
+                source, repo_name, link_format='markdown')
+
         return literal(
             '<div class="markdown-block">%s</div>' %
             maybe_convert_relative_links(
diff --git a/rhodecode/tests/lib/test_helpers.py b/rhodecode/tests/lib/test_helpers.py
index 2a8b92c8..f9b213ce 100644
--- a/rhodecode/tests/lib/test_helpers.py
+++ b/rhodecode/tests/lib/test_helpers.py
@@ -103,55 +103,62 @@ def test_extract_issues(backend, text_string, pattern, expected):
     assert issues == expected
 
 
-@pytest.mark.parametrize('text_string, pattern, expected_text', [
-    ('Fix #42', '(?:#)(?P<issue_id>\d+)',
-     'Fix <a class="issue-tracker-link" href="http://r.io/{repo}/i/42">#42</a>'
-     ),
-    ('Fix #42', '(?:#)?<issue_id>\d+)', 'Fix #42'),  # Broken regex
+@pytest.mark.parametrize('text_string, pattern, link_format, expected_text', [
+    ('Fix #42', '(?:#)(?P<issue_id>\d+)', 'html',
+     'Fix <a class="issue-tracker-link" href="http://r.io/{repo}/i/42">#42</a>'),
+
+    ('Fix #42', '(?:#)(?P<issue_id>\d+)', 'markdown',
+     'Fix [#42](http://r.io/{repo}/i/42)'),
+
+    ('Fix #42', '(?:#)(?P<issue_id>\d+)', 'rst',
+     'Fix `#42 <http://r.io/{repo}/i/42>`_'),
+
+    ('Fix #42', '(?:#)?<issue_id>\d+)', 'html',
+     'Fix #42'),  # Broken regex
 ])
-def test_process_patterns_repo(backend, text_string, pattern, expected_text):
+def test_process_patterns_repo(backend, text_string, pattern, expected_text, link_format):
     repo = backend.create_repo()
-    config = {'123': {
-        'uid': '123',
-        'pat': pattern,
-        'url': 'http://r.io/${repo}/i/${issue_id}',
-        'pref': '#',
-        }
-    }
 
     def get_settings_mock(self, cache=True):
-        return config
+        return {
+            '123': {
+                'uid': '123',
+                'pat': pattern,
+                'url': 'http://r.io/${repo}/i/${issue_id}',
+                'pref': '#',
+            }
+        }
 
     with mock.patch.object(IssueTrackerSettingsModel,
                            'get_settings', get_settings_mock):
         processed_text, issues = helpers.process_patterns(
-            text_string, repo.repo_name, config)
+            text_string, repo.repo_name, link_format)
 
     assert processed_text == expected_text.format(repo=repo.repo_name)
 
 
 @pytest.mark.parametrize('text_string, pattern, expected_text', [
     ('Fix #42', '(?:#)(?P<issue_id>\d+)',
-     'Fix <a class="issue-tracker-link" href="http://r.io/i/42">#42</a>'
-     ),
-    ('Fix #42', '(?:#)?<issue_id>\d+)', 'Fix #42'),  # Broken regex
+     'Fix <a class="issue-tracker-link" href="http://r.io/i/42">#42</a>'),
+    ('Fix #42', '(?:#)?<issue_id>\d+)',
+     'Fix #42'),  # Broken regex
 ])
 def test_process_patterns_no_repo(text_string, pattern, expected_text):
-    config = {'123': {
-        'uid': '123',
-        'pat': pattern,
-        'url': 'http://r.io/i/${issue_id}',
-        'pref': '#',
-        }
-    }
 
     def get_settings_mock(self, cache=True):
-        return config
+        return {
+            '123': {
+                'uid': '123',
+                'pat': pattern,
+                'url': 'http://r.io/i/${issue_id}',
+                'pref': '#',
+            }
+        }
 
     with mock.patch.object(IssueTrackerSettingsModel,
                            'get_global_settings', get_settings_mock):
         processed_text, issues = helpers.process_patterns(
-            text_string, '', config)
+            text_string, '')
 
     assert processed_text == expected_text
 
@@ -161,21 +168,21 @@ def test_process_patterns_non_existent_repo_name(backend):
     pattern = '(?:#)(?P<issue_id>\d+)'
     expected_text = ('Fix <a class="issue-tracker-link" '
                      'href="http://r.io/do-not-exist/i/42">#42</a>')
-    config = {'123': {
-        'uid': '123',
-        'pat': pattern,
-        'url': 'http://r.io/${repo}/i/${issue_id}',
-        'pref': '#',
-        }
-    }
 
     def get_settings_mock(self, cache=True):
-        return config
+        return {
+            '123': {
+                'uid': '123',
+                'pat': pattern,
+                'url': 'http://r.io/${repo}/i/${issue_id}',
+                'pref': '#',
+            }
+        }
 
     with mock.patch.object(IssueTrackerSettingsModel,
                            'get_global_settings', get_settings_mock):
         processed_text, issues = helpers.process_patterns(
-            text_string, 'do-not-exist', config)
+            text_string, 'do-not-exist')
 
     assert processed_text == expected_text
 

From 7515b25253b23e5004eaa2f0d84ce92aa819a020 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 20 Apr 2017 14:04:15 +0200
Subject: [PATCH 036/211] comments: remove helper to render a comment object.

- we always use helper renderer, and for consistency we should stick with that.
It makes refactoring, and general use much harder. DB objects should have least
possible logic inside.
---
 rhodecode/model/db.py                                     | 4 ----
 rhodecode/templates/changeset/changeset_file_comment.mako | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index 9034a7ca..0991eaa9 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -3096,10 +3096,6 @@ class ChangesetComment(Base, BaseModel):
         return self.get_index_from_version(
             self.pull_request_version_id, versions)
 
-    def render(self, mentions=False):
-        from rhodecode.lib import helpers as h
-        return h.render(self.text, renderer=self.renderer, mentions=mentions)
-
     def __repr__(self):
         if self.comment_id:
             return '<DB:Comment #%s>' % self.comment_id
diff --git a/rhodecode/templates/changeset/changeset_file_comment.mako b/rhodecode/templates/changeset/changeset_file_comment.mako
index 9e627716..6b18cee7 100644
--- a/rhodecode/templates/changeset/changeset_file_comment.mako
+++ b/rhodecode/templates/changeset/changeset_file_comment.mako
@@ -158,7 +158,7 @@
           </div>
       </div>
       <div class="text">
-          ${comment.render(mentions=True)|n}
+          ${h.render(comment.text, renderer=comment.renderer, mentions=True)}
       </div>
 
   </div>

From 15fc2d8a4840747c2b06287143b2fc3939701c45 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 20 Apr 2017 20:56:16 +0200
Subject: [PATCH 037/211] mercurial: show phases status in changelog.

- ref #5265
---
 rhodecode/lib/vcs/backends/hg/commit.py               | 11 +++++++++++
 rhodecode/public/css/tags.less                        | 10 +++++++++-
 rhodecode/templates/changelog/changelog_elements.mako |  5 +++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/rhodecode/lib/vcs/backends/hg/commit.py b/rhodecode/lib/vcs/backends/hg/commit.py
index 24990701..d451136e 100644
--- a/rhodecode/lib/vcs/backends/hg/commit.py
+++ b/rhodecode/lib/vcs/backends/hg/commit.py
@@ -159,6 +159,17 @@ class MercurialCommit(base.BaseCommit):
         parents = self._remote.ctx_parents(self.idx)
         return self._make_commits(parents)
 
+    @LazyProperty
+    def phase(self):
+        phase_id = self._remote.ctx_phase(self.idx)
+        phase_text = {
+            0: 'public',
+            1: 'draft',
+            2: 'secret',
+        }.get(phase_id) or ''
+
+        return safe_unicode(phase_text)
+
     @LazyProperty
     def children(self):
         """
diff --git a/rhodecode/public/css/tags.less b/rhodecode/public/css/tags.less
index 906d1105..ccdc63be 100644
--- a/rhodecode/public/css/tags.less
+++ b/rhodecode/public/css/tags.less
@@ -98,4 +98,12 @@
     &.admin {
         &:extend(.tag5);
     }
-}
\ No newline at end of file
+}
+
+.phase-draft {
+  color: @color3
+}
+
+.phase-secret {
+  color:@grey3
+}
diff --git a/rhodecode/templates/changelog/changelog_elements.mako b/rhodecode/templates/changelog/changelog_elements.mako
index 5371c16c..f4e51b19 100644
--- a/rhodecode/templates/changelog/changelog_elements.mako
+++ b/rhodecode/templates/changelog/changelog_elements.mako
@@ -48,6 +48,11 @@
       <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=commit.raw_id)}">
         <span class="commit_hash">${h.show_id(commit)}</span>
       </a>
+      % if hasattr(commit, 'phase'):
+          % if commit.phase != 'public':
+              <span class="tag phase-${commit.phase} tooltip" title="${_('commit phase')}">${commit.phase}</span>
+          % endif
+      % endif
     </code>
     </td>
     <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_('Expand commit message')}" onclick="commitsController.expandCommit(this); return false">

From 80f19b6a7efc3d146f40c02383933f6523a49e48 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 20 Apr 2017 21:26:56 +0200
Subject: [PATCH 038/211] commit-page: show phase on commit page.

- refs #5265
---
 rhodecode/templates/changeset/changeset.mako | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/rhodecode/templates/changeset/changeset.mako b/rhodecode/templates/changeset/changeset.mako
index de77fcb2..5deb5d5a 100644
--- a/rhodecode/templates/changeset/changeset.mako
+++ b/rhodecode/templates/changeset/changeset.mako
@@ -36,16 +36,21 @@
             <h4>${_('Commit')}
               <code>
                 ${h.show_id(c.commit)}
+                % if hasattr(c.commit, 'phase'):
+                      <span class="tag phase-${c.commit.phase} tooltip" title="${_('commit phase')}">${c.commit.phase}</span>
+                % endif
               </code>
             </h4>
           </span>
-          <span id="parent_link">
-            <a href="#" title="${_('Parent Commit')}">${_('Parent')}</a>
-          </span>
-           |
-          <span id="child_link">
-            <a href="#" title="${_('Child Commit')}">${_('Child')}</a>
-          </span>
+          <div class="pull-right">
+              <span id="parent_link">
+                <a href="#" title="${_('Parent Commit')}">${_('Parent')}</a>
+              </span>
+               |
+              <span id="child_link">
+                <a href="#" title="${_('Child Commit')}">${_('Child')}</a>
+              </span>
+          </div>
       </div>
 
       <div class="fieldset">

From b595153ea8f554d1b862aa036630096466ec95d7 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 19 Apr 2017 16:52:24 +0200
Subject: [PATCH 039/211] user-groups: moved get_user_groups from RepoModel to
 UserGroupModel.

---
 rhodecode/apps/admin/views/users.py        |  3 +-
 rhodecode/apps/home/views.py               |  7 ++-
 rhodecode/model/repo.py                    | 46 +----------------
 rhodecode/model/user_group.py              | 51 ++++++++++++++++--
 rhodecode/tests/models/test_repos.py       | 60 +---------------------
 rhodecode/tests/models/test_user_groups.py | 58 +++++++++++++++++++++
 6 files changed, 113 insertions(+), 112 deletions(-)

diff --git a/rhodecode/apps/admin/views/users.py b/rhodecode/apps/admin/views/users.py
index ba42e413..1b428a7b 100644
--- a/rhodecode/apps/admin/views/users.py
+++ b/rhodecode/apps/admin/views/users.py
@@ -242,7 +242,8 @@ class AdminUsersView(BaseAppView, DataGridAppView):
         c.user = User.get_or_404(user_id, pyramid_exc=True)
         c.data = c.user.group_member
         self._redirect_for_default_user(c.user.username)
-        groups = [UserGroupModel.get_user_groups_as_dict(group.users_group) for group in c.user.group_member]
+        groups = [UserGroupModel.get_user_groups_as_dict(group.users_group)
+                  for group in c.user.group_member]
         c.groups = json.dumps(groups)
         c.active = 'groups'
 
diff --git a/rhodecode/apps/home/views.py b/rhodecode/apps/home/views.py
index df505c39..d62c543c 100644
--- a/rhodecode/apps/home/views.py
+++ b/rhodecode/apps/home/views.py
@@ -31,7 +31,7 @@ from rhodecode.lib.utils2 import safe_unicode, str2bool
 from rhodecode.model.db import func, Repository, RepoGroup
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.scm import ScmModel
-
+from rhodecode.model.user_group import UserGroupModel
 
 log = logging.getLogger(__name__)
 
@@ -62,7 +62,7 @@ class HomeView(BaseAppView):
 
         if include_groups:
             # extend with user groups
-            _user_groups = repo_model.get_user_groups(
+            _user_groups = UserGroupModel().get_user_groups(
                 name_contains=query, only_active=active)
             _users = _users + _user_groups
 
@@ -79,8 +79,7 @@ class HomeView(BaseAppView):
         log.debug('generating user group list, query:%s, active:%s',
                   query, active)
 
-        repo_model = RepoModel()
-        _user_groups = repo_model.get_user_groups(
+        _user_groups = UserGroupModel().get_user_groups(
             name_contains=query, only_active=active)
         _user_groups = _user_groups
 
diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py
index 08e3d455..631019fb 100644
--- a/rhodecode/model/repo.py
+++ b/rhodecode/model/repo.py
@@ -30,7 +30,6 @@ import time
 import traceback
 from datetime import datetime, timedelta
 
-from sqlalchemy.sql import func
 from sqlalchemy.sql.expression import true, or_
 from zope.cachedescriptors.property import Lazy as LazyProperty
 
@@ -40,19 +39,17 @@ from rhodecode.lib.auth import HasUserGroupPermissionAny
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.lib.exceptions import AttachedForksError
 from rhodecode.lib.hooks_base import log_delete_repository
-from rhodecode.lib.markup_renderer import MarkupRenderer
 from rhodecode.lib.utils import make_db_config
 from rhodecode.lib.utils2 import (
     safe_str, safe_unicode, remove_prefix, obfuscate_url_pw,
     get_current_rhodecode_user, safe_int, datetime_to_time, action_logger_generic)
 from rhodecode.lib.vcs.backends import get_backend
-from rhodecode.lib.vcs.exceptions import NodeDoesNotExistError
 from rhodecode.model import BaseModel
 from rhodecode.model.db import (
     Repository, UserRepoToPerm, UserGroupRepoToPerm, UserRepoGroupToPerm,
     UserGroupRepoGroupToPerm, User, Permission, Statistics, UserGroup,
     RepoGroup, RepositoryField)
-from rhodecode.model.scm import UserGroupList
+
 from rhodecode.model.settings import VcsSettingsModel
 
 
@@ -196,47 +193,6 @@ class RepoModel(BaseModel):
         ]
         return _users
 
-    def get_user_groups(self, name_contains=None, limit=20, only_active=True):
-
-        # TODO: mikhail: move this method to the UserGroupModel.
-        query = self.sa.query(UserGroup)
-        if only_active:
-            query = query.filter(UserGroup.users_group_active == true())
-
-        if name_contains:
-            ilike_expression = u'%{}%'.format(safe_unicode(name_contains))
-            query = query.filter(
-                UserGroup.users_group_name.ilike(ilike_expression))\
-                .order_by(func.length(UserGroup.users_group_name))\
-                .order_by(UserGroup.users_group_name)
-
-            query = query.limit(limit)
-        user_groups = query.all()
-        perm_set = ['usergroup.read', 'usergroup.write', 'usergroup.admin']
-        user_groups = UserGroupList(user_groups, perm_set=perm_set)
-
-        _groups = [
-            {
-                'id': group.users_group_id,
-                # TODO: marcink figure out a way to generate the url for the
-                # icon
-                'icon_link': '',
-                'value_display': 'Group: %s (%d members)' % (
-                    group.users_group_name, len(group.members),),
-                'value': group.users_group_name,
-                'description': group.user_group_description,
-                'owner': group.user.username,
-
-                'owner_icon': h.gravatar_url(group.user.email, 30),
-                'value_display_owner': h.person(group.user.email),
-
-                'value_type': 'user_group',
-                'active': group.users_group_active,
-            }
-            for group in user_groups
-        ]
-        return _groups
-
     @classmethod
     def update_repoinfo(cls, repositories=None):
         if not repositories:
diff --git a/rhodecode/model/user_group.py b/rhodecode/model/user_group.py
index 22c0154d..33798cd0 100644
--- a/rhodecode/model/user_group.py
+++ b/rhodecode/model/user_group.py
@@ -27,9 +27,10 @@ user group model for RhodeCode
 import logging
 import traceback
 
-from rhodecode.lib.utils2 import safe_str
+from rhodecode.lib.utils2 import safe_str, safe_unicode
 from rhodecode.model import BaseModel
-from rhodecode.model.db import UserGroupMember, UserGroup,\
+from rhodecode.model.scm import UserGroupList
+from rhodecode.model.db import true, func, UserGroupMember, UserGroup,\
     UserGroupRepoToPerm, Permission, UserGroupToPerm, User, UserUserGroupToPerm,\
     UserGroupUserGroupToPerm, UserGroupRepoGroupToPerm
 from rhodecode.lib.exceptions import UserGroupAssignedException,\
@@ -539,6 +540,48 @@ class UserGroupModel(BaseModel):
             log.debug('Adding user %s to user group %s', user.username, gr.users_group_name)
             UserGroupModel().add_user_to_group(gr.users_group_name, user.username)
 
+    def get_user_groups(self, name_contains=None, limit=20, only_active=True,
+                        expand_groups=False):
+        import rhodecode.lib.helpers as h
+
+        query = self.sa.query(UserGroup)
+        if only_active:
+            query = query.filter(UserGroup.users_group_active == true())
+
+        if name_contains:
+            ilike_expression = u'%{}%'.format(safe_unicode(name_contains))
+            query = query.filter(
+                UserGroup.users_group_name.ilike(ilike_expression))\
+                .order_by(func.length(UserGroup.users_group_name))\
+                .order_by(UserGroup.users_group_name)
+
+            query = query.limit(limit)
+        user_groups = query.all()
+        perm_set = ['usergroup.read', 'usergroup.write', 'usergroup.admin']
+        user_groups = UserGroupList(user_groups, perm_set=perm_set)
+
+        _groups = [
+            {
+                'id': group.users_group_id,
+                # TODO: marcink figure out a way to generate the url for the
+                # icon
+                'icon_link': '',
+                'value_display': 'Group: %s (%d members)' % (
+                    group.users_group_name, len(group.members),),
+                'value': group.users_group_name,
+                'description': group.user_group_description,
+                'owner': group.user.username,
+
+                'owner_icon': h.gravatar_url(group.user.email, 30),
+                'value_display_owner': h.person(group.user.email),
+
+                'value_type': 'user_group',
+                'active': group.users_group_active,
+            }
+            for group in user_groups
+        ]
+        return _groups
+
     @staticmethod
     def get_user_groups_as_dict(user_group):
         import rhodecode.lib.helpers as h
@@ -550,7 +593,9 @@ class UserGroupModel(BaseModel):
             'active': user_group.users_group_active,
             "owner": user_group.user.username,
             'owner_icon': h.gravatar_url(user_group.user.email, 30),
-            "owner_data": {'owner': user_group.user.username, 'owner_icon': h.gravatar_url(user_group.user.email, 30)}
+            "owner_data": {
+                'owner': user_group.user.username,
+                'owner_icon': h.gravatar_url(user_group.user.email, 30)}
             }
         return data
 
diff --git a/rhodecode/tests/models/test_repos.py b/rhodecode/tests/models/test_repos.py
index 8de8dd30..7a6040cb 100644
--- a/rhodecode/tests/models/test_repos.py
+++ b/rhodecode/tests/models/test_repos.py
@@ -29,10 +29,9 @@ from rhodecode.model.db import Repository
 from rhodecode.model.meta import Session
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.scm import ScmModel
-from rhodecode.lib.utils2 import safe_unicode
 
 
-class TestRepoModel:
+class TestRepoModel(object):
 
     def test_remove_repo(self, backend):
         repo = backend.create_repo()
@@ -251,60 +250,3 @@ class TestGetUsers(object):
         fake_users = [u for u in users if u['last_name'].startswith('Fake')]
         assert len(fake_users) == 3
 
-
-class TestGetUserGroups(object):
-    def test_returns_filtered_list(self, backend, user_util):
-        created_groups = []
-        for i in range(4):
-            created_groups.append(
-                user_util.create_user_group(users_group_active=True))
-
-        group_filter = created_groups[-1].users_group_name[-2:]
-        with mock.patch('rhodecode.lib.helpers.gravatar_url'):
-            with self._patch_user_group_list():
-                groups = RepoModel().get_user_groups(group_filter)
-
-        fake_groups = [
-            u for u in groups if u['value'].startswith('test_returns')]
-        assert len(fake_groups) == 1
-        assert fake_groups[0]['value'] == created_groups[-1].users_group_name
-        assert fake_groups[0]['value_display'].startswith(
-            'Group: test_returns')
-
-    def test_returns_limited_list(self, backend, user_util):
-        created_groups = []
-        for i in range(3):
-            created_groups.append(
-                user_util.create_user_group(users_group_active=True))
-        with mock.patch('rhodecode.lib.helpers.gravatar_url'):
-            with self._patch_user_group_list():
-                groups = RepoModel().get_user_groups('test_returns')
-
-        fake_groups = [
-            u for u in groups if u['value'].startswith('test_returns')]
-        assert len(fake_groups) == 3
-
-    def test_returns_active_user_groups(self, backend, user_util):
-        for i in range(4):
-            is_active = i % 2 == 0
-            user_util.create_user_group(users_group_active=is_active)
-        with mock.patch('rhodecode.lib.helpers.gravatar_url'):
-            with self._patch_user_group_list():
-                groups = RepoModel().get_user_groups()
-        expected = ('id', 'icon_link', 'value_display', 'value', 'value_type')
-        for group in groups:
-            assert group['value_type'] is 'user_group'
-            for key in expected:
-                assert key in group
-
-        fake_groups = [
-            u for u in groups if u['value'].startswith('test_returns')]
-        assert len(fake_groups) == 2
-        for user in fake_groups:
-            assert user['value_display'].startswith('Group: test_returns')
-
-    def _patch_user_group_list(self):
-        def side_effect(group_list, perm_set):
-            return group_list
-        return mock.patch(
-            'rhodecode.model.repo.UserGroupList', side_effect=side_effect)
diff --git a/rhodecode/tests/models/test_user_groups.py b/rhodecode/tests/models/test_user_groups.py
index eb39e833..b22accc3 100644
--- a/rhodecode/tests/models/test_user_groups.py
+++ b/rhodecode/tests/models/test_user_groups.py
@@ -35,6 +35,64 @@ def teardown_module(self):
     _delete_all_user_groups()
 
 
+class TestGetUserGroups(object):
+    def test_returns_filtered_list(self, backend, user_util):
+        created_groups = []
+        for i in range(4):
+            created_groups.append(
+                user_util.create_user_group(users_group_active=True))
+
+        group_filter = created_groups[-1].users_group_name[-2:]
+        with mock.patch('rhodecode.lib.helpers.gravatar_url'):
+            with self._patch_user_group_list():
+                groups = UserGroupModel().get_user_groups(group_filter)
+
+        fake_groups = [
+            u for u in groups if u['value'].startswith('test_returns')]
+        assert len(fake_groups) == 1
+        assert fake_groups[0]['value'] == created_groups[-1].users_group_name
+        assert fake_groups[0]['value_display'].startswith(
+            'Group: test_returns')
+
+    def test_returns_limited_list(self, backend, user_util):
+        created_groups = []
+        for i in range(3):
+            created_groups.append(
+                user_util.create_user_group(users_group_active=True))
+        with mock.patch('rhodecode.lib.helpers.gravatar_url'):
+            with self._patch_user_group_list():
+                groups = UserGroupModel().get_user_groups('test_returns')
+
+        fake_groups = [
+            u for u in groups if u['value'].startswith('test_returns')]
+        assert len(fake_groups) == 3
+
+    def test_returns_active_user_groups(self, backend, user_util):
+        for i in range(4):
+            is_active = i % 2 == 0
+            user_util.create_user_group(users_group_active=is_active)
+        with mock.patch('rhodecode.lib.helpers.gravatar_url'):
+            with self._patch_user_group_list():
+                groups = UserGroupModel().get_user_groups()
+        expected = ('id', 'icon_link', 'value_display', 'value', 'value_type')
+        for group in groups:
+            assert group['value_type'] is 'user_group'
+            for key in expected:
+                assert key in group
+
+        fake_groups = [
+            u for u in groups if u['value'].startswith('test_returns')]
+        assert len(fake_groups) == 2
+        for user in fake_groups:
+            assert user['value_display'].startswith('Group: test_returns')
+
+    def _patch_user_group_list(self):
+        def side_effect(group_list, perm_set):
+            return group_list
+        return mock.patch(
+            'rhodecode.model.user_group.UserGroupList', side_effect=side_effect)
+
+
 @pytest.mark.parametrize(
     "pre_existing, regular_should_be, external_should_be, groups, "
     "expected", [

From a3ed262ffd74f07b30a0c469df32ce92820b1166 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 19 Apr 2017 16:58:38 +0200
Subject: [PATCH 040/211] users: moved get_users from RepoModel to UserModel.

---
 rhodecode/apps/home/views.py         |  4 +-
 rhodecode/model/repo.py              | 37 ------------
 rhodecode/model/user.py              | 36 ++++++++++++
 rhodecode/tests/models/test_repos.py | 81 --------------------------
 rhodecode/tests/models/test_users.py | 87 +++++++++++++++++++++++++++-
 5 files changed, 122 insertions(+), 123 deletions(-)

diff --git a/rhodecode/apps/home/views.py b/rhodecode/apps/home/views.py
index d62c543c..64fc7100 100644
--- a/rhodecode/apps/home/views.py
+++ b/rhodecode/apps/home/views.py
@@ -31,6 +31,7 @@ from rhodecode.lib.utils2 import safe_unicode, str2bool
 from rhodecode.model.db import func, Repository, RepoGroup
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.scm import ScmModel
+from rhodecode.model.user import UserModel
 from rhodecode.model.user_group import UserGroupModel
 
 log = logging.getLogger(__name__)
@@ -56,8 +57,7 @@ class HomeView(BaseAppView):
         log.debug('generating user list, query:%s, active:%s, with_groups:%s',
                   query, active, include_groups)
 
-        repo_model = RepoModel()
-        _users = repo_model.get_users(
+        _users = UserModel().get_users(
             name_contains=query, only_active=active)
 
         if include_groups:
diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py
index 631019fb..0e5a27fe 100644
--- a/rhodecode/model/repo.py
+++ b/rhodecode/model/repo.py
@@ -30,7 +30,6 @@ import time
 import traceback
 from datetime import datetime, timedelta
 
-from sqlalchemy.sql.expression import true, or_
 from zope.cachedescriptors.property import Lazy as LazyProperty
 
 from rhodecode import events
@@ -157,42 +156,6 @@ class RepoModel(BaseModel):
         return h.url('summary_home', repo_name=safe_str(repo.repo_name),
             qualified=True)
 
-    def get_users(self, name_contains=None, limit=20, only_active=True):
-
-        # TODO: mikhail: move this method to the UserModel.
-        query = self.sa.query(User)
-        if only_active:
-            query = query.filter(User.active == true())
-
-        if name_contains:
-            ilike_expression = u'%{}%'.format(safe_unicode(name_contains))
-            query = query.filter(
-                or_(
-                    User.name.ilike(ilike_expression),
-                    User.lastname.ilike(ilike_expression),
-                    User.username.ilike(ilike_expression)
-                )
-            )
-            query = query.limit(limit)
-        users = query.all()
-
-        _users = [
-            {
-                'id': user.user_id,
-                'first_name': user.name,
-                'last_name': user.lastname,
-                'username': user.username,
-                'email': user.email,
-                'icon_link': h.gravatar_url(user.email, 30),
-                'value_display': h.person(user),
-                'value': user.username,
-                'value_type': 'user',
-                'active': user.active,
-            }
-            for user in users
-        ]
-        return _users
-
     @classmethod
     def update_repoinfo(cls, repositories=None):
         if not repositories:
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py
index fba5954c..2b2b37ba 100644
--- a/rhodecode/model/user.py
+++ b/rhodecode/model/user.py
@@ -65,6 +65,42 @@ class UserModel(BaseModel):
     def get_user(self, user):
         return self._get_user(user)
 
+    def get_users(self, name_contains=None, limit=20, only_active=True):
+        import rhodecode.lib.helpers as h
+
+        query = self.sa.query(User)
+        if only_active:
+            query = query.filter(User.active == true())
+
+        if name_contains:
+            ilike_expression = u'%{}%'.format(safe_unicode(name_contains))
+            query = query.filter(
+                or_(
+                    User.name.ilike(ilike_expression),
+                    User.lastname.ilike(ilike_expression),
+                    User.username.ilike(ilike_expression)
+                )
+            )
+            query = query.limit(limit)
+        users = query.all()
+
+        _users = [
+            {
+                'id': user.user_id,
+                'first_name': user.name,
+                'last_name': user.lastname,
+                'username': user.username,
+                'email': user.email,
+                'icon_link': h.gravatar_url(user.email, 30),
+                'value_display': h.person(user),
+                'value': user.username,
+                'value_type': 'user',
+                'active': user.active,
+            }
+            for user in users
+        ]
+        return _users
+
     def get_by_username(self, username, cache=False, case_insensitive=False):
 
         if case_insensitive:
diff --git a/rhodecode/tests/models/test_repos.py b/rhodecode/tests/models/test_repos.py
index 7a6040cb..81d67bd7 100644
--- a/rhodecode/tests/models/test_repos.py
+++ b/rhodecode/tests/models/test_repos.py
@@ -169,84 +169,3 @@ class TestRepoModel(object):
             repo.update_commit_cache(config=config)
             scm.assert_called_with(
                 cache=False, config=config)
-
-
-class TestGetUsers(object):
-    def test_returns_active_users(self, backend, user_util):
-        for i in range(4):
-            is_active = i % 2 == 0
-            user_util.create_user(active=is_active, lastname='Fake user')
-
-        with mock.patch('rhodecode.lib.helpers.gravatar_url'):
-            users = RepoModel().get_users()
-        fake_users = [u for u in users if u['last_name'] == 'Fake user']
-        assert len(fake_users) == 2
-
-        expected_keys = (
-            'id', 'first_name', 'last_name', 'username', 'icon_link',
-            'value_display', 'value', 'value_type')
-        for user in users:
-            assert user['value_type'] is 'user'
-            for key in expected_keys:
-                assert key in user
-
-    def test_returns_user_filtered_by_last_name(self, backend, user_util):
-        keywords = ('aBc', u'ünicode')
-        for keyword in keywords:
-            for i in range(2):
-                user_util.create_user(
-                    active=True, lastname=u'Fake {} user'.format(keyword))
-
-        with mock.patch('rhodecode.lib.helpers.gravatar_url'):
-            keyword = keywords[1].lower()
-            users = RepoModel().get_users(name_contains=keyword)
-
-        fake_users = [u for u in users if u['last_name'].startswith('Fake')]
-        assert len(fake_users) == 2
-        for user in fake_users:
-            assert user['last_name'] == safe_unicode('Fake ünicode user')
-
-    def test_returns_user_filtered_by_first_name(self, backend, user_util):
-        created_users = []
-        keywords = ('aBc', u'ünicode')
-        for keyword in keywords:
-            for i in range(2):
-                created_users.append(user_util.create_user(
-                    active=True, lastname='Fake user',
-                    firstname=u'Fake {} user'.format(keyword)))
-
-        keyword = keywords[1].lower()
-        with mock.patch('rhodecode.lib.helpers.gravatar_url'):
-            users = RepoModel().get_users(name_contains=keyword)
-
-        fake_users = [u for u in users if u['last_name'].startswith('Fake')]
-        assert len(fake_users) == 2
-        for user in fake_users:
-            assert user['first_name'] == safe_unicode('Fake ünicode user')
-
-    def test_returns_user_filtered_by_username(self, backend, user_util):
-        created_users = []
-        for i in range(5):
-            created_users.append(user_util.create_user(
-                active=True, lastname='Fake user'))
-
-        user_filter = created_users[-1].username[-2:]
-        with mock.patch('rhodecode.lib.helpers.gravatar_url'):
-            users = RepoModel().get_users(name_contains=user_filter)
-
-        fake_users = [u for u in users if u['last_name'].startswith('Fake')]
-        assert len(fake_users) == 1
-        assert fake_users[0]['username'] == created_users[-1].username
-
-    def test_returns_limited_user_list(self, backend, user_util):
-        created_users = []
-        for i in range(5):
-            created_users.append(user_util.create_user(
-                active=True, lastname='Fake user'))
-
-        with mock.patch('rhodecode.lib.helpers.gravatar_url'):
-            users = RepoModel().get_users(name_contains='Fake', limit=3)
-
-        fake_users = [u for u in users if u['last_name'].startswith('Fake')]
-        assert len(fake_users) == 3
-
diff --git a/rhodecode/tests/models/test_users.py b/rhodecode/tests/models/test_users.py
index 97b541e1..0b70fcc8 100644
--- a/rhodecode/tests/models/test_users.py
+++ b/rhodecode/tests/models/test_users.py
@@ -19,10 +19,11 @@
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import pytest
-from sqlalchemy.sql.expression import true
+import mock
 
-from rhodecode.model.db import User, UserGroup, UserGroupMember, UserEmailMap,\
-    Permission, UserIpMap
+from rhodecode.lib.utils2 import safe_unicode
+from rhodecode.model.db import (
+    true, User, UserGroup, UserGroupMember, UserEmailMap, Permission, UserIpMap)
 from rhodecode.model.meta import Session
 from rhodecode.model.user import UserModel
 from rhodecode.model.user_group import UserGroupModel
@@ -33,6 +34,86 @@ from rhodecode.tests.fixture import Fixture
 fixture = Fixture()
 
 
+class TestGetUsers(object):
+    def test_returns_active_users(self, backend, user_util):
+        for i in range(4):
+            is_active = i % 2 == 0
+            user_util.create_user(active=is_active, lastname='Fake user')
+
+        with mock.patch('rhodecode.lib.helpers.gravatar_url'):
+            users = UserModel().get_users()
+        fake_users = [u for u in users if u['last_name'] == 'Fake user']
+        assert len(fake_users) == 2
+
+        expected_keys = (
+            'id', 'first_name', 'last_name', 'username', 'icon_link',
+            'value_display', 'value', 'value_type')
+        for user in users:
+            assert user['value_type'] is 'user'
+            for key in expected_keys:
+                assert key in user
+
+    def test_returns_user_filtered_by_last_name(self, backend, user_util):
+        keywords = ('aBc', u'ünicode')
+        for keyword in keywords:
+            for i in range(2):
+                user_util.create_user(
+                    active=True, lastname=u'Fake {} user'.format(keyword))
+
+        with mock.patch('rhodecode.lib.helpers.gravatar_url'):
+            keyword = keywords[1].lower()
+            users = UserModel().get_users(name_contains=keyword)
+
+        fake_users = [u for u in users if u['last_name'].startswith('Fake')]
+        assert len(fake_users) == 2
+        for user in fake_users:
+            assert user['last_name'] == safe_unicode('Fake ünicode user')
+
+    def test_returns_user_filtered_by_first_name(self, backend, user_util):
+        created_users = []
+        keywords = ('aBc', u'ünicode')
+        for keyword in keywords:
+            for i in range(2):
+                created_users.append(user_util.create_user(
+                    active=True, lastname='Fake user',
+                    firstname=u'Fake {} user'.format(keyword)))
+
+        keyword = keywords[1].lower()
+        with mock.patch('rhodecode.lib.helpers.gravatar_url'):
+            users = UserModel().get_users(name_contains=keyword)
+
+        fake_users = [u for u in users if u['last_name'].startswith('Fake')]
+        assert len(fake_users) == 2
+        for user in fake_users:
+            assert user['first_name'] == safe_unicode('Fake ünicode user')
+
+    def test_returns_user_filtered_by_username(self, backend, user_util):
+        created_users = []
+        for i in range(5):
+            created_users.append(user_util.create_user(
+                active=True, lastname='Fake user'))
+
+        user_filter = created_users[-1].username[-2:]
+        with mock.patch('rhodecode.lib.helpers.gravatar_url'):
+            users = UserModel().get_users(name_contains=user_filter)
+
+        fake_users = [u for u in users if u['last_name'].startswith('Fake')]
+        assert len(fake_users) == 1
+        assert fake_users[0]['username'] == created_users[-1].username
+
+    def test_returns_limited_user_list(self, backend, user_util):
+        created_users = []
+        for i in range(5):
+            created_users.append(user_util.create_user(
+                active=True, lastname='Fake user'))
+
+        with mock.patch('rhodecode.lib.helpers.gravatar_url'):
+            users = UserModel().get_users(name_contains='Fake', limit=3)
+
+        fake_users = [u for u in users if u['last_name'].startswith('Fake')]
+        assert len(fake_users) == 3
+
+
 @pytest.fixture
 def test_user(request, pylonsapp):
     usr = UserModel().create_or_update(

From 0b80fe66c9345cc62a992d23b38612b6e36c66bb Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 19 Apr 2017 17:30:07 +0200
Subject: [PATCH 041/211] pull-request-reviewers: added option to add reviewers
 by picking an user group for pull requests.

- fixes #5228
---
 rhodecode/apps/home/views.py                  |  9 ++-
 rhodecode/model/user.py                       | 31 +++++----
 rhodecode/model/user_group.py                 | 69 +++++++++++--------
 .../public/js/src/rhodecode/pullrequests.js   | 28 +++++---
 .../debug_style/collapsable-content.html      |  2 +-
 .../templates/pullrequests/pullrequest.mako   |  4 +-
 .../pullrequests/pullrequest_show.mako        |  4 +-
 7 files changed, 90 insertions(+), 57 deletions(-)

diff --git a/rhodecode/apps/home/views.py b/rhodecode/apps/home/views.py
index 64fc7100..cc451ab8 100644
--- a/rhodecode/apps/home/views.py
+++ b/rhodecode/apps/home/views.py
@@ -53,6 +53,7 @@ class HomeView(BaseAppView):
         query = self.request.GET.get('query')
         active = str2bool(self.request.GET.get('active') or True)
         include_groups = str2bool(self.request.GET.get('user_groups'))
+        expand_groups = str2bool(self.request.GET.get('user_groups_expand'))
 
         log.debug('generating user list, query:%s, active:%s, with_groups:%s',
                   query, active, include_groups)
@@ -63,7 +64,8 @@ class HomeView(BaseAppView):
         if include_groups:
             # extend with user groups
             _user_groups = UserGroupModel().get_user_groups(
-                name_contains=query, only_active=active)
+                name_contains=query, only_active=active,
+                expand_groups=expand_groups)
             _users = _users + _user_groups
 
         return {'suggestions': _users}
@@ -76,11 +78,14 @@ class HomeView(BaseAppView):
     def user_group_autocomplete_data(self):
         query = self.request.GET.get('query')
         active = str2bool(self.request.GET.get('active') or True)
+        expand_groups = str2bool(self.request.GET.get('user_groups_expand'))
+
         log.debug('generating user group list, query:%s, active:%s',
                   query, active)
 
         _user_groups = UserGroupModel().get_user_groups(
-            name_contains=query, only_active=active)
+            name_contains=query, only_active=active,
+            expand_groups=expand_groups)
         _user_groups = _user_groups
 
         return {'suggestions': _user_groups}
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py
index 2b2b37ba..d398eb0e 100644
--- a/rhodecode/model/user.py
+++ b/rhodecode/model/user.py
@@ -65,9 +65,24 @@ class UserModel(BaseModel):
     def get_user(self, user):
         return self._get_user(user)
 
-    def get_users(self, name_contains=None, limit=20, only_active=True):
+    def _serialize_user(self, user):
         import rhodecode.lib.helpers as h
 
+        return {
+            'id': user.user_id,
+            'first_name': user.name,
+            'last_name': user.lastname,
+            'username': user.username,
+            'email': user.email,
+            'icon_link': h.gravatar_url(user.email, 30),
+            'value_display': h.person(user),
+            'value': user.username,
+            'value_type': 'user',
+            'active': user.active,
+        }
+
+    def get_users(self, name_contains=None, limit=20, only_active=True):
+
         query = self.sa.query(User)
         if only_active:
             query = query.filter(User.active == true())
@@ -85,19 +100,7 @@ class UserModel(BaseModel):
         users = query.all()
 
         _users = [
-            {
-                'id': user.user_id,
-                'first_name': user.name,
-                'last_name': user.lastname,
-                'username': user.username,
-                'email': user.email,
-                'icon_link': h.gravatar_url(user.email, 30),
-                'value_display': h.person(user),
-                'value': user.username,
-                'value_type': 'user',
-                'active': user.active,
-            }
-            for user in users
+            self._serialize_user(user) for user in users
         ]
         return _users
 
diff --git a/rhodecode/model/user_group.py b/rhodecode/model/user_group.py
index 33798cd0..a9cfca10 100644
--- a/rhodecode/model/user_group.py
+++ b/rhodecode/model/user_group.py
@@ -30,12 +30,14 @@ import traceback
 from rhodecode.lib.utils2 import safe_str, safe_unicode
 from rhodecode.model import BaseModel
 from rhodecode.model.scm import UserGroupList
-from rhodecode.model.db import true, func, UserGroupMember, UserGroup,\
-    UserGroupRepoToPerm, Permission, UserGroupToPerm, User, UserUserGroupToPerm,\
-    UserGroupUserGroupToPerm, UserGroupRepoGroupToPerm
-from rhodecode.lib.exceptions import UserGroupAssignedException,\
-    RepoGroupAssignmentError
-from rhodecode.lib.utils2 import get_current_rhodecode_user, action_logger_generic
+from rhodecode.model.db import (
+    true, func, User, UserGroupMember, UserGroup,
+    UserGroupRepoToPerm, Permission, UserGroupToPerm, UserUserGroupToPerm,
+    UserGroupUserGroupToPerm, UserGroupRepoGroupToPerm)
+from rhodecode.lib.exceptions import (
+    UserGroupAssignedException, RepoGroupAssignmentError)
+from rhodecode.lib.utils2 import (
+    get_current_rhodecode_user, action_logger_generic)
 
 log = logging.getLogger(__name__)
 
@@ -113,7 +115,7 @@ class UserGroupModel(BaseModel):
             if member_type == 'user':
                 self.revoke_user_permission(user_group=user_group, user=member_id)
             else:
-                #check if we have permissions to alter this usergroup
+                # check if we have permissions to alter this usergroup
                 member_name = UserGroup.get(member_id).users_group_name
                 if not check_perms or HasUserGroupPermissionAny(*req_perms)(member_name, user=cur_user):
                     self.revoke_user_group_permission(
@@ -540,10 +542,28 @@ class UserGroupModel(BaseModel):
             log.debug('Adding user %s to user group %s', user.username, gr.users_group_name)
             UserGroupModel().add_user_to_group(gr.users_group_name, user.username)
 
+    def _serialize_user_group(self, user_group):
+        import rhodecode.lib.helpers as h
+        return {
+                'id': user_group.users_group_id,
+                # TODO: marcink figure out a way to generate the url for the
+                # icon
+                'icon_link': '',
+                'value_display': 'Group: %s (%d members)' % (
+                    user_group.users_group_name, len(user_group.members),),
+                'value': user_group.users_group_name,
+                'description': user_group.user_group_description,
+                'owner': user_group.user.username,
+
+                'owner_icon': h.gravatar_url(user_group.user.email, 30),
+                'value_display_owner': h.person(user_group.user.email),
+
+                'value_type': 'user_group',
+                'active': user_group.users_group_active,
+            }
+
     def get_user_groups(self, name_contains=None, limit=20, only_active=True,
                         expand_groups=False):
-        import rhodecode.lib.helpers as h
-
         query = self.sa.query(UserGroup)
         if only_active:
             query = query.filter(UserGroup.users_group_active == true())
@@ -560,26 +580,19 @@ class UserGroupModel(BaseModel):
         perm_set = ['usergroup.read', 'usergroup.write', 'usergroup.admin']
         user_groups = UserGroupList(user_groups, perm_set=perm_set)
 
-        _groups = [
-            {
-                'id': group.users_group_id,
-                # TODO: marcink figure out a way to generate the url for the
-                # icon
-                'icon_link': '',
-                'value_display': 'Group: %s (%d members)' % (
-                    group.users_group_name, len(group.members),),
-                'value': group.users_group_name,
-                'description': group.user_group_description,
-                'owner': group.user.username,
+        # store same serialize method to extract data from User
+        from rhodecode.model.user import UserModel
+        serialize_user = UserModel()._serialize_user
 
-                'owner_icon': h.gravatar_url(group.user.email, 30),
-                'value_display_owner': h.person(group.user.email),
-
-                'value_type': 'user_group',
-                'active': group.users_group_active,
-            }
-            for group in user_groups
-        ]
+        _groups = []
+        for group in user_groups:
+            entry = self._serialize_user_group(group)
+            if expand_groups:
+                expanded_members = []
+                for member in group.members:
+                    expanded_members.append(serialize_user(member.user))
+                entry['members'] = expanded_members
+            _groups.append(entry)
         return _groups
 
     @staticmethod
diff --git a/rhodecode/public/js/src/rhodecode/pullrequests.js b/rhodecode/public/js/src/rhodecode/pullrequests.js
index 8d40ad04..ad4ea4e1 100644
--- a/rhodecode/public/js/src/rhodecode/pullrequests.js
+++ b/rhodecode/public/js/src/rhodecode/pullrequests.js
@@ -198,8 +198,8 @@ var initPullRequestsCodeMirror = function (textAreaId) {
 /**
  * Reviewer autocomplete
  */
-var ReviewerAutoComplete = function(input_id) {
-  $('#'+input_id).autocomplete({
+var ReviewerAutoComplete = function(inputId) {
+  $(inputId).autocomplete({
     serviceUrl: pyroutes.url('user_autocomplete_data'),
     minChars:2,
     maxHeight:400,
@@ -207,14 +207,26 @@ var ReviewerAutoComplete = function(input_id) {
     showNoSuggestionNotice: true,
     tabDisabled: true,
     autoSelectFirst: true,
+    params: { user_id: templateContext.rhodecode_user.user_id, user_groups:true, user_groups_expand:true },
     formatResult: autocompleteFormatResult,
     lookupFilter: autocompleteFilterResult,
-    onSelect: function(suggestion, data){
-      var msg = _gettext('added manually by "{0}"');
-      var reasons = [msg.format(templateContext.rhodecode_user.username)];
-      addReviewMember(data.id, data.first_name, data.last_name,
-                      data.username, data.icon_link, reasons);
-      $('#'+input_id).val('');
+    onSelect: function(element, data) {
+
+        var reasons = [_gettext('added manually by "{0}"').format(templateContext.rhodecode_user.username)];
+        if (data.value_type == 'user_group') {
+            reasons.push(_gettext('member of "{0}"').format(data.value_display));
+
+            $.each(data.members, function(index, member_data) {
+                addReviewMember(member_data.id, member_data.first_name, member_data.last_name,
+                                member_data.username, member_data.icon_link, reasons);
+            })
+
+        } else {
+          addReviewMember(data.id, data.first_name, data.last_name,
+                          data.username, data.icon_link, reasons);
+        }
+
+      $(inputId).val('');
     }
   });
 };
diff --git a/rhodecode/templates/debug_style/collapsable-content.html b/rhodecode/templates/debug_style/collapsable-content.html
index 8551ec72..beaa42ba 100644
--- a/rhodecode/templates/debug_style/collapsable-content.html
+++ b/rhodecode/templates/debug_style/collapsable-content.html
@@ -886,7 +886,7 @@ $(document).ready(function() {
         AJAX_COMMENT_DELETE_URL = "/rhodecode-momentum/pull-request-comment/__COMMENT_ID__/delete";
 
         $(function(){
-            ReviewerAutoComplete('user');
+            ReviewerAutoComplete('#user');
 
             $('#open_edit_reviewers').on('click', function(e){
                 $('#open_edit_reviewers').hide();
diff --git a/rhodecode/templates/pullrequests/pullrequest.mako b/rhodecode/templates/pullrequests/pullrequest.mako
index 5d8e18bb..08516109 100644
--- a/rhodecode/templates/pullrequests/pullrequest.mako
+++ b/rhodecode/templates/pullrequests/pullrequest.mako
@@ -115,7 +115,7 @@
                     <input type="hidden" name="__end__" value="review_members:sequence">
                     <div id="add_reviewer_input" class='ac'>
                         <div class="reviewer_ac">
-                            ${h.text('user', class_='ac-input', placeholder=_('Add reviewer'))}
+                            ${h.text('user', class_='ac-input', placeholder=_('Add reviewer or reviewer group'))}
                             <div id="reviewers_container"></div>
                         </div>
                     </div>
@@ -584,7 +584,7 @@ $(function(){
       loadDefaultReviewers();
   % endif
 
-  ReviewerAutoComplete('user');
+  ReviewerAutoComplete('#user');
 });
 </script>
 
diff --git a/rhodecode/templates/pullrequests/pullrequest_show.mako b/rhodecode/templates/pullrequests/pullrequest_show.mako
index e94be307..483ee7a4 100644
--- a/rhodecode/templates/pullrequests/pullrequest_show.mako
+++ b/rhodecode/templates/pullrequests/pullrequest_show.mako
@@ -363,7 +363,7 @@
           <div id="add_reviewer_input" class='ac' style="display: none;">
             %if c.allowed_to_update:
             <div class="reviewer_ac">
-               ${h.text('user', class_='ac-input', placeholder=_('Add reviewer'))}
+               ${h.text('user', class_='ac-input', placeholder=_('Add reviewer or reviewer group'))}
                <div id="reviewers_container"></div>
             </div>
             <div>
@@ -617,7 +617,7 @@
 
 
         $(function(){
-            ReviewerAutoComplete('user');
+            ReviewerAutoComplete('#user');
             // custom code mirror
             var codeMirrorInstance = initPullRequestsCodeMirror('#pr-description-input');
 

From 2d37a1e953bf50b0e364d8a813ec2d99d2b3ca00 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 20 Apr 2017 01:00:09 +0200
Subject: [PATCH 042/211] routing: switched static redirection links to
 pyramid.

- ref #4185
---
 rhodecode/apps/home/__init__.py               |  4 ++
 rhodecode/config/routing.py                   | 21 +-----
 rhodecode/config/routing_links.py             | 67 +++++++++++++------
 rhodecode/lib/base.py                         |  2 +-
 .../admin/users/user_edit_profile.mako        |  2 +-
 rhodecode/templates/base/base.mako            |  2 +-
 .../base/issue_tracker_settings.mako          |  2 +-
 rhodecode/templates/base/vcs_settings.mako    |  2 +-
 .../changeset/changeset_file_comment.mako     |  2 +-
 .../templates/errors/error_document.mako      |  4 +-
 rhodecode/templates/summary/components.mako   |  2 +-
 rhodecode/tests/config/test_routing_links.py  | 35 +++++-----
 12 files changed, 82 insertions(+), 63 deletions(-)

diff --git a/rhodecode/apps/home/__init__.py b/rhodecode/apps/home/__init__.py
index d0ecad0f..ac4265fc 100644
--- a/rhodecode/apps/home/__init__.py
+++ b/rhodecode/apps/home/__init__.py
@@ -17,6 +17,7 @@
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
+from rhodecode.config import routing_links
 
 
 def includeme(config):
@@ -37,5 +38,8 @@ def includeme(config):
         name='goto_switcher_data',
         pattern='/_goto_data')
 
+    # register our static links via redirection mechanismy
+    routing_links.connect_redirection_links(config)
+
     # Scan module for configuration decorators.
     config.scan()
diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py
index 9ec2a1e2..a88054a9 100644
--- a/rhodecode/config/routing.py
+++ b/rhodecode/config/routing.py
@@ -32,8 +32,6 @@ import os
 import re
 from routes import Mapper
 
-from rhodecode.config import routing_links
-
 # prefix for non repository related links needs to be prefixed with `/`
 ADMIN_PREFIX = '/_admin'
 STATIC_FILE_PREFIX = '/_static'
@@ -189,24 +187,7 @@ def make_map(config):
     # MAIN PAGE
     rmap.connect('home', '/', controller='home', action='index', jsroute=True)
 
-    # TODO: johbo: Static links, to be replaced by our redirection mechanism
-    rmap.connect('rst_help',
-                 'http://docutils.sourceforge.net/docs/user/rst/quickref.html',
-                 _static=True)
-    rmap.connect('markdown_help',
-                 'http://daringfireball.net/projects/markdown/syntax',
-                 _static=True)
-    rmap.connect('rhodecode_official', 'https://rhodecode.com', _static=True)
-    rmap.connect('rhodecode_support', 'https://rhodecode.com/help/', _static=True)
-    rmap.connect('rhodecode_translations', 'https://rhodecode.com/translate/enterprise', _static=True)
-    # TODO: anderson - making this a static link since redirect won't play
-    # nice with POST requests
-    rmap.connect('enterprise_license_convert_from_old',
-                 'https://rhodecode.com/u/license-upgrade',
-                 _static=True)
-
-    routing_links.connect_redirection_links(rmap)
-
+    # ping and pylons error test
     rmap.connect('ping', '%s/ping' % (ADMIN_PREFIX,), controller='home', action='ping')
     rmap.connect('error_test', '%s/error_test' % (ADMIN_PREFIX,), controller='home', action='error_test')
 
diff --git a/rhodecode/config/routing_links.py b/rhodecode/config/routing_links.py
index fd9f5e68..1b2dbd5b 100644
--- a/rhodecode/config/routing_links.py
+++ b/rhodecode/config/routing_links.py
@@ -46,27 +46,56 @@ you can see it working.
 # flake8: noqa
 from __future__ import unicode_literals
 
-
 link_config = [
-    {"name": "enterprise_docs",
-     "target": "https://rhodecode.com/r1/enterprise/docs/",
-     "external_target": "https://docs.rhodecode.com/RhodeCode-Enterprise/",
-     },
-    {"name": "enterprise_log_file_locations",
-     "target": "https://rhodecode.com/r1/enterprise/docs/admin-system-overview/",
-     "external_target": "https://docs.rhodecode.com/RhodeCode-Enterprise/admin/system-overview.html#log-files",
-     },
-    {"name": "enterprise_issue_tracker_settings",
-     "target": "https://rhodecode.com/r1/enterprise/docs/issue-trackers-overview/",
-     "external_target": "https://docs.rhodecode.com/RhodeCode-Enterprise/issue-trackers/issue-trackers.html",
-     },
-    {"name": "enterprise_svn_setup",
-     "target": "https://rhodecode.com/r1/enterprise/docs/svn-setup/",
-     "external_target": "https://docs.rhodecode.com/RhodeCode-Enterprise/admin/svn-http.html",
-     },
+    {
+        "name": "enterprise_docs",
+        "target": "https://rhodecode.com/r1/enterprise/docs/",
+        "external_target": "https://docs.rhodecode.com/RhodeCode-Enterprise/",
+    },
+    {
+        "name": "enterprise_log_file_locations",
+        "target": "https://rhodecode.com/r1/enterprise/docs/admin-system-overview/",
+        "external_target": "https://docs.rhodecode.com/RhodeCode-Enterprise/admin/system-overview.html#log-files",
+    },
+    {
+        "name": "enterprise_issue_tracker_settings",
+        "target": "https://rhodecode.com/r1/enterprise/docs/issue-trackers-overview/",
+        "external_target": "https://docs.rhodecode.com/RhodeCode-Enterprise/issue-trackers/issue-trackers.html",
+    },
+    {
+        "name": "enterprise_svn_setup",
+        "target": "https://rhodecode.com/r1/enterprise/docs/svn-setup/",
+        "external_target": "https://docs.rhodecode.com/RhodeCode-Enterprise/admin/svn-http.html",
+    },
+    {
+        "name": "rst_help",
+        "target": "http://docutils.sourceforge.net/docs/user/rst/quickref.html",
+        "external_target": "http://docutils.sourceforge.net/docs/user/rst/quickref.html",
+    },
+    {
+        "name": "markdown_help",
+        "target": "http://daringfireball.net/projects/markdown/syntax",
+        "external_target": "http://daringfireball.net/projects/markdown/syntax",
+    },
+    {
+        "name": "rhodecode_official",
+        "target": "https://rhodecode.com",
+        "external_target": "https://rhodecode.com/",
+    },
+    {
+        "name": "rhodecode_support",
+        "target": "https://rhodecode.com/help/",
+        "external_target": "https://rhodecode.com/support",
+    },
+    {
+        "name": "rhodecode_translations",
+        "target": "https://rhodecode.com/translate/enterprise",
+        "external_target": "https://www.transifex.com/rhodecode/RhodeCode/",
+    },
+
 ]
 
 
-def connect_redirection_links(rmap):
+def connect_redirection_links(config):
     for link in link_config:
-        rmap.connect(link['name'], link['target'], _static=True)
+        config.add_route(link['name'], link['target'], static=True)
diff --git a/rhodecode/lib/base.py b/rhodecode/lib/base.py
index 5aee366a..1897f62a 100644
--- a/rhodecode/lib/base.py
+++ b/rhodecode/lib/base.py
@@ -302,7 +302,7 @@ def attach_context_attributes(context, request):
         'rhodecode_markup_renderer', 'rst')
     context.visual.comment_types = ChangesetComment.COMMENT_TYPES
     context.visual.rhodecode_support_url = \
-        rc_config.get('rhodecode_support_url') or url('rhodecode_support')
+        rc_config.get('rhodecode_support_url') or h.route_url('rhodecode_support')
 
     context.pre_code = rc_config.get('rhodecode_pre_code')
     context.post_code = rc_config.get('rhodecode_post_code')
diff --git a/rhodecode/templates/admin/users/user_edit_profile.mako b/rhodecode/templates/admin/users/user_edit_profile.mako
index b77986c7..91bc1884 100644
--- a/rhodecode/templates/admin/users/user_edit_profile.mako
+++ b/rhodecode/templates/admin/users/user_edit_profile.mako
@@ -127,7 +127,7 @@
                     ## allowed_languages is defined in the users.py
                     ## c.language comes from base.py as a default language
                     ${h.select('language', c.language, c.allowed_languages)}
-                    <p class="help-block">${h.literal(_('Help translate %(rc_link)s into your language.') % {'rc_link': h.link_to('RhodeCode Enterprise', h.url('rhodecode_translations'))})}</p>
+                    <p class="help-block">${h.literal(_('Help translate %(rc_link)s into your language.') % {'rc_link': h.link_to('RhodeCode Enterprise', h.route_url('rhodecode_translations'))})}</p>
                 </div>
             </div>
             <div class="buttons">
diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako
index 7e1ce201..128322d8 100644
--- a/rhodecode/templates/base/base.mako
+++ b/rhodecode/templates/base/base.mako
@@ -41,7 +41,7 @@
                % if c.visual.show_version:
                    RhodeCode Enterprise ${c.rhodecode_version} ${c.rhodecode_edition}
                % endif
-               &copy; 2010-${h.datetime.today().year}, <a href="${h.url('rhodecode_official')}" target="_blank">RhodeCode GmbH</a>. All rights reserved.
+               &copy; 2010-${h.datetime.today().year}, <a href="${h.route_url('rhodecode_official')}" target="_blank">RhodeCode GmbH</a>. All rights reserved.
                % if c.visual.rhodecode_support_url:
                   <a href="${c.visual.rhodecode_support_url}" target="_blank">${_('Support')}</a>
                % endif
diff --git a/rhodecode/templates/base/issue_tracker_settings.mako b/rhodecode/templates/base/issue_tracker_settings.mako
index 0d9c341d..e812ec75 100644
--- a/rhodecode/templates/base/issue_tracker_settings.mako
+++ b/rhodecode/templates/base/issue_tracker_settings.mako
@@ -18,7 +18,7 @@
           <td class="td-regex issue-tracker-example">${'(?:#)(?P<issue_id>\d+)'}</td>
           <td class="td-url issue-tracker-example">${'https://myissueserver.com/${repo}/issue/${issue_id}'}</td>
           <td class="td-prefix issue-tracker-example">#</td>
-          <td class="issue-tracker-example"><a href="https://docs.rhodecode.com/RhodeCode-Enterprise/issue-trackers/issue-trackers.html" target="_blank">${_('Read more')}</a></td>
+          <td class="issue-tracker-example"><a href="${h.route_url('enterprise_issue_tracker_settings')}" target="_blank">${_('Read more')}</a></td>
       </tr>
       %for uid, entry in patterns:
         <tr id="entry_${uid}">
diff --git a/rhodecode/templates/base/vcs_settings.mako b/rhodecode/templates/base/vcs_settings.mako
index 197261a3..77a65a51 100644
--- a/rhodecode/templates/base/vcs_settings.mako
+++ b/rhodecode/templates/base/vcs_settings.mako
@@ -201,7 +201,7 @@
                     <div class="label">
                         <span class="help-block">
                             ${_('Subversion HTTP Support. Enables communication with SVN over HTTP protocol.')}
-                            <a href="${h.url('enterprise_svn_setup')}" target="_blank">${_('SVN Protocol setup Documentation')}</a>.
+                            <a href="${h.route_url('enterprise_svn_setup')}" target="_blank">${_('SVN Protocol setup Documentation')}</a>.
                         </span>
                     </div>
                 </div>
diff --git a/rhodecode/templates/changeset/changeset_file_comment.mako b/rhodecode/templates/changeset/changeset_file_comment.mako
index 6b18cee7..d4e51c4b 100644
--- a/rhodecode/templates/changeset/changeset_file_comment.mako
+++ b/rhodecode/templates/changeset/changeset_file_comment.mako
@@ -346,7 +346,7 @@
             <div class="toolbar">
                 <div class="toolbar-text">
                   ${(_('Comments parsed using %s syntax with %s, and %s actions support.') % (
-                           ('<a href="%s">%s</a>' % (h.url('%s_help' % c.visual.default_renderer), c.visual.default_renderer.upper())),
+                           ('<a href="%s">%s</a>' % (h.route_url('%s_help' % c.visual.default_renderer), c.visual.default_renderer.upper())),
                            ('<span class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this RhodeCode user')),
                            ('<span class="tooltip" title="%s">`/`</span>' % _('Start typing with / for certain actions to be triggered via text box.'))
                        )
diff --git a/rhodecode/templates/errors/error_document.mako b/rhodecode/templates/errors/error_document.mako
index 68ce52d1..f071a1ba 100644
--- a/rhodecode/templates/errors/error_document.mako
+++ b/rhodecode/templates/errors/error_document.mako
@@ -62,12 +62,12 @@
                 <div class="inner-column">
                     <h4>Support</h4>
                     <p>For support, go to <a href="${c.visual.rhodecode_support_url}" target="_blank">${_('Support')}</a>.
-                       It may be useful to include your log file; see the log file locations <a href="${h.url('enterprise_log_file_locations')}">here</a>.
+                       It may be useful to include your log file; see the log file locations <a href="${h.route_url('enterprise_log_file_locations')}">here</a>.
                     </p>
                 </div>
                 <div class="inner-column">
                     <h4>Documentation</h4>
-                    <p>For more information, see <a href="${h.url('enterprise_docs')}">docs.rhodecode.com</a>.</p>
+                    <p>For more information, see <a href="${h.route_url('enterprise_docs')}">docs.rhodecode.com</a>.</p>
                 </div>
             </div>
         </div>
diff --git a/rhodecode/templates/summary/components.mako b/rhodecode/templates/summary/components.mako
index 87dfd03c..33fe0faa 100644
--- a/rhodecode/templates/summary/components.mako
+++ b/rhodecode/templates/summary/components.mako
@@ -53,7 +53,7 @@
                 <input type="text" class="input-monospace" id="clone_url_id" disabled value="${c.clone_repo_url_id}" style="display: none;"/>
                 <a id="clone_by_name" class="clone" style="display: none;">${_('Show by Name')}</a>
                 <a id="clone_by_id" class="clone">${_('Show by ID')}</a>
-                <p class="help-block">${_('SVN Protocol is disabled. To enable it, see the')} <a href="${h.url('enterprise_svn_setup')}" target="_blank">${_('documentation here')}</a>.</p>
+                <p class="help-block">${_('SVN Protocol is disabled. To enable it, see the')} <a href="${h.route_url('enterprise_svn_setup')}" target="_blank">${_('documentation here')}</a>.</p>
             </div>
           %else:
             <div class="left-label">
diff --git a/rhodecode/tests/config/test_routing_links.py b/rhodecode/tests/config/test_routing_links.py
index 12dc221f..cda0b497 100644
--- a/rhodecode/tests/config/test_routing_links.py
+++ b/rhodecode/tests/config/test_routing_links.py
@@ -18,23 +18,28 @@
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
-import mock
-
+import pytest
+import requests
 from rhodecode.config import routing_links
 
 
+def check_connection():
+    try:
+        response = requests.get('https://rhodecode.com')
+        return response.status_code == 200
+    except Exception as e:
+        print(e)
+
+    return False
+
+
+connection_available = pytest.mark.skipif(
+    not check_connection(), reason="No outside internet connection available")
+
+
+@connection_available
 def test_connect_redirection_links():
-    link_config = [
-        {"name": "example_link",
-         "external_target": "http://example.com",
-         "target": "https://rhodecode.com/r/v1/enterprise/example",
-         },
-    ]
 
-    rmap = mock.Mock()
-    with mock.patch.object(routing_links, 'link_config', link_config):
-        routing_links.connect_redirection_links(rmap)
-
-    rmap.connect.assert_called_with(
-        link_config[0]['name'], link_config[0]['target'],
-        _static=True)
+    for link_data in routing_links.link_config:
+        response = requests.get(link_data['target'])
+        assert response.url == link_data['external_target']

From 022732590fc6cd76201ea67adca64a1154962943 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 20 Apr 2017 23:39:39 +0200
Subject: [PATCH 043/211] core: remove writing of largeobject dirs on
 AppStartup.

- this makes celery much slower
- creates a database connection on APP start which again makes celery explode sometimes
- making a db connection on AppCreation could lead to some problems in future.
---
 rhodecode/config/middleware.py |  5 ++---
 rhodecode/subscribers.py       | 31 ++-----------------------------
 2 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py
index 3da53646..b7ec6a3f 100644
--- a/rhodecode/config/middleware.py
+++ b/rhodecode/config/middleware.py
@@ -53,8 +53,8 @@ from rhodecode.lib.middleware.vcs import VCSMiddleware
 from rhodecode.lib.plugins.utils import register_rhodecode_plugin
 from rhodecode.lib.utils2 import aslist as rhodecode_aslist
 from rhodecode.subscribers import (
-    scan_repositories_if_enabled, write_metadata_if_needed,
-    write_js_routes_if_enabled, create_largeobjects_dirs_if_needed)
+    scan_repositories_if_enabled, write_js_routes_if_enabled,
+    write_metadata_if_needed)
 
 
 log = logging.getLogger(__name__)
@@ -305,7 +305,6 @@ def includeme(config):
     settings['default_locale_name'] = settings.get('lang', 'en')
 
     # Add subscribers.
-    config.add_subscriber(create_largeobjects_dirs_if_needed, ApplicationCreated)
     config.add_subscriber(scan_repositories_if_enabled, ApplicationCreated)
     config.add_subscriber(write_metadata_if_needed, ApplicationCreated)
     config.add_subscriber(write_js_routes_if_enabled, ApplicationCreated)
diff --git a/rhodecode/subscribers.py b/rhodecode/subscribers.py
index 11f02ac1..8a60a008 100644
--- a/rhodecode/subscribers.py
+++ b/rhodecode/subscribers.py
@@ -130,12 +130,12 @@ def scan_repositories_if_enabled(event):
     This is subscribed to the `pyramid.events.ApplicationCreated` event. It
     does a repository scan if enabled in the settings.
     """
-    from rhodecode.model.scm import ScmModel
-    from rhodecode.lib.utils import repo2db_mapper, get_rhodecode_base_path
     settings = event.app.registry.settings
     vcs_server_enabled = settings['vcs.server.enable']
     import_on_startup = settings['startup.import_repos']
     if vcs_server_enabled and import_on_startup:
+        from rhodecode.model.scm import ScmModel
+        from rhodecode.lib.utils import repo2db_mapper, get_rhodecode_base_path
         repositories = ScmModel().repo_scan(get_rhodecode_base_path())
         repo2db_mapper(repositories, remove_obsolete=False)
 
@@ -229,33 +229,6 @@ def write_js_routes_if_enabled(event):
             f.write(jsroutes_file_content)
 
 
-def create_largeobjects_dirs_if_needed(event):
-    """
-    This is subscribed to the `pyramid.events.ApplicationCreated` event. It
-    does a repository scan if enabled in the settings.
-    """
-    from rhodecode.lib.utils import get_rhodecode_base_path
-    from rhodecode.lib.vcs.backends.hg import largefiles_store
-    from rhodecode.lib.vcs.backends.git import lfs_store
-
-    repo_store_path = get_rhodecode_base_path()
-
-    paths = [
-        largefiles_store(repo_store_path),
-        lfs_store(repo_store_path)]
-
-    for path in paths:
-        if os.path.isdir(path):
-            continue
-        if os.path.isfile(path):
-            continue
-        # not a file nor dir, we try to create it
-        try:
-            os.makedirs(path)
-        except Exception:
-            log.warning('Failed to create largefiles dir:%s', path)
-
-
 class Subscriber(object):
     """
     Base class for subscribers to the pyramid event system.

From 1ee433edf94f5b835f07913ff5181e31cfac6846 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 20 Apr 2017 23:43:46 +0200
Subject: [PATCH 044/211] core: add possibility to skip write of metadata by
 defining metadata.skip key.

---
 rhodecode/subscribers.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rhodecode/subscribers.py b/rhodecode/subscribers.py
index 8a60a008..21528b68 100644
--- a/rhodecode/subscribers.py
+++ b/rhodecode/subscribers.py
@@ -172,6 +172,10 @@ def write_metadata_if_needed(event):
         with open(metadata_destination, 'wb') as f:
             f.write(ext_json.json.dumps(metadata))
 
+    settings = event.app.registry.settings
+    if settings.get('metadata.skip'):
+        return
+
     try:
         write()
     except Exception:

From aa53b82e490fc09ed746123ed2de664ee3ca6433 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 20 Apr 2017 23:56:32 +0200
Subject: [PATCH 045/211] vcs-settings: moved creation of largefiles default
 dirs into vcs settings view.

- couldn't find a better place to do this
- check is cheap, and moving it out from AppStart to here makes more sense
- users need to enable largefile form this view, so enforcing defaults dirs
makes most sense right here in this view.
---
 rhodecode/controllers/admin/settings.py |  5 ++++-
 rhodecode/model/settings.py             | 25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/rhodecode/controllers/admin/settings.py b/rhodecode/controllers/admin/settings.py
index f7f9ebf6..716293d5 100644
--- a/rhodecode/controllers/admin/settings.py
+++ b/rhodecode/controllers/admin/settings.py
@@ -195,9 +195,12 @@ class SettingsController(BaseController):
         pyramid_settings = get_current_registry().settings
         c.svn_proxy_generate_config = pyramid_settings[generate_config]
 
+        defaults = self._form_defaults()
+
+        model.create_largeobjects_dirs_if_needed(defaults['paths_root_path'])
         return htmlfill.render(
             render('admin/settings/settings.mako'),
-            defaults=self._form_defaults(),
+            defaults=defaults,
             encoding="UTF-8",
             force_defaults=False)
 
diff --git a/rhodecode/model/settings.py b/rhodecode/model/settings.py
index 9241441f..e629eefb 100644
--- a/rhodecode/model/settings.py
+++ b/rhodecode/model/settings.py
@@ -18,6 +18,7 @@
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
+import os
 import hashlib
 import logging
 from collections import namedtuple
@@ -775,3 +776,27 @@ class VcsSettingsModel(object):
                 raise ValueError(
                     'The given data does not contain {} key'.format(data_key))
         return data_keys
+
+    def create_largeobjects_dirs_if_needed(self, repo_store_path):
+        """
+        This is subscribed to the `pyramid.events.ApplicationCreated` event. It
+        does a repository scan if enabled in the settings.
+        """
+
+        from rhodecode.lib.vcs.backends.hg import largefiles_store
+        from rhodecode.lib.vcs.backends.git import lfs_store
+
+        paths = [
+            largefiles_store(repo_store_path),
+            lfs_store(repo_store_path)]
+
+        for path in paths:
+            if os.path.isdir(path):
+                continue
+            if os.path.isfile(path):
+                continue
+            # not a file nor dir, we try to create it
+            try:
+                os.makedirs(path)
+            except Exception:
+                log.warning('Failed to create largefiles dir:%s', path)

From 6e89c8460419489ee1b9530ee176d2d1a5e2948f Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 21 Apr 2017 06:02:15 +0200
Subject: [PATCH 046/211] file-upload: allow specfing custom filename for
 uploaded archives.

---
 rhodecode/controllers/files.py           |  1 -
 rhodecode/public/css/main.less           |  4 ++++
 rhodecode/templates/files/files_add.mako | 14 +++++++++-----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/rhodecode/controllers/files.py b/rhodecode/controllers/files.py
index 7233ac09..6dbd00fa 100644
--- a/rhodecode/controllers/files.py
+++ b/rhodecode/controllers/files.py
@@ -660,7 +660,6 @@ class FilesController(BaseRepoController):
         file_obj = r_post.get('upload_file', None)
 
         if file_obj is not None and hasattr(file_obj, 'filename'):
-            filename = file_obj.filename
             content = file_obj.file
 
             if hasattr(content, 'file'):
diff --git a/rhodecode/public/css/main.less b/rhodecode/public/css/main.less
index 99141ddf..8c467a83 100644
--- a/rhodecode/public/css/main.less
+++ b/rhodecode/public/css/main.less
@@ -2008,6 +2008,10 @@ BIN_FILENODE = 7
             input {
                 display: none;
             }
+          margin-top: 10px;
+        }
+        .file-upload-label {
+          margin-top: 10px;
         }
         p {
             margin-top: 5px;
diff --git a/rhodecode/templates/files/files_add.mako b/rhodecode/templates/files/files_add.mako
index b51faaa8..074b3869 100644
--- a/rhodecode/templates/files/files_add.mako
+++ b/rhodecode/templates/files/files_add.mako
@@ -56,11 +56,17 @@
         </div>
         <div id="upload_file_container" class="fieldset" style="display: none;">
             <div class="filename-label left-label">
+                ${_('Filename')}:
+            </div>
+            <div class="right-content">
+                <input class="input-small" type="text" value="" size="46" name="filename" id="filename_upload" placeholder="${_('No file selected')}">
+            </div>
+            <div class="filename-label left-label file-upload-label">
                 ${_('Upload file')}:
             </div>
             <div class="right-content file-upload-input">
                 <label for="upload_file" class="btn btn-default">Browse</label>
-                <span id="selected-file">${_('No file selected')}</span>
+
                 <input type="file" name="upload_file" id="upload_file">
                 <p>${_('or')} <a id="file_enable" href="#">${_('Create New File')}</a></p>
             </div>
@@ -155,10 +161,8 @@
     });
 
     $('#upload_file').on('change', function() {
-        if (detectIE() && detectIE() <= 9) {
-            if (this.files && this.files[0]) {
-                $('#selected-file').html(this.files[0].name);
-            }
+        if (this.files && this.files[0]) {
+            $('#filename_upload').val(this.files[0].name);
         }
     });
 

From 8f5b7122aa67e55bb42d727893a47d2fe12e4fd6 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 21 Apr 2017 13:34:40 +0200
Subject: [PATCH 047/211] search: added basic example query block.

---
 rhodecode/controllers/search.py        |  1 +
 rhodecode/lib/helpers.py               | 18 ++++++++++++++++++
 rhodecode/lib/index/__init__.py        |  2 ++
 rhodecode/lib/index/whoosh.py          |  3 ++-
 rhodecode/templates/search/search.mako |  7 +++++++
 5 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/rhodecode/controllers/search.py b/rhodecode/controllers/search.py
index 9263ef38..00750942 100644
--- a/rhodecode/controllers/search.py
+++ b/rhodecode/controllers/search.py
@@ -107,5 +107,6 @@ class SearchController(BaseRepoController):
         c.runtime = execution_time
         c.cur_query = search_query
         c.search_type = search_type
+        c.searcher = searcher
         # Return a rendered template
         return render('/search/search.mako')
diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py
index daa446df..88fa6ae3 100644
--- a/rhodecode/lib/helpers.py
+++ b/rhodecode/lib/helpers.py
@@ -1842,6 +1842,24 @@ def journal_filter_help():
     )
 
 
+def search_filter_help(searcher):
+
+    terms = ''
+    return _(
+        'Example filter terms for `{searcher}` search:\n' +
+        '{terms}\n' +
+        'Generate wildcards using \'*\' character:\n' +
+        '     "repo_name:vcs*" - search everything starting with \'vcs\'\n' +
+        '     "repo_name:*vcs*" - search for repository containing \'vcs\'\n' +
+        '\n' +
+        'Optional AND / OR operators in queries\n' +
+        '     "repo_name:vcs OR repo_name:test"\n' +
+        '     "owner:test AND repo_name:test*"\n' +
+        'More: {search_doc}'
+    ).format(searcher=searcher.name,
+             terms=terms, search_doc=searcher.query_lang_doc)
+
+
 def not_mapped_error(repo_name):
     flash(_('%s repository is not mapped to db perhaps'
             ' it was created or renamed from the filesystem'
diff --git a/rhodecode/lib/index/__init__.py b/rhodecode/lib/index/__init__.py
index 512075b0..2eeaa0dc 100644
--- a/rhodecode/lib/index/__init__.py
+++ b/rhodecode/lib/index/__init__.py
@@ -33,6 +33,8 @@ default_location = '%(here)s/data/index'
 
 
 class BaseSearch(object):
+    query_lang_doc = ''
+
     def __init__(self):
         pass
 
diff --git a/rhodecode/lib/index/whoosh.py b/rhodecode/lib/index/whoosh.py
index 00b9be18..25f7397f 100644
--- a/rhodecode/lib/index/whoosh.py
+++ b/rhodecode/lib/index/whoosh.py
@@ -61,7 +61,8 @@ log = logging.getLogger(__name__)
 
 
 class Search(BaseSearch):
-
+    # this also shows in UI
+    query_lang_doc = 'http://whoosh.readthedocs.io/en/latest/querylang.html'
     name = 'whoosh'
 
     def __init__(self, config):
diff --git a/rhodecode/templates/search/search.mako b/rhodecode/templates/search/search.mako
index f10f139b..76a3bd9d 100644
--- a/rhodecode/templates/search/search.mako
+++ b/rhodecode/templates/search/search.mako
@@ -63,6 +63,7 @@
             ${h.select('type',c.search_type,[('content',_('File contents')), ('commit',_('Commit messages')), ('path',_('File names')),],id='id_search_type')}
             <input type="submit" value="${_('Search')}" class="btn"/>
             <br/>
+
             <div class="search-feedback-items">
             % for error in c.errors:
               <span class="error-message">
@@ -71,10 +72,16 @@
                   % endfor
               </span>
             % endfor
+            <div class="field">
+                <p class="filterexample" style="position: inherit" onclick="$('#search-help').toggle()">${_('Example Queries')}</p>
+                <pre id="search-help" style="display: none">${h.tooltip(h.search_filter_help(c.searcher))}</pre>
+            </div>
+
             <div class="field">${c.runtime}</div>
             </div>
         </div>
     </div>
+
     ${h.end_form()}
     <div class="search">
     % if c.search_type == 'content':

From 47f72d2b191dc52d0def94b6481a1bb6ba16876e Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 21 Apr 2017 17:10:26 +0200
Subject: [PATCH 048/211] search: moved search into pyramid views.

---
 rhodecode/apps/search/__init__.py             |  44 ++++++
 rhodecode/apps/search/tests/__init__.py       |   0
 .../search/tests}/test_search.py              |  50 +++----
 rhodecode/apps/search/views.py                | 133 ++++++++++++++++++
 rhodecode/config/middleware.py                |   1 +
 rhodecode/config/routing.py                   |   9 --
 rhodecode/controllers/search.py               | 112 ---------------
 rhodecode/templates/base/base.mako            |   4 +-
 rhodecode/templates/search/search.mako        |   4 +-
 .../templates/search/search_content.mako      |   2 +-
 .../tests/{controllers => lib}/test_search.py |   0
 11 files changed, 208 insertions(+), 151 deletions(-)
 create mode 100644 rhodecode/apps/search/__init__.py
 create mode 100644 rhodecode/apps/search/tests/__init__.py
 rename rhodecode/{tests/functional => apps/search/tests}/test_search.py (83%)
 create mode 100644 rhodecode/apps/search/views.py
 delete mode 100644 rhodecode/controllers/search.py
 rename rhodecode/tests/{controllers => lib}/test_search.py (100%)

diff --git a/rhodecode/apps/search/__init__.py b/rhodecode/apps/search/__init__.py
new file mode 100644
index 00000000..3b67d94c
--- /dev/null
+++ b/rhodecode/apps/search/__init__.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017 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/
+from rhodecode.apps._base import ADMIN_PREFIX
+
+
+def includeme(config):
+
+    config.add_route(
+        name='search',
+        pattern=ADMIN_PREFIX + '/search')
+
+    config.add_route(
+        name='search_repo',
+        pattern='/{repo_name:.*?[^/]}/search', repo_route=True)
+
+    # Scan module for configuration decorators.
+    config.scan()
+
+
+    # # FULL TEXT SEARCH
+    # rmap.connect('search', '%s/search' % (ADMIN_PREFIX,),
+    #              controller='search')
+    # rmap.connect('search_repo_home', '/{repo_name}/search',
+    #              controller='search',
+    #              action='index',
+    #              conditions={'function': check_repo},
+    #              requirements=URL_NAME_REQUIREMENTS)
\ No newline at end of file
diff --git a/rhodecode/apps/search/tests/__init__.py b/rhodecode/apps/search/tests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/rhodecode/tests/functional/test_search.py b/rhodecode/apps/search/tests/test_search.py
similarity index 83%
rename from rhodecode/tests/functional/test_search.py
rename to rhodecode/apps/search/tests/test_search.py
index b3748e1c..6c97a335 100644
--- a/rhodecode/tests/functional/test_search.py
+++ b/rhodecode/apps/search/tests/test_search.py
@@ -25,16 +25,27 @@ import pytest
 from whoosh import query
 
 from rhodecode.tests import (
-    TestController, url, SkipTest, HG_REPO,
+    TestController, SkipTest, HG_REPO,
     TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS)
 from rhodecode.tests.utils import AssertResponse
 
 
+def route_path(name, **kwargs):
+    from rhodecode.apps._base import ADMIN_PREFIX
+    return {
+        'search':
+            ADMIN_PREFIX + '/search',
+        'search_repo':
+            '/{repo_name}/search',
+
+    }[name].format(**kwargs)
+
+
 class TestSearchController(TestController):
 
     def test_index(self):
         self.log_user()
-        response = self.app.get(url(controller='search', action='index'))
+        response = self.app.get(route_path('search'))
         assert_response = AssertResponse(response)
         assert_response.one_element_exists('input#q')
 
@@ -43,17 +54,15 @@ class TestSearchController(TestController):
             raise SkipTest('skipped due to existing index')
         else:
             self.log_user()
-            response = self.app.get(url(controller='search', action='index'),
+            response = self.app.get(route_path('search'),
                                     {'q': HG_REPO})
             response.mustcontain('There is no index to search in. '
                                  'Please run whoosh indexer')
 
     def test_search_validation(self):
         self.log_user()
-        response = self.app.get(
-            url(controller='search', action='index'), {'q': query,
-                                                       'type': 'content',
-                                                       'page_limit': 1000})
+        response = self.app.get(route_path('search'),
+            {'q': query, 'type': 'content', 'page_limit': 1000})
 
         response.mustcontain(
             'page_limit - 1000 is greater than maximum value 500')
@@ -88,10 +97,8 @@ class TestSearchController(TestController):
     ])
     def test_search_files(self, query, expected_hits, expected_paths):
         self.log_user()
-        response = self.app.get(
-            url(controller='search', action='index'), {'q': query,
-                                                       'type': 'content',
-                                                       'page_limit': 500})
+        response = self.app.get(route_path('search'),
+            {'q': query, 'type': 'content', 'page_limit': 500})
 
         response.mustcontain('%s results' % expected_hits)
         for path in expected_paths:
@@ -137,10 +144,8 @@ class TestSearchController(TestController):
     def test_search_commit_messages(
             self, query, expected_hits, expected_commits, enabled_backends):
         self.log_user()
-        response = self.app.get(
-            url(controller='search', action='index'), {'q': query,
-                                                       'type': 'commit',
-                                                       'page_limit': 500})
+        response = self.app.get(route_path('search'),
+            {'q': query, 'type': 'commit', 'page_limit': 500})
 
         response.mustcontain('%s results' % expected_hits)
         for backend, commit_id in expected_commits:
@@ -156,10 +161,8 @@ class TestSearchController(TestController):
     ])
     def test_search_file_paths(self, query, expected_hits, expected_paths):
         self.log_user()
-        response = self.app.get(
-            url(controller='search', action='index'), {'q': query,
-                                                       'type': 'path',
-                                                       'page_limit': 500})
+        response = self.app.get(route_path('search'),
+            {'q': query, 'type': 'path', 'page_limit': 500})
 
         response.mustcontain('%s results' % expected_hits)
         for path in expected_paths:
@@ -168,8 +171,7 @@ class TestSearchController(TestController):
     def test_search_commit_message_specific_repo(self, backend):
         self.log_user()
         response = self.app.get(
-            url(controller='search', action='index',
-                repo_name=backend.repo_name),
+            route_path('search_repo',repo_name=backend.repo_name),
             {'q': 'bother to ask where to fetch repo during tests',
              'type': 'commit'})
 
@@ -178,8 +180,7 @@ class TestSearchController(TestController):
     def test_filters_are_not_applied_for_admin_user(self):
         self.log_user()
         with mock.patch('whoosh.searching.Searcher.search') as search_mock:
-            self.app.get(
-                url(controller='search', action='index'),
+            self.app.get(route_path('search'),
                 {'q': 'test query', 'type': 'commit'})
         assert search_mock.call_count == 1
         _, kwargs = search_mock.call_args
@@ -188,8 +189,7 @@ class TestSearchController(TestController):
     def test_filters_are_applied_for_normal_user(self, enabled_backends):
         self.log_user(TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS)
         with mock.patch('whoosh.searching.Searcher.search') as search_mock:
-            self.app.get(
-                url(controller='search', action='index'),
+            self.app.get(route_path('search'),
                 {'q': 'test query', 'type': 'commit'})
         assert search_mock.call_count == 1
         _, kwargs = search_mock.call_args
diff --git a/rhodecode/apps/search/views.py b/rhodecode/apps/search/views.py
new file mode 100644
index 00000000..1230bf46
--- /dev/null
+++ b/rhodecode/apps/search/views.py
@@ -0,0 +1,133 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2011-2017 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 urllib
+from pyramid.view import view_config
+from webhelpers.util import update_params
+
+from rhodecode.apps._base import BaseAppView, RepoAppView
+from rhodecode.lib.auth import (LoginRequired, HasRepoPermissionAnyDecorator)
+from rhodecode.lib.helpers import Page
+from rhodecode.lib.utils2 import safe_str, safe_int
+from rhodecode.lib.index import searcher_from_config
+from rhodecode.model import validation_schema
+from rhodecode.model.validation_schema.schemas import search_schema
+
+log = logging.getLogger(__name__)
+
+
+def search(request, tmpl_context, repo_name):
+    searcher = searcher_from_config(request.registry.settings)
+    formatted_results = []
+    execution_time = ''
+
+    schema = search_schema.SearchParamsSchema()
+
+    search_params = {}
+    errors = []
+    try:
+        search_params = schema.deserialize(
+            dict(search_query=request.GET.get('q'),
+                 search_type=request.GET.get('type'),
+                 search_sort=request.GET.get('sort'),
+                 page_limit=request.GET.get('page_limit'),
+                 requested_page=request.GET.get('page'))
+        )
+    except validation_schema.Invalid as e:
+        errors = e.children
+
+    def url_generator(**kw):
+        q = urllib.quote(safe_str(search_query))
+        return update_params(
+            "?q=%s&type=%s" % (q, safe_str(search_type)), **kw)
+
+    c = tmpl_context
+    search_query = search_params.get('search_query')
+    search_type = search_params.get('search_type')
+    search_sort = search_params.get('search_sort')
+    if search_params.get('search_query'):
+        page_limit = search_params['page_limit']
+        requested_page = search_params['requested_page']
+
+        try:
+            search_result = searcher.search(
+                search_query, search_type, c.auth_user, repo_name,
+                requested_page, page_limit, search_sort)
+
+            formatted_results = Page(
+                search_result['results'], page=requested_page,
+                item_count=search_result['count'],
+                items_per_page=page_limit, url=url_generator)
+        finally:
+            searcher.cleanup()
+
+        if not search_result['error']:
+            execution_time = '%s results (%.3f seconds)' % (
+                search_result['count'],
+                search_result['runtime'])
+        elif not errors:
+            node = schema['search_query']
+            errors = [
+                validation_schema.Invalid(node, search_result['error'])]
+
+    c.perm_user = c.auth_user
+    c.repo_name = repo_name
+    c.sort = search_sort
+    c.url_generator = url_generator
+    c.errors = errors
+    c.formatted_results = formatted_results
+    c.runtime = execution_time
+    c.cur_query = search_query
+    c.search_type = search_type
+    c.searcher = searcher
+
+
+class SearchView(BaseAppView):
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+        self._register_global_c(c)
+        return c
+
+    @LoginRequired()
+    @view_config(
+        route_name='search', request_method='GET',
+        renderer='rhodecode:templates/search/search.mako')
+    def search(self):
+        c = self.load_default_context()
+        search(self.request, c, repo_name=None)
+        return self._get_template_context(c)
+
+
+class SearchRepoView(RepoAppView):
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+        self._register_global_c(c)
+        return c
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.admin')
+    @view_config(
+        route_name='search_repo', request_method='GET',
+        renderer='rhodecode:templates/search/search.mako')
+    def search_repo(self):
+        c = self.load_default_context()
+        search(self.request, c, repo_name=self.db_repo_name)
+        return self._get_template_context(c)
diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py
index b7ec6a3f..0aa57c43 100644
--- a/rhodecode/config/middleware.py
+++ b/rhodecode/config/middleware.py
@@ -291,6 +291,7 @@ def includeme(config):
     config.include('rhodecode.apps.login')
     config.include('rhodecode.apps.home')
     config.include('rhodecode.apps.repository')
+    config.include('rhodecode.apps.search')
     config.include('rhodecode.apps.user_profile')
     config.include('rhodecode.apps.my_account')
     config.include('rhodecode.apps.svn_support')
diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py
index a88054a9..0d698fce 100644
--- a/rhodecode/config/routing.py
+++ b/rhodecode/config/routing.py
@@ -614,15 +614,6 @@ def make_map(config):
                  controller='journal', action='toggle_following', jsroute=True,
                  conditions={'method': ['POST']})
 
-    # FULL TEXT SEARCH
-    rmap.connect('search', '%s/search' % (ADMIN_PREFIX,),
-                 controller='search')
-    rmap.connect('search_repo_home', '/{repo_name}/search',
-                 controller='search',
-                 action='index',
-                 conditions={'function': check_repo},
-                 requirements=URL_NAME_REQUIREMENTS)
-
     # FEEDS
     rmap.connect('rss_feed_home', '/{repo_name}/feed/rss',
                  controller='feed', action='rss',
diff --git a/rhodecode/controllers/search.py b/rhodecode/controllers/search.py
deleted file mode 100644
index 00750942..00000000
--- a/rhodecode/controllers/search.py
+++ /dev/null
@@ -1,112 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (C) 2010-2017 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/
-
-"""
-Search controller for RhodeCode
-"""
-
-import logging
-import urllib
-
-from pylons import request, config, tmpl_context as c
-
-from webhelpers.util import update_params
-
-from rhodecode.lib.auth import LoginRequired, AuthUser
-from rhodecode.lib.base import BaseRepoController, render
-from rhodecode.lib.helpers import Page
-from rhodecode.lib.utils2 import safe_str, safe_int
-from rhodecode.lib.index import searcher_from_config
-from rhodecode.model import validation_schema
-from rhodecode.model.validation_schema.schemas import search_schema
-
-log = logging.getLogger(__name__)
-
-
-class SearchController(BaseRepoController):
-
-    @LoginRequired()
-    def index(self, repo_name=None):
-
-        searcher = searcher_from_config(config)
-        formatted_results = []
-        execution_time = ''
-
-        schema = search_schema.SearchParamsSchema()
-
-        search_params = {}
-        errors = []
-        try:
-            search_params = schema.deserialize(
-                dict(search_query=request.GET.get('q'),
-                     search_type=request.GET.get('type'),
-                     search_sort=request.GET.get('sort'),
-                     page_limit=request.GET.get('page_limit'),
-                     requested_page=request.GET.get('page'))
-            )
-        except validation_schema.Invalid as e:
-            errors = e.children
-
-        def url_generator(**kw):
-            q = urllib.quote(safe_str(search_query))
-            return update_params(
-                "?q=%s&type=%s" % (q, safe_str(search_type)), **kw)
-
-        search_query = search_params.get('search_query')
-        search_type = search_params.get('search_type')
-        search_sort = search_params.get('search_sort')
-        if search_params.get('search_query'):
-            page_limit = search_params['page_limit']
-            requested_page = search_params['requested_page']
-
-            c.perm_user = AuthUser(user_id=c.rhodecode_user.user_id,
-                                   ip_addr=self.ip_addr)
-
-            try:
-                search_result = searcher.search(
-                    search_query, search_type, c.perm_user, repo_name,
-                    requested_page, page_limit, search_sort)
-
-                formatted_results = Page(
-                    search_result['results'], page=requested_page,
-                    item_count=search_result['count'],
-                    items_per_page=page_limit, url=url_generator)
-            finally:
-                searcher.cleanup()
-
-            if not search_result['error']:
-                execution_time = '%s results (%.3f seconds)' % (
-                    search_result['count'],
-                    search_result['runtime'])
-            elif not errors:
-                node = schema['search_query']
-                errors = [
-                    validation_schema.Invalid(node, search_result['error'])]
-
-        c.sort = search_sort
-        c.url_generator = url_generator
-        c.errors = errors
-        c.formatted_results = formatted_results
-        c.runtime = execution_time
-        c.cur_query = search_query
-        c.search_type = search_type
-        c.searcher = searcher
-        # Return a rendered template
-        return render('/search/search.mako')
diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako
index 128322d8..45de2b6b 100644
--- a/rhodecode/templates/base/base.mako
+++ b/rhodecode/templates/base/base.mako
@@ -253,7 +253,7 @@
                    ${_('Compare fork')}</a></li>
               %endif
 
-              <li><a href="${h.url('search_repo_home',repo_name=c.repo_name)}">${_('Search')}</a></li>
+              <li><a href="${h.route_path('search_repo',repo_name=c.repo_name)}">${_('Search')}</a></li>
 
               %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name) and c.rhodecode_db_repo.enable_locking:
                 %if c.rhodecode_db_repo.locked[0]:
@@ -399,7 +399,7 @@
           </a>
         </li>
       <li class="${is_active('search')}">
-          <a class="menulink" title="${_('Search in repositories you have access to')}" href="${h.url('search')}">
+          <a class="menulink" title="${_('Search in repositories you have access to')}" href="${h.route_path('search')}">
             <div class="menulabel">${_('Search')}</div>
           </a>
       </li>
diff --git a/rhodecode/templates/search/search.mako b/rhodecode/templates/search/search.mako
index 76a3bd9d..15d43d76 100644
--- a/rhodecode/templates/search/search.mako
+++ b/rhodecode/templates/search/search.mako
@@ -45,7 +45,7 @@
         <div class="title">
             ${self.repo_page_title(c.rhodecode_db_repo)}
         </div>
-        ${h.form(h.url('search_repo_home',repo_name=c.repo_name),method='get')}
+        ${h.form(h.route_path('search_repo',repo_name=c.repo_name),method='get')}
     %else:
         <!-- box / title -->
         <div class="title">
@@ -53,7 +53,7 @@
             <ul class="links">&nbsp;</ul>
         </div>
         <!-- end box / title -->
-        ${h.form(h.url('search'),method='get')}
+        ${h.form(h.route_path('search'), method='get')}
     %endif
     <div class="form search-form">
         <div class="fields">
diff --git a/rhodecode/templates/search/search_content.mako b/rhodecode/templates/search/search_content.mako
index 1a25a39b..aebe039d 100644
--- a/rhodecode/templates/search/search_content.mako
+++ b/rhodecode/templates/search/search_content.mako
@@ -54,7 +54,7 @@ ${h.code_highlight(
           <div class="stats">
             ${h.link_to(h.literal(entry['f_path']), h.url('files_home',repo_name=entry['repository'],revision=entry.get('commit_id', 'tip'),f_path=entry['f_path']))}
             %if entry.get('lines'):
-              | ${entry.get('lines', 0.)} ${ungettext('line', 'lines', entry.get('lines', 0.))}
+              | ${entry.get('lines', 0.)} ${_ungettext('line', 'lines', entry.get('lines', 0.))}
             %endif
             %if entry.get('size'):
               | ${h.format_byte_size_binary(entry['size'])}
diff --git a/rhodecode/tests/controllers/test_search.py b/rhodecode/tests/lib/test_search.py
similarity index 100%
rename from rhodecode/tests/controllers/test_search.py
rename to rhodecode/tests/lib/test_search.py

From e5360e80e40dfddec85b403dca8cb4d7baa25523 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 24 Apr 2017 10:25:16 +0200
Subject: [PATCH 049/211] pull-reqests: workflow, change who can close a PR,
 it's only super-admin owner or person who can merge.

- before it was every reviewer can close. Which really doesn't make sense.
---
 rhodecode/controllers/pullrequests.py         |  8 ++++--
 .../tests/functional/test_pullrequests.py     | 26 ++++++++++++++++---
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py
index 279cc5db..b17fd546 100644
--- a/rhodecode/controllers/pullrequests.py
+++ b/rhodecode/controllers/pullrequests.py
@@ -726,7 +726,7 @@ class PullrequestsController(BaseRepoController):
             c.allowed_to_delete = PullRequestModel().check_user_delete(
                 pull_request_latest, c.rhodecode_user) and not pr_closed
             c.allowed_to_comment = not pr_closed
-            c.allowed_to_close = c.allowed_to_change_status and not pr_closed
+            c.allowed_to_close = c.allowed_to_merge and not pr_closed
 
         # check merge capabilities
         _merge_check = MergeCheck.validate(
@@ -969,7 +969,11 @@ class PullrequestsController(BaseRepoController):
         close_pull_request = request.POST.get('close_pull_request')
 
         close_pr = False
-        if close_pull_request:
+        # only owner or admin or person with write permissions
+        allowed_to_close = PullRequestModel().check_user_update(
+            pull_request, c.rhodecode_user)
+
+        if close_pull_request and allowed_to_close:
             close_pr = True
             pull_request_review_status = pull_request.calculated_review_status()
             if pull_request_review_status == ChangesetStatus.STATUS_APPROVED:
diff --git a/rhodecode/tests/functional/test_pullrequests.py b/rhodecode/tests/functional/test_pullrequests.py
index 1d397fd1..95ba258e 100644
--- a/rhodecode/tests/functional/test_pullrequests.py
+++ b/rhodecode/tests/functional/test_pullrequests.py
@@ -31,7 +31,8 @@ from rhodecode.model.meta import Session
 from rhodecode.model.pull_request import PullRequestModel
 from rhodecode.model.user import UserModel
 from rhodecode.model.repo import RepoModel
-from rhodecode.tests import assert_session_flash, url, TEST_USER_ADMIN_LOGIN
+from rhodecode.tests import (
+    assert_session_flash, url, TEST_USER_ADMIN_LOGIN, TEST_USER_REGULAR_LOGIN)
 from rhodecode.tests.utils import AssertResponse
 
 
@@ -97,7 +98,7 @@ class TestPullrequestsController:
             'Server-side pull request merging is disabled.'
             in response) != pr_merge_enabled
 
-    def test_close_status_visibility(self, pr_util, csrf_token):
+    def test_close_status_visibility(self, pr_util, user_util, csrf_token):
         from rhodecode.tests.functional.test_login import login_url, logut_url
         # Logout
         response = self.app.post(
@@ -105,10 +106,11 @@ class TestPullrequestsController:
             params={'csrf_token': csrf_token})
         # Login as regular user
         response = self.app.post(login_url,
-                                 {'username': 'test_regular',
+                                 {'username': TEST_USER_REGULAR_LOGIN,
                                   'password': 'test12'})
 
-        pull_request = pr_util.create_pull_request(author='test_regular')
+        pull_request = pr_util.create_pull_request(
+            author=TEST_USER_REGULAR_LOGIN)
 
         response = self.app.get(url(
             controller='pullrequests', action='show',
@@ -118,6 +120,22 @@ class TestPullrequestsController:
         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(url(
+            controller='pullrequests', action='show',
+            repo_name=pull_request.target_repo.scm_instance().name,
+            pull_request_id=str(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):

From dabc59289069da67a4ddf7a275aa92add4cd096d Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 24 Apr 2017 16:36:28 +0200
Subject: [PATCH 050/211] pull-request: fixed typo in wrong ref type error, and
 added which refs are actually allowed.

---
 rhodecode/controllers/pullrequests.py | 2 +-
 rhodecode/lib/vcs/backends/base.py    | 2 +-
 rhodecode/model/pull_request.py       | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py
index b17fd546..05d7928a 100644
--- a/rhodecode/controllers/pullrequests.py
+++ b/rhodecode/controllers/pullrequests.py
@@ -492,7 +492,7 @@ class PullrequestsController(BaseRepoController):
             msg = PullRequestModel.UPDATE_STATUS_MESSAGES[resp.reason]
             warning_reasons = [
                 UpdateFailureReason.NO_CHANGE,
-                UpdateFailureReason.WRONG_REF_TPYE,
+                UpdateFailureReason.WRONG_REF_TYPE,
             ]
             category = 'warning' if resp.reason in warning_reasons else 'error'
             h.flash(msg, category=category)
diff --git a/rhodecode/lib/vcs/backends/base.py b/rhodecode/lib/vcs/backends/base.py
index 9d9387a9..5c23f755 100644
--- a/rhodecode/lib/vcs/backends/base.py
+++ b/rhodecode/lib/vcs/backends/base.py
@@ -130,7 +130,7 @@ class UpdateFailureReason(object):
     NO_CHANGE = 2
 
     # The pull request has a reference type that is not supported for update.
-    WRONG_REF_TPYE = 3
+    WRONG_REF_TYPE = 3
 
     # Update failed because the target reference is missing.
     MISSING_TARGET_REF = 4
diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py
index f2470ad0..324cf681 100644
--- a/rhodecode/model/pull_request.py
+++ b/rhodecode/model/pull_request.py
@@ -118,9 +118,9 @@ class PullRequestModel(BaseModel):
             'Pull request update failed because of an unknown error.'),
         UpdateFailureReason.NO_CHANGE: lazy_ugettext(
             'No update needed because the source and target have not changed.'),
-        UpdateFailureReason.WRONG_REF_TPYE: lazy_ugettext(
+        UpdateFailureReason.WRONG_REF_TYPE: lazy_ugettext(
             'Pull request cannot be updated because the reference type is '
-            'not supported for an update.'),
+            'not supported for an update. Only Branch, Tag or Bookmark is allowed.'),
         UpdateFailureReason.MISSING_TARGET_REF: lazy_ugettext(
             'This pull request cannot be updated because the target '
             'reference is missing.'),
@@ -594,7 +594,7 @@ class PullRequestModel(BaseModel):
                 pull_request, source_ref_type)
             return UpdateResponse(
                 executed=False,
-                reason=UpdateFailureReason.WRONG_REF_TPYE,
+                reason=UpdateFailureReason.WRONG_REF_TYPE,
                 old=pull_request, new=None, changes=None,
                 source_changed=False, target_changed=False)
 

From 9ee8d218a26e58add39b185e1ea6c9fc8c90519a Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 24 Apr 2017 23:19:10 +0200
Subject: [PATCH 051/211] files: fix problem with specifing custom path for
 filename.

- problem was in html where the filename was specified 2x.
---
 rhodecode/controllers/files.py           | 1 +
 rhodecode/templates/files/files_add.mako | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/rhodecode/controllers/files.py b/rhodecode/controllers/files.py
index 6dbd00fa..c81ac409 100644
--- a/rhodecode/controllers/files.py
+++ b/rhodecode/controllers/files.py
@@ -660,6 +660,7 @@ class FilesController(BaseRepoController):
         file_obj = r_post.get('upload_file', None)
 
         if file_obj is not None and hasattr(file_obj, 'filename'):
+            filename = r_post.get('filename_upload')
             content = file_obj.file
 
             if hasattr(content, 'file'):
diff --git a/rhodecode/templates/files/files_add.mako b/rhodecode/templates/files/files_add.mako
index 074b3869..821d88f1 100644
--- a/rhodecode/templates/files/files_add.mako
+++ b/rhodecode/templates/files/files_add.mako
@@ -59,7 +59,7 @@
                 ${_('Filename')}:
             </div>
             <div class="right-content">
-                <input class="input-small" type="text" value="" size="46" name="filename" id="filename_upload" placeholder="${_('No file selected')}">
+                <input class="input-small" type="text" value="" size="46" name="filename_upload" id="filename_upload" placeholder="${_('No file selected')}">
             </div>
             <div class="filename-label left-label file-upload-label">
                 ${_('Upload file')}:

From ecae23eca6c408addd4292b30401082566c12a6e Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 24 Apr 2017 23:21:40 +0200
Subject: [PATCH 052/211] routes: updated JS routes after moving search into
 pyramid.

---
 rhodecode/public/js/rhodecode/routes.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js
index ad587034..aa0637e0 100644
--- a/rhodecode/public/js/rhodecode/routes.js
+++ b/rhodecode/public/js/rhodecode/routes.js
@@ -103,6 +103,8 @@ function registerRCRoutes() {
     pyroutes.register('strip', '/%(repo_name)s/strip', ['repo_name']);
     pyroutes.register('strip_check', '/%(repo_name)s/strip_check', ['repo_name']);
     pyroutes.register('strip_execute', '/%(repo_name)s/strip_execute', ['repo_name']);
+    pyroutes.register('search', '/_admin/search', []);
+    pyroutes.register('search_repo', '/%(repo_name)s/search', ['repo_name']);
     pyroutes.register('user_profile', '/_profiles/%(username)s', ['username']);
     pyroutes.register('my_account_profile', '/_admin/my_account/profile', []);
     pyroutes.register('my_account_password', '/_admin/my_account/password', []);

From 335ffaa6fd6e775aa9d94dd2ace2bfedad032029 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 25 Apr 2017 08:38:38 +0200
Subject: [PATCH 053/211] users: personal repo-group shouldn't be available for
 default user.

---
 rhodecode/model/db.py   | 5 ++++-
 rhodecode/model/user.py | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index 0991eaa9..ea065bb9 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -2208,8 +2208,11 @@ class RepoGroup(Base, BaseModel):
     @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.personal == true()) \
             .filter(cls.user == user).scalar()
 
     @classmethod
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py
index d398eb0e..4aa7fb18 100644
--- a/rhodecode/model/user.py
+++ b/rhodecode/model/user.py
@@ -669,7 +669,8 @@ class UserModel(BaseModel):
                     user_id, api_key, username)
                 return False
             if not dbuser.active:
-                log.debug('User `%s` is inactive, skipping fill data', username)
+                log.debug('User `%s:%s` is inactive, skipping fill data',
+                          username, user_id)
                 return False
 
             log.debug('filling user:%s data', dbuser)

From 8b1cc3ce9d0718e277b37f81c49ab1b4d164d85e Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 25 Apr 2017 08:39:18 +0200
Subject: [PATCH 054/211] user: simplify fetching of personal repository
 groups.

- we don't rely on auth user no need to fetch permissions
- for disabled users this fixes a bug that repo group wasn't displayed
---
 rhodecode/controllers/admin/users.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rhodecode/controllers/admin/users.py b/rhodecode/controllers/admin/users.py
index b9efc62f..20f8ecbf 100644
--- a/rhodecode/controllers/admin/users.py
+++ b/rhodecode/controllers/admin/users.py
@@ -381,8 +381,7 @@ class UsersController(BaseController):
             return redirect(h.route_path('users'))
 
         c.active = 'advanced'
-        c.perm_user = AuthUser(user_id=user_id, ip_addr=self.ip_addr)
-        c.personal_repo_group = c.perm_user.personal_repo_group
+        c.personal_repo_group = RepoGroup.get_user_personal_repo_group(user_id)
         c.personal_repo_group_name = RepoGroupModel()\
             .get_personal_group_name(user)
         c.first_admin = User.get_first_super_admin()

From d1c88bb315f87e43a4248d6a764253fe420f827a Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 27 Apr 2017 10:40:52 +0200
Subject: [PATCH 055/211] dependencies: fixes iron-ajax hash.

- somehow it was changed. Need to fix it for CI to work.
---
 pkgs/bower-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/bower-packages.nix b/pkgs/bower-packages.nix
index 138fe3be..db721237 100644
--- a/pkgs/bower-packages.nix
+++ b/pkgs/bower-packages.nix
@@ -7,7 +7,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
   (fetchbower "paper-tooltip" "PolymerElements/paper-tooltip#1.1.3" "PolymerElements/paper-tooltip#^1.1.2" "0vmrm1n8k9sk9nvqy03q177axy22pia6i3j1gxbk72j3pqiqvg6k")
   (fetchbower "paper-toast" "PolymerElements/paper-toast#1.3.0" "PolymerElements/paper-toast#^1.3.0" "0x9rqxsks5455s8pk4aikpp99ijdn6kxr9gvhwh99nbcqdzcxq1m")
   (fetchbower "paper-toggle-button" "PolymerElements/paper-toggle-button#1.2.0" "PolymerElements/paper-toggle-button#^1.2.0" "0mphcng3ngspbpg4jjn0mb91nvr4xc1phq3qswib15h6sfww1b2w")
-  (fetchbower "iron-ajax" "PolymerElements/iron-ajax#1.4.3" "PolymerElements/iron-ajax#^1.4.3" "0m3dx27arwmlcp00b7n516sc5a51f40p9vapr1nvd57l3i3z0pzm")
+  (fetchbower "iron-ajax" "PolymerElements/iron-ajax#1.4.3" "PolymerElements/iron-ajax#^1.4.3" "1b1z3112ggjdflgrwbpmnbsh3kgcm4hn255wshvrlzds4w069gja")
   (fetchbower "iron-autogrow-textarea" "PolymerElements/iron-autogrow-textarea#1.0.13" "PolymerElements/iron-autogrow-textarea#^1.0.13" "0zwhpl97vii1s8k0lgain8i9dnw29b0mxc5ixdscx9las13n2lqq")
   (fetchbower "iron-a11y-keys" "PolymerElements/iron-a11y-keys#1.0.6" "PolymerElements/iron-a11y-keys#^1.0.6" "1xz3mgghfcxixq28sdb654iaxj4nyi1bzcwf77ydkms6fviqs9mv")
   (fetchbower "iron-flex-layout" "PolymerElements/iron-flex-layout#1.3.1" "PolymerElements/iron-flex-layout#^1.0.0" "0nswv3ih3bhflgcd2wjfmddqswzgqxb2xbq65jk9w3rkj26hplbl")

From 9ab3e7057a17a723733af12e5c61c85af8c4af3d Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 25 Apr 2017 08:45:07 +0200
Subject: [PATCH 056/211] ux: show that user is disabled when editing him.

---
 rhodecode/templates/admin/users/user_edit.mako | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rhodecode/templates/admin/users/user_edit.mako b/rhodecode/templates/admin/users/user_edit.mako
index 3f81f726..d8be135b 100644
--- a/rhodecode/templates/admin/users/user_edit.mako
+++ b/rhodecode/templates/admin/users/user_edit.mako
@@ -13,7 +13,12 @@
     &raquo;
     ${h.link_to(_('Users'),h.route_path('users'))}
     &raquo;
+    % if c.user.active:
     ${c.user.username}
+    % else:
+    <strike title="${_('This user is set as disabled')}">${c.user.username}</strike>
+    % endif
+
 </%def>
 
 <%def name="menu_bar_nav()">

From 23f3d5fbdff59517e749c0f206495c59a918bd85 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 26 Apr 2017 23:19:45 +0200
Subject: [PATCH 057/211] audit-logs: introducing new audit logger for actions.

- api v2
- gathers more actions such as dump of user/action data
---
 rhodecode/lib/audit_logger.py | 138 ++++++++++++++++++++++++++++++++++
 rhodecode/model/db.py         |   6 +-
 2 files changed, 143 insertions(+), 1 deletion(-)
 create mode 100644 rhodecode/lib/audit_logger.py

diff --git a/rhodecode/lib/audit_logger.py b/rhodecode/lib/audit_logger.py
new file mode 100644
index 00000000..33b6335d
--- /dev/null
+++ b/rhodecode/lib/audit_logger.py
@@ -0,0 +1,138 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2017-2017 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 datetime
+
+from rhodecode.model import meta
+from rhodecode.model.db import User, UserLog
+
+
+log = logging.getLogger(__name__)
+
+
+ACTIONS = {
+    'repo.add': {},
+    'repo.edit': {},
+}
+
+
+class UserWrap(object):
+    """
+    Fake object used to imitate AuthUser
+    """
+
+    def __init__(self, user_id=None, username=None, ip_addr=None):
+        self.user_id = user_id
+        self.username = username
+        self.ip_addr = ip_addr
+
+
+def _store_log(action_name, action_data, user_id, username, user_data,
+               ip_address, repository_id, repository_name):
+    user_log = UserLog()
+    user_log.version = UserLog.VERSION_2
+
+    user_log.action = action_name
+    user_log.action_data = action_data
+
+    user_log.user_ip = ip_address
+
+    user_log.user_id = user_id
+    user_log.username = username
+    user_log.user_data = user_data
+
+    user_log.repository_id = repository_id
+    user_log.repository_name = repository_name
+
+    user_log.action_date = datetime.datetime.now()
+
+    log.info('AUDIT: Logging action: `%s` by user:id:%s[%s] ip:%s',
+             action_name, user_id, username, ip_address)
+
+    return user_log
+
+
+def store(
+        action, user, action_data=None, user_data=None, ip_addr=None,
+        repo=None, sa_session=None, commit=False):
+    """
+    Audit logger for various actions made by users, typically this results in a call such::
+
+        from rhodecode.lib import audit_logger
+
+        audit_logger.store(action='repo.edit', user=self._rhodecode_user)
+        audit_logger.store(action='repo.delete', user=audit_logger.UserWrap(username='itried-to-login', ip_addr='8.8.8.8'))
+
+        # without an user ?
+        audit_user = audit_logger.UserWrap(
+            username=self.request.params.get('username'),
+            ip_addr=self.request.remote_addr)
+        audit_logger.store(action='user.login.failure', user=audit_user)
+    """
+    from rhodecode.lib.utils2 import safe_unicode
+    from rhodecode.lib.auth import AuthUser
+
+    if action not in ACTIONS:
+        raise ValueError('Action `{}` not in valid actions'.format(action))
+
+    if not sa_session:
+        sa_session = meta.Session()
+
+    try:
+        username = getattr(user, 'username', None)
+        if not username:
+            pass
+
+        user_id = getattr(user, 'user_id', None)
+        if not user_id:
+            # maybe we have username ? Try to figure user_id from username
+            if username:
+                user_id = getattr(
+                    User.get_by_username(username), 'user_id', None)
+
+        ip_addr = ip_addr or getattr(user, 'ip_addr', None)
+        if not ip_addr:
+            pass
+
+        if not user_data:
+            # try to get this from the auth user
+            if isinstance(user, AuthUser):
+                user_data = {}
+
+        repository_id = getattr(repo, 'repo_id', None)
+        repository_name = getattr(repo, 'repo_name', None)
+
+        user_log = _store_log(
+            action_name=safe_unicode(action),
+            action_data=action_data or {},
+            user_id=user_id,
+            username=username,
+            user_data=user_data or {},
+            ip_address=safe_unicode(ip_addr),
+            repository_id=repository_id,
+            repository_name=repository_name
+        )
+        sa_session.add(user_log)
+        if commit:
+            sa_session.commit()
+
+    except Exception:
+        log.exception('AUDIT: failed to store audit log')
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index ea065bb9..52864ec2 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -1098,6 +1098,10 @@ class UserLog(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
+    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'), nullable=True, unique=None, default=None)
     username = Column("username", String(255), nullable=True, unique=None, default=None)
@@ -1107,7 +1111,7 @@ class UserLog(Base, BaseModel):
     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='v1')
+    version = Column("version", String(255), nullable=True, default=VERSION_1)
     user_data = Column('user_data_json', MutationObj.as_mutable(JsonType(dialect_map=dict(mysql=UnicodeText(16384)))))
     action_data = Column('action_data_json', MutationObj.as_mutable(JsonType(dialect_map=dict(mysql=UnicodeText(16384)))))
 

From a956ed9350ff105573a80b58bbde3a328cd77f6e Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 26 Apr 2017 22:53:00 +0200
Subject: [PATCH 058/211] audit-journal: support v2 api to browse audit events.

---
 rhodecode/templates/admin/admin_log.mako | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/rhodecode/templates/admin/admin_log.mako b/rhodecode/templates/admin/admin_log.mako
index 25bf7209..27e6dd4b 100644
--- a/rhodecode/templates/admin/admin_log.mako
+++ b/rhodecode/templates/admin/admin_log.mako
@@ -6,9 +6,10 @@
     <tr>
         <th>${_('Username')}</th>
         <th>${_('Action')}</th>
+        <th>${_('Action Data')}</th>
         <th>${_('Repository')}</th>
         <th>${_('Date')}</th>
-        <th>${_('From IP')}</th>
+        <th>${_('IP')}</th>
     </tr>
 
     %for cnt,l in enumerate(c.users_log):
@@ -20,11 +21,24 @@
               ${l.username}
             %endif
         </td>
-        <td class="td-journalaction">${h.action_parser(l)[0]()}
+        <td class="td-journalaction">
+            % if l.version == l.VERSION_1:
+                ${h.action_parser(l)[0]()}
+            % else:
+                ${h.literal(l.action)}
+            % endif
+
             <div class="journal_action_params">
-                ${h.literal(h.action_parser(l)[1]())}
+                % if l.version == l.VERSION_1:
+                    ${h.literal(h.action_parser(l)[1]())}
+                % endif
             </div>
         </td>
+        <td>
+            % if l.version == l.VERSION_2:
+                ${l.action_data}
+            % endif
+        </td>
         <td class="td-componentname">
             %if l.repository is not None:
               ${h.link_to(l.repository.repo_name,h.url('summary_home',repo_name=l.repository.repo_name))}

From 5369a394e019b4888e938822f6afa0b6a9b6416b Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 26 Apr 2017 23:05:03 +0200
Subject: [PATCH 059/211] user-audit: share same template for rendering audit
 logs between user and admin views.

---
 rhodecode/apps/admin/views/users.py           |  4 +-
 rhodecode/controllers/admin/admin.py          |  2 +-
 rhodecode/templates/admin/admin.mako          |  2 +-
 rhodecode/templates/admin/admin_log.mako      | 61 +------------------
 rhodecode/templates/admin/admin_log_base.mako | 60 ++++++++++++++++++
 .../admin/users/user_edit_audit.mako          | 47 +-------------
 6 files changed, 67 insertions(+), 109 deletions(-)
 create mode 100644 rhodecode/templates/admin/admin_log_base.mako

diff --git a/rhodecode/apps/admin/views/users.py b/rhodecode/apps/admin/views/users.py
index 1b428a7b..196f1b41 100644
--- a/rhodecode/apps/admin/views/users.py
+++ b/rhodecode/apps/admin/views/users.py
@@ -293,14 +293,14 @@ class AdminUsersView(BaseAppView, DataGridAppView):
         p = safe_int(self.request.GET.get('page', 1), 1)
 
         filter_term = self.request.GET.get('filter')
-        c.user_log = UserModel().get_user_log(c.user, filter_term)
+        user_log = UserModel().get_user_log(c.user, filter_term)
 
         def url_generator(**kw):
             if filter_term:
                 kw['filter'] = filter_term
             return self.request.current_route_path(_query=kw)
 
-        c.user_log = Page(c.user_log, page=p, items_per_page=10,
+        c.audit_logs = Page(user_log, page=p, items_per_page=10,
                           url=url_generator)
         c.filter_term = filter_term
         return self._get_template_context(c)
diff --git a/rhodecode/controllers/admin/admin.py b/rhodecode/controllers/admin/admin.py
index 793456ac..bbaa8dad 100644
--- a/rhodecode/controllers/admin/admin.py
+++ b/rhodecode/controllers/admin/admin.py
@@ -67,7 +67,7 @@ class AdminController(BaseController):
         def url_generator(**kw):
             return url.current(filter=c.search_term, **kw)
 
-        c.users_log = Page(users_log, page=p, items_per_page=10,
+        c.audit_logs = Page(users_log, page=p, items_per_page=10,
                            url=url_generator)
         c.log_data = render('admin/admin_log.mako')
 
diff --git a/rhodecode/templates/admin/admin.mako b/rhodecode/templates/admin/admin.mako
index 61e401cd..eea33dad 100644
--- a/rhodecode/templates/admin/admin.mako
+++ b/rhodecode/templates/admin/admin.mako
@@ -12,7 +12,7 @@
     ${h.form(None, id_="filter_form", method="get")}
         <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or ''}" placeholder="${_('journal filter...')}"/>
         <input type='submit' value="${_('filter')}" class="btn" />
-        ${_('Admin journal')} - ${ungettext('%s entry', '%s entries', c.users_log.item_count) % (c.users_log.item_count)}
+        ${_('Admin journal')} - ${ungettext('%s entry', '%s entries', c.audit_logs.item_count) % (c.audit_logs.item_count)}
     ${h.end_form()}
     <p class="tooltip filterexample" title="${h.tooltip(h.journal_filter_help())}">${_('Example Queries')}</p>
 </%def>
diff --git a/rhodecode/templates/admin/admin_log.mako b/rhodecode/templates/admin/admin_log.mako
index 27e6dd4b..02be0e1c 100644
--- a/rhodecode/templates/admin/admin_log.mako
+++ b/rhodecode/templates/admin/admin_log.mako
@@ -1,64 +1,5 @@
 ## -*- coding: utf-8 -*-
-<%namespace name="base" file="/base/base.mako"/>
-
-%if c.users_log:
-<table class="rctable admin_log">
-    <tr>
-        <th>${_('Username')}</th>
-        <th>${_('Action')}</th>
-        <th>${_('Action Data')}</th>
-        <th>${_('Repository')}</th>
-        <th>${_('Date')}</th>
-        <th>${_('IP')}</th>
-    </tr>
-
-    %for cnt,l in enumerate(c.users_log):
-    <tr class="parity${cnt%2}">
-        <td class="td-user">
-            %if l.user is not None:
-              ${base.gravatar_with_user(l.user.email)}
-            %else:
-              ${l.username}
-            %endif
-        </td>
-        <td class="td-journalaction">
-            % if l.version == l.VERSION_1:
-                ${h.action_parser(l)[0]()}
-            % else:
-                ${h.literal(l.action)}
-            % endif
-
-            <div class="journal_action_params">
-                % if l.version == l.VERSION_1:
-                    ${h.literal(h.action_parser(l)[1]())}
-                % endif
-            </div>
-        </td>
-        <td>
-            % if l.version == l.VERSION_2:
-                ${l.action_data}
-            % endif
-        </td>
-        <td class="td-componentname">
-            %if l.repository is not None:
-              ${h.link_to(l.repository.repo_name,h.url('summary_home',repo_name=l.repository.repo_name))}
-            %else:
-              ${l.repository_name}
-            %endif
-        </td>
-
-        <td class="td-time">${h.format_date(l.action_date)}</td>
-        <td class="td-ip">${l.user_ip}</td>
-    </tr>
-    %endfor
-</table>
-
-<div class="pagination-wh pagination-left">
-${c.users_log.pager('$link_previous ~2~ $link_next')}
-</div>
-%else:
-    ${_('No actions yet')}
-%endif
+<%include file="/admin/admin_log_base.mako" />
 
 <script type="text/javascript">
     $(function(){
diff --git a/rhodecode/templates/admin/admin_log_base.mako b/rhodecode/templates/admin/admin_log_base.mako
new file mode 100644
index 00000000..90cdd67c
--- /dev/null
+++ b/rhodecode/templates/admin/admin_log_base.mako
@@ -0,0 +1,60 @@
+<%namespace name="base" file="/base/base.mako"/>
+
+%if c.audit_logs:
+<table class="rctable admin_log">
+    <tr>
+        <th>${_('Username')}</th>
+        <th>${_('Action')}</th>
+        <th>${_('Action Data')}</th>
+        <th>${_('Repository')}</th>
+        <th>${_('Date')}</th>
+        <th>${_('IP')}</th>
+    </tr>
+
+    %for cnt,l in enumerate(c.audit_logs):
+    <tr class="parity${cnt%2}">
+        <td class="td-user">
+            %if l.user is not None:
+              ${base.gravatar_with_user(l.user.email)}
+            %else:
+              ${l.username}
+            %endif
+        </td>
+        <td class="td-journalaction">
+            % if l.version == l.VERSION_1:
+                ${h.action_parser(l)[0]()}
+            % else:
+                ${h.literal(l.action)}
+            % endif
+
+            <div class="journal_action_params">
+                % if l.version == l.VERSION_1:
+                    ${h.literal(h.action_parser(l)[1]())}
+                % endif
+            </div>
+        </td>
+        <td>
+            % if l.version == l.VERSION_2:
+                ${l.action_data}
+            % endif
+        </td>
+        <td class="td-componentname">
+            %if l.repository is not None:
+              ${h.link_to(l.repository.repo_name,h.url('summary_home',repo_name=l.repository.repo_name))}
+            %else:
+              ${l.repository_name}
+            %endif
+        </td>
+
+        <td class="td-time">${h.format_date(l.action_date)}</td>
+        <td class="td-ip">${l.user_ip}</td>
+    </tr>
+    %endfor
+</table>
+
+<div class="pagination-wh pagination-left">
+${c.audit_logs.pager('$link_previous ~2~ $link_next')}
+</div>
+%else:
+    ${_('No actions yet')}
+%endif
\ No newline at end of file
diff --git a/rhodecode/templates/admin/users/user_edit_audit.mako b/rhodecode/templates/admin/users/user_edit_audit.mako
index 65770efe..08f71899 100644
--- a/rhodecode/templates/admin/users/user_edit_audit.mako
+++ b/rhodecode/templates/admin/users/user_edit_audit.mako
@@ -5,7 +5,7 @@
 <div class="panel panel-default">
     <div class="panel-heading">
       <h3 class="panel-title">${_('User Audit Logs')} -
-      ${_ungettext('%s entry', '%s entries', c.user_log.item_count) % (c.user_log.item_count)}
+      ${_ungettext('%s entry', '%s entries', c.audit_logs.item_count) % (c.audit_logs.item_count)}
       </h3>
     </div>
     <div class="panel-body">
@@ -16,50 +16,7 @@
         ${h.end_form()}
         <p class="tooltip filterexample" style="position: inherit" title="${h.tooltip(h.journal_filter_help())}">${_('Example Queries')}</p>
 
-        % if c.user_log:
-            <table class="rctable admin_log">
-                <tr>
-                    <th>${_('Username')}</th>
-                    <th>${_('Action')}</th>
-                    <th>${_('Repository')}</th>
-                    <th>${_('Date')}</th>
-                    <th>${_('From IP')}</th>
-                </tr>
-
-                %for cnt,l in enumerate(c.user_log):
-                <tr class="parity${cnt%2}">
-                    <td class="td-user">
-                        %if l.user is not None:
-                          ${base.gravatar_with_user(l.user.email)}
-                        %else:
-                          ${l.username}
-                        %endif
-                    </td>
-                    <td class="td-journalaction">${h.action_parser(l)[0]()}
-                        <div class="journal_action_params">
-                            ${h.literal(h.action_parser(l)[1]())}
-                        </div>
-                    </td>
-                    <td class="td-componentname">
-                        %if l.repository is not None:
-                          ${h.link_to(l.repository.repo_name,h.url('summary_home',repo_name=l.repository.repo_name))}
-                        %else:
-                          ${l.repository_name}
-                        %endif
-                    </td>
-
-                    <td class="td-time">${h.format_date(l.action_date)}</td>
-                    <td class="td-ip">${l.user_ip}</td>
-                </tr>
-                %endfor
-            </table>
-
-            <div class="pagination-wh pagination-left">
-            ${c.user_log.pager('$link_previous ~2~ $link_next')}
-            </div>
-        % else:
-            ${_('No actions yet')}
-        % endif
+        <%include file="/admin/admin_log_base.mako" />
 
     </div>
 </div>

From 18fc345e5d1c3e5dca1aab16fcb0ae0dcf2ed86b Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 26 Apr 2017 23:05:48 +0200
Subject: [PATCH 060/211] audit-logs: use new v2 api on login/logout/password
 reset views.

---
 rhodecode/apps/login/views.py | 20 ++++++++++++++++++++
 rhodecode/lib/audit_logger.py |  5 +++++
 2 files changed, 25 insertions(+)

diff --git a/rhodecode/apps/login/views.py b/rhodecode/apps/login/views.py
index 43645ea7..03ce3edc 100644
--- a/rhodecode/apps/login/views.py
+++ b/rhodecode/apps/login/views.py
@@ -34,6 +34,7 @@ from rhodecode.apps._base import BaseAppView
 from rhodecode.authentication.base import authenticate, HTTP_TYPE
 from rhodecode.events import UserRegistered
 from rhodecode.lib import helpers as h
+from rhodecode.lib import audit_logger
 from rhodecode.lib.auth import (
     AuthUser, HasPermissionAnyDecorator, CSRFRequired)
 from rhodecode.lib.base import get_ip_addr
@@ -166,6 +167,13 @@ class LoginView(BaseAppView):
                 username=form_result['username'],
                 remember=form_result['remember'])
             log.debug('Redirecting to "%s" after login.', c.came_from)
+
+            audit_user = audit_logger.UserWrap(
+                username=self.request.params.get('username'),
+                ip_addr=self.request.remote_addr)
+            audit_logger.store(action='user.login.success', user=audit_user,
+                               commit=True)
+
             raise HTTPFound(c.came_from, headers=headers)
         except formencode.Invalid as errors:
             defaults = errors.value
@@ -176,6 +184,12 @@ class LoginView(BaseAppView):
                 'errors': errors.error_dict,
                 'defaults': defaults,
             })
+
+            audit_user = audit_logger.UserWrap(
+                username=self.request.params.get('username'),
+                ip_addr=self.request.remote_addr)
+            audit_logger.store(action='user.login.failure', user=audit_user,
+                               commit=True)
             return render_ctx
 
         except UserCreationError as e:
@@ -191,6 +205,8 @@ class LoginView(BaseAppView):
     def logout(self):
         auth_user = self._rhodecode_user
         log.info('Deleting session for user: `%s`', auth_user)
+        audit_logger.store(action='user.logout', user=auth_user,
+                           commit=True)
         self.session.delete()
         return HTTPFound(url('home'))
 
@@ -338,6 +354,10 @@ class LoginView(BaseAppView):
                     form_result, password_reset_url)
                 # Display success message and redirect.
                 self.session.flash(msg, queue='success')
+
+                audit_logger.store(action='user.password.reset_request',
+                                   action_data={'email': user_email},
+                                   user=self._rhodecode_user, commit=True)
                 return HTTPFound(self.request.route_path('reset_password'))
 
             except formencode.Invalid as errors:
diff --git a/rhodecode/lib/audit_logger.py b/rhodecode/lib/audit_logger.py
index 33b6335d..dbbaa5cc 100644
--- a/rhodecode/lib/audit_logger.py
+++ b/rhodecode/lib/audit_logger.py
@@ -29,6 +29,11 @@ log = logging.getLogger(__name__)
 
 
 ACTIONS = {
+    'user.login.success': {},
+    'user.login.failure': {},
+    'user.logout': {},
+    'user.password.reset_request': {},
+
     'repo.add': {},
     'repo.edit': {},
 }

From 5664a5498d41b6587fe2488ee1e5858ce705c4fa Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 26 Apr 2017 23:15:50 +0200
Subject: [PATCH 061/211] strip: cleanup code.

---
 rhodecode/apps/repository/views/strip.py | 33 ++++++++++++------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/rhodecode/apps/repository/views/strip.py b/rhodecode/apps/repository/views/strip.py
index 1ba26f48..e6ac2dfb 100644
--- a/rhodecode/apps/repository/views/strip.py
+++ b/rhodecode/apps/repository/views/strip.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2017-2017 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
@@ -24,7 +24,7 @@ from pyramid.view import view_config
 from rhodecode.apps._base import RepoAppView
 from rhodecode.lib.auth import (LoginRequired, HasRepoPermissionAnyDecorator,
     NotAnonymous)
-
+from rhodecode.lib.ext_json import json
 
 log = logging.getLogger(__name__)
 
@@ -57,21 +57,21 @@ class StripView(RepoAppView):
     @HasRepoPermissionAnyDecorator('repository.admin')
     @view_config(
         route_name='strip_check', request_method='POST',
-        renderer='json', xhr=True
-    )
+        renderer='json', xhr=True)
     def strip_check(self):
         from rhodecode.lib.vcs.backends.base import EmptyCommit
         data = {}
         rp = self.request.POST
         for i in range(1, 11):
-            chset = 'changeset_id-%d'%(i,)
+            chset = 'changeset_id-%d' % (i,)
             check = rp.get(chset)
             if check:
                 data[i] = self.db_repo.get_changeset(rp[chset])
                 if isinstance(data[i], EmptyCommit):
                     data[i] = {'rev': None, 'commit': rp[chset]}
                 else:
-                    data[i] = {'rev': data[i].raw_id, 'branch': data[i].branch, 'author': data[i].author,
+                    data[i] = {'rev': data[i].raw_id, 'branch': data[i].branch,
+                               'author': data[i].author,
                                'comment': data[i].message}
             else:
                 break
@@ -82,12 +82,9 @@ class StripView(RepoAppView):
     @HasRepoPermissionAnyDecorator('repository.admin')
     @view_config(
         route_name='strip_execute', request_method='POST',
-        renderer='json', xhr=True
-    )
+        renderer='json', xhr=True)
     def strip_execute(self):
-
         from rhodecode.model.scm import ScmModel
-        from rhodecode.lib.ext_json import json
 
         c = self.load_default_context()
         user = self._rhodecode_user
@@ -95,16 +92,18 @@ class StripView(RepoAppView):
         data = {}
         for idx in rp:
             commit = json.loads(rp[idx])
-            #If someone put two times the same branch
+            # If someone put two times the same branch
             if commit['branch'] in data.keys():
                 continue
             try:
-                ScmModel().strip(repo=c.repo_info,
-                          commit_id=commit['rev'], branch=commit['branch'])
-                log.info('Stripped commit %s from repo `%s` by %s' % (commit['rev'], c.repo_info.repo_name, user))
+                ScmModel().strip(
+                    repo=c.repo_info,
+                    commit_id=commit['rev'], branch=commit['branch'])
+                log.info('Stripped commit %s from repo `%s` by %s' % (
+                    commit['rev'], c.repo_info.repo_name, user))
                 data[commit['rev']] = True
-            except Exception, e:
+            except Exception as e:
                 data[commit['rev']] = False
-                log.debug('Stripped commit %s from repo `%s` failed by %s, exeption %s' % (commit['rev'],
-                                                                            c.repo_info.repo_name, user, e.message))
+                log.debug('Stripped commit %s from repo `%s` failed by %s, exeption %s' % (
+                    commit['rev'], self.db_repo_name, user, e.message))
         return data

From 2e6238eb7613b43ffbeed591ce37ac40d84c01be Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 26 Apr 2017 23:21:12 +0200
Subject: [PATCH 062/211] audit-logs: added web strip command to audit logs

---
 rhodecode/apps/repository/views/strip.py | 8 ++++++++
 rhodecode/lib/audit_logger.py            | 1 +
 2 files changed, 9 insertions(+)

diff --git a/rhodecode/apps/repository/views/strip.py b/rhodecode/apps/repository/views/strip.py
index e6ac2dfb..441fee18 100644
--- a/rhodecode/apps/repository/views/strip.py
+++ b/rhodecode/apps/repository/views/strip.py
@@ -22,6 +22,7 @@ import logging
 from pyramid.view import view_config
 
 from rhodecode.apps._base import RepoAppView
+from rhodecode.lib import audit_logger
 from rhodecode.lib.auth import (LoginRequired, HasRepoPermissionAnyDecorator,
     NotAnonymous)
 from rhodecode.lib.ext_json import json
@@ -102,6 +103,13 @@ class StripView(RepoAppView):
                 log.info('Stripped commit %s from repo `%s` by %s' % (
                     commit['rev'], c.repo_info.repo_name, user))
                 data[commit['rev']] = True
+
+                audit_logger.store(
+                    action='repo.commit.strip',
+                    action_data={'commit_id': commit['rev']},
+                    repo=self.db_repo,
+                    user=self._rhodecode_user, commit=True)
+
             except Exception as e:
                 data[commit['rev']] = False
                 log.debug('Stripped commit %s from repo `%s` failed by %s, exeption %s' % (
diff --git a/rhodecode/lib/audit_logger.py b/rhodecode/lib/audit_logger.py
index dbbaa5cc..7d33031a 100644
--- a/rhodecode/lib/audit_logger.py
+++ b/rhodecode/lib/audit_logger.py
@@ -36,6 +36,7 @@ ACTIONS = {
 
     'repo.add': {},
     'repo.edit': {},
+    'repo.commit.strip': {}
 }
 
 

From 546bc596826053336764ff35766cc0c61edbb71f Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 27 Apr 2017 10:36:32 +0200
Subject: [PATCH 063/211] tests: fixed some tests after new audit-logger

---
 rhodecode/tests/functional/test_admin.py       | 6 ++++--
 rhodecode/tests/functional/test_admin_repos.py | 8 ++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/rhodecode/tests/functional/test_admin.py b/rhodecode/tests/functional/test_admin.py
index 379564d4..0e68c763 100644
--- a/rhodecode/tests/functional/test_admin.py
+++ b/rhodecode/tests/functional/test_admin.py
@@ -79,7 +79,8 @@ class TestAdminController(TestController):
     def test_filter_all_entries(self):
         self.log_user()
         response = self.app.get(url(controller='admin/admin', action='index',))
-        response.mustcontain('2034 entries')
+        all_count = UserLog.query().count()
+        response.mustcontain('%s entries' % all_count)
 
     def test_filter_journal_filter_exact_match_on_repository(self):
         self.log_user()
@@ -139,7 +140,8 @@ class TestAdminController(TestController):
         self.log_user()
         response = self.app.get(url(controller='admin/admin', action='index',
                                     filter='username:*test*'))
-        response.mustcontain('100 entries')
+        entries_count = UserLog.query().filter(UserLog.username.ilike('%test%')).count()
+        response.mustcontain('{} entries'.format(entries_count))
 
     def test_filter_journal_filter_prefix_on_username(self):
         self.log_user()
diff --git a/rhodecode/tests/functional/test_admin_repos.py b/rhodecode/tests/functional/test_admin_repos.py
index aaa7fa72..392c4537 100644
--- a/rhodecode/tests/functional/test_admin_repos.py
+++ b/rhodecode/tests/functional/test_admin_repos.py
@@ -797,13 +797,14 @@ class TestVcsSettings(object):
             self, backend, user_util, settings_util, csrf_token):
         repo = backend.create_repo()
         repo_name = repo.repo_name
-        user = UserModel().get_by_username(TEST_USER_REGULAR_LOGIN)
 
         logout_user_session(self.app, csrf_token)
         session = login_user_session(
             self.app, TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS)
         new_csrf_token = auth.get_csrf_token(session)
 
+        user = UserModel().get_by_username(TEST_USER_REGULAR_LOGIN)
+        repo = Repository.get_by_repo_name(repo_name)
         user_util.grant_user_permission_to_repo(repo, user, 'repository.admin')
         data = self.FORM_DATA.copy()
         data['csrf_token'] = new_csrf_token
@@ -1179,11 +1180,14 @@ class TestVcsSettings(object):
             self, backend_svn, user_util, settings_util, csrf_token):
         repo = backend_svn.create_repo()
         repo_name = repo.repo_name
-        user = UserModel().get_by_username(TEST_USER_REGULAR_LOGIN)
+
         logout_user_session(self.app, csrf_token)
         session = login_user_session(
             self.app, TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS)
         csrf_token = auth.get_csrf_token(session)
+
+        repo = Repository.get_by_repo_name(repo_name)
+        user = UserModel().get_by_username(TEST_USER_REGULAR_LOGIN)
         user_util.grant_user_permission_to_repo(repo, user, 'repository.admin')
         branch = settings_util.create_repo_rhodecode_ui(
             repo, VcsSettingsModel.SVN_BRANCH_SECTION, 'test_branch',

From 39d7def8ce59eca3290d85c146a1dfa10a2b9da9 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 27 Apr 2017 12:10:26 +0200
Subject: [PATCH 064/211] audit-logger: store some user details on we have
 proper object of auth-user.

---
 rhodecode/lib/audit_logger.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rhodecode/lib/audit_logger.py b/rhodecode/lib/audit_logger.py
index 7d33031a..08771da8 100644
--- a/rhodecode/lib/audit_logger.py
+++ b/rhodecode/lib/audit_logger.py
@@ -121,7 +121,10 @@ def store(
         if not user_data:
             # try to get this from the auth user
             if isinstance(user, AuthUser):
-                user_data = {}
+                user_data = {
+                    'username': user.username,
+                    'email': user.email,
+                }
 
         repository_id = getattr(repo, 'repo_id', None)
         repository_name = getattr(repo, 'repo_name', None)

From acb796c723f1db82e499a90c596944a576bd9abf Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 27 Apr 2017 12:12:05 +0200
Subject: [PATCH 065/211] audit-logs: store user agent for login/logout
 actions.

---
 rhodecode/apps/login/views.py | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/rhodecode/apps/login/views.py b/rhodecode/apps/login/views.py
index 03ce3edc..64bc91a9 100644
--- a/rhodecode/apps/login/views.py
+++ b/rhodecode/apps/login/views.py
@@ -171,8 +171,10 @@ class LoginView(BaseAppView):
             audit_user = audit_logger.UserWrap(
                 username=self.request.params.get('username'),
                 ip_addr=self.request.remote_addr)
-            audit_logger.store(action='user.login.success', user=audit_user,
-                               commit=True)
+            action_data = {'user_agent': self.request.user_agent}
+            audit_logger.store(
+                action='user.login.success', action_data=action_data,
+                user=audit_user, commit=True)
 
             raise HTTPFound(c.came_from, headers=headers)
         except formencode.Invalid as errors:
@@ -188,8 +190,10 @@ class LoginView(BaseAppView):
             audit_user = audit_logger.UserWrap(
                 username=self.request.params.get('username'),
                 ip_addr=self.request.remote_addr)
-            audit_logger.store(action='user.login.failure', user=audit_user,
-                               commit=True)
+            action_data = {'user_agent': self.request.user_agent}
+            audit_logger.store(
+                action='user.login.failure', action_data=action_data,
+                user=audit_user, commit=True)
             return render_ctx
 
         except UserCreationError as e:
@@ -205,8 +209,11 @@ class LoginView(BaseAppView):
     def logout(self):
         auth_user = self._rhodecode_user
         log.info('Deleting session for user: `%s`', auth_user)
-        audit_logger.store(action='user.logout', user=auth_user,
-                           commit=True)
+
+        action_data = {'user_agent': self.request.user_agent}
+        audit_logger.store(
+            action='user.logout', action_data=action_data,
+            user=auth_user, commit=True)
         self.session.delete()
         return HTTPFound(url('home'))
 
@@ -355,8 +362,10 @@ class LoginView(BaseAppView):
                 # Display success message and redirect.
                 self.session.flash(msg, queue='success')
 
+                action_data = {'email': user_email,
+                               'user_agent': self.request.user_agent}
                 audit_logger.store(action='user.password.reset_request',
-                                   action_data={'email': user_email},
+                                   action_data=action_data,
                                    user=self._rhodecode_user, commit=True)
                 return HTTPFound(self.request.route_path('reset_password'))
 

From 13ef2d8dbf267b29a80b5c4673bd2561ba0078bf Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 27 Apr 2017 12:12:30 +0200
Subject: [PATCH 066/211] audit-logs: present action data as formatted JSON.

---
 rhodecode/templates/admin/admin_log_base.mako | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rhodecode/templates/admin/admin_log_base.mako b/rhodecode/templates/admin/admin_log_base.mako
index 90cdd67c..c62945c6 100644
--- a/rhodecode/templates/admin/admin_log_base.mako
+++ b/rhodecode/templates/admin/admin_log_base.mako
@@ -35,7 +35,12 @@
         </td>
         <td>
             % if l.version == l.VERSION_2:
-                ${l.action_data}
+                <a href="#" onclick="$('#entry-'+${l.user_log_id}).toggle();return false">${_('toggle')}</a>
+                <div id="entry-${l.user_log_id}" style="display: none">
+                    <pre>${h.json.dumps(l.action_data, indent=4, sort_keys=True)}</pre>
+                </div>
+            % else:
+                ${_('not available in v1 type')}
             % endif
         </td>
         <td class="td-componentname">

From 175f8f53473282e2a3a5e43c5a068b6ac75e22b4 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 27 Apr 2017 12:35:28 +0200
Subject: [PATCH 067/211] ux: make url on summary screen stretch to fill in
 space.

---
 rhodecode/public/css/summary.less | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/rhodecode/public/css/summary.less b/rhodecode/public/css/summary.less
index c5cafaf8..716e7128 100644
--- a/rhodecode/public/css/summary.less
+++ b/rhodecode/public/css/summary.less
@@ -57,9 +57,13 @@
           white-space: pre-wrap;
         }
 
-        #clone_url,
+        #clone_url {
+            width: ~"calc(100% - 96px)";
+            padding:  @padding/4;
+        }
+
         #clone_url_id {
-            min-width: 29em;
+            width: ~"calc(100% - 118px)";
             padding:  @padding/4;
         }
 

From 721d155fa9b7ad8d369b16fe57f4df30c144a42a Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 27 Apr 2017 18:06:51 +0200
Subject: [PATCH 068/211] pull-requests: make sure we process comments in the
 order of IDS when linking them.

- random order could be problematic
---
 rhodecode/model/pull_request.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py
index 324cf681..03de5217 100644
--- a/rhodecode/model/pull_request.py
+++ b/rhodecode/model/pull_request.py
@@ -806,13 +806,15 @@ class PullRequestModel(BaseModel):
 
         """
         pull_request = pull_request_version.pull_request
-        comments = ChangesetComment.query().filter(
-            # TODO: johbo: Should we query for the repo at all here?
-            # Pending decision on how comments of PRs are to be related
-            # to either the source repo, the target repo or no repo at all.
-            ChangesetComment.repo_id == pull_request.target_repo.repo_id,
-            ChangesetComment.pull_request == pull_request,
-            ChangesetComment.pull_request_version == None)
+        comments = ChangesetComment.query()\
+            .filter(
+                # TODO: johbo: Should we query for the repo at all here?
+                # Pending decision on how comments of PRs are to be related
+                # to either the source repo, the target repo or no repo at all.
+                ChangesetComment.repo_id == pull_request.target_repo.repo_id,
+                ChangesetComment.pull_request == pull_request,
+                ChangesetComment.pull_request_version == None)\
+            .order_by(ChangesetComment.comment_id.asc())
 
         # TODO: johbo: Find out why this breaks if it is done in a bulk
         # operation.

From 99fe6237ebd2be33fd005c139559384db8a305c7 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 27 Apr 2017 18:40:54 +0200
Subject: [PATCH 069/211] pull-requests: comments don't order by versions since
 we anyway order by unique number.

---
 rhodecode/controllers/pullrequests.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py
index 05d7928a..421058e6 100644
--- a/rhodecode/controllers/pullrequests.py
+++ b/rhodecode/controllers/pullrequests.py
@@ -748,7 +748,7 @@ class PullrequestsController(BaseRepoController):
         # GENERAL COMMENTS with versions #
         q = comments_model._all_general_comments_of_pull_request(pull_request_latest)
         q = q.order_by(ChangesetComment.comment_id.asc())
-        general_comments = q.order_by(ChangesetComment.pull_request_version_id.asc())
+        general_comments = q
 
         # pick comments we want to render at current version
         c.comment_versions = comments_model.aggregate_comments(
@@ -758,7 +758,8 @@ class PullrequestsController(BaseRepoController):
         # INLINE COMMENTS with versions  #
         q = comments_model._all_inline_comments_of_pull_request(pull_request_latest)
         q = q.order_by(ChangesetComment.comment_id.asc())
-        inline_comments = q.order_by(ChangesetComment.pull_request_version_id.asc())
+        inline_comments = q
+
         c.inline_versions = comments_model.aggregate_comments(
             inline_comments, versions, c.at_version_num, inline=True)
 

From b21017e30d4d5b550f3de2933a55f625e79b1f21 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 27 Apr 2017 20:28:54 +0200
Subject: [PATCH 070/211] docs: updated docs about configuration of vcsserver.

---
 docs/admin/vcs-server.rst | 100 ++++++++++++++++++++++++--------------
 1 file changed, 63 insertions(+), 37 deletions(-)

diff --git a/docs/admin/vcs-server.rst b/docs/admin/vcs-server.rst
index 6ca66530..8f07438e 100644
--- a/docs/admin/vcs-server.rst
+++ b/docs/admin/vcs-server.rst
@@ -7,7 +7,7 @@ The VCS Server handles |RCM| backend functionality. You need to configure
 a VCS Server to run with a |RCM| instance. If you do not, you will be missing
 the connection between |RCM| and its |repos|. This will cause error messages
 on the web interface. You can run your setup in the following configurations,
-currently the best performance is one VCS Server per |RCM| instance:
+currently the best performance is one of following:
 
 * One VCS Server per |RCM| instance.
 * One VCS Server handling multiple instances.
@@ -59,7 +59,8 @@ instance in the
     \vcs.backends <available-vcs-systems>
         Set a comma-separated list of the |repo| options available from the
         web interface. The default is ``hg, git, svn``,
-        which is all |repo| types available.
+        which is all |repo| types available. The order of backends is also the
+        order backend will try to detect requests type.
 
     \vcs.connection_timeout <seconds>
         Set the length of time in seconds that the VCS Server waits for
@@ -159,9 +160,10 @@ for full details see the :ref:`RhodeCode Control CLI <control:rcc-cli>`.
 
     - NAME: vcsserver-1
     - STATUS: RUNNING
-    - TYPE: VCSServer
-    - VERSION: 1.0.0
-    - URL: http://127.0.0.1:10001
+      logs:/home/ubuntu/.rccontrol/vcsserver-1/vcsserver.log
+    - VERSION: 4.7.2 VCSServer
+    - URL: http://127.0.0.1:10008
+    - CONFIG: /home/ubuntu/.rccontrol/vcsserver-1/vcsserver.ini
 
     $ rccontrol restart vcsserver-1
     Instance "vcsserver-1" successfully stopped.
@@ -181,7 +183,9 @@ For a more detailed explanation of the logger levers, see :ref:`debug-mode`.
 .. rst-class:: dl-horizontal
 
     \host <ip-address>
-        Set the host on which the VCS Server will run.
+        Set the host on which the VCS Server will run. VCSServer is not
+        protected by any authentication, so we *highly* recommend running it
+        under localhost ip that is `127.0.0.1`
 
     \port <int>
         Set the port number on which the VCS Server will be available.
@@ -189,13 +193,22 @@ For a more detailed explanation of the logger levers, see :ref:`debug-mode`.
     \locale <locale_utf>
         Set the locale the VCS Server expects.
 
-    \threadpool_size <int>
-        Set the size of the threadpool used to communicate
-        with the WSGI workers. This should be at least 6 times the number of
-        WSGI worker processes.
+    \workers <int>
+        Set the number of process workers.Recommended
+        value is (2 * NUMBER_OF_CPUS + 1), eg 2CPU = 5 workers
+
+    \max_requests <int>
+        The maximum number of requests a worker will process before restarting.
+        Any value greater than zero will limit the number of requests a work
+        will process before automatically restarting. This is a simple method
+        to help limit the damage of memory leaks.
+
+    \max_requests_jitter <int>
+        The maximum jitter to add to the max_requests setting.
+        The jitter causes the restart per worker to be randomized by
+        randint(0, max_requests_jitter). This is intended to stagger worker
+        restarts to avoid all workers restarting at the same time.
 
-    \timeout <seconds>
-        Set the timeout for RPC communication in seconds.
 
 .. note::
 
@@ -204,27 +217,54 @@ For a more detailed explanation of the logger levers, see :ref:`debug-mode`.
 .. code-block:: ini
 
     ################################################################################
-    # RhodeCode VCSServer - configuration                                          #
+    # RhodeCode VCSServer with HTTP Backend - configuration                        #
     #                                                                              #
     ################################################################################
 
-    [DEFAULT]
+
+    [server:main]
+    ## COMMON ##
     host = 127.0.0.1
-    port = 9900
+    port = 10002
+
+    ##########################
+    ## GUNICORN WSGI SERVER ##
+    ##########################
+    ## run with gunicorn --log-config vcsserver.ini --paste vcsserver.ini
+    use = egg:gunicorn#main
+    ## Sets the number of process workers. Recommended
+    ## value is (2 * NUMBER_OF_CPUS + 1), eg 2CPU = 5 workers
+    workers = 3
+    ## process name
+    proc_name = rhodecode_vcsserver
+    ## type of worker class, one of sync, gevent
+    ## recommended for bigger setup is using of of other than sync one
+    worker_class = sync
+    ## The maximum number of simultaneous clients. Valid only for Gevent
+    #worker_connections = 10
+    ## max number of requests that worker will handle before being gracefully
+    ## restarted, could prevent memory leaks
+    max_requests = 1000
+    max_requests_jitter = 30
+    ## amount of time a worker can spend with handling a request before it
+    ## gets killed and restarted. Set to 6hrs
+    timeout = 21600
+
+    [app:main]
+    use = egg:rhodecode-vcsserver
+
+    pyramid.default_locale_name = en
+    pyramid.includes =
+
+    ## default locale used by VCS systems
     locale = en_US.UTF-8
-    # number of worker threads, this should be set based on a formula threadpool=N*6
-    # where N is number of RhodeCode Enterprise workers, eg. running 2 instances
-    # 8 gunicorn workers each would be 2 * 8 * 6 = 96, threadpool_size = 96
-    threadpool_size = 16
-    timeout = 0
 
     # cache regions, please don't change
     beaker.cache.regions = repo_object
     beaker.cache.repo_object.type = memorylru
-    beaker.cache.repo_object.max_items = 1000
-
+    beaker.cache.repo_object.max_items = 100
     # cache auto-expires after N seconds
-    beaker.cache.repo_object.expire = 10
+    beaker.cache.repo_object.expire = 300
     beaker.cache.repo_object.enabled = true
 
 
@@ -270,20 +310,6 @@ For a more detailed explanation of the logger levers, see :ref:`debug-mode`.
     level = DEBUG
     formatter = generic
 
-    [handler_file]
-    class = FileHandler
-    args = ('vcsserver.log', 'a',)
-    level = DEBUG
-    formatter = generic
-
-    [handler_file_rotating]
-    class = logging.handlers.TimedRotatingFileHandler
-    # 'D', 5 - rotate every 5days
-    # you can set 'h', 'midnight'
-    args = ('vcsserver.log', 'D', 5, 10,)
-    level = DEBUG
-    formatter = generic
-
     ################
     ## FORMATTERS ##
     ################

From 02ed0adea32f47bba727c93272e8dd2a1f507ddb Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 28 Apr 2017 10:56:42 +0200
Subject: [PATCH 071/211] audit-logs: change v1 data text to less intrusive.

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

diff --git a/rhodecode/templates/admin/admin_log_base.mako b/rhodecode/templates/admin/admin_log_base.mako
index c62945c6..afef8ef5 100644
--- a/rhodecode/templates/admin/admin_log_base.mako
+++ b/rhodecode/templates/admin/admin_log_base.mako
@@ -40,7 +40,7 @@
                     <pre>${h.json.dumps(l.action_data, indent=4, sort_keys=True)}</pre>
                 </div>
             % else:
-                ${_('not available in v1 type')}
+                <pre title="${_('data not available for v1 entries type')}">-</pre>
             % endif
         </td>
         <td class="td-componentname">

From 3262bcc63433e07731f783b153754b033be8c3a6 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 28 Apr 2017 20:05:15 +0200
Subject: [PATCH 072/211] integrations: expose actor user_id, and username in
 webhook integration templates args.

ref #5287
---
 rhodecode/events/base.py                     | 9 ++++++---
 rhodecode/integrations/types/webhook.py      | 8 +++++++-
 rhodecode/tests/integrations/test_webhook.py | 6 +++++-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/rhodecode/events/base.py b/rhodecode/events/base.py
index f65c8728..2103b66b 100644
--- a/rhodecode/events/base.py
+++ b/rhodecode/events/base.py
@@ -24,7 +24,8 @@ from rhodecode.lib.utils2 import AttributeDict
 
 # this is a user object to be used for events caused by the system (eg. shell)
 SYSTEM_USER = AttributeDict(dict(
-    username='__SYSTEM__'
+    username='__SYSTEM__',
+    user_id='__SYSTEM_ID__'
 ))
 
 log = logging.getLogger(__name__)
@@ -61,7 +62,8 @@ class RhodecodeEvent(object):
             instance = auth_user.get_instance()
             if not instance:
                 return AttributeDict(dict(
-                    username=auth_user.username
+                    username=auth_user.username,
+                    user_id=auth_user.user_id,
                 ))
             return instance
 
@@ -93,7 +95,8 @@ class RhodecodeEvent(object):
             'utc_timestamp': self.utc_timestamp,
             'actor_ip': self.actor_ip,
             'actor': {
-                'username': self.actor.username
+                'username': self.actor.username,
+                'user_id': self.actor.user_id
             },
             'server_url': self.server_url
         }
diff --git a/rhodecode/integrations/types/webhook.py b/rhodecode/integrations/types/webhook.py
index 77270b11..5d8a5193 100644
--- a/rhodecode/integrations/types/webhook.py
+++ b/rhodecode/integrations/types/webhook.py
@@ -35,7 +35,7 @@ from rhodecode.integrations.types.base import IntegrationTypeBase
 
 log = logging.getLogger(__name__)
 
-# updating this required to update the `base_vars` passed in url calling func
+# updating this required to update the `common_vars` passed in url calling func
 WEBHOOK_URL_VARS = [
     'repo_name',
     'repo_type',
@@ -50,6 +50,10 @@ WEBHOOK_URL_VARS = [
     'pull_request_id',
     'pull_request_url',
 
+    # user who triggers the call
+    'username',
+    'user_id',
+
 ]
 URL_VARS = ', '.join('${' + x + '}' for x in WEBHOOK_URL_VARS)
 
@@ -70,6 +74,8 @@ class WebhookHandler(object):
             'repo_type': data['repo']['repo_type'],
             'repo_id': data['repo']['repo_id'],
             'repo_url': data['repo']['url'],
+            'username': data['actor']['username'],
+            'user_id': data['actor']['user_id']
         }
 
         return string.Template(
diff --git a/rhodecode/tests/integrations/test_webhook.py b/rhodecode/tests/integrations/test_webhook.py
index 348d09f4..44bddf2c 100644
--- a/rhodecode/tests/integrations/test_webhook.py
+++ b/rhodecode/tests/integrations/test_webhook.py
@@ -32,7 +32,11 @@ def base_data():
             'repo_name': 'foo',
             'repo_type': 'hg',
             'repo_id': '12',
-            'url': 'http://repo.url/foo'
+            'url': 'http://repo.url/foo',
+        },
+        'actor': {
+            'username': 'actor_name',
+            'user_id': 1
         }
     }
 

From 46dcc2730acbfcc7a18c8aaadaf7b9981dd73566 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 28 Apr 2017 21:21:05 +0200
Subject: [PATCH 073/211] hooks: expose user agent in the variables submitted
 to pull/push hooks.

---
 rhodecode/lib/base.py                  | 5 +++++
 rhodecode/tests/events/test_repo.py    | 1 +
 rhodecode/tests/lib/test_base.py       | 8 +++++---
 rhodecode/tests/lib/test_hooks_base.py | 2 ++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/rhodecode/lib/base.py b/rhodecode/lib/base.py
index 1897f62a..2eb86c77 100644
--- a/rhodecode/lib/base.py
+++ b/rhodecode/lib/base.py
@@ -162,6 +162,10 @@ def get_access_path(environ):
     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):
@@ -200,6 +204,7 @@ def vcs_operation_context(
         '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,
     }
diff --git a/rhodecode/tests/events/test_repo.py b/rhodecode/tests/events/test_repo.py
index 00f6a932..337528c5 100644
--- a/rhodecode/tests/events/test_repo.py
+++ b/rhodecode/tests/events/test_repo.py
@@ -43,6 +43,7 @@ def scm_extras(user_regular, repo_stub):
         'config': '',
         'server_url': 'http://example.com',
         'make_lock': None,
+        'user-agent': 'some-client',
         'locked_by': [None],
         'commit_ids': ['a' * 40] * 3,
         'is_shadow_repo': False,
diff --git a/rhodecode/tests/lib/test_base.py b/rhodecode/tests/lib/test_base.py
index a6382f53..cd3288de 100644
--- a/rhodecode/tests/lib/test_base.py
+++ b/rhodecode/tests/lib/test_base.py
@@ -34,8 +34,9 @@ from rhodecode.model import db
     ('scm', 'stub_scm'),
     ('hooks', ['stub_hook']),
     ('config', 'stub_ini_filename'),
-    ('ip', 'fake_ip'),
+    ('ip', '1.2.3.4'),
     ('server_url', 'https://example.com'),
+    ('user_agent', 'client-text-v1.1'),
     # TODO: johbo: Commpare locking parameters with `_get_rc_scm_extras`
     # in hooks_utils.
     ('make_lock', None),
@@ -71,7 +72,6 @@ def test_vcs_operation_context_can_skip_locking_check(mock_get_locking_state):
 
 @patch.object(
     base, 'get_enabled_hook_classes', Mock(return_value=['stub_hook']))
-@patch.object(base, 'get_ip_addr', Mock(return_value="fake_ip"))
 @patch('rhodecode.lib.utils2.get_server_url',
        Mock(return_value='https://example.com'))
 def call_vcs_operation_context(**kwargs_override):
@@ -87,7 +87,9 @@ def call_vcs_operation_context(**kwargs_override):
         'rhodecode.CONFIG', {'__file__': 'stub_ini_filename'})
     settings_patch = patch.object(base, 'VcsSettingsModel')
     with config_file_patch, settings_patch as settings_mock:
-        result = base.vcs_operation_context(environ={}, **kwargs)
+        result = base.vcs_operation_context(
+            environ={'HTTP_USER_AGENT': 'client-text-v1.1',
+                     'REMOTE_ADDR': '1.2.3.4'}, **kwargs)
     settings_mock.assert_called_once_with(repo='stub_repo_name')
     return result
 
diff --git a/rhodecode/tests/lib/test_hooks_base.py b/rhodecode/tests/lib/test_hooks_base.py
index 26dd09d9..6e54c6e8 100644
--- a/rhodecode/tests/lib/test_hooks_base.py
+++ b/rhodecode/tests/lib/test_hooks_base.py
@@ -39,6 +39,7 @@ def test_post_push_truncates_commits(user_regular, repo_stub):
         'config': '',
         'server_url': 'http://example.com',
         'make_lock': None,
+        'user_agent': 'some-client',
         'locked_by': [None],
         'commit_ids': ['abcde12345' * 4] * 30000,
         'is_shadow_repo': False,
@@ -72,6 +73,7 @@ def hook_extras(user_regular, repo_stub):
         'config': '',
         'server_url': 'http://example.com',
         'make_lock': None,
+        'user_agent': 'some-client',
         'locked_by': [None],
         'commit_ids': [],
         'is_shadow_repo': False,

From 175cd5d4db2f52ad230e0cc479ff112ff37dc8b5 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 28 Apr 2017 21:03:00 +0200
Subject: [PATCH 074/211] audit-logs: log user agent for push/pull.

---
 rhodecode/lib/middleware/simplevcs.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/rhodecode/lib/middleware/simplevcs.py b/rhodecode/lib/middleware/simplevcs.py
index 39ceb792..55981331 100644
--- a/rhodecode/lib/middleware/simplevcs.py
+++ b/rhodecode/lib/middleware/simplevcs.py
@@ -36,7 +36,8 @@ from webob.exc import (
 import rhodecode
 from rhodecode.authentication.base import authenticate, VCS_TYPE
 from rhodecode.lib.auth import AuthUser, HasPermissionAnyMiddleware
-from rhodecode.lib.base import BasicAuth, get_ip_addr, vcs_operation_context
+from rhodecode.lib.base import (
+    BasicAuth, get_ip_addr, get_user_agent, vcs_operation_context)
 from rhodecode.lib.exceptions import (
     HTTPLockedRC, HTTPRequirementError, UserCreationError,
     NotAllowedToCreateUserError)
@@ -310,6 +311,7 @@ class SimpleVCS(object):
         log.debug('Extracted repo name is %s', self.url_repo_name)
 
         ip_addr = get_ip_addr(environ)
+        user_agent = get_user_agent(environ)
         username = None
 
         # skip passing error to error controller
@@ -429,9 +431,9 @@ class SimpleVCS(object):
         fix_PATH()
 
         log.info(
-            '%s action on %s repo "%s" by "%s" from %s',
+            '%s action on %s repo "%s" by "%s" from %s %s',
             action, self.SCM, safe_str(self.url_repo_name),
-            safe_str(username), ip_addr)
+            safe_str(username), ip_addr, user_agent)
 
         return self._generate_vcs_response(
             environ, start_response, repo_path, extras, action)

From b7382fcefb635e9bbd1fec35b51534d24d72826a Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 25 Apr 2017 09:51:13 +0200
Subject: [PATCH 075/211] dependencies: bumped deform to 2.0.4

---
 pkgs/python-packages.nix | 8 ++++----
 requirements.txt         | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix
index 4d70f03a..28d541fd 100644
--- a/pkgs/python-packages.nix
+++ b/pkgs/python-packages.nix
@@ -601,13 +601,13 @@
     };
   };
   deform = super.buildPythonPackage {
-    name = "deform-2.0a2";
+    name = "deform-2.0.4";
     buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [Chameleon colander peppercorn translationstring zope.deprecation];
+    propagatedBuildInputs = with self; [Chameleon colander iso8601 peppercorn translationstring zope.deprecation];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/8d/b3/aab57e81da974a806dc9c5fa024a6404720f890a6dcf2e80885e3cb4609a/deform-2.0a2.tar.gz";
-      md5 = "7a90d41f7fbc18002ce74f39bd90a5e4";
+      url = "https://pypi.python.org/packages/66/3b/eefcb07abcab7a97f6665aa2d0cf1af741d9d6e78a2e4657fd2b89f89880/deform-2.0.4.tar.gz";
+      md5 = "34756e42cf50dd4b4430809116c4ec0a";
     };
     meta = {
       license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
diff --git a/requirements.txt b/requirements.txt
index 4acd78ed..883c79c3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,7 +16,7 @@ colander==1.2
 configobj==5.0.6
 cssselect==1.0.1
 decorator==4.0.11
-deform==2.0a2
+deform==2.0.4
 docutils==0.12
 dogpile.cache==0.6.1
 dogpile.core==0.4.1

From 21513d9b08b2bcec113055c1994f2d82adb53f9f Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 26 Apr 2017 14:43:01 +0200
Subject: [PATCH 076/211] deform: fixed selecting of default values for select2
 widget.

---
 rhodecode/templates/forms/select2.pt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rhodecode/templates/forms/select2.pt b/rhodecode/templates/forms/select2.pt
index 359842b8..9cdc18b3 100644
--- a/rhodecode/templates/forms/select2.pt
+++ b/rhodecode/templates/forms/select2.pt
@@ -21,7 +21,7 @@
                 tal:attributes="label item.label">
         <option tal:repeat="(value, description) item.options"
                 tal:attributes="
-                selected (multiple and value in list(map(unicode, cstruct)) or value == list(map(unicode, cstruct))) and 'selected';
+                selected python:field.widget.get_select_value(cstruct, value);
                 class css_class;
                 label field.widget.long_label_generator and description;
                 value value"
@@ -29,7 +29,7 @@
       </optgroup>
       <option tal:condition="not isinstance(item, optgroup_class)"
               tal:attributes="
-              selected (multiple and item[0] in list(map(unicode, cstruct)) or item[0] == unicode(cstruct)) and 'selected';
+              selected python:field.widget.get_select_value(cstruct, item[0]);
               class css_class;
               value item[0]">${item[1]}</option>
     </tal:loop>
@@ -37,7 +37,7 @@
 
   <script type="text/javascript">
    deform.addCallback(
-     '${field.oid}',
+     '${oid}',
      function(oid) {
        $('#' + oid).select2({
          containerCssClass: 'form-control drop-menu',

From 252dc7e9bff765cdc3b3f9c105f94707fbb12c22 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 27 Apr 2017 15:29:07 +0200
Subject: [PATCH 077/211] repo-view: handle empty repo or missing requirements
 in base view for repositories.

---
 rhodecode/apps/_base/__init__.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/rhodecode/apps/_base/__init__.py b/rhodecode/apps/_base/__init__.py
index a2a082e7..cf324959 100644
--- a/rhodecode/apps/_base/__init__.py
+++ b/rhodecode/apps/_base/__init__.py
@@ -25,6 +25,7 @@ from pyramid.httpexceptions import HTTPFound
 
 from rhodecode.lib import helpers as h
 from rhodecode.lib.utils2 import StrictAttributeDict, safe_int
+from rhodecode.lib.vcs.exceptions import RepositoryRequirementError
 from rhodecode.model import repo
 from rhodecode.model.db import User
 from rhodecode.model.scm import ScmModel
@@ -121,12 +122,25 @@ class RepoAppView(BaseAppView):
         self.db_repo_name = self.db_repo.repo_name
         self.db_repo_pull_requests = ScmModel().get_pull_requests(self.db_repo)
 
+    def _handle_missing_requirements(self, error):
+        log.error(
+            'Requirements are missing for repository %s: %s',
+            self.db_repo_name, error.message)
+
     def _get_local_tmpl_context(self):
         c = super(RepoAppView, self)._get_local_tmpl_context()
         # register common vars for this type of view
         c.rhodecode_db_repo = self.db_repo
         c.repo_name = self.db_repo_name
         c.repository_pull_requests = self.db_repo_pull_requests
+
+        c.repository_requirements_missing = False
+        try:
+            self.rhodecode_vcs_repo = self.db_repo.scm_instance()
+        except RepositoryRequirementError as e:
+            c.repository_requirements_missing = True
+            self._handle_missing_requirements(e)
+
         return c
 
 

From 8bf9c820c0f2e178bd92f660725173f489bc8644 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 26 Apr 2017 16:39:50 +0200
Subject: [PATCH 078/211] forms: added RcForm with custom error reporting
 widget.

---
 rhodecode/forms/__init__.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/rhodecode/forms/__init__.py b/rhodecode/forms/__init__.py
index 28e13277..4ed9ea81 100644
--- a/rhodecode/forms/__init__.py
+++ b/rhodecode/forms/__init__.py
@@ -24,6 +24,9 @@ deform - later can be replaced with something custom.
 """
 
 from rhodecode.translation import _
+from rhodecode.translation import TranslationString
+
+from mako.template import Template
 from deform import Button, Form, widget, ValidationFailure
 
 
@@ -31,3 +34,16 @@ class buttons:
     save = Button(name='Save', type='submit')
     reset = Button(name=_('Reset'), type='reset')
     delete = Button(name=_('Delete'), type='submit')
+
+
+class RcForm(Form):
+    def render_error(self, request, field):
+        html = ''
+        if field.error:
+            for err in field.error.messages():
+                if isinstance(err, TranslationString):
+                    err = request.translate(err)
+                html = Template(
+                    '<span class="error-message">${err}</span>').render(err=err)
+
+        return html

From b26439b5499fd4638f8be19512ad17bff383dd99 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 28 Apr 2017 12:39:24 +0200
Subject: [PATCH 079/211] repo-settings: converted repo settings to pyramid

- switched to pyramid views
- switched to deform
- validation shares the similar schema as API
- added new audit-log
---
 rhodecode/apps/repository/__init__.py         |   6 +-
 .../apps/repository/views/repo_settings.py    | 178 ++++++++++++++++++
 rhodecode/config/routing.py                   |   9 -
 rhodecode/controllers/admin/repos.py          |  83 --------
 rhodecode/model/db.py                         |   2 +-
 rhodecode/model/repo.py                       |   6 -
 rhodecode/public/js/rhodecode/routes.js       |   2 +-
 .../templates/admin/integrations/form.mako    |   2 +-
 .../templates/admin/integrations/list.mako    |   2 +-
 .../templates/admin/integrations/new.mako     |   2 +-
 .../templates/admin/repos/repo_edit.mako      |   2 +-
 .../admin/repos/repo_edit_settings.mako       | 139 +++++++-------
 rhodecode/templates/base/base.mako            |   2 +-
 .../templates/data_table/_dt_elements.mako    |   4 +-
 rhodecode/templates/summary/components.mako   |   4 +-
 15 files changed, 268 insertions(+), 175 deletions(-)
 create mode 100644 rhodecode/apps/repository/views/repo_settings.py

diff --git a/rhodecode/apps/repository/__init__.py b/rhodecode/apps/repository/__init__.py
index 95d5378d..9fa6864b 100644
--- a/rhodecode/apps/repository/__init__.py
+++ b/rhodecode/apps/repository/__init__.py
@@ -21,6 +21,11 @@
 
 def includeme(config):
 
+    # Settings
+    config.add_route(
+        name='edit_repo',
+        pattern='/{repo_name:.*?[^/]}/settings', repo_route=True)
+
     config.add_route(
         name='repo_maintenance',
         pattern='/{repo_name:.*?[^/]}/maintenance', repo_route=True)
@@ -29,7 +34,6 @@ def includeme(config):
         name='repo_maintenance_execute',
         pattern='/{repo_name:.*?[^/]}/maintenance/execute', repo_route=True)
 
-
     # Strip
     config.add_route(
         name='strip',
diff --git a/rhodecode/apps/repository/views/repo_settings.py b/rhodecode/apps/repository/views/repo_settings.py
new file mode 100644
index 00000000..0814f54a
--- /dev/null
+++ b/rhodecode/apps/repository/views/repo_settings.py
@@ -0,0 +1,178 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2011-2017 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 deform
+from pyramid.httpexceptions import HTTPFound
+from pyramid.view import view_config
+
+from rhodecode.apps._base import RepoAppView
+from rhodecode.forms import RcForm
+from rhodecode.lib import helpers as h
+from rhodecode.lib import audit_logger
+from rhodecode.lib.auth import (
+    LoginRequired, HasRepoPermissionAnyDecorator,
+    HasRepoPermissionAllDecorator, CSRFRequired)
+from rhodecode.model.db import RepositoryField, RepoGroup
+from rhodecode.model.meta import Session
+from rhodecode.model.repo import RepoModel
+from rhodecode.model.scm import RepoGroupList, ScmModel
+from rhodecode.model.validation_schema.schemas import repo_schema
+
+log = logging.getLogger(__name__)
+
+
+class RepoSettingsView(RepoAppView):
+
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+
+        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
+        c.repo_info = self.db_repo
+
+        acl_groups = RepoGroupList(
+            RepoGroup.query().all(),
+            perm_set=['group.write', 'group.admin'])
+        c.repo_groups = RepoGroup.groups_choices(groups=acl_groups)
+        c.repo_groups_choices = map(lambda k: k[0], c.repo_groups)
+
+        # in case someone no longer have a group.write access to a repository
+        # pre fill the list with this entry, we don't care if this is the same
+        # but it will allow saving repo data properly.
+        repo_group = self.db_repo.group
+        if repo_group and repo_group.group_id not in c.repo_groups_choices:
+            c.repo_groups_choices.append(repo_group.group_id)
+            c.repo_groups.append(RepoGroup._generate_choice(repo_group))
+
+        if c.repository_requirements_missing or self.rhodecode_vcs_repo is None:
+            # we might be in missing requirement state, so we load things
+            # without touching scm_instance()
+            c.landing_revs_choices, c.landing_revs = \
+                ScmModel().get_repo_landing_revs()
+        else:
+            c.landing_revs_choices, c.landing_revs = \
+                ScmModel().get_repo_landing_revs(self.db_repo)
+
+        c.personal_repo_group = c.auth_user.personal_repo_group
+        c.repo_fields = RepositoryField.query()\
+            .filter(RepositoryField.repository == self.db_repo).all()
+
+        self._register_global_c(c)
+        return c
+
+    def _get_schema(self, c, old_values=None):
+        return repo_schema.RepoSettingsSchema().bind(
+            repo_type_options=[self.db_repo.repo_type],
+            repo_ref_options=c.landing_revs_choices,
+            repo_ref_items=c.landing_revs,
+            repo_repo_group_options=c.repo_groups_choices,
+            repo_repo_group_items=c.repo_groups,
+            # user caller
+            user=self._rhodecode_user,
+            old_values=old_values
+        )
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.admin')
+    @view_config(
+        route_name='edit_repo', request_method='GET',
+        renderer='rhodecode:templates/admin/repos/repo_edit.mako')
+    def edit_settings(self):
+        c = self.load_default_context()
+        c.active = 'settings'
+
+        defaults = RepoModel()._get_defaults(self.db_repo_name)
+        defaults['repo_owner'] = defaults['user']
+        defaults['repo_landing_commit_ref'] = defaults['repo_landing_rev']
+
+        schema = self._get_schema(c)
+        c.form = RcForm(schema, appstruct=defaults)
+        return self._get_template_context(c)
+
+    @LoginRequired()
+    @HasRepoPermissionAllDecorator('repository.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='edit_repo', request_method='POST',
+        renderer='rhodecode:templates/admin/repos/repo_edit.mako')
+    def edit_settings_update(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+        c.active = 'settings'
+        old_repo_name = self.db_repo_name
+
+        old_values = self.db_repo.get_api_data()
+        schema = self._get_schema(c, old_values=old_values)
+
+        c.form = RcForm(schema)
+        pstruct = self.request.POST.items()
+        pstruct.append(('repo_type', self.db_repo.repo_type))
+        try:
+            schema_data = c.form.validate(pstruct)
+        except deform.ValidationFailure as err_form:
+            return self._get_template_context(c)
+
+        # data is now VALID, proceed with updates
+        # save validated data back into the updates dict
+        validated_updates = dict(
+            repo_name=schema_data['repo_group']['repo_name_without_group'],
+            repo_group=schema_data['repo_group']['repo_group_id'],
+
+            user=schema_data['repo_owner'],
+            repo_description=schema_data['repo_description'],
+            repo_private=schema_data['repo_private'],
+            clone_uri=schema_data['repo_clone_uri'],
+            repo_landing_rev=schema_data['repo_landing_commit_ref'],
+            repo_enable_statistics=schema_data['repo_enable_statistics'],
+            repo_enable_locking=schema_data['repo_enable_locking'],
+            repo_enable_downloads=schema_data['repo_enable_downloads'],
+        )
+        # detect if CLONE URI changed, if we get OLD means we keep old values
+        if schema_data['repo_clone_uri_change'] == 'OLD':
+            validated_updates['clone_uri'] = self.db_repo.clone_uri
+
+        # use the new full name for redirect
+        new_repo_name = schema_data['repo_group']['repo_name_with_group']
+
+        # save extra fields into our validated data
+        for key, value in pstruct:
+            if key.startswith(RepositoryField.PREFIX):
+                validated_updates[key] = value
+
+        try:
+            RepoModel().update(self.db_repo, **validated_updates)
+            ScmModel().mark_for_invalidation(new_repo_name)
+
+            audit_logger.store(
+                'repo.edit', action_data={'old_data': old_values},
+                user=self._rhodecode_user, repo=self.db_repo)
+
+            Session().commit()
+
+            h.flash(_('Repository {} updated successfully').format(
+                old_repo_name), category='success')
+        except Exception:
+            log.exception("Exception during update of repository")
+            h.flash(_('Error occurred during update of repository {}').format(
+                old_repo_name), category='error')
+
+        raise HTTPFound(
+            self.request.route_path('edit_repo', repo_name=new_repo_name))
diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py
index 0d698fce..0a1ad457 100644
--- a/rhodecode/config/routing.py
+++ b/rhodecode/config/routing.py
@@ -200,10 +200,6 @@ def make_map(config):
                   action='index', conditions={'method': ['GET']})
         m.connect('new_repo', '/create_repository', jsroute=True,
                   action='create_repository', conditions={'method': ['GET']})
-        m.connect('/repos/{repo_name}',
-                  action='update', conditions={'method': ['PUT'],
-                                               'function': check_repo},
-                  requirements=URL_NAME_REQUIREMENTS)
         m.connect('delete_repo', '/repos/{repo_name}',
                   action='delete', conditions={'method': ['DELETE']},
                   requirements=URL_NAME_REQUIREMENTS)
@@ -665,11 +661,6 @@ def make_map(config):
                  requirements=URL_NAME_REQUIREMENTS)
 
     # repo edit options
-    rmap.connect('edit_repo', '/{repo_name}/settings', jsroute=True,
-                 controller='admin/repos', action='edit',
-                 conditions={'method': ['GET'], 'function': check_repo},
-                 requirements=URL_NAME_REQUIREMENTS)
-
     rmap.connect('edit_repo_perms', '/{repo_name}/settings/permissions',
                  jsroute=True,
                  controller='admin/repos', action='edit_permissions',
diff --git a/rhodecode/controllers/admin/repos.py b/rhodecode/controllers/admin/repos.py
index 45e16380..2c0661a8 100644
--- a/rhodecode/controllers/admin/repos.py
+++ b/rhodecode/controllers/admin/repos.py
@@ -288,65 +288,6 @@ class ReposController(BaseRepoController):
             return {'result': True}
         return {'result': False}
 
-    @HasRepoPermissionAllDecorator('repository.admin')
-    @auth.CSRFRequired()
-    def update(self, repo_name):
-        """
-        PUT /repos/repo_name: Update an existing item"""
-        # Forms posted to this method should contain a hidden field:
-        #    <input type="hidden" name="_method" value="PUT" />
-        # Or using helpers:
-        #    h.form(url('repo', repo_name=ID),
-        #           method='put')
-        # url('repo', repo_name=ID)
-
-        self.__load_data(repo_name)
-        c.active = 'settings'
-        c.repo_fields = RepositoryField.query()\
-            .filter(RepositoryField.repository == c.repo_info).all()
-
-        repo_model = RepoModel()
-        changed_name = repo_name
-
-        c.personal_repo_group = c.rhodecode_user.personal_repo_group
-        # override the choices with extracted revisions !
-        repo = Repository.get_by_repo_name(repo_name)
-        old_data = {
-            'repo_name': repo_name,
-            'repo_group': repo.group.get_dict() if repo.group else {},
-            'repo_type': repo.repo_type,
-        }
-        _form = RepoForm(
-            edit=True, old_data=old_data, repo_groups=c.repo_groups_choices,
-            landing_revs=c.landing_revs_choices, allow_disabled=True)()
-
-        try:
-            form_result = _form.to_python(dict(request.POST))
-            repo = repo_model.update(repo_name, **form_result)
-            ScmModel().mark_for_invalidation(repo_name)
-            h.flash(_('Repository %s updated successfully') % repo_name,
-                    category='success')
-            changed_name = repo.repo_name
-            action_logger(c.rhodecode_user, 'admin_updated_repo',
-                              changed_name, self.ip_addr, self.sa)
-            Session().commit()
-        except formencode.Invalid as errors:
-            defaults = self.__load_data(repo_name)
-            defaults.update(errors.value)
-            return htmlfill.render(
-                render('admin/repos/repo_edit.mako'),
-                defaults=defaults,
-                errors=errors.error_dict or {},
-                prefix_error=False,
-                encoding="UTF-8",
-                force_defaults=False)
-
-        except Exception:
-            log.exception("Exception during update of repository")
-            h.flash(_('Error occurred during update of repository %s') \
-                    % repo_name, category='error')
-        return redirect(url('edit_repo', repo_name=changed_name))
-
     @HasRepoPermissionAllDecorator('repository.admin')
     @auth.CSRFRequired()
     def delete(self, repo_name):
@@ -397,28 +338,9 @@ class ReposController(BaseRepoController):
         """GET /repos/repo_name: Show a specific item"""
         # url('repo', repo_name=ID)
 
-    @HasRepoPermissionAllDecorator('repository.admin')
-    def edit(self, repo_name):
-        """GET /repo_name/settings: Form to edit an existing item"""
-        # url('edit_repo', repo_name=ID)
-        defaults = self.__load_data(repo_name)
-        if 'clone_uri' in defaults:
-            del defaults['clone_uri']
-
-        c.repo_fields = RepositoryField.query()\
-            .filter(RepositoryField.repository == c.repo_info).all()
-        c.personal_repo_group = c.rhodecode_user.personal_repo_group
-        c.active = 'settings'
-        return htmlfill.render(
-            render('admin/repos/repo_edit.mako'),
-            defaults=defaults,
-            encoding="UTF-8",
-            force_defaults=False)
-
     @HasRepoPermissionAllDecorator('repository.admin')
     def edit_permissions(self, repo_name):
         """GET /repo_name/settings: Form to edit an existing item"""
-        # url('edit_repo', repo_name=ID)
         c.repo_info = self._load_repo(repo_name)
         c.active = 'permissions'
         defaults = RepoModel()._get_defaults(repo_name)
@@ -446,7 +368,6 @@ class ReposController(BaseRepoController):
     @HasRepoPermissionAllDecorator('repository.admin')
     def edit_fields(self, repo_name):
         """GET /repo_name/settings: Form to edit an existing item"""
-        # url('edit_repo', repo_name=ID)
         c.repo_info = self._load_repo(repo_name)
         c.repo_fields = RepositoryField.query()\
             .filter(RepositoryField.repository == c.repo_info).all()
@@ -493,7 +414,6 @@ class ReposController(BaseRepoController):
     @HasRepoPermissionAllDecorator('repository.admin')
     def edit_advanced(self, repo_name):
         """GET /repo_name/settings: Form to edit an existing item"""
-        # url('edit_repo', repo_name=ID)
         c.repo_info = self._load_repo(repo_name)
         c.default_user_id = User.get_default_user().user_id
         c.in_public_journal = UserFollowing.query()\
@@ -638,7 +558,6 @@ class ReposController(BaseRepoController):
     @HasRepoPermissionAllDecorator('repository.admin')
     def edit_caches_form(self, repo_name):
         """GET /repo_name/settings: Form to edit an existing item"""
-        # url('edit_repo', repo_name=ID)
         c.repo_info = self._load_repo(repo_name)
         c.active = 'caches'
 
@@ -660,7 +579,6 @@ class ReposController(BaseRepoController):
     @HasRepoPermissionAllDecorator('repository.admin')
     def edit_remote_form(self, repo_name):
         """GET /repo_name/settings: Form to edit an existing item"""
-        # url('edit_repo', repo_name=ID)
         c.repo_info = self._load_repo(repo_name)
         c.active = 'remote'
 
@@ -682,7 +600,6 @@ class ReposController(BaseRepoController):
     @HasRepoPermissionAllDecorator('repository.admin')
     def edit_statistics_form(self, repo_name):
         """GET /repo_name/settings: Form to edit an existing item"""
-        # url('edit_repo', repo_name=ID)
         c.repo_info = self._load_repo(repo_name)
         repo = c.repo_info.scm_instance()
 
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index 52864ec2..720e8b10 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -2184,7 +2184,7 @@ class RepoGroup(Base, BaseModel):
 
         repo_groups = []
         if show_empty_group:
-            repo_groups = [('-1', u'-- %s --' % _('No parent'))]
+            repo_groups = [(-1, u'-- %s --' % _('No parent'))]
 
         repo_groups.extend([cls._generate_choice(x) for x in groups])
 
diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py
index 0e5a27fe..b9292499 100644
--- a/rhodecode/model/repo.py
+++ b/rhodecode/model/repo.py
@@ -333,12 +333,6 @@ class RepoModel(BaseModel):
                     val = kwargs[k]
                     if strip:
                         k = remove_prefix(k, 'repo_')
-                    if k == 'clone_uri':
-                        from rhodecode.model.validators import Missing
-                        _change = kwargs.get('clone_uri_change')
-                        if _change in [Missing, 'OLD']:
-                            # we don't change the value, so use original one
-                            val = cur_repo.clone_uri
 
                     setattr(cur_repo, k, val)
 
diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js
index aa0637e0..5534afe5 100644
--- a/rhodecode/public/js/rhodecode/routes.js
+++ b/rhodecode/public/js/rhodecode/routes.js
@@ -24,7 +24,6 @@ function registerRCRoutes() {
     pyroutes.register('repo_refs_changelog_data', '/%(repo_name)s/refs-data-changelog', ['repo_name']);
     pyroutes.register('repo_default_reviewers_data', '/%(repo_name)s/default-reviewers', ['repo_name']);
     pyroutes.register('changeset_home', '/%(repo_name)s/changeset/%(revision)s', ['repo_name', 'revision']);
-    pyroutes.register('edit_repo', '/%(repo_name)s/settings', ['repo_name']);
     pyroutes.register('edit_repo_perms', '/%(repo_name)s/settings/permissions', ['repo_name']);
     pyroutes.register('changeset_comment', '/%(repo_name)s/changeset/%(revision)s/comment', ['repo_name', 'revision']);
     pyroutes.register('changeset_comment_preview', '/%(repo_name)s/changeset/comment/preview', ['repo_name']);
@@ -98,6 +97,7 @@ function registerRCRoutes() {
     pyroutes.register('user_group_autocomplete_data', '/_user_groups', []);
     pyroutes.register('repo_list_data', '/_repos', []);
     pyroutes.register('goto_switcher_data', '/_goto_data', []);
+    pyroutes.register('edit_repo', '/%(repo_name)s/settings', ['repo_name']);
     pyroutes.register('repo_maintenance', '/%(repo_name)s/maintenance', ['repo_name']);
     pyroutes.register('repo_maintenance_execute', '/%(repo_name)s/maintenance/execute', ['repo_name']);
     pyroutes.register('strip', '/%(repo_name)s/strip', ['repo_name']);
diff --git a/rhodecode/templates/admin/integrations/form.mako b/rhodecode/templates/admin/integrations/form.mako
index 15a6f740..a64b4a5f 100644
--- a/rhodecode/templates/admin/integrations/form.mako
+++ b/rhodecode/templates/admin/integrations/form.mako
@@ -3,7 +3,7 @@
 
 <%def name="breadcrumbs_links()">
   %if c.repo:
-    ${h.link_to('Settings',h.url('edit_repo', repo_name=c.repo.repo_name))}
+    ${h.link_to('Settings',h.route_path('edit_repo', repo_name=c.repo.repo_name))}
     &raquo;
     ${h.link_to(_('Integrations'),request.route_url(route_name='repo_integrations_home', repo_name=c.repo.repo_name))}
     &raquo;
diff --git a/rhodecode/templates/admin/integrations/list.mako b/rhodecode/templates/admin/integrations/list.mako
index ae7c61cc..80beef2b 100644
--- a/rhodecode/templates/admin/integrations/list.mako
+++ b/rhodecode/templates/admin/integrations/list.mako
@@ -3,7 +3,7 @@
 
 <%def name="breadcrumbs_links()">
   %if c.repo:
-    ${h.link_to('Settings',h.url('edit_repo', repo_name=c.repo.repo_name))}
+    ${h.link_to('Settings',h.route_path('edit_repo', repo_name=c.repo.repo_name))}
   %elif c.repo_group:
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
diff --git a/rhodecode/templates/admin/integrations/new.mako b/rhodecode/templates/admin/integrations/new.mako
index 3ba23b21..fa53a42f 100644
--- a/rhodecode/templates/admin/integrations/new.mako
+++ b/rhodecode/templates/admin/integrations/new.mako
@@ -4,7 +4,7 @@
 
 <%def name="breadcrumbs_links()">
   %if c.repo:
-    ${h.link_to('Settings',h.url('edit_repo', repo_name=c.repo.repo_name))}
+    ${h.link_to('Settings',h.route_path('edit_repo', repo_name=c.repo.repo_name))}
     &raquo;
     ${h.link_to(_('Integrations'),request.route_url(route_name='repo_integrations_home', repo_name=c.repo.repo_name))}
   %elif c.repo_group:
diff --git a/rhodecode/templates/admin/repos/repo_edit.mako b/rhodecode/templates/admin/repos/repo_edit.mako
index 8b698ae1..d1bad42b 100644
--- a/rhodecode/templates/admin/repos/repo_edit.mako
+++ b/rhodecode/templates/admin/repos/repo_edit.mako
@@ -40,7 +40,7 @@
     <div class="sidebar">
         <ul class="nav nav-pills nav-stacked">
           <li class="${'active' if c.active=='settings' else ''}">
-              <a href="${h.url('edit_repo', repo_name=c.repo_name)}">${_('Settings')}</a>
+              <a href="${h.route_path('edit_repo', repo_name=c.repo_name)}">${_('Settings')}</a>
           </li>
           <li class="${'active' if c.active=='permissions' else ''}">
               <a href="${h.url('edit_repo_perms', repo_name=c.repo_name)}">${_('Permissions')}</a>
diff --git a/rhodecode/templates/admin/repos/repo_edit_settings.mako b/rhodecode/templates/admin/repos/repo_edit_settings.mako
index 79019268..c4a89f38 100644
--- a/rhodecode/templates/admin/repos/repo_edit_settings.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_settings.mako
@@ -3,92 +3,110 @@
 
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('Settings for Repository: %s') % c.repo_info.repo_name}</h3>
+        <h3 class="panel-title">${_('Settings for Repository: %s') % c.rhodecode_db_repo.repo_name}</h3>
     </div>
     <div class="panel-body">
-    ${h.secure_form(url('repo', repo_name=c.repo_info.repo_name),method='put')}
+    ${h.secure_form(h.route_path('edit_repo', repo_name=c.rhodecode_db_repo.repo_name), method='POST')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
+
             <div class="field">
                 <div class="label">
                     <label for="repo_name">${_('Name')}:</label>
                 </div>
                 <div class="input">
-                    ${h.text('repo_name',class_="medium")}
-                    <p class="help-block">${_('Non-changeable id')}: `_${c.repo_info.repo_id}` <span><a id="show_more_clone_id" href="#">${_('what is that ?')}</a></span></p>
+                    ${c.form['repo_name'].render(css_class='medium', oid='repo_name')|n}
+                    ${c.form.render_error(request, c.form['repo_name'])|n}
+
+                    <p class="help-block">${_('Non-changeable id')}: `_${c.rhodecode_db_repo.repo_id}` <span><a href="#" onclick="$('#clone_id').toggle();return false">${_('what is that ?')}</a></span></p>
                     <p id="clone_id" style="display:none;">
-                        ${_('URL by id')}: `${c.repo_info.clone_url(with_id=True)}` </br>
+                        ${_('URL by id')}: `${c.rhodecode_db_repo.clone_url(with_id=True)}` <br/>
                         ${_('''In case this repository is renamed or moved into another group the repository url changes.
                                Using above url guarantees that this repository will always be accessible under such url.
                                Useful for CI systems, or any other cases that you need to hardcode the url into 3rd party service.''')}</p>
                 </div>
            </div>
-           % if c.repo_info.repo_type != 'svn':
+
+           <div class="field">
+                <div class="label">
+                    <label for="repo_group">${_('Repository group')}:</label>
+                </div>
+                <div class="select">
+                    ${c.form['repo_group'].render(css_class='medium', oid='repo_group')|n}
+                    ${c.form.render_error(request, c.form['repo_group'])|n}
+
+                    % if c.personal_repo_group:
+                         <a class="btn" href="#" data-personal-group-name="${c.personal_repo_group.group_name}" data-personal-group-id="${c.personal_repo_group.group_id}" onclick="selectMyGroup(this); return false">
+                             ${_('Select my personal group (`%(repo_group_name)s`)') % {'repo_group_name': c.personal_repo_group.group_name}}
+                         </a>
+                    % endif
+                    <p class="help-block">${_('Optional select a group to put this repository into.')}</p>
+                </div>
+           </div>
+
+           % if c.rhodecode_db_repo.repo_type != 'svn':
            <div class="field">
                <div class="label">
                    <label for="clone_uri">${_('Remote uri')}:</label>
                </div>
                <div class="input">
-                   %if c.repo_info.clone_uri:
+                   %if c.rhodecode_db_repo.clone_uri:
+                    ## display
                     <div id="clone_uri_hidden" class='text-as-placeholder'>
-                        <span id="clone_uri_hidden_value">${c.repo_info.clone_uri_hidden}</span>
+                        <span id="clone_uri_hidden_value">${c.rhodecode_db_repo.clone_uri_hidden}</span>
                         <span class="link" id="edit_clone_uri"><i class="icon-edit"></i>${_('edit')}</span>
                     </div>
+                    ## alter field
                     <div id="alter_clone_uri" style="display: none">
-                        ${h.text('clone_uri',class_="medium",  placeholder=_('new value, leave empty to remove'))}
-                        ${h.hidden('clone_uri_change', 'OLD')}
+                        ${c.form['repo_clone_uri'].render(css_class='medium', oid='clone_uri', placeholder=_('enter new value, or leave empty to remove'))|n}
+                        ${c.form.render_error(request, c.form['repo_clone_uri'])|n}
+                        ${h.hidden('repo_clone_uri_change', 'OLD')}
+
                         <span class="link" id="cancel_edit_clone_uri">${_('cancel')}</span>
                     </div>
                    %else:
                     ## not set yet, display form to set it
-                    ${h.text('clone_uri',class_="medium")}
-                    ${h.hidden('clone_uri_change', 'NEW')}
+                    ${c.form['repo_clone_uri'].render(css_class='medium', oid='clone_uri')|n}
+                    ${c.form.render_error(request, c.form['repo_clone_uri'])|n}
+                    ${h.hidden('repo_clone_uri_change', 'NEW')}
                    %endif
-                 <p id="alter_clone_uri_help_block" class="help-block">${_('http[s] url where from repository was imported, also used for doing remote pulls.')}</p>
+                 <p id="alter_clone_uri_help_block" class="help-block">
+                     <% pull_link = h.literal(h.link_to('remote sync', h.url('edit_repo_remote', repo_name=c.repo_name))) %>
+                     ${_('http[s] url where from repository was imported, this field can used for doing {pull_link}.').format(pull_link=pull_link)|n} <br/>
+                     ${_('This field is stored encrypted inside Database, a format of http://user:password@server.com/repo_name can be used and will be hidden from display.')}
+                 </p>
                </div>
             </div>
-            % else:
-              ${h.hidden('clone_uri', '')}
-            % endif
+           % else:
+           ${h.hidden('repo_clone_uri', '')}
+           % endif
+
             <div class="field">
                 <div class="label">
-                    <label for="repo_group">${_('Repository group')}:</label>
+                    <label for="repo_landing_commit_ref">${_('Landing commit')}:</label>
                 </div>
                 <div class="select">
-                    ${h.select('repo_group','',c.repo_groups,class_="medium")}
-                    % if c.personal_repo_group:
-                         <a class="btn" href="#" id="select_my_group" data-personal-group-id="${c.personal_repo_group.group_id}">
-                             ${_('Select my personal group (%(repo_group_name)s)') % {'repo_group_name': c.personal_repo_group.group_name}}
-                         </a>
-                    % endif
-                    <p class="help-block">${_('Optional select a group to put this repository into.')}</p>
-                </div>
-            </div>
-            <div class="field">
-                <div class="label">
-                    <label for="repo_landing_rev">${_('Landing commit')}:</label>
-                </div>
-                <div class="select">
-                    ${h.select('repo_landing_rev','',c.landing_revs,class_="medium")}
-                    <p class="help-block">${_('Default commit for files page, downloads, whoosh and readme')}</p>
+                    ${c.form['repo_landing_commit_ref'].render(css_class='medium', oid='repo_landing_commit_ref')|n}
+                    ${c.form.render_error(request, c.form['repo_landing_commit_ref'])|n}
+                    <p class="help-block">${_('Default commit for files page, downloads, full text search index and readme')}</p>
                 </div>
             </div>
 
             <div class="field badged-field">
                 <div class="label">
-                    <label for="user">${_('Owner')}:</label>
+                    <label for="repo_owner">${_('Owner')}:</label>
                 </div>
                 <div class="input">
                     <div class="badge-input-container">
                         <div class="user-badge">
-                            ${base.gravatar_with_user(c.repo_info.user.email, show_disabled=not c.repo_info.user.active)}
+                            ${base.gravatar_with_user(c.rhodecode_db_repo.user.email, show_disabled=not c.rhodecode_db_repo.user.active)}
                         </div>
                         <div class="badge-input-wrap">
-                            ${h.text('user', class_="medium", autocomplete="off")}
+                            ${c.form['repo_owner'].render(css_class='medium', oid='repo_owner')|n}
                         </div>
                     </div>
-                    <form:error name="user"/>
+                    ${c.form.render_error(request, c.form['repo_owner'])|n}
                     <p class="help-block">${_('Change owner of this repository.')}</p>
                 </div>
             </div>
@@ -98,44 +116,49 @@
                     <label for="repo_description">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
-                    ${h.textarea('repo_description', )}
+                    ${c.form['repo_description'].render(css_class='medium', oid='repo_description')|n}
+                    ${c.form.render_error(request, c.form['repo_description'])|n}
                     <p class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</p>
                 </div>
             </div>
 
             <div class="field">
                 <div class="label label-checkbox">
-                    <label for="repo_private">${_('Private repository')}:</label>
+                    <label for="${c.form['repo_private'].oid}">${_('Private repository')}:</label>
                 </div>
                 <div class="checkboxes">
-                    ${h.checkbox('repo_private',value="True")}
+                    ${c.form['repo_private'].render(css_class='medium')|n}
+                    ${c.form.render_error(request, c.form['repo_private'])|n}
                     <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
-                    <label for="repo_enable_statistics">${_('Enable statistics')}:</label>
+                    <label for="${c.form['repo_enable_statistics'].oid}">${_('Enable statistics')}:</label>
                 </div>
                 <div class="checkboxes">
-                    ${h.checkbox('repo_enable_statistics',value="True")}
+                    ${c.form['repo_enable_statistics'].render(css_class='medium')|n}
+                    ${c.form.render_error(request, c.form['repo_enable_statistics'])|n}
                     <span class="help-block">${_('Enable statistics window on summary page.')}</span>
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
-                    <label for="repo_enable_downloads">${_('Enable downloads')}:</label>
+                    <label for="${c.form['repo_enable_downloads'].oid}">${_('Enable downloads')}:</label>
                 </div>
                 <div class="checkboxes">
-                    ${h.checkbox('repo_enable_downloads',value="True")}
+                    ${c.form['repo_enable_downloads'].render(css_class='medium')|n}
+                    ${c.form.render_error(request, c.form['repo_enable_downloads'])|n}
                     <span class="help-block">${_('Enable download menu on summary page.')}</span>
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
-                    <label for="repo_enable_locking">${_('Enable automatic locking')}:</label>
+                    <label for="${c.form['repo_enable_locking'].oid}">${_('Enable automatic locking')}:</label>
                 </div>
                 <div class="checkboxes">
-                    ${h.checkbox('repo_enable_locking',value="True")}
+                    ${c.form['repo_enable_locking'].render(css_class='medium')|n}
+                    ${c.form.render_error(request, c.form['repo_enable_locking'])|n}
                     <span class="help-block">${_('Enable automatic locking on repository. Pulling from this repository creates a lock that can be released by pushing back by the same user')}</span>
                 </div>
             </div>
@@ -168,12 +191,6 @@
 
 <script>
     $(document).ready(function(){
-        var select2Options = {
-          'containerCssClass': "drop-menu",
-          'dropdownCssClass': "drop-menu-dropdown",
-          'dropdownAutoWidth': true
-        };
-
         var cloneUrl = function() {
           var alterButton = $('#alter_clone_uri');
           var editButton = $('#edit_clone_uri');
@@ -182,7 +199,7 @@
           var hiddenUrlValue = $('#clone_uri_hidden_value');
           var input = $('#clone_uri');
           var helpBlock = $('#alter_clone_uri_help_block');
-          var changedFlag = $('#clone_uri_change');
+          var changedFlag = $('#repo_clone_uri_change');
           var originalText = helpBlock.html();
           var obfuscatedUrl = hiddenUrlValue.html();
 
@@ -223,18 +240,10 @@
           initEvents();
         }();
 
-        $('#show_more_clone_id').on('click', function(e){
-            $('#clone_id').show();
-            e.preventDefault();
-        });
+        selectMyGroup = function(element) {
+            $("#repo_group").val($(element).data('personalGroupId')).trigger("change");
+        };
 
-        $('#repo_landing_rev').select2(select2Options);
-        $('#repo_group').select2(select2Options);
-
-        UsersAutoComplete('user', '${c.rhodecode_user.user_id}');
-        $('#select_my_group').on('click', function(e){
-            e.preventDefault();
-            $("#repo_group").val($(this).data('personalGroupId')).trigger("change");
-        });
+        UsersAutoComplete('repo_owner', '${c.rhodecode_user.user_id}');
     });
 </script>
diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako
index 45de2b6b..b1d62ce2 100644
--- a/rhodecode/templates/base/base.mako
+++ b/rhodecode/templates/base/base.mako
@@ -246,7 +246,7 @@
           <a class="menulink" href="#" class="dropdown"><div class="menulabel">${_('Options')} <div class="show_more"></div></div></a>
           <ul class="submenu">
              %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
-                   <li><a href="${h.url('edit_repo',repo_name=c.repo_name)}">${_('Settings')}</a></li>
+                   <li><a href="${h.route_path('edit_repo',repo_name=c.repo_name)}">${_('Settings')}</a></li>
              %endif
               %if c.rhodecode_db_repo.fork:
                <li><a href="${h.url('compare_url',repo_name=c.rhodecode_db_repo.fork.repo_name,source_ref_type=c.rhodecode_db_repo.landing_rev[0],source_ref=c.rhodecode_db_repo.landing_rev[1], target_repo=c.repo_name,target_ref_type='branch' if request.GET.get('branch') else c.rhodecode_db_repo.landing_rev[0],target_ref=request.GET.get('branch') or c.rhodecode_db_repo.landing_rev[1], merge=1)}">
diff --git a/rhodecode/templates/data_table/_dt_elements.mako b/rhodecode/templates/data_table/_dt_elements.mako
index 6d1c7424..26811250 100644
--- a/rhodecode/templates/data_table/_dt_elements.mako
+++ b/rhodecode/templates/data_table/_dt_elements.mako
@@ -42,7 +42,7 @@
     %>
   <div class="${'repo_state_pending' if rstate == 'repo_state_pending' else ''} truncate">
     ##NAME
-    <a href="${h.url('edit_repo' if admin else 'summary_home',repo_name=name)}">
+    <a href="${h.route_path('edit_repo',repo_name=name) if admin else h.url('summary_home',repo_name=name)}">
 
     ##TYPE OF REPO
     %if h.is_hg(rtype):
@@ -115,7 +115,7 @@
 <%def name="repo_actions(repo_name, super_user=True)">
   <div>
     <div class="grid_edit">
-      <a href="${h.url('edit_repo',repo_name=repo_name)}" title="${_('Edit')}">
+      <a href="${h.route_path('edit_repo',repo_name=repo_name)}" title="${_('Edit')}">
         <i class="icon-pencil"></i>Edit</a>
     </div>
     <div class="grid_delete">
diff --git a/rhodecode/templates/summary/components.mako b/rhodecode/templates/summary/components.mako
index 33fe0faa..c3a9a5b4 100644
--- a/rhodecode/templates/summary/components.mako
+++ b/rhodecode/templates/summary/components.mako
@@ -145,7 +145,7 @@
                       ${_('Statistics are disabled for this repository')}
                   </span>
                   % if h.HasPermissionAll('hg.admin')('enable stats on from summary'):
-                     , ${h.link_to(_('enable statistics'),h.url('edit_repo',repo_name=c.repo_name, anchor='repo_enable_statistics'))}
+                     , ${h.link_to(_('enable statistics'),h.route_path('edit_repo',repo_name=c.repo_name, anchor='repo_enable_statistics'))}
                   % endif
               % endif
             </div>
@@ -169,7 +169,7 @@
                         ${_('Downloads are disabled for this repository')}
                     </span>
                     % if h.HasPermissionAll('hg.admin')('enable downloads on from summary'):
-                       , ${h.link_to(_('enable downloads'),h.url('edit_repo',repo_name=c.repo_name, anchor='repo_enable_downloads'))}
+                       , ${h.link_to(_('enable downloads'),h.route_path('edit_repo',repo_name=c.repo_name, anchor='repo_enable_downloads'))}
                     % endif
                 % else:
                     <span class="enabled">

From 0a781e98286475d861692cbe8d3e285a30812fa1 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 26 Apr 2017 16:42:13 +0200
Subject: [PATCH 080/211] validation-schemas: added convert to opt group
 utility.

---
 rhodecode/model/validation_schema/utils.py | 49 ++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 rhodecode/model/validation_schema/utils.py

diff --git a/rhodecode/model/validation_schema/utils.py b/rhodecode/model/validation_schema/utils.py
new file mode 100644
index 00000000..ef244be6
--- /dev/null
+++ b/rhodecode/model/validation_schema/utils.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017 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 deform.widget
+
+
+def convert_to_optgroup(items):
+    """
+    Convert such format::
+
+        [
+            ['rev:tip', u'latest tip'], 
+            ([(u'branch:default', u'default')], u'Branches'), 
+        ]
+
+    into one used by deform Select widget::
+
+        (
+            ('rev:tip', 'latest tip'),
+            OptGroup('Branches',
+                    ('branch:default', 'default'),
+        )
+    """
+    result = []
+    for value, label in items:
+        # option group
+        if isinstance(value, (tuple, list)):
+            result.append(deform.widget.OptGroup(label, *value))
+        else:
+            result.append((value, label))
+
+    return result

From a23b33ee9c99f9c03d964d45da691c52ce266092 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 26 Apr 2017 16:40:47 +0200
Subject: [PATCH 081/211] repo-schema: made changes to allow deform usage.

---
 .../validation_schema/schemas/repo_schema.py  | 52 +++++++++++++++----
 1 file changed, 43 insertions(+), 9 deletions(-)

diff --git a/rhodecode/model/validation_schema/schemas/repo_schema.py b/rhodecode/model/validation_schema/schemas/repo_schema.py
index 754d2133..9a60876a 100644
--- a/rhodecode/model/validation_schema/schemas/repo_schema.py
+++ b/rhodecode/model/validation_schema/schemas/repo_schema.py
@@ -19,8 +19,10 @@
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import colander
+import deform.widget
 
 from rhodecode.translation import _
+from rhodecode.model.validation_schema.utils import convert_to_optgroup
 from rhodecode.model.validation_schema import validators, preparers, types
 
 DEFAULT_LANDING_REF = 'rev:tip'
@@ -32,6 +34,11 @@ def get_group_and_repo(repo_name):
         repo_name, get_object=True)
 
 
+def get_repo_group(repo_group_id):
+    from rhodecode.model.repo_group import RepoGroup
+    return RepoGroup.get(repo_group_id), RepoGroup.CHOICES_SEPARATOR
+
+
 @colander.deferred
 def deferred_repo_type_validator(node, kw):
     options = kw.get('repo_type_options', [])
@@ -53,10 +60,19 @@ def deferred_repo_owner_validator(node, kw):
 
 @colander.deferred
 def deferred_landing_ref_validator(node, kw):
-    options = kw.get('repo_ref_options', [DEFAULT_LANDING_REF])
+    options = kw.get(
+        'repo_ref_options', [DEFAULT_LANDING_REF])
     return colander.OneOf([x for x in options])
 
 
+@colander.deferred
+def deferred_landing_ref_widget(node, kw):
+    items = kw.get(
+        'repo_ref_items', [(DEFAULT_LANDING_REF, DEFAULT_LANDING_REF)])
+    items = convert_to_optgroup(items)
+    return deform.widget.Select2Widget(values=items)
+
+
 @colander.deferred
 def deferred_fork_of_validator(node, kw):
     old_values = kw.get('old_values') or {}
@@ -199,6 +215,19 @@ def deferred_repo_name_validator(node, kw):
         no_git_suffix_validator, validators.valid_name_validator)
 
 
+@colander.deferred
+def deferred_repo_group_validator(node, kw):
+    options = kw.get(
+        'repo_repo_group_options')
+    return colander.OneOf([x for x in options])
+
+
+@colander.deferred
+def deferred_repo_group_widget(node, kw):
+    items = kw.get('repo_repo_group_items')
+    return deform.widget.Select2Widget(values=items)
+
+
 class GroupType(colander.Mapping):
     def _validate(self, node, value):
         try:
@@ -220,8 +249,10 @@ class GroupType(colander.Mapping):
          parent_group_name,
          parent_group) = get_group_and_repo(validated_name)
 
+        appstruct['repo_name_with_group'] = validated_name
         appstruct['repo_name_without_group'] = repo_name_without_group
         appstruct['repo_group_name'] = parent_group_name or types.RootLocation
+
         if parent_group:
             appstruct['repo_group_id'] = parent_group.group_id
 
@@ -265,16 +296,19 @@ class RepoSchema(colander.MappingSchema):
 
     repo_owner = colander.SchemaNode(
         colander.String(),
-        validator=deferred_repo_owner_validator)
+        validator=deferred_repo_owner_validator,
+        widget=deform.widget.TextInputWidget())
 
     repo_description = colander.SchemaNode(
-        colander.String(), missing='')
+        colander.String(), missing='',
+        widget=deform.widget.TextAreaWidget())
 
     repo_landing_commit_ref = colander.SchemaNode(
         colander.String(),
         validator=deferred_landing_ref_validator,
         preparers=[preparers.strip_preparer],
-        missing=DEFAULT_LANDING_REF)
+        missing=DEFAULT_LANDING_REF,
+        widget=deferred_landing_ref_widget)
 
     repo_clone_uri = colander.SchemaNode(
         colander.String(),
@@ -289,19 +323,19 @@ class RepoSchema(colander.MappingSchema):
 
     repo_private = colander.SchemaNode(
         types.StringBooleanType(),
-        missing=False)
+        missing=False, widget=deform.widget.CheckboxWidget())
     repo_copy_permissions = colander.SchemaNode(
         types.StringBooleanType(),
-        missing=False)
+        missing=False, widget=deform.widget.CheckboxWidget())
     repo_enable_statistics = colander.SchemaNode(
         types.StringBooleanType(),
-        missing=False)
+        missing=False, widget=deform.widget.CheckboxWidget())
     repo_enable_downloads = colander.SchemaNode(
         types.StringBooleanType(),
-        missing=False)
+        missing=False, widget=deform.widget.CheckboxWidget())
     repo_enable_locking = colander.SchemaNode(
         types.StringBooleanType(),
-        missing=False)
+        missing=False, widget=deform.widget.CheckboxWidget())
 
     def deserialize(self, cstruct):
         """

From dfec9d48a27713f61abf165621d71ee0b55d27aa Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 28 Apr 2017 12:03:35 +0200
Subject: [PATCH 082/211] repo-schema: added a custom schema for repo settings.

- deform ready
- using new uri validators
- added proper widgets to handle deform
---
 .../apps/repository/views/repo_settings.py    |  1 +
 .../validation_schema/schemas/repo_schema.py  | 54 +++++++++++
 .../model/validation_schema/validators.py     | 92 +++++++++++++++++++
 .../admin/repos/repo_edit_settings.mako       | 17 +++-
 4 files changed, 161 insertions(+), 3 deletions(-)

diff --git a/rhodecode/apps/repository/views/repo_settings.py b/rhodecode/apps/repository/views/repo_settings.py
index 0814f54a..b1227f83 100644
--- a/rhodecode/apps/repository/views/repo_settings.py
+++ b/rhodecode/apps/repository/views/repo_settings.py
@@ -80,6 +80,7 @@ class RepoSettingsView(RepoAppView):
 
     def _get_schema(self, c, old_values=None):
         return repo_schema.RepoSettingsSchema().bind(
+            repo_type=self.db_repo.repo_type,
             repo_type_options=[self.db_repo.repo_type],
             repo_ref_options=c.landing_revs_choices,
             repo_ref_items=c.landing_revs,
diff --git a/rhodecode/model/validation_schema/schemas/repo_schema.py b/rhodecode/model/validation_schema/schemas/repo_schema.py
index 9a60876a..ef6425d0 100644
--- a/rhodecode/model/validation_schema/schemas/repo_schema.py
+++ b/rhodecode/model/validation_schema/schemas/repo_schema.py
@@ -65,6 +65,13 @@ def deferred_landing_ref_validator(node, kw):
     return colander.OneOf([x for x in options])
 
 
+@colander.deferred
+def deferred_clone_uri_validator(node, kw):
+    repo_type = kw.get('repo_type')
+    validator = validators.CloneUriValidator(repo_type)
+    return validator
+
+
 @colander.deferred
 def deferred_landing_ref_widget(node, kw):
     items = kw.get(
@@ -358,3 +365,50 @@ class RepoSchema(colander.MappingSchema):
         third.deserialize({'unique_repo_name': validated_name})
 
         return appstruct
+
+
+class RepoSettingsSchema(RepoSchema):
+    repo_group = colander.SchemaNode(
+        colander.Integer(),
+        validator=deferred_repo_group_validator,
+        widget=deferred_repo_group_widget,
+        missing='')
+
+    repo_clone_uri_change = colander.SchemaNode(
+        colander.String(),
+        missing='NEW')
+
+    repo_clone_uri = colander.SchemaNode(
+        colander.String(),
+        preparers=[preparers.strip_preparer],
+        validator=deferred_clone_uri_validator,
+        missing='')
+
+    def deserialize(self, cstruct):
+        """
+        Custom deserialize that allows to chain validation, and verify
+        permissions, and as last step uniqueness
+        """
+
+        # first pass, to validate given data
+        appstruct = super(RepoSchema, self).deserialize(cstruct)
+        validated_name = appstruct['repo_name']
+        # because of repoSchema adds repo-group as an ID, we inject it as
+        # full name here because validators require it, it's unwrapped later
+        # so it's safe to use and final name is going to be without group anyway
+
+        group, separator = get_repo_group(appstruct['repo_group'])
+        if group:
+            validated_name = separator.join([group.group_name, validated_name])
+
+        # second pass to validate permissions to repo_group
+        second = RepoGroupAccessSchema().bind(**self.bindings)
+        appstruct_second = second.deserialize({'repo_group': validated_name})
+        # save result
+        appstruct['repo_group'] = appstruct_second['repo_group']
+
+        # thirds to validate uniqueness
+        third = RepoNameUniqueSchema().bind(**self.bindings)
+        third.deserialize({'unique_repo_name': validated_name})
+
+        return appstruct
diff --git a/rhodecode/model/validation_schema/validators.py b/rhodecode/model/validation_schema/validators.py
index 42dec556..5d88e624 100644
--- a/rhodecode/model/validation_schema/validators.py
+++ b/rhodecode/model/validation_schema/validators.py
@@ -1,5 +1,27 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2011-2017 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 re
+import logging
+
 
 import ipaddress
 import colander
@@ -7,6 +29,8 @@ import colander
 from rhodecode.translation import _
 from rhodecode.lib.utils2 import glob2re
 
+log = logging.getLogger(__name__)
+
 
 def ip_addr_validator(node, value):
     try:
@@ -46,3 +70,71 @@ def valid_name_validator(node, value):
     msg = _('Name must start with a letter or number. Got `{}`').format(value)
     if not re.match(r'^[a-zA-z0-9]{1,}', value):
         raise colander.Invalid(node, msg)
+
+
+class InvalidCloneUrl(Exception):
+    allowed_prefixes = ()
+
+
+def url_validator(url, repo_type, config):
+    from rhodecode.lib.vcs.backends.hg import MercurialRepository
+    from rhodecode.lib.vcs.backends.git import GitRepository
+    from rhodecode.lib.vcs.backends.svn import SubversionRepository
+
+    if repo_type == 'hg':
+        allowed_prefixes = ('http', 'svn+http', 'git+http')
+
+        if 'http' in url[:4]:
+            # initially check if it's at least the proper URL
+            # or does it pass basic auth
+
+            MercurialRepository.check_url(url, config)
+        elif 'svn+http' in url[:8]:  # svn->hg import
+            SubversionRepository.check_url(url, config)
+        elif 'git+http' in url[:8]:  # git->hg import
+            raise NotImplementedError()
+        else:
+            exc = InvalidCloneUrl('Clone from URI %s not allowed. '
+                                  'Allowed url must start with one of %s'
+                                  % (url, ','.join(allowed_prefixes)))
+            exc.allowed_prefixes = allowed_prefixes
+            raise exc
+
+    elif repo_type == 'git':
+        allowed_prefixes = ('http', 'svn+http', 'hg+http')
+        if 'http' in url[:4]:
+            # initially check if it's at least the proper URL
+            # or does it pass basic auth
+            GitRepository.check_url(url, config)
+        elif 'svn+http' in url[:8]:  # svn->git import
+            raise NotImplementedError()
+        elif 'hg+http' in url[:8]:  # hg->git import
+            raise NotImplementedError()
+        else:
+            exc = InvalidCloneUrl('Clone from URI %s not allowed. '
+                                  'Allowed url must start with one of %s'
+                                  % (url, ','.join(allowed_prefixes)))
+            exc.allowed_prefixes = allowed_prefixes
+            raise exc
+
+
+class CloneUriValidator(object):
+    def __init__(self, repo_type):
+        self.repo_type = repo_type
+
+    def __call__(self, node, value):
+        from rhodecode.lib.utils import make_db_config
+        try:
+            config = make_db_config(clear_session=False)
+            url_validator(value, self.repo_type, config)
+        except InvalidCloneUrl as e:
+            log.warning(e)
+            msg = _(u'Invalid clone url, provide a valid clone '
+                    u'url starting with one of {allowed_prefixes}').format(
+                allowed_prefixes=e.allowed_prefixes)
+            raise colander.Invalid(node, msg)
+        except Exception:
+            log.exception('Url validation failed')
+            msg = _(u'invalid clone url for {repo_type} repository').format(
+                repo_type=self.repo_type)
+            raise colander.Invalid(node, msg)
diff --git a/rhodecode/templates/admin/repos/repo_edit_settings.mako b/rhodecode/templates/admin/repos/repo_edit_settings.mako
index c4a89f38..73adf9e6 100644
--- a/rhodecode/templates/admin/repos/repo_edit_settings.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_settings.mako
@@ -52,18 +52,29 @@
                </div>
                <div class="input">
                    %if c.rhodecode_db_repo.clone_uri:
-                    ## display
+                    ## display, if we don't have any errors
+                    % if not c.form['repo_clone_uri'].error:
                     <div id="clone_uri_hidden" class='text-as-placeholder'>
                         <span id="clone_uri_hidden_value">${c.rhodecode_db_repo.clone_uri_hidden}</span>
                         <span class="link" id="edit_clone_uri"><i class="icon-edit"></i>${_('edit')}</span>
                     </div>
+                    % endif
+
                     ## alter field
-                    <div id="alter_clone_uri" style="display: none">
+                    <div id="alter_clone_uri" style="${'' if c.form['repo_clone_uri'].error else 'display: none'}">
                         ${c.form['repo_clone_uri'].render(css_class='medium', oid='clone_uri', placeholder=_('enter new value, or leave empty to remove'))|n}
                         ${c.form.render_error(request, c.form['repo_clone_uri'])|n}
-                        ${h.hidden('repo_clone_uri_change', 'OLD')}
+                        % if c.form['repo_clone_uri'].error:
+                            ## we got error from form subit, means we modify the url
+                            ${h.hidden('repo_clone_uri_change', 'MOD')}
+                        % else:
+                            ${h.hidden('repo_clone_uri_change', 'OLD')}
+                        % endif
 
+                        % if not c.form['repo_clone_uri'].error:
                         <span class="link" id="cancel_edit_clone_uri">${_('cancel')}</span>
+                        % endif
+
                     </div>
                    %else:
                     ## not set yet, display form to set it

From 196813bfdda37c7a9c2e44738cdee9950a21db83 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 27 Apr 2017 21:37:53 +0200
Subject: [PATCH 083/211] tests: added special no-newline test name generator

---
 rhodecode/tests/__init__.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/rhodecode/tests/__init__.py b/rhodecode/tests/__init__.py
index cbaf36b2..f998aee9 100644
--- a/rhodecode/tests/__init__.py
+++ b/rhodecode/tests/__init__.py
@@ -56,7 +56,7 @@ log = logging.getLogger(__name__)
 __all__ = [
     'get_new_dir', 'TestController', 'SkipTest',
     'url', 'link_to', 'ldap_lib_installed', 'clear_all_caches',
-    'assert_session_flash', 'login_user',
+    'assert_session_flash', 'login_user', 'no_newline_id_generator',
     'TESTS_TMP_PATH', 'HG_REPO', 'GIT_REPO', 'SVN_REPO',
     'NEW_HG_REPO', 'NEW_GIT_REPO',
     'HG_FORK', 'GIT_FORK', 'TEST_USER_ADMIN_LOGIN', 'TEST_USER_ADMIN_PASS',
@@ -249,3 +249,17 @@ def assert_session_flash_is_empty(response):
         msg = 'flash messages are present in session:%s' % \
               response.session['flash'][0]
         pytest.fail(safe_str(msg))
+
+
+def no_newline_id_generator(test_name):
+    """
+    Generates a test name without spaces or newlines characters. Used for
+    nicer output of progress of test
+    """
+    org_name = test_name
+    test_name = test_name\
+        .replace('\n', '_N') \
+        .replace('\t', '_T') \
+        .replace(' ', '_S')
+
+    return test_name or 'test-with-empty-name'

From 3680a0f227f8d97ef79980b603226039edb11c4e Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 28 Apr 2017 12:36:37 +0200
Subject: [PATCH 084/211] tests: fixed tests for new repo settings

- added settings update missing tests
- fixed id generation to some tests for better display
---
 rhodecode/apps/repository/tests/__init__.py   |   0
 .../repository/tests/test_repo_settings.py    | 230 ++++++++++++++++++
 .../repository/tests/test_vcs_settings.py}    |  29 ++-
 .../tests/config/test_sanitize_settings.py    |   3 +-
 .../tests/controllers/test_repo_groups.py     |   4 +-
 .../tests/functional/test_admin_repos.py      |  61 -----
 .../models/schemas/test_repo_group_schema.py  |  14 +-
 .../tests/models/schemas/test_repo_schema.py  |  16 +-
 rhodecode/tests/models/test_scm.py            |   3 +-
 rhodecode/tests/other/test_libs.py            |   8 +-
 10 files changed, 271 insertions(+), 97 deletions(-)
 create mode 100644 rhodecode/apps/repository/tests/__init__.py
 create mode 100644 rhodecode/apps/repository/tests/test_repo_settings.py
 rename rhodecode/{tests/functional/test_admin_repo_settings.py => apps/repository/tests/test_vcs_settings.py} (89%)

diff --git a/rhodecode/apps/repository/tests/__init__.py b/rhodecode/apps/repository/tests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/rhodecode/apps/repository/tests/test_repo_settings.py b/rhodecode/apps/repository/tests/test_repo_settings.py
new file mode 100644
index 00000000..4889fcd5
--- /dev/null
+++ b/rhodecode/apps/repository/tests/test_repo_settings.py
@@ -0,0 +1,230 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2017 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import mock
+import pytest
+
+from rhodecode.lib.utils2 import str2bool
+from rhodecode.lib.vcs.exceptions import RepositoryRequirementError
+from rhodecode.model.db import Repository, UserRepoToPerm, Permission, User
+from rhodecode.model.meta import Session
+from rhodecode.tests import (
+    url, HG_REPO, TEST_USER_ADMIN_LOGIN, TEST_USER_REGULAR_LOGIN,
+    assert_session_flash)
+from rhodecode.tests.fixture import Fixture
+
+fixture = Fixture()
+
+
+def route_path(name, params=None, **kwargs):
+    import urllib
+
+    base_url = {
+        'edit_repo': '/{repo_name}/settings',
+    }[name].format(**kwargs)
+
+    if params:
+        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+    return base_url
+
+
+def _get_permission_for_user(user, repo):
+    perm = UserRepoToPerm.query()\
+        .filter(UserRepoToPerm.repository ==
+                Repository.get_by_repo_name(repo))\
+        .filter(UserRepoToPerm.user == User.get_by_username(user))\
+        .all()
+    return perm
+
+
+@pytest.mark.usefixtures('autologin_user', 'app')
+class TestAdminRepoSettings(object):
+    @pytest.mark.parametrize('urlname', [
+        'edit_repo',
+    ])
+    def test_show_page(self, urlname, app, backend):
+        app.get(route_path(urlname, repo_name=backend.repo_name), status=200)
+
+    def test_edit_accessible_when_missing_requirements(
+            self, backend_hg, autologin_user):
+        scm_patcher = mock.patch.object(
+            Repository, 'scm_instance', side_effect=RepositoryRequirementError)
+        with scm_patcher:
+            self.app.get(route_path('edit_repo', repo_name=backend_hg.repo_name))
+
+    @pytest.mark.parametrize('urlname', [
+        'edit_repo_perms',
+        'edit_repo_advanced',
+        'repo_vcs_settings',
+        'edit_repo_fields',
+        'repo_settings_issuetracker',
+        'edit_repo_caches',
+        'edit_repo_remote',
+        'edit_repo_statistics',
+    ])
+    def test_show_page_pylons(self, urlname, app):
+        app.get(url(urlname, repo_name=HG_REPO))
+
+    @pytest.mark.parametrize('update_settings', [
+        {'repo_description': 'alter-desc'},
+        {'repo_owner': TEST_USER_REGULAR_LOGIN},
+        {'repo_private': 'true'},
+        {'repo_enable_locking': 'true'},
+        {'repo_enable_downloads': 'true'},
+    ])
+    def test_update_repo_settings(self, update_settings, csrf_token, backend, user_util):
+        repo = user_util.create_repo(repo_type=backend.alias)
+        repo_name = repo.repo_name
+
+        params = fixture._get_repo_create_params(
+                csrf_token=csrf_token,
+                repo_name=repo_name,
+                repo_type=backend.alias,
+                repo_owner=TEST_USER_ADMIN_LOGIN,
+                repo_description='DESC',
+
+                repo_private='false',
+                repo_enable_locking='false',
+                repo_enable_downloads='false')
+        params.update(update_settings)
+        self.app.post(
+            route_path('edit_repo', repo_name=repo_name),
+            params=params, status=302)
+
+        repo = Repository.get_by_repo_name(repo_name)
+        assert repo.user.username == \
+               update_settings.get('repo_owner', repo.user.username)
+
+        assert repo.description == \
+               update_settings.get('repo_description', repo.description)
+
+        assert repo.private == \
+               str2bool(update_settings.get(
+                   'repo_private', repo.private))
+
+        assert repo.enable_locking == \
+               str2bool(update_settings.get(
+                   'repo_enable_locking', repo.enable_locking))
+
+        assert repo.enable_downloads == \
+               str2bool(update_settings.get(
+                   'repo_enable_downloads', repo.enable_downloads))
+
+    def test_update_repo_name_via_settings(self, csrf_token, user_util, backend):
+        repo = user_util.create_repo(repo_type=backend.alias)
+        repo_name = repo.repo_name
+
+        repo_group = user_util.create_repo_group()
+        repo_group_name = repo_group.group_name
+        new_name = repo_group_name + '_' + repo_name
+
+        params = fixture._get_repo_create_params(
+                csrf_token=csrf_token,
+                repo_name=new_name,
+                repo_type=backend.alias,
+                repo_owner=TEST_USER_ADMIN_LOGIN,
+                repo_description='DESC',
+                repo_private='false',
+                repo_enable_locking='false',
+                repo_enable_downloads='false')
+        self.app.post(
+            route_path('edit_repo', repo_name=repo_name),
+            params=params, status=302)
+        repo = Repository.get_by_repo_name(new_name)
+        assert repo.repo_name == new_name
+
+    def test_update_repo_group_via_settings(self, csrf_token, user_util, backend):
+        repo = user_util.create_repo(repo_type=backend.alias)
+        repo_name = repo.repo_name
+
+        repo_group = user_util.create_repo_group()
+        repo_group_name = repo_group.group_name
+        repo_group_id = repo_group.group_id
+
+        new_name = repo_group_name + '/' + repo_name
+        params = fixture._get_repo_create_params(
+                csrf_token=csrf_token,
+                repo_name=repo_name,
+                repo_type=backend.alias,
+                repo_owner=TEST_USER_ADMIN_LOGIN,
+                repo_description='DESC',
+                repo_group=repo_group_id,
+                repo_private='false',
+                repo_enable_locking='false',
+                repo_enable_downloads='false')
+        self.app.post(
+            route_path('edit_repo', repo_name=repo_name),
+            params=params, status=302)
+        repo = Repository.get_by_repo_name(new_name)
+        assert repo.repo_name == new_name
+
+    def test_set_private_flag_sets_default_user_permissions_to_none(
+            self, autologin_user, backend, csrf_token):
+
+        # initially repository perm should be read
+        perm = _get_permission_for_user(user='default', repo=backend.repo_name)
+        assert len(perm) == 1
+        assert perm[0].permission.permission_name == 'repository.read'
+        assert not backend.repo.private
+
+        response = self.app.post(
+            route_path('edit_repo', repo_name=backend.repo_name),
+            params=fixture._get_repo_create_params(
+                repo_private='true',
+                repo_name=backend.repo_name,
+                repo_type=backend.alias,
+                repo_owner=TEST_USER_ADMIN_LOGIN,
+                csrf_token=csrf_token), status=302)
+
+        assert_session_flash(
+            response,
+            msg='Repository %s updated successfully' % (backend.repo_name))
+
+        repo = Repository.get_by_repo_name(backend.repo_name)
+        assert repo.private is True
+
+        # now the repo default permission should be None
+        perm = _get_permission_for_user(user='default', repo=backend.repo_name)
+        assert len(perm) == 1
+        assert perm[0].permission.permission_name == 'repository.none'
+
+        response = self.app.post(
+            route_path('edit_repo', repo_name=backend.repo_name),
+            params=fixture._get_repo_create_params(
+                repo_private='false',
+                repo_name=backend.repo_name,
+                repo_type=backend.alias,
+                repo_owner=TEST_USER_ADMIN_LOGIN,
+                csrf_token=csrf_token), status=302)
+
+        assert_session_flash(
+            response,
+            msg='Repository %s updated successfully' % (backend.repo_name))
+        assert backend.repo.private is False
+
+        # we turn off private now the repo default permission should stay None
+        perm = _get_permission_for_user(user='default', repo=backend.repo_name)
+        assert len(perm) == 1
+        assert perm[0].permission.permission_name == 'repository.none'
+
+        # update this permission back
+        perm[0].permission = Permission.get_by_key('repository.read')
+        Session().add(perm[0])
+        Session().commit()
diff --git a/rhodecode/tests/functional/test_admin_repo_settings.py b/rhodecode/apps/repository/tests/test_vcs_settings.py
similarity index 89%
rename from rhodecode/tests/functional/test_admin_repo_settings.py
rename to rhodecode/apps/repository/tests/test_vcs_settings.py
index 5e7b8ac3..191b08ca 100644
--- a/rhodecode/tests/functional/test_admin_repo_settings.py
+++ b/rhodecode/apps/repository/tests/test_vcs_settings.py
@@ -23,25 +23,24 @@ import pytest
 
 import rhodecode
 from rhodecode.model.settings import SettingsModel
-from rhodecode.tests import url, HG_REPO
+from rhodecode.tests import url
 from rhodecode.tests.utils import AssertResponse
 
 
+def route_path(name, params=None, **kwargs):
+    import urllib
+
+    base_url = {
+        'edit_repo': '/{repo_name}/settings',
+    }[name].format(**kwargs)
+
+    if params:
+        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+    return base_url
+
+
 @pytest.mark.usefixtures('autologin_user', 'app')
-class TestAdminRepoSettingsController:
-    @pytest.mark.parametrize('urlname', [
-        'edit_repo',
-        'edit_repo_perms',
-        'edit_repo_advanced',
-        'repo_vcs_settings',
-        'edit_repo_fields',
-        'repo_settings_issuetracker',
-        'edit_repo_caches',
-        'edit_repo_remote',
-        'edit_repo_statistics',
-    ])
-    def test_simple_get(self, urlname, app):
-        app.get(url(urlname, repo_name=HG_REPO))
+class TestAdminRepoVcsSettings(object):
 
     @pytest.mark.parametrize('setting_name, setting_backends', [
         ('hg_use_rebase_for_merging', ['hg']),
diff --git a/rhodecode/tests/config/test_sanitize_settings.py b/rhodecode/tests/config/test_sanitize_settings.py
index 3b047fbc..b33b2fd8 100644
--- a/rhodecode/tests/config/test_sanitize_settings.py
+++ b/rhodecode/tests/config/test_sanitize_settings.py
@@ -21,6 +21,7 @@
 
 import pytest
 
+from rhodecode.tests import no_newline_id_generator
 from rhodecode.config.middleware import (
     _sanitize_vcs_settings, _bool_setting, _string_setting, _list_setting,
     _int_setting)
@@ -70,7 +71,7 @@ class TestHelperFunctions(object):
         (' hg\n git\n svn ', ['hg', 'git', 'svn']),
         (', hg , git , svn , ', ['', 'hg', 'git', 'svn', '']),
         ('cheese,free node,other', ['cheese', 'free node', 'other']),
-    ])
+    ], ids=no_newline_id_generator)
     def test_list_setting_helper(self, raw, expected):
         key = 'dummy-key'
         settings = {key: raw}
diff --git a/rhodecode/tests/controllers/test_repo_groups.py b/rhodecode/tests/controllers/test_repo_groups.py
index 2f0ae4db..193f94d6 100644
--- a/rhodecode/tests/controllers/test_repo_groups.py
+++ b/rhodecode/tests/controllers/test_repo_groups.py
@@ -64,7 +64,7 @@ def test_repo_groups_load_defaults(
     personal_group = personal_group_with_parent
     controller._RepoGroupsController__load_defaults(True, personal_group)
 
-    expected_list = ['-1', personal_group.parent_group.group_id]
+    expected_list = [-1, personal_group.parent_group.group_id]
     returned_group_ids = [group[0] for group in c.repo_groups]
     assert returned_group_ids == expected_list
 
@@ -74,6 +74,6 @@ def test_repo_groups_load_defaults_with_missing_group(
     personal_group = personal_group_with_parent
     controller._RepoGroupsController__load_defaults(True)
 
-    expected_list = sorted(['-1', personal_group.group_id])
+    expected_list = sorted([-1, personal_group.group_id])
     returned_group_ids = sorted([group[0] for group in c.repo_groups])
     assert returned_group_ids == expected_list
diff --git a/rhodecode/tests/functional/test_admin_repos.py b/rhodecode/tests/functional/test_admin_repos.py
index 392c4537..74f68e5a 100644
--- a/rhodecode/tests/functional/test_admin_repos.py
+++ b/rhodecode/tests/functional/test_admin_repos.py
@@ -400,67 +400,6 @@ class TestAdminRepos(object):
     def test_show(self, autologin_user, backend):
         self.app.get(url('repo', repo_name=backend.repo_name))
 
-    def test_edit(self, backend, autologin_user):
-        self.app.get(url('edit_repo', repo_name=backend.repo_name))
-
-    def test_edit_accessible_when_missing_requirements(
-            self, backend_hg, autologin_user):
-        scm_patcher = mock.patch.object(
-            Repository, 'scm_instance', side_effect=RepositoryRequirementError)
-        with scm_patcher:
-            self.app.get(url('edit_repo', repo_name=backend_hg.repo_name))
-
-    def test_set_private_flag_sets_default_to_none(
-            self, autologin_user, backend, csrf_token):
-        # initially repository perm should be read
-        perm = _get_permission_for_user(user='default', repo=backend.repo_name)
-        assert len(perm) == 1
-        assert perm[0].permission.permission_name == 'repository.read'
-        assert not backend.repo.private
-
-        response = self.app.post(
-            url('repo', repo_name=backend.repo_name),
-            fixture._get_repo_create_params(
-                repo_private=1,
-                repo_name=backend.repo_name,
-                repo_type=backend.alias,
-                user=TEST_USER_ADMIN_LOGIN,
-                _method='put',
-                csrf_token=csrf_token))
-        assert_session_flash(
-            response,
-            msg='Repository %s updated successfully' % (backend.repo_name))
-        assert backend.repo.private
-
-        # now the repo default permission should be None
-        perm = _get_permission_for_user(user='default', repo=backend.repo_name)
-        assert len(perm) == 1
-        assert perm[0].permission.permission_name == 'repository.none'
-
-        response = self.app.post(
-            url('repo', repo_name=backend.repo_name),
-            fixture._get_repo_create_params(
-                repo_private=False,
-                repo_name=backend.repo_name,
-                repo_type=backend.alias,
-                user=TEST_USER_ADMIN_LOGIN,
-                _method='put',
-                csrf_token=csrf_token))
-        assert_session_flash(
-            response,
-            msg='Repository %s updated successfully' % (backend.repo_name))
-        assert not backend.repo.private
-
-        # we turn off private now the repo default permission should stay None
-        perm = _get_permission_for_user(user='default', repo=backend.repo_name)
-        assert len(perm) == 1
-        assert perm[0].permission.permission_name == 'repository.none'
-
-        # update this permission back
-        perm[0].permission = Permission.get_by_key('repository.read')
-        Session().add(perm[0])
-        Session().commit()
-
     def test_default_user_cannot_access_private_repo_in_a_group(
             self, autologin_user, user_util, backend, csrf_token):
 
diff --git a/rhodecode/tests/models/schemas/test_repo_group_schema.py b/rhodecode/tests/models/schemas/test_repo_group_schema.py
index da3a3978..b0c0cba3 100644
--- a/rhodecode/tests/models/schemas/test_repo_group_schema.py
+++ b/rhodecode/tests/models/schemas/test_repo_group_schema.py
@@ -52,18 +52,18 @@ class TestRepoGroupSchema(object):
         )
 
         schema_data = schema.deserialize(dict(
-            repo_group_name='dupa',
+            repo_group_name='my_schema_group',
             repo_group_owner=user_admin.username
         ))
 
-        assert schema_data['repo_group_name'] == 'dupa'
+        assert schema_data['repo_group_name'] == u'my_schema_group'
         assert schema_data['repo_group'] == {
             'repo_group_id': None,
             'repo_group_name': types.RootLocation,
-            'repo_group_name_without_group': 'dupa'}
+            'repo_group_name_without_group': u'my_schema_group'}
 
     @pytest.mark.parametrize('given, err_key, expected_exc', [
-        ('xxx/dupa', 'repo_group', 'Parent repository group `xxx` does not exist'),
+        ('xxx/my_schema_group', 'repo_group', 'Parent repository group `xxx` does not exist'),
         ('', 'repo_group_name', 'Name must start with a letter or number. Got ``'),
     ])
     def test_deserialize_with_bad_group_name(
@@ -86,7 +86,7 @@ class TestRepoGroupSchema(object):
             user=user_admin
         )
 
-        full_name = test_repo_group.group_name + '/dupa'
+        full_name = test_repo_group.group_name + u'/my_schema_group'
         schema_data = schema.deserialize(dict(
             repo_group_name=full_name,
             repo_group_owner=user_admin.username
@@ -96,7 +96,7 @@ class TestRepoGroupSchema(object):
         assert schema_data['repo_group'] == {
             'repo_group_id': test_repo_group.group_id,
             'repo_group_name': test_repo_group.group_name,
-            'repo_group_name_without_group': 'dupa'}
+            'repo_group_name_without_group': u'my_schema_group'}
 
     def test_deserialize_with_group_name_regular_user_no_perms(
             self, app, user_regular, test_repo_group):
@@ -104,7 +104,7 @@ class TestRepoGroupSchema(object):
             user=user_regular
         )
 
-        full_name = test_repo_group.group_name + '/dupa'
+        full_name = test_repo_group.group_name + u'/my_schema_group'
         with pytest.raises(colander.Invalid) as excinfo:
             schema.deserialize(dict(
                 repo_group_name=full_name,
diff --git a/rhodecode/tests/models/schemas/test_repo_schema.py b/rhodecode/tests/models/schemas/test_repo_schema.py
index 71e3dcc8..5b453da2 100644
--- a/rhodecode/tests/models/schemas/test_repo_schema.py
+++ b/rhodecode/tests/models/schemas/test_repo_schema.py
@@ -57,19 +57,20 @@ class TestRepoSchema(object):
         )
 
         schema_data = schema.deserialize(dict(
-            repo_name='dupa',
+            repo_name='my_schema_repo',
             repo_type='hg',
             repo_owner=user_admin.username
         ))
 
-        assert schema_data['repo_name'] == 'dupa'
+        assert schema_data['repo_name'] == u'my_schema_repo'
         assert schema_data['repo_group'] == {
             'repo_group_id': None,
             'repo_group_name': types.RootLocation,
-            'repo_name_without_group': 'dupa'}
+            'repo_name_with_group': u'my_schema_repo',
+            'repo_name_without_group': u'my_schema_repo'}
 
     @pytest.mark.parametrize('given, err_key, expected_exc', [
-        ('xxx/dupa','repo_group', 'Repository group `xxx` does not exist'),
+        ('xxx/my_schema_repo','repo_group', 'Repository group `xxx` does not exist'),
         ('', 'repo_name', 'Name must start with a letter or number. Got ``'),
     ])
     def test_deserialize_with_bad_group_name(
@@ -95,7 +96,7 @@ class TestRepoSchema(object):
             user=user_admin
         )
 
-        full_name = test_repo_group.group_name + '/dupa'
+        full_name = test_repo_group.group_name + u'/my_schema_repo'
         schema_data = schema.deserialize(dict(
             repo_name=full_name,
             repo_type='hg',
@@ -106,7 +107,8 @@ class TestRepoSchema(object):
         assert schema_data['repo_group'] == {
             'repo_group_id': test_repo_group.group_id,
             'repo_group_name': test_repo_group.group_name,
-            'repo_name_without_group': 'dupa'}
+            'repo_name_with_group': full_name,
+            'repo_name_without_group': u'my_schema_repo'}
 
     def test_deserialize_with_group_name_regular_user_no_perms(
             self, app, user_regular, test_repo_group):
@@ -115,7 +117,7 @@ class TestRepoSchema(object):
             user=user_regular
         )
 
-        full_name = test_repo_group.group_name + '/dupa'
+        full_name = test_repo_group.group_name + '/my_schema_repo'
         with pytest.raises(colander.Invalid) as excinfo:
             schema.deserialize(dict(
                 repo_name=full_name,
diff --git a/rhodecode/tests/models/test_scm.py b/rhodecode/tests/models/test_scm.py
index 98e161b7..4b365bad 100644
--- a/rhodecode/tests/models/test_scm.py
+++ b/rhodecode/tests/models/test_scm.py
@@ -27,6 +27,7 @@ from mock import Mock, patch, DEFAULT
 
 import rhodecode
 from rhodecode.model import db, scm
+from rhodecode.tests import no_newline_id_generator
 
 
 def test_scm_instance_config(backend):
@@ -295,7 +296,7 @@ class TestCheckRhodecodeHook(object):
     @pytest.mark.parametrize("file_content, expected_result", [
         ("RC_HOOK_VER = '3.3.3'\n", True),
         ("RC_HOOK = '3.3.3'\n", False),
-    ])
+    ], ids=no_newline_id_generator)
     @patch('os.path.exists', Mock(return_value=True))
     def test_signatures(self, file_content, expected_result):
         hook_content_patcher = patch.object(
diff --git a/rhodecode/tests/other/test_libs.py b/rhodecode/tests/other/test_libs.py
index 69cc9c16..1eee5553 100644
--- a/rhodecode/tests/other/test_libs.py
+++ b/rhodecode/tests/other/test_libs.py
@@ -27,6 +27,8 @@ import datetime
 import string
 import mock
 import pytest
+
+from rhodecode.tests import no_newline_id_generator
 from rhodecode.tests.utils import run_test_concurrently
 from rhodecode.lib.helpers import InitialsGravatar
 
@@ -113,7 +115,7 @@ def test_str2bool(str_bool, expected):
 (pref+"user.dot  hej ! not-needed maril@domain.org", []),
 (pref+"\n@marcin", ['marcin']),
 ]
-for pref in ['', '\n', 'hi !', '\t', '\n\n']]))
+for pref in ['', '\n', 'hi !', '\t', '\n\n']]), ids=no_newline_id_generator)
 def test_mention_extractor(text, expected):
     from rhodecode.lib.utils2 import extract_mentioned_users
     got = extract_mentioned_users(text)
@@ -378,7 +380,7 @@ def _quick_url(text, tmpl="""<a class="revision-link" href="%s">%s</a>""", url_=
    some text url[123123123123]
    sometimes !
    """)
-])
+], ids=no_newline_id_generator)
 def test_urlify_commits(sample, expected):
     def fake_url(self, *args, **kwargs):
         return '/some-url'
@@ -410,7 +412,7 @@ def test_urlify_commits(sample, expected):
      url[https://foo.bar.com]
      some text lalala""",
      "https://foo.bar.com")
-])
+], ids=no_newline_id_generator)
 def test_urlify_test(sample, expected, url_):
     from rhodecode.lib.helpers import urlify_text
     expected = _quick_url(expected, tmpl="""<a href="%s">%s</a>""", url_=url_)

From 3ec15e8b8fd4b8757a58da8e821713c64f898fbd Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 28 Apr 2017 13:56:37 +0200
Subject: [PATCH 085/211] repo-caches: moved view into pyramid.

---
 rhodecode/apps/repository/__init__.py         |  6 ++
 .../repository/tests/test_repo_settings.py    |  3 +-
 .../apps/repository/views/repo_caches.py      | 76 +++++++++++++++++++
 rhodecode/config/routing.py                   |  9 ---
 rhodecode/controllers/admin/repos.py          | 24 ------
 rhodecode/public/js/rhodecode/routes.js       |  1 +
 .../templates/admin/repos/repo_edit.mako      |  2 +-
 .../admin/repos/repo_edit_caches.mako         | 28 ++++---
 8 files changed, 102 insertions(+), 47 deletions(-)
 create mode 100644 rhodecode/apps/repository/views/repo_caches.py

diff --git a/rhodecode/apps/repository/__init__.py b/rhodecode/apps/repository/__init__.py
index 9fa6864b..eda0176b 100644
--- a/rhodecode/apps/repository/__init__.py
+++ b/rhodecode/apps/repository/__init__.py
@@ -26,6 +26,12 @@ def includeme(config):
         name='edit_repo',
         pattern='/{repo_name:.*?[^/]}/settings', repo_route=True)
 
+    # Caches
+    config.add_route(
+        name='edit_repo_caches',
+        pattern='/{repo_name:.*?[^/]}/settings/caches', repo_route=True)
+
+    # Maintenance
     config.add_route(
         name='repo_maintenance',
         pattern='/{repo_name:.*?[^/]}/maintenance', repo_route=True)
diff --git a/rhodecode/apps/repository/tests/test_repo_settings.py b/rhodecode/apps/repository/tests/test_repo_settings.py
index 4889fcd5..e5820f2b 100644
--- a/rhodecode/apps/repository/tests/test_repo_settings.py
+++ b/rhodecode/apps/repository/tests/test_repo_settings.py
@@ -38,6 +38,7 @@ def route_path(name, params=None, **kwargs):
 
     base_url = {
         'edit_repo': '/{repo_name}/settings',
+        'edit_repo_caches': '/{repo_name}/settings/caches',
     }[name].format(**kwargs)
 
     if params:
@@ -58,6 +59,7 @@ def _get_permission_for_user(user, repo):
 class TestAdminRepoSettings(object):
     @pytest.mark.parametrize('urlname', [
         'edit_repo',
+        'edit_repo_caches'
     ])
     def test_show_page(self, urlname, app, backend):
         app.get(route_path(urlname, repo_name=backend.repo_name), status=200)
@@ -75,7 +77,6 @@ class TestAdminRepoSettings(object):
         'repo_vcs_settings',
         'edit_repo_fields',
         'repo_settings_issuetracker',
-        'edit_repo_caches',
         'edit_repo_remote',
         'edit_repo_statistics',
     ])
diff --git a/rhodecode/apps/repository/views/repo_caches.py b/rhodecode/apps/repository/views/repo_caches.py
new file mode 100644
index 00000000..2a017277
--- /dev/null
+++ b/rhodecode/apps/repository/views/repo_caches.py
@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2011-2017 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
+
+from pyramid.httpexceptions import HTTPFound
+from pyramid.view import view_config
+
+from rhodecode.apps._base import RepoAppView
+from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
+from rhodecode.lib import helpers as h
+from rhodecode.model.meta import Session
+from rhodecode.model.scm import ScmModel
+
+log = logging.getLogger(__name__)
+
+
+class RepoCachesView(RepoAppView):
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+
+        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
+        c.repo_info = self.db_repo
+
+        self._register_global_c(c)
+        return c
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.admin')
+    @view_config(
+        route_name='edit_repo_caches', request_method='GET',
+        renderer='rhodecode:templates/admin/repos/repo_edit.mako')
+    def repo_caches(self):
+        c = self.load_default_context()
+        c.active = 'caches'
+
+        return self._get_template_context(c)
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.admin')
+    @view_config(
+        route_name='edit_repo_caches', request_method='POST')
+    def repo_caches_purge(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+        c.active = 'caches'
+
+        try:
+            ScmModel().mark_for_invalidation(self.db_repo_name, delete=True)
+            Session().commit()
+            h.flash(_('Cache invalidation successful'),
+                    category='success')
+        except Exception:
+            log.exception("Exception during cache invalidation")
+            h.flash(_('An error occurred during cache invalidation'),
+                    category='error')
+
+        raise HTTPFound(h.route_path(
+            'edit_repo_caches', repo_name=self.db_repo_name))
\ No newline at end of file
diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py
index 0a1ad457..802ec9e2 100644
--- a/rhodecode/config/routing.py
+++ b/rhodecode/config/routing.py
@@ -708,15 +708,6 @@ def make_map(config):
                  conditions={'method': ['PUT'], 'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
-    rmap.connect('edit_repo_caches', '/{repo_name}/settings/caches',
-                 controller='admin/repos', action='edit_caches_form',
-                 conditions={'method': ['GET'], 'function': check_repo},
-                 requirements=URL_NAME_REQUIREMENTS)
-    rmap.connect('edit_repo_caches', '/{repo_name}/settings/caches',
-                 controller='admin/repos', action='edit_caches',
-                 conditions={'method': ['PUT'], 'function': check_repo},
-                 requirements=URL_NAME_REQUIREMENTS)
-
     rmap.connect('edit_repo_remote', '/{repo_name}/settings/remote',
                  controller='admin/repos', action='edit_remote_form',
                  conditions={'method': ['GET'], 'function': check_repo},
diff --git a/rhodecode/controllers/admin/repos.py b/rhodecode/controllers/admin/repos.py
index 2c0661a8..e03d5138 100644
--- a/rhodecode/controllers/admin/repos.py
+++ b/rhodecode/controllers/admin/repos.py
@@ -539,30 +539,6 @@ class ReposController(BaseRepoController):
                     category='error')
         return redirect(url('summary_home', repo_name=repo_name))
 
-    @HasRepoPermissionAllDecorator('repository.admin')
-    @auth.CSRFRequired()
-    def edit_caches(self, repo_name):
-        """PUT /{repo_name}/settings/caches: invalidate the repo caches."""
-        try:
-            ScmModel().mark_for_invalidation(repo_name, delete=True)
-            Session().commit()
-            h.flash(_('Cache invalidation successful'),
-                    category='success')
-        except Exception:
-            log.exception("Exception during cache invalidation")
-            h.flash(_('An error occurred during cache invalidation'),
-                    category='error')
-
-        return redirect(url('edit_repo_caches', repo_name=c.repo_name))
-
-    @HasRepoPermissionAllDecorator('repository.admin')
-    def edit_caches_form(self, repo_name):
-        """GET /repo_name/settings: Form to edit an existing item"""
-        c.repo_info = self._load_repo(repo_name)
-        c.active = 'caches'
-
-        return render('admin/repos/repo_edit.mako')
-
     @HasRepoPermissionAllDecorator('repository.admin')
     @auth.CSRFRequired()
     def edit_remote(self, repo_name):
diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js
index 5534afe5..f9b37348 100644
--- a/rhodecode/public/js/rhodecode/routes.js
+++ b/rhodecode/public/js/rhodecode/routes.js
@@ -98,6 +98,7 @@ function registerRCRoutes() {
     pyroutes.register('repo_list_data', '/_repos', []);
     pyroutes.register('goto_switcher_data', '/_goto_data', []);
     pyroutes.register('edit_repo', '/%(repo_name)s/settings', ['repo_name']);
+    pyroutes.register('edit_repo_caches', '/%(repo_name)s/settings/caches', ['repo_name']);
     pyroutes.register('repo_maintenance', '/%(repo_name)s/maintenance', ['repo_name']);
     pyroutes.register('repo_maintenance_execute', '/%(repo_name)s/maintenance/execute', ['repo_name']);
     pyroutes.register('strip', '/%(repo_name)s/strip', ['repo_name']);
diff --git a/rhodecode/templates/admin/repos/repo_edit.mako b/rhodecode/templates/admin/repos/repo_edit.mako
index d1bad42b..5b41ed65 100644
--- a/rhodecode/templates/admin/repos/repo_edit.mako
+++ b/rhodecode/templates/admin/repos/repo_edit.mako
@@ -58,7 +58,7 @@
               <a href="${h.url('repo_settings_issuetracker', repo_name=c.repo_name)}">${_('Issue Tracker')}</a>
           </li>
           <li class="${'active' if c.active=='caches' else ''}">
-              <a href="${h.url('edit_repo_caches', repo_name=c.repo_name)}">${_('Caches')}</a>
+              <a href="${h.route_path('edit_repo_caches', repo_name=c.repo_name)}">${_('Caches')}</a>
           </li>
           %if c.repo_info.repo_type != 'svn':
           <li class="${'active' if c.active=='remote' else ''}">
diff --git a/rhodecode/templates/admin/repos/repo_edit_caches.mako b/rhodecode/templates/admin/repos/repo_edit_caches.mako
index 1e33cc01..fee99e3c 100644
--- a/rhodecode/templates/admin/repos/repo_edit_caches.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_caches.mako
@@ -3,21 +3,25 @@
         <h3 class="panel-title">${_('Invalidate Cache for Repository')}</h3>
     </div>
     <div class="panel-body">
-        ${h.secure_form(url('edit_repo_caches', repo_name=c.repo_name), method='put')}
-        <div>
-           <div class="fields">
-              <p>
-                 ${h.submit('reset_cache_%s' % c.repo_info.repo_name,_('Invalidate repository cache'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to invalidate repository cache')+"');")}
-              </p>
-              <div class="field" >
-                  <span class="help-block">
-                  ${_('Manually invalidate the repository cache. On the next access a repository cache will be recreated.')}
-                  </span>
-              </div>
 
+        <h4>${_('Manually invalidate the repository cache. On the next access a repository cache will be recreated.')}</h4>
+
+        <p>
+            ${_('Cache purge can be automated by such api call called periodically (in crontab etc)')}
+            <br/>
+            <code>
+                curl ${h.route_url('apiv2')} -X POST -H 'content-type:text/plain' --data-binary '{"id":1, "auth_token":"SECRET", "method":"invalidate_cache", "args":{"repoid":"${c.repo_info.repo_name}"}}'
+            </code>
+        </p>
+
+        ${h.secure_form(h.route_path('edit_repo_caches', repo_name=c.repo_name), method='POST')}
+        <div class="form">
+           <div class="fields">
+               ${h.submit('reset_cache_%s' % c.repo_info.repo_name,_('Invalidate repository cache'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to invalidate repository cache')+"');")}
            </div>
         </div>
         ${h.end_form()}
+
     </div>
 </div>
 
@@ -25,7 +29,7 @@
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">
-            ${(ungettext('List of repository caches (%(count)s entry)', 'List of repository caches (%(count)s entries)' ,len(c.repo_info.cache_keys)) % {'count': len(c.repo_info.cache_keys)})}
+            ${(_ungettext('List of repository caches (%(count)s entry)', 'List of repository caches (%(count)s entries)' ,len(c.repo_info.cache_keys)) % {'count': len(c.repo_info.cache_keys)})}
         </h3>
     </div>
     <div class="panel-body">

From 4bc1c16840e6ef09c8131131d2d6c53e6f821a26 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 28 Apr 2017 13:57:23 +0200
Subject: [PATCH 086/211] repo-strip: rename file to adjust same naming as
 other views.

- removed NotAnonymous becuase it's already protected by admin permissions.
---
 rhodecode/apps/repository/views/{strip.py => repo_strip.py} | 3 ---
 1 file changed, 3 deletions(-)
 rename rhodecode/apps/repository/views/{strip.py => repo_strip.py} (98%)

diff --git a/rhodecode/apps/repository/views/strip.py b/rhodecode/apps/repository/views/repo_strip.py
similarity index 98%
rename from rhodecode/apps/repository/views/strip.py
rename to rhodecode/apps/repository/views/repo_strip.py
index 441fee18..50edf21e 100644
--- a/rhodecode/apps/repository/views/strip.py
+++ b/rhodecode/apps/repository/views/repo_strip.py
@@ -41,7 +41,6 @@ class StripView(RepoAppView):
         return c
 
     @LoginRequired()
-    @NotAnonymous()
     @HasRepoPermissionAnyDecorator('repository.admin')
     @view_config(
         route_name='strip', request_method='GET',
@@ -54,7 +53,6 @@ class StripView(RepoAppView):
         return self._get_template_context(c)
 
     @LoginRequired()
-    @NotAnonymous()
     @HasRepoPermissionAnyDecorator('repository.admin')
     @view_config(
         route_name='strip_check', request_method='POST',
@@ -79,7 +77,6 @@ class StripView(RepoAppView):
         return data
 
     @LoginRequired()
-    @NotAnonymous()
     @HasRepoPermissionAnyDecorator('repository.admin')
     @view_config(
         route_name='strip_execute', request_method='POST',

From ec67f1c7db573f891d36a352c5dd5f0d5e1c2021 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 28 Apr 2017 13:57:59 +0200
Subject: [PATCH 087/211] repo-maintainance: removed NotAnonymous becuase it's
 already protected by admin permissions.

---
 rhodecode/apps/repository/views/repo_maintainance.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/rhodecode/apps/repository/views/repo_maintainance.py b/rhodecode/apps/repository/views/repo_maintainance.py
index c8de40ee..9e8274e7 100644
--- a/rhodecode/apps/repository/views/repo_maintainance.py
+++ b/rhodecode/apps/repository/views/repo_maintainance.py
@@ -41,7 +41,6 @@ class RepoMaintenanceView(RepoAppView):
         return c
 
     @LoginRequired()
-    @NotAnonymous()
     @HasRepoPermissionAnyDecorator('repository.admin')
     @view_config(
         route_name='repo_maintenance', request_method='GET',
@@ -54,7 +53,6 @@ class RepoMaintenanceView(RepoAppView):
         return self._get_template_context(c)
 
     @LoginRequired()
-    @NotAnonymous()
     @HasRepoPermissionAnyDecorator('repository.admin')
     @view_config(
         route_name='repo_maintenance_execute', request_method='GET',

From e1c2f6b6b6ec07892721534e798c421fcdece4e9 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 28 Apr 2017 17:20:38 +0200
Subject: [PATCH 088/211] repo-reviewers: expose a default placeholder on CE
 edition.

- shows the menu consistent
- adds preview of prominent EE feature
---
 rhodecode/apps/repository/__init__.py         |   5 ++
 .../repository/views/repo_review_rules.py     |  51 ++++++++++++++++++
 .../images/ee_features/default_reviewers.png  | Bin 0 -> 122022 bytes
 rhodecode/public/js/rhodecode/routes.js       |   1 +
 .../templates/admin/repos/repo_edit.mako      |  23 +++-----
 .../admin/repos/repo_edit_reviewers.mako      |   9 ++++
 6 files changed, 72 insertions(+), 17 deletions(-)
 create mode 100644 rhodecode/apps/repository/views/repo_review_rules.py
 create mode 100644 rhodecode/public/images/ee_features/default_reviewers.png
 create mode 100644 rhodecode/templates/admin/repos/repo_edit_reviewers.mako

diff --git a/rhodecode/apps/repository/__init__.py b/rhodecode/apps/repository/__init__.py
index eda0176b..104b56d7 100644
--- a/rhodecode/apps/repository/__init__.py
+++ b/rhodecode/apps/repository/__init__.py
@@ -31,6 +31,11 @@ def includeme(config):
         name='edit_repo_caches',
         pattern='/{repo_name:.*?[^/]}/settings/caches', repo_route=True)
 
+    # Repo Review Rules
+    config.add_route(
+        name='repo_reviewers',
+        pattern='/{repo_name:.*?[^/]}/settings/review/rules', repo_route=True)
+
     # Maintenance
     config.add_route(
         name='repo_maintenance',
diff --git a/rhodecode/apps/repository/views/repo_review_rules.py b/rhodecode/apps/repository/views/repo_review_rules.py
new file mode 100644
index 00000000..e85e7078
--- /dev/null
+++ b/rhodecode/apps/repository/views/repo_review_rules.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017 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
+
+from pyramid.view import view_config
+
+from rhodecode.apps._base import RepoAppView
+from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
+
+log = logging.getLogger(__name__)
+
+
+class RepoReviewRulesView(RepoAppView):
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+
+        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
+        c.repo_info = self.db_repo
+
+        self._register_global_c(c)
+        return c
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.admin')
+    @view_config(
+        route_name='repo_reviewers', request_method='GET',
+        renderer='rhodecode:templates/admin/repos/repo_edit.mako')
+    def repo_review_rules(self):
+        c = self.load_default_context()
+        c.active = 'reviewers'
+
+        return self._get_template_context(c)
+
diff --git a/rhodecode/public/images/ee_features/default_reviewers.png b/rhodecode/public/images/ee_features/default_reviewers.png
new file mode 100644
index 0000000000000000000000000000000000000000..f80db8ac2a5655b01a8a1f9651521bcec5b28288
GIT binary patch
literal 122022
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
F^k2uH&i()Z

literal 0
HcmV?d00001

diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js
index f9b37348..21dcd24d 100644
--- a/rhodecode/public/js/rhodecode/routes.js
+++ b/rhodecode/public/js/rhodecode/routes.js
@@ -99,6 +99,7 @@ function registerRCRoutes() {
     pyroutes.register('goto_switcher_data', '/_goto_data', []);
     pyroutes.register('edit_repo', '/%(repo_name)s/settings', ['repo_name']);
     pyroutes.register('edit_repo_caches', '/%(repo_name)s/settings/caches', ['repo_name']);
+    pyroutes.register('repo_reviewers', '/%(repo_name)s/settings/review/rules', ['repo_name']);
     pyroutes.register('repo_maintenance', '/%(repo_name)s/maintenance', ['repo_name']);
     pyroutes.register('repo_maintenance_execute', '/%(repo_name)s/maintenance/execute', ['repo_name']);
     pyroutes.register('strip', '/%(repo_name)s/strip', ['repo_name']);
diff --git a/rhodecode/templates/admin/repos/repo_edit.mako b/rhodecode/templates/admin/repos/repo_edit.mako
index 5b41ed65..9b35235c 100644
--- a/rhodecode/templates/admin/repos/repo_edit.mako
+++ b/rhodecode/templates/admin/repos/repo_edit.mako
@@ -36,7 +36,6 @@
   </div>
 
   <div class="sidebar-col-wrapper scw-small">
-    ##main
     <div class="sidebar">
         <ul class="nav nav-pills nav-stacked">
           <li class="${'active' if c.active=='settings' else ''}">
@@ -71,28 +70,18 @@
           <li class="${'active' if c.active=='integrations' else ''}">
               <a href="${h.route_path('repo_integrations_home', repo_name=c.repo_name)}">${_('Integrations')}</a>
           </li>
+          %if c.repo_info.repo_type != 'svn':
+          <li class="${'active' if c.active=='reviewers' else ''}">
+              <a href="${h.route_path('repo_reviewers', repo_name=c.repo_name)}">${_('Reviewer Rules')}</a>
+          </li>
+          %endif
           <li class="${'active' if c.active=='maintenance' else ''}">
               <a href="${h.route_path('repo_maintenance', repo_name=c.repo_name)}">${_('Maintenance')}</a>
           </li>
           <li class="${'active' if c.active=='strip' else ''}">
               <a href="${h.route_path('strip', repo_name=c.repo_name)}">${_('Strip')}</a>
           </li>
-          ## TODO: dan: replace repo navigation with navlist registry like with
-          ## admin menu. First must find way to allow runtime configuration
-          ## it to account for the c.repo_info.repo_type != 'svn' call above
-          <%
-          reviewer_settings = False
-          try:
-            import rc_reviewers
-            reviewer_settings = True
-          except ImportError:
-            pass
-          %>
-          %if reviewer_settings:
-          <li class="${'active' if c.active=='reviewers' else ''}">
-              <a href="${h.route_path('repo_reviewers_home', repo_name=c.repo_name)}">${_('Reviewers')}</a>
-          </li>
-          %endif
+
         </ul>
     </div>
 
diff --git a/rhodecode/templates/admin/repos/repo_edit_reviewers.mako b/rhodecode/templates/admin/repos/repo_edit_reviewers.mako
new file mode 100644
index 00000000..e62fb458
--- /dev/null
+++ b/rhodecode/templates/admin/repos/repo_edit_reviewers.mako
@@ -0,0 +1,9 @@
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">${_('Default Reviewer Rules')}</h3>
+    </div>
+    <div class="panel-body">
+        <h4>${_('This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license.').format(sales_email='<a href="mailto:sales@rhodecode.com">sales@rhodecode.com</a>')|n}</h4>
+        <img style="width: 100%; height: 100%" src="${h.asset('images/ee_features/default_reviewers.png')}"/>
+    </div>
+</div>

From 25732899d20d381db8ebb7a5fdc6900d6ee6c561 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 2 May 2017 23:00:09 +0200
Subject: [PATCH 089/211] docs: added large header support for Apache

---
 docs/admin/apache-conf-example.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/admin/apache-conf-example.rst b/docs/admin/apache-conf-example.rst
index 86408ff2..0aa39d04 100644
--- a/docs/admin/apache-conf-example.rst
+++ b/docs/admin/apache-conf-example.rst
@@ -62,6 +62,9 @@ Below config if for an Apache Reverse Proxy configuration.
         ProxyPass / http://127.0.0.1:10002/ timeout=7200 Keepalive=On
         ProxyPassReverse / http://127.0.0.1:10002/
 
+        # Increase headers for large Mercurial headers
+        LimitRequestLine 16380
+
         # strict http prevents from https -> http downgrade
         Header always set Strict-Transport-Security "max-age=63072000; includeSubdomains; preload"
 

From 9d45467ca38974397da8f723f3e6b39a0b4e1ec4 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 3 May 2017 18:28:54 +0200
Subject: [PATCH 090/211] emails: make bad headers error show what headers we
 investigated.

- makes debugging easier.
---
 rhodecode/lib/rcmail/message.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/rhodecode/lib/rcmail/message.py b/rhodecode/lib/rcmail/message.py
index 0684f7cb..62b5fbdb 100644
--- a/rhodecode/lib/rcmail/message.py
+++ b/rhodecode/lib/rcmail/message.py
@@ -114,14 +114,18 @@ class Message(object):
 
         return response
 
+    def _get_headers(self):
+        headers = [self.subject, self.sender]
+        headers += list(self.send_to)
+        headers += self.extra_headers.values()
+        return headers
+
     def is_bad_headers(self):
         """
         Checks for bad headers i.e. newlines in subject, sender or recipients.
         """
 
-        headers = [self.subject, self.sender]
-        headers += list(self.send_to)
-        headers += self.extra_headers.values()
+        headers = self._get_headers()
 
         for val in headers:
             for c in '\r\n':
@@ -144,7 +148,8 @@ class Message(object):
             raise InvalidMessage("No sender address has been set")
 
         if self.is_bad_headers():
-            raise BadHeaders
+            headers = self._get_headers()
+            raise BadHeaders(headers)
 
     def add_recipient(self, recipient):
         """

From 37094cb9b3acc056ab404305410f5d37d631ba79 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 3 May 2017 18:44:10 +0200
Subject: [PATCH 091/211] emails: fixed newlines in email templates that can
 break email sending code.

---
 rhodecode/model/notification.py               |  5 ++
 .../email_templates/commit_comment.mako       |  2 +-
 .../templates/email_templates/email_test.mako |  2 +-
 rhodecode/templates/email_templates/main.mako |  2 +-
 .../email_templates/password_reset.mako       |  2 +-
 .../password_reset_confirmation.mako          |  2 +-
 .../email_templates/pull_request_comment.mako |  2 +-
 .../email_templates/pull_request_review.mako  |  2 +-
 rhodecode/templates/email_templates/test.mako |  2 +-
 .../email_templates/user_registration.mako    |  2 +-
 rhodecode/tests/lib/test_mako_emails.py       | 55 +++++++++++++++++++
 11 files changed, 69 insertions(+), 9 deletions(-)

diff --git a/rhodecode/model/notification.py b/rhodecode/model/notification.py
index c3af7125..0872f59f 100644
--- a/rhodecode/model/notification.py
+++ b/rhodecode/model/notification.py
@@ -332,14 +332,19 @@ class EmailNotificationModel(BaseModel):
 
         :param kwargs:
         """
+
         kwargs['rhodecode_instance_name'] = self.rhodecode_instance_name
 
         _kwargs = {
             'instance_url': h.url('home', qualified=True),
+            'whitespace_filter': self.whitespace_filter
         }
         _kwargs.update(kwargs)
         return _kwargs
 
+    def whitespace_filter(self, text):
+        return text.replace('\n', '').replace('\t', '')
+
     def get_renderer(self, type_):
         template_name = self.email_types[type_]
         return PartialRenderer(template_name)
diff --git a/rhodecode/templates/email_templates/commit_comment.mako b/rhodecode/templates/email_templates/commit_comment.mako
index a9f6a9fa..92832af8 100644
--- a/rhodecode/templates/email_templates/commit_comment.mako
+++ b/rhodecode/templates/email_templates/commit_comment.mako
@@ -3,7 +3,7 @@
 <%namespace name="base" file="base.mako"/>
 
 ## EMAIL SUBJECT
-<%def name="subject()" filter="n,trim">
+<%def name="subject()" filter="n,trim,whitespace_filter">
 <%
 data = {
     'user': h.person(user),
diff --git a/rhodecode/templates/email_templates/email_test.mako b/rhodecode/templates/email_templates/email_test.mako
index cde58508..25865eb9 100644
--- a/rhodecode/templates/email_templates/email_test.mako
+++ b/rhodecode/templates/email_templates/email_test.mako
@@ -1,7 +1,7 @@
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 
-<%def name="subject()" filter="n,trim">
+<%def name="subject()" filter="n,trim,whitespace_filter">
 RhodeCode test email: ${h.format_date(date)}
 </%def>
 
diff --git a/rhodecode/templates/email_templates/main.mako b/rhodecode/templates/email_templates/main.mako
index 71bf68ea..90f2a3db 100644
--- a/rhodecode/templates/email_templates/main.mako
+++ b/rhodecode/templates/email_templates/main.mako
@@ -1,7 +1,7 @@
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 
-<%def name="subject()" filter="n,trim">
+<%def name="subject()" filter="n,trim,whitespace_filter">
 </%def>
 
 
diff --git a/rhodecode/templates/email_templates/password_reset.mako b/rhodecode/templates/email_templates/password_reset.mako
index e39d7f14..7b69ba6e 100644
--- a/rhodecode/templates/email_templates/password_reset.mako
+++ b/rhodecode/templates/email_templates/password_reset.mako
@@ -1,7 +1,7 @@
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 
-<%def name="subject()" filter="n,trim">
+<%def name="subject()" filter="n,trim,whitespace_filter">
 RhodeCode Password reset
 </%def>
 
diff --git a/rhodecode/templates/email_templates/password_reset_confirmation.mako b/rhodecode/templates/email_templates/password_reset_confirmation.mako
index 5c59c3b9..e5421235 100644
--- a/rhodecode/templates/email_templates/password_reset_confirmation.mako
+++ b/rhodecode/templates/email_templates/password_reset_confirmation.mako
@@ -1,7 +1,7 @@
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 
-<%def name="subject()" filter="n,trim">
+<%def name="subject()" filter="n,trim,whitespace_filter">
 Your new RhodeCode password
 </%def>
 
diff --git a/rhodecode/templates/email_templates/pull_request_comment.mako b/rhodecode/templates/email_templates/pull_request_comment.mako
index ef11e96c..519fe158 100644
--- a/rhodecode/templates/email_templates/pull_request_comment.mako
+++ b/rhodecode/templates/email_templates/pull_request_comment.mako
@@ -3,7 +3,7 @@
 <%namespace name="base" file="base.mako"/>
 
 ## EMAIL SUBJECT
-<%def name="subject()" filter="n,trim">
+<%def name="subject()" filter="n,trim,whitespace_filter">
 <%
 data = {
     'user': h.person(user),
diff --git a/rhodecode/templates/email_templates/pull_request_review.mako b/rhodecode/templates/email_templates/pull_request_review.mako
index 07a93af3..cd36bb71 100644
--- a/rhodecode/templates/email_templates/pull_request_review.mako
+++ b/rhodecode/templates/email_templates/pull_request_review.mako
@@ -2,7 +2,7 @@
 <%inherit file="base.mako"/>
 <%namespace name="base" file="base.mako"/>
 
-<%def name="subject()" filter="n,trim">
+<%def name="subject()" filter="n,trim,whitespace_filter">
 <%
 data = {
     'user': h.person(user),
diff --git a/rhodecode/templates/email_templates/test.mako b/rhodecode/templates/email_templates/test.mako
index d4be33f8..e3b6fe05 100644
--- a/rhodecode/templates/email_templates/test.mako
+++ b/rhodecode/templates/email_templates/test.mako
@@ -1,7 +1,7 @@
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 
-<%def name="subject()" filter="n,trim">
+<%def name="subject()" filter="n,trim,whitespace_filter">
 Test "Subject" ${_('hello "world"')|n}
 </%def>
 
diff --git a/rhodecode/templates/email_templates/user_registration.mako b/rhodecode/templates/email_templates/user_registration.mako
index 1ce5784a..13a38e79 100644
--- a/rhodecode/templates/email_templates/user_registration.mako
+++ b/rhodecode/templates/email_templates/user_registration.mako
@@ -1,7 +1,7 @@
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 
-<%def name="subject()" filter="n,trim">
+<%def name="subject()" filter="n,trim,whitespace_filter">
 RhodeCode new user registration: ${user.username}
 </%def>
 
diff --git a/rhodecode/tests/lib/test_mako_emails.py b/rhodecode/tests/lib/test_mako_emails.py
index 511c0e84..edb29e89 100644
--- a/rhodecode/tests/lib/test_mako_emails.py
+++ b/rhodecode/tests/lib/test_mako_emails.py
@@ -3,6 +3,7 @@ import collections
 import pytest
 
 from rhodecode.lib.utils import PartialRenderer
+from rhodecode.lib.utils2 import AttributeDict
 from rhodecode.model.notification import EmailNotificationModel
 
 
@@ -66,3 +67,57 @@ def test_render_pr_email(pylonsapp, user_admin):
 
     # subject
     assert subject == 'Marcin Kuzminski wants you to review 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(pylonsapp, mention, email_type):
+    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')
+
+    source_repo = target_repo = collections.namedtuple('Repo',
+        'type, repo_name')(
+        'hg', 'pull_request_1')
+
+    kwargs = {
+        'user': '<marcin@rhodecode.com> Marcin Kuzminski',
+        'commit': AttributeDict(raw_id='a'*40, message='Commit message'),
+        'status_change': 'approved',
+        'commit_target_repo': AttributeDict(),
+        'repo_name': 'test-repo',
+        'comment_file': 'test-file.py',
+        'comment_line': 'n100',
+        'comment_type': 'note',
+        'commit_comment_url': 'http://comment-url',
+        'instance_url': 'http://rc-instance',
+        'comment_body': 'hello world',
+        'mention': mention,
+
+        'pr_comment_url': 'http://comment-url',
+        'pr_source_repo': AttributeDict(repo_name='foobar'),
+        'pr_source_repo_url': 'http://soirce-repo/url',
+        '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',
+    }
+    subject, headers, body, body_plaintext = EmailNotificationModel().render_email(
+        email_type, **kwargs)
+
+    assert '\n' not in subject

From c19a9fc11a5d281156bd416ed73419516c5f304e Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 4 May 2017 12:30:42 +0200
Subject: [PATCH 092/211] system-info: expose the common certificate file path.

---
 rhodecode/apps/admin/views/system_info.py | 1 +
 rhodecode/lib/system_info.py              | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/rhodecode/apps/admin/views/system_info.py b/rhodecode/apps/admin/views/system_info.py
index 6e8d82d7..ee9e93d2 100644
--- a/rhodecode/apps/admin/views/system_info.py
+++ b/rhodecode/apps/admin/views/system_info.py
@@ -106,6 +106,7 @@ class AdminSystemInfoSettingsView(BaseAppView):
             (_('RhodeCode Server IP'), val('server')['server_ip'], state('server')),
             (_('RhodeCode Server ID'), val('server')['server_id'], state('server')),
             (_('RhodeCode Configuration'), val('rhodecode_config')['path'], state('rhodecode_config')),
+            (_('RhodeCode Certificate'), val('rhodecode_config')['cert_path'], state('rhodecode_config')),
             (_('Workers'), val('rhodecode_config')['config']['server:main'].get('workers', '?'), state('rhodecode_config')),
             (_('Worker Type'), val('rhodecode_config')['config']['server:main'].get('worker_class', 'sync'), state('rhodecode_config')),
             ('', '', ''),  # spacer
diff --git a/rhodecode/lib/system_info.py b/rhodecode/lib/system_info.py
index 5a75aed4..e8e39bb8 100644
--- a/rhodecode/lib/system_info.py
+++ b/rhodecode/lib/system_info.py
@@ -570,6 +570,10 @@ def rhodecode_config():
         log.exception('Failed to read .ini file for display')
         parsed_ini = {}
 
+    cert_path = os.path.join(
+        os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(path)))),
+        '.rccontrol-profile/etc/ca-bundle.crt')
+
     rhodecode_ini_safe['server:main'] = parsed_ini
 
     blacklist = [
@@ -608,7 +612,8 @@ def rhodecode_config():
             rhodecode_ini_safe.pop(k, None)
 
     # TODO: maybe put some CONFIG checks here ?
-    return SysInfoRes(value={'config': rhodecode_ini_safe, 'path': path})
+    return SysInfoRes(value={'config': rhodecode_ini_safe,
+                             'path': path, 'cert_path': cert_path})
 
 
 def database_info():

From 40894ec11eda73b0af9860b72cd16f86ae10baf8 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 4 May 2017 14:14:43 +0200
Subject: [PATCH 093/211] markdown: fixed hr styling, and strong style.

---
 rhodecode/public/css/legacy_code_styles.less | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/rhodecode/public/css/legacy_code_styles.less b/rhodecode/public/css/legacy_code_styles.less
index ac829233..e4f092c6 100644
--- a/rhodecode/public/css/legacy_code_styles.less
+++ b/rhodecode/public/css/legacy_code_styles.less
@@ -165,6 +165,7 @@ div.markdown-block h6 {
 div.markdown-block hr {
     border: 0;
     color: #e6e5e5;
+    background-color: #e6e5e5;
     height: 3px;
     margin-bottom: 13px;
 }
@@ -200,6 +201,12 @@ div.markdown-block img {
   background-color: #fff;
 }
 
+
+div.markdown-block strong {
+  font-weight: 600;
+  margin: 0;
+}
+
 div.markdown-block ul,
 div.markdown-block ol {
     padding-left: 30px !important;

From ba05fdf087161e283ddc3ac630df55212fc96074 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 4 May 2017 14:15:30 +0200
Subject: [PATCH 094/211] summary: disconnect readme rendering data from the
 comments.

- this prevents the rendering artifacts specific for the comments.
---
 rhodecode/public/css/main.less           |   1 +
 rhodecode/public/css/readme-box.less     | 252 +++++++++++++++++++++++
 rhodecode/templates/summary/summary.mako |   2 +-
 3 files changed, 254 insertions(+), 1 deletion(-)
 create mode 100644 rhodecode/public/css/readme-box.less

diff --git a/rhodecode/public/css/main.less b/rhodecode/public/css/main.less
index 8c467a83..163597bc 100644
--- a/rhodecode/public/css/main.less
+++ b/rhodecode/public/css/main.less
@@ -11,6 +11,7 @@
 @import 'form-bootstrap';
 @import 'codemirror';
 @import 'legacy_code_styles';
+@import 'readme-box';
 @import 'progress-bar';
 
 @import 'type';
diff --git a/rhodecode/public/css/readme-box.less b/rhodecode/public/css/readme-box.less
new file mode 100644
index 00000000..e4928fc2
--- /dev/null
+++ b/rhodecode/public/css/readme-box.less
@@ -0,0 +1,252 @@
+/** README styling **/
+div.readme_box {
+    clear: both;
+    overflow: hidden;
+    margin: 0;
+    padding: 3px 15px 3px;
+}
+
+div.readme_box h1,
+div.readme_box h2,
+div.readme_box h3,
+div.readme_box h4,
+div.readme_box h5,
+div.readme_box h6 {
+    border-bottom: none !important;
+    padding: 0 !important;
+    overflow: visible !important;
+}
+
+div.readme_box h1 {
+    font-size: 32px;
+    margin: 15px 0 15px 0 !important;
+    padding-bottom: 5px !important;
+}
+
+div.readme_box h2 {
+    font-size: 24px !important;
+    margin: 34px 0 10px 0 !important;
+    border-top: 3px #e6e5e5 solid !important;
+    padding-top: 15px !important;
+    padding-bottom: 8px !important;
+}
+
+div.readme_box h3 {
+    font-size: 18px !important;
+    margin: 30px 0 8px 0 !important;
+    padding-bottom: 2px !important;
+}
+
+div.readme_box h4 {
+    font-size: 13px !important;
+    margin: 18px 0 3px 0 !important;
+}
+
+div.readme_box h5 {
+    font-size: 12px !important;
+    margin: 15px 0 3px 0 !important;
+}
+
+div.readme_box h6 {
+    font-size: 12px;
+    color: #777777;
+    margin: 15px 0 3px 0 !important;
+}
+
+div.readme_box hr {
+    border: 0;
+    color: #e6e5e5;
+    background-color: #e6e5e5;
+    height: 3px;
+    margin-bottom: 13px;
+}
+
+div.readme_box ol,
+div.readme_box ul,
+div.readme_box p,
+div.readme_box blockquote,
+div.readme_box dl,
+div.readme_box li,
+div.readme_box table {
+    margin: 3px 0px 13px 0px !important;
+    color: #424242 !important;
+    font-size: 13px !important;
+    font-family: "Helvetica" !important;
+    font-weight: normal  !important;
+    overflow: visible !important;
+    line-height: 140% !important;
+}
+
+div.readme_box pre {
+  margin: 3px 0px 13px 0px !important;
+  padding: .5em;
+  color: #424242 !important;
+  font-size: 13px !important;
+  overflow: visible !important;
+  line-height: 140% !important;
+  background-color: @grey7;
+}
+
+div.readme_box img {
+  border-style: none;
+  background-color: #fff;
+}
+
+
+div.readme_box strong {
+  font-weight: 600;
+  margin: 0;
+}
+
+div.readme_box ul,
+div.readme_box ol {
+    padding-left: 30px !important;
+    margin-top: 0px !important;
+    margin-bottom: 18px !important;
+}
+
+div.readme_box ul li,
+div.readme_box ol li {
+    list-style: bullet !important;
+    margin: 6px !important;
+    padding: 0 !important;
+}
+
+div.readme_box ol li {
+    list-style: decimal !important;
+}
+
+/*
+div.readme_box a,
+div.readme_box a:visited {
+    color: #4183C4 !important;
+    background-color: inherit;
+    text-decoration: none;
+}
+*/
+
+
+div.readme_box button {
+    font-size: @basefontsize;
+    padding: 4px 6px;
+    .border-radius(@border-radius);
+    border: @border-thickness solid @grey5;
+    background-color: @grey6;
+}
+
+div.readme_box code,
+div.readme_box pre {
+    font-family: Monaco;
+    font-size: 11px;
+    .border-radius(@border-radius);
+    background-color: white;
+    color: @grey3;
+}
+
+
+div.readme_box code {
+    border: @border-thickness solid @grey6;
+    margin: 0 2px;
+    padding: 0 5px;
+}
+
+div.readme_box pre {
+    border: @border-thickness solid @grey5;
+    overflow: auto;
+    padding: .5em;
+    background-color: @grey7;
+}
+
+div.readme_box pre > code {
+    border: 0;
+    margin: 0;
+    padding: 0;
+}
+
+/** RST STYLE **/
+div.rst-block {
+    clear: both;
+    overflow: hidden;
+    margin: 0;
+    padding: 3px 15px 3px;
+}
+
+div.rst-block h2 {
+    font-weight: normal;
+}
+
+div.rst-block  h1,
+div.rst-block  h2,
+div.rst-block  h3,
+div.rst-block  h4,
+div.rst-block  h5,
+div.rst-block  h6 {
+    border-bottom: 0 !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    line-height: 1.5em !important;
+}
+
+
+div.rst-block  h1:first-child {
+    padding-top: .25em !important;
+}
+
+div.rst-block  h2,
+div.rst-block  h3 {
+    margin: 1em 0 !important;
+}
+
+div.rst-block  h2 {
+    margin-top: 1.5em !important;
+    border-top: 4px solid #e0e0e0 !important;
+    padding-top: .5em !important;
+}
+
+div.rst-block  p {
+    color: black !important;
+    margin: 1em 0 !important;
+    line-height: 1.5em !important;
+}
+
+div.rst-block  ul {
+    list-style: disc !important;
+    margin: 1em 0 1em 2em !important;
+    clear: both;
+}
+
+div.rst-block  ol {
+    list-style: decimal;
+    margin: 1em 0 1em 2em !important;
+}
+
+div.rst-block pre,
+div.rst-block code {
+    font: 12px "Bitstream Vera Sans Mono","Courier",monospace;
+}
+
+div.rst-block code {
+    font-size: 12px !important;
+    background-color: ghostWhite !important;
+    color: #444 !important;
+    padding: 0 .2em !important;
+    border: 1px solid #dedede !important;
+}
+
+div.rst-block pre code {
+    padding: 0 !important;
+    font-size: 12px !important;
+    background-color: #eee !important;
+    border: none !important;
+}
+
+div.rst-block pre {
+    margin: 1em 0;
+    padding: @padding;
+    border: 1px solid @grey6;
+    .border-radius(@border-radius);
+    overflow: auto;
+    font-size: 12px;
+    color: #444;
+    background-color: @grey7;
+}
\ No newline at end of file
diff --git a/rhodecode/templates/summary/summary.mako b/rhodecode/templates/summary/summary.mako
index 63c80712..2cbc4938 100644
--- a/rhodecode/templates/summary/summary.mako
+++ b/rhodecode/templates/summary/summary.mako
@@ -50,7 +50,7 @@
         </h3>
     </div>
     <div class="readme codeblock">
-      <div class="readme_box markdown-block">
+      <div class="readme_box">
         ${c.readme_data|n}
       </div>
     </div>

From 5eb051d03c6e9b58ad2bb909572ed26aeee71c1a Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 4 May 2017 14:18:46 +0200
Subject: [PATCH 095/211] markdown: reduce margin for list elements.

---
 rhodecode/public/css/legacy_code_styles.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rhodecode/public/css/legacy_code_styles.less b/rhodecode/public/css/legacy_code_styles.less
index e4f092c6..b31603bb 100644
--- a/rhodecode/public/css/legacy_code_styles.less
+++ b/rhodecode/public/css/legacy_code_styles.less
@@ -217,7 +217,7 @@ div.markdown-block ol {
 div.markdown-block ul li,
 div.markdown-block ol li {
     list-style: disc !important;
-    margin: 13px !important;
+    margin: 6px !important;
     padding: 0 !important;
 }
 

From 5c4d0f0819844b19c9c1226a732d519971e9f891 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 5 May 2017 14:01:12 +0200
Subject: [PATCH 096/211] repo-settings: show owner info even if this user
 doesn't have an email.

---
 rhodecode/templates/admin/repos/repo_edit_settings.mako | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rhodecode/templates/admin/repos/repo_edit_settings.mako b/rhodecode/templates/admin/repos/repo_edit_settings.mako
index 73adf9e6..7ad8033b 100644
--- a/rhodecode/templates/admin/repos/repo_edit_settings.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_settings.mako
@@ -111,7 +111,7 @@
                 <div class="input">
                     <div class="badge-input-container">
                         <div class="user-badge">
-                            ${base.gravatar_with_user(c.rhodecode_db_repo.user.email, show_disabled=not c.rhodecode_db_repo.user.active)}
+                            ${base.gravatar_with_user(c.rhodecode_db_repo.user.email or c.rhodecode_db_repo.user.username, show_disabled=not c.rhodecode_db_repo.user.active)}
                         </div>
                         <div class="badge-input-wrap">
                             ${c.form['repo_owner'].render(css_class='medium', oid='repo_owner')|n}

From 17a42739e836c1ee2dd26d6b406c7dc8838471ba Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 5 May 2017 16:04:16 +0200
Subject: [PATCH 097/211] repo-permissions: moved permissions into pyramid.

- fix issues when added new perms changed those already in the form
- fixed issue with default user overriding permissions when private repos where turned on.
- Two above are not security issues, but rather making the behaviour more consistent.
---
 rhodecode/apps/repository/__init__.py         |  5 +
 .../repository/tests/test_repo_settings.py    |  5 +-
 .../apps/repository/views/repo_permissions.py | 98 +++++++++++++++++++
 rhodecode/config/routing.py                   | 10 --
 rhodecode/controllers/admin/repos.py          | 27 -----
 rhodecode/lib/audit_logger.py                 |  1 +
 rhodecode/model/repo.py                       | 30 +++---
 rhodecode/model/validators.py                 | 41 +++++---
 rhodecode/public/js/rhodecode/routes.js       |  2 +-
 .../templates/admin/repos/repo_edit.mako      |  2 +-
 .../admin/repos/repo_edit_permissions.mako    | 21 ++--
 rhodecode/templates/base/perms_summary.mako   |  2 +-
 12 files changed, 165 insertions(+), 79 deletions(-)
 create mode 100644 rhodecode/apps/repository/views/repo_permissions.py

diff --git a/rhodecode/apps/repository/__init__.py b/rhodecode/apps/repository/__init__.py
index 104b56d7..a2eb23d4 100644
--- a/rhodecode/apps/repository/__init__.py
+++ b/rhodecode/apps/repository/__init__.py
@@ -31,6 +31,11 @@ def includeme(config):
         name='edit_repo_caches',
         pattern='/{repo_name:.*?[^/]}/settings/caches', repo_route=True)
 
+    # Permissions
+    config.add_route(
+        name='edit_repo_perms',
+        pattern='/{repo_name:.*?[^/]}/settings/permissions', repo_route=True)
+
     # Repo Review Rules
     config.add_route(
         name='repo_reviewers',
diff --git a/rhodecode/apps/repository/tests/test_repo_settings.py b/rhodecode/apps/repository/tests/test_repo_settings.py
index e5820f2b..865f990a 100644
--- a/rhodecode/apps/repository/tests/test_repo_settings.py
+++ b/rhodecode/apps/repository/tests/test_repo_settings.py
@@ -39,6 +39,7 @@ def route_path(name, params=None, **kwargs):
     base_url = {
         'edit_repo': '/{repo_name}/settings',
         'edit_repo_caches': '/{repo_name}/settings/caches',
+        'edit_repo_perms': '/{repo_name}/settings/permissions',
     }[name].format(**kwargs)
 
     if params:
@@ -59,7 +60,8 @@ def _get_permission_for_user(user, repo):
 class TestAdminRepoSettings(object):
     @pytest.mark.parametrize('urlname', [
         'edit_repo',
-        'edit_repo_caches'
+        'edit_repo_caches',
+        'edit_repo_perms',
     ])
     def test_show_page(self, urlname, app, backend):
         app.get(route_path(urlname, repo_name=backend.repo_name), status=200)
@@ -72,7 +74,6 @@ class TestAdminRepoSettings(object):
             self.app.get(route_path('edit_repo', repo_name=backend_hg.repo_name))
 
     @pytest.mark.parametrize('urlname', [
-        'edit_repo_perms',
         'edit_repo_advanced',
         'repo_vcs_settings',
         'edit_repo_fields',
diff --git a/rhodecode/apps/repository/views/repo_permissions.py b/rhodecode/apps/repository/views/repo_permissions.py
new file mode 100644
index 00000000..671e2cf5
--- /dev/null
+++ b/rhodecode/apps/repository/views/repo_permissions.py
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2011-2017 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 deform
+from pyramid.httpexceptions import HTTPFound
+from pyramid.view import view_config
+
+from rhodecode.apps._base import RepoAppView
+from rhodecode.forms import RcForm
+from rhodecode.lib import helpers as h
+from rhodecode.lib import audit_logger
+from rhodecode.lib.auth import (
+    LoginRequired, HasRepoPermissionAnyDecorator,
+    HasRepoPermissionAllDecorator, CSRFRequired)
+from rhodecode.model.db import RepositoryField, RepoGroup
+from rhodecode.model.forms import RepoPermsForm
+from rhodecode.model.meta import Session
+from rhodecode.model.repo import RepoModel
+from rhodecode.model.scm import RepoGroupList, ScmModel
+from rhodecode.model.validation_schema.schemas import repo_schema
+
+log = logging.getLogger(__name__)
+
+
+class RepoSettingsPermissionsView(RepoAppView):
+
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+
+        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
+        c.repo_info = self.db_repo
+
+        self._register_global_c(c)
+        return c
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.admin')
+    @view_config(
+        route_name='edit_repo_perms', request_method='GET',
+        renderer='rhodecode:templates/admin/repos/repo_edit.mako')
+    def edit_permissions(self):
+        c = self.load_default_context()
+        c.active = 'permissions'
+        return self._get_template_context(c)
+
+    @LoginRequired()
+    @HasRepoPermissionAllDecorator('repository.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='edit_repo_perms', request_method='POST',
+        renderer='rhodecode:templates/admin/repos/repo_edit.mako')
+    def edit_permissions_update(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+        c.active = 'permissions'
+        data = self.request.POST
+        # store private flag outside of HTML to verify if we can modify
+        # default user permissions, prevents submition of FAKE post data
+        # into the form for private repos
+        data['repo_private'] = self.db_repo.private
+        form = RepoPermsForm()().to_python(data)
+        changes = RepoModel().update_permissions(
+            self.db_repo_name, form['perm_additions'], form['perm_updates'],
+            form['perm_deletions'])
+
+        action_data = {
+            'added': changes['added'],
+            'updated': changes['updated'],
+            'deleted': changes['deleted'],
+        }
+        audit_logger.store(
+            'repo.edit.permissions', action_data=action_data,
+            user=self._rhodecode_user, repo=self.db_repo)
+
+        Session().commit()
+        h.flash(_('Repository permissions updated'), category='success')
+
+        raise HTTPFound(
+            self.request.route_path('edit_repo_perms', repo_name=self.db_repo_name))
diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py
index 802ec9e2..a7f5ad35 100644
--- a/rhodecode/config/routing.py
+++ b/rhodecode/config/routing.py
@@ -661,16 +661,6 @@ def make_map(config):
                  requirements=URL_NAME_REQUIREMENTS)
 
     # repo edit options
-    rmap.connect('edit_repo_perms', '/{repo_name}/settings/permissions',
-                 jsroute=True,
-                 controller='admin/repos', action='edit_permissions',
-                 conditions={'method': ['GET'], 'function': check_repo},
-                 requirements=URL_NAME_REQUIREMENTS)
-    rmap.connect('edit_repo_perms_update', '/{repo_name}/settings/permissions',
-                 controller='admin/repos', action='edit_permissions_update',
-                 conditions={'method': ['PUT'], 'function': check_repo},
-                 requirements=URL_NAME_REQUIREMENTS)
-
     rmap.connect('edit_repo_fields', '/{repo_name}/settings/fields',
                  controller='admin/repos', action='edit_fields',
                  conditions={'method': ['GET'], 'function': check_repo},
diff --git a/rhodecode/controllers/admin/repos.py b/rhodecode/controllers/admin/repos.py
index e03d5138..dd8998c3 100644
--- a/rhodecode/controllers/admin/repos.py
+++ b/rhodecode/controllers/admin/repos.py
@@ -338,33 +338,6 @@ class ReposController(BaseRepoController):
         """GET /repos/repo_name: Show a specific item"""
         # url('repo', repo_name=ID)
 
-    @HasRepoPermissionAllDecorator('repository.admin')
-    def edit_permissions(self, repo_name):
-        """GET /repo_name/settings: Form to edit an existing item"""
-        c.repo_info = self._load_repo(repo_name)
-        c.active = 'permissions'
-        defaults = RepoModel()._get_defaults(repo_name)
-
-        return htmlfill.render(
-            render('admin/repos/repo_edit.mako'),
-            defaults=defaults,
-            encoding="UTF-8",
-            force_defaults=False)
-
-    @HasRepoPermissionAllDecorator('repository.admin')
-    @auth.CSRFRequired()
-    def edit_permissions_update(self, repo_name):
-        form = RepoPermsForm()().to_python(request.POST)
-        RepoModel().update_permissions(repo_name,
-            form['perm_additions'], form['perm_updates'], form['perm_deletions'])
-
-        #TODO: implement this
-        #action_logger(c.rhodecode_user, 'admin_changed_repo_permissions',
-        #              repo_name, self.ip_addr, self.sa)
-        Session().commit()
-        h.flash(_('Repository permissions updated'), category='success')
-        return redirect(url('edit_repo_perms', repo_name=repo_name))
-
     @HasRepoPermissionAllDecorator('repository.admin')
     def edit_fields(self, repo_name):
         """GET /repo_name/settings: Form to edit an existing item"""
diff --git a/rhodecode/lib/audit_logger.py b/rhodecode/lib/audit_logger.py
index 08771da8..282fcd4f 100644
--- a/rhodecode/lib/audit_logger.py
+++ b/rhodecode/lib/audit_logger.py
@@ -36,6 +36,7 @@ ACTIONS = {
 
     'repo.add': {},
     'repo.edit': {},
+    'repo.edit.permissions': {},
     'repo.commit.strip': {}
 }
 
diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py
index b9292499..3739be7b 100644
--- a/rhodecode/model/repo.py
+++ b/rhodecode/model/repo.py
@@ -259,7 +259,7 @@ class RepoModel(BaseModel):
         defaults = repo_info.get_dict()
         defaults['repo_name'] = repo_info.just_name
 
-        groups  = repo_info.groups_with_parents
+        groups = repo_info.groups_with_parents
         parent_group = groups[-1] if groups else None
 
         # we use -1 as this is how in HTML, we mark an empty group
@@ -295,16 +295,6 @@ class RepoModel(BaseModel):
             replacement_user = User.get_first_super_admin().username
             defaults.update({'user': replacement_user})
 
-        # fill repository users
-        for p in repo_info.repo_to_perm:
-            defaults.update({'u_perm_%s' % p.user.user_id:
-                            p.permission.permission_name})
-
-        # fill repository groups
-        for p in repo_info.users_group_to_perm:
-            defaults.update({'g_perm_%s' % p.users_group.users_group_id:
-                            p.permission.permission_name})
-
         return defaults
 
     def update(self, repo, **kwargs):
@@ -507,10 +497,16 @@ class RepoModel(BaseModel):
 
         req_perms = ('usergroup.read', 'usergroup.write', 'usergroup.admin')
 
+        changes = {
+            'added': [],
+            'updated': [],
+            'deleted': []
+        }
         # update permissions
         for member_id, perm, member_type in perm_updates:
             member_id = int(member_id)
             if member_type == 'user':
+                member_name = User.get(member_id).username
                 # this updates also current one if found
                 self.grant_user_permission(
                     repo=repo, user=member_id, perm=perm)
@@ -522,10 +518,14 @@ class RepoModel(BaseModel):
                     self.grant_user_group_permission(
                         repo=repo, group_name=member_id, perm=perm)
 
+            changes['updated'].append({'type': member_type, 'id': member_id,
+                                       'name': member_name, 'new_perm': perm})
+
         # set new permissions
         for member_id, perm, member_type in perm_additions:
             member_id = int(member_id)
             if member_type == 'user':
+                member_name = User.get(member_id).username
                 self.grant_user_permission(
                     repo=repo, user=member_id, perm=perm)
             else:  # set for user group
@@ -535,11 +535,13 @@ class RepoModel(BaseModel):
                         *req_perms)(member_name, user=cur_user):
                     self.grant_user_group_permission(
                         repo=repo, group_name=member_id, perm=perm)
-
+            changes['added'].append({'type': member_type, 'id': member_id,
+                                     'name': member_name, 'new_perm': perm})
         # delete permissions
         for member_id, perm, member_type in perm_deletions:
             member_id = int(member_id)
             if member_type == 'user':
+                member_name = User.get(member_id).username
                 self.revoke_user_permission(repo=repo, user=member_id)
             else:  # set for user group
                 # check if we have permissions to alter this usergroup
@@ -549,6 +551,10 @@ class RepoModel(BaseModel):
                     self.revoke_user_group_permission(
                         repo=repo, group_name=member_id)
 
+            changes['deleted'].append({'type': member_type, 'id': member_id,
+                                       'name': member_name, 'new_perm': perm})
+        return changes
+
     def create_fork(self, form_data, cur_user):
         """
         Simple wrapper into executing celery task for fork creation
diff --git a/rhodecode/model/validators.py b/rhodecode/model/validators.py
index 412c0dad..9a5bce9b 100644
--- a/rhodecode/model/validators.py
+++ b/rhodecode/model/validators.py
@@ -784,7 +784,8 @@ def ValidPerms(type_='repo'):
                 del_member = perm_dict.get('id')
                 del_type = perm_dict.get('type')
                 if del_member and del_type:
-                    perm_deletions.add((del_member, None, del_type))
+                    perm_deletions.add(
+                        (del_member, None, del_type))
 
             # store additions in order of how they were added in web form
             for k in sorted(new_perms_group.keys()):
@@ -793,36 +794,48 @@ def ValidPerms(type_='repo'):
                 new_type = perm_dict.get('type')
                 new_perm = perm_dict.get('perm')
                 if new_member and new_perm and new_type:
-                    perm_additions.add((new_member, new_perm, new_type))
+                    perm_additions.add(
+                        (new_member, new_perm, new_type))
 
             # get updates of permissions
             # (read the existing radio button states)
+            default_user_id = User.get_default_user().user_id
             for k, update_value in value.iteritems():
                 if k.startswith('u_perm_') or k.startswith('g_perm_'):
                     member = k[7:]
                     update_type = {'u': 'user',
                                    'g': 'users_group'}[k[0]]
-                    if member == User.DEFAULT_USER:
-                        if str2bool(value.get('repo_private')):
-                            # set none for default when updating to
-                            # private repo protects agains form manipulation
-                            update_value = EMPTY_PERM
-                    perm_updates.add((member, update_value, update_type))
-            # check the deletes
 
-            value['perm_additions'] = list(perm_additions)
+                    if safe_int(member) == default_user_id:
+                        if str2bool(value.get('repo_private')):
+                            # prevent from updating default user permissions
+                            # when this repository is marked as private
+                            update_value = EMPTY_PERM
+
+                    perm_updates.add(
+                        (member, update_value, update_type))
+
+            value['perm_additions'] = []  # propagated later
             value['perm_updates'] = list(perm_updates)
             value['perm_deletions'] = list(perm_deletions)
 
-            # validate users they exist and they are active !
-            for member_id, _perm, member_type in perm_additions:
+            updates_map = dict(
+                (x[0], (x[1], x[2])) for x in value['perm_updates'])
+            # make sure Additions don't override updates.
+            for member_id, perm, member_type in list(perm_additions):
+                if member_id in updates_map:
+                    perm = updates_map[member_id][0]
+                value['perm_additions'].append((member_id, perm, member_type))
+
+                # on new entries validate users they exist and they are active !
+                # this leaves feedback to the form
                 try:
                     if member_type == 'user':
-                        self.user_db = User.query()\
+                        User.query()\
                             .filter(User.active == true())\
                             .filter(User.user_id == member_id).one()
                     if member_type == 'users_group':
-                        self.user_db = UserGroup.query()\
+                        UserGroup.query()\
                             .filter(UserGroup.users_group_active == true())\
                             .filter(UserGroup.users_group_id == member_id)\
                             .one()
diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js
index 21dcd24d..a0506a1a 100644
--- a/rhodecode/public/js/rhodecode/routes.js
+++ b/rhodecode/public/js/rhodecode/routes.js
@@ -24,7 +24,6 @@ function registerRCRoutes() {
     pyroutes.register('repo_refs_changelog_data', '/%(repo_name)s/refs-data-changelog', ['repo_name']);
     pyroutes.register('repo_default_reviewers_data', '/%(repo_name)s/default-reviewers', ['repo_name']);
     pyroutes.register('changeset_home', '/%(repo_name)s/changeset/%(revision)s', ['repo_name', 'revision']);
-    pyroutes.register('edit_repo_perms', '/%(repo_name)s/settings/permissions', ['repo_name']);
     pyroutes.register('changeset_comment', '/%(repo_name)s/changeset/%(revision)s/comment', ['repo_name', 'revision']);
     pyroutes.register('changeset_comment_preview', '/%(repo_name)s/changeset/comment/preview', ['repo_name']);
     pyroutes.register('changeset_comment_delete', '/%(repo_name)s/changeset/comment/%(comment_id)s/delete', ['repo_name', 'comment_id']);
@@ -99,6 +98,7 @@ function registerRCRoutes() {
     pyroutes.register('goto_switcher_data', '/_goto_data', []);
     pyroutes.register('edit_repo', '/%(repo_name)s/settings', ['repo_name']);
     pyroutes.register('edit_repo_caches', '/%(repo_name)s/settings/caches', ['repo_name']);
+    pyroutes.register('edit_repo_perms', '/%(repo_name)s/settings/permissions', ['repo_name']);
     pyroutes.register('repo_reviewers', '/%(repo_name)s/settings/review/rules', ['repo_name']);
     pyroutes.register('repo_maintenance', '/%(repo_name)s/maintenance', ['repo_name']);
     pyroutes.register('repo_maintenance_execute', '/%(repo_name)s/maintenance/execute', ['repo_name']);
diff --git a/rhodecode/templates/admin/repos/repo_edit.mako b/rhodecode/templates/admin/repos/repo_edit.mako
index 9b35235c..1a00f1ed 100644
--- a/rhodecode/templates/admin/repos/repo_edit.mako
+++ b/rhodecode/templates/admin/repos/repo_edit.mako
@@ -42,7 +42,7 @@
               <a href="${h.route_path('edit_repo', repo_name=c.repo_name)}">${_('Settings')}</a>
           </li>
           <li class="${'active' if c.active=='permissions' else ''}">
-              <a href="${h.url('edit_repo_perms', repo_name=c.repo_name)}">${_('Permissions')}</a>
+              <a href="${h.route_path('edit_repo_perms', repo_name=c.repo_name)}">${_('Permissions')}</a>
           </li>
           <li class="${'active' if c.active=='advanced' else ''}">
               <a href="${h.url('edit_repo_advanced', repo_name=c.repo_name)}">${_('Advanced')}</a>
diff --git a/rhodecode/templates/admin/repos/repo_edit_permissions.mako b/rhodecode/templates/admin/repos/repo_edit_permissions.mako
index ee69fa32..50deba3d 100644
--- a/rhodecode/templates/admin/repos/repo_edit_permissions.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_permissions.mako
@@ -5,8 +5,7 @@
         <h3 class="panel-title">${_('Repository Permissions')}</h3>
     </div>
     <div class="panel-body">
-        ${h.secure_form(url('edit_repo_perms_update', repo_name=c.repo_name), method='put')}
-        ${h.hidden('repo_private')}
+        ${h.secure_form(h.route_path('edit_repo_perms', repo_name=c.repo_name), method='POST')}
         <table id="permissions_manage" class="rctable permissions">
             <tr>
                 <th class="td-radio">${_('None')}</th>
@@ -40,7 +39,7 @@
                     <tr>
                         <td colspan="4">
                             <span class="private_repo_msg">
-                            <strong>${_('private repository')}</strong>
+                            <strong title="${_user.permission}">${_('private repository')}</strong>
                             </span>
                         </td>
                         <td class="private_repo_msg">
@@ -50,10 +49,10 @@
                     </tr>
                 %else:
                     <tr>
-                        <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.none')}</td>
-                        <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.read')}</td>
-                        <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.write')}</td>
-                        <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.admin')}</td>
+                        <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.none', checked=_user.permission=='repository.none')}</td>
+                        <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.read', checked=_user.permission=='repository.read')}</td>
+                        <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.write', checked=_user.permission=='repository.write')}</td>
+                        <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.admin', checked=_user.permission=='repository.admin')}</td>
                         <td class="td-user">
                             ${base.gravatar(_user.email, 16)}
                             <span class="user">
@@ -79,10 +78,10 @@
             ## USER GROUPS
             %for _user_group in c.repo_info.permission_user_groups():
                 <tr>
-                    <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'repository.none')}</td>
-                    <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'repository.read')}</td>
-                    <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'repository.write')}</td>
-                    <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'repository.admin')}</td>
+                    <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'repository.none', checked=_user_group.permission=='repository.none')}</td>
+                    <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'repository.read', checked=_user_group.permission=='repository.read')}</td>
+                    <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'repository.write', checked=_user_group.permission=='repository.write')}</td>
+                    <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'repository.admin', checked=_user_group.permission=='repository.admin')}</td>
                     <td class="td-componentname">
                         <i class="icon-group" ></i>
                         %if h.HasPermissionAny('hg.admin')():
diff --git a/rhodecode/templates/base/perms_summary.mako b/rhodecode/templates/base/perms_summary.mako
index 4b4898f6..af6773b5 100644
--- a/rhodecode/templates/base/perms_summary.mako
+++ b/rhodecode/templates/base/perms_summary.mako
@@ -146,7 +146,7 @@
                     %if actions:
                     <td class="td-action">
                         %if section == 'repositories':
-                            <a href="${h.url('edit_repo_perms',repo_name=k,anchor='permissions_manage')}">${_('edit')}</a>
+                            <a href="${h.route_path('edit_repo_perms',repo_name=k,anchor='permissions_manage')}">${_('edit')}</a>
                         %elif section == 'repositories_groups':
                             <a href="${h.url('edit_repo_group_perms',group_name=k,anchor='permissions_manage')}">${_('edit')}</a>
                         %elif section == 'user_groups':

From 9473470c8ab5f9a934b420ca0c7b4c575b1d0a9c Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 9 May 2017 11:11:39 +0200
Subject: [PATCH 098/211] backends: make sure the NoNode error uses safe
 representation of path to avoide unicode errors.

---
 rhodecode/lib/vcs/backends/base.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rhodecode/lib/vcs/backends/base.py b/rhodecode/lib/vcs/backends/base.py
index 5c23f755..51262945 100644
--- a/rhodecode/lib/vcs/backends/base.py
+++ b/rhodecode/lib/vcs/backends/base.py
@@ -1065,8 +1065,8 @@ class BaseCommit(object):
 
     def no_node_at_path(self, path):
         return NodeDoesNotExistError(
-            "There is no file nor directory at the given path: "
-            "'%s' at commit %s" % (path, self.short_id))
+            u"There is no file nor directory at the given path: "
+            u"'%s' at commit %s" % (safe_unicode(path), self.short_id))
 
     def _fix_path(self, path):
         """

From 664cbc6f52645486ecd923effad530171db4ad60 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 9 May 2017 15:19:04 +0200
Subject: [PATCH 099/211] audit-logs: add push/pull actions to audit logs.

---
 rhodecode/lib/audit_logger.py                 | 21 +++++++++++++++++--
 rhodecode/lib/hooks_base.py                   | 19 +++++++++++++++++
 .../tests/functional/test_pullrequests.py     |  4 +++-
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/rhodecode/lib/audit_logger.py b/rhodecode/lib/audit_logger.py
index 282fcd4f..51a5a69d 100644
--- a/rhodecode/lib/audit_logger.py
+++ b/rhodecode/lib/audit_logger.py
@@ -22,7 +22,7 @@ import logging
 import datetime
 
 from rhodecode.model import meta
-from rhodecode.model.db import User, UserLog
+from rhodecode.model.db import User, UserLog, Repository
 
 
 log = logging.getLogger(__name__)
@@ -33,6 +33,8 @@ ACTIONS = {
     'user.login.failure': {},
     'user.logout': {},
     'user.password.reset_request': {},
+    'user.push': {},
+    'user.pull': {},
 
     'repo.add': {},
     'repo.edit': {},
@@ -52,6 +54,16 @@ class UserWrap(object):
         self.ip_addr = ip_addr
 
 
+class RepoWrap(object):
+    """
+    Fake object used to imitate RepoObject that audit logger requires
+    """
+
+    def __init__(self, repo_id=None, repo_name=None):
+        self.repo_id = repo_id
+        self.repo_name = repo_name
+
+
 def _store_log(action_name, action_data, user_id, username, user_data,
                ip_address, repository_id, repository_name):
     user_log = UserLog()
@@ -127,8 +139,13 @@ def store(
                     'email': user.email,
                 }
 
-        repository_id = getattr(repo, 'repo_id', None)
         repository_name = getattr(repo, 'repo_name', None)
+        repository_id = getattr(repo, 'repo_id', None)
+        if not repository_id:
+            # maybe we have repo_name ? Try to figure repo_id from repo_name
+            if repository_name:
+                repository_id = getattr(
+                    Repository.get_by_repo_name(repository_name), 'repo_id', None)
 
         user_log = _store_log(
             action_name=safe_unicode(action),
diff --git a/rhodecode/lib/hooks_base.py b/rhodecode/lib/hooks_base.py
index 50358f6b..cab8c4fb 100644
--- a/rhodecode/lib/hooks_base.py
+++ b/rhodecode/lib/hooks_base.py
@@ -30,6 +30,7 @@ import logging
 import rhodecode
 from rhodecode import events
 from rhodecode.lib import helpers as h
+from rhodecode.lib import audit_logger
 from rhodecode.lib.utils import action_logger
 from rhodecode.lib.utils2 import safe_str
 from rhodecode.lib.exceptions import HTTPLockedRC, UserCreationError
@@ -156,6 +157,14 @@ def post_pull(extras):
     action = 'pull'
     action_logger(user, action, extras.repository, extras.ip, commit=True)
 
+    audit_user = audit_logger.UserWrap(
+        username=extras.username,
+        ip_addr=extras.ip)
+    audit_logger.store(
+        action='user.pull', action_data={
+            'user_agent': extras.user_agent},
+        user=audit_user, commit=True)
+
     # Propagate to external components.
     if not is_shadow_repo(extras):
         post_pull_extension(**extras)
@@ -192,6 +201,16 @@ def post_push(extras):
     action_logger(
         extras.username, action, extras.repository, extras.ip, commit=True)
 
+    audit_user = audit_logger.UserWrap(
+        username=extras.username,
+        ip_addr=extras.ip)
+    repo = audit_logger.RepoWrap(repo_name=extras.repository)
+    audit_logger.store(
+        action='user.push', action_data={
+            'user_agent': extras.user_agent,
+            'commit_ids': commit_ids[:10000]},
+        user=audit_user, repo=repo, commit=True)
+
     # Propagate to external components.
     if not is_shadow_repo(extras):
         post_push_extension(
diff --git a/rhodecode/tests/functional/test_pullrequests.py b/rhodecode/tests/functional/test_pullrequests.py
index 95ba258e..e7ee3899 100644
--- a/rhodecode/tests/functional/test_pullrequests.py
+++ b/rhodecode/tests/functional/test_pullrequests.py
@@ -537,7 +537,9 @@ class TestPullrequestsController:
             pull_request, ChangesetStatus.STATUS_APPROVED)
 
         # Check the relevant log entries were added
-        user_logs = UserLog.query().order_by('-user_log_id').limit(4)
+        user_logs = UserLog.query() \
+            .filter(UserLog.version == UserLog.VERSION_1) \
+            .order_by('-user_log_id').limit(4)
         actions = [log.action for log in user_logs]
         pr_commit_ids = PullRequestModel()._get_commit_ids(pull_request)
         expected_actions = [

From 1c512d13971aff83d84a2c0a9b59798b40669120 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 9 May 2017 21:13:46 +0200
Subject: [PATCH 100/211] audit-logs: store repository name on pull action.

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

diff --git a/rhodecode/lib/hooks_base.py b/rhodecode/lib/hooks_base.py
index cab8c4fb..76b5f6f5 100644
--- a/rhodecode/lib/hooks_base.py
+++ b/rhodecode/lib/hooks_base.py
@@ -160,10 +160,11 @@ def post_pull(extras):
     audit_user = audit_logger.UserWrap(
         username=extras.username,
         ip_addr=extras.ip)
+    repo = audit_logger.RepoWrap(repo_name=extras.repository)
     audit_logger.store(
         action='user.pull', action_data={
             'user_agent': extras.user_agent},
-        user=audit_user, commit=True)
+        user=audit_user, repo=repo, commit=True)
 
     # Propagate to external components.
     if not is_shadow_repo(extras):

From 4801f5f8cade7458fe88842da04b96f4ef16e57f Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 10 May 2017 18:33:59 +0200
Subject: [PATCH 101/211] mercurial-evolve: enable evolve setting on
 repositories.

---
 rhodecode/api/views/repo_api.py               |  1 +
 rhodecode/lib/db_manage.py                    |  8 +++++++
 rhodecode/lib/vcs/backends/hg/commit.py       | 10 +++++++++
 rhodecode/model/forms.py                      |  1 +
 rhodecode/model/settings.py                   | 22 +++++++++++++------
 rhodecode/public/css/tables.less              |  5 +++++
 rhodecode/templates/base/vcs_settings.mako    | 13 +++++++++++
 .../changelog/changelog_elements.mako         | 19 ++++++++++++++--
 rhodecode/templates/changeset/changeset.mako  | 17 +++++++++++++-
 .../tests/functional/test_admin_repos.py      |  1 +
 .../tests/functional/test_admin_settings.py   | 17 ++++++++++++++
 .../models/settings/test_vcs_settings.py      | 14 +++++++++---
 12 files changed, 115 insertions(+), 13 deletions(-)

diff --git a/rhodecode/api/views/repo_api.py b/rhodecode/api/views/repo_api.py
index 29896575..0c446e69 100644
--- a/rhodecode/api/views/repo_api.py
+++ b/rhodecode/api/views/repo_api.py
@@ -1902,6 +1902,7 @@ def get_repo_settings(request, apiuser, repoid, key=Optional(None)):
             "id": 237,
             "result": {
                 "extensions_largefiles": true,
+                "extensions_evolve": true,
                 "hooks_changegroup_push_logger": true,
                 "hooks_changegroup_repo_size": false,
                 "hooks_outgoing_pull_logger": true,
diff --git a/rhodecode/lib/db_manage.py b/rhodecode/lib/db_manage.py
index 3e0d5f84..2b4b5a5d 100644
--- a/rhodecode/lib/db_manage.py
+++ b/rhodecode/lib/db_manage.py
@@ -363,6 +363,14 @@ class DbManage(object):
         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)
+
         # enable hggit disabled by default
         hggit = RhodeCodeUi()
         hggit.ui_section = 'extensions'
diff --git a/rhodecode/lib/vcs/backends/hg/commit.py b/rhodecode/lib/vcs/backends/hg/commit.py
index d451136e..422fca61 100644
--- a/rhodecode/lib/vcs/backends/hg/commit.py
+++ b/rhodecode/lib/vcs/backends/hg/commit.py
@@ -170,6 +170,16 @@ class MercurialCommit(base.BaseCommit):
 
         return safe_unicode(phase_text)
 
+    @LazyProperty
+    def obsolete(self):
+        obsolete = self._remote.ctx_obsolete(self.idx)
+        return obsolete
+
+    @LazyProperty
+    def hidden(self):
+        hidden = self._remote.ctx_hidden(self.idx)
+        return hidden
+
     @LazyProperty
     def children(self):
         """
diff --git a/rhodecode/model/forms.py b/rhodecode/model/forms.py
index a2e54b8f..0b352349 100644
--- a/rhodecode/model/forms.py
+++ b/rhodecode/model/forms.py
@@ -384,6 +384,7 @@ class _BaseVcsSettingsForm(formencode.Schema):
 
     # 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)
 
diff --git a/rhodecode/model/settings.py b/rhodecode/model/settings.py
index e629eefb..4770626a 100644
--- a/rhodecode/model/settings.py
+++ b/rhodecode/model/settings.py
@@ -415,15 +415,16 @@ class VcsSettingsModel(object):
         ('hooks', 'outgoing.pull_logger'),)
     HG_SETTINGS = (
         ('extensions', 'largefiles'),
-        ('phases', 'publish'),)
+        ('phases', 'publish'),
+        ('extensions', 'evolve'),)
     GIT_SETTINGS = (
         ('vcs_git_lfs', 'enabled'),)
-
     GLOBAL_HG_SETTINGS = (
         ('extensions', 'largefiles'),
         ('largefiles', 'usercache'),
         ('phases', 'publish'),
-        ('extensions', 'hgsubversion'))
+        ('extensions', 'hgsubversion'),
+        ('extensions', 'evolve'),)
     GLOBAL_GIT_SETTINGS = (
         ('vcs_git_lfs', 'enabled'),
         ('vcs_git_lfs', 'store_location'))
@@ -546,22 +547,26 @@ class VcsSettingsModel(object):
 
     @assert_repo_settings
     def create_or_update_repo_hg_settings(self, data):
-        largefiles, phases = \
+        largefiles, phases, evolve = \
             self.HG_SETTINGS
-        largefiles_key, phases_key = \
+        largefiles_key, phases_key, evolve_key = \
             self._get_settings_keys(self.HG_SETTINGS, data)
 
         self._create_or_update_ui(
             self.repo_settings, *largefiles, value='',
             active=data[largefiles_key])
+        self._create_or_update_ui(
+            self.repo_settings, *evolve, value='',
+            active=data[evolve_key])
         self._create_or_update_ui(
             self.repo_settings, *phases, value=safe_str(data[phases_key]))
 
     def create_or_update_global_hg_settings(self, data):
-        largefiles, largefiles_store, phases, hgsubversion \
+        largefiles, largefiles_store, phases, hgsubversion, evolve \
             = self.GLOBAL_HG_SETTINGS
-        largefiles_key, largefiles_store_key, phases_key, subversion_key \
+        largefiles_key, largefiles_store_key, phases_key, subversion_key, evolve_key \
             = self._get_settings_keys(self.GLOBAL_HG_SETTINGS, data)
+
         self._create_or_update_ui(
             self.global_settings, *largefiles, value='',
             active=data[largefiles_key])
@@ -572,6 +577,9 @@ class VcsSettingsModel(object):
             self.global_settings, *phases, value=safe_str(data[phases_key]))
         self._create_or_update_ui(
             self.global_settings, *hgsubversion, active=data[subversion_key])
+        self._create_or_update_ui(
+            self.global_settings, *evolve, value='',
+            active=data[evolve_key])
 
     def create_or_update_repo_git_settings(self, data):
         # NOTE(marcink): # comma make unpack work properly
diff --git a/rhodecode/public/css/tables.less b/rhodecode/public/css/tables.less
index b6584d51..50792ba6 100644
--- a/rhodecode/public/css/tables.less
+++ b/rhodecode/public/css/tables.less
@@ -108,6 +108,11 @@ table.dataTable {
         &.td-hash {
             min-width: 80px;
             width: 200px;
+
+            .obsolete {
+                text-decoration: line-through;
+                color: lighten(@grey2,25%);
+            }
         }
 
         &.td-time {
diff --git a/rhodecode/templates/base/vcs_settings.mako b/rhodecode/templates/base/vcs_settings.mako
index 77a65a51..8e259d5d 100644
--- a/rhodecode/templates/base/vcs_settings.mako
+++ b/rhodecode/templates/base/vcs_settings.mako
@@ -130,6 +130,19 @@
                         <span class="help-block">${_('Requires hgsubversion library to be installed. Allows cloning remote SVN repositories and migrates them to Mercurial type.')}</span>
                     </div>
                 % endif
+
+                <div class="checkbox">
+                    ${h.checkbox('extensions_evolve' + suffix, 'True', **kwargs)}
+                    <label for="extensions_evolve${suffix}">${_('Enable evolve extension')}</label>
+                </div>
+                <div class="label">
+                    % if display_globals:
+                        <span class="help-block">${_('Enable evolve extension for all repositories.')}</span>
+                    % else:
+                        <span class="help-block">${_('Enable evolve extension for this repository.')}</span>
+                    % endif
+                </div>
+
             </div>
         </div>
         ## LABS for HG
diff --git a/rhodecode/templates/changelog/changelog_elements.mako b/rhodecode/templates/changelog/changelog_elements.mako
index f4e51b19..4f36b651 100644
--- a/rhodecode/templates/changelog/changelog_elements.mako
+++ b/rhodecode/templates/changelog/changelog_elements.mako
@@ -46,13 +46,28 @@
     <td class="td-hash">
     <code>
       <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=commit.raw_id)}">
-        <span class="commit_hash">${h.show_id(commit)}</span>
+        <span class="${'commit_hash obsolete' if getattr(commit, 'obsolete', None) else 'commit_hash'}">${h.show_id(commit)}</span>
       </a>
       % if hasattr(commit, 'phase'):
           % if commit.phase != 'public':
-              <span class="tag phase-${commit.phase} tooltip" title="${_('commit phase')}">${commit.phase}</span>
+              <span class="tag phase-${commit.phase} tooltip" title="${_('Commit phase')}">${commit.phase}</span>
           % endif
       % endif
+
+      ## obsolete commits
+      % if hasattr(commit, 'obsolete'):
+          % if commit.obsolete:
+              <span class="tag obsolete-${commit.obsolete} tooltip" title="${_('Evolve State')}">${_('obsolete')}</span>
+          % endif
+      % endif
+
+      ## hidden commits
+      % if hasattr(commit, 'hidden'):
+          % if commit.hidden:
+              <span class="tag obsolete-${commit.hidden} tooltip" title="${_('Evolve State')}">${_('hidden')}</span>
+          % endif
+      % endif
+
     </code>
     </td>
     <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_('Expand commit message')}" onclick="commitsController.expandCommit(this); return false">
diff --git a/rhodecode/templates/changeset/changeset.mako b/rhodecode/templates/changeset/changeset.mako
index 5deb5d5a..840728ed 100644
--- a/rhodecode/templates/changeset/changeset.mako
+++ b/rhodecode/templates/changeset/changeset.mako
@@ -37,8 +37,23 @@
               <code>
                 ${h.show_id(c.commit)}
                 % if hasattr(c.commit, 'phase'):
-                      <span class="tag phase-${c.commit.phase} tooltip" title="${_('commit phase')}">${c.commit.phase}</span>
+                      <span class="tag phase-${c.commit.phase} tooltip" title="${_('Commit phase')}">${c.commit.phase}</span>
                 % endif
+
+                ## obsolete commits
+                % if hasattr(c.commit, 'obsolete'):
+                  % if c.commit.obsolete:
+                      <span class="tag obsolete-${c.commit.obsolete} tooltip" title="${_('Evolve State')}">${_('obsolete')}</span>
+                  % endif
+                % endif
+
+                ## hidden commits
+                % if hasattr(c.commit, 'hidden'):
+                  % if c.commit.hidden:
+                      <span class="tag hidden-${c.commit.hidden} tooltip" title="${_('Evolve State')}">${_('hidden')}</span>
+                  % endif
+                % endif
+
               </code>
             </h4>
           </span>
diff --git a/rhodecode/tests/functional/test_admin_repos.py b/rhodecode/tests/functional/test_admin_repos.py
index 74f68e5a..5f7a63f4 100644
--- a/rhodecode/tests/functional/test_admin_repos.py
+++ b/rhodecode/tests/functional/test_admin_repos.py
@@ -581,6 +581,7 @@ class TestVcsSettings(object):
         'hooks_changegroup_push_logger': False,
         'hooks_outgoing_pull_logger': False,
         'extensions_largefiles': False,
+        'extensions_evolve': False,
         'phases_publish': 'False',
         'rhodecode_pr_merge_enabled': False,
         'rhodecode_use_outdated_comments': False,
diff --git a/rhodecode/tests/functional/test_admin_settings.py b/rhodecode/tests/functional/test_admin_settings.py
index f1b22562..33847664 100644
--- a/rhodecode/tests/functional/test_admin_settings.py
+++ b/rhodecode/tests/functional/test_admin_settings.py
@@ -275,6 +275,23 @@ class TestAdminSettingsVcs(object):
             'value="True" checked="checked" />')
         response.mustcontain(extensions_input)
 
+    def test_extensions_hgevolve(self, app, form_defaults, csrf_token):
+        form_defaults.update({
+            'csrf_token': csrf_token,
+            'extensions_evolve': 'True',
+        })
+        response = app.post(
+            url('admin_settings_vcs'),
+            params=form_defaults,
+            status=302)
+
+        response = response.follow()
+        extensions_input = (
+            '<input id="extensions_evolve" '
+            'name="extensions_evolve" type="checkbox" '
+            'value="True" checked="checked" />')
+        response.mustcontain(extensions_input)
+
     def test_has_a_section_for_pull_request_settings(self, app):
         response = app.get(url('admin_settings_vcs'))
         response.mustcontain('Pull Request Settings')
diff --git a/rhodecode/tests/models/settings/test_vcs_settings.py b/rhodecode/tests/models/settings/test_vcs_settings.py
index 10bcb893..32b977c7 100644
--- a/rhodecode/tests/models/settings/test_vcs_settings.py
+++ b/rhodecode/tests/models/settings/test_vcs_settings.py
@@ -500,7 +500,8 @@ class TestCreateOrUpdateUi(object):
     def test_update(self, repo_stub, settings_util):
         model = VcsSettingsModel(repo=repo_stub.repo_name)
 
-        largefiles, phases = model.HG_SETTINGS
+        largefiles, phases, evolve = model.HG_SETTINGS
+
         section = 'test-section'
         key = 'test-key'
         settings_util.create_repo_rhodecode_ui(
@@ -519,6 +520,7 @@ class TestCreateOrUpdateUi(object):
 class TestCreateOrUpdateRepoHgSettings(object):
     FORM_DATA = {
         'extensions_largefiles': False,
+        'extensions_evolve': False,
         'phases_publish': False
     }
 
@@ -529,6 +531,8 @@ class TestCreateOrUpdateRepoHgSettings(object):
         expected_calls = [
             mock.call(model.repo_settings, 'extensions', 'largefiles',
                       active=False, value=''),
+            mock.call(model.repo_settings, 'extensions', 'evolve',
+                      active=False, value=''),
             mock.call(model.repo_settings, 'phases', 'publish', value='False'),
         ]
         assert expected_calls == create_mock.call_args_list
@@ -574,7 +578,8 @@ class TestCreateOrUpdateGlobalHgSettings(object):
         'extensions_largefiles': False,
         'largefiles_usercache': '/example/largefiles-store',
         'phases_publish': False,
-        'extensions_hgsubversion': False
+        'extensions_hgsubversion': False,
+        'extensions_evolve': False
     }
 
     def test_creates_repo_hg_settings_when_data_is_correct(self):
@@ -589,7 +594,9 @@ class TestCreateOrUpdateGlobalHgSettings(object):
             mock.call(model.global_settings, 'phases', 'publish',
                       value='False'),
             mock.call(model.global_settings, 'extensions', 'hgsubversion',
-                      active=False)
+                      active=False),
+            mock.call(model.global_settings, 'extensions', 'evolve',
+                      active=False, value='')
         ]
         assert expected_calls == create_mock.call_args_list
 
@@ -957,6 +964,7 @@ class TestCreateOrUpdateRepoSettings(object):
         'hooks_changegroup_push_logger': False,
         'hooks_outgoing_pull_logger': False,
         'extensions_largefiles': False,
+        'extensions_evolve': False,
         'largefiles_usercache': '/example/largefiles-store',
         'vcs_git_lfs_enabled': False,
         'vcs_git_lfs_store_location': '/',

From ffd7928e315e084e77178888874fa3139c5f7e77 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 11 May 2017 11:20:46 +0200
Subject: [PATCH 102/211] user-groups: make the group sync help text explain
 more what group sync does

---
 .../admin/user_groups/user_group_edit_advanced.mako       | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako b/rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako
index 9948f787..0ef1bc90 100644
--- a/rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako
+++ b/rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako
@@ -34,7 +34,6 @@
         % if sync_type:
             <p>
                 ${_('This group is set to be automatically synchronised.')}<br/>
-                ${_('Each member will be added or removed from this groups once they interact with RhodeCode system.')}<br/>
                 ${_('This group synchronization was set by')}: <strong>${sync_type}</strong>
             </p>
         % else:
@@ -56,11 +55,8 @@
             </div>
             <div class="field">
                 <span class="help-block">
-                    %if sync_type:
-                        ${_('User group will no longer synchronize membership')}
-                    %else:
-                        ${_('User group will start to synchronize membership')}
-                    %endif
+                    ${_('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)')}
                 </span>
             </div>
         ${h.end_form()}

From ee7bfb3a878e6719bbc725695cf79d95a3e5e56b Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 11 May 2017 12:19:32 +0200
Subject: [PATCH 103/211] helpers: added a helper to show example api call for
 automation of certain actions.

---
 rhodecode/lib/helpers.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py
index 88fa6ae3..a5cd2294 100644
--- a/rhodecode/lib/helpers.py
+++ b/rhodecode/lib/helpers.py
@@ -36,6 +36,8 @@ import urlparse
 import time
 import string
 import hashlib
+from collections import OrderedDict
+
 import pygments
 import itertools
 import fnmatch
@@ -2003,3 +2005,23 @@ def resource_path(*args, **kwds):
     """
     req = get_current_request()
     return req.resource_path(*args, **kwds)
+
+
+def api_call_example(method, args):
+    """
+    Generates an API call example via CURL
+    """
+    args_json = json.dumps(OrderedDict([
+        ('id', 1),
+        ('auth_token', 'SECRET'),
+        ('method', method),
+        ('args', args)
+    ]))
+    return literal(
+        "curl {api_url} -X POST -H 'content-type:text/plain' --data-binary '{data}'"
+        "<br/><br/>SECRET can be found in <a href=\"{token_url}\">auth-tokens</a> page, "
+        "and needs to be of `api calls` role."
+        .format(
+            api_url=route_url('apiv2'),
+            token_url=route_url('my_account_auth_tokens'),
+            data=args_json))

From 74042e1c35e15ec7297277faa2c05751f362b8cf Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 11 May 2017 12:20:13 +0200
Subject: [PATCH 104/211] settings-pages: replaced hardcoded api calls examples
 with introduced helper.

---
 .../admin/repos/repo_edit_caches.mako         |  6 ++---
 .../admin/repos/repo_edit_remote.mako         | 25 +++++++++++--------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/rhodecode/templates/admin/repos/repo_edit_caches.mako b/rhodecode/templates/admin/repos/repo_edit_caches.mako
index fee99e3c..7c368bb8 100644
--- a/rhodecode/templates/admin/repos/repo_edit_caches.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_caches.mako
@@ -7,10 +7,10 @@
         <h4>${_('Manually invalidate the repository cache. On the next access a repository cache will be recreated.')}</h4>
 
         <p>
-            ${_('Cache purge can be automated by such api call called periodically (in crontab etc)')}
+            ${_('Cache purge can be automated by such api call. Can be called periodically in crontab etc.')}
             <br/>
             <code>
-                curl ${h.route_url('apiv2')} -X POST -H 'content-type:text/plain' --data-binary '{"id":1, "auth_token":"SECRET", "method":"invalidate_cache", "args":{"repoid":"${c.repo_info.repo_name}"}}'
+            ${h.api_call_example(method='invalidate_cache', args={"repoid": c.repo_info.repo_name})}
             </code>
         </p>
 
@@ -51,5 +51,3 @@
       </div>
     </div>
 </div>
-
-
diff --git a/rhodecode/templates/admin/repos/repo_edit_remote.mako b/rhodecode/templates/admin/repos/repo_edit_remote.mako
index 470769de..74d318f1 100644
--- a/rhodecode/templates/admin/repos/repo_edit_remote.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_remote.mako
@@ -4,17 +4,20 @@
     </div>
     <div class="panel-body">
 
+        <h4>${_('Manually pull changes from external repository.')}</h4>
+
         %if c.repo_info.clone_uri:
 
-            <div class="panel-body-title-text">${_('Remote mirror url')}:
-                <a href="${c.repo_info.clone_uri}">${c.repo_info.clone_uri_hidden}</a>
-                <p>
-                ${_('Pull can be automated by such api call called periodically (in crontab etc)')}
-                </p>
+            ${_('Remote mirror url')}:
+            <a href="${c.repo_info.clone_uri}">${c.repo_info.clone_uri_hidden}</a>
+
+            <p>
+                ${_('Pull can be automated by such api call. Can be called periodically in crontab etc.')}
+                <br/>
                 <code>
-                curl ${h.route_url('apiv2')} -X POST -H 'content-type:text/plain' --data-binary '{"id":1, "auth_token":"SECRET","method":"pull", "args":{"repoid":"${c.repo_info.repo_name}"}}'
+                ${h.api_call_example(method='pull', args={"repoid": c.repo_info.repo_name})}
                 </code>
-            </div>
+            </p>
 
             ${h.secure_form(url('edit_repo_remote', repo_name=c.repo_name), method='put')}
             <div class="form">
@@ -24,14 +27,14 @@
             </div>
             ${h.end_form()}
         %else:
-          <div class="panel-body-title-text">${_('This repository does not have any remote mirror url set.')}</div>
 
+          ${_('This repository does not have any remote mirror url set.')}
+          <a href="${h.route_path('edit_repo', repo_name=c.repo_info.repo_name)}">${_('Set remote url.')}</a>
+          <br/>
+          <br/>
           <button class="btn disabled" type="submit" disabled="disabled">
             ${_('Pull changes from remote location')}
           </button>
         %endif
     </div>
 </div>
-
-
-

From 1ea2e3e49f3230b1be206fe2345683e61c1ea1f8 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 11 May 2017 12:34:41 +0200
Subject: [PATCH 105/211] api: added maintenance command into API.

---
 rhodecode/api/views/repo_api.py               | 63 +++++++++++++++++++
 .../admin/repos/repo_edit_maintenance.mako    | 28 ++++++---
 2 files changed, 81 insertions(+), 10 deletions(-)

diff --git a/rhodecode/api/views/repo_api.py b/rhodecode/api/views/repo_api.py
index 0c446e69..031a642d 100644
--- a/rhodecode/api/views/repo_api.py
+++ b/rhodecode/api/views/repo_api.py
@@ -29,6 +29,7 @@ from rhodecode.api.utils import (
     get_user_group_or_error, get_user_or_error, validate_repo_permissions,
     get_perm_or_error, parse_args, get_origin, build_commit_data,
     validate_set_owner_permissions)
+from rhodecode.lib import repo_maintenance
 from rhodecode.lib.auth import HasPermissionAnyApi, HasUserGroupPermissionAnyApi
 from rhodecode.lib.utils2 import str2bool, time_to_datetime
 from rhodecode.lib.ext_json import json
@@ -1986,3 +1987,65 @@ def set_repo_settings(request, apiuser, repoid, settings):
 
     # Indicate success.
     return True
+
+
+@jsonrpc_method()
+def maintenance(request, apiuser, repoid):
+    """
+    Triggers a maintenance on the given repository.
+
+    This command can only be run using an |authtoken| with admin
+    rights to the specified repository. For more information,
+    see :ref:`config-token-ref`.
+
+    This command takes the following options:
+
+    :param apiuser: This is filled automatically from the |authtoken|.
+    :type apiuser: AuthUser
+    :param repoid: The repository name or repository ID.
+    :type repoid: str or int
+
+    Example output:
+
+    .. code-block:: bash
+
+      id : <id_given_in_input>
+      result : {
+        "msg": "executed maintenance command",
+        "executed_actions": [
+           <action_message>, <action_message2>...
+        ],
+        "repository": "<repository name>"
+      }
+      error :  null
+
+    Example error output:
+
+    .. code-block:: bash
+
+      id : <id_given_in_input>
+      result : null
+      error :  {
+        "Unable to execute maintenance on `<reponame>`"
+      }
+
+    """
+
+    repo = get_repo_or_error(repoid)
+    if not has_superadmin_permission(apiuser):
+        _perms = ('repository.admin',)
+        validate_repo_permissions(apiuser, repoid, repo, _perms)
+
+    try:
+        maintenance = repo_maintenance.RepoMaintenance()
+        executed_actions = maintenance.execute(repo)
+
+        return {
+            'msg': 'executed maintenance command',
+            'executed_actions': executed_actions,
+            'repository': repo.repo_name
+        }
+    except Exception:
+        log.exception("Exception occurred while trying to run maintenance")
+        raise JSONRPCError(
+            'Unable to execute maintenance on `%s`' % repo.repo_name)
diff --git a/rhodecode/templates/admin/repos/repo_edit_maintenance.mako b/rhodecode/templates/admin/repos/repo_edit_maintenance.mako
index f24285bc..027d403c 100644
--- a/rhodecode/templates/admin/repos/repo_edit_maintenance.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_maintenance.mako
@@ -4,19 +4,27 @@
     </div>
     <div class="panel-body">
 
+        % if c.executable_tasks:
+        <h4>${_('Perform maintenance tasks for this repo')}</h4>
+
+        <span>${_('Following tasks will be performed')}:</span>
+        <ol>
+        % for task in c.executable_tasks:
+            <li>${task}</li>
+        % endfor
+        </ol>
         <p>
-            % if c.executable_tasks:
-            ${_('Perform maintenance tasks for this repo, following tasks will be performed')}:
-            <ol>
-            % for task in c.executable_tasks:
-                <li>${task}</li>
-            % endfor
-            </ol>
-            % else:
-                ${_('No maintenance tasks for this repo available')}
-            % endif
+            ${_('Maintenance can be automated by such api call. Can be called periodically in crontab etc.')}
+            <br/>
+            <code>
+                ${h.api_call_example(method='maintenance', args={"repoid": c.repo_info.repo_name})}
+            </code>
         </p>
 
+        % else:
+            <h4>${_('No maintenance tasks for this repo available')}</h4>
+        % endif
+
         <div id="results" style="display:none; padding: 10px 0px;"></div>
 
         % if c.executable_tasks:

From 93c97b0aefe554fb1ec9ddef4f9a4573f3da429f Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 11 May 2017 12:58:19 +0200
Subject: [PATCH 106/211] audit-logger: added entry for archive download.

---
 rhodecode/controllers/files.py | 30 +++++++++++++++++++++---------
 rhodecode/lib/audit_logger.py  | 32 +++++++++++++++++++++++++-------
 2 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/rhodecode/controllers/files.py b/rhodecode/controllers/files.py
index c81ac409..cb5836e7 100644
--- a/rhodecode/controllers/files.py
+++ b/rhodecode/controllers/files.py
@@ -35,7 +35,7 @@ from webob.exc import HTTPNotFound, HTTPBadRequest
 
 from rhodecode.controllers.utils import parse_path_ref
 from rhodecode.lib import diffs, helpers as h, caches
-from rhodecode.lib.compat import OrderedDict
+from rhodecode.lib import audit_logger
 from rhodecode.lib.codeblocks import (
     filenode_as_lines_tokens, filenode_as_annotated_lines_tokens)
 from rhodecode.lib.utils import jsonify, action_logger
@@ -813,6 +813,26 @@ class FilesController(BaseRepoController):
                 shutil.move(archive, cached_archive_path)
                 archive = cached_archive_path
 
+        # store download action
+        action_logger(user=c.rhodecode_user,
+                      action='user_downloaded_archive:%s' % archive_name,
+                      repo=repo_name, ipaddr=self.ip_addr, commit=True)
+
+        audit_logger.store(
+            action='repo.archive.download',
+            action_data={'user_agent': request.user_agent,
+                         'archive_name': archive_name,
+                         'archive_spec': fname,
+                         'archive_cached': use_cached_archive},
+            user=c.rhodecode_user,
+            repo=dbrepo,
+            commit=True
+        )
+
+        response.content_disposition = str(
+            'attachment; filename=%s' % archive_name)
+        response.content_type = str(content_type)
+
         def get_chunked_archive(archive):
             with open(archive, 'rb') as stream:
                 while True:
@@ -826,14 +846,6 @@ class FilesController(BaseRepoController):
                         break
                     yield data
 
-        # store download action
-        action_logger(user=c.rhodecode_user,
-                      action='user_downloaded_archive:%s' % archive_name,
-                      repo=repo_name, ipaddr=self.ip_addr, commit=True)
-        response.content_disposition = str(
-            'attachment; filename=%s' % archive_name)
-        response.content_type = str(content_type)
-
         return get_chunked_archive(archive)
 
     @LoginRequired()
diff --git a/rhodecode/lib/audit_logger.py b/rhodecode/lib/audit_logger.py
index 51a5a69d..7a7b2093 100644
--- a/rhodecode/lib/audit_logger.py
+++ b/rhodecode/lib/audit_logger.py
@@ -39,7 +39,8 @@ ACTIONS = {
     'repo.add': {},
     'repo.edit': {},
     'repo.edit.permissions': {},
-    'repo.commit.strip': {}
+    'repo.commit.strip': {},
+    'repo.archive.download': {},
 }
 
 
@@ -97,14 +98,31 @@ def store(
 
         from rhodecode.lib import audit_logger
 
-        audit_logger.store(action='repo.edit', user=self._rhodecode_user)
-        audit_logger.store(action='repo.delete', user=audit_logger.UserWrap(username='itried-to-login', ip_addr='8.8.8.8'))
+        audit_logger.store(
+            action='repo.edit', user=self._rhodecode_user)
+        audit_logger.store(
+            action='repo.delete',
+            user=audit_logger.UserWrap(username='itried-login', ip_addr='8.8.8.8'))
+
+        # repo action
+        audit_logger.store(
+            action='repo.delete',
+            user=audit_logger.UserWrap(username='itried-login', ip_addr='8.8.8.8'),
+            repo=audit_logger.RepoWrap(repo_name='some-repo'))
+
+        # repo action, when we know and have the repository object already
+        audit_logger.store(
+            action='repo.delete',
+            user=audit_logger.UserWrap(username='itried-login', ip_addr='8.8.8.8'),
+            repo=repo_object)
 
         # without an user ?
-        audit_user = audit_logger.UserWrap(
-            username=self.request.params.get('username'),
-            ip_addr=self.request.remote_addr)
-        audit_logger.store(action='user.login.failure', user=audit_user)
+        audit_logger.store(
+            action='user.login.failure',
+            user=audit_logger.UserWrap(
+                    username=self.request.params.get('username'),
+                    ip_addr=self.request.remote_addr))
+
     """
     from rhodecode.lib.utils2 import safe_unicode
     from rhodecode.lib.auth import AuthUser

From 8890b4a0da8747943f9205f01e94154e99a749da Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 12 May 2017 11:05:39 +0200
Subject: [PATCH 107/211] ldap: addedn info about custom certificates option

---
 rhodecode/authentication/plugins/auth_ldap.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rhodecode/authentication/plugins/auth_ldap.py b/rhodecode/authentication/plugins/auth_ldap.py
index 1eaaac6e..848f803c 100644
--- a/rhodecode/authentication/plugins/auth_ldap.py
+++ b/rhodecode/authentication/plugins/auth_ldap.py
@@ -112,7 +112,9 @@ class LdapSettingsSchema(AuthnPluginSettingsSchemaBase):
     tls_reqcert = colander.SchemaNode(
         colander.String(),
         default=tls_reqcert_choices[0],
-        description=_('Require Cert over TLS?'),
+        description=_('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.'),
         title=_('Certificate Checks'),
         validator=colander.OneOf(tls_reqcert_choices),
         widget='select')

From ddf67dbb5b29fa6fd0cfff6186134bd10cdb3e06 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 12 May 2017 11:55:07 +0200
Subject: [PATCH 108/211] repo-settings: unify the URL schemas and always use
 settings/ for repo based urls.

---
 rhodecode/apps/repository/__init__.py   | 10 +++++-----
 rhodecode/public/js/rhodecode/routes.js | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/rhodecode/apps/repository/__init__.py b/rhodecode/apps/repository/__init__.py
index a2eb23d4..b33f7faa 100644
--- a/rhodecode/apps/repository/__init__.py
+++ b/rhodecode/apps/repository/__init__.py
@@ -44,23 +44,23 @@ def includeme(config):
     # Maintenance
     config.add_route(
         name='repo_maintenance',
-        pattern='/{repo_name:.*?[^/]}/maintenance', repo_route=True)
+        pattern='/{repo_name:.*?[^/]}/settings/maintenance', repo_route=True)
 
     config.add_route(
         name='repo_maintenance_execute',
-        pattern='/{repo_name:.*?[^/]}/maintenance/execute', repo_route=True)
+        pattern='/{repo_name:.*?[^/]}/settings/maintenance/execute', repo_route=True)
 
     # Strip
     config.add_route(
         name='strip',
-        pattern='/{repo_name:.*?[^/]}/strip', repo_route=True)
+        pattern='/{repo_name:.*?[^/]}/settings/strip', repo_route=True)
 
     config.add_route(
         name='strip_check',
-        pattern='/{repo_name:.*?[^/]}/strip_check', repo_route=True)
+        pattern='/{repo_name:.*?[^/]}/settings/strip_check', repo_route=True)
 
     config.add_route(
         name='strip_execute',
-        pattern='/{repo_name:.*?[^/]}/strip_execute', repo_route=True)
+        pattern='/{repo_name:.*?[^/]}/settings/strip_execute', repo_route=True)
     # Scan module for configuration decorators.
     config.scan()
diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js
index a0506a1a..85266eb3 100644
--- a/rhodecode/public/js/rhodecode/routes.js
+++ b/rhodecode/public/js/rhodecode/routes.js
@@ -100,11 +100,11 @@ function registerRCRoutes() {
     pyroutes.register('edit_repo_caches', '/%(repo_name)s/settings/caches', ['repo_name']);
     pyroutes.register('edit_repo_perms', '/%(repo_name)s/settings/permissions', ['repo_name']);
     pyroutes.register('repo_reviewers', '/%(repo_name)s/settings/review/rules', ['repo_name']);
-    pyroutes.register('repo_maintenance', '/%(repo_name)s/maintenance', ['repo_name']);
-    pyroutes.register('repo_maintenance_execute', '/%(repo_name)s/maintenance/execute', ['repo_name']);
-    pyroutes.register('strip', '/%(repo_name)s/strip', ['repo_name']);
-    pyroutes.register('strip_check', '/%(repo_name)s/strip_check', ['repo_name']);
-    pyroutes.register('strip_execute', '/%(repo_name)s/strip_execute', ['repo_name']);
+    pyroutes.register('repo_maintenance', '/%(repo_name)s/settings/maintenance', ['repo_name']);
+    pyroutes.register('repo_maintenance_execute', '/%(repo_name)s/settings/maintenance/execute', ['repo_name']);
+    pyroutes.register('strip', '/%(repo_name)s/settings/strip', ['repo_name']);
+    pyroutes.register('strip_check', '/%(repo_name)s/settings/strip_check', ['repo_name']);
+    pyroutes.register('strip_execute', '/%(repo_name)s/settings/strip_execute', ['repo_name']);
     pyroutes.register('search', '/_admin/search', []);
     pyroutes.register('search_repo', '/%(repo_name)s/search', ['repo_name']);
     pyroutes.register('user_profile', '/_profiles/%(username)s', ['username']);

From ca6ba228c32d6e8f4cb4ab10bbd1bf8a3d58e536 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 12 May 2017 16:23:26 +0200
Subject: [PATCH 109/211] tags/branches/bookmarks: moved views into pyramid.

---
 rhodecode/apps/_base/__init__.py              | 72 +++++++++++++++-
 rhodecode/apps/repository/__init__.py         | 15 ++++
 .../repository/tests/test_repo_bookmarks.py}  | 29 +++++--
 .../repository/tests/test_repo_branches.py}   | 23 +++--
 .../repository/tests/test_repo_tags.py}       | 23 +++--
 .../apps/repository/views/repo_bookmarks.py   | 50 +++++++++++
 .../apps/repository/views/repo_branches.py    | 51 +++++++++++
 .../repository/views/repo_tags.py}            | 33 ++++---
 rhodecode/config/routing.py                   | 12 ---
 rhodecode/controllers/base_references.py      | 85 -------------------
 rhodecode/controllers/branches.py             | 45 ----------
 rhodecode/controllers/tags.py                 | 38 ---------
 rhodecode/public/js/rhodecode/routes.js       |  3 +
 rhodecode/templates/summary/components.mako   |  8 +-
 14 files changed, 264 insertions(+), 223 deletions(-)
 rename rhodecode/{tests/functional/test_bookmarks.py => apps/repository/tests/test_repo_bookmarks.py} (67%)
 rename rhodecode/{tests/functional/test_branches.py => apps/repository/tests/test_repo_branches.py} (71%)
 rename rhodecode/{tests/functional/test_tags.py => apps/repository/tests/test_repo_tags.py} (72%)
 create mode 100644 rhodecode/apps/repository/views/repo_bookmarks.py
 create mode 100644 rhodecode/apps/repository/views/repo_branches.py
 rename rhodecode/{controllers/bookmarks.py => apps/repository/views/repo_tags.py} (56%)
 delete mode 100644 rhodecode/controllers/base_references.py
 delete mode 100644 rhodecode/controllers/branches.py
 delete mode 100644 rhodecode/controllers/tags.py

diff --git a/rhodecode/apps/_base/__init__.py b/rhodecode/apps/_base/__init__.py
index cf324959..d9b7e080 100644
--- a/rhodecode/apps/_base/__init__.py
+++ b/rhodecode/apps/_base/__init__.py
@@ -24,8 +24,10 @@ from pylons import tmpl_context as c
 from pyramid.httpexceptions import HTTPFound
 
 from rhodecode.lib import helpers as h
-from rhodecode.lib.utils2 import StrictAttributeDict, safe_int
+from rhodecode.lib.utils import PartialRenderer
+from rhodecode.lib.utils2 import StrictAttributeDict, safe_int, datetime_to_time
 from rhodecode.lib.vcs.exceptions import RepositoryRequirementError
+from rhodecode.lib.ext_json import json
 from rhodecode.model import repo
 from rhodecode.model.db import User
 from rhodecode.model.scm import ScmModel
@@ -37,6 +39,24 @@ ADMIN_PREFIX = '/_admin'
 STATIC_FILE_PREFIX = '/_static'
 
 
+def get_format_ref_id(repo):
+    """Returns a `repo` specific reference formatter function"""
+    if h.is_svn(repo):
+        return _format_ref_id_svn
+    else:
+        return _format_ref_id
+
+
+def _format_ref_id(name, raw_id):
+    """Default formatting of a given reference `name`"""
+    return name
+
+
+def _format_ref_id_svn(name, raw_id):
+    """Special way of formatting a reference for Subversion including path"""
+    return '%s@%s' % (name, raw_id)
+
+
 class TemplateArgs(StrictAttributeDict):
     pass
 
@@ -170,6 +190,56 @@ class DataGridAppView(object):
         return draw, start, length
 
 
+class BaseReferencesView(RepoAppView):
+    """
+    Base for reference view for branches, tags and bookmarks.
+    """
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+
+        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
+        c.repo_info = self.db_repo
+
+        self._register_global_c(c)
+        return c
+
+    def load_refs_context(self, ref_items, partials_template):
+        _render = PartialRenderer(partials_template)
+        _data = []
+        pre_load = ["author", "date", "message"]
+
+        is_svn = h.is_svn(self.rhodecode_vcs_repo)
+        format_ref_id = get_format_ref_id(self.rhodecode_vcs_repo)
+
+        for ref_name, commit_id in ref_items:
+            commit = self.rhodecode_vcs_repo.get_commit(
+                commit_id=commit_id, pre_load=pre_load)
+
+            # TODO: johbo: Unify generation of reference links
+            use_commit_id = '/' in ref_name or is_svn
+            files_url = h.url(
+                'files_home',
+                repo_name=c.repo_name,
+                f_path=ref_name if is_svn else '',
+                revision=commit_id if use_commit_id else ref_name,
+                at=ref_name)
+
+            _data.append({
+                "name": _render('name', ref_name, files_url),
+                "name_raw": ref_name,
+                "date": _render('date', commit.date),
+                "date_raw": datetime_to_time(commit.date),
+                "author": _render('author', commit.author),
+                "commit": _render(
+                    'commit', commit.message, commit.raw_id, commit.idx),
+                "commit_raw": commit.idx,
+                "compare": _render(
+                    'compare', format_ref_id(ref_name, commit.raw_id)),
+            })
+        c.has_references = bool(_data)
+        c.data = json.dumps(_data)
+
+
 class RepoRoutePredicate(object):
     def __init__(self, val, config):
         self.val = val
diff --git a/rhodecode/apps/repository/__init__.py b/rhodecode/apps/repository/__init__.py
index b33f7faa..5fbfd135 100644
--- a/rhodecode/apps/repository/__init__.py
+++ b/rhodecode/apps/repository/__init__.py
@@ -21,6 +21,21 @@
 
 def includeme(config):
 
+    # Tags
+    config.add_route(
+        name='tags_home',
+        pattern='/{repo_name:.*?[^/]}/tags', repo_route=True)
+
+    # Branches
+    config.add_route(
+        name='branches_home',
+        pattern='/{repo_name:.*?[^/]}/branches', repo_route=True)
+
+    # Bookmarks
+    config.add_route(
+        name='bookmarks_home',
+        pattern='/{repo_name:.*?[^/]}/bookmarks', repo_route=True)
+
     # Settings
     config.add_route(
         name='edit_repo',
diff --git a/rhodecode/tests/functional/test_bookmarks.py b/rhodecode/apps/repository/tests/test_repo_bookmarks.py
similarity index 67%
rename from rhodecode/tests/functional/test_bookmarks.py
rename to rhodecode/apps/repository/tests/test_repo_bookmarks.py
index 8f3da043..5d3a2b35 100644
--- a/rhodecode/tests/functional/test_bookmarks.py
+++ b/rhodecode/apps/repository/tests/test_repo_bookmarks.py
@@ -18,24 +18,35 @@
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
+import pytest
 from rhodecode.model.db import Repository
-from rhodecode.tests import *
 
 
-class TestBookmarksController(TestController):
+def route_path(name, params=None, **kwargs):
+    import urllib
+
+    base_url = {
+        'bookmarks_home': '/{repo_name}/bookmarks',
+    }[name].format(**kwargs)
+
+    if params:
+        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+    return base_url
+
+
+@pytest.mark.usefixtures('autologin_user', 'app')
+class TestBookmarks(object):
 
     def test_index(self, backend):
-        self.log_user()
         if backend.alias == 'hg':
-            response = self.app.get(url(controller='bookmarks',
-                                        action='index',
-                                        repo_name=backend.repo_name))
+            response = self.app.get(
+                route_path('bookmarks_home', repo_name=backend.repo_name))
 
             repo = Repository.get_by_repo_name(backend.repo_name)
             for commit_id, obj_name in repo.scm_instance().bookmarks.items():
                 assert commit_id in response
                 assert obj_name in response
         else:
-            self.app.get(url(controller='bookmarks',
-                             action='index',
-                             repo_name=backend.repo_name), status=404)
\ No newline at end of file
+            self.app.get(
+                route_path('bookmarks_home', repo_name=backend.repo_name),
+                status=404)
diff --git a/rhodecode/tests/functional/test_branches.py b/rhodecode/apps/repository/tests/test_repo_branches.py
similarity index 71%
rename from rhodecode/tests/functional/test_branches.py
rename to rhodecode/apps/repository/tests/test_repo_branches.py
index 50a96375..f8a4d338 100644
--- a/rhodecode/tests/functional/test_branches.py
+++ b/rhodecode/apps/repository/tests/test_repo_branches.py
@@ -18,17 +18,28 @@
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
+import pytest
 from rhodecode.model.db import Repository
-from rhodecode.tests import *
 
 
-class TestBranchesController(TestController):
+def route_path(name, params=None, **kwargs):
+    import urllib
+
+    base_url = {
+        'branches_home': '/{repo_name}/branches',
+    }[name].format(**kwargs)
+
+    if params:
+        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+    return base_url
+
+
+@pytest.mark.usefixtures('autologin_user', 'app')
+class TestBranchesController(object):
 
     def test_index(self, backend):
-        self.log_user()
-        response = self.app.get(url(controller='branches',
-                                    action='index',
-                                    repo_name=backend.repo_name))
+        response = self.app.get(
+            route_path('branches_home', repo_name=backend.repo_name))
 
         repo = Repository.get_by_repo_name(backend.repo_name)
 
diff --git a/rhodecode/tests/functional/test_tags.py b/rhodecode/apps/repository/tests/test_repo_tags.py
similarity index 72%
rename from rhodecode/tests/functional/test_tags.py
rename to rhodecode/apps/repository/tests/test_repo_tags.py
index bc31d0a1..7210b6b2 100644
--- a/rhodecode/tests/functional/test_tags.py
+++ b/rhodecode/apps/repository/tests/test_repo_tags.py
@@ -18,16 +18,27 @@
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
+import pytest
 from rhodecode.model.db import Repository
-from rhodecode.tests import *
 
 
-class TestTagsController(TestController):
+def route_path(name, params=None, **kwargs):
+    import urllib
+
+    base_url = {
+        'tags_home': '/{repo_name}/tags',
+    }[name].format(**kwargs)
+
+    if params:
+        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+    return base_url
+
+
+@pytest.mark.usefixtures('autologin_user', 'app')
+class TestTagsController(object):
     def test_index(self, backend):
-        self.log_user()
-        response = self.app.get(url(controller='tags',
-                                    action='index',
-                                    repo_name=backend.repo_name))
+        response = self.app.get(
+            route_path('tags_home', repo_name=backend.repo_name))
 
         repo = Repository.get_by_repo_name(backend.repo_name)
 
diff --git a/rhodecode/apps/repository/views/repo_bookmarks.py b/rhodecode/apps/repository/views/repo_bookmarks.py
new file mode 100644
index 00000000..fc071b55
--- /dev/null
+++ b/rhodecode/apps/repository/views/repo_bookmarks.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2011-2017 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
+
+from pyramid.httpexceptions import HTTPNotFound
+from pyramid.view import view_config
+
+from rhodecode.apps._base import BaseReferencesView
+from rhodecode.lib.auth import (LoginRequired, HasRepoPermissionAnyDecorator)
+from rhodecode.lib import helpers as h
+
+log = logging.getLogger(__name__)
+
+
+class RepoBookmarksView(BaseReferencesView):
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator(
+        'repository.read', 'repository.write', 'repository.admin')
+    @view_config(
+        route_name='bookmarks_home', request_method='GET',
+        renderer='rhodecode:templates/bookmarks/bookmarks.mako')
+    def bookmarks(self):
+        c = self.load_default_context()
+
+        if not h.is_hg(self.db_repo):
+            raise HTTPNotFound()
+
+        ref_items = self.rhodecode_vcs_repo.bookmarks.items()
+        self.load_refs_context(
+            ref_items=ref_items, partials_template='bookmarks/bookmarks_data.mako')
+
+        return self._get_template_context(c)
diff --git a/rhodecode/apps/repository/views/repo_branches.py b/rhodecode/apps/repository/views/repo_branches.py
new file mode 100644
index 00000000..15c89572
--- /dev/null
+++ b/rhodecode/apps/repository/views/repo_branches.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2011-2017 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
+from pyramid.view import view_config
+
+from rhodecode.apps._base import BaseReferencesView
+from rhodecode.lib.auth import (LoginRequired, HasRepoPermissionAnyDecorator)
+
+
+log = logging.getLogger(__name__)
+
+
+class RepoBranchesView(BaseReferencesView):
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator(
+        'repository.read', 'repository.write', 'repository.admin')
+    @view_config(
+        route_name='branches_home', request_method='GET',
+        renderer='rhodecode:templates/branches/branches.mako')
+    def branches(self):
+        c = self.load_default_context()
+        c.closed_branches = self.rhodecode_vcs_repo.branches_closed
+        # NOTE(marcink):
+        # we need this trick because of PartialRenderer still uses the
+        # global 'c', we might not need this after full pylons migration
+        self._register_global_c(c)
+
+        ref_items = self.rhodecode_vcs_repo.branches_all.items()
+        self.load_refs_context(
+            ref_items=ref_items, partials_template='branches/branches_data.mako')
+
+        return self._get_template_context(c)
diff --git a/rhodecode/controllers/bookmarks.py b/rhodecode/apps/repository/views/repo_tags.py
similarity index 56%
rename from rhodecode/controllers/bookmarks.py
rename to rhodecode/apps/repository/views/repo_tags.py
index 270427a8..9d01fa8d 100644
--- a/rhodecode/controllers/bookmarks.py
+++ b/rhodecode/apps/repository/views/repo_tags.py
@@ -17,30 +17,29 @@
 # 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/
-"""
-Bookmarks controller for rhodecode
-"""
 
 import logging
+from pyramid.view import view_config
 
-from pylons import tmpl_context as c
-from webob.exc import HTTPNotFound
-
-from rhodecode.controllers.base_references import BaseReferencesController
-from rhodecode.lib import helpers as h
+from rhodecode.apps._base import BaseReferencesView
+from rhodecode.lib.auth import (LoginRequired, HasRepoPermissionAnyDecorator)
 
 log = logging.getLogger(__name__)
 
 
-class BookmarksController(BaseReferencesController):
+class RepoTagsView(BaseReferencesView):
 
-    partials_template = 'bookmarks/bookmarks_data.mako'
-    template = 'bookmarks/bookmarks.mako'
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator(
+        'repository.read', 'repository.write', 'repository.admin')
+    @view_config(
+        route_name='tags_home', request_method='GET',
+        renderer='rhodecode:templates/tags/tags.mako')
+    def tags(self):
+        c = self.load_default_context()
 
-    def __before__(self):
-        super(BookmarksController, self).__before__()
-        if not h.is_hg(c.rhodecode_repo):
-            raise HTTPNotFound()
+        ref_items = self.rhodecode_vcs_repo.tags.items()
+        self.load_refs_context(
+            ref_items=ref_items, partials_template='tags/tags_data.mako')
 
-    def _get_reference_items(self, repo):
-        return repo.bookmarks.items()
+        return self._get_template_context(c)
diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py
index a7f5ad35..54d88dc9 100644
--- a/rhodecode/config/routing.py
+++ b/rhodecode/config/routing.py
@@ -890,18 +890,6 @@ def make_map(config):
                  controller='summary', conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
-    rmap.connect('branches_home', '/{repo_name}/branches',
-                 controller='branches', conditions={'function': check_repo},
-                 requirements=URL_NAME_REQUIREMENTS)
-
-    rmap.connect('tags_home', '/{repo_name}/tags',
-                 controller='tags', conditions={'function': check_repo},
-                 requirements=URL_NAME_REQUIREMENTS)
-
-    rmap.connect('bookmarks_home', '/{repo_name}/bookmarks',
-                 controller='bookmarks', conditions={'function': check_repo},
-                 requirements=URL_NAME_REQUIREMENTS)
-
     rmap.connect('changelog_home', '/{repo_name}/changelog', jsroute=True,
                  controller='changelog', conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
diff --git a/rhodecode/controllers/base_references.py b/rhodecode/controllers/base_references.py
deleted file mode 100644
index b6775df4..00000000
--- a/rhodecode/controllers/base_references.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (C) 2010-2017 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/
-
-from pylons import tmpl_context as c
-
-from rhodecode.controllers import utils
-from rhodecode.lib import helpers as h
-from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
-from rhodecode.lib.base import BaseRepoController, render
-from rhodecode.lib.ext_json import json
-from rhodecode.lib.utils import PartialRenderer
-from rhodecode.lib.utils2 import datetime_to_time
-
-
-class BaseReferencesController(BaseRepoController):
-    """
-    Base for reference controllers for branches, tags and bookmarks.
-
-    Implement and set the following things:
-
-    - `partials_template` is the source for the partials to use.
-
-    - `template` is the template to render in the end.
-
-    - `_get_reference_items(repo)` should return a sequence of tuples which
-      map from `name` to `commit_id`.
-
-    """
-
-    @LoginRequired()
-    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
-                                   'repository.admin')
-    def index(self):
-        _render = PartialRenderer(self.partials_template)
-        _data = []
-        pre_load = ["author", "date", "message"]
-        repo = c.rhodecode_repo
-        is_svn = h.is_svn(repo)
-        format_ref_id = utils.get_format_ref_id(repo)
-
-        for ref_name, commit_id in self._get_reference_items(repo):
-            commit = repo.get_commit(
-                commit_id=commit_id, pre_load=pre_load)
-
-            # TODO: johbo: Unify generation of reference links
-            use_commit_id = '/' in ref_name or is_svn
-            files_url = h.url(
-                'files_home',
-                repo_name=c.repo_name,
-                f_path=ref_name if is_svn else '',
-                revision=commit_id if use_commit_id else ref_name,
-                at=ref_name)
-
-            _data.append({
-                "name": _render('name', ref_name, files_url),
-                "name_raw": ref_name,
-                "date": _render('date', commit.date),
-                "date_raw": datetime_to_time(commit.date),
-                "author": _render('author', commit.author),
-                "commit": _render(
-                    'commit', commit.message, commit.raw_id, commit.idx),
-                "commit_raw": commit.idx,
-                "compare": _render(
-                    'compare', format_ref_id(ref_name, commit.raw_id)),
-            })
-        c.has_references = bool(_data)
-        c.data = json.dumps(_data)
-        return render(self.template)
diff --git a/rhodecode/controllers/branches.py b/rhodecode/controllers/branches.py
deleted file mode 100644
index ae1f275d..00000000
--- a/rhodecode/controllers/branches.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (C) 2010-2017 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/
-
-"""
-branches controller for rhodecode
-"""
-
-import logging
-
-from pylons import tmpl_context as c
-
-from rhodecode.controllers.base_references import BaseReferencesController
-
-
-log = logging.getLogger(__name__)
-
-
-class BranchesController(BaseReferencesController):
-
-    partials_template = 'branches/branches_data.mako'
-    template = 'branches/branches.mako'
-
-    def __before__(self):
-        super(BranchesController, self).__before__()
-        c.closed_branches = c.rhodecode_repo.branches_closed
-
-    def _get_reference_items(self, repo):
-        return repo.branches_all.items()
diff --git a/rhodecode/controllers/tags.py b/rhodecode/controllers/tags.py
deleted file mode 100644
index 68327df9..00000000
--- a/rhodecode/controllers/tags.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (C) 2010-2017 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/
-
-"""
-Tags controller for rhodecode
-"""
-
-import logging
-
-from rhodecode.controllers.base_references import BaseReferencesController
-
-log = logging.getLogger(__name__)
-
-
-class TagsController(BaseReferencesController):
-
-    partials_template = 'tags/tags_data.mako'
-    template = 'tags/tags.mako'
-
-    def _get_reference_items(self, repo):
-        return repo.tags.items()
diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js
index 85266eb3..ce6a741b 100644
--- a/rhodecode/public/js/rhodecode/routes.js
+++ b/rhodecode/public/js/rhodecode/routes.js
@@ -96,6 +96,9 @@ function registerRCRoutes() {
     pyroutes.register('user_group_autocomplete_data', '/_user_groups', []);
     pyroutes.register('repo_list_data', '/_repos', []);
     pyroutes.register('goto_switcher_data', '/_goto_data', []);
+    pyroutes.register('tags_home', '/%(repo_name)s/tags', ['repo_name']);
+    pyroutes.register('branches_home', '/%(repo_name)s/branches', ['repo_name']);
+    pyroutes.register('bookmarks_home', '/%(repo_name)s/bookmarks', ['repo_name']);
     pyroutes.register('edit_repo', '/%(repo_name)s/settings', ['repo_name']);
     pyroutes.register('edit_repo_caches', '/%(repo_name)s/settings/caches', ['repo_name']);
     pyroutes.register('edit_repo_perms', '/%(repo_name)s/settings/permissions', ['repo_name']);
diff --git a/rhodecode/templates/summary/components.mako b/rhodecode/templates/summary/components.mako
index c3a9a5b4..1f721f26 100644
--- a/rhodecode/templates/summary/components.mako
+++ b/rhodecode/templates/summary/components.mako
@@ -1,27 +1,27 @@
 <%def name="refs_counters(branches, closed_branches, tags, bookmarks)">
     <span class="branchtag tag">
-    <a href="${h.url('branches_home',repo_name=c.repo_name)}" class="childs">
+    <a href="${h.route_path('branches_home',repo_name=c.repo_name)}" class="childs">
       <i class="icon-branch"></i>${ungettext(
       '%(num)s Branch','%(num)s Branches', len(branches)) % {'num': len(branches)}}</a>
     </span>
 
     %if closed_branches:
     <span class="branchtag tag">
-    <a href="${h.url('branches_home',repo_name=c.repo_name)}" class="childs">
+    <a href="${h.route_path('branches_home',repo_name=c.repo_name)}" class="childs">
       <i class="icon-branch"></i>${ungettext(
       '%(num)s Closed Branch', '%(num)s Closed Branches', len(closed_branches)) % {'num': len(closed_branches)}}</a>
     </span>
     %endif
 
     <span class="tagtag tag">
-    <a href="${h.url('tags_home',repo_name=c.repo_name)}" class="childs">
+    <a href="${h.route_path('tags_home',repo_name=c.repo_name)}" class="childs">
         <i class="icon-tag"></i>${ungettext(
         '%(num)s Tag', '%(num)s Tags', len(tags)) % {'num': len(tags)}}</a>
     </span>
 
     %if bookmarks:
     <span class="booktag tag">
-    <a href="${h.url('bookmarks_home',repo_name=c.repo_name)}" class="childs">
+    <a href="${h.route_path('bookmarks_home',repo_name=c.repo_name)}" class="childs">
         <i class="icon-bookmark"></i>${ungettext(
         '%(num)s Bookmark', '%(num)s Bookmarks', len(bookmarks)) % {'num': len(bookmarks)}}</a>
     </span>

From e4c938f836206f295510a3deb646f699fe4c940b Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 12 May 2017 19:11:36 +0200
Subject: [PATCH 110/211] login: add link when using external auth to make it
 easier to login using oauth providers.

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

diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako
index b1d62ce2..7035c82a 100644
--- a/rhodecode/templates/base/base.mako
+++ b/rhodecode/templates/base/base.mako
@@ -322,8 +322,9 @@
                     <div class="buttons">
                         <div class="register">
                         %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
-                         ${h.link_to(_("Don't have an account ?"),h.route_path('register'))}
+                         ${h.link_to(_("Don't have an account?"),h.route_path('register'))} <br/>
                         %endif
+                        ${h.link_to(_("Using external auth? Login here."),h.route_path('login'))}
                         </div>
                         <div class="submit">
                             ${h.submit('sign_in',_('Sign In'),class_="btn btn-small",tabindex=3)}

From b2cfc908229184f8ab5a908020bdcb0c85142a04 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 15 May 2017 18:29:18 +0200
Subject: [PATCH 111/211] error-document: make sure the error document has
 registered helpers, and uses only pyramid mechanics.

- in some edge cases the renderer_globals are not called and
we cannot rely on them
- this should be a purely pyramid view not relying on any of pylons
left overs.
---
 rhodecode/apps/home/__init__.py                | 6 +++++-
 rhodecode/config/middleware.py                 | 5 +++--
 rhodecode/templates/errors/error_document.mako | 7 +++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/rhodecode/apps/home/__init__.py b/rhodecode/apps/home/__init__.py
index ac4265fc..1da8523a 100644
--- a/rhodecode/apps/home/__init__.py
+++ b/rhodecode/apps/home/__init__.py
@@ -22,6 +22,10 @@ from rhodecode.config import routing_links
 
 def includeme(config):
 
+    config.add_route(
+        name='home',
+        pattern='/')
+
     config.add_route(
         name='user_autocomplete_data',
         pattern='/_users')
@@ -38,7 +42,7 @@ def includeme(config):
         name='goto_switcher_data',
         pattern='/_goto_data')
 
-    # register our static links via redirection mechanismy
+    # register our static links via redirection mechanism
     routing_links.connect_redirection_links(config)
 
     # Scan module for configuration decorators.
diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py
index 0aa57c43..70678710 100644
--- a/rhodecode/config/middleware.py
+++ b/rhodecode/config/middleware.py
@@ -222,6 +222,7 @@ def add_pylons_compat_data(registry, global_config, settings):
 def error_handler(exception, request):
     import rhodecode
     from rhodecode.lib.utils2 import AttributeDict
+    from rhodecode.lib import helpers
 
     rhodecode_title = rhodecode.CONFIG.get('rhodecode_title') or 'RhodeCode'
 
@@ -255,9 +256,9 @@ def error_handler(exception, request):
     c.causes = []
     if hasattr(base_response, 'causes'):
         c.causes = base_response.causes
-
+    c.messages = helpers.flash.pop_messages()
     response = render_to_response(
-        '/errors/error_document.mako', {'c': c}, request=request,
+        '/errors/error_document.mako', {'c': c, 'h': helpers}, request=request,
         response=base_response)
 
     return response
diff --git a/rhodecode/templates/errors/error_document.mako b/rhodecode/templates/errors/error_document.mako
index f071a1ba..5c568e52 100644
--- a/rhodecode/templates/errors/error_document.mako
+++ b/rhodecode/templates/errors/error_document.mako
@@ -24,11 +24,10 @@
         <script type="text/javascript" src="${h.asset('js/scripts.js', ver=c.rhodecode_version_hash)}"></script>
     </head>
     <body>
-        <% messages = h.flash.pop_messages() %>
 
         <div class="wrapper error_page">
             <div class="sidebar">
-                <a href="${h.url('home')}"><img class="error-page-logo" src="${h.asset('images/RhodeCode_Logo_Black.png')}" alt="RhodeCode"/></a>
+                <a href="${h.route_path('home')}"><img class="error-page-logo" src="${h.asset('images/RhodeCode_Logo_Black.png')}" alt="RhodeCode"/></a>
             </div>
             <div class="main-content">
                 <h1>
@@ -37,8 +36,8 @@
                     </span><br/>
                     ${c.error_message} | <span class="error_message">${c.error_explanation}</span>
                 </h1>
-                % if messages:
-                    % for message in messages:
+                % if c.messages:
+                    % for message in c.messages:
                         <div class="alert alert-${message.category}">${message}</div>
                     % endfor
                 % endif    

From 1f812d6a5ee9961b0e99c92de9184f8ec0777194 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 15 May 2017 22:10:36 +0200
Subject: [PATCH 112/211] caches: ensure we don't use non-ascii characters in
 cache keys.

- this could before lead to problems in beaker cache implementation.
---
 rhodecode/lib/auth.py                         |  8 ++---
 rhodecode/model/db.py                         | 36 +++++++++----------
 rhodecode/model/integration.py                | 10 +++---
 rhodecode/model/repo.py                       | 11 +++---
 rhodecode/model/repo_group.py                 |  7 ++--
 rhodecode/model/user.py                       | 11 +++---
 .../tests/lib/middleware/test_simplevcs.py    |  4 +--
 7 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/rhodecode/lib/auth.py b/rhodecode/lib/auth.py
index d647ad9a..ba6320bb 100644
--- a/rhodecode/lib/auth.py
+++ b/rhodecode/lib/auth.py
@@ -1045,8 +1045,8 @@ class AuthUser(object):
             default_ips = UserIpMap.query().filter(
                 UserIpMap.user == User.get_default_user(cache=True))
             if cache:
-                default_ips = default_ips.options(FromCache("sql_cache_short",
-                                                  "get_user_ips_default"))
+                default_ips = default_ips.options(
+                    FromCache("sql_cache_short", "get_user_ips_default"))
 
             # populate from default user
             for ip in default_ips:
@@ -1059,8 +1059,8 @@ class AuthUser(object):
 
         user_ips = UserIpMap.query().filter(UserIpMap.user_id == user_id)
         if cache:
-            user_ips = user_ips.options(FromCache("sql_cache_short",
-                                                  "get_user_ips_%s" % user_id))
+            user_ips = user_ips.options(
+                FromCache("sql_cache_short", "get_user_ips_%s" % user_id))
 
         for ip in user_ips:
             try:
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index 720e8b10..284add7e 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -761,9 +761,9 @@ class User(Base, BaseModel):
                 if val:
                     return val
             else:
+                cache_key = "get_user_by_name_%s" % _hash_key(username)
                 q = q.options(
-                    FromCache("sql_cache_short",
-                              "get_user_by_name_%s" % _hash_key(username)))
+                    FromCache("sql_cache_short", cache_key))
 
         return q.scalar()
 
@@ -774,8 +774,8 @@ class User(Base, BaseModel):
             .filter(or_(UserApiKeys.expires == -1,
                         UserApiKeys.expires >= time.time()))
         if cache:
-            q = q.options(FromCache("sql_cache_short",
-                                    "get_auth_token_%s" % auth_token))
+            q = q.options(
+                FromCache("sql_cache_short", "get_auth_token_%s" % auth_token))
 
         match = q.first()
         if match:
@@ -790,9 +790,10 @@ class User(Base, BaseModel):
         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" % _hash_key(email)))
+            q = q.options(
+                FromCache("sql_cache_short", "get_email_key_%s" % email_key))
 
         ret = q.scalar()
         if ret is None:
@@ -804,8 +805,8 @@ class User(Base, BaseModel):
                 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))
+                q = q.options(
+                    FromCache("sql_cache_short", "get_email_map_key_%s" % email_key))
             ret = getattr(q.scalar(), 'user', None)
 
         return ret
@@ -1195,17 +1196,16 @@ class UserGroup(Base, BaseModel):
         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)))
+            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):
         user_group = cls.query()
         if cache:
-            user_group = user_group.options(FromCache("sql_cache_short",
-                                    "get_users_group_%s" % user_group_id))
+            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):
@@ -1546,9 +1546,9 @@ class Repository(Base, BaseModel):
                 if val:
                     return val
             else:
+                cache_key = "get_repo_by_name_%s" % _hash_key(repo_name)
                 q = q.options(
-                    FromCache("sql_cache_short",
-                              "get_repo_by_name_%s" % _hash_key(repo_name)))
+                    FromCache("sql_cache_short", cache_key))
 
         return q.scalar()
 
@@ -2204,9 +2204,9 @@ class RepoGroup(Base, BaseModel):
         else:
             gr = cls.query().filter(cls.group_name == group_name)
         if cache:
-            gr = gr.options(FromCache(
-                            "sql_cache_short",
-                            "get_group_%s" % _hash_key(group_name)))
+            name_key = _hash_key(group_name)
+            gr = gr.options(
+                FromCache("sql_cache_short", "get_group_%s" % name_key))
         return gr.scalar()
 
     @classmethod
diff --git a/rhodecode/model/integration.py b/rhodecode/model/integration.py
index 490d7581..72a7c02c 100644
--- a/rhodecode/model/integration.py
+++ b/rhodecode/model/integration.py
@@ -200,14 +200,14 @@ class IntegrationModel(BaseModel):
             query = query.filter(or_(*clauses))
 
             if cache:
-                query = query.options(FromCache(
-                    "sql_cache_short",
-                    "get_enabled_repo_integrations_%i" % event.repo.repo_id))
+                cache_key = "get_enabled_repo_integrations_%i" % event.repo.repo_id
+                query = query.options(
+                    FromCache("sql_cache_short", cache_key))
         else: # only global integrations
             query = query.filter(global_integrations_filter)
             if cache:
-                query = query.options(FromCache(
-                    "sql_cache_short", "get_enabled_global_integrations"))
+                query = query.options(
+                    FromCache("sql_cache_short", "get_enabled_global_integrations"))
 
         result = query.all()
         return result
\ No newline at end of file
diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py
index 3739be7b..507cc2d2 100644
--- a/rhodecode/model/repo.py
+++ b/rhodecode/model/repo.py
@@ -44,7 +44,7 @@ from rhodecode.lib.utils2 import (
     get_current_rhodecode_user, safe_int, datetime_to_time, action_logger_generic)
 from rhodecode.lib.vcs.backends import get_backend
 from rhodecode.model import BaseModel
-from rhodecode.model.db import (
+from rhodecode.model.db import (_hash_key,
     Repository, UserRepoToPerm, UserGroupRepoToPerm, UserRepoGroupToPerm,
     UserGroupRepoGroupToPerm, User, Permission, Statistics, UserGroup,
     RepoGroup, RepositoryField)
@@ -99,8 +99,8 @@ class RepoModel(BaseModel):
             .filter(Repository.repo_id == repo_id)
 
         if cache:
-            repo = repo.options(FromCache("sql_cache_short",
-                                          "get_repo_%s" % repo_id))
+            repo = repo.options(
+                FromCache("sql_cache_short", "get_repo_%s" % repo_id))
         return repo.scalar()
 
     def get_repo(self, repository):
@@ -111,8 +111,9 @@ class RepoModel(BaseModel):
             .filter(Repository.repo_name == repo_name)
 
         if cache:
-            repo = repo.options(FromCache("sql_cache_short",
-                                          "get_repo_%s" % repo_name))
+            name_key = _hash_key(repo_name)
+            repo = repo.options(
+                FromCache("sql_cache_short", "get_repo_%s" % name_key))
         return repo.scalar()
 
     def _extract_id_from_repo_name(self, repo_name):
diff --git a/rhodecode/model/repo_group.py b/rhodecode/model/repo_group.py
index 18b4b372..9ffb65e4 100644
--- a/rhodecode/model/repo_group.py
+++ b/rhodecode/model/repo_group.py
@@ -35,7 +35,7 @@ from zope.cachedescriptors.property import Lazy as LazyProperty
 
 from rhodecode import events
 from rhodecode.model import BaseModel
-from rhodecode.model.db import (
+from rhodecode.model.db import (_hash_key,
     RepoGroup, UserRepoGroupToPerm, User, Permission, UserGroupRepoGroupToPerm,
     UserGroup, Repository)
 from rhodecode.model.settings import VcsSettingsModel, SettingsModel
@@ -73,8 +73,9 @@ class RepoGroupModel(BaseModel):
             .filter(RepoGroup.group_name == repo_group_name)
 
         if cache:
-            repo = repo.options(FromCache(
-                "sql_cache_short", "get_repo_group_%s" % repo_group_name))
+            name_key = _hash_key(repo_group_name)
+            repo = repo.options(
+                FromCache("sql_cache_short", "get_repo_group_%s" % name_key))
         return repo.scalar()
 
     def get_default_create_personal_repo_group(self):
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py
index 4aa7fb18..62d16a3e 100644
--- a/rhodecode/model/user.py
+++ b/rhodecode/model/user.py
@@ -40,7 +40,7 @@ from rhodecode.lib.utils2 import (
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.model import BaseModel
 from rhodecode.model.auth_token import AuthTokenModel
-from rhodecode.model.db import (
+from rhodecode.model.db import (_hash_key,
     or_, joinedload, User, UserToPerm, UserEmailMap, UserIpMap, UserLog)
 from rhodecode.lib.exceptions import (
     DefaultUserException, UserOwnsReposException, UserOwnsRepoGroupsException,
@@ -58,8 +58,8 @@ class UserModel(BaseModel):
     def get(self, user_id, cache=False):
         user = self.sa.query(User)
         if cache:
-            user = user.options(FromCache("sql_cache_short",
-                                          "get_user_%s" % user_id))
+            user = user.options(
+                FromCache("sql_cache_short", "get_user_%s" % user_id))
         return user.get(user_id)
 
     def get_user(self, user):
@@ -112,8 +112,9 @@ class UserModel(BaseModel):
             user = self.sa.query(User)\
                 .filter(User.username == username)
         if cache:
-            user = user.options(FromCache("sql_cache_short",
-                                          "get_user_%s" % username))
+            name_key = _hash_key(username)
+            user = user.options(
+                FromCache("sql_cache_short", "get_user_%s" % name_key))
         return user.scalar()
 
     def get_by_email(self, email, cache=False, case_insensitive=False):
diff --git a/rhodecode/tests/lib/middleware/test_simplevcs.py b/rhodecode/tests/lib/middleware/test_simplevcs.py
index b5512265..936ca2dc 100644
--- a/rhodecode/tests/lib/middleware/test_simplevcs.py
+++ b/rhodecode/tests/lib/middleware/test_simplevcs.py
@@ -87,8 +87,8 @@ def vcscontroller(pylonsapp, config_stub):
 def _remove_default_user_from_query_cache():
     user = User.get_default_user(cache=True)
     query = Session().query(User).filter(User.username == user.username)
-    query = query.options(FromCache(
-        "sql_cache_short", "get_user_%s" % _hash_key(user.username)))
+    query = query.options(
+        FromCache("sql_cache_short", "get_user_%s" % _hash_key(user.username)))
     query.invalidate()
     Session().expire(user)
 

From 27a8d620429ec370e1159cf163b8515f0f44ae56 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 16 May 2017 21:26:18 +0200
Subject: [PATCH 113/211] admin: fix wrong ext_json import from tools.

---
 rhodecode/apps/admin/views/users.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rhodecode/apps/admin/views/users.py b/rhodecode/apps/admin/views/users.py
index 196f1b41..6647051e 100644
--- a/rhodecode/apps/admin/views/users.py
+++ b/rhodecode/apps/admin/views/users.py
@@ -26,7 +26,7 @@ from pyramid.view import view_config
 from sqlalchemy.sql.functions import coalesce
 
 from rhodecode.lib.helpers import Page
-from rhodecode_tools.lib.ext_json import json
+from rhodecode.lib.ext_json import json
 
 from rhodecode.apps._base import BaseAppView, DataGridAppView
 from rhodecode.lib.auth import (

From 208136ab4dc105ceaf54b25ab6ce2d2d96018b41 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 16 May 2017 12:43:58 +0200
Subject: [PATCH 114/211] repo-settings: moved advanced setion into pyramid
 views.

- improved delete method, and actions.
---
 rhodecode/apps/repository/__init__.py         |  28 +++
 .../repository/tests/test_repo_settings.py    |   5 +-
 .../tests/test_repo_settings_advanced.py      | 150 ++++++++++++
 .../views/repo_settings_advanced.py           | 225 ++++++++++++++++++
 rhodecode/config/routing.py                   |  21 +-
 rhodecode/controllers/admin/repos.py          | 144 -----------
 rhodecode/lib/audit_logger.py                 |   5 +-
 rhodecode/public/js/rhodecode/routes.js       |   6 +
 .../templates/admin/repos/repo_edit.mako      |   2 +-
 .../admin/repos/repo_edit_advanced.mako       |  33 ++-
 .../templates/data_table/_dt_elements.mako    |   2 +-
 .../tests/functional/test_admin_repos.py      |  91 -------
 rhodecode/tests/functional/test_forks.py      |   4 +-
 13 files changed, 435 insertions(+), 281 deletions(-)
 create mode 100644 rhodecode/apps/repository/tests/test_repo_settings_advanced.py
 create mode 100644 rhodecode/apps/repository/views/repo_settings_advanced.py

diff --git a/rhodecode/apps/repository/__init__.py b/rhodecode/apps/repository/__init__.py
index 5fbfd135..9f9bb5ab 100644
--- a/rhodecode/apps/repository/__init__.py
+++ b/rhodecode/apps/repository/__init__.py
@@ -21,6 +21,11 @@
 
 def includeme(config):
 
+    # Summary
+    config.add_route(
+        name='repo_summary_explicit',
+        pattern='/{repo_name:.*?[^/]}/summary', repo_route=True)
+
     # Tags
     config.add_route(
         name='tags_home',
@@ -41,6 +46,23 @@ def includeme(config):
         name='edit_repo',
         pattern='/{repo_name:.*?[^/]}/settings', repo_route=True)
 
+    # Settings advanced
+    config.add_route(
+        name='edit_repo_advanced',
+        pattern='/{repo_name:.*?[^/]}/settings/advanced', repo_route=True)
+    config.add_route(
+        name='edit_repo_advanced_delete',
+        pattern='/{repo_name:.*?[^/]}/settings/advanced/delete', repo_route=True)
+    config.add_route(
+        name='edit_repo_advanced_locking',
+        pattern='/{repo_name:.*?[^/]}/settings/advanced/locking', repo_route=True)
+    config.add_route(
+        name='edit_repo_advanced_journal',
+        pattern='/{repo_name:.*?[^/]}/settings/advanced/journal', repo_route=True)
+    config.add_route(
+        name='edit_repo_advanced_fork',
+        pattern='/{repo_name:.*?[^/]}/settings/advanced/fork', repo_route=True)
+
     # Caches
     config.add_route(
         name='edit_repo_caches',
@@ -77,5 +99,11 @@ def includeme(config):
     config.add_route(
         name='strip_execute',
         pattern='/{repo_name:.*?[^/]}/settings/strip_execute', repo_route=True)
+
+    # NOTE(marcink): needs to be at the end for catch-all
+    # config.add_route(
+    #     name='repo_summary',
+    #     pattern='/{repo_name:.*?[^/]}', repo_route=True)
+
     # Scan module for configuration decorators.
     config.scan()
diff --git a/rhodecode/apps/repository/tests/test_repo_settings.py b/rhodecode/apps/repository/tests/test_repo_settings.py
index 865f990a..9262dda9 100644
--- a/rhodecode/apps/repository/tests/test_repo_settings.py
+++ b/rhodecode/apps/repository/tests/test_repo_settings.py
@@ -38,6 +38,7 @@ def route_path(name, params=None, **kwargs):
 
     base_url = {
         'edit_repo': '/{repo_name}/settings',
+        'edit_repo_advanced': '/{repo_name}/settings/advanced',
         'edit_repo_caches': '/{repo_name}/settings/caches',
         'edit_repo_perms': '/{repo_name}/settings/permissions',
     }[name].format(**kwargs)
@@ -62,6 +63,7 @@ class TestAdminRepoSettings(object):
         'edit_repo',
         'edit_repo_caches',
         'edit_repo_perms',
+        'edit_repo_advanced',
     ])
     def test_show_page(self, urlname, app, backend):
         app.get(route_path(urlname, repo_name=backend.repo_name), status=200)
@@ -74,10 +76,9 @@ class TestAdminRepoSettings(object):
             self.app.get(route_path('edit_repo', repo_name=backend_hg.repo_name))
 
     @pytest.mark.parametrize('urlname', [
-        'edit_repo_advanced',
         'repo_vcs_settings',
-        'edit_repo_fields',
         'repo_settings_issuetracker',
+        'edit_repo_fields',
         'edit_repo_remote',
         'edit_repo_statistics',
     ])
diff --git a/rhodecode/apps/repository/tests/test_repo_settings_advanced.py b/rhodecode/apps/repository/tests/test_repo_settings_advanced.py
new file mode 100644
index 00000000..523b5ac7
--- /dev/null
+++ b/rhodecode/apps/repository/tests/test_repo_settings_advanced.py
@@ -0,0 +1,150 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2017 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
+
+from rhodecode.lib.utils2 import safe_unicode, safe_str
+from rhodecode.model.db import Repository
+from rhodecode.model.repo import RepoModel
+from rhodecode.tests import (
+    HG_REPO, GIT_REPO, assert_session_flash, no_newline_id_generator)
+from rhodecode.tests.fixture import Fixture
+from rhodecode.tests.utils import repo_on_filesystem
+
+fixture = Fixture()
+
+
+def route_path(name, params=None, **kwargs):
+    import urllib
+
+    base_url = {
+        'repo_summary_explicit': '/{repo_name}/summary',
+        'repo_summary': '/{repo_name}',
+        'edit_repo_advanced': '/{repo_name}/settings/advanced',
+        'edit_repo_advanced_delete': '/{repo_name}/settings/advanced/delete',
+        'edit_repo_advanced_fork': '/{repo_name}/settings/advanced/fork',
+        'edit_repo_advanced_locking': '/{repo_name}/settings/advanced/locking',
+        'edit_repo_advanced_journal': '/{repo_name}/settings/advanced/journal',
+
+    }[name].format(**kwargs)
+
+    if params:
+        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+    return base_url
+
+
+@pytest.mark.usefixtures('autologin_user', 'app')
+class TestAdminRepoSettingsAdvanced(object):
+
+    def test_set_repo_fork_has_no_self_id(self, autologin_user, backend):
+        repo = backend.repo
+        response = self.app.get(
+            route_path('edit_repo_advanced', repo_name=backend.repo_name))
+        opt = """<option value="%s">vcs_test_git</option>""" % repo.repo_id
+        response.mustcontain(no=[opt])
+
+    def test_set_fork_of_target_repo(
+            self, autologin_user, backend, csrf_token):
+        target_repo = 'target_%s' % backend.alias
+        fixture.create_repo(target_repo, repo_type=backend.alias)
+        repo2 = Repository.get_by_repo_name(target_repo)
+        response = self.app.post(
+            route_path('edit_repo_advanced_fork', repo_name=backend.repo_name),
+            params={'id_fork_of': repo2.repo_id,
+                    'csrf_token': csrf_token})
+        repo = Repository.get_by_repo_name(backend.repo_name)
+        repo2 = Repository.get_by_repo_name(target_repo)
+        assert_session_flash(
+            response,
+            'Marked repo %s as fork of %s' % (repo.repo_name, repo2.repo_name))
+
+        assert repo.fork == repo2
+        response = response.follow()
+        # check if given repo is selected
+
+        opt = 'This repository is a fork of <a href="%s">%s</a>' % (
+            route_path('repo_summary', repo_name=repo2.repo_name),
+            repo2.repo_name)
+
+        response.mustcontain(opt)
+
+        fixture.destroy_repo(target_repo, forks='detach')
+
+    @pytest.mark.backends("hg", "git")
+    def test_set_fork_of_other_type_repo(
+            self, autologin_user, backend, csrf_token):
+        TARGET_REPO_MAP = {
+            'git': {
+                'type': 'hg',
+                'repo_name': HG_REPO},
+            'hg': {
+                'type': 'git',
+                'repo_name': GIT_REPO},
+        }
+        target_repo = TARGET_REPO_MAP[backend.alias]
+
+        repo2 = Repository.get_by_repo_name(target_repo['repo_name'])
+        response = self.app.post(
+            route_path('edit_repo_advanced_fork', repo_name=backend.repo_name),
+            params={'id_fork_of': repo2.repo_id,
+                    'csrf_token': csrf_token})
+        assert_session_flash(
+            response,
+            'Cannot set repository as fork of repository with other type')
+
+    def test_set_fork_of_none(self, autologin_user, backend, csrf_token):
+        # mark it as None
+        response = self.app.post(
+            route_path('edit_repo_advanced_fork', repo_name=backend.repo_name),
+            params={'id_fork_of': None, '_method': 'put',
+                    'csrf_token': csrf_token})
+        assert_session_flash(
+            response,
+            'Marked repo %s as fork of %s'
+            % (backend.repo_name, "Nothing"))
+        assert backend.repo.fork is None
+
+    def test_set_fork_of_same_repo(self, autologin_user, backend, csrf_token):
+        repo = Repository.get_by_repo_name(backend.repo_name)
+        response = self.app.post(
+            route_path('edit_repo_advanced_fork', repo_name=backend.repo_name),
+            params={'id_fork_of': repo.repo_id, 'csrf_token': csrf_token})
+        assert_session_flash(
+            response, 'An error occurred during this operation')
+
+    @pytest.mark.parametrize(
+        "suffix",
+        ['', u'ąęł' , '123'],
+        ids=no_newline_id_generator)
+    def test_advanced_delete(self, autologin_user, backend, suffix, csrf_token):
+        repo = backend.create_repo(name_suffix=suffix)
+        repo_name = repo.repo_name
+        repo_name_str = safe_str(repo.repo_name)
+
+        response = self.app.post(
+            route_path('edit_repo_advanced_delete', repo_name=repo_name_str),
+            params={'csrf_token': csrf_token})
+        assert_session_flash(response,
+                             u'Deleted repository `{}`'.format(repo_name))
+        response.follow()
+
+        # check if repo was deleted from db
+        assert RepoModel().get_by_repo_name(repo_name) is None
+        assert not repo_on_filesystem(repo_name_str)
diff --git a/rhodecode/apps/repository/views/repo_settings_advanced.py b/rhodecode/apps/repository/views/repo_settings_advanced.py
new file mode 100644
index 00000000..c95ef398
--- /dev/null
+++ b/rhodecode/apps/repository/views/repo_settings_advanced.py
@@ -0,0 +1,225 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2011-2017 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
+
+from pyramid.view import view_config
+from pyramid.httpexceptions import HTTPFound
+
+from rhodecode.apps._base import RepoAppView
+from rhodecode.lib import helpers as h
+from rhodecode.lib import audit_logger
+from rhodecode.lib.auth import (
+    LoginRequired, HasRepoPermissionAnyDecorator, CSRFRequired)
+from rhodecode.lib.exceptions import AttachedForksError
+from rhodecode.lib.utils2 import safe_int
+from rhodecode.lib.vcs import RepositoryError
+from rhodecode.model.db import Session, UserFollowing, User, Repository
+from rhodecode.model.repo import RepoModel
+from rhodecode.model.scm import ScmModel
+
+log = logging.getLogger(__name__)
+
+
+class RepoSettingsView(RepoAppView):
+
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+
+        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
+        c.repo_info = self.db_repo
+
+        self._register_global_c(c)
+        return c
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.admin')
+    @view_config(
+        route_name='edit_repo_advanced', request_method='GET',
+        renderer='rhodecode:templates/admin/repos/repo_edit.mako')
+    def edit_advanced(self):
+        c = self.load_default_context()
+        c.active = 'advanced'
+
+        c.default_user_id = User.get_default_user().user_id
+        c.in_public_journal = UserFollowing.query() \
+            .filter(UserFollowing.user_id == c.default_user_id) \
+            .filter(UserFollowing.follows_repository == c.repo_info).scalar()
+
+        c.has_origin_repo_read_perm = False
+        if self.db_repo.fork:
+            c.has_origin_repo_read_perm = h.HasRepoPermissionAny(
+                'repository.write', 'repository.read', 'repository.admin')(
+                self.db_repo.fork.repo_name, 'repo set as fork page')
+
+        return self._get_template_context(c)
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.admin')
+    @view_config(
+        route_name='edit_repo_advanced_delete', request_method='POST',
+        renderer='rhodecode:templates/admin/repos/repo_edit.mako')
+    def edit_advanced_delete(self):
+        """
+        Deletes the repository, or shows warnings if deletion is not possible
+        because of attached forks or other errors.
+        """
+        _ = self.request.translate
+        handle_forks = self.request.POST.get('forks', None)
+
+        try:
+            _forks = self.db_repo.forks.count()
+            if _forks and handle_forks:
+                if handle_forks == 'detach_forks':
+                    handle_forks = 'detach'
+                    h.flash(_('Detached %s forks') % _forks, category='success')
+                elif handle_forks == 'delete_forks':
+                    handle_forks = 'delete'
+                    h.flash(_('Deleted %s forks') % _forks, category='success')
+
+            repo_data = self.db_repo.get_api_data()
+            RepoModel().delete(self.db_repo, forks=handle_forks)
+
+            repo = audit_logger.RepoWrap(repo_id=self.db_repo.repo_id,
+                                         repo_name=self.db_repo.repo_name)
+            audit_logger.store(
+                action='repo.delete', action_data={'repo_data': repo_data},
+                user=self._rhodecode_user, repo=repo, commit=False)
+
+            ScmModel().mark_for_invalidation(self.db_repo_name)
+            h.flash(
+                _('Deleted repository `%s`') % self.db_repo_name,
+                category='success')
+            Session().commit()
+        except AttachedForksError:
+            repo_advanced_url = h.route_path(
+                'edit_repo_advanced', repo_name=self.db_repo_name,
+                _anchor='advanced-delete')
+            delete_anchor = h.link_to(_('detach or delete'), repo_advanced_url)
+            h.flash(_('Cannot delete `{repo}` it still contains attached forks. '
+                      'Try using {delete_or_detach} option.')
+                    .format(repo=self.db_repo_name, delete_or_detach=delete_anchor),
+                    category='warning')
+
+            # redirect to advanced for forks handle action ?
+            raise HTTPFound(repo_advanced_url)
+
+        except Exception:
+            log.exception("Exception during deletion of repository")
+            h.flash(_('An error occurred during deletion of `%s`')
+                    % self.db_repo_name, category='error')
+            # redirect to advanced for more deletion options
+            raise HTTPFound(
+                h.route_path('edit_repo_advanced', repo_name=self.db_repo_name),
+                _anchor='advanced-delete')
+
+        raise HTTPFound(h.route_path('home'))
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='edit_repo_advanced_journal', request_method='POST',
+        renderer='rhodecode:templates/admin/repos/repo_edit.mako')
+    def edit_advanced_journal(self):
+        """
+        Set's this repository to be visible in public journal,
+        in other words making default user to follow this repo
+        """
+        _ = self.request.translate
+
+        try:
+            user_id = User.get_default_user().user_id
+            ScmModel().toggle_following_repo(self.db_repo.repo_id, user_id)
+            h.flash(_('Updated repository visibility in public journal'),
+                    category='success')
+            Session().commit()
+        except Exception:
+            h.flash(_('An error occurred during setting this '
+                      'repository in public journal'),
+                    category='error')
+
+        raise HTTPFound(
+            h.route_path('edit_repo_advanced', repo_name=self.db_repo_name))
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='edit_repo_advanced_fork', request_method='POST',
+        renderer='rhodecode:templates/admin/repos/repo_edit.mako')
+    def edit_advanced_fork(self):
+        """
+        Mark given repository as a fork of another
+        """
+        _ = self.request.translate
+
+        new_fork_id = self.request.POST.get('id_fork_of')
+        try:
+
+            if new_fork_id and not new_fork_id.isdigit():
+                log.error('Given fork id %s is not an INT', new_fork_id)
+
+            fork_id = safe_int(new_fork_id)
+            repo = ScmModel().mark_as_fork(
+                self.db_repo_name, fork_id, self._rhodecode_user.user_id)
+            fork = repo.fork.repo_name if repo.fork else _('Nothing')
+            Session().commit()
+            h.flash(_('Marked repo %s as fork of %s') % (self.db_repo_name, fork),
+                    category='success')
+        except RepositoryError as e:
+            log.exception("Repository Error occurred")
+            h.flash(str(e), category='error')
+        except Exception as e:
+            log.exception("Exception while editing fork")
+            h.flash(_('An error occurred during this operation'),
+                    category='error')
+
+        raise HTTPFound(
+            h.route_path('edit_repo_advanced', repo_name=self.db_repo_name))
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='edit_repo_advanced_locking', request_method='POST',
+        renderer='rhodecode:templates/admin/repos/repo_edit.mako')
+    def edit_advanced_locking(self):
+        """
+        Toggle locking of repository
+        """
+        _ = self.request.translate
+        set_lock = self.request.POST.get('set_lock')
+        set_unlock = self.request.POST.get('set_unlock')
+
+        try:
+            if set_lock:
+                Repository.lock(self.db_repo, self._rhodecode_user.user_id,
+                                lock_reason=Repository.LOCK_WEB)
+                h.flash(_('Locked repository'), category='success')
+            elif set_unlock:
+                Repository.unlock(self.db_repo)
+                h.flash(_('Unlocked repository'), category='success')
+        except Exception as e:
+            log.exception("Exception during unlocking")
+            h.flash(_('An error occurred during unlocking'), category='error')
+
+        raise HTTPFound(
+            h.route_path('edit_repo_advanced', repo_name=self.db_repo_name))
diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py
index 54d88dc9..c72c2665 100644
--- a/rhodecode/config/routing.py
+++ b/rhodecode/config/routing.py
@@ -185,7 +185,7 @@ def make_map(config):
     #==========================================================================
 
     # MAIN PAGE
-    rmap.connect('home', '/', controller='home', action='index', jsroute=True)
+    rmap.connect('home', '/', controller='home', action='index')
 
     # ping and pylons error test
     rmap.connect('ping', '%s/ping' % (ADMIN_PREFIX,), controller='home', action='ping')
@@ -674,30 +674,11 @@ def make_map(config):
                  conditions={'method': ['DELETE'], 'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
-    rmap.connect('edit_repo_advanced', '/{repo_name}/settings/advanced',
-                 controller='admin/repos', action='edit_advanced',
-                 conditions={'method': ['GET'], 'function': check_repo},
-                 requirements=URL_NAME_REQUIREMENTS)
-
-    rmap.connect('edit_repo_advanced_locking', '/{repo_name}/settings/advanced/locking',
-                 controller='admin/repos', action='edit_advanced_locking',
-                 conditions={'method': ['PUT'], 'function': check_repo},
-                 requirements=URL_NAME_REQUIREMENTS)
     rmap.connect('toggle_locking', '/{repo_name}/settings/advanced/locking_toggle',
                  controller='admin/repos', action='toggle_locking',
                  conditions={'method': ['GET'], 'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
-    rmap.connect('edit_repo_advanced_journal', '/{repo_name}/settings/advanced/journal',
-                 controller='admin/repos', action='edit_advanced_journal',
-                 conditions={'method': ['PUT'], 'function': check_repo},
-                 requirements=URL_NAME_REQUIREMENTS)
-
-    rmap.connect('edit_repo_advanced_fork', '/{repo_name}/settings/advanced/fork',
-                 controller='admin/repos', action='edit_advanced_fork',
-                 conditions={'method': ['PUT'], 'function': check_repo},
-                 requirements=URL_NAME_REQUIREMENTS)
-
     rmap.connect('edit_repo_remote', '/{repo_name}/settings/remote',
                  controller='admin/repos', action='edit_remote_form',
                  conditions={'method': ['GET'], 'function': check_repo},
diff --git a/rhodecode/controllers/admin/repos.py b/rhodecode/controllers/admin/repos.py
index dd8998c3..22f265b3 100644
--- a/rhodecode/controllers/admin/repos.py
+++ b/rhodecode/controllers/admin/repos.py
@@ -288,51 +288,6 @@ class ReposController(BaseRepoController):
             return {'result': True}
         return {'result': False}
 
-    @HasRepoPermissionAllDecorator('repository.admin')
-    @auth.CSRFRequired()
-    def delete(self, repo_name):
-        """
-        DELETE /repos/repo_name: Delete an existing item"""
-        # Forms posted to this method should contain a hidden field:
-        #    <input type="hidden" name="_method" value="DELETE" />
-        # Or using helpers:
-        #    h.form(url('repo', repo_name=ID),
-        #           method='delete')
-        # url('repo', repo_name=ID)
-
-        repo_model = RepoModel()
-        repo = repo_model.get_by_repo_name(repo_name)
-        if not repo:
-            h.not_mapped_error(repo_name)
-            return redirect(url('repos'))
-        try:
-            _forks = repo.forks.count()
-            handle_forks = None
-            if _forks and request.POST.get('forks'):
-                do = request.POST['forks']
-                if do == 'detach_forks':
-                    handle_forks = 'detach'
-                    h.flash(_('Detached %s forks') % _forks, category='success')
-                elif do == 'delete_forks':
-                    handle_forks = 'delete'
-                    h.flash(_('Deleted %s forks') % _forks, category='success')
-            repo_model.delete(repo, forks=handle_forks)
-            action_logger(c.rhodecode_user, 'admin_deleted_repo',
-                  repo_name, self.ip_addr, self.sa)
-            ScmModel().mark_for_invalidation(repo_name)
-            h.flash(_('Deleted repository %s') % repo_name, category='success')
-            Session().commit()
-        except AttachedForksError:
-            h.flash(_('Cannot delete %s it still contains attached forks')
-                        % repo_name, category='warning')
-
-        except Exception:
-            log.exception("Exception during deletion of repository")
-            h.flash(_('An error occurred during deletion of %s') % repo_name,
-                    category='error')
-
-        return redirect(url('repos'))
-
     @HasPermissionAllDecorator('hg.admin')
     def show(self, repo_name, format='html'):
         """GET /repos/repo_name: Show a specific item"""
@@ -384,105 +339,6 @@ class ReposController(BaseRepoController):
             h.flash(msg, category='error')
         return redirect(url('edit_repo_fields', repo_name=repo_name))
 
-    @HasRepoPermissionAllDecorator('repository.admin')
-    def edit_advanced(self, repo_name):
-        """GET /repo_name/settings: Form to edit an existing item"""
-        c.repo_info = self._load_repo(repo_name)
-        c.default_user_id = User.get_default_user().user_id
-        c.in_public_journal = UserFollowing.query()\
-            .filter(UserFollowing.user_id == c.default_user_id)\
-            .filter(UserFollowing.follows_repository == c.repo_info).scalar()
-
-        c.active = 'advanced'
-        c.has_origin_repo_read_perm = False
-        if c.repo_info.fork:
-            c.has_origin_repo_read_perm = h.HasRepoPermissionAny(
-                'repository.write', 'repository.read', 'repository.admin')(
-                c.repo_info.fork.repo_name, 'repo set as fork page')
-
-        if request.POST:
-            return redirect(url('repo_edit_advanced'))
-        return render('admin/repos/repo_edit.mako')
-
-    @HasRepoPermissionAllDecorator('repository.admin')
-    @auth.CSRFRequired()
-    def edit_advanced_journal(self, repo_name):
-        """
-        Set's this repository to be visible in public journal,
-        in other words assing default user to follow this repo
-
-        :param repo_name:
-        """
-
-        try:
-            repo_id = Repository.get_by_repo_name(repo_name).repo_id
-            user_id = User.get_default_user().user_id
-            self.scm_model.toggle_following_repo(repo_id, user_id)
-            h.flash(_('Updated repository visibility in public journal'),
-                    category='success')
-            Session().commit()
-        except Exception:
-            h.flash(_('An error occurred during setting this'
-                      ' repository in public journal'),
-                    category='error')
-
-        return redirect(url('edit_repo_advanced', repo_name=repo_name))
-
-    @HasRepoPermissionAllDecorator('repository.admin')
-    @auth.CSRFRequired()
-    def edit_advanced_fork(self, repo_name):
-        """
-        Mark given repository as a fork of another
-
-        :param repo_name:
-        """
-
-        new_fork_id = request.POST.get('id_fork_of')
-        try:
-
-            if new_fork_id and not new_fork_id.isdigit():
-                log.error('Given fork id %s is not an INT', new_fork_id)
-
-            fork_id = safe_int(new_fork_id)
-            repo = ScmModel().mark_as_fork(repo_name, fork_id,
-                                           c.rhodecode_user.username)
-            fork = repo.fork.repo_name if repo.fork else _('Nothing')
-            Session().commit()
-            h.flash(_('Marked repo %s as fork of %s') % (repo_name, fork),
-                    category='success')
-        except RepositoryError as e:
-            log.exception("Repository Error occurred")
-            h.flash(str(e), category='error')
-        except Exception as e:
-            log.exception("Exception while editing fork")
-            h.flash(_('An error occurred during this operation'),
-                    category='error')
-
-        return redirect(url('edit_repo_advanced', repo_name=repo_name))
-
-    @HasRepoPermissionAllDecorator('repository.admin')
-    @auth.CSRFRequired()
-    def edit_advanced_locking(self, repo_name):
-        """
-        Unlock repository when it is locked !
-
-        :param repo_name:
-        """
-        try:
-            repo = Repository.get_by_repo_name(repo_name)
-            if request.POST.get('set_lock'):
-                Repository.lock(repo, c.rhodecode_user.user_id,
-                                lock_reason=Repository.LOCK_WEB)
-                h.flash(_('Locked repository'), category='success')
-            elif request.POST.get('set_unlock'):
-                Repository.unlock(repo)
-                h.flash(_('Unlocked repository'), category='success')
-        except Exception as e:
-            log.exception("Exception during unlocking")
-            h.flash(_('An error occurred during unlocking'),
-                    category='error')
-        return redirect(url('edit_repo_advanced', repo_name=repo_name))
-
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     @auth.CSRFRequired()
     def toggle_locking(self, repo_name):
diff --git a/rhodecode/lib/audit_logger.py b/rhodecode/lib/audit_logger.py
index 7a7b2093..183af07c 100644
--- a/rhodecode/lib/audit_logger.py
+++ b/rhodecode/lib/audit_logger.py
@@ -36,9 +36,10 @@ ACTIONS = {
     'user.push': {},
     'user.pull': {},
 
-    'repo.add': {},
+    'repo.create': {},
     'repo.edit': {},
     'repo.edit.permissions': {},
+    'repo.delete': {},
     'repo.commit.strip': {},
     'repo.archive.download': {},
 }
@@ -101,7 +102,7 @@ def store(
         audit_logger.store(
             action='repo.edit', user=self._rhodecode_user)
         audit_logger.store(
-            action='repo.delete',
+            action='repo.delete', action_data={'repo_data': repo_data},
             user=audit_logger.UserWrap(username='itried-login', ip_addr='8.8.8.8'))
 
         # repo action
diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js
index ce6a741b..425d4214 100644
--- a/rhodecode/public/js/rhodecode/routes.js
+++ b/rhodecode/public/js/rhodecode/routes.js
@@ -96,10 +96,16 @@ function registerRCRoutes() {
     pyroutes.register('user_group_autocomplete_data', '/_user_groups', []);
     pyroutes.register('repo_list_data', '/_repos', []);
     pyroutes.register('goto_switcher_data', '/_goto_data', []);
+    pyroutes.register('repo_summary_explicit', '/%(repo_name)s/summary', ['repo_name']);
     pyroutes.register('tags_home', '/%(repo_name)s/tags', ['repo_name']);
     pyroutes.register('branches_home', '/%(repo_name)s/branches', ['repo_name']);
     pyroutes.register('bookmarks_home', '/%(repo_name)s/bookmarks', ['repo_name']);
     pyroutes.register('edit_repo', '/%(repo_name)s/settings', ['repo_name']);
+    pyroutes.register('edit_repo_advanced', '/%(repo_name)s/settings/advanced', ['repo_name']);
+    pyroutes.register('edit_repo_advanced_delete', '/%(repo_name)s/settings/advanced/delete', ['repo_name']);
+    pyroutes.register('edit_repo_advanced_locking', '/%(repo_name)s/settings/advanced/locking', ['repo_name']);
+    pyroutes.register('edit_repo_advanced_journal', '/%(repo_name)s/settings/advanced/journal', ['repo_name']);
+    pyroutes.register('edit_repo_advanced_fork', '/%(repo_name)s/settings/advanced/fork', ['repo_name']);
     pyroutes.register('edit_repo_caches', '/%(repo_name)s/settings/caches', ['repo_name']);
     pyroutes.register('edit_repo_perms', '/%(repo_name)s/settings/permissions', ['repo_name']);
     pyroutes.register('repo_reviewers', '/%(repo_name)s/settings/review/rules', ['repo_name']);
diff --git a/rhodecode/templates/admin/repos/repo_edit.mako b/rhodecode/templates/admin/repos/repo_edit.mako
index 1a00f1ed..e27a6ada 100644
--- a/rhodecode/templates/admin/repos/repo_edit.mako
+++ b/rhodecode/templates/admin/repos/repo_edit.mako
@@ -45,7 +45,7 @@
               <a href="${h.route_path('edit_repo_perms', repo_name=c.repo_name)}">${_('Permissions')}</a>
           </li>
           <li class="${'active' if c.active=='advanced' else ''}">
-              <a href="${h.url('edit_repo_advanced', repo_name=c.repo_name)}">${_('Advanced')}</a>
+              <a href="${h.route_path('edit_repo_advanced', repo_name=c.repo_name)}">${_('Advanced')}</a>
           </li>
           <li class="${'active' if c.active=='vcs' else ''}">
               <a href="${h.url('repo_vcs_settings', repo_name=c.repo_name)}">${_('VCS')}</a>
diff --git a/rhodecode/templates/admin/repos/repo_edit_advanced.mako b/rhodecode/templates/admin/repos/repo_edit_advanced.mako
index f71c8d5c..529843a4 100644
--- a/rhodecode/templates/admin/repos/repo_edit_advanced.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_advanced.mako
@@ -10,8 +10,8 @@
 %>
 
 <div class="panel panel-default">
-    <div class="panel-heading">
-        <h3 class="panel-title">${_('Repository: %s') % c.repo_info.repo_name}</h3>
+    <div class="panel-heading" id="advanced-info" >
+        <h3 class="panel-title">${_('Repository: %s') % c.repo_info.repo_name} <a class="permalink" href="#advanced-info"> ¶</a></h3>
     </div>
     <div class="panel-body">
         ${base.dt_info_panel(elems)}
@@ -20,11 +20,11 @@
 
 
 <div class="panel panel-default">
-    <div class="panel-heading">
-        <h3 class="panel-title">${_('Fork Reference')}</h3>
+    <div class="panel-heading" id="advanced-fork">
+        <h3 class="panel-title">${_('Fork Reference')} <a class="permalink" href="#advanced-fork"> ¶</a></h3>
     </div>
     <div class="panel-body">
-      ${h.secure_form(url('edit_repo_advanced_fork', repo_name=c.repo_info.repo_name), method='put')}
+      ${h.secure_form(h.route_path('edit_repo_advanced_fork', repo_name=c.repo_info.repo_name), method='POST')}
 
         % if c.repo_info.fork:
             <div class="panel-body-title-text">${h.literal(_('This repository is a fork of %(repo_link)s') % {'repo_link': h.link_to_if(c.has_origin_repo_read_perm,c.repo_info.fork.repo_name, h.url('summary_home', repo_name=c.repo_info.fork.repo_name))})}
@@ -44,15 +44,14 @@
 
 
 <div class="panel panel-default">
-    <div class="panel-heading">
-        <h3 class="panel-title">${_('Public Journal Visibility')}</h3>
+    <div class="panel-heading" id="advanced-journal">
+        <h3 class="panel-title">${_('Public Journal Visibility')} <a class="permalink" href="#advanced-journal"> ¶</a></h3>
     </div>
     <div class="panel-body">
-      ${h.secure_form(url('edit_repo_advanced_journal', repo_name=c.repo_info.repo_name), method='put')}
+      ${h.secure_form(h.route_path('edit_repo_advanced_journal', repo_name=c.repo_info.repo_name), method='POST')}
         <div class="field">
         %if c.in_public_journal:
           <button class="btn btn-small" type="submit">
-              <i class="icon-minus"></i>
               ${_('Remove from Public Journal')}
           </button>
         %else:
@@ -70,11 +69,11 @@
 
 
 <div class="panel panel-default">
-    <div class="panel-heading">
-        <h3 class="panel-title">${_('Locking state')}</h3>
+    <div class="panel-heading" id="advanced-locking">
+        <h3 class="panel-title">${_('Locking state')} <a class="permalink" href="#advanced-locking"> ¶</a></h3>
     </div>
     <div class="panel-body">
-        ${h.secure_form(url('edit_repo_advanced_locking', repo_name=c.repo_info.repo_name), method='put')}
+        ${h.secure_form(h.route_path('edit_repo_advanced_locking', repo_name=c.repo_info.repo_name), method='POST')}
 
         %if c.repo_info.locked[0]:
              <div class="panel-body-title-text">${'Locked by %s on %s. Lock reason: %s' % (h.person_by_id(c.repo_info.locked[0]),
@@ -110,15 +109,15 @@
 </div>
 
 <div class="panel panel-danger">
-    <div class="panel-heading">
-        <h3 class="panel-title">${_('Delete repository')}</h3>
+    <div class="panel-heading" id="advanced-delete">
+        <h3 class="panel-title">${_('Delete repository')} <a class="permalink" href="#advanced-delete"> ¶</a></h3>
     </div>
     <div class="panel-body">
-      ${h.secure_form(url('repo', repo_name=c.repo_name),method='delete')}
+      ${h.secure_form(h.route_path('edit_repo_advanced_delete', repo_name=c.repo_name), method='POST')}
         <table class="display">
             <tr>
                 <td>
-                    ${ungettext('This repository has %s fork.', 'This repository has %s forks.', c.repo_info.  forks.count()) % c.repo_info.forks.count()}
+                    ${_ungettext('This repository has %s fork.', 'This repository has %s forks.', c.repo_info.forks.count()) % c.repo_info.forks.count()}
                 </td>
                 <td>
                     %if c.repo_info.forks.count():
@@ -143,7 +142,7 @@
         </div>
         <div class="field">
             <span class="help-block">
-                ${_('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.')}
+                ${_('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.')}
             </span>
         </div>
 
diff --git a/rhodecode/templates/data_table/_dt_elements.mako b/rhodecode/templates/data_table/_dt_elements.mako
index 26811250..ac2de551 100644
--- a/rhodecode/templates/data_table/_dt_elements.mako
+++ b/rhodecode/templates/data_table/_dt_elements.mako
@@ -119,7 +119,7 @@
         <i class="icon-pencil"></i>Edit</a>
     </div>
     <div class="grid_delete">
-      ${h.secure_form(h.url('repo', repo_name=repo_name),method='delete')}
+      ${h.secure_form(h.route_path('edit_repo_advanced_delete', repo_name=repo_name), method='POST')}
         ${h.submit('remove_%s' % repo_name,_('Delete'),class_="btn btn-link btn-danger",
         onclick="return confirm('"+_('Confirm to delete this repository: %s') % repo_name+"');")}
       ${h.end_form()}
diff --git a/rhodecode/tests/functional/test_admin_repos.py b/rhodecode/tests/functional/test_admin_repos.py
index 5f7a63f4..92e4629d 100644
--- a/rhodecode/tests/functional/test_admin_repos.py
+++ b/rhodecode/tests/functional/test_admin_repos.py
@@ -382,21 +382,6 @@ class TestAdminRepos(object):
                 csrf_token=csrf_token))
         response.mustcontain('Repository name cannot end with .git')
 
-    @pytest.mark.parametrize("suffix", [u'', u'ąęł'], ids=['', 'non-ascii'])
-    def test_delete(self, autologin_user, backend, suffix, csrf_token):
-        repo = backend.create_repo(name_suffix=suffix)
-        repo_name = repo.repo_name
-
-        response = self.app.post(url('repo', repo_name=repo_name),
-                                 params={'_method': 'delete',
-                                         'csrf_token': csrf_token})
-        assert_session_flash(response, 'Deleted repository %s' % (repo_name))
-        response.follow()
-
-        # check if repo was deleted from db
-        assert RepoModel().get_by_repo_name(repo_name) is None
-        assert not repo_on_filesystem(repo_name)
-
     def test_show(self, autologin_user, backend):
         self.app.get(url('repo', repo_name=backend.repo_name))
 
@@ -414,82 +399,6 @@ class TestAdminRepos(object):
         assert permissions[0].permission.permission_name == 'repository.none'
         assert permissions[0].repository.private is True
 
-    def test_set_repo_fork_has_no_self_id(self, autologin_user, backend):
-        repo = backend.repo
-        response = self.app.get(
-            url('edit_repo_advanced', repo_name=backend.repo_name))
-        opt = """<option value="%s">vcs_test_git</option>""" % repo.repo_id
-        response.mustcontain(no=[opt])
-
-    def test_set_fork_of_target_repo(
-            self, autologin_user, backend, csrf_token):
-        target_repo = 'target_%s' % backend.alias
-        fixture.create_repo(target_repo, repo_type=backend.alias)
-        repo2 = Repository.get_by_repo_name(target_repo)
-        response = self.app.post(
-            url('edit_repo_advanced_fork', repo_name=backend.repo_name),
-            params={'id_fork_of': repo2.repo_id, '_method': 'put',
-                    'csrf_token': csrf_token})
-        repo = Repository.get_by_repo_name(backend.repo_name)
-        repo2 = Repository.get_by_repo_name(target_repo)
-        assert_session_flash(
-            response,
-            'Marked repo %s as fork of %s' % (repo.repo_name, repo2.repo_name))
-
-        assert repo.fork == repo2
-        response = response.follow()
-        # check if given repo is selected
-
-        opt = 'This repository is a fork of <a href="%s">%s</a>' % (
-            url('summary_home', repo_name=repo2.repo_name), repo2.repo_name)
-
-        response.mustcontain(opt)
-
-        fixture.destroy_repo(target_repo, forks='detach')
-
-    @pytest.mark.backends("hg", "git")
-    def test_set_fork_of_other_type_repo(self, autologin_user, backend,
-                                         csrf_token):
-        TARGET_REPO_MAP = {
-            'git': {
-                'type': 'hg',
-                'repo_name': HG_REPO},
-            'hg': {
-                'type': 'git',
-                'repo_name': GIT_REPO},
-        }
-        target_repo = TARGET_REPO_MAP[backend.alias]
-
-        repo2 = Repository.get_by_repo_name(target_repo['repo_name'])
-        response = self.app.post(
-            url('edit_repo_advanced_fork', repo_name=backend.repo_name),
-            params={'id_fork_of': repo2.repo_id, '_method': 'put',
-                    'csrf_token': csrf_token})
-        assert_session_flash(
-            response,
-            'Cannot set repository as fork of repository with other type')
-
-    def test_set_fork_of_none(self, autologin_user, backend, csrf_token):
-        # mark it as None
-        response = self.app.post(
-            url('edit_repo_advanced_fork', repo_name=backend.repo_name),
-            params={'id_fork_of': None, '_method': 'put',
-                    'csrf_token': csrf_token})
-        assert_session_flash(
-            response,
-            'Marked repo %s as fork of %s'
-            % (backend.repo_name, "Nothing"))
-        assert backend.repo.fork is None
-
-    def test_set_fork_of_same_repo(self, autologin_user, backend, csrf_token):
-        repo = Repository.get_by_repo_name(backend.repo_name)
-        response = self.app.post(
-            url('edit_repo_advanced_fork', repo_name=backend.repo_name),
-            params={'id_fork_of': repo.repo_id, '_method': 'put',
-                    'csrf_token': csrf_token})
-        assert_session_flash(
-            response, 'An error occurred during this operation')
-
     def test_create_on_top_level_without_permissions(self, backend):
         session = login_user_session(
             self.app, TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS)
diff --git a/rhodecode/tests/functional/test_forks.py b/rhodecode/tests/functional/test_forks.py
index 1769b680..5bd807b4 100644
--- a/rhodecode/tests/functional/test_forks.py
+++ b/rhodecode/tests/functional/test_forks.py
@@ -106,9 +106,7 @@ class _BaseTest(TestController):
         )
 
         # remove this fork
-        response = self.app.post(
-            url('repo', repo_name=fork_name),
-            params={'_method': 'delete', 'csrf_token': self.csrf_token})
+        fixture.destroy_repo(fork_name)
 
     def test_fork_create_into_group(self):
         self.log_user()

From 5c453c1cb6c7e953ed07645717ae851f9f1970b3 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 16 May 2017 14:48:07 +0200
Subject: [PATCH 115/211] audit-logger: unify calls to repo.delete and also
 store source of call, api/web.

---
 rhodecode/api/tests/test_delete_repo.py       | 14 ++++++++------
 rhodecode/api/views/repo_api.py               | 19 +++++++++++++++----
 .../views/repo_settings_advanced.py           |  7 ++++---
 rhodecode/public/js/rhodecode/routes.js       |  2 +-
 4 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/rhodecode/api/tests/test_delete_repo.py b/rhodecode/api/tests/test_delete_repo.py
index d7ea6596..cab42790 100644
--- a/rhodecode/api/tests/test_delete_repo.py
+++ b/rhodecode/api/tests/test_delete_repo.py
@@ -30,43 +30,45 @@ from rhodecode.api.tests.utils import (
 class TestApiDeleteRepo(object):
     def test_api_delete_repo(self, backend):
         repo = backend.create_repo()
-
+        repo_name = repo.repo_name
         id_, params = build_data(
             self.apikey, 'delete_repo', repoid=repo.repo_name, )
         response = api_call(self.app, params)
 
         expected = {
-            'msg': 'Deleted repository `%s`' % (repo.repo_name,),
+            'msg': 'Deleted repository `%s`' % (repo_name,),
             'success': True
         }
         assert_ok(id_, expected, given=response.body)
 
     def test_api_delete_repo_by_non_admin(self, backend, user_regular):
         repo = backend.create_repo(cur_user=user_regular.username)
+        repo_name = repo.repo_name
         id_, params = build_data(
             user_regular.api_key, 'delete_repo', repoid=repo.repo_name, )
         response = api_call(self.app, params)
 
         expected = {
-            'msg': 'Deleted repository `%s`' % (repo.repo_name,),
+            'msg': 'Deleted repository `%s`' % (repo_name,),
             'success': True
         }
         assert_ok(id_, expected, given=response.body)
 
     def test_api_delete_repo_by_non_admin_no_permission(self, backend):
         repo = backend.create_repo()
+        repo_name = repo.repo_name
         id_, params = build_data(
             self.apikey_regular, 'delete_repo', repoid=repo.repo_name, )
         response = api_call(self.app, params)
-        expected = 'repository `%s` does not exist' % (repo.repo_name)
+        expected = 'repository `%s` does not exist' % (repo_name)
         assert_error(id_, expected, given=response.body)
 
     def test_api_delete_repo_exception_occurred(self, backend):
         repo = backend.create_repo()
+        repo_name = repo.repo_name
         id_, params = build_data(
             self.apikey, 'delete_repo', repoid=repo.repo_name, )
         with mock.patch.object(RepoModel, 'delete', crash):
             response = api_call(self.app, params)
-        expected = 'failed to delete repository `%s`' % (
-            repo.repo_name,)
+        expected = 'failed to delete repository `%s`' % (repo_name,)
         assert_error(id_, expected, given=response.body)
diff --git a/rhodecode/api/views/repo_api.py b/rhodecode/api/views/repo_api.py
index 031a642d..f78f4daf 100644
--- a/rhodecode/api/views/repo_api.py
+++ b/rhodecode/api/views/repo_api.py
@@ -29,6 +29,7 @@ from rhodecode.api.utils import (
     get_user_group_or_error, get_user_or_error, validate_repo_permissions,
     get_perm_or_error, parse_args, get_origin, build_commit_data,
     validate_set_owner_permissions)
+from rhodecode.lib import audit_logger
 from rhodecode.lib import repo_maintenance
 from rhodecode.lib.auth import HasPermissionAnyApi, HasUserGroupPermissionAnyApi
 from rhodecode.lib.utils2 import str2bool, time_to_datetime
@@ -1154,6 +1155,7 @@ def delete_repo(request, apiuser, repoid, forks=Optional('')):
     """
 
     repo = get_repo_or_error(repoid)
+    repo_name = repo.repo_name
     if not has_superadmin_permission(apiuser):
         _perms = ('repository.admin',)
         validate_repo_permissions(apiuser, repoid, repo, _perms)
@@ -1171,18 +1173,27 @@ def delete_repo(request, apiuser, repoid, forks=Optional('')):
                 'Cannot delete `%s` it still contains attached forks' %
                 (repo.repo_name,)
             )
-
+        repo_data = repo.get_api_data()
         RepoModel().delete(repo, forks=forks)
+
+        repo = audit_logger.RepoWrap(repo_id=None,
+                                     repo_name=repo.repo_name)
+
+        audit_logger.store(
+            action='repo.delete',
+            action_data={'repo_data': repo_data, 'source': 'api_call'},
+            user=apiuser, repo=repo, commit=False)
+
+        ScmModel().mark_for_invalidation(repo_name, delete=True)
         Session().commit()
         return {
-            'msg': 'Deleted repository `%s`%s' % (
-                repo.repo_name, _forks_msg),
+            'msg': 'Deleted repository `%s`%s' % (repo_name, _forks_msg),
             'success': True
         }
     except Exception:
         log.exception("Exception occurred while trying to delete repo")
         raise JSONRPCError(
-            'failed to delete repository `%s`' % (repo.repo_name,)
+            'failed to delete repository `%s`' % (repo_name,)
         )
 
 
diff --git a/rhodecode/apps/repository/views/repo_settings_advanced.py b/rhodecode/apps/repository/views/repo_settings_advanced.py
index c95ef398..8948e4f7 100644
--- a/rhodecode/apps/repository/views/repo_settings_advanced.py
+++ b/rhodecode/apps/repository/views/repo_settings_advanced.py
@@ -97,13 +97,14 @@ class RepoSettingsView(RepoAppView):
             repo_data = self.db_repo.get_api_data()
             RepoModel().delete(self.db_repo, forks=handle_forks)
 
-            repo = audit_logger.RepoWrap(repo_id=self.db_repo.repo_id,
+            repo = audit_logger.RepoWrap(repo_id=None,
                                          repo_name=self.db_repo.repo_name)
             audit_logger.store(
-                action='repo.delete', action_data={'repo_data': repo_data},
+                action='repo.delete',
+                action_data={'repo_data': repo_data, 'source': 'web_action'},
                 user=self._rhodecode_user, repo=repo, commit=False)
 
-            ScmModel().mark_for_invalidation(self.db_repo_name)
+            ScmModel().mark_for_invalidation(self.db_repo_name, delete=True)
             h.flash(
                 _('Deleted repository `%s`') % self.db_repo_name,
                 category='success')
diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js
index 425d4214..92dad0cd 100644
--- a/rhodecode/public/js/rhodecode/routes.js
+++ b/rhodecode/public/js/rhodecode/routes.js
@@ -12,7 +12,6 @@
  ******************************************************************************/
 function registerRCRoutes() {
     // routes registration
-    pyroutes.register('home', '/', []);
     pyroutes.register('new_repo', '/_admin/create_repository', []);
     pyroutes.register('edit_user', '/_admin/users/%(user_id)s/edit', ['user_id']);
     pyroutes.register('edit_user_group_members', '/_admin/user_groups/%(user_group_id)s/edit/members', ['user_group_id']);
@@ -92,6 +91,7 @@ function registerRCRoutes() {
     pyroutes.register('register', '/_admin/register', []);
     pyroutes.register('reset_password', '/_admin/password_reset', []);
     pyroutes.register('reset_password_confirmation', '/_admin/password_reset_confirmation', []);
+    pyroutes.register('home', '/', []);
     pyroutes.register('user_autocomplete_data', '/_users', []);
     pyroutes.register('user_group_autocomplete_data', '/_user_groups', []);
     pyroutes.register('repo_list_data', '/_repos', []);

From 59200825e30f5b4c3a3cc87220539ff4eb26c330 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 17 May 2017 16:24:34 +0200
Subject: [PATCH 116/211] hooks: added pushkey Mercurial hook.

- This will be needed to extract pushed Bookmarks.
---
 rhodecode/__init__.py                         |  2 +-
 .../dbmigrate/versions/073_version_4_8_0.py   | 63 +++++++++++++++++++
 rhodecode/model/db.py                         |  1 +
 3 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 rhodecode/lib/dbmigrate/versions/073_version_4_8_0.py

diff --git a/rhodecode/__init__.py b/rhodecode/__init__.py
index e4be6a1a..531167a8 100644
--- a/rhodecode/__init__.py
+++ b/rhodecode/__init__.py
@@ -51,7 +51,7 @@ PYRAMID_SETTINGS = {}
 EXTENSIONS = {}
 
 __version__ = ('.'.join((str(each) for each in VERSION[:3])))
-__dbversion__ = 72  # defines current db version for migrations
+__dbversion__ = 73  # defines current db version for migrations
 __platform__ = platform.system()
 __license__ = 'AGPLv3, and Commercial License'
 __author__ = 'RhodeCode GmbH'
diff --git a/rhodecode/lib/dbmigrate/versions/073_version_4_8_0.py b/rhodecode/lib/dbmigrate/versions/073_version_4_8_0.py
new file mode 100644
index 00000000..6928cf0e
--- /dev/null
+++ b/rhodecode/lib/dbmigrate/versions/073_version_4_8_0.py
@@ -0,0 +1,63 @@
+import logging
+
+from sqlalchemy import *
+from rhodecode.model import meta
+from rhodecode.lib.dbmigrate.versions import _reset_base, notify
+
+log = logging.getLogger(__name__)
+
+
+def get_by_key(cls, key):
+    return cls.query().filter(cls.ui_key == key).scalar()
+
+
+def create_or_update_hook(cls, key, val, SESSION):
+    new_ui = get_by_key(cls, key) or cls()
+    new_ui.ui_section = 'hooks'
+    new_ui.ui_active = True
+    new_ui.ui_key = key
+    new_ui.ui_value = val
+
+    SESSION().add(new_ui)
+
+
+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_7_0_0 as db
+
+    # issue fixups
+    fixups(db, meta.Session)
+
+
+def downgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine
+
+
+def fixups(models, _SESSION):
+
+    cleanup_if_present = (
+        'pushkey.key_push',
+    )
+
+    for hook in cleanup_if_present:
+        ui_cfg = models.RhodeCodeUi.query().filter(
+            models.RhodeCodeUi.ui_key == hook).scalar()
+        if ui_cfg is not None:
+            log.info('Removing RhodeCodeUI for hook "%s".', hook)
+            _SESSION().delete(ui_cfg)
+
+    to_add = [
+        ('pushkey.key_push',
+         'python:vcsserver.hooks.key_push'),
+    ]
+
+    for hook, value in to_add:
+        log.info('Adding RhodeCodeUI for hook "%s".', hook)
+        create_or_update_hook(models.RhodeCodeUi, hook, value, _SESSION)
+
+    _SESSION().commit()
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index 284add7e..ac7f7f25 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -358,6 +358,7 @@ class RhodeCodeUi(Base, BaseModel):
     HOOK_PRE_PUSH = 'prechangegroup.pre_push'
     HOOK_PRETX_PUSH = 'pretxnchangegroup.pre_push'
     HOOK_PUSH = 'changegroup.push_logger'
+    HOOK_PUSH_KEY = 'pushkey.key_push'
 
     # TODO: johbo: Unify way how hooks are configured for git and hg,
     # git part is currently hardcoded.

From 726bc5aba853f69ad1d459e06c1958f572cca98a Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 17 May 2017 16:42:00 +0200
Subject: [PATCH 117/211] hooks: deprecate old action_logger

---
 rhodecode/lib/hooks_base.py                     | 16 ++++------------
 rhodecode/tests/functional/test_pullrequests.py | 10 ++++++++--
 rhodecode/tests/lib/test_hooks_base.py          | 17 +++++++----------
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/rhodecode/lib/hooks_base.py b/rhodecode/lib/hooks_base.py
index 76b5f6f5..c6ded4e4 100644
--- a/rhodecode/lib/hooks_base.py
+++ b/rhodecode/lib/hooks_base.py
@@ -31,7 +31,6 @@ import rhodecode
 from rhodecode import events
 from rhodecode.lib import helpers as h
 from rhodecode.lib import audit_logger
-from rhodecode.lib.utils import action_logger
 from rhodecode.lib.utils2 import safe_str
 from rhodecode.lib.exceptions import HTTPLockedRC, UserCreationError
 from rhodecode.model.db import Repository, User
@@ -153,9 +152,6 @@ def pre_pull(extras):
 
 def post_pull(extras):
     """Hook executed after client pulls the code."""
-    user = User.get_by_username(extras.username)
-    action = 'pull'
-    action_logger(user, action, extras.repository, extras.ip, commit=True)
 
     audit_user = audit_logger.UserWrap(
         username=extras.username,
@@ -175,6 +171,7 @@ def post_pull(extras):
     output = ''
     # make lock is a tri state False, True, None. We only make lock on True
     if extras.make_lock is True and not is_shadow_repo(extras):
+        user = User.get_by_username(extras.username)
         Repository.lock(Repository.get_by_repo_name(extras.repository),
                         user.user_id,
                         lock_reason=Repository.LOCK_PULL)
@@ -195,16 +192,11 @@ def post_pull(extras):
 
 def post_push(extras):
     """Hook executed after user pushes to the repository."""
-    action_tmpl = extras.action + ':%s'
-    commit_ids = extras.commit_ids[:29000]
-
-    action = action_tmpl % ','.join(commit_ids)
-    action_logger(
-        extras.username, action, extras.repository, extras.ip, commit=True)
+    commit_ids = extras.commit_ids
 
+    # log the push call
     audit_user = audit_logger.UserWrap(
-        username=extras.username,
-        ip_addr=extras.ip)
+        username=extras.username, ip_addr=extras.ip)
     repo = audit_logger.RepoWrap(repo_name=extras.repository)
     audit_logger.store(
         action='user.push', action_data={
diff --git a/rhodecode/tests/functional/test_pullrequests.py b/rhodecode/tests/functional/test_pullrequests.py
index e7ee3899..4bed42f0 100644
--- a/rhodecode/tests/functional/test_pullrequests.py
+++ b/rhodecode/tests/functional/test_pullrequests.py
@@ -539,7 +539,7 @@ class TestPullrequestsController:
         # Check the relevant log entries were added
         user_logs = UserLog.query() \
             .filter(UserLog.version == UserLog.VERSION_1) \
-            .order_by('-user_log_id').limit(4)
+            .order_by('-user_log_id').limit(3)
         actions = [log.action for log in user_logs]
         pr_commit_ids = PullRequestModel()._get_commit_ids(pull_request)
         expected_actions = [
@@ -547,10 +547,16 @@ class TestPullrequestsController:
             u'user_merged_pull_request:%d' % pull_request_id,
             # The action below reflect that the post push actions were executed
             u'user_commented_pull_request:%d' % pull_request_id,
-            u'push:%s' % ','.join(pr_commit_ids),
         ]
         assert actions == expected_actions
 
+        user_logs = UserLog.query() \
+            .filter(UserLog.version == UserLog.VERSION_2) \
+            .order_by('-user_log_id').limit(1)
+        actions = [log.action for log in user_logs]
+        assert actions == ['user.push']
+        assert user_logs[0].action_data['commit_ids'] == pr_commit_ids
+
         # Check post_push rcextension was really executed
         push_calls = rhodecode.EXTENSIONS.calls['post_push']
         assert len(push_calls) == 1
diff --git a/rhodecode/tests/lib/test_hooks_base.py b/rhodecode/tests/lib/test_hooks_base.py
index 6e54c6e8..b1f956ee 100644
--- a/rhodecode/tests/lib/test_hooks_base.py
+++ b/rhodecode/tests/lib/test_hooks_base.py
@@ -20,15 +20,10 @@
 
 import mock
 import pytest
-
+from rhodecode.model.db import Session, UserLog
 from rhodecode.lib import hooks_base, utils2
 
 
-@mock.patch.multiple(
-    hooks_base,
-    action_logger=mock.Mock(),
-    post_push_extension=mock.Mock(),
-    Repository=mock.Mock())
 def test_post_push_truncates_commits(user_regular, repo_stub):
     extras = {
         'ip': '127.0.0.1',
@@ -49,11 +44,13 @@ def test_post_push_truncates_commits(user_regular, repo_stub):
     hooks_base.post_push(extras)
 
     # Calculate appropriate action string here
-    expected_action = 'push_local:%s' % ','.join(extras.commit_ids[:29000])
+    commit_ids = extras.commit_ids[:10000]
 
-    hooks_base.action_logger.assert_called_with(
-        extras.username, expected_action, extras.repository, extras.ip,
-        commit=True)
+    entry = UserLog.query().order_by('-user_log_id').first()
+    assert entry.action == 'user.push'
+    assert entry.action_data['commit_ids'] == commit_ids
+    Session().delete(entry)
+    Session().commit()
 
 
 def assert_called_with_mock(callable_, expected_mock_name):

From b942ed82f2be71f4cfa6e636d6b7ff6f77005244 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 17 May 2017 22:17:09 +0200
Subject: [PATCH 118/211] hooks: expose refs on push.

- allows easier pull request creation
---
 rhodecode/lib/db_manage.py                    |   1 +
 rhodecode/lib/hooks_base.py                   |  14 +-
 rhodecode/lib/utils.py                        |   1 +
 rhodecode/model/settings.py                   |   3 +-
 rhodecode/tests/lib/test_utils.py             |   8 +-
 .../tests/other/vcs_operations/__init__.py    |   7 +
 .../tests/other/vcs_operations/conftest.py    |   3 +
 .../vcs_operations/test_vcs_operations.py     | 178 +++++++++++++++++-
 8 files changed, 208 insertions(+), 7 deletions(-)

diff --git a/rhodecode/lib/db_manage.py b/rhodecode/lib/db_manage.py
index 2b4b5a5d..3668517b 100644
--- a/rhodecode/lib/db_manage.py
+++ b/rhodecode/lib/db_manage.py
@@ -319,6 +319,7 @@ class DbManage(object):
             (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'),
 
         ]
 
diff --git a/rhodecode/lib/hooks_base.py b/rhodecode/lib/hooks_base.py
index c6ded4e4..1d919b01 100644
--- a/rhodecode/lib/hooks_base.py
+++ b/rhodecode/lib/hooks_base.py
@@ -232,8 +232,20 @@ def post_push(extras):
             # 2xx Codes don't raise exceptions
             output += _http_ret.title
 
-    output += 'RhodeCode: push completed\n'
+    if extras.new_refs:
+        tmpl = \
+            extras.server_url + '/' + \
+            extras.repository + \
+            "/pull-request/new?{ref_type}={ref_name}"
+        for branch_name in extras.new_refs['branches']:
+            output += 'RhodeCode: open pull request link: {}\n'.format(
+                tmpl.format(ref_type='branch', ref_name=branch_name))
 
+        for book_name in extras.new_refs['bookmarks']:
+            output += 'RhodeCode: open pull request link: {}\n'.format(
+                tmpl.format(ref_type='bookmark', ref_name=book_name))
+
+    output += 'RhodeCode: push completed\n'
     return HookResponse(0, output)
 
 
diff --git a/rhodecode/lib/utils.py b/rhodecode/lib/utils.py
index 32eed5a9..a3f4fe3d 100644
--- a/rhodecode/lib/utils.py
+++ b/rhodecode/lib/utils.py
@@ -428,6 +428,7 @@ def config_data_from_db(clear_session=True, repo=None):
     if 'push' not in enabled_hook_classes:
         skip_entries.append(('hooks', RhodeCodeUi.HOOK_PRE_PUSH))
         skip_entries.append(('hooks', RhodeCodeUi.HOOK_PRETX_PUSH))
+        skip_entries.append(('hooks', RhodeCodeUi.HOOK_PUSH_KEY))
 
     config = [entry for entry in config if entry[:2] not in skip_entries]
 
diff --git a/rhodecode/model/settings.py b/rhodecode/model/settings.py
index 4770626a..560264cf 100644
--- a/rhodecode/model/settings.py
+++ b/rhodecode/model/settings.py
@@ -52,7 +52,8 @@ class SettingsModel(BaseModel):
     BUILTIN_HOOKS = (
         RhodeCodeUi.HOOK_REPO_SIZE, RhodeCodeUi.HOOK_PUSH,
         RhodeCodeUi.HOOK_PRE_PUSH, RhodeCodeUi.HOOK_PRETX_PUSH,
-        RhodeCodeUi.HOOK_PULL, RhodeCodeUi.HOOK_PRE_PULL)
+        RhodeCodeUi.HOOK_PULL, RhodeCodeUi.HOOK_PRE_PULL,
+        RhodeCodeUi.HOOK_PUSH_KEY,)
     HOOKS_SECTION = 'hooks'
 
     def __init__(self, sa=None, repo=None):
diff --git a/rhodecode/tests/lib/test_utils.py b/rhodecode/tests/lib/test_utils.py
index 3ae1b48e..808cccd7 100644
--- a/rhodecode/tests/lib/test_utils.py
+++ b/rhodecode/tests/lib/test_utils.py
@@ -86,22 +86,24 @@ HOOK_PUSH = db.RhodeCodeUi.HOOK_PUSH
 HOOK_PRE_PULL = db.RhodeCodeUi.HOOK_PRE_PULL
 HOOK_PULL = db.RhodeCodeUi.HOOK_PULL
 HOOK_REPO_SIZE = db.RhodeCodeUi.HOOK_REPO_SIZE
+HOOK_PUSH_KEY = db.RhodeCodeUi.HOOK_PUSH_KEY
 
 HG_HOOKS = frozenset(
     (HOOK_PRE_PULL, HOOK_PULL, HOOK_PRE_PUSH, HOOK_PRETX_PUSH, HOOK_PUSH,
-     HOOK_REPO_SIZE))
+     HOOK_REPO_SIZE, HOOK_PUSH_KEY))
 
 
 @pytest.mark.parametrize('disabled_hooks,expected_hooks', [
     ([], HG_HOOKS),
     (HG_HOOKS, []),
 
-    ([HOOK_PRE_PUSH, HOOK_PRETX_PUSH, HOOK_REPO_SIZE], [HOOK_PRE_PULL, HOOK_PULL, HOOK_PUSH]),
+    ([HOOK_PRE_PUSH, HOOK_PRETX_PUSH, HOOK_REPO_SIZE, HOOK_PUSH_KEY], [HOOK_PRE_PULL, HOOK_PULL, HOOK_PUSH]),
 
     # When a pull/push hook is disabled, its pre-pull/push counterpart should
     # be disabled too.
     ([HOOK_PUSH], [HOOK_PRE_PULL, HOOK_PULL, HOOK_REPO_SIZE]),
-    ([HOOK_PULL], [HOOK_PRE_PUSH, HOOK_PRETX_PUSH, HOOK_PUSH, HOOK_REPO_SIZE]),
+    ([HOOK_PULL], [HOOK_PRE_PUSH, HOOK_PRETX_PUSH, HOOK_PUSH, HOOK_REPO_SIZE,
+                   HOOK_PUSH_KEY]),
 ])
 def test_make_db_config_hg_hooks(pylonsapp, request, disabled_hooks,
                                  expected_hooks):
diff --git a/rhodecode/tests/other/vcs_operations/__init__.py b/rhodecode/tests/other/vcs_operations/__init__.py
index b26148f3..dda8ba64 100644
--- a/rhodecode/tests/other/vcs_operations/__init__.py
+++ b/rhodecode/tests/other/vcs_operations/__init__.py
@@ -131,6 +131,13 @@ def _check_proper_git_push(
         assert "Setting default branch" not in stderr
 
 
+def _check_proper_hg_push(stdout, stderr, branch='default'):
+    assert 'pushing to' in stdout
+    assert 'searching for changes' in stdout
+
+    assert 'abort:' not in stderr
+
+
 def _check_proper_clone(stdout, stderr, vcs):
     if vcs == 'hg':
         assert 'requesting all changes' in stdout
diff --git a/rhodecode/tests/other/vcs_operations/conftest.py b/rhodecode/tests/other/vcs_operations/conftest.py
index 11333bbc..36736605 100644
--- a/rhodecode/tests/other/vcs_operations/conftest.py
+++ b/rhodecode/tests/other/vcs_operations/conftest.py
@@ -84,6 +84,9 @@ class RcWebServer(object):
         _url = 'http://%(user)s:%(passwd)s@%(host)s/%(cloned_repo)s' % params
         return _url
 
+    def host_url(self):
+        return 'http://' + get_host_url(self.pylons_config)
+
 
 @pytest.fixture(scope="module")
 def rcextensions(request, pylonsapp, tmpdir_factory):
diff --git a/rhodecode/tests/other/vcs_operations/test_vcs_operations.py b/rhodecode/tests/other/vcs_operations/test_vcs_operations.py
index 6bcb1986..179e3639 100644
--- a/rhodecode/tests/other/vcs_operations/test_vcs_operations.py
+++ b/rhodecode/tests/other/vcs_operations/test_vcs_operations.py
@@ -34,6 +34,7 @@ import time
 import pytest
 
 from rhodecode.lib.vcs.backends.git.repository import GitRepository
+from rhodecode.lib.vcs.backends.hg.repository import MercurialRepository
 from rhodecode.lib.vcs.nodes import FileNode
 from rhodecode.model.auth_token import AuthTokenModel
 from rhodecode.model.db import Repository, UserIpMap, CacheKey
@@ -42,7 +43,8 @@ from rhodecode.model.user import UserModel
 from rhodecode.tests import (GIT_REPO, HG_REPO, TEST_USER_ADMIN_LOGIN)
 
 from rhodecode.tests.other.vcs_operations import (
-    Command, _check_proper_clone, _check_proper_git_push, _add_files_and_push,
+    Command, _check_proper_clone, _check_proper_git_push,
+    _check_proper_hg_push, _add_files_and_push,
     HG_REPO_WITH_GROUP, GIT_REPO_WITH_GROUP)
 
 
@@ -396,7 +398,6 @@ class TestVCSOperations(object):
             'hg clone', clone_url, tmpdir.strpath)
         assert 'abort: authorization failed' in stderr
 
-
     def test_clone_by_auth_token_with_scope(
             self, rc_web_server, tmpdir, user_util, enable_auth_plugins):
         enable_auth_plugins(['egg:rhodecode-enterprise-ce#token',
@@ -479,3 +480,176 @@ def test_git_fetches_from_remote_repository_with_annotated_tags(
     source_repo = backend_git['annotated-tag']
     target_vcs_repo = backend_git.create_repo().scm_instance()
     target_vcs_repo.fetch(rc_web_server.repo_clone_url(source_repo.repo_name))
+
+
+def test_git_push_shows_pull_request_refs(backend_git, rc_web_server, tmpdir):
+    """
+    test if remote info about refs is visible
+    """
+    empty_repo = backend_git.create_repo()
+
+    clone_url = rc_web_server.repo_clone_url(empty_repo.repo_name)
+
+    cmd = Command(tmpdir.strpath)
+    cmd.execute('git clone', clone_url)
+
+    repo = GitRepository(os.path.join(tmpdir.strpath, empty_repo.repo_name))
+    repo.in_memory_commit.add(FileNode('readme.md', content='## Hello'))
+    repo.in_memory_commit.commit(
+        message='Commit on branch Master',
+        author='Automatic test',
+        branch='master')
+
+    repo_cmd = Command(repo.path)
+    stdout, stderr = repo_cmd.execute('git push --verbose origin master')
+    _check_proper_git_push(stdout, stderr, branch='master')
+
+    ref = '{}/{}/pull-request/new?branch=master'.format(
+        rc_web_server.host_url(), empty_repo.repo_name)
+    assert 'remote: RhodeCode: open pull request link: {}'.format(ref) in stderr
+    assert 'remote: RhodeCode: push completed' in stderr
+
+    # push on the same branch
+    repo = GitRepository(os.path.join(tmpdir.strpath, empty_repo.repo_name))
+    repo.in_memory_commit.add(FileNode('setup.py', content='print\n'))
+    repo.in_memory_commit.commit(
+        message='Commit2 on branch Master',
+        author='Automatic test2',
+        branch='master')
+
+    repo_cmd = Command(repo.path)
+    stdout, stderr = repo_cmd.execute('git push --verbose origin master')
+    _check_proper_git_push(stdout, stderr, branch='master')
+
+    assert 'remote: RhodeCode: open pull request link: {}'.format(ref) in stderr
+    assert 'remote: RhodeCode: push completed' in stderr
+
+    # new Branch
+    repo = GitRepository(os.path.join(tmpdir.strpath, empty_repo.repo_name))
+    repo.in_memory_commit.add(FileNode('feature1.py', content='## Hello world'))
+    repo.in_memory_commit.commit(
+        message='Commit on branch feature',
+        author='Automatic test',
+        branch='feature')
+
+    repo_cmd = Command(repo.path)
+    stdout, stderr = repo_cmd.execute('git push --verbose origin feature')
+    _check_proper_git_push(stdout, stderr, branch='feature')
+
+    ref = '{}/{}/pull-request/new?branch=feature'.format(
+        rc_web_server.host_url(), empty_repo.repo_name)
+    assert 'remote: RhodeCode: open pull request link: {}'.format(ref) in stderr
+    assert 'remote: RhodeCode: push completed' in stderr
+
+
+def test_hg_push_shows_pull_request_refs(backend_hg, rc_web_server, tmpdir):
+    empty_repo = backend_hg.create_repo()
+
+    clone_url = rc_web_server.repo_clone_url(empty_repo.repo_name)
+
+    cmd = Command(tmpdir.strpath)
+    cmd.execute('hg clone', clone_url)
+
+    repo = MercurialRepository(os.path.join(tmpdir.strpath, empty_repo.repo_name))
+    repo.in_memory_commit.add(FileNode(u'readme.md', content=u'## Hello'))
+    repo.in_memory_commit.commit(
+        message=u'Commit on branch default',
+        author=u'Automatic test',
+        branch='default')
+
+    repo_cmd = Command(repo.path)
+    repo_cmd.execute('hg checkout default')
+
+    stdout, stderr = repo_cmd.execute('hg push --verbose', clone_url)
+    _check_proper_hg_push(stdout, stderr, branch='default')
+
+    ref = '{}/{}/pull-request/new?branch=default'.format(
+        rc_web_server.host_url(), empty_repo.repo_name)
+    assert 'remote: RhodeCode: open pull request link: {}'.format(ref) in stdout
+    assert 'remote: RhodeCode: push completed' in stdout
+
+    # push on the same branch
+    repo = MercurialRepository(os.path.join(tmpdir.strpath, empty_repo.repo_name))
+    repo.in_memory_commit.add(FileNode(u'setup.py', content=u'print\n'))
+    repo.in_memory_commit.commit(
+        message=u'Commit2 on branch default',
+        author=u'Automatic test2',
+        branch=u'default')
+
+    repo_cmd = Command(repo.path)
+    repo_cmd.execute('hg checkout default')
+
+    stdout, stderr = repo_cmd.execute('hg push --verbose', clone_url)
+    _check_proper_hg_push(stdout, stderr, branch='default')
+
+    assert 'remote: RhodeCode: open pull request link: {}'.format(ref) in stdout
+    assert 'remote: RhodeCode: push completed' in stdout
+
+    # new Branch
+    repo = MercurialRepository(os.path.join(tmpdir.strpath, empty_repo.repo_name))
+    repo.in_memory_commit.add(FileNode(u'feature1.py', content=u'## Hello world'))
+    repo.in_memory_commit.commit(
+        message=u'Commit on branch feature',
+        author=u'Automatic test',
+        branch=u'feature')
+
+    repo_cmd = Command(repo.path)
+    repo_cmd.execute('hg checkout feature')
+
+    stdout, stderr = repo_cmd.execute('hg push --new-branch --verbose', clone_url)
+    _check_proper_hg_push(stdout, stderr, branch='feature')
+
+    ref = '{}/{}/pull-request/new?branch=feature'.format(
+        rc_web_server.host_url(), empty_repo.repo_name)
+    assert 'remote: RhodeCode: open pull request link: {}'.format(ref) in stdout
+    assert 'remote: RhodeCode: push completed' in stdout
+
+
+def test_hg_push_shows_pull_request_refs_book(backend_hg, rc_web_server, tmpdir):
+    empty_repo = backend_hg.create_repo()
+
+    clone_url = rc_web_server.repo_clone_url(empty_repo.repo_name)
+
+    cmd = Command(tmpdir.strpath)
+    cmd.execute('hg clone', clone_url)
+
+    repo = MercurialRepository(os.path.join(tmpdir.strpath, empty_repo.repo_name))
+    repo.in_memory_commit.add(FileNode(u'readme.md', content=u'## Hello'))
+    repo.in_memory_commit.commit(
+        message=u'Commit on branch default',
+        author=u'Automatic test',
+        branch='default')
+
+    repo_cmd = Command(repo.path)
+    repo_cmd.execute('hg checkout default')
+
+    stdout, stderr = repo_cmd.execute('hg push --verbose', clone_url)
+    _check_proper_hg_push(stdout, stderr, branch='default')
+
+    ref = '{}/{}/pull-request/new?branch=default'.format(
+        rc_web_server.host_url(), empty_repo.repo_name)
+    assert 'remote: RhodeCode: open pull request link: {}'.format(ref) in stdout
+    assert 'remote: RhodeCode: push completed' in stdout
+
+    # add bookmark
+    repo = MercurialRepository(os.path.join(tmpdir.strpath, empty_repo.repo_name))
+    repo.in_memory_commit.add(FileNode(u'setup.py', content=u'print\n'))
+    repo.in_memory_commit.commit(
+        message=u'Commit2 on branch default',
+        author=u'Automatic test2',
+        branch=u'default')
+
+    repo_cmd = Command(repo.path)
+    repo_cmd.execute('hg checkout default')
+    repo_cmd.execute('hg bookmark feature2')
+    stdout, stderr = repo_cmd.execute('hg push -B feature2 --verbose', clone_url)
+    _check_proper_hg_push(stdout, stderr, branch='default')
+
+    ref = '{}/{}/pull-request/new?branch=default'.format(
+        rc_web_server.host_url(), empty_repo.repo_name)
+    assert 'remote: RhodeCode: open pull request link: {}'.format(ref) in stdout
+    ref = '{}/{}/pull-request/new?bookmark=feature2'.format(
+        rc_web_server.host_url(), empty_repo.repo_name)
+    assert 'remote: RhodeCode: open pull request link: {}'.format(ref) in stdout
+    assert 'remote: RhodeCode: push completed' in stdout
+    assert 'exporting bookmark feature2' in stdout

From 0465149479024970b9a3c0dded1ba557ae885d5a Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 18 May 2017 13:37:03 +0200
Subject: [PATCH 119/211] core: moved channelstream test into pyramid.

---
 rhodecode/apps/my_account/__init__.py         | 11 ++++--
 rhodecode/apps/my_account/views.py            | 39 ++++++++++++++++++-
 rhodecode/config/routing.py                   |  4 --
 rhodecode/controllers/admin/my_account.py     | 34 ----------------
 rhodecode/public/js/rhodecode/routes.js       |  1 +
 .../my_account/my_account_notifications.mako  |  2 +-
 6 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/rhodecode/apps/my_account/__init__.py b/rhodecode/apps/my_account/__init__.py
index 8b1e5864..5025147b 100644
--- a/rhodecode/apps/my_account/__init__.py
+++ b/rhodecode/apps/my_account/__init__.py
@@ -41,12 +41,15 @@ def includeme(config):
         pattern=ADMIN_PREFIX + '/my_account/auth_tokens')
     config.add_route(
         name='my_account_auth_tokens_add',
-        pattern=ADMIN_PREFIX + '/my_account/auth_tokens/new',
-        )
+        pattern=ADMIN_PREFIX + '/my_account/auth_tokens/new')
     config.add_route(
         name='my_account_auth_tokens_delete',
-        pattern=ADMIN_PREFIX + '/my_account/auth_tokens/delete',
-        )
+        pattern=ADMIN_PREFIX + '/my_account/auth_tokens/delete')
+
+    # channelstream test
+    config.add_route(
+        name='my_account_notifications_test_channelstream',
+        pattern=ADMIN_PREFIX + '/my_account/test_channelstream')
 
     # Scan module for configuration decorators.
     config.scan()
diff --git a/rhodecode/apps/my_account/views.py b/rhodecode/apps/my_account/views.py
index 3972add9..5287a67b 100644
--- a/rhodecode/apps/my_account/views.py
+++ b/rhodecode/apps/my_account/views.py
@@ -19,14 +19,17 @@
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import logging
+import datetime
 
 from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config
 
 from rhodecode.apps._base import BaseAppView
 from rhodecode import forms
-from rhodecode.lib.auth import LoginRequired, NotAnonymous, CSRFRequired
 from rhodecode.lib import helpers as h
+from rhodecode.lib.auth import LoginRequired, NotAnonymous, CSRFRequired
+from rhodecode.lib.channelstream import channelstream_request, \
+    ChannelstreamException
 from rhodecode.lib.utils2 import safe_int, md5
 from rhodecode.model.auth_token import AuthTokenModel
 from rhodecode.model.meta import Session
@@ -192,3 +195,37 @@ class MyAccountView(BaseAppView):
             h.flash(_("Auth token successfully deleted"), category='success')
 
         return HTTPFound(h.route_path('my_account_auth_tokens'))
+
+    @LoginRequired()
+    @NotAnonymous()
+    @CSRFRequired()
+    @view_config(
+        route_name='my_account_notifications_test_channelstream',
+        request_method='POST', renderer='json_ext')
+    def my_account_notifications_test_channelstream(self):
+        message = 'Test message sent via Channelstream by user: {}, on {}'.format(
+            self._rhodecode_user.username, datetime.datetime.now())
+        payload = {
+            # 'channel': 'broadcast',
+            'type': 'message',
+            'timestamp': datetime.datetime.utcnow(),
+            'user': 'system',
+            'pm_users': [self._rhodecode_user.username],
+            'message': {
+                'message': message,
+                'level': 'info',
+                'topic': '/notifications'
+            }
+        }
+
+        registry = self.request.registry
+        rhodecode_plugins = getattr(registry, 'rhodecode_plugins', {})
+        channelstream_config = rhodecode_plugins.get('channelstream', {})
+
+        try:
+            channelstream_request(channelstream_config, [payload], '/message')
+        except ChannelstreamException as e:
+            log.exception('Failed to send channelstream data')
+            return {"response": 'ERROR: {}'.format(e.__class__.__name__)}
+        return {"response": 'Channelstream data sent. '
+                            'You should see a new live message now.'}
diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py
index c72c2665..6340201d 100644
--- a/rhodecode/config/routing.py
+++ b/rhodecode/config/routing.py
@@ -513,10 +513,6 @@ def make_map(config):
                   '/my_account/toggle_visibility',
                   action='my_notifications_toggle_visibility',
                   conditions={'method': ['POST']})
-    m.connect('my_account_notifications_test_channelstream',
-              '/my_account/test_channelstream',
-              action='my_account_notifications_test_channelstream',
-              conditions={'method': ['POST']})
 
     # NOTIFICATION REST ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
diff --git a/rhodecode/controllers/admin/my_account.py b/rhodecode/controllers/admin/my_account.py
index 51bd737c..e5413d21 100644
--- a/rhodecode/controllers/admin/my_account.py
+++ b/rhodecode/controllers/admin/my_account.py
@@ -24,11 +24,9 @@ my account controller for RhodeCode admin
 """
 
 import logging
-import datetime
 
 import formencode
 from formencode import htmlfill
-from pyramid.threadlocal import get_current_registry
 from pyramid.httpexceptions import HTTPFound
 
 from pylons import request, tmpl_context as c, url
@@ -44,8 +42,6 @@ from rhodecode.lib.base import BaseController, render
 from rhodecode.lib.utils import jsonify
 from rhodecode.lib.utils2 import safe_int, str2bool
 from rhodecode.lib.ext_json import json
-from rhodecode.lib.channelstream import channelstream_request, \
-    ChannelstreamException
 
 from rhodecode.model.db import (
     Repository, PullRequest, UserEmailMap, User, UserFollowing)
@@ -332,33 +328,3 @@ class MyAccountController(BaseController):
         user.update_userdata(notification_status=new_status)
         Session().commit()
         return user.user_data['notification_status']
-
-    @auth.CSRFRequired()
-    @jsonify
-    def my_account_notifications_test_channelstream(self):
-        message = 'Test message sent via Channelstream by user: {}, on {}'.format(
-            c.rhodecode_user.username, datetime.datetime.now())
-        payload = {
-            'type': 'message',
-            'timestamp': datetime.datetime.utcnow(),
-            'user': 'system',
-            #'channel': 'broadcast',
-            'pm_users': [c.rhodecode_user.username],
-            'message': {
-                'message': message,
-                'level': 'info',
-                'topic': '/notifications'
-            }
-        }
-
-        registry = get_current_registry()
-        rhodecode_plugins = getattr(registry, 'rhodecode_plugins', {})
-        channelstream_config = rhodecode_plugins.get('channelstream', {})
-
-        try:
-            channelstream_request(channelstream_config, [payload], '/message')
-        except ChannelstreamException as e:
-            log.exception('Failed to send channelstream data')
-            return {"response": 'ERROR: {}'.format(e.__class__.__name__)}
-        return {"response": 'Channelstream data sent. '
-                            'You should see a new live message now.'}
diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js
index 92dad0cd..35b383c5 100644
--- a/rhodecode/public/js/rhodecode/routes.js
+++ b/rhodecode/public/js/rhodecode/routes.js
@@ -123,5 +123,6 @@ function registerRCRoutes() {
     pyroutes.register('my_account_auth_tokens', '/_admin/my_account/auth_tokens', []);
     pyroutes.register('my_account_auth_tokens_add', '/_admin/my_account/auth_tokens/new', []);
     pyroutes.register('my_account_auth_tokens_delete', '/_admin/my_account/auth_tokens/delete', []);
+    pyroutes.register('my_account_notifications_test_channelstream', '/_admin/my_account/test_channelstream', []);
     pyroutes.register('apiv2', '/_admin/api', []);
 }
diff --git a/rhodecode/templates/admin/my_account/my_account_notifications.mako b/rhodecode/templates/admin/my_account/my_account_notifications.mako
index 4b41bd1d..e71e465f 100644
--- a/rhodecode/templates/admin/my_account/my_account_notifications.mako
+++ b/rhodecode/templates/admin/my_account/my_account_notifications.mako
@@ -10,7 +10,7 @@
 
 <iron-ajax id="sendTestNotification"
            method="post"
-           url="${url('my_account_notifications_test_channelstream')}"
+           url="${h.route_path('my_account_notifications_test_channelstream')}"
            content-type="application/json"
            on-response="handleTestNotification"
            handle-as="json">

From 1e57ca444499544b583a9efb3322f140278c6395 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 18 May 2017 13:18:27 +0200
Subject: [PATCH 120/211] audit-logs: deprecated archive download info from
 audit logs.

---
 rhodecode/controllers/files.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/rhodecode/controllers/files.py b/rhodecode/controllers/files.py
index cb5836e7..af5230f6 100644
--- a/rhodecode/controllers/files.py
+++ b/rhodecode/controllers/files.py
@@ -814,10 +814,6 @@ class FilesController(BaseRepoController):
                 archive = cached_archive_path
 
         # store download action
-        action_logger(user=c.rhodecode_user,
-                      action='user_downloaded_archive:%s' % archive_name,
-                      repo=repo_name, ipaddr=self.ip_addr, commit=True)
-
         audit_logger.store(
             action='repo.archive.download',
             action_data={'user_agent': request.user_agent,

From 7216dd64ff15a4a642f2ffa4428590cb543766ed Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 19 May 2017 10:33:10 +0200
Subject: [PATCH 121/211] audit-logs: introduced new view to replace admin
 journal.

- audit logs will represent the all important actions made inside the system
- raw view visible for super-admins
---
 rhodecode/apps/admin/__init__.py              | 16 ++++
 .../admin/tests/test_admin_audit_logs.py}     | 83 +++++++++++--------
 .../apps/admin/tests/test_admin_main_views.py | 82 ++++++++++++++++++
 .../admin/views/audit_logs.py}                | 60 +++++---------
 rhodecode/apps/admin/views/main_views.py      | 63 ++++++++++++++
 rhodecode/apps/repository/__init__.py         |  6 ++
 rhodecode/config/routing.py                   | 16 ----
 rhodecode/controllers/journal.py              |  2 +-
 rhodecode/public/js/rhodecode/routes.js       |  6 ++
 .../{admin.mako => admin_audit_logs.mako}     |  8 +-
 rhodecode/templates/admin/admin_log.mako      | 15 ----
 .../templates/admin/auth/auth_settings.mako   |  2 +-
 .../templates/admin/auth/plugin_settings.mako |  2 +-
 .../templates/admin/defaults/defaults.mako    |  2 +-
 .../templates/admin/integrations/base.mako    |  2 +-
 .../templates/admin/integrations/form.mako    |  4 +-
 .../templates/admin/integrations/list.mako    |  4 +-
 .../templates/admin/integrations/new.mako     |  4 +-
 .../admin/permissions/permissions.mako        |  2 +-
 .../admin/repo_groups/repo_group_add.mako     |  2 +-
 .../admin/repo_groups/repo_group_edit.mako    |  2 +-
 .../admin/repo_groups/repo_groups.mako        |  2 +-
 rhodecode/templates/admin/repos/repo_add.mako |  2 +-
 rhodecode/templates/admin/repos/repos.mako    |  2 +-
 .../templates/admin/settings/settings.mako    |  2 +-
 .../admin/user_groups/user_group_add.mako     |  2 +-
 .../admin/user_groups/user_group_edit.mako    |  2 +-
 .../admin/user_groups/user_groups.mako        |  2 +-
 rhodecode/templates/admin/users/user_add.mako |  2 +-
 .../templates/admin/users/user_edit.mako      |  2 +-
 rhodecode/templates/admin/users/users.mako    |  2 +-
 rhodecode/templates/base/base.mako            |  2 +-
 .../tests/functional/test_pullrequests.py     | 13 ---
 33 files changed, 272 insertions(+), 146 deletions(-)
 rename rhodecode/{tests/functional/test_admin.py => apps/admin/tests/test_admin_audit_logs.py} (64%)
 create mode 100644 rhodecode/apps/admin/tests/test_admin_main_views.py
 rename rhodecode/{controllers/admin/admin.py => apps/admin/views/audit_logs.py} (57%)
 create mode 100644 rhodecode/apps/admin/views/main_views.py
 rename rhodecode/templates/admin/{admin.mako => admin_audit_logs.mako} (78%)
 delete mode 100644 rhodecode/templates/admin/admin_log.mako

diff --git a/rhodecode/apps/admin/__init__.py b/rhodecode/apps/admin/__init__.py
index bd26edff..fbaf3fd6 100644
--- a/rhodecode/apps/admin/__init__.py
+++ b/rhodecode/apps/admin/__init__.py
@@ -29,6 +29,20 @@ def admin_routes(config):
     Admin prefixed routes
     """
 
+    config.add_route(
+        name='admin_audit_logs',
+        pattern='/audit_logs')
+
+    config.add_route(
+        name='pull_requests_global_0',  # backward compat
+        pattern='/pull_requests/{pull_request_id:[0-9]+}')
+    config.add_route(
+        name='pull_requests_global_1',  # backward compat
+        pattern='/pull-requests/{pull_request_id:[0-9]+}')
+    config.add_route(
+        name='pull_requests_global',
+        pattern='/pull-request/{pull_request_id:[0-9]+}')
+
     config.add_route(
         name='admin_settings_open_source',
         pattern='/settings/open_source')
@@ -93,6 +107,8 @@ def includeme(config):
     navigation_registry = NavigationRegistry(labs_active=labs_active)
     config.registry.registerUtility(navigation_registry)
 
+    # main admin routes
+    config.add_route(name='admin_home', pattern=ADMIN_PREFIX)
     config.include(admin_routes, route_prefix=ADMIN_PREFIX)
 
     # Scan module for configuration decorators.
diff --git a/rhodecode/tests/functional/test_admin.py b/rhodecode/apps/admin/tests/test_admin_audit_logs.py
similarity index 64%
rename from rhodecode/tests/functional/test_admin.py
rename to rhodecode/apps/admin/tests/test_admin_audit_logs.py
index 0e68c763..6f14b285 100644
--- a/rhodecode/tests/functional/test_admin.py
+++ b/rhodecode/apps/admin/tests/test_admin_audit_logs.py
@@ -25,12 +25,25 @@ import datetime
 import pytest
 
 from rhodecode.tests import *
+from rhodecode.tests.fixture import FIXTURES
 from rhodecode.model.db import UserLog
 from rhodecode.model.meta import Session
 from rhodecode.lib.utils2 import safe_unicode
 
-dn = os.path.dirname
-FIXTURES = os.path.join(dn(dn(os.path.abspath(__file__))), 'fixtures')
+
+def route_path(name, params=None, **kwargs):
+    import urllib
+    from rhodecode.apps._base import ADMIN_PREFIX
+
+    base_url = {
+        'admin_home': ADMIN_PREFIX,
+        'admin_audit_logs': ADMIN_PREFIX + '/audit_logs',
+
+    }[name].format(**kwargs)
+
+    if params:
+        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+    return base_url
 
 
 class TestAdminController(TestController):
@@ -73,102 +86,102 @@ class TestAdminController(TestController):
 
     def test_index(self):
         self.log_user()
-        response = self.app.get(url(controller='admin/admin', action='index'))
-        response.mustcontain('Admin journal')
+        response = self.app.get(route_path('admin_audit_logs'))
+        response.mustcontain('Admin audit logs')
 
     def test_filter_all_entries(self):
         self.log_user()
-        response = self.app.get(url(controller='admin/admin', action='index',))
+        response = self.app.get(route_path('admin_audit_logs'))
         all_count = UserLog.query().count()
         response.mustcontain('%s entries' % all_count)
 
     def test_filter_journal_filter_exact_match_on_repository(self):
         self.log_user()
-        response = self.app.get(url(controller='admin/admin', action='index',
-                                    filter='repository:rhodecode'))
+        response = self.app.get(route_path('admin_audit_logs',
+                                params=dict(filter='repository:rhodecode')))
         response.mustcontain('3 entries')
 
     def test_filter_journal_filter_exact_match_on_repository_CamelCase(self):
         self.log_user()
-        response = self.app.get(url(controller='admin/admin', action='index',
-                                    filter='repository:RhodeCode'))
+        response = self.app.get(route_path('admin_audit_logs',
+                                params=dict(filter='repository:RhodeCode')))
         response.mustcontain('3 entries')
 
     def test_filter_journal_filter_wildcard_on_repository(self):
         self.log_user()
-        response = self.app.get(url(controller='admin/admin', action='index',
-                                    filter='repository:*test*'))
+        response = self.app.get(route_path('admin_audit_logs',
+                                params=dict(filter='repository:*test*')))
         response.mustcontain('862 entries')
 
     def test_filter_journal_filter_prefix_on_repository(self):
         self.log_user()
-        response = self.app.get(url(controller='admin/admin', action='index',
-                                    filter='repository:test*'))
+        response = self.app.get(route_path('admin_audit_logs',
+                                params=dict(filter='repository:test*')))
         response.mustcontain('257 entries')
 
     def test_filter_journal_filter_prefix_on_repository_CamelCase(self):
         self.log_user()
-        response = self.app.get(url(controller='admin/admin', action='index',
-                                    filter='repository:Test*'))
+        response = self.app.get(route_path('admin_audit_logs',
+                                params=dict(filter='repository:Test*')))
         response.mustcontain('257 entries')
 
     def test_filter_journal_filter_prefix_on_repository_and_user(self):
         self.log_user()
-        response = self.app.get(url(controller='admin/admin', action='index',
-                                    filter='repository:test* AND username:demo'))
+        response = self.app.get(route_path('admin_audit_logs',
+                                params=dict(filter='repository:test* AND username:demo')))
         response.mustcontain('130 entries')
 
     def test_filter_journal_filter_prefix_on_repository_or_target_repo(self):
         self.log_user()
-        response = self.app.get(url(controller='admin/admin', action='index',
-                                    filter='repository:test* OR repository:rhodecode'))
+        response = self.app.get(route_path('admin_audit_logs',
+                                params=dict(filter='repository:test* OR repository:rhodecode')))
         response.mustcontain('260 entries')  # 257 + 3
 
     def test_filter_journal_filter_exact_match_on_username(self):
         self.log_user()
-        response = self.app.get(url(controller='admin/admin', action='index',
-                                    filter='username:demo'))
+        response = self.app.get(route_path('admin_audit_logs',
+                               params=dict(filter='username:demo')))
         response.mustcontain('1087 entries')
 
     def test_filter_journal_filter_exact_match_on_username_camelCase(self):
         self.log_user()
-        response = self.app.get(url(controller='admin/admin', action='index',
-                                    filter='username:DemO'))
+        response = self.app.get(route_path('admin_audit_logs',
+                                params=dict(filter='username:DemO')))
         response.mustcontain('1087 entries')
 
     def test_filter_journal_filter_wildcard_on_username(self):
         self.log_user()
-        response = self.app.get(url(controller='admin/admin', action='index',
-                                    filter='username:*test*'))
+        response = self.app.get(route_path('admin_audit_logs',
+                                params=dict(filter='username:*test*')))
         entries_count = UserLog.query().filter(UserLog.username.ilike('%test%')).count()
         response.mustcontain('{} entries'.format(entries_count))
 
     def test_filter_journal_filter_prefix_on_username(self):
         self.log_user()
-        response = self.app.get(url(controller='admin/admin', action='index',
-                                    filter='username:demo*'))
+        response = self.app.get(route_path('admin_audit_logs',
+                                params=dict(filter='username:demo*')))
         response.mustcontain('1101 entries')
 
     def test_filter_journal_filter_prefix_on_user_or_other_user(self):
         self.log_user()
-        response = self.app.get(url(controller='admin/admin', action='index',
-                                    filter='username:demo OR username:volcan'))
+        response = self.app.get(route_path('admin_audit_logs',
+                                params=dict(filter='username:demo OR username:volcan')))
         response.mustcontain('1095 entries')  # 1087 + 8
 
     def test_filter_journal_filter_wildcard_on_action(self):
         self.log_user()
-        response = self.app.get(url(controller='admin/admin', action='index',
-                                    filter='action:*pull_request*'))
+        response = self.app.get(route_path('admin_audit_logs',
+                                params=dict(filter='action:*pull_request*')))
         response.mustcontain('187 entries')
 
     def test_filter_journal_filter_on_date(self):
         self.log_user()
-        response = self.app.get(url(controller='admin/admin', action='index',
-                                    filter='date:20121010'))
+        response = self.app.get(route_path('admin_audit_logs',
+                                params=dict(filter='date:20121010')))
         response.mustcontain('47 entries')
 
     def test_filter_journal_filter_on_date_2(self):
         self.log_user()
-        response = self.app.get(url(controller='admin/admin', action='index',
-                                    filter='date:20121020'))
+        response = self.app.get(route_path('admin_audit_logs',
+                                params=dict(filter='date:20121020')))
         response.mustcontain('17 entries')
diff --git a/rhodecode/apps/admin/tests/test_admin_main_views.py b/rhodecode/apps/admin/tests/test_admin_main_views.py
new file mode 100644
index 00000000..1727b625
--- /dev/null
+++ b/rhodecode/apps/admin/tests/test_admin_main_views.py
@@ -0,0 +1,82 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2017 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
+
+from rhodecode.tests import TestController
+from rhodecode.tests.fixture import Fixture
+
+fixture = Fixture()
+
+
+def route_path(name, params=None, **kwargs):
+    import urllib
+    from rhodecode.apps._base import ADMIN_PREFIX
+
+    base_url = {
+        'admin_home': ADMIN_PREFIX,
+        'pullrequest_show': '/{repo_name}/pull-request/{pull_request_id}',
+        'pull_requests_global': ADMIN_PREFIX + '/pull-request/{pull_request_id}',
+        'pull_requests_global_0': ADMIN_PREFIX + '/pull_requests/{pull_request_id}',
+        'pull_requests_global_1': ADMIN_PREFIX + '/pull-requests/{pull_request_id}',
+
+    }[name].format(**kwargs)
+
+    if params:
+        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+    return base_url
+
+
+class TestAdminMainView(TestController):
+
+    def test_redirect_admin_home(self):
+        self.log_user()
+        response = self.app.get(route_path('admin_home'), status=302)
+        assert response.location.endswith('/audit_logs')
+
+    def test_redirect_pull_request_view(self, view):
+        self.log_user()
+        self.app.get(
+            route_path(view, pull_request_id='xxxx'),
+            status=404)
+
+    @pytest.mark.backends("git", "hg")
+    @pytest.mark.parametrize('view', [
+        'pull_requests_global',
+        'pull_requests_global_0',
+        'pull_requests_global_1',
+    ])
+    def test_redirect_pull_request_view(self, view, pr_util):
+        self.log_user()
+        pull_request = pr_util.create_pull_request()
+        pull_request_id = pull_request.pull_request_id
+
+        response = self.app.get(
+            route_path(view, pull_request_id=pull_request_id),
+            status=302)
+        assert response.location.endswith(
+            'pull-request/{}'.format(pull_request_id))
+
+        repo_name = pull_request.target_repo.repo_name
+        redirect_url = route_path(
+            'pullrequest_show', repo_name=repo_name,
+            pull_request_id=pull_request.pull_request_id)
+
+        assert redirect_url in response.location
diff --git a/rhodecode/controllers/admin/admin.py b/rhodecode/apps/admin/views/audit_logs.py
similarity index 57%
rename from rhodecode/controllers/admin/admin.py
rename to rhodecode/apps/admin/views/audit_logs.py
index bbaa8dad..1ee6cf1c 100644
--- a/rhodecode/controllers/admin/admin.py
+++ b/rhodecode/apps/admin/views/audit_logs.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2016-2017  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
@@ -18,42 +18,41 @@
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
-"""
-Controller for Admin panel of RhodeCode Enterprise
-"""
-
-
 import logging
 
-from pylons import request, tmpl_context as c, url
-from pylons.controllers.util import redirect
+from pyramid.view import view_config
 from sqlalchemy.orm import joinedload
 
-from rhodecode.model.db import UserLog, PullRequest
+from rhodecode.apps._base import BaseAppView
+from rhodecode.model.db import UserLog
 from rhodecode.lib.user_log_filter import user_log_filter
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
-from rhodecode.lib.base import BaseController, render
 from rhodecode.lib.utils2 import safe_int
 from rhodecode.lib.helpers import Page
 
-
 log = logging.getLogger(__name__)
 
 
-class AdminController(BaseController):
+class AdminAuditLogsView(BaseAppView):
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+        self._register_global_c(c)
+        return c
 
     @LoginRequired()
-    def __before__(self):
-        super(AdminController, self).__before__()
-
     @HasPermissionAllDecorator('hg.admin')
-    def index(self):
+    @view_config(
+        route_name='admin_audit_logs', request_method='GET',
+        renderer='rhodecode:templates/admin/admin_audit_logs.mako')
+    def admin_audit_logs(self):
+        c = self.load_default_context()
+
         users_log = UserLog.query()\
             .options(joinedload(UserLog.user))\
             .options(joinedload(UserLog.repository))
 
         # FILTERING
-        c.search_term = request.GET.get('filter')
+        c.search_term = self.request.GET.get('filter')
         try:
             users_log = user_log_filter(users_log, c.search_term)
         except Exception:
@@ -62,28 +61,13 @@ class AdminController(BaseController):
 
         users_log = users_log.order_by(UserLog.action_date.desc())
 
-        p = safe_int(request.GET.get('page', 1), 1)
+        p = safe_int(self.request.GET.get('page', 1), 1)
 
         def url_generator(**kw):
-            return url.current(filter=c.search_term, **kw)
+            if c.search_term:
+                kw['filter'] = c.search_term
+            return self.request.current_route_path(_query=kw)
 
         c.audit_logs = Page(users_log, page=p, items_per_page=10,
-                           url=url_generator)
-        c.log_data = render('admin/admin_log.mako')
-
-        if request.is_xhr:
-            return c.log_data
-        return render('admin/admin.mako')
-
-    # global redirect doesn't need permissions
-    def pull_requests(self, pull_request_id):
-        """
-        Global redirect for Pull Requests
-
-        :param pull_request_id: id of pull requests in the system
-        """
-        pull_request = PullRequest.get_or_404(pull_request_id)
-        repo_name = pull_request.target_repo.repo_name
-        return redirect(url(
-            'pullrequest_show', repo_name=repo_name,
-            pull_request_id=pull_request_id))
+                            url=url_generator)
+        return self._get_template_context(c)
diff --git a/rhodecode/apps/admin/views/main_views.py b/rhodecode/apps/admin/views/main_views.py
new file mode 100644
index 00000000..6c014c4d
--- /dev/null
+++ b/rhodecode/apps/admin/views/main_views.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017  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
+
+
+from pyramid.httpexceptions import HTTPFound
+from pyramid.view import view_config
+
+from rhodecode.apps._base import BaseAppView
+from rhodecode.lib import helpers as h
+from rhodecode.lib.auth import (LoginRequired, HasPermissionAllDecorator)
+from rhodecode.model.db import PullRequest
+
+
+log = logging.getLogger(__name__)
+
+
+class AdminMainView(BaseAppView):
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @view_config(
+        route_name='admin_home', request_method='GET')
+    def admin_main(self):
+        # redirect _admin to audit logs...
+        raise HTTPFound(h.route_path('admin_audit_logs'))
+
+    @LoginRequired()
+    @view_config(route_name='pull_requests_global_0', request_method='GET')
+    @view_config(route_name='pull_requests_global_1', request_method='GET')
+    @view_config(route_name='pull_requests_global', request_method='GET')
+    def pull_requests(self):
+        """
+        Global redirect for Pull Requests
+
+        :param pull_request_id: id of pull requests in the system
+        """
+
+        pull_request_id = self.request.matchdict.get('pull_request_id')
+        pull_request = PullRequest.get_or_404(pull_request_id, pyramid_exc=True)
+        repo_name = pull_request.target_repo.repo_name
+
+        raise HTTPFound(
+            h.route_path('pullrequest_show', repo_name=repo_name,
+                         pull_request_id=pull_request_id))
diff --git a/rhodecode/apps/repository/__init__.py b/rhodecode/apps/repository/__init__.py
index 9f9bb5ab..8719555c 100644
--- a/rhodecode/apps/repository/__init__.py
+++ b/rhodecode/apps/repository/__init__.py
@@ -41,6 +41,12 @@ def includeme(config):
         name='bookmarks_home',
         pattern='/{repo_name:.*?[^/]}/bookmarks', repo_route=True)
 
+    # Pull Requests
+    config.add_route(
+        name='pullrequest_show',
+        pattern='/{repo_name:.*?[^/]}/pull-request/{pull_request_id}',
+        repo_route=True)
+
     # Settings
     config.add_route(
         name='edit_repo',
diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py
index 6340201d..6cc70d76 100644
--- a/rhodecode/config/routing.py
+++ b/rhodecode/config/routing.py
@@ -561,22 +561,6 @@ def make_map(config):
                   action='show', conditions={'method': ['GET']},
                   requirements=URL_NAME_REQUIREMENTS)
 
-    # ADMIN MAIN PAGES
-    with rmap.submapper(path_prefix=ADMIN_PREFIX,
-                        controller='admin/admin') as m:
-        m.connect('admin_home', '', action='index')
-        m.connect('admin_add_repo', '/add_repo/{new_repo:[a-z0-9\. _-]*}',
-                  action='add_repo')
-        m.connect(
-            'pull_requests_global_0', '/pull_requests/{pull_request_id:[0-9]+}',
-            action='pull_requests')
-        m.connect(
-            'pull_requests_global_1', '/pull-requests/{pull_request_id:[0-9]+}',
-            action='pull_requests')
-        m.connect(
-            'pull_requests_global', '/pull-request/{pull_request_id:[0-9]+}',
-            action='pull_requests')
-
     # USER JOURNAL
     rmap.connect('journal', '%s/journal' % (ADMIN_PREFIX,),
                  controller='journal', action='index')
diff --git a/rhodecode/controllers/journal.py b/rhodecode/controllers/journal.py
index f49c1fa3..a88a355b 100644
--- a/rhodecode/controllers/journal.py
+++ b/rhodecode/controllers/journal.py
@@ -34,11 +34,11 @@ from webob.exc import HTTPBadRequest
 from pylons import request, tmpl_context as c, response, url
 from pylons.i18n.translation import _
 
-from rhodecode.controllers.admin.admin import user_log_filter
 from rhodecode.model.db import UserLog, UserFollowing, User, UserApiKeys
 from rhodecode.model.meta import Session
 import rhodecode.lib.helpers as h
 from rhodecode.lib.helpers import Page
+from rhodecode.lib.user_log_filter import user_log_filter
 from rhodecode.lib.auth import LoginRequired, NotAnonymous, CSRFRequired
 from rhodecode.lib.base import BaseController, render
 from rhodecode.lib.utils2 import safe_int, AttributeDict
diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js
index 35b383c5..aa8e98de 100644
--- a/rhodecode/public/js/rhodecode/routes.js
+++ b/rhodecode/public/js/rhodecode/routes.js
@@ -69,6 +69,11 @@ function registerRCRoutes() {
     pyroutes.register('repo_integrations_create', '%(repo_name)s/settings/integrations/%(integration)s/new', ['repo_name', 'integration']);
     pyroutes.register('repo_integrations_edit', '%(repo_name)s/settings/integrations/%(integration)s/%(integration_id)s', ['repo_name', 'integration', 'integration_id']);
     pyroutes.register('ops_ping', '_admin/ops/ping', []);
+    pyroutes.register('admin_home', '/_admin', []);
+    pyroutes.register('admin_audit_logs', '_admin/audit_logs', []);
+    pyroutes.register('pull_requests_global_0', '_admin/pull_requests/%(pull_request_id)s', ['pull_request_id']);
+    pyroutes.register('pull_requests_global_1', '_admin/pull-requests/%(pull_request_id)s', ['pull_request_id']);
+    pyroutes.register('pull_requests_global', '_admin/pull-request/%(pull_request_id)s', ['pull_request_id']);
     pyroutes.register('admin_settings_open_source', '_admin/settings/open_source', []);
     pyroutes.register('admin_settings_vcs_svn_generate_cfg', '_admin/settings/vcs/svn_generate_cfg', []);
     pyroutes.register('admin_settings_system', '_admin/settings/system', []);
@@ -100,6 +105,7 @@ function registerRCRoutes() {
     pyroutes.register('tags_home', '/%(repo_name)s/tags', ['repo_name']);
     pyroutes.register('branches_home', '/%(repo_name)s/branches', ['repo_name']);
     pyroutes.register('bookmarks_home', '/%(repo_name)s/bookmarks', ['repo_name']);
+    pyroutes.register('pullrequest_show', '/%(repo_name)s/pull-request/%(pull_request_id)s', ['repo_name', 'pull_request_id']);
     pyroutes.register('edit_repo', '/%(repo_name)s/settings', ['repo_name']);
     pyroutes.register('edit_repo_advanced', '/%(repo_name)s/settings/advanced', ['repo_name']);
     pyroutes.register('edit_repo_advanced_delete', '/%(repo_name)s/settings/advanced/delete', ['repo_name']);
diff --git a/rhodecode/templates/admin/admin.mako b/rhodecode/templates/admin/admin_audit_logs.mako
similarity index 78%
rename from rhodecode/templates/admin/admin.mako
rename to rhodecode/templates/admin/admin_audit_logs.mako
index eea33dad..6886ccae 100644
--- a/rhodecode/templates/admin/admin.mako
+++ b/rhodecode/templates/admin/admin_audit_logs.mako
@@ -2,7 +2,7 @@
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
-    ${_('Admin journal')}
+    ${_('Admin audit logs')}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
@@ -10,9 +10,9 @@
 
 <%def name="breadcrumbs_links()">
     ${h.form(None, id_="filter_form", method="get")}
-        <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or ''}" placeholder="${_('journal filter...')}"/>
+        <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or ''}" placeholder="${_('filter...')}"/>
         <input type='submit' value="${_('filter')}" class="btn" />
-        ${_('Admin journal')} - ${ungettext('%s entry', '%s entries', c.audit_logs.item_count) % (c.audit_logs.item_count)}
+        ${_('Audit logs')} - ${_ungettext('%s entry', '%s entries', c.audit_logs.item_count) % (c.audit_logs.item_count)}
     ${h.end_form()}
     <p class="tooltip filterexample" title="${h.tooltip(h.journal_filter_help())}">${_('Example Queries')}</p>
 </%def>
@@ -29,7 +29,7 @@
     <!-- end box / title -->
     <div class="table">
         <div id="user_log">
-            ${c.log_data}
+            <%include file="/admin/admin_log_base.mako" />
         </div>
     </div>
 </div>
diff --git a/rhodecode/templates/admin/admin_log.mako b/rhodecode/templates/admin/admin_log.mako
deleted file mode 100644
index 02be0e1c..00000000
--- a/rhodecode/templates/admin/admin_log.mako
+++ /dev/null
@@ -1,15 +0,0 @@
-## -*- coding: utf-8 -*-
-<%include file="/admin/admin_log_base.mako" />
-
-<script type="text/javascript">
-    $(function(){
-        //because this is loaded on every pjax request, it must run only once
-        //therefore the .one method
-        $(document).on('pjax:complete',function(){
-            show_more_event();
-        });
-
-        $(document).pjax('#user_log .pager_link', '#user_log');
-    });
-</script>
-
diff --git a/rhodecode/templates/admin/auth/auth_settings.mako b/rhodecode/templates/admin/auth/auth_settings.mako
index d9c767b4..9ccdebaa 100644
--- a/rhodecode/templates/admin/auth/auth_settings.mako
+++ b/rhodecode/templates/admin/auth/auth_settings.mako
@@ -9,7 +9,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_('Admin'),h.url('admin_home'))}
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))}
     &raquo;
     ${_('Authentication Plugins')}
 </%def>
diff --git a/rhodecode/templates/admin/auth/plugin_settings.mako b/rhodecode/templates/admin/auth/plugin_settings.mako
index ec37a790..6a84a57a 100644
--- a/rhodecode/templates/admin/auth/plugin_settings.mako
+++ b/rhodecode/templates/admin/auth/plugin_settings.mako
@@ -9,7 +9,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-  ${h.link_to(_('Admin'),h.url('admin_home'))}
+  ${h.link_to(_('Admin'),h.route_path('admin_home'))}
   &raquo;
   ${h.link_to(_('Authentication Plugins'),request.resource_path(resource.__parent__, route_name='auth_home'))}
   &raquo;
diff --git a/rhodecode/templates/admin/defaults/defaults.mako b/rhodecode/templates/admin/defaults/defaults.mako
index 8f47e695..78aa88ef 100644
--- a/rhodecode/templates/admin/defaults/defaults.mako
+++ b/rhodecode/templates/admin/defaults/defaults.mako
@@ -9,7 +9,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_('Admin'),h.url('admin_home'))}
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))}
     &raquo;
     ${_('Repositories defaults')}
 </%def>
diff --git a/rhodecode/templates/admin/integrations/base.mako b/rhodecode/templates/admin/integrations/base.mako
index 5db47c2c..6b5506a9 100644
--- a/rhodecode/templates/admin/integrations/base.mako
+++ b/rhodecode/templates/admin/integrations/base.mako
@@ -18,7 +18,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_('Admin'),h.url('admin_home'))}
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))}
     &raquo;
     ${_('Integrations')}
 </%def>
diff --git a/rhodecode/templates/admin/integrations/form.mako b/rhodecode/templates/admin/integrations/form.mako
index a64b4a5f..a57f0c05 100644
--- a/rhodecode/templates/admin/integrations/form.mako
+++ b/rhodecode/templates/admin/integrations/form.mako
@@ -12,7 +12,7 @@
                         repo_name=c.repo.repo_name,
                         integration=current_IntegrationType.key))}
   %elif c.repo_group:
-    ${h.link_to(_('Admin'),h.url('admin_home'))}
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))}
     &raquo;
     ${h.link_to(_('Repository Groups'),h.url('repo_groups'))}
     &raquo;
@@ -25,7 +25,7 @@
                         repo_group_name=c.repo_group.group_name,
                         integration=current_IntegrationType.key))}
   %else:
-    ${h.link_to(_('Admin'),h.url('admin_home'))}
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))}
     &raquo;
     ${h.link_to(_('Settings'),h.url('admin_settings'))}
     &raquo;
diff --git a/rhodecode/templates/admin/integrations/list.mako b/rhodecode/templates/admin/integrations/list.mako
index 80beef2b..8a9bb1cd 100644
--- a/rhodecode/templates/admin/integrations/list.mako
+++ b/rhodecode/templates/admin/integrations/list.mako
@@ -5,13 +5,13 @@
   %if c.repo:
     ${h.link_to('Settings',h.route_path('edit_repo', repo_name=c.repo.repo_name))}
   %elif c.repo_group:
-    ${h.link_to(_('Admin'),h.url('admin_home'))}
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))}
     &raquo;
     ${h.link_to(_('Repository Groups'),h.url('repo_groups'))}
     &raquo;
     ${h.link_to(c.repo_group.group_name,h.url('edit_repo_group', group_name=c.repo_group.group_name))}
   %else:
-    ${h.link_to(_('Admin'),h.url('admin_home'))}
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))}
     &raquo;
     ${h.link_to(_('Settings'),h.url('admin_settings'))}
   %endif
diff --git a/rhodecode/templates/admin/integrations/new.mako b/rhodecode/templates/admin/integrations/new.mako
index fa53a42f..65a2ed8f 100644
--- a/rhodecode/templates/admin/integrations/new.mako
+++ b/rhodecode/templates/admin/integrations/new.mako
@@ -8,7 +8,7 @@
     &raquo;
     ${h.link_to(_('Integrations'),request.route_url(route_name='repo_integrations_home', repo_name=c.repo.repo_name))}
   %elif c.repo_group:
-    ${h.link_to(_('Admin'),h.url('admin_home'))}
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))}
     &raquo;
     ${h.link_to(_('Repository Groups'),h.url('repo_groups'))}
     &raquo;
@@ -16,7 +16,7 @@
     &raquo;
     ${h.link_to(_('Integrations'),request.route_url(route_name='repo_group_integrations_home', repo_group_name=c.repo_group.group_name))}
   %else:
-    ${h.link_to(_('Admin'),h.url('admin_home'))}
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))}
     &raquo;
     ${h.link_to(_('Settings'),h.url('admin_settings'))}
     &raquo;
diff --git a/rhodecode/templates/admin/permissions/permissions.mako b/rhodecode/templates/admin/permissions/permissions.mako
index 4afa7312..d96ecb93 100644
--- a/rhodecode/templates/admin/permissions/permissions.mako
+++ b/rhodecode/templates/admin/permissions/permissions.mako
@@ -9,7 +9,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_('Admin'),h.url('admin_home'))}
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))}
     &raquo;
     ${_('Permissions')}
 </%def>
diff --git a/rhodecode/templates/admin/repo_groups/repo_group_add.mako b/rhodecode/templates/admin/repo_groups/repo_group_add.mako
index 7bfe230c..82f836b7 100644
--- a/rhodecode/templates/admin/repo_groups/repo_group_add.mako
+++ b/rhodecode/templates/admin/repo_groups/repo_group_add.mako
@@ -9,7 +9,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_('Admin'),h.url('admin_home'))}
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))}
     &raquo;
     ${h.link_to(_('Repository groups'),h.url('repo_groups'))}
     &raquo;
diff --git a/rhodecode/templates/admin/repo_groups/repo_group_edit.mako b/rhodecode/templates/admin/repo_groups/repo_group_edit.mako
index 141252d7..26ef6803 100644
--- a/rhodecode/templates/admin/repo_groups/repo_group_edit.mako
+++ b/rhodecode/templates/admin/repo_groups/repo_group_edit.mako
@@ -9,7 +9,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_('Admin'),h.url('admin_home'))}
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))}
     &raquo;
     ${h.link_to(_('Repository Groups'),h.url('repo_groups'))}
     %if c.repo_group.parent_group:
diff --git a/rhodecode/templates/admin/repo_groups/repo_groups.mako b/rhodecode/templates/admin/repo_groups/repo_groups.mako
index d0cea57a..6e998c6a 100644
--- a/rhodecode/templates/admin/repo_groups/repo_groups.mako
+++ b/rhodecode/templates/admin/repo_groups/repo_groups.mako
@@ -10,7 +10,7 @@
 
 <%def name="breadcrumbs_links()">
     <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-    ${h.link_to(_('Admin'),h.url('admin_home'))} &raquo; <span id="repo_group_count">0</span> ${_('repository groups')}
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))} &raquo; <span id="repo_group_count">0</span> ${_('repository groups')}
 </%def>
 
 <%def name="menu_bar_nav()">
diff --git a/rhodecode/templates/admin/repos/repo_add.mako b/rhodecode/templates/admin/repos/repo_add.mako
index 868f27a8..3ec71cbb 100644
--- a/rhodecode/templates/admin/repos/repo_add.mako
+++ b/rhodecode/templates/admin/repos/repo_add.mako
@@ -10,7 +10,7 @@
 
 <%def name="breadcrumbs_links()">
     %if c.rhodecode_user.is_admin:
-    ${h.link_to(_('Admin'),h.url('admin_home'))}
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))}
     &raquo;
     ${h.link_to(_('Repositories'),h.url('repos'))}
     %else:
diff --git a/rhodecode/templates/admin/repos/repos.mako b/rhodecode/templates/admin/repos/repos.mako
index ce06b6b5..01debfae 100644
--- a/rhodecode/templates/admin/repos/repos.mako
+++ b/rhodecode/templates/admin/repos/repos.mako
@@ -10,7 +10,7 @@
 
 <%def name="breadcrumbs_links()">
     <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-    ${h.link_to(_('Admin'),h.url('admin_home'))} &raquo; <span id="repo_count">0</span> ${_('repositories')}
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))} &raquo; <span id="repo_count">0</span> ${_('repositories')}
 </%def>
 
 <%def name="menu_bar_nav()">
diff --git a/rhodecode/templates/admin/settings/settings.mako b/rhodecode/templates/admin/settings/settings.mako
index 071133e7..a136daa8 100644
--- a/rhodecode/templates/admin/settings/settings.mako
+++ b/rhodecode/templates/admin/settings/settings.mako
@@ -9,7 +9,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_('Admin'),h.url('admin_home'))}
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))}
     &raquo;
     ${_('Settings')}
 </%def>
diff --git a/rhodecode/templates/admin/user_groups/user_group_add.mako b/rhodecode/templates/admin/user_groups/user_group_add.mako
index b198e2de..e404d60e 100644
--- a/rhodecode/templates/admin/user_groups/user_group_add.mako
+++ b/rhodecode/templates/admin/user_groups/user_group_add.mako
@@ -8,7 +8,7 @@
     %endif
 </%def>
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_('Admin'),h.url('admin_home'))}
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))}
     &raquo;
     ${h.link_to(_('User groups'),h.url('users_groups'))}
     &raquo;
diff --git a/rhodecode/templates/admin/user_groups/user_group_edit.mako b/rhodecode/templates/admin/user_groups/user_group_edit.mako
index e912b0ec..fb28b8d5 100644
--- a/rhodecode/templates/admin/user_groups/user_group_edit.mako
+++ b/rhodecode/templates/admin/user_groups/user_group_edit.mako
@@ -9,7 +9,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_('Admin'),h.url('admin_home'))}
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))}
     &raquo;
     ${h.link_to(_('User Groups'),h.url('users_groups'))}
     &raquo;
diff --git a/rhodecode/templates/admin/user_groups/user_groups.mako b/rhodecode/templates/admin/user_groups/user_groups.mako
index 441e8234..5b9709bf 100644
--- a/rhodecode/templates/admin/user_groups/user_groups.mako
+++ b/rhodecode/templates/admin/user_groups/user_groups.mako
@@ -10,7 +10,7 @@
 
 <%def name="breadcrumbs_links()">
     <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-    ${h.link_to(_('Admin'),h.url('admin_home'))} &raquo; <span id="user_group_count">0</span> ${_('user groups')}
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))} &raquo; <span id="user_group_count">0</span> ${_('user groups')}
 </%def>
 
 <%def name="menu_bar_nav()">
diff --git a/rhodecode/templates/admin/users/user_add.mako b/rhodecode/templates/admin/users/user_add.mako
index 21525aad..2d3e83f0 100644
--- a/rhodecode/templates/admin/users/user_add.mako
+++ b/rhodecode/templates/admin/users/user_add.mako
@@ -8,7 +8,7 @@
     %endif
 </%def>
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_('Admin'),h.url('admin_home'))}
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))}
     &raquo;
     ${h.link_to(_('Users'),h.route_path('users'))}
     &raquo;
diff --git a/rhodecode/templates/admin/users/user_edit.mako b/rhodecode/templates/admin/users/user_edit.mako
index d8be135b..c12b7fdf 100644
--- a/rhodecode/templates/admin/users/user_edit.mako
+++ b/rhodecode/templates/admin/users/user_edit.mako
@@ -9,7 +9,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_('Admin'),h.url('admin_home'))}
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))}
     &raquo;
     ${h.link_to(_('Users'),h.route_path('users'))}
     &raquo;
diff --git a/rhodecode/templates/admin/users/users.mako b/rhodecode/templates/admin/users/users.mako
index 58575eb9..d526f912 100644
--- a/rhodecode/templates/admin/users/users.mako
+++ b/rhodecode/templates/admin/users/users.mako
@@ -10,7 +10,7 @@
 
 <%def name="breadcrumbs_links()">
     <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-    ${h.link_to(_('Admin'),h.url('admin_home'))} &raquo; <span id="user_count">0</span>
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))} &raquo; <span id="user_count">0</span>
 </%def>
 
 <%def name="menu_bar_nav()">
diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako
index 7035c82a..256790e3 100644
--- a/rhodecode/templates/base/base.mako
+++ b/rhodecode/templates/base/base.mako
@@ -72,7 +72,7 @@
 
 <%def name="admin_menu()">
   <ul class="admin_menu submenu">
-      <li><a href="${h.url('admin_home')}">${_('Admin journal')}</a></li>
+      <li><a href="${h.route_path('admin_audit_logs')}">${_('Admin audit logs')}</a></li>
       <li><a href="${h.url('repos')}">${_('Repositories')}</a></li>
       <li><a href="${h.url('repo_groups')}">${_('Repository groups')}</a></li>
       <li><a href="${h.route_path('users')}">${_('Users')}</a></li>
diff --git a/rhodecode/tests/functional/test_pullrequests.py b/rhodecode/tests/functional/test_pullrequests.py
index 4bed42f0..e90d9ca9 100644
--- a/rhodecode/tests/functional/test_pullrequests.py
+++ b/rhodecode/tests/functional/test_pullrequests.py
@@ -53,19 +53,6 @@ class TestPullrequestsController:
             'pullrequest', repo_name=repo_name)
         response.mustcontain(create_pr_link)
 
-    def test_global_redirect_of_pr(self, backend, pr_util):
-        pull_request = pr_util.create_pull_request()
-
-        response = self.app.get(
-            url('pull_requests_global',
-                pull_request_id=pull_request.pull_request_id))
-
-        repo_name = pull_request.target_repo.repo_name
-        redirect_url = url('pullrequest_show', repo_name=repo_name,
-                           pull_request_id=pull_request.pull_request_id)
-        assert response.status == '302 Found'
-        assert redirect_url in response.location
-
     def test_create_pr_form_with_raw_commit_id(self, backend):
         repo = backend.repo
 

From 51775c0669897754423584509bf363aa2bed8b22 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 29 May 2017 20:00:38 +0200
Subject: [PATCH 122/211] pull-requests: fixed translation of error messages
 via merge-api.

- fixes #5325
---
 rhodecode/api/views/pull_request_api.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rhodecode/api/views/pull_request_api.py b/rhodecode/api/views/pull_request_api.py
index b454cdcc..e0d84ad7 100644
--- a/rhodecode/api/views/pull_request_api.py
+++ b/rhodecode/api/views/pull_request_api.py
@@ -273,7 +273,12 @@ def merge_pull_request(request, apiuser, repoid, pullrequestid,
     merge_possible = not check.failed
 
     if not merge_possible:
-        reasons = ','.join([msg for _e, msg in check.errors])
+        error_messages = []
+        for err_type, error_msg in check.errors:
+            error_msg = request.translate(error_msg)
+            error_messages.append(error_msg)
+
+        reasons = ','.join(error_messages)
         raise JSONRPCError(
             'merge not possible for following reasons: {}'.format(reasons))
 

From 67377b4a77a3874de947c26300dd19dcf7861f29 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 29 May 2017 12:58:09 +0200
Subject: [PATCH 123/211] tests: fix the markdown redirection link after their
 change to HTTPS

---
 rhodecode/config/routing_links.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rhodecode/config/routing_links.py b/rhodecode/config/routing_links.py
index 1b2dbd5b..d0c86568 100644
--- a/rhodecode/config/routing_links.py
+++ b/rhodecode/config/routing_links.py
@@ -74,8 +74,8 @@ link_config = [
     },
     {
         "name": "markdown_help",
-        "target": "http://daringfireball.net/projects/markdown/syntax",
-        "external_target": "http://daringfireball.net/projects/markdown/syntax",
+        "target": "https://daringfireball.net/projects/markdown/syntax",
+        "external_target": "https://daringfireball.net/projects/markdown/syntax",
     },
     {
         "name": "rhodecode_official",

From 2f81e258a745f8bfd77a3887101239a36fa34a4b Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 29 May 2017 23:17:17 +0200
Subject: [PATCH 124/211] webhook: enable support of extra repo variables as
 replacement in template url.

---
 rhodecode/events/repo.py                     | 15 +++++++++++----
 rhodecode/integrations/types/webhook.py      |  6 ++++++
 rhodecode/tests/integrations/test_webhook.py |  1 +
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/rhodecode/events/repo.py b/rhodecode/events/repo.py
index 84993649..a18aa810 100644
--- a/rhodecode/events/repo.py
+++ b/rhodecode/events/repo.py
@@ -16,6 +16,7 @@
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
+import collections
 import logging
 
 from rhodecode.translation import lazy_ugettext
@@ -75,9 +76,10 @@ def _commits_as_dict(commit_ids, repos):
                 urlified_message, issues_data = process_patterns(
                     cs_data['message'], repo.repo_name)
                 cs_data['issues'] = issues_data
-                cs_data['message_html'] = urlify_commit_message(cs_data['message'],
-                    repo.repo_name)
-                cs_data['message_html_title'] = chop_at_smart(cs_data['message'], '\n', suffix_if_chopped='...')
+                cs_data['message_html'] = urlify_commit_message(
+                    cs_data['message'], repo.repo_name)
+                cs_data['message_html_title'] = chop_at_smart(
+                    cs_data['message'], '\n', suffix_if_chopped='...')
                 commits.append(cs_data)
 
                 needed_commits.remove(commit_id)
@@ -118,12 +120,17 @@ class RepoEvent(RhodecodeEvent):
     def as_dict(self):
         from rhodecode.model.repo import RepoModel
         data = super(RepoEvent, self).as_dict()
+        extra_fields = collections.OrderedDict()
+        for field in self.repo.extra_fields:
+            extra_fields[field.field_key] = field.field_value
+
         data.update({
             'repo': {
                 'repo_id': self.repo.repo_id,
                 'repo_name': self.repo.repo_name,
                 'repo_type': self.repo.repo_type,
-                'url': RepoModel().get_url(self.repo)
+                'url': RepoModel().get_url(self.repo),
+                'extra_fields': extra_fields
             }
         })
         return data
diff --git a/rhodecode/integrations/types/webhook.py b/rhodecode/integrations/types/webhook.py
index 5d8a5193..93fd9b10 100644
--- a/rhodecode/integrations/types/webhook.py
+++ b/rhodecode/integrations/types/webhook.py
@@ -41,6 +41,8 @@ WEBHOOK_URL_VARS = [
     'repo_type',
     'repo_id',
     'repo_url',
+    # extra repo fields
+    'extra:<extra_key_name>',
 
     # special attrs below that we handle, using multi-call
     'branch',
@@ -77,6 +79,10 @@ class WebhookHandler(object):
             'username': data['actor']['username'],
             'user_id': data['actor']['user_id']
         }
+        extra_vars = {}
+        for extra_key, extra_val in data['repo']['extra_fields'].items():
+            extra_vars['extra:{}'.format(extra_key)] = extra_val
+        common_vars.update(extra_vars)
 
         return string.Template(
             self.template_url).safe_substitute(**common_vars)
diff --git a/rhodecode/tests/integrations/test_webhook.py b/rhodecode/tests/integrations/test_webhook.py
index 44bddf2c..495e2950 100644
--- a/rhodecode/tests/integrations/test_webhook.py
+++ b/rhodecode/tests/integrations/test_webhook.py
@@ -33,6 +33,7 @@ def base_data():
             'repo_type': 'hg',
             'repo_id': '12',
             'url': 'http://repo.url/foo',
+            'extra_fields': {},
         },
         'actor': {
             'username': 'actor_name',

From 58d7ad084c8e131bf08840ed817fcca321e7dd3c Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 26 May 2017 12:38:36 +0200
Subject: [PATCH 125/211] log-in: changed naming from log-in to sign in for
 consistency with other text.

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

diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako
index 256790e3..0f7776f3 100644
--- a/rhodecode/templates/base/base.mako
+++ b/rhodecode/templates/base/base.mako
@@ -324,7 +324,7 @@
                         %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
                          ${h.link_to(_("Don't have an account?"),h.route_path('register'))} <br/>
                         %endif
-                        ${h.link_to(_("Using external auth? Login here."),h.route_path('login'))}
+                        ${h.link_to(_("Using external auth? Sign In here."),h.route_path('login'))}
                         </div>
                         <div class="submit">
                             ${h.submit('sign_in',_('Sign In'),class_="btn btn-small",tabindex=3)}

From c4d8a9cccf89273869f52c2dd051878bd4800fef Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 26 May 2017 12:40:09 +0200
Subject: [PATCH 126/211] templates: expose default user data into templates
 for JS usage.

---
 rhodecode/templates/base/root.mako | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rhodecode/templates/base/root.mako b/rhodecode/templates/base/root.mako
index 21e5ec89..56b1f426 100644
--- a/rhodecode/templates/base/root.mako
+++ b/rhodecode/templates/base/root.mako
@@ -16,6 +16,11 @@ if getattr(c, 'rhodecode_user', None) and c.rhodecode_user.user_id:
     c.template_context['rhodecode_user']['last_name'] = c.rhodecode_user.lastname
 
 c.template_context['visual']['default_renderer'] = h.get_visual_attr(c, 'default_renderer')
+c.template_context['default_user'] = {
+    'username': h.DEFAULT_USER,
+    'user_id': 1
+}
+
 %>
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>

From 6ad32c57eaaf87a099520d921c10297f7687a27a Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 26 May 2017 12:46:02 +0200
Subject: [PATCH 127/211] permissions: move refresh operation as a flag to the
 get_default_user function

---
 rhodecode/controllers/admin/permissions.py | 7 +------
 rhodecode/model/db.py                      | 8 +++++++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/rhodecode/controllers/admin/permissions.py b/rhodecode/controllers/admin/permissions.py
index da3b202a..84af157a 100644
--- a/rhodecode/controllers/admin/permissions.py
+++ b/rhodecode/controllers/admin/permissions.py
@@ -64,12 +64,7 @@ class PermissionsController(BaseController):
         c.active = 'application'
         self.__load_data()
 
-        c.user = User.get_default_user()
-
-        # TODO: johbo: 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(c.user)
+        c.user = User.get_default_user(refresh=True)
 
         app_settings = SettingsModel().get_all_settings()
         defaults = {
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index ac7f7f25..ec61e97b 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -874,10 +874,16 @@ class User(Base, BaseModel):
             .order_by(User.username.asc()).all()
 
     @classmethod
-    def get_default_user(cls, cache=False):
+    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
 
     def _get_default_perms(self, user, suffix=''):

From d0e3f7b137dabac798e46de5fd421f883fa78160 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 26 May 2017 13:02:12 +0200
Subject: [PATCH 128/211] maintenance: added svn verify command to tasks to be
 able to verify the filesystem and repo formats.

---
 rhodecode/lib/repo_maintenance.py            | 11 ++++++++++-
 rhodecode/lib/vcs/backends/svn/repository.py |  6 ++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/rhodecode/lib/repo_maintenance.py b/rhodecode/lib/repo_maintenance.py
index d3faff25..fe301bd1 100644
--- a/rhodecode/lib/repo_maintenance.py
+++ b/rhodecode/lib/repo_maintenance.py
@@ -83,6 +83,15 @@ class HGVerify(MaintenanceTask):
         return res
 
 
+class SVNVerify(MaintenanceTask):
+    human_name = 'SVN Verify repo'
+
+    def run(self):
+        instance = self.db_repo.scm_instance()
+        res = instance.verify()
+        return res
+
+
 class RepoMaintenance(object):
     """
     Performs maintenance of repository based on it's type
@@ -90,7 +99,7 @@ class RepoMaintenance(object):
     tasks = {
         'hg': [HGVerify],
         'git': [GitGC],
-        'svn': [],
+        'svn': [SVNVerify],
     }
 
     def get_tasks_for_repo(self, db_repo):
diff --git a/rhodecode/lib/vcs/backends/svn/repository.py b/rhodecode/lib/vcs/backends/svn/repository.py
index 078f2e13..2107badd 100644
--- a/rhodecode/lib/vcs/backends/svn/repository.py
+++ b/rhodecode/lib/vcs/backends/svn/repository.py
@@ -158,6 +158,12 @@ class SubversionRepository(base.BaseRepository):
             return commit_id1
         return commit_id2
 
+    def verify(self):
+        verify = self._remote.verify()
+
+        self._remote.invalidate_vcs_cache()
+        return verify
+
     def compare(self, commit_id1, commit_id2, repo2, merge, pre_load=None):
         # TODO: johbo: Implement better comparison, this is a very naive
         # version which does not allow to compare branches, tags or folders

From be41f0b920fae246421a57b63044c2e9998488fb Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 29 May 2017 20:58:42 +0200
Subject: [PATCH 129/211] pull-requests: moved the listing of pull requests for
 repo into pyramid.

- moved as datagrid App
- changed loading of grid to lazy, as other new views.
---
 rhodecode/apps/_base/__init__.py              |  28 +++
 rhodecode/apps/repository/__init__.py         |  10 +
 .../repository/views/repo_pull_requests.py    | 184 ++++++++++++++++++
 rhodecode/config/routing.py                   |   7 -
 rhodecode/controllers/pullrequests.py         | 118 -----------
 rhodecode/public/css/panels.less              |   4 +
 rhodecode/public/js/rhodecode/routes.js       |   3 +-
 rhodecode/templates/base/base.mako            |   2 +-
 .../templates/pullrequests/pullrequests.mako  |  52 +++--
 9 files changed, 262 insertions(+), 146 deletions(-)
 create mode 100644 rhodecode/apps/repository/views/repo_pull_requests.py

diff --git a/rhodecode/apps/_base/__init__.py b/rhodecode/apps/_base/__init__.py
index d9b7e080..a202a8df 100644
--- a/rhodecode/apps/_base/__init__.py
+++ b/rhodecode/apps/_base/__init__.py
@@ -268,6 +268,34 @@ class RepoRoutePredicate(object):
         return False
 
 
+class RepoTypeRoutePredicate(object):
+    def __init__(self, val, config):
+        self.val = val or ['hg', 'git', 'svn']
+
+    def text(self):
+        return 'repo_accepted_type = %s' % self.val
+
+    phash = text
+
+    def __call__(self, info, request):
+
+        rhodecode_db_repo = request.db_repo
+
+        log.debug(
+            '%s checking repo type for %s in %s',
+            self.__class__.__name__, rhodecode_db_repo.repo_type, self.val)
+
+        if rhodecode_db_repo.repo_type in self.val:
+            return True
+        else:
+            log.warning('Current view is not supported for repo type:%s',
+                        rhodecode_db_repo.repo_type)
+            return False
+
+
+
 def includeme(config):
     config.add_route_predicate(
         'repo_route', RepoRoutePredicate)
+    config.add_route_predicate(
+        'repo_accepted_types', RepoTypeRoutePredicate)
\ No newline at end of file
diff --git a/rhodecode/apps/repository/__init__.py b/rhodecode/apps/repository/__init__.py
index 8719555c..5dc6afb3 100644
--- a/rhodecode/apps/repository/__init__.py
+++ b/rhodecode/apps/repository/__init__.py
@@ -47,6 +47,16 @@ def includeme(config):
         pattern='/{repo_name:.*?[^/]}/pull-request/{pull_request_id}',
         repo_route=True)
 
+    config.add_route(
+        name='pullrequest_show_all',
+        pattern='/{repo_name:.*?[^/]}/pull-request',
+        repo_route=True, repo_accepted_types=['hg', 'git'])
+
+    config.add_route(
+        name='pullrequest_show_all_data',
+        pattern='/{repo_name:.*?[^/]}/pull-request-data',
+        repo_route=True, repo_accepted_types=['hg', 'git'])
+
     # Settings
     config.add_route(
         name='edit_repo',
diff --git a/rhodecode/apps/repository/views/repo_pull_requests.py b/rhodecode/apps/repository/views/repo_pull_requests.py
new file mode 100644
index 00000000..ce59f7b7
--- /dev/null
+++ b/rhodecode/apps/repository/views/repo_pull_requests.py
@@ -0,0 +1,184 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2011-2017 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
+
+from pyramid.view import view_config
+
+from rhodecode.apps._base import RepoAppView, DataGridAppView
+from rhodecode.lib import helpers as h
+from rhodecode.lib import audit_logger
+from rhodecode.lib.auth import (
+    LoginRequired, HasRepoPermissionAnyDecorator)
+from rhodecode.lib.utils import PartialRenderer
+from rhodecode.lib.utils2 import str2bool
+from rhodecode.model.comment import CommentsModel
+from rhodecode.model.db import PullRequest
+from rhodecode.model.pull_request import PullRequestModel
+
+log = logging.getLogger(__name__)
+
+
+class RepoPullRequestsView(RepoAppView, DataGridAppView):
+
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+
+        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
+        c.repo_info = self.db_repo
+
+        self._register_global_c(c)
+        return c
+
+    def _get_pull_requests_list(
+            self, repo_name, source, filter_type, opened_by, statuses):
+
+        draw, start, limit = self._extract_chunk(self.request)
+        search_q, order_by, order_dir = self._extract_ordering(self.request)
+        _render = PartialRenderer('data_table/_dt_elements.mako')
+
+        # pagination
+
+        if filter_type == 'awaiting_review':
+            pull_requests = PullRequestModel().get_awaiting_review(
+                repo_name, source=source, opened_by=opened_by,
+                statuses=statuses, offset=start, length=limit,
+                order_by=order_by, order_dir=order_dir)
+            pull_requests_total_count = PullRequestModel().count_awaiting_review(
+                repo_name, source=source, statuses=statuses,
+                opened_by=opened_by)
+        elif filter_type == 'awaiting_my_review':
+            pull_requests = PullRequestModel().get_awaiting_my_review(
+                repo_name, source=source, opened_by=opened_by,
+                user_id=self._rhodecode_user.user_id, statuses=statuses,
+                offset=start, length=limit, order_by=order_by,
+                order_dir=order_dir)
+            pull_requests_total_count = PullRequestModel().count_awaiting_my_review(
+                repo_name, source=source, user_id=self._rhodecode_user.user_id,
+                statuses=statuses, opened_by=opened_by)
+        else:
+            pull_requests = PullRequestModel().get_all(
+                repo_name, source=source, opened_by=opened_by,
+                statuses=statuses, offset=start, length=limit,
+                order_by=order_by, order_dir=order_dir)
+            pull_requests_total_count = PullRequestModel().count_all(
+                repo_name, source=source, statuses=statuses,
+                opened_by=opened_by)
+
+        data = []
+        comments_model = CommentsModel()
+        for pr in pull_requests:
+            comments = comments_model.get_all_comments(
+                self.db_repo.repo_id, pull_request=pr)
+
+            data.append({
+                'name': _render('pullrequest_name',
+                                pr.pull_request_id, pr.target_repo.repo_name),
+                'name_raw': pr.pull_request_id,
+                'status': _render('pullrequest_status',
+                                  pr.calculated_review_status()),
+                'title': _render(
+                    'pullrequest_title', pr.title, pr.description),
+                'description': h.escape(pr.description),
+                'updated_on': _render('pullrequest_updated_on',
+                                      h.datetime_to_time(pr.updated_on)),
+                'updated_on_raw': h.datetime_to_time(pr.updated_on),
+                'created_on': _render('pullrequest_updated_on',
+                                      h.datetime_to_time(pr.created_on)),
+                'created_on_raw': h.datetime_to_time(pr.created_on),
+                'author': _render('pullrequest_author',
+                                  pr.author.full_contact, ),
+                'author_raw': pr.author.full_name,
+                'comments': _render('pullrequest_comments', len(comments)),
+                'comments_raw': len(comments),
+                'closed': pr.is_closed(),
+            })
+
+        data = ({
+            'draw': draw,
+            'data': data,
+            'recordsTotal': pull_requests_total_count,
+            'recordsFiltered': pull_requests_total_count,
+        })
+        return data
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator(
+        'repository.read', 'repository.write', 'repository.admin')
+    @view_config(
+        route_name='pullrequest_show_all', request_method='GET',
+        renderer='rhodecode:templates/pullrequests/pullrequests.mako')
+    def pull_request_list(self):
+        c = self.load_default_context()
+
+        req_get = self.request.GET
+        c.source = str2bool(req_get.get('source'))
+        c.closed = str2bool(req_get.get('closed'))
+        c.my = str2bool(req_get.get('my'))
+        c.awaiting_review = str2bool(req_get.get('awaiting_review'))
+        c.awaiting_my_review = str2bool(req_get.get('awaiting_my_review'))
+
+        c.active = 'open'
+        if c.my:
+            c.active = 'my'
+        if c.closed:
+            c.active = 'closed'
+        if c.awaiting_review and not c.source:
+            c.active = 'awaiting'
+        if c.source and not c.awaiting_review:
+            c.active = 'source'
+        if c.awaiting_my_review:
+            c.active = 'awaiting_my'
+
+        return self._get_template_context(c)
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator(
+        'repository.read', 'repository.write', 'repository.admin')
+    @view_config(
+        route_name='pullrequest_show_all_data', request_method='GET',
+        renderer='json_ext', xhr=True)
+    def pull_request_list_data(self):
+
+        # additional filters
+        req_get = self.request.GET
+        source = str2bool(req_get.get('source'))
+        closed = str2bool(req_get.get('closed'))
+        my = str2bool(req_get.get('my'))
+        awaiting_review = str2bool(req_get.get('awaiting_review'))
+        awaiting_my_review = str2bool(req_get.get('awaiting_my_review'))
+
+        filter_type = 'awaiting_review' if awaiting_review \
+            else 'awaiting_my_review' if awaiting_my_review \
+            else None
+
+        opened_by = None
+        if my:
+            opened_by = [self._rhodecode_user.user_id]
+
+        statuses = [PullRequest.STATUS_NEW, PullRequest.STATUS_OPEN]
+        if closed:
+            statuses = [PullRequest.STATUS_CLOSED]
+
+        data = self._get_pull_requests_list(
+            repo_name=self.db_repo_name, source=source,
+            filter_type=filter_type, opened_by=opened_by, statuses=statuses)
+
+        return data
diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py
index 6cc70d76..6c3fa419 100644
--- a/rhodecode/config/routing.py
+++ b/rhodecode/config/routing.py
@@ -827,13 +827,6 @@ def make_map(config):
                                               'method': ['DELETE']},
                  requirements=URL_NAME_REQUIREMENTS)
 
-    rmap.connect('pullrequest_show_all',
-                 '/{repo_name}/pull-request',
-                 controller='pullrequests',
-                 action='show_all', conditions={'function': check_repo,
-                                                'method': ['GET']},
-                 requirements=URL_NAME_REQUIREMENTS, jsroute=True)
-
     rmap.connect('pullrequest_comment',
                  '/{repo_name}/pull-request-comment/{pull_request_id}',
                  controller='pullrequests',
diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py
index 421058e6..667641f9 100644
--- a/rhodecode/controllers/pullrequests.py
+++ b/rhodecode/controllers/pullrequests.py
@@ -72,124 +72,6 @@ class PullrequestsController(BaseRepoController):
         c.REVIEW_STATUS_APPROVED = ChangesetStatus.STATUS_APPROVED
         c.REVIEW_STATUS_REJECTED = ChangesetStatus.STATUS_REJECTED
 
-    def _extract_ordering(self, request):
-        column_index = safe_int(request.GET.get('order[0][column]'))
-        order_dir = request.GET.get('order[0][dir]', 'desc')
-        order_by = request.GET.get(
-            'columns[%s][data][sort]' % column_index, 'name_raw')
-        return order_by, order_dir
-
-    @LoginRequired()
-    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
-                                   'repository.admin')
-    @HasAcceptedRepoType('git', 'hg')
-    def show_all(self, repo_name):
-        # filter types
-        c.active = 'open'
-        c.source = str2bool(request.GET.get('source'))
-        c.closed = str2bool(request.GET.get('closed'))
-        c.my = str2bool(request.GET.get('my'))
-        c.awaiting_review = str2bool(request.GET.get('awaiting_review'))
-        c.awaiting_my_review = str2bool(request.GET.get('awaiting_my_review'))
-        c.repo_name = repo_name
-
-        opened_by = None
-        if c.my:
-            c.active = 'my'
-            opened_by = [c.rhodecode_user.user_id]
-
-        statuses = [PullRequest.STATUS_NEW, PullRequest.STATUS_OPEN]
-        if c.closed:
-            c.active = 'closed'
-            statuses = [PullRequest.STATUS_CLOSED]
-
-        if c.awaiting_review and not c.source:
-            c.active = 'awaiting'
-        if c.source and not c.awaiting_review:
-            c.active = 'source'
-        if c.awaiting_my_review:
-            c.active = 'awaiting_my'
-
-        data = self._get_pull_requests_list(
-            repo_name=repo_name, opened_by=opened_by, statuses=statuses)
-        if not request.is_xhr:
-            c.data = json.dumps(data['data'])
-            c.records_total = data['recordsTotal']
-            return render('/pullrequests/pullrequests.mako')
-        else:
-            return json.dumps(data)
-
-    def _get_pull_requests_list(self, repo_name, opened_by, statuses):
-        # pagination
-        start = safe_int(request.GET.get('start'), 0)
-        length = safe_int(request.GET.get('length'), c.visual.dashboard_items)
-        order_by, order_dir = self._extract_ordering(request)
-
-        if c.awaiting_review:
-            pull_requests = PullRequestModel().get_awaiting_review(
-                repo_name, source=c.source, opened_by=opened_by,
-                statuses=statuses, offset=start, length=length,
-                order_by=order_by, order_dir=order_dir)
-            pull_requests_total_count = PullRequestModel(
-            ).count_awaiting_review(
-                repo_name, source=c.source, statuses=statuses,
-                opened_by=opened_by)
-        elif c.awaiting_my_review:
-            pull_requests = PullRequestModel().get_awaiting_my_review(
-                repo_name, source=c.source, opened_by=opened_by,
-                user_id=c.rhodecode_user.user_id, statuses=statuses,
-                offset=start, length=length, order_by=order_by,
-                order_dir=order_dir)
-            pull_requests_total_count = PullRequestModel(
-            ).count_awaiting_my_review(
-                repo_name, source=c.source, user_id=c.rhodecode_user.user_id,
-                statuses=statuses, opened_by=opened_by)
-        else:
-            pull_requests = PullRequestModel().get_all(
-                repo_name, source=c.source, opened_by=opened_by,
-                statuses=statuses, offset=start, length=length,
-                order_by=order_by, order_dir=order_dir)
-            pull_requests_total_count = PullRequestModel().count_all(
-                repo_name, source=c.source, statuses=statuses,
-                opened_by=opened_by)
-
-        from rhodecode.lib.utils import PartialRenderer
-        _render = PartialRenderer('data_table/_dt_elements.mako')
-        data = []
-        for pr in pull_requests:
-            comments = CommentsModel().get_all_comments(
-                c.rhodecode_db_repo.repo_id, pull_request=pr)
-
-            data.append({
-                'name': _render('pullrequest_name',
-                                pr.pull_request_id, pr.target_repo.repo_name),
-                'name_raw': pr.pull_request_id,
-                'status': _render('pullrequest_status',
-                                  pr.calculated_review_status()),
-                'title': _render(
-                    'pullrequest_title', pr.title, pr.description),
-                'description': h.escape(pr.description),
-                'updated_on': _render('pullrequest_updated_on',
-                                      h.datetime_to_time(pr.updated_on)),
-                'updated_on_raw': h.datetime_to_time(pr.updated_on),
-                'created_on': _render('pullrequest_updated_on',
-                                      h.datetime_to_time(pr.created_on)),
-                'created_on_raw': h.datetime_to_time(pr.created_on),
-                'author': _render('pullrequest_author',
-                                  pr.author.full_contact, ),
-                'author_raw': pr.author.full_name,
-                'comments': _render('pullrequest_comments', len(comments)),
-                'comments_raw': len(comments),
-                'closed': pr.is_closed(),
-            })
-        # json used to render the grid
-        data = ({
-            'data': data,
-            'recordsTotal': pull_requests_total_count,
-            'recordsFiltered': pull_requests_total_count,
-        })
-        return data
-
     @LoginRequired()
     @NotAnonymous()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
diff --git a/rhodecode/public/css/panels.less b/rhodecode/public/css/panels.less
index 84285d07..2f728f51 100644
--- a/rhodecode/public/css/panels.less
+++ b/rhodecode/public/css/panels.less
@@ -42,6 +42,10 @@
 
     .panel-body {
         padding: @panel-padding;
+
+        &.panel-body-min-height {
+            min-height: 150px
+        }
     }
     
     .panel-footer {
diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js
index aa8e98de..4cd53cc8 100644
--- a/rhodecode/public/js/rhodecode/routes.js
+++ b/rhodecode/public/js/rhodecode/routes.js
@@ -34,7 +34,6 @@ function registerRCRoutes() {
     pyroutes.register('pullrequest_repo_destinations', '/%(repo_name)s/pull-request/repo-destinations', ['repo_name']);
     pyroutes.register('pullrequest_show', '/%(repo_name)s/pull-request/%(pull_request_id)s', ['repo_name', 'pull_request_id']);
     pyroutes.register('pullrequest_update', '/%(repo_name)s/pull-request/%(pull_request_id)s', ['repo_name', 'pull_request_id']);
-    pyroutes.register('pullrequest_show_all', '/%(repo_name)s/pull-request', ['repo_name']);
     pyroutes.register('pullrequest_comment', '/%(repo_name)s/pull-request-comment/%(pull_request_id)s', ['repo_name', 'pull_request_id']);
     pyroutes.register('pullrequest_comment_delete', '/%(repo_name)s/pull-request-comment/%(comment_id)s/delete', ['repo_name', 'comment_id']);
     pyroutes.register('changelog_home', '/%(repo_name)s/changelog', ['repo_name']);
@@ -106,6 +105,8 @@ function registerRCRoutes() {
     pyroutes.register('branches_home', '/%(repo_name)s/branches', ['repo_name']);
     pyroutes.register('bookmarks_home', '/%(repo_name)s/bookmarks', ['repo_name']);
     pyroutes.register('pullrequest_show', '/%(repo_name)s/pull-request/%(pull_request_id)s', ['repo_name', 'pull_request_id']);
+    pyroutes.register('pullrequest_show_all', '/%(repo_name)s/pull-request', ['repo_name']);
+    pyroutes.register('pullrequest_show_all_data', '/%(repo_name)s/pull-request-data', ['repo_name']);
     pyroutes.register('edit_repo', '/%(repo_name)s/settings', ['repo_name']);
     pyroutes.register('edit_repo_advanced', '/%(repo_name)s/settings/advanced', ['repo_name']);
     pyroutes.register('edit_repo_advanced_delete', '/%(repo_name)s/settings/advanced/delete', ['repo_name']);
diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako
index 0f7776f3..e133b722 100644
--- a/rhodecode/templates/base/base.mako
+++ b/rhodecode/templates/base/base.mako
@@ -234,7 +234,7 @@
         ## TODO: anderson: ideally it would have a function on the scm_instance "enable_pullrequest() and enable_fork()"
         %if c.rhodecode_db_repo.repo_type in ['git','hg']:
           <li class="${is_active('showpullrequest')}">
-            <a class="menulink" href="${h.url('pullrequest_show_all',repo_name=c.repo_name)}" title="${_('Show Pull Requests for %s') % c.repo_name}">
+            <a class="menulink" href="${h.route_path('pullrequest_show_all', repo_name=c.repo_name)}" title="${_('Show Pull Requests for %s') % c.repo_name}">
               %if c.repository_pull_requests:
                 <span class="pr_notifications">${c.repository_pull_requests}</span>
               %endif
diff --git a/rhodecode/templates/pullrequests/pullrequests.mako b/rhodecode/templates/pullrequests/pullrequests.mako
index f0f31ff1..957f981e 100644
--- a/rhodecode/templates/pullrequests/pullrequests.mako
+++ b/rhodecode/templates/pullrequests/pullrequests.mako
@@ -45,12 +45,12 @@
     ##main
     <div class="sidebar">
         <ul class="nav nav-pills nav-stacked">
-          <li class="${'active' if c.active=='open' else ''}"><a href="${h.url('pullrequest_show_all',repo_name=c.repo_name,source=0)}">${_('Opened')}</a></li>
-          <li class="${'active' if c.active=='my' else ''}"><a href="${h.url('pullrequest_show_all',repo_name=c.repo_name,source=0,my=1)}">${_('Opened by me')}</a></li>
-          <li class="${'active' if c.active=='awaiting' else ''}"><a href="${h.url('pullrequest_show_all',repo_name=c.repo_name,source=0,awaiting_review=1)}">${_('Awaiting review')}</a></li>
-          <li class="${'active' if c.active=='awaiting_my' else ''}"><a href="${h.url('pullrequest_show_all',repo_name=c.repo_name,source=0,awaiting_my_review=1)}">${_('Awaiting my review')}</a></li>
-          <li class="${'active' if c.active=='closed' else ''}"><a href="${h.url('pullrequest_show_all',repo_name=c.repo_name,source=0,closed=1)}">${_('Closed')}</a></li>
-          <li class="${'active' if c.active=='source' else ''}"><a href="${h.url('pullrequest_show_all',repo_name=c.repo_name,source=1)}">${_('From this repo')}</a></li>
+          <li class="${'active' if c.active=='open' else ''}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name,         _query={'source':0})}">${_('Opened')}</a></li>
+          <li class="${'active' if c.active=='my' else ''}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name,           _query={'source':0,'my':1})}">${_('Opened by me')}</a></li>
+          <li class="${'active' if c.active=='awaiting' else ''}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name,     _query={'source':0,'awaiting_review':1})}">${_('Awaiting review')}</a></li>
+          <li class="${'active' if c.active=='awaiting_my' else ''}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name,  _query={'source':0,'awaiting_my_review':1})}">${_('Awaiting my review')}</a></li>
+          <li class="${'active' if c.active=='closed' else ''}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name,       _query={'source':0,'closed':1})}">${_('Closed')}</a></li>
+          <li class="${'active' if c.active=='source' else ''}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name,       _query={'source':1})}">${_('From this repo')}</a></li>
         </ul>
     </div>
 
@@ -73,7 +73,7 @@
               %endif
           </h3>
         </div>
-        <div class="panel-body">
+        <div class="panel-body panel-body-min-height">
           <table id="pull_request_list_table" class="display"></table>
         </div>
       </div>
@@ -83,14 +83,24 @@
 
 <script type="text/javascript">
 $(document).ready(function() {
+
+    var $pullRequestListTable = $('#pull_request_list_table');
+
     // object list
-    $('#pull_request_list_table').DataTable({
-      data: ${c.data|n},
-      processing: false,
+    $pullRequestListTable.DataTable({
+      processing: true,
       serverSide: true,
-      deferLoading: ${c.records_total},
-      ajax: "",
-      dom: 'tp',
+      ajax: {
+          "url": "${h.route_path('pullrequest_show_all_data', repo_name=c.repo_name)}",
+          "data": function (d) {
+              d.source = "${c.source}";
+              d.closed = "${c.closed}";
+              d.my = "${c.my}";
+              d.awaiting_review = "${c.awaiting_review}";
+              d.awaiting_my_review = "${c.awaiting_my_review}";
+          }
+      },
+      dom: 'rtp',
       pageLength: ${c.visual.dashboard_items},
       order: [[ 1, "desc" ]],
       columns: [
@@ -109,6 +119,7 @@ $(document).ready(function() {
       ],
       language: {
             paginate: DEFAULT_GRID_PAGINATION,
+            sProcessing: _gettext('loading...'),
             emptyTable: _gettext("No pull requests available yet.")
       },
       "drawCallback": function( settings, json ) {
@@ -120,13 +131,16 @@ $(document).ready(function() {
           }
       }
     });
-});
-$('#pull_request_list_table').on('xhr.dt', function(e, settings, json, xhr){
-    $('#pull_request_list_table').css('opacity', 1);
+
+    $pullRequestListTable.on('xhr.dt', function(e, settings, json, xhr){
+        $pullRequestListTable.css('opacity', 1);
+    });
+
+    $pullRequestListTable.on('preXhr.dt', function(e, settings, data){
+        $pullRequestListTable.css('opacity', 0.3);
+    });
+
 });
 
-$('#pull_request_list_table').on('preXhr.dt', function(e, settings, data){
-    $('#pull_request_list_table').css('opacity', 0.3);
-});
 </script>
 </%def>

From 98243a5812c9d0f42e16835d89e04916efeb0a94 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 26 May 2017 12:37:48 +0200
Subject: [PATCH 130/211] reviewers: moved the new v1 api of default reviewers
 into pyramid view.

- updated schema
- updated logic of routing so EE can override it.
---
 rhodecode/apps/repository/__init__.py          |  4 ++++
 .../apps/repository/views/repo_review_rules.py | 18 ++++++++++++++++++
 rhodecode/config/routing.py                    |  3 ---
 rhodecode/controllers/summary.py               | 17 +++--------------
 rhodecode/controllers/utils.py                 |  4 +++-
 rhodecode/public/js/rhodecode/routes.js        |  2 +-
 6 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/rhodecode/apps/repository/__init__.py b/rhodecode/apps/repository/__init__.py
index 5dc6afb3..8d1c116f 100644
--- a/rhodecode/apps/repository/__init__.py
+++ b/rhodecode/apps/repository/__init__.py
@@ -94,6 +94,10 @@ def includeme(config):
         name='repo_reviewers',
         pattern='/{repo_name:.*?[^/]}/settings/review/rules', repo_route=True)
 
+    config.add_route(
+        name='repo_default_reviewers_data',
+        pattern='/{repo_name:.*?[^/]}/settings/review/default-reviewers', repo_route=True)
+
     # Maintenance
     config.add_route(
         name='repo_maintenance',
diff --git a/rhodecode/apps/repository/views/repo_review_rules.py b/rhodecode/apps/repository/views/repo_review_rules.py
index e85e7078..72c64b2e 100644
--- a/rhodecode/apps/repository/views/repo_review_rules.py
+++ b/rhodecode/apps/repository/views/repo_review_rules.py
@@ -23,6 +23,7 @@ import logging
 from pyramid.view import view_config
 
 from rhodecode.apps._base import RepoAppView
+from rhodecode.controllers import utils
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 
 log = logging.getLogger(__name__)
@@ -49,3 +50,20 @@ class RepoReviewRulesView(RepoAppView):
 
         return self._get_template_context(c)
 
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator(
+        'repository.read', 'repository.write', 'repository.admin')
+    @view_config(
+        route_name='repo_default_reviewers_data', request_method='GET',
+        renderer='json_ext')
+    def repo_default_reviewers_data(self):
+        reasons = ['Default reviewer', 'Repository owner']
+        default = utils.reviewer_as_json(
+            user=self.db_repo.user, reasons=reasons, mandatory=False)
+
+        return {
+            'api_ver': 'v1',  # define version for later possible schema upgrade
+            'reviewers': [default],
+            'rules': {},
+            'rules_data': {},
+        }
diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py
index 6c3fa419..bcacb1d4 100644
--- a/rhodecode/config/routing.py
+++ b/rhodecode/config/routing.py
@@ -623,9 +623,6 @@ def make_map(config):
     rmap.connect('repo_refs_changelog_data', '/{repo_name}/refs-data-changelog',
                  controller='summary', action='repo_refs_changelog_data',
                  requirements=URL_NAME_REQUIREMENTS, jsroute=True)
-    rmap.connect('repo_default_reviewers_data', '/{repo_name}/default-reviewers',
-                 controller='summary', action='repo_default_reviewers_data',
-                 jsroute=True, requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('changeset_home', '/{repo_name}/changeset/{revision}',
                  controller='changeset', revision='tip',
diff --git a/rhodecode/controllers/summary.py b/rhodecode/controllers/summary.py
index bf9d82df..220ffab9 100644
--- a/rhodecode/controllers/summary.py
+++ b/rhodecode/controllers/summary.py
@@ -27,7 +27,7 @@ from string import lower
 
 from pylons import tmpl_context as c, request
 from pylons.i18n.translation import _
-from beaker.cache import cache_region, region_invalidate
+from beaker.cache import cache_region
 
 from rhodecode.config.conf import (LANGUAGES_EXTENSIONS_MAP)
 from rhodecode.controllers import utils
@@ -36,13 +36,12 @@ from rhodecode.lib import caches, helpers as h
 from rhodecode.lib.utils import jsonify
 from rhodecode.lib.utils2 import safe_str
 from rhodecode.lib.auth import (
-    LoginRequired, HasRepoPermissionAnyDecorator, NotAnonymous, XHRRequired)
+    LoginRequired, HasRepoPermissionAnyDecorator, XHRRequired)
 from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.markup_renderer import MarkupRenderer, relative_links
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.vcs.backends.base import EmptyCommit
-from rhodecode.lib.vcs.exceptions import (
-    CommitError, EmptyRepositoryError, NodeDoesNotExistError)
+from rhodecode.lib.vcs.exceptions import CommitError, EmptyRepositoryError
 from rhodecode.model.db import Statistics, CacheKey, User
 from rhodecode.model.repo import ReadmeFinder
 
@@ -259,16 +258,6 @@ class SummaryController(BaseRepoController):
         }
         return data
 
-    @LoginRequired()
-    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
-                                   'repository.admin')
-    @jsonify
-    def repo_default_reviewers_data(self, repo_name):
-        return {
-            'reviewers': [utils.reviewer_as_json(
-                user=c.rhodecode_db_repo.user, reasons=None)]
-        }
-
     @jsonify
     def repo_refs_changelog_data(self, repo_name):
         repo = c.rhodecode_repo
diff --git a/rhodecode/controllers/utils.py b/rhodecode/controllers/utils.py
index 8ea09a03..a2ad2ba6 100644
--- a/rhodecode/controllers/utils.py
+++ b/rhodecode/controllers/utils.py
@@ -89,17 +89,19 @@ def get_commit_from_ref_name(repo, ref_name, ref_type=None):
     return repo_scm.get_commit(commit_id)
 
 
-def reviewer_as_json(user, reasons):
+def reviewer_as_json(user, reasons, mandatory):
     """
     Returns json struct of a reviewer for frontend
 
     :param user: the reviewer
     :param reasons: list of strings of why they are reviewers
+    :param mandatory: bool, to set user as mandatory
     """
 
     return {
         'user_id': user.user_id,
         'reasons': reasons,
+        'mandatory': mandatory,
         'username': user.username,
         'firstname': user.firstname,
         'lastname': user.lastname,
diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js
index 4cd53cc8..81402391 100644
--- a/rhodecode/public/js/rhodecode/routes.js
+++ b/rhodecode/public/js/rhodecode/routes.js
@@ -21,7 +21,6 @@ function registerRCRoutes() {
     pyroutes.register('repo_stats', '/%(repo_name)s/repo_stats/%(commit_id)s', ['repo_name', 'commit_id']);
     pyroutes.register('repo_refs_data', '/%(repo_name)s/refs-data', ['repo_name']);
     pyroutes.register('repo_refs_changelog_data', '/%(repo_name)s/refs-data-changelog', ['repo_name']);
-    pyroutes.register('repo_default_reviewers_data', '/%(repo_name)s/default-reviewers', ['repo_name']);
     pyroutes.register('changeset_home', '/%(repo_name)s/changeset/%(revision)s', ['repo_name', 'revision']);
     pyroutes.register('changeset_comment', '/%(repo_name)s/changeset/%(revision)s/comment', ['repo_name', 'revision']);
     pyroutes.register('changeset_comment_preview', '/%(repo_name)s/changeset/comment/preview', ['repo_name']);
@@ -116,6 +115,7 @@ function registerRCRoutes() {
     pyroutes.register('edit_repo_caches', '/%(repo_name)s/settings/caches', ['repo_name']);
     pyroutes.register('edit_repo_perms', '/%(repo_name)s/settings/permissions', ['repo_name']);
     pyroutes.register('repo_reviewers', '/%(repo_name)s/settings/review/rules', ['repo_name']);
+    pyroutes.register('repo_default_reviewers_data', '/%(repo_name)s/settings/review/default-reviewers', ['repo_name']);
     pyroutes.register('repo_maintenance', '/%(repo_name)s/settings/maintenance', ['repo_name']);
     pyroutes.register('repo_maintenance_execute', '/%(repo_name)s/settings/maintenance/execute', ['repo_name']);
     pyroutes.register('strip', '/%(repo_name)s/settings/strip', ['repo_name']);

From 83187d1dfcdcec10e753a626f4151f231dea3a7d Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 29 May 2017 09:48:29 +0200
Subject: [PATCH 131/211] user-autocomplete: allow skipping default user.

---
 rhodecode/apps/home/views.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/rhodecode/apps/home/views.py b/rhodecode/apps/home/views.py
index cc451ab8..6c02e0de 100644
--- a/rhodecode/apps/home/views.py
+++ b/rhodecode/apps/home/views.py
@@ -54,6 +54,7 @@ class HomeView(BaseAppView):
         active = str2bool(self.request.GET.get('active') or True)
         include_groups = str2bool(self.request.GET.get('user_groups'))
         expand_groups = str2bool(self.request.GET.get('user_groups_expand'))
+        skip_default_user = str2bool(self.request.GET.get('skip_default_user'))
 
         log.debug('generating user list, query:%s, active:%s, with_groups:%s',
                   query, active, include_groups)
@@ -61,6 +62,12 @@ class HomeView(BaseAppView):
         _users = UserModel().get_users(
             name_contains=query, only_active=active)
 
+        def maybe_skip_default_user(usr):
+            if skip_default_user and usr['username'] == UserModel.cls.DEFAULT_USER:
+                return False
+            return True
+        _users = filter(maybe_skip_default_user, _users)
+
         if include_groups:
             # extend with user groups
             _user_groups = UserGroupModel().get_user_groups(

From bd1e865c9cec38c9205b10fcde3a5214ad2dec6b Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 29 May 2017 20:10:17 +0200
Subject: [PATCH 132/211] pull-request: extended default reviewers
 functionality.

- added mandatory reviewers JS logic Fixes: #4219
- added option to forbid author to be a reviewer via JS/Frontend checks. Fixes #5190
- added option to forbid adding new reviewers except those defined. Fixes #5208
---
 rhodecode/__init__.py                         |   2 +-
 .../api/tests/test_create_pull_request.py     |  36 +-
 rhodecode/api/tests/test_get_pull_request.py  |   3 +-
 .../api/tests/test_update_pull_request.py     |  28 +-
 rhodecode/api/views/pull_request_api.py       |  66 +--
 rhodecode/apps/_base/__init__.py              |   7 +
 .../tests/test_pull_requests_list.py          |  83 ++++
 rhodecode/apps/repository/utils.py            |  76 ++++
 .../repository/views/repo_review_rules.py     |  15 +-
 rhodecode/controllers/pullrequests.py         |  66 ++-
 rhodecode/controllers/utils.py                |  20 -
 .../dbmigrate/versions/074_version_4_8_0.py   |  37 ++
 .../dbmigrate/versions/075_version_4_8_0.py   |  38 ++
 .../dbmigrate/versions/076_version_4_8_0.py   |  33 ++
 .../dbmigrate/versions/077_version_4_8_0.py   |  40 ++
 rhodecode/model/changeset_status.py           |  15 +-
 rhodecode/model/db.py                         |  92 ++--
 rhodecode/model/forms.py                      |   3 +-
 rhodecode/model/pull_request.py               |  54 ++-
 .../schemas/reviewer_schema.py                |  34 ++
 rhodecode/model/validation_schema/types.py    |   2 +-
 rhodecode/public/css/buttons.less             |  12 +-
 rhodecode/public/css/deform.less              |   2 +-
 rhodecode/public/css/main.less                |  38 ++
 .../public/js/src/rhodecode/pullrequests.js   | 393 ++++++++++++++----
 .../templates/admin/repos/repo_edit.mako      |   6 +-
 .../templates/compare/compare_commits.mako    |   1 +
 rhodecode/templates/forms/sequence.pt         |  12 +-
 rhodecode/templates/forms/sequence_item.pt    |  10 +-
 .../templates/pullrequests/pullrequest.mako   | 172 ++------
 .../pullrequests/pullrequest_show.mako        | 108 +++--
 rhodecode/tests/functional/test_login.py      |   5 +-
 .../tests/functional/test_pullrequests.py     |  68 +--
 rhodecode/tests/models/test_pullrequest.py    |   4 +-
 rhodecode/tests/plugin.py                     |   5 +-
 35 files changed, 1139 insertions(+), 447 deletions(-)
 create mode 100644 rhodecode/apps/repository/tests/test_pull_requests_list.py
 create mode 100644 rhodecode/apps/repository/utils.py
 create mode 100644 rhodecode/lib/dbmigrate/versions/074_version_4_8_0.py
 create mode 100644 rhodecode/lib/dbmigrate/versions/075_version_4_8_0.py
 create mode 100644 rhodecode/lib/dbmigrate/versions/076_version_4_8_0.py
 create mode 100644 rhodecode/lib/dbmigrate/versions/077_version_4_8_0.py
 create mode 100644 rhodecode/model/validation_schema/schemas/reviewer_schema.py

diff --git a/rhodecode/__init__.py b/rhodecode/__init__.py
index 531167a8..a4e96a15 100644
--- a/rhodecode/__init__.py
+++ b/rhodecode/__init__.py
@@ -51,7 +51,7 @@ PYRAMID_SETTINGS = {}
 EXTENSIONS = {}
 
 __version__ = ('.'.join((str(each) for each in VERSION[:3])))
-__dbversion__ = 73  # defines current db version for migrations
+__dbversion__ = 77  # defines current db version for migrations
 __platform__ = platform.system()
 __license__ = 'AGPLv3, and Commercial License'
 __author__ = 'RhodeCode GmbH'
diff --git a/rhodecode/api/tests/test_create_pull_request.py b/rhodecode/api/tests/test_create_pull_request.py
index 0fc76026..505beec5 100644
--- a/rhodecode/api/tests/test_create_pull_request.py
+++ b/rhodecode/api/tests/test_create_pull_request.py
@@ -98,7 +98,12 @@ class TestCreatePullRequestApi(object):
     def test_create_with_reviewers_specified_by_names(
             self, backend, no_notifications):
         data = self._prepare_data(backend)
-        reviewers = [TEST_USER_REGULAR_LOGIN, TEST_USER_ADMIN_LOGIN]
+        reviewers = [
+            {'username': TEST_USER_REGULAR_LOGIN,
+             'reasons': ['added manually']},
+            {'username': TEST_USER_ADMIN_LOGIN,
+             'reasons': ['added manually']},
+        ]
         data['reviewers'] = reviewers
         id_, params = build_data(
             self.apikey_regular, 'create_pull_request', **data)
@@ -110,16 +115,26 @@ class TestCreatePullRequestApi(object):
         assert result['result']['msg'] == expected_message
         pull_request_id = result['result']['pull_request_id']
         pull_request = PullRequestModel().get(pull_request_id)
-        actual_reviewers = [r.user.username for r in pull_request.reviewers]
+        actual_reviewers = [
+            {'username': r.user.username,
+             'reasons': ['added manually'],
+             } for r in pull_request.reviewers
+        ]
         assert sorted(actual_reviewers) == sorted(reviewers)
 
     @pytest.mark.backends("git", "hg")
     def test_create_with_reviewers_specified_by_ids(
             self, backend, no_notifications):
         data = self._prepare_data(backend)
-        reviewer_names = [TEST_USER_REGULAR_LOGIN, TEST_USER_ADMIN_LOGIN]
         reviewers = [
-            UserModel().get_by_username(n).user_id for n in reviewer_names]
+            {'username': UserModel().get_by_username(
+                TEST_USER_REGULAR_LOGIN).user_id,
+             'reasons': ['added manually']},
+            {'username': UserModel().get_by_username(
+                TEST_USER_ADMIN_LOGIN).user_id,
+             'reasons': ['added manually']},
+        ]
+
         data['reviewers'] = reviewers
         id_, params = build_data(
             self.apikey_regular, 'create_pull_request', **data)
@@ -131,14 +146,17 @@ class TestCreatePullRequestApi(object):
         assert result['result']['msg'] == expected_message
         pull_request_id = result['result']['pull_request_id']
         pull_request = PullRequestModel().get(pull_request_id)
-        actual_reviewers = [r.user.username for r in pull_request.reviewers]
-        assert sorted(actual_reviewers) == sorted(reviewer_names)
+        actual_reviewers = [
+            {'username': r.user.user_id,
+             'reasons': ['added manually'],
+             } for r in pull_request.reviewers
+        ]
+        assert sorted(actual_reviewers) == sorted(reviewers)
 
     @pytest.mark.backends("git", "hg")
     def test_create_fails_when_the_reviewer_is_not_found(self, backend):
         data = self._prepare_data(backend)
-        reviewers = ['somebody']
-        data['reviewers'] = reviewers
+        data['reviewers'] = [{'username': 'somebody'}]
         id_, params = build_data(
             self.apikey_regular, 'create_pull_request', **data)
         response = api_call(self.app, params)
@@ -153,7 +171,7 @@ class TestCreatePullRequestApi(object):
         id_, params = build_data(
             self.apikey_regular, 'create_pull_request', **data)
         response = api_call(self.app, params)
-        expected_message = 'reviewers should be specified as a list'
+        expected_message = {u'': '"test_regular,test_admin" is not iterable'}
         assert_error(id_, expected_message, given=response.body)
 
     @pytest.mark.backends("git", "hg")
diff --git a/rhodecode/api/tests/test_get_pull_request.py b/rhodecode/api/tests/test_get_pull_request.py
index 6283b2e6..3018b6d5 100644
--- a/rhodecode/api/tests/test_get_pull_request.py
+++ b/rhodecode/api/tests/test_get_pull_request.py
@@ -109,7 +109,8 @@ class TestGetPullRequest(object):
                     'reasons': reasons,
                     'review_status': st[0][1].status if st else 'not_reviewed',
                 }
-                for reviewer, reasons, st in pull_request.reviewers_statuses()
+                for reviewer, reasons, mandatory, st in
+                pull_request.reviewers_statuses()
             ]
         }
         assert_ok(id_, expected, response.body)
diff --git a/rhodecode/api/tests/test_update_pull_request.py b/rhodecode/api/tests/test_update_pull_request.py
index f86357cb..28dd0889 100644
--- a/rhodecode/api/tests/test_update_pull_request.py
+++ b/rhodecode/api/tests/test_update_pull_request.py
@@ -119,20 +119,28 @@ class TestUpdatePullRequest(object):
 
     @pytest.mark.backends("git", "hg")
     def test_api_update_change_reviewers(
-            self, pr_util, silence_action_logger, no_notifications):
+            self, user_util, pr_util, silence_action_logger, no_notifications):
+        a = user_util.create_user()
+        b = user_util.create_user()
+        c = user_util.create_user()
+        new_reviewers = [
+            {'username': b.username,'reasons': ['updated via API'],
+             'mandatory':False},
+            {'username': c.username, 'reasons': ['updated via API'],
+             'mandatory':False},
+        ]
 
-        users = [x.username for x in User.get_all()]
-        new = [users.pop(0)]
-        removed = sorted(new)
-        added = sorted(users)
+        added = [b.username, c.username]
+        removed = [a.username]
 
-        pull_request = pr_util.create_pull_request(reviewers=new)
+        pull_request = pr_util.create_pull_request(
+            reviewers=[(a.username, ['added via API'], False)])
 
         id_, params = build_data(
             self.apikey, 'update_pull_request',
             repoid=pull_request.target_repo.repo_name,
             pullrequestid=pull_request.pull_request_id,
-            reviewers=added)
+            reviewers=new_reviewers)
         response = api_call(self.app, params)
         expected = {
             "msg": "Updated pull request `{}`".format(
@@ -152,7 +160,7 @@ class TestUpdatePullRequest(object):
             self.apikey, 'update_pull_request',
             repoid=pull_request.target_repo.repo_name,
             pullrequestid=pull_request.pull_request_id,
-            reviewers=['bad_name'])
+            reviewers=[{'username': 'bad_name'}])
         response = api_call(self.app, params)
 
         expected = 'user `bad_name` does not exist'
@@ -165,7 +173,7 @@ class TestUpdatePullRequest(object):
             self.apikey, 'update_pull_request',
             repoid='fake',
             pullrequestid='fake',
-            reviewers=['bad_name'])
+            reviewers=[{'username': 'bad_name'}])
         response = api_call(self.app, params)
 
         expected = 'repository `fake` does not exist'
@@ -181,7 +189,7 @@ class TestUpdatePullRequest(object):
             self.apikey, 'update_pull_request',
             repoid=pull_request.target_repo.repo_name,
             pullrequestid=999999,
-            reviewers=['bad_name'])
+            reviewers=[{'username': 'bad_name'}])
         response = api_call(self.app, params)
 
         expected = 'pull request `999999` does not exist'
diff --git a/rhodecode/api/views/pull_request_api.py b/rhodecode/api/views/pull_request_api.py
index e0d84ad7..1cd43875 100644
--- a/rhodecode/api/views/pull_request_api.py
+++ b/rhodecode/api/views/pull_request_api.py
@@ -21,7 +21,7 @@
 
 import logging
 
-from rhodecode.api import jsonrpc_method, JSONRPCError
+from rhodecode.api import jsonrpc_method, JSONRPCError, JSONRPCValidationError
 from rhodecode.api.utils import (
     has_superadmin_permission, Optional, OAttr, get_repo_or_error,
     get_pull_request_or_error, get_commit_or_error, get_user_or_error,
@@ -34,6 +34,9 @@ from rhodecode.model.comment import CommentsModel
 from rhodecode.model.db import Session, ChangesetStatus, ChangesetComment
 from rhodecode.model.pull_request import PullRequestModel, MergeCheck
 from rhodecode.model.settings import SettingsModel
+from rhodecode.model.validation_schema import Invalid
+from rhodecode.model.validation_schema.schemas.reviewer_schema import \
+    ReviewerListSchema
 
 log = logging.getLogger(__name__)
 
@@ -537,7 +540,7 @@ def create_pull_request(
     :type reviewers: Optional(list)
         Accepts username strings or objects of the format:
 
-            {'username': 'nick', 'reasons': ['original author']}
+            {'username': 'nick', 'reasons': ['original author'], 'mandatory': <bool>}
     """
 
     source = get_repo_or_error(source_repo)
@@ -567,20 +570,19 @@ def create_pull_request(
         raise JSONRPCError('no common ancestor found')
 
     reviewer_objects = Optional.extract(reviewers) or []
-    if not isinstance(reviewer_objects, list):
-        raise JSONRPCError('reviewers should be specified as a list')
+    if reviewer_objects:
+        schema = ReviewerListSchema()
+        try:
+            reviewer_objects = schema.deserialize(reviewer_objects)
+        except Invalid as err:
+            raise JSONRPCValidationError(colander_exc=err)
 
-    reviewers_reasons = []
+    reviewers = []
     for reviewer_object in reviewer_objects:
-        reviewer_reasons = []
-        if isinstance(reviewer_object, (basestring, int)):
-            reviewer_username = reviewer_object
-        else:
-            reviewer_username = reviewer_object['username']
-            reviewer_reasons = reviewer_object.get('reasons', [])
-
-        user = get_user_or_error(reviewer_username)
-        reviewers_reasons.append((user.user_id, reviewer_reasons))
+        user = get_user_or_error(reviewer_object['username'])
+        reasons = reviewer_object['reasons']
+        mandatory = reviewer_object['mandatory']
+        reviewers.append((user.user_id, reasons, mandatory))
 
     pull_request_model = PullRequestModel()
     pull_request = pull_request_model.create(
@@ -591,7 +593,7 @@ def create_pull_request(
         target_ref=full_target_ref,
         revisions=reversed(
             [commit.raw_id for commit in reversed(commit_ranges)]),
-        reviewers=reviewers_reasons,
+        reviewers=reviewers,
         title=title,
         description=Optional.extract(description)
     )
@@ -624,6 +626,10 @@ def update_pull_request(
     :type description: Optional(str)
     :param reviewers: Update pull request reviewers list with new value.
     :type reviewers: Optional(list)
+        Accepts username strings or objects of the format:
+
+            {'username': 'nick', 'reasons': ['original author'], 'mandatory': <bool>}
+
     :param update_commits: Trigger update of commits for this pull request
     :type: update_commits: Optional(bool)
     :param close_pull_request: Close this pull request with rejected state
@@ -669,23 +675,21 @@ def update_pull_request(
             'pull request `%s` update failed, pull request is closed' % (
                 pullrequestid,))
 
+
     reviewer_objects = Optional.extract(reviewers) or []
-    if not isinstance(reviewer_objects, list):
-        raise JSONRPCError('reviewers should be specified as a list')
+    if reviewer_objects:
+        schema = ReviewerListSchema()
+        try:
+            reviewer_objects = schema.deserialize(reviewer_objects)
+        except Invalid as err:
+            raise JSONRPCValidationError(colander_exc=err)
 
-    reviewers_reasons = []
-    reviewer_ids = set()
+    reviewers = []
     for reviewer_object in reviewer_objects:
-        reviewer_reasons = []
-        if isinstance(reviewer_object, (int, basestring)):
-            reviewer_username = reviewer_object
-        else:
-            reviewer_username = reviewer_object['username']
-            reviewer_reasons = reviewer_object.get('reasons', [])
-
-        user = get_user_or_error(reviewer_username)
-        reviewer_ids.add(user.user_id)
-        reviewers_reasons.append((user.user_id, reviewer_reasons))
+        user = get_user_or_error(reviewer_object['username'])
+        reasons = reviewer_object['reasons']
+        mandatory = reviewer_object['mandatory']
+        reviewers.append((user.user_id, reasons, mandatory))
 
     title = Optional.extract(title)
     description = Optional.extract(description)
@@ -704,9 +708,9 @@ def update_pull_request(
         Session().commit()
 
     reviewers_changes = {"added": [], "removed": []}
-    if reviewer_ids:
+    if reviewers:
         added_reviewers, removed_reviewers = \
-            PullRequestModel().update_reviewers(pull_request, reviewers_reasons)
+            PullRequestModel().update_reviewers(pull_request, reviewers)
 
         reviewers_changes['added'] = sorted(
             [get_user_or_error(n).username for n in added_reviewers])
diff --git a/rhodecode/apps/_base/__init__.py b/rhodecode/apps/_base/__init__.py
index a202a8df..3f06d5c7 100644
--- a/rhodecode/apps/_base/__init__.py
+++ b/rhodecode/apps/_base/__init__.py
@@ -290,6 +290,13 @@ class RepoTypeRoutePredicate(object):
         else:
             log.warning('Current view is not supported for repo type:%s',
                         rhodecode_db_repo.repo_type)
+            #
+            # h.flash(h.literal(
+            #     _('Action not supported for %s.' % rhodecode_repo.alias)),
+            #     category='warning')
+            # return redirect(
+            #     url('summary_home', repo_name=cls.rhodecode_db_repo.repo_name))
+
             return False
 
 
diff --git a/rhodecode/apps/repository/tests/test_pull_requests_list.py b/rhodecode/apps/repository/tests/test_pull_requests_list.py
new file mode 100644
index 00000000..5bdbad57
--- /dev/null
+++ b/rhodecode/apps/repository/tests/test_pull_requests_list.py
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2017 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
+from rhodecode.model.db import Repository
+
+
+def route_path(name, params=None, **kwargs):
+    import urllib
+
+    base_url = {
+        'pullrequest_show_all': '/{repo_name}/pull-request',
+        'pullrequest_show_all_data': '/{repo_name}/pull-request-data',
+    }[name].format(**kwargs)
+
+    if params:
+        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+    return base_url
+
+
+@pytest.mark.backends("git", "hg")
+@pytest.mark.usefixtures('autologin_user', 'app')
+class TestPullRequestList(object):
+
+    @pytest.mark.parametrize('params, expected_title', [
+        ({'source': 0, 'closed': 1}, 'Closed Pull Requests'),
+        ({'source': 0, 'my': 1}, 'opened by me'),
+        ({'source': 0, 'awaiting_review': 1}, 'awaiting review'),
+        ({'source': 0, 'awaiting_my_review': 1}, 'awaiting my review'),
+        ({'source': 1}, 'Pull Requests from'),
+    ])
+    def test_showing_list_page(self, backend, pr_util, params, expected_title):
+        pull_request = pr_util.create_pull_request()
+
+        response = self.app.get(
+            route_path('pullrequest_show_all',
+                       repo_name=pull_request.target_repo.repo_name,
+                       params=params))
+
+        assert_response = response.assert_response()
+        assert_response.element_equals_to('.panel-title', expected_title)
+        element = assert_response.get_element('.panel-title')
+        element_text = assert_response._element_to_string(element)
+
+    def test_showing_list_page_data(self, backend, pr_util, xhr_header):
+        pull_request = pr_util.create_pull_request()
+        response = self.app.get(
+            route_path('pullrequest_show_all_data',
+                       repo_name=pull_request.target_repo.repo_name),
+            extra_environ=xhr_header)
+
+        assert response.json['recordsTotal'] == 1
+        assert response.json['data'][0]['description'] == 'Description'
+
+    def test_description_is_escaped_on_index_page(self, backend, pr_util, xhr_header):
+        xss_description = "<script>alert('Hi!')</script>"
+        pull_request = pr_util.create_pull_request(description=xss_description)
+
+        response = self.app.get(
+            route_path('pullrequest_show_all_data',
+                       repo_name=pull_request.target_repo.repo_name),
+            extra_environ=xhr_header)
+
+        assert response.json['recordsTotal'] == 1
+        assert response.json['data'][0]['description'] == \
+               "&lt;script&gt;alert(&#39;Hi!&#39;)&lt;/script&gt;"
diff --git a/rhodecode/apps/repository/utils.py b/rhodecode/apps/repository/utils.py
new file mode 100644
index 00000000..f425a0b0
--- /dev/null
+++ b/rhodecode/apps/repository/utils.py
@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017 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/
+
+from rhodecode.lib import helpers as h
+from rhodecode.lib.utils2 import safe_int
+
+
+def reviewer_as_json(user, reasons, mandatory):
+    """
+    Returns json struct of a reviewer for frontend
+
+    :param user: the reviewer
+    :param reasons: list of strings of why they are reviewers
+    :param mandatory: bool, to set user as mandatory
+    """
+
+    return {
+        'user_id': user.user_id,
+        'reasons': reasons,
+        'mandatory': mandatory,
+        'username': user.username,
+        'firstname': user.firstname,
+        'lastname': user.lastname,
+        'gravatar_link': h.gravatar_url(user.email, 14),
+    }
+
+
+def get_default_reviewers_data(
+        current_user, source_repo, source_commit, target_repo, target_commit):
+
+    """ Return json for default reviewers of a repository """
+
+    reasons = ['Default reviewer', 'Repository owner']
+    default = reviewer_as_json(
+        user=current_user, reasons=reasons, mandatory=False)
+
+    return {
+        'api_ver': 'v1',  # define version for later possible schema upgrade
+        'reviewers': [default],
+        'rules': {},
+        'rules_data': {},
+    }
+
+
+def validate_default_reviewers(review_members, reviewer_rules):
+    """
+    Function to validate submitted reviewers against the saved rules
+
+    """
+    reviewers = []
+    reviewer_by_id = {}
+    for r in review_members:
+        reviewer_user_id = safe_int(r['user_id'])
+        entry = (reviewer_user_id, r['reasons'], r['mandatory'])
+
+        reviewer_by_id[reviewer_user_id] = entry
+        reviewers.append(entry)
+
+    return reviewers
diff --git a/rhodecode/apps/repository/views/repo_review_rules.py b/rhodecode/apps/repository/views/repo_review_rules.py
index 72c64b2e..b57d8e5c 100644
--- a/rhodecode/apps/repository/views/repo_review_rules.py
+++ b/rhodecode/apps/repository/views/repo_review_rules.py
@@ -23,7 +23,7 @@ import logging
 from pyramid.view import view_config
 
 from rhodecode.apps._base import RepoAppView
-from rhodecode.controllers import utils
+from rhodecode.apps.repository.utils import get_default_reviewers_data
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 
 log = logging.getLogger(__name__)
@@ -57,13 +57,8 @@ class RepoReviewRulesView(RepoAppView):
         route_name='repo_default_reviewers_data', request_method='GET',
         renderer='json_ext')
     def repo_default_reviewers_data(self):
-        reasons = ['Default reviewer', 'Repository owner']
-        default = utils.reviewer_as_json(
-            user=self.db_repo.user, reasons=reasons, mandatory=False)
+        review_data = get_default_reviewers_data(
+            self.db_repo.user, None, None, None, None)
+        return review_data
+
 
-        return {
-            'api_ver': 'v1',  # define version for later possible schema upgrade
-            'reviewers': [default],
-            'rules': {},
-            'rules_data': {},
-        }
diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py
index 667641f9..9166f2e1 100644
--- a/rhodecode/controllers/pullrequests.py
+++ b/rhodecode/controllers/pullrequests.py
@@ -228,8 +228,6 @@ class PullrequestsController(BaseRepoController):
         target_repo = _form['target_repo']
         target_ref = _form['target_ref']
         commit_ids = _form['revisions'][::-1]
-        reviewers = [
-            (r['user_id'], r['reasons']) for r in _form['review_members']]
 
         # find the ancestor for this pr
         source_db_repo = Repository.get_by_repo_name(_form['source_repo'])
@@ -257,17 +255,29 @@ class PullrequestsController(BaseRepoController):
             )
 
         description = _form['pullrequest_desc']
+
+        get_default_reviewers_data, validate_default_reviewers = \
+            PullRequestModel().get_reviewer_functions()
+
+        # recalculate reviewers logic, to make sure we can validate this
+        reviewer_rules = get_default_reviewers_data(
+            c.rhodecode_user, source_db_repo, source_commit, target_db_repo,
+            target_commit)
+
+        reviewers = validate_default_reviewers(
+            _form['review_members'], reviewer_rules)
+
         try:
             pull_request = PullRequestModel().create(
                 c.rhodecode_user.user_id, source_repo, source_ref, target_repo,
                 target_ref, commit_ids, reviewers, pullrequest_title,
-                description
+                description, reviewer_rules
             )
             Session().commit()
             h.flash(_('Successfully opened new pull request'),
                     category='success')
         except Exception as e:
-            msg = _('Error occurred during sending pull request')
+            msg = _('Error occurred during creation of this pull request.')
             log.exception(msg)
             h.flash(msg, category='error')
             return redirect(url('pullrequest_home', repo_name=repo_name))
@@ -292,7 +302,8 @@ class PullrequestsController(BaseRepoController):
 
             if 'review_members' in controls:
                 self._update_reviewers(
-                    pull_request_id, controls['review_members'])
+                    pull_request_id, controls['review_members'],
+                    pull_request.reviewer_data)
             elif str2bool(request.POST.get('update_commits', 'false')):
                 self._update_commits(pull_request)
             elif str2bool(request.POST.get('close_pull_request', 'false')):
@@ -435,10 +446,20 @@ class PullrequestsController(BaseRepoController):
                 merge_resp.failure_reason)
             h.flash(msg, category='error')
 
-    def _update_reviewers(self, pull_request_id, review_members):
-        reviewers = [
-            (int(r['user_id']), r['reasons']) for r in review_members]
+    def _update_reviewers(self, pull_request_id, review_members, reviewer_rules):
+
+        get_default_reviewers_data, validate_default_reviewers = \
+            PullRequestModel().get_reviewer_functions()
+
+        try:
+            reviewers = validate_default_reviewers(review_members, reviewer_rules)
+        except ValueError as e:
+            log.error('Reviewers Validation:{}'.format(e))
+            h.flash(e, category='error')
+            return
+
         PullRequestModel().update_reviewers(pull_request_id, reviewers)
+        h.flash(_('Pull request reviewers updated.'), category='success')
         Session().commit()
 
     def _reject_close(self, pull_request):
@@ -490,7 +511,8 @@ class PullrequestsController(BaseRepoController):
             _org_pull_request_obj = pull_request_ver.pull_request
             at_version = pull_request_ver.pull_request_version_id
         else:
-            _org_pull_request_obj = pull_request_obj = PullRequest.get_or_404(pull_request_id)
+            _org_pull_request_obj = pull_request_obj = PullRequest.get_or_404(
+                pull_request_id)
 
         pull_request_display_obj = PullRequest.get_pr_display_object(
             pull_request_obj, _org_pull_request_obj)
@@ -597,9 +619,9 @@ class PullrequestsController(BaseRepoController):
             c.allowed_to_comment = False
             c.allowed_to_close = False
         else:
-            c.allowed_to_change_status = PullRequestModel(). \
-                check_user_change_status(pull_request_at_ver, c.rhodecode_user) \
-                                         and not pr_closed
+            can_change_status = PullRequestModel().check_user_change_status(
+                pull_request_at_ver, c.rhodecode_user)
+            c.allowed_to_change_status = can_change_status and not pr_closed
 
             c.allowed_to_update = PullRequestModel().check_user_update(
                 pull_request_latest, c.rhodecode_user) and not pr_closed
@@ -610,6 +632,18 @@ class PullrequestsController(BaseRepoController):
             c.allowed_to_comment = not pr_closed
             c.allowed_to_close = c.allowed_to_merge and not pr_closed
 
+        c.forbid_adding_reviewers = False
+        c.forbid_author_to_review = False
+
+        if pull_request_latest.reviewer_data and \
+                        'rules' in pull_request_latest.reviewer_data:
+            rules = pull_request_latest.reviewer_data['rules'] or {}
+            try:
+                c.forbid_adding_reviewers = rules.get('forbid_adding_reviewers')
+                c.forbid_author_to_review = rules.get('forbid_author_to_review')
+            except Exception:
+                pass
+
         # check merge capabilities
         _merge_check = MergeCheck.validate(
             pull_request_latest, user=c.rhodecode_user)
@@ -724,12 +758,18 @@ class PullrequestsController(BaseRepoController):
                 c.commit_ranges.append(comm)
                 commit_cache[comm.raw_id] = comm
 
+            # Order here matters, we first need to get target, and then
+            # the source
             target_commit = commits_source_repo.get_commit(
                 commit_id=safe_str(target_ref_id))
+
             source_commit = commits_source_repo.get_commit(
                 commit_id=safe_str(source_ref_id))
+
         except CommitDoesNotExistError:
-            pass
+            log.warning(
+                'Failed to get commit from `{}` repo'.format(
+                    commits_source_repo), exc_info=True)
         except RepositoryRequirementError:
             log.warning(
                 'Failed to get all required data from repo', exc_info=True)
diff --git a/rhodecode/controllers/utils.py b/rhodecode/controllers/utils.py
index a2ad2ba6..f74d7320 100644
--- a/rhodecode/controllers/utils.py
+++ b/rhodecode/controllers/utils.py
@@ -87,23 +87,3 @@ def get_commit_from_ref_name(repo, ref_name, ref_type=None):
                     '%s "%s" does not exist' % (ref_type, ref_name))
 
     return repo_scm.get_commit(commit_id)
-
-
-def reviewer_as_json(user, reasons, mandatory):
-    """
-    Returns json struct of a reviewer for frontend
-
-    :param user: the reviewer
-    :param reasons: list of strings of why they are reviewers
-    :param mandatory: bool, to set user as mandatory
-    """
-
-    return {
-        'user_id': user.user_id,
-        'reasons': reasons,
-        'mandatory': mandatory,
-        'username': user.username,
-        'firstname': user.firstname,
-        'lastname': user.lastname,
-        'gravatar_link': h.gravatar_url(user.email, 14),
-    }
diff --git a/rhodecode/lib/dbmigrate/versions/074_version_4_8_0.py b/rhodecode/lib/dbmigrate/versions/074_version_4_8_0.py
new file mode 100644
index 00000000..7148172f
--- /dev/null
+++ b/rhodecode/lib/dbmigrate/versions/074_version_4_8_0.py
@@ -0,0 +1,37 @@
+import logging
+
+from sqlalchemy import *
+from rhodecode.model import meta
+from rhodecode.lib.dbmigrate.versions import _reset_base, notify
+
+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_7_0_1 as db
+
+    repo_review_rule_table = db.RepoReviewRule.__table__
+
+    forbid_author_to_review = Column(
+        "forbid_author_to_review", Boolean(), nullable=True, default=False)
+    forbid_author_to_review.create(table=repo_review_rule_table)
+
+    forbid_adding_reviewers = Column(
+        "forbid_adding_reviewers", Boolean(), nullable=True, default=False)
+    forbid_adding_reviewers.create(table=repo_review_rule_table)
+
+    fixups(db, meta.Session)
+
+
+def downgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine
+
+
+def fixups(models, _SESSION):
+    pass
diff --git a/rhodecode/lib/dbmigrate/versions/075_version_4_8_0.py b/rhodecode/lib/dbmigrate/versions/075_version_4_8_0.py
new file mode 100644
index 00000000..199aed11
--- /dev/null
+++ b/rhodecode/lib/dbmigrate/versions/075_version_4_8_0.py
@@ -0,0 +1,38 @@
+import logging
+
+from sqlalchemy import *
+from rhodecode.model import meta
+from rhodecode.lib.dbmigrate.versions import _reset_base, notify
+
+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_7_0_1 as db
+
+    repo_review_rule_user_table = db.RepoReviewRuleUser.__table__
+    repo_review_rule_user_group_table = db.RepoReviewRuleUserGroup.__table__
+
+    mandatory_user = Column(
+        "mandatory", Boolean(), nullable=True, default=False)
+    mandatory_user.create(table=repo_review_rule_user_table)
+
+    mandatory_user_group = Column(
+        "mandatory", Boolean(), nullable=True, default=False)
+    mandatory_user_group.create(table=repo_review_rule_user_group_table)
+
+    fixups(db, meta.Session)
+
+
+def downgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine
+
+
+def fixups(models, _SESSION):
+    pass
diff --git a/rhodecode/lib/dbmigrate/versions/076_version_4_8_0.py b/rhodecode/lib/dbmigrate/versions/076_version_4_8_0.py
new file mode 100644
index 00000000..bff46235
--- /dev/null
+++ b/rhodecode/lib/dbmigrate/versions/076_version_4_8_0.py
@@ -0,0 +1,33 @@
+import logging
+
+from sqlalchemy import *
+from rhodecode.model import meta
+from rhodecode.lib.dbmigrate.versions import _reset_base, notify
+
+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_7_0_1 as db
+
+    pull_request_reviewers = db.PullRequestReviewers.__table__
+
+    mandatory = Column(
+        "mandatory", Boolean(), nullable=True, default=False)
+    mandatory.create(table=pull_request_reviewers)
+
+    fixups(db, meta.Session)
+
+
+def downgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine
+
+
+def fixups(models, _SESSION):
+    pass
diff --git a/rhodecode/lib/dbmigrate/versions/077_version_4_8_0.py b/rhodecode/lib/dbmigrate/versions/077_version_4_8_0.py
new file mode 100644
index 00000000..bb9eb868
--- /dev/null
+++ b/rhodecode/lib/dbmigrate/versions/077_version_4_8_0.py
@@ -0,0 +1,40 @@
+import logging
+
+from sqlalchemy import *
+from rhodecode.model import meta
+from rhodecode.lib.dbmigrate.versions import _reset_base, notify
+
+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_7_0_1 as db
+
+    pull_request = db.PullRequest.__table__
+    pull_request_version = db.PullRequestVersion.__table__
+
+    reviewer_data_1 = Column(
+        'reviewer_data_json',
+        db.JsonType(dialect_map=dict(mysql=UnicodeText(16384))))
+    reviewer_data_1.create(table=pull_request)
+
+    reviewer_data_2 = Column(
+        'reviewer_data_json',
+        db.JsonType(dialect_map=dict(mysql=UnicodeText(16384))))
+    reviewer_data_2.create(table=pull_request_version)
+
+    fixups(db, meta.Session)
+
+
+def downgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine
+
+
+def fixups(models, _SESSION):
+    pass
diff --git a/rhodecode/model/changeset_status.py b/rhodecode/model/changeset_status.py
index ad712ce7..6f8f3f2c 100644
--- a/rhodecode/model/changeset_status.py
+++ b/rhodecode/model/changeset_status.py
@@ -80,7 +80,7 @@ class ChangesetStatusModel(BaseModel):
         """
         votes = defaultdict(int)
         reviewers_number = len(statuses_by_reviewers)
-        for user, reasons, statuses in statuses_by_reviewers:
+        for user, reasons, mandatory, statuses in statuses_by_reviewers:
             if statuses:
                 ver, latest = statuses[0]
                 votes[latest.status] += 1
@@ -248,13 +248,14 @@ class ChangesetStatusModel(BaseModel):
         for o in pull_request.reviewers:
             if not o.user:
                 continue
-            st = commit_statuses.get(o.user.username, None)
-            if st:
-                st = [(x, list(y)[0])
-                      for x, y in (itertools.groupby(sorted(st, key=version),
-                                                     version))]
+            statuses = commit_statuses.get(o.user.username, None)
+            if statuses:
+                statuses = [(x, list(y)[0])
+                      for x, y in (itertools.groupby(
+                        sorted(statuses, key=version),version))]
 
-            pull_request_reviewers.append((o.user, o.reasons, st))
+            pull_request_reviewers.append(
+                (o.user, o.reasons, o.mandatory, statuses))
         return pull_request_reviewers
 
     def calculated_review_status(self, pull_request, reviewers_statuses=None):
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index ec61e97b..50a8ad8d 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -3229,6 +3229,14 @@ class _PullRequestBase(BaseModel):
     _last_merge_status = Column('merge_status', Integer(), nullable=True)
     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)
+
     @hybrid_property
     def revisions(self):
         return self._revisions.split(':') if self._revisions else []
@@ -3348,7 +3356,8 @@ class _PullRequestBase(BaseModel):
                     'reasons': reasons,
                     'review_status': st[0][1].status if st else 'not_reviewed',
                 }
-                for reviewer, reasons, st in pull_request.reviewers_statuses()
+                for reviewer, reasons, mandatory, st in
+                pull_request.reviewers_statuses()
             ]
         }
 
@@ -3438,6 +3447,8 @@ class PullRequest(Base, _PullRequestBase):
         attrs.revisions = pull_request_obj.revisions
 
         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)
 
@@ -3516,11 +3527,6 @@ class PullRequestReviewers(Base, BaseModel):
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
 
-    def __init__(self, user=None, pull_request=None, reasons=None):
-        self.user = user
-        self.pull_request = pull_request
-        self.reasons = reasons or []
-
     @hybrid_property
     def reasons(self):
         if not self._reasons:
@@ -3545,7 +3551,7 @@ class PullRequestReviewers(Base, BaseModel):
     _reasons = Column(
         'reason', MutationList.as_mutable(
             JsonType('list', dialect_map=dict(mysql=UnicodeText(16384)))))
-
+    mandatory = Column("mandatory", Boolean(), nullable=False, default=False)
     user = relationship('User')
     pull_request = relationship('PullRequest')
 
@@ -3849,14 +3855,17 @@ class RepoReviewRuleUser(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
     )
-    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)
+    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)
     user = relationship('User')
 
+    def rule_data(self):
+        return {
+            'mandatory': self.mandatory
+        }
+
 
 class RepoReviewRuleUserGroup(Base, BaseModel):
     __tablename__ = 'repo_review_rules_users_groups'
@@ -3864,14 +3873,17 @@ class RepoReviewRuleUserGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True,}
     )
-    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)
+    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)
     users_group = relationship('UserGroup')
 
+    def rule_data(self):
+        return {
+            'mandatory': self.mandatory
+        }
+
 
 class RepoReviewRule(Base, BaseModel):
     __tablename__ = 'repo_review_rules'
@@ -3886,13 +3898,13 @@ class RepoReviewRule(Base, BaseModel):
         "repo_id", Integer(), ForeignKey('repositories.repo_id'))
     repo = relationship('Repository', backref='review_rules')
 
-    _branch_pattern = Column("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
+    _branch_pattern = Column("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)
+    forbid_author_to_review = Column("forbid_author_to_review", Boolean(), nullable=False, default=False)
+    forbid_adding_reviewers = Column("forbid_adding_reviewers", Boolean(), nullable=False, default=False)
 
-    use_authors_for_review = Column("use_authors_for_review", Boolean(),
-        nullable=False, default=False)
     rule_users = relationship('RepoReviewRuleUser')
     rule_user_groups = relationship('RepoReviewRuleUserGroup')
 
@@ -3948,16 +3960,26 @@ class RepoReviewRule(Base, BaseModel):
     def review_users(self):
         """ Returns the users which this rule applies to """
 
-        users = set()
-        users |= set([
-            rule_user.user for rule_user in self.rule_users
-            if rule_user.user.active])
-        users |= set(
-            member.user
-            for rule_user_group in self.rule_user_groups
-            for member in rule_user_group.users_group.members
-            if member.user.active
-        )
+        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',
+                        'data': rule_user.rule_data()
+                    }
+
+        for rule_user_group in self.rule_user_groups:
+            for member in rule_user_group.users_group.members:
+                if member.user.active:
+                    users[member.user.username] = {
+                        'user': member.user,
+                        'source': 'user_group',
+                        'data': rule_user_group.rule_data()
+                    }
+
         return users
 
     def __repr__(self):
diff --git a/rhodecode/model/forms.py b/rhodecode/model/forms.py
index 0b352349..190644d5 100644
--- a/rhodecode/model/forms.py
+++ b/rhodecode/model/forms.py
@@ -535,12 +535,13 @@ def PullRequestForm(repo_id):
     class ReviewerForm(formencode.Schema):
         user_id = v.Int(not_empty=True)
         reasons = All()
+        mandatory = v.StringBoolean()
 
     class _PullRequestForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
 
-        user = v.UnicodeString(strip=True, required=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)
diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py
index 03de5217..41faf511 100644
--- a/rhodecode/model/pull_request.py
+++ b/rhodecode/model/pull_request.py
@@ -415,7 +415,9 @@ class PullRequestModel(BaseModel):
             .all()
 
     def create(self, created_by, source_repo, source_ref, target_repo,
-        target_ref, revisions, reviewers, title, description=None):
+               target_ref, revisions, reviewers, title, description=None,
+               reviewer_data=None):
+
         created_by_user = self._get_user(created_by)
         source_repo = self._get_repo(source_repo)
         target_repo = self._get_repo(target_repo)
@@ -429,6 +431,7 @@ class PullRequestModel(BaseModel):
         pull_request.title = title
         pull_request.description = description
         pull_request.author = created_by_user
+        pull_request.reviewer_data = reviewer_data
 
         Session().add(pull_request)
         Session().flush()
@@ -436,15 +439,16 @@ class PullRequestModel(BaseModel):
         reviewer_ids = set()
         # members / reviewers
         for reviewer_object in reviewers:
-            if isinstance(reviewer_object, tuple):
-                user_id, reasons = reviewer_object
-            else:
-                user_id, reasons = reviewer_object, []
+            user_id, reasons, mandatory = reviewer_object
 
             user = self._get_user(user_id)
             reviewer_ids.add(user.user_id)
 
-            reviewer = PullRequestReviewers(user, pull_request, reasons)
+            reviewer = PullRequestReviewers()
+            reviewer.user = user
+            reviewer.pull_request = pull_request
+            reviewer.reasons = reasons
+            reviewer.mandatory = mandatory
             Session().add(reviewer)
 
         # Set approval status to "Under Review" for all commits which are
@@ -763,6 +767,7 @@ class PullRequestModel(BaseModel):
         version._last_merge_status = pull_request._last_merge_status
         version.shadow_merge_ref = pull_request.shadow_merge_ref
         version.merge_rev = pull_request.merge_rev
+        version.reviewer_data = pull_request.reviewer_data
 
         version.revisions = pull_request.revisions
         version.pull_request = pull_request
@@ -903,16 +908,18 @@ class PullRequestModel(BaseModel):
         Update the reviewers in the pull request
 
         :param pull_request: the pr to update
-        :param reviewer_data: list of tuples [(user, ['reason1', 'reason2'])]
+        :param reviewer_data: list of tuples
+            [(user, ['reason1', 'reason2'], mandatory_flag)]
         """
 
-        reviewers_reasons = {}
-        for user_id, reasons in reviewer_data:
+        reviewers = {}
+        for user_id, reasons, mandatory in reviewer_data:
             if isinstance(user_id, (int, basestring)):
                 user_id = self._get_user(user_id).user_id
-            reviewers_reasons[user_id] = reasons
+            reviewers[user_id] = {
+                'reasons': reasons, 'mandatory': mandatory}
 
-        reviewers_ids = set(reviewers_reasons.keys())
+        reviewers_ids = set(reviewers.keys())
         pull_request = self.__get_pull_request(pull_request)
         current_reviewers = PullRequestReviewers.query()\
             .filter(PullRequestReviewers.pull_request ==
@@ -928,8 +935,12 @@ class PullRequestModel(BaseModel):
         for uid in ids_to_add:
             changed = True
             _usr = self._get_user(uid)
-            reasons = reviewers_reasons[uid]
-            reviewer = PullRequestReviewers(_usr, pull_request, reasons)
+            reviewer = PullRequestReviewers()
+            reviewer.user = _usr
+            reviewer.pull_request = pull_request
+            reviewer.reasons = reviewers[uid]['reasons']
+            # NOTE(marcink): mandatory shouldn't be changed now
+            #reviewer.mandatory = reviewers[uid]['reasons']
             Session().add(reviewer)
 
         for uid in ids_to_remove:
@@ -1369,6 +1380,23 @@ class PullRequestModel(BaseModel):
                 action=action, pr_id=pull_request.pull_request_id),
             pull_request.target_repo)
 
+    def get_reviewer_functions(self):
+        """
+        Fetches functions for validation and fetching default reviewers.
+        If available we use the EE package, else we fallback to CE
+        package functions
+        """
+        try:
+            from rc_reviewers.utils import get_default_reviewers_data
+            from rc_reviewers.utils import validate_default_reviewers
+        except ImportError:
+            from rhodecode.apps.repository.utils import \
+                get_default_reviewers_data
+            from rhodecode.apps.repository.utils import \
+                validate_default_reviewers
+
+        return get_default_reviewers_data, validate_default_reviewers
+
 
 class MergeCheck(object):
     """
diff --git a/rhodecode/model/validation_schema/schemas/reviewer_schema.py b/rhodecode/model/validation_schema/schemas/reviewer_schema.py
new file mode 100644
index 00000000..e76098b4
--- /dev/null
+++ b/rhodecode/model/validation_schema/schemas/reviewer_schema.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017 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 colander
+from rhodecode.model.validation_schema import validators, preparers, types
+
+
+class ReviewerSchema(colander.MappingSchema):
+    username = colander.SchemaNode(types.StrOrIntType())
+    reasons = colander.SchemaNode(colander.List(), missing=[])
+    mandatory = colander.SchemaNode(colander.Boolean(), missing=False)
+
+
+class ReviewerListSchema(colander.SequenceSchema):
+    reviewers = ReviewerSchema()
+
+
diff --git a/rhodecode/model/validation_schema/types.py b/rhodecode/model/validation_schema/types.py
index 1c4309c9..ddeeb981 100644
--- a/rhodecode/model/validation_schema/types.py
+++ b/rhodecode/model/validation_schema/types.py
@@ -190,7 +190,7 @@ class UserGroupType(UserOrUserGroupType):
 
 class StrOrIntType(colander.String):
     def deserialize(self, node, cstruct):
-        if isinstance(node, basestring):
+        if isinstance(cstruct, basestring):
             return super(StrOrIntType, self).deserialize(node, cstruct)
         else:
             return colander.Integer().deserialize(node, cstruct)
diff --git a/rhodecode/public/css/buttons.less b/rhodecode/public/css/buttons.less
index d63f4a78..014b56e4 100644
--- a/rhodecode/public/css/buttons.less
+++ b/rhodecode/public/css/buttons.less
@@ -62,6 +62,10 @@ input[type="button"] {
         text-shadow: none;
     }
 
+    &.no-margin {
+        margin: 0 0 0 0;
+    }
+
 }
 
 
@@ -270,11 +274,17 @@ input[type="button"] {
     font-size: inherit;
     color: @rcblue;
     border: none;
-    .border-radius (0);
+    border-radius: 0;
     background-color: transparent;
 
+    &.last-item {
+        border: none;
+        padding: 0 0 0 0;
+    }
+
     &:last-child {
         border: none;
+        padding: 0 0 0 0;
     }
 
     &:hover {
diff --git a/rhodecode/public/css/deform.less b/rhodecode/public/css/deform.less
index 4ad32db7..e84afd72 100644
--- a/rhodecode/public/css/deform.less
+++ b/rhodecode/public/css/deform.less
@@ -12,7 +12,7 @@
 
   .control-label {
     width: 200px;
-    padding: 10px;
+    padding: 10px 0px;
     float: left;
   }
   .control-inputs {
diff --git a/rhodecode/public/css/main.less b/rhodecode/public/css/main.less
index 163597bc..0dad3c66 100644
--- a/rhodecode/public/css/main.less
+++ b/rhodecode/public/css/main.less
@@ -359,9 +359,26 @@ ul.auth_plugins {
     }
 }
 
+.pr-mergeinfo {
+    clear: both;
+    margin: .5em 0;
+
+    input {
+      min-width: 100% !important;
+      padding: 0 !important;
+      border: 0;
+    }
+}
+
 .pr-pullinfo {
     clear: both;
     margin: .5em 0;
+
+    input {
+      min-width: 100% !important;
+      padding: 0 !important;
+      border: 0;
+    }
 }
 
 #pr-title-input {
@@ -1298,6 +1315,11 @@ table.integrations {
     width: 100%;
     margin-bottom: 8px;
 }
+
+.reviewer_entry {
+  min-height: 55px;
+}
+
 .reviewers_member {
     width: 100%;
     overflow: auto;
@@ -1332,6 +1354,8 @@ table.integrations {
     }
 }
 
+.reviewer_member_mandatory,
+.reviewer_member_mandatory_remove,
 .reviewer_member_remove {
     position: absolute;
     right: 0;
@@ -1341,6 +1365,15 @@ table.integrations {
     padding: 0;
     color: black;
 }
+
+.reviewer_member_mandatory_remove {
+  color: @grey4;
+}
+
+.reviewer_member_mandatory {
+  padding-top:20px;
+}
+
 .reviewer_member_status {
     margin-top: 5px;
 }
@@ -1370,6 +1403,11 @@ table.integrations {
 .pr-description {
     white-space:pre-wrap;
 }
+
+.pr-reviewer-rules {
+   padding: 10px 0px 20px 0px;
+}
+
 .group_members {
     margin-top: 0;
     padding: 0;
diff --git a/rhodecode/public/js/src/rhodecode/pullrequests.js b/rhodecode/public/js/src/rhodecode/pullrequests.js
index ad4ea4e1..31948d0a 100644
--- a/rhodecode/public/js/src/rhodecode/pullrequests.js
+++ b/rhodecode/public/js/src/rhodecode/pullrequests.js
@@ -16,77 +16,327 @@
 // # RhodeCode Enterprise Edition, including its added features, Support services,
 // # and proprietary license terms, please see https://rhodecode.com/licenses/
 
+
+var prButtonLockChecks = {
+  'compare': false,
+  'reviewers': false
+};
+
 /**
- * Pull request reviewers
+ * lock button until all checks and loads are made. E.g reviewer calculation
+ * should prevent from submitting a PR
+ * @param lockEnabled
+ * @param msg
+ * @param scope
  */
-var removeReviewMember = function(reviewer_id, mark_delete){
-    var reviewer = $('#reviewer_{0}'.format(reviewer_id));
+var prButtonLock = function(lockEnabled, msg, scope) {
+      scope = scope || 'all';
+      if (scope == 'all'){
+          prButtonLockChecks['compare'] = !lockEnabled;
+          prButtonLockChecks['reviewers'] = !lockEnabled;
+      } else if (scope == 'compare') {
+          prButtonLockChecks['compare'] = !lockEnabled;
+      } else if (scope == 'reviewers'){
+          prButtonLockChecks['reviewers'] = !lockEnabled;
+      }
+      var checksMeet = prButtonLockChecks.compare && prButtonLockChecks.reviewers;
+      if (lockEnabled) {
+          $('#save').attr('disabled', 'disabled');
+      }
+      else if (checksMeet) {
+          $('#save').removeAttr('disabled');
+      }
 
-    if(typeof(mark_delete) === undefined){
-        mark_delete = false;
-    }
-
-    if(mark_delete === true){
-        if (reviewer){
-            // now delete the input
-            $('#reviewer_{0} input'.format(reviewer_id)).remove();
-            // mark as to-delete
-            var obj = $('#reviewer_{0}_name'.format(reviewer_id));
-            obj.addClass('to-delete');
-            obj.css({"text-decoration":"line-through", "opacity": 0.5});
-        }
-    }
-    else{
-        $('#reviewer_{0}'.format(reviewer_id)).remove();
-    }
+      if (msg) {
+          $('#pr_open_message').html(msg);
+      }
 };
 
-var addReviewMember = function(id, fname, lname, nname, gravatar_link, reasons) {
-    var members = $('#review_members').get(0);
-    var reasons_html = '';
-    var reasons_inputs = '';
-    var reasons = reasons || [];
-    if (reasons) {
-        for (var i = 0; i < reasons.length; i++) {
-            reasons_html += '<div class="reviewer_reason">- {0}</div>'.format(reasons[i]);
-            reasons_inputs += '<input type="hidden" name="reason" value="' + escapeHtml(reasons[i]) + '">';
-        }
-    }
-    var tmpl = '<li id="reviewer_{2}">'+
-       '<input type="hidden" name="__start__" value="reviewer:mapping">'+
-       '<div class="reviewer_status">'+
-          '<div class="flag_status not_reviewed pull-left reviewer_member_status"></div>'+
-       '</div>'+
-      '<img alt="gravatar" class="gravatar" src="{0}"/>'+
-      '<span class="reviewer_name user">{1}</span>'+
-      reasons_html +
-      '<input type="hidden" name="user_id" value="{2}">'+
-       '<input type="hidden" name="__start__" value="reasons:sequence">'+
-       '{3}'+
-       '<input type="hidden" name="__end__" value="reasons:sequence">'+
-      '<div class="reviewer_member_remove action_button" onclick="removeReviewMember({2})">' +
-      '<i class="icon-remove-sign"></i>'+
-        '</div>'+
-    '</div>'+
-    '<input type="hidden" name="__end__" value="reviewer:mapping">'+
-    '</li>' ;
 
-    var displayname = "{0} ({1} {2})".format(
-            nname, escapeHtml(fname), escapeHtml(lname));
-    var element = tmpl.format(gravatar_link,displayname,id,reasons_inputs);
-    // check if we don't have this ID already in
-    var ids = [];
-    var _els = $('#review_members li').toArray();
-    for (el in _els){
-        ids.push(_els[el].id)
-    }
-    if(ids.indexOf('reviewer_'+id) == -1){
-        // only add if it's not there
-        members.innerHTML += element;
-    }
+/**
+Generate Title and Description for a PullRequest.
+In case of 1 commits, the title and description is that one commit
+in case of multiple commits, we iterate on them with max N number of commits,
+and build description in a form
+- commitN
+- commitN+1
+...
+
+Title is then constructed from branch names, or other references,
+replacing '-' and '_' into spaces
+
+* @param sourceRef
+* @param elements
+* @param limit
+* @returns {*[]}
+*/
+var getTitleAndDescription = function(sourceRef, elements, limit) {
+  var title = '';
+  var desc = '';
+
+  $.each($(elements).get().reverse().slice(0, limit), function(idx, value) {
+      var rawMessage = $(value).find('td.td-description .message').data('messageRaw');
+      desc += '- ' + rawMessage.split('\n')[0].replace(/\n+$/, "") + '\n';
+  });
+  // only 1 commit, use commit message as title
+  if (elements.length === 1) {
+      title = $(elements[0]).find('td.td-description .message').data('messageRaw').split('\n')[0];
+  }
+  else {
+      // use reference name
+      title = sourceRef.replace(/-/g, ' ').replace(/_/g, ' ').capitalizeFirstLetter();
+  }
+
+  return [title, desc]
+};
+
+
+
+ReviewersController = function () {
+    var self = this;
+    this.$reviewRulesContainer = $('#review_rules');
+    this.$rulesList = this.$reviewRulesContainer.find('.pr-reviewer-rules');
+    this.forbidReviewUsers = undefined;
+    this.$reviewMembers = $('#review_members');
+    this.currentRequest = null;
+
+    this.defaultForbidReviewUsers = function() {
+        return [
+            {'username': 'default',
+             'user_id': templateContext.default_user.user_id}
+        ];
+    };
+
+    this.hideReviewRules = function() {
+        self.$reviewRulesContainer.hide();
+    };
+
+    this.showReviewRules = function() {
+        self.$reviewRulesContainer.show();
+    };
+
+    this.addRule = function(ruleText) {
+        self.showReviewRules();
+        return '<div>- {0}</div>'.format(ruleText)
+    };
+
+    this.loadReviewRules = function(data) {
+        // reset forbidden Users
+        this.forbidReviewUsers = self.defaultForbidReviewUsers();
+
+        // reset state of review rules
+        self.$rulesList.html('');
+
+        if (!data || data.rules === undefined || $.isEmptyObject(data.rules)) {
+            // default rule, case for older repo that don't have any rules stored
+            self.$rulesList.append(
+                self.addRule(
+                    _gettext('All reviewers must vote.'))
+            );
+            return self.forbidReviewUsers
+        }
+
+        if (data.rules.voting !== undefined) {
+            if (data.rules.voting < 0){
+                self.$rulesList.append(
+                    self.addRule(
+                        _gettext('All reviewers must vote.'))
+                )
+            } else if (data.rules.voting === 1) {
+                self.$rulesList.append(
+                    self.addRule(
+                        _gettext('At least {0} reviewer must vote.').format(data.rules.voting))
+                )
+
+            } else {
+                self.$rulesList.append(
+                    self.addRule(
+                        _gettext('At least {0} reviewers must vote.').format(data.rules.voting))
+                )
+            }
+        }
+        if (data.rules.use_code_authors_for_review) {
+            self.$rulesList.append(
+                self.addRule(
+                    _gettext('Reviewers picked from source code changes.'))
+            )
+        }
+        if (data.rules.forbid_adding_reviewers) {
+            $('#add_reviewer_input').remove();
+            self.$rulesList.append(
+                self.addRule(
+                    _gettext('Adding new reviewers is forbidden.'))
+            )
+        }
+        if (data.rules.forbid_author_to_review) {
+            self.forbidReviewUsers.push(data.rules_data.pr_author);
+            self.$rulesList.append(
+                self.addRule(
+                    _gettext('Author is not allowed to be a reviewer.'))
+            )
+        }
+        return self.forbidReviewUsers
+    };
+
+    this.loadDefaultReviewers = function(sourceRepo, sourceRef, targetRepo, targetRef) {
+
+        if (self.currentRequest) {
+            // make sure we cleanup old running requests before triggering this
+            // again
+            self.currentRequest.abort();
+        }
+
+        $('.calculate-reviewers').show();
+        // reset reviewer members
+        self.$reviewMembers.empty();
+
+        prButtonLock(true, null, 'reviewers');
+        $('#user').hide(); // hide user autocomplete before load
+
+        var url = pyroutes.url('repo_default_reviewers_data',
+                {
+                    'repo_name': templateContext.repo_name,
+                    'source_repo': sourceRepo,
+                    'source_ref': sourceRef[2],
+                    'target_repo': targetRepo,
+                    'target_ref': targetRef[2]
+                });
+
+        self.currentRequest = $.get(url)
+            .done(function(data) {
+                self.currentRequest = null;
+
+                // review rules
+                self.loadReviewRules(data);
+
+                for (var i = 0; i < data.reviewers.length; i++) {
+                  var reviewer = data.reviewers[i];
+                  self.addReviewMember(
+                      reviewer.user_id, reviewer.firstname,
+                      reviewer.lastname, reviewer.username,
+                      reviewer.gravatar_link, reviewer.reasons,
+                      reviewer.mandatory);
+                }
+                $('.calculate-reviewers').hide();
+                prButtonLock(false, null, 'reviewers');
+                $('#user').show(); // show user autocomplete after load
+            });
+    };
+
+    // check those, refactor
+    this.removeReviewMember = function(reviewer_id, mark_delete) {
+        var reviewer = $('#reviewer_{0}'.format(reviewer_id));
+
+        if(typeof(mark_delete) === undefined){
+            mark_delete = false;
+        }
+
+        if(mark_delete === true){
+            if (reviewer){
+                // now delete the input
+                $('#reviewer_{0} input'.format(reviewer_id)).remove();
+                // mark as to-delete
+                var obj = $('#reviewer_{0}_name'.format(reviewer_id));
+                obj.addClass('to-delete');
+                obj.css({"text-decoration":"line-through", "opacity": 0.5});
+            }
+        }
+        else{
+            $('#reviewer_{0}'.format(reviewer_id)).remove();
+        }
+    };
+
+    this.addReviewMember = function(id, fname, lname, nname, gravatar_link, reasons, mandatory) {
+        var members = self.$reviewMembers.get(0);
+        var reasons_html = '';
+        var reasons_inputs = '';
+        var reasons = reasons || [];
+        var mandatory = mandatory || false;
+
+        if (reasons) {
+            for (var i = 0; i < reasons.length; i++) {
+                reasons_html += '<div class="reviewer_reason">- {0}</div>'.format(reasons[i]);
+                reasons_inputs += '<input type="hidden" name="reason" value="' + escapeHtml(reasons[i]) + '">';
+            }
+        }
+        var tmpl = '' +
+        '<li id="reviewer_{2}" class="reviewer_entry">'+
+           '<input type="hidden" name="__start__" value="reviewer:mapping">'+
+           '<div class="reviewer_status">'+
+              '<div class="flag_status not_reviewed pull-left reviewer_member_status"></div>'+
+           '</div>'+
+          '<img alt="gravatar" class="gravatar" src="{0}"/>'+
+          '<span class="reviewer_name user">{1}</span>'+
+          reasons_html +
+          '<input type="hidden" name="user_id" value="{2}">'+
+          '<input type="hidden" name="__start__" value="reasons:sequence">'+
+           '{3}'+
+          '<input type="hidden" name="__end__" value="reasons:sequence">';
+
+        if (mandatory) {
+            tmpl += ''+
+            '<div class="reviewer_member_mandatory_remove">' +
+            '<i class="icon-remove-sign"></i>'+
+            '</div>' +
+            '<input type="hidden" name="mandatory" value="true">'+
+            '<div class="reviewer_member_mandatory">' +
+                '<i class="icon-lock" title="Mandatory reviewer"></i>'+
+            '</div>';
+
+        } else {
+            tmpl += ''+
+            '<input type="hidden" name="mandatory" value="false">'+
+            '<div class="reviewer_member_remove action_button" onclick="reviewersController.removeReviewMember({2})">' +
+                '<i class="icon-remove-sign"></i>'+
+            '</div>';
+        }
+        // continue template
+        tmpl += ''+
+        '<input type="hidden" name="__end__" value="reviewer:mapping">'+
+        '</li>' ;
+
+        var displayname = "{0} ({1} {2})".format(
+                nname, escapeHtml(fname), escapeHtml(lname));
+        var element = tmpl.format(gravatar_link,displayname,id,reasons_inputs);
+        // check if we don't have this ID already in
+        var ids = [];
+        var _els = self.$reviewMembers.find('li').toArray();
+        for (el in _els){
+            ids.push(_els[el].id)
+        }
+
+        var userAllowedReview = function(userId) {
+            var allowed = true;
+            $.each(self.forbidReviewUsers, function(index, member_data) {
+                if (parseInt(userId) === member_data['user_id']) {
+                    allowed = false;
+                    return false // breaks the loop
+                }
+            });
+            return allowed
+        };
+
+        var userAllowed = userAllowedReview(id);
+        if (!userAllowed){
+           alert(_gettext('User `{0}` not allowed to be a reviewer').format(nname));
+        }
+        var shouldAdd = userAllowed && ids.indexOf('reviewer_'+id) == -1;
+
+        if(shouldAdd) {
+            // only add if it's not there
+            members.innerHTML += element;
+        }
+
+    };
+
+    this.updateReviewers = function(repo_name, pull_request_id){
+        var postData = '_method=put&' + $('#reviewers input').serialize();
+        _updatePullRequest(repo_name, pull_request_id, postData);
+    };
 
 };
 
+
 var _updatePullRequest = function(repo_name, pull_request_id, postData) {
     var url = pyroutes.url(
         'pullrequest_update',
@@ -102,13 +352,6 @@ var _updatePullRequest = function(repo_name, pull_request_id, postData) {
     ajaxPOST(url, postData, success);
 };
 
-var updateReviewers = function(reviewers_ids, repo_name, pull_request_id){
-    if (reviewers_ids === undefined){
-      var postData = '_method=put&' + $('#reviewers input').serialize();
-      _updatePullRequest(repo_name, pull_request_id, postData);
-    }
-};
-
 /**
  * PULL REQUEST reject & close
  */
@@ -207,7 +450,7 @@ var ReviewerAutoComplete = function(inputId) {
     showNoSuggestionNotice: true,
     tabDisabled: true,
     autoSelectFirst: true,
-    params: { user_id: templateContext.rhodecode_user.user_id, user_groups:true, user_groups_expand:true },
+    params: { user_id: templateContext.rhodecode_user.user_id, user_groups:true, user_groups_expand:true, skip_default_user:true },
     formatResult: autocompleteFormatResult,
     lookupFilter: autocompleteFilterResult,
     onSelect: function(element, data) {
@@ -217,13 +460,15 @@ var ReviewerAutoComplete = function(inputId) {
             reasons.push(_gettext('member of "{0}"').format(data.value_display));
 
             $.each(data.members, function(index, member_data) {
-                addReviewMember(member_data.id, member_data.first_name, member_data.last_name,
-                                member_data.username, member_data.icon_link, reasons);
+                reviewersController.addReviewMember(
+                    member_data.id, member_data.first_name, member_data.last_name,
+                    member_data.username, member_data.icon_link, reasons);
             })
 
         } else {
-          addReviewMember(data.id, data.first_name, data.last_name,
-                          data.username, data.icon_link, reasons);
+          reviewersController.addReviewMember(
+              data.id, data.first_name, data.last_name,
+              data.username, data.icon_link, reasons);
         }
 
       $(inputId).val('');
diff --git a/rhodecode/templates/admin/repos/repo_edit.mako b/rhodecode/templates/admin/repos/repo_edit.mako
index e27a6ada..800d95f0 100644
--- a/rhodecode/templates/admin/repos/repo_edit.mako
+++ b/rhodecode/templates/admin/repos/repo_edit.mako
@@ -24,7 +24,11 @@
 </%def>
 
 <%def name="main_content()">
-  <%include file="/admin/repos/repo_edit_${c.active}.mako"/>
+  % if hasattr(c, 'repo_edit_template'):
+    <%include file="${c.repo_edit_template}"/>
+  % else:
+    <%include file="/admin/repos/repo_edit_${c.active}.mako"/>
+  % endif
 </%def>
 
 
diff --git a/rhodecode/templates/compare/compare_commits.mako b/rhodecode/templates/compare/compare_commits.mako
index a866d837..dd87b078 100644
--- a/rhodecode/templates/compare/compare_commits.mako
+++ b/rhodecode/templates/compare/compare_commits.mako
@@ -6,6 +6,7 @@
     <a href="${h.url('changeset_home', repo_name=c.repo_name, revision=c.ancestor)}">
         ${h.short_id(c.ancestor)}
     </a>. ${_('Compare was calculated based on this shared commit.')}
+    <input id="common_ancestor" type="hidden" name="common_ancestor" value="${c.ancestor}">
 </div>
 %endif
 
diff --git a/rhodecode/templates/forms/sequence.pt b/rhodecode/templates/forms/sequence.pt
index a749f7d9..541276ef 100644
--- a/rhodecode/templates/forms/sequence.pt
+++ b/rhodecode/templates/forms/sequence.pt
@@ -32,21 +32,21 @@
          tal:attributes="prototype prototype"/>
 
   <div class="panel panel-default">
-    <div class="panel-heading">${title}</div>
     <div class="panel-body">
 
       <div class="deform-seq-container"
            id="${oid}-orderable">
         <div tal:define="subfields [ x[1] for x in subfields ]"
              tal:repeat="subfield subfields"
-             tal:replace="structure subfield.render_template(item_tmpl,
-                                                          parent=field)" />
+             tal:replace="structure subfield.render_template(item_tmpl,parent=field)" />
         <span class="deform-insert-before"
               tal:attributes="
                  min_len min_len;
                  max_len max_len;
                  now_len now_len;
-                 orderable orderable;"></span>
+                 orderable orderable;">
+
+        </span>
       </div>
 
       <div style="clear: both"></div>
@@ -78,12 +78,12 @@
                placeholder: '<span class="glyphicon glyphicon-arrow-right placeholder"></span>',
                onDragStart: function ($item, container, _super) {
                  var offset = $item.offset(),
-                 pointer = container.rootGroup.pointer
+                 pointer = container.rootGroup.pointer;
 
                  adjustment = {
                    left: pointer.left - offset.left,
                    top: pointer.top - offset.top
-                 }
+                 };
 
                  _super($item, container)
                },
diff --git a/rhodecode/templates/forms/sequence_item.pt b/rhodecode/templates/forms/sequence_item.pt
index 3b0c28be..c77e852a 100644
--- a/rhodecode/templates/forms/sequence_item.pt
+++ b/rhodecode/templates/forms/sequence_item.pt
@@ -6,6 +6,7 @@
                  oid oid|field.oid"
      class="form-group row deform-seq-item ${field.error and error_class or ''} ${field.widget.item_css_class or ''}"
      i18n:domain="deform">
+
   <div class="deform-seq-item-group">
     <span tal:replace="structure field.serialize(cstruct)"/>
     <tal:errors condition="field.error and not hidden"
@@ -17,13 +18,8 @@
          i18n:translate="">${msg}</p>
     </tal:errors>
   </div>
+
   <div class="deform-seq-item-handle" style="padding:0">
-    <!-- sequence_item -->
-    <span class="deform-order-button close glyphicon glyphicon-resize-vertical"
-          id="${oid}-order"
-          tal:condition="not hidden"
-          title="Reorder (via drag and drop)"
-          i18n:attributes="title"></span>
     <a class="deform-close-button close"
        id="${oid}-close"
        tal:condition="not field.widget.hidden"
@@ -31,5 +27,5 @@
        i18n:attributes="title"
        onclick="javascript:deform.removeSequenceItem(this);">&times;</a>
   </div>
-  <!-- /sequence_item -->
+
 </div>
diff --git a/rhodecode/templates/pullrequests/pullrequest.mako b/rhodecode/templates/pullrequests/pullrequest.mako
index 08516109..3d5cd54b 100644
--- a/rhodecode/templates/pullrequests/pullrequest.mako
+++ b/rhodecode/templates/pullrequests/pullrequest.mako
@@ -62,7 +62,7 @@
 
                             ##ORG
                             <div class="content">
-                                <strong>${_('Origin repository')}:</strong>
+                                <strong>${_('Source repository')}:</strong>
                                 ${c.rhodecode_db_repo.description}
                             </div>
                             <div class="content">
@@ -102,6 +102,17 @@
                 </div>
             </div>
             <div>
+                ## REIEW RULES
+                <div id="review_rules" style="display: none" class="reviewers-title block-right">
+                    <div class="pr-details-title">
+                        ${_('Reviewer rules')}
+                    </div>
+                    <div class="pr-reviewer-rules">
+                        ## review rules will be appended here, by default reviewers logic
+                    </div>
+                </div>
+
+                ## REVIEWERS
                 <div class="reviewers-title block-right">
                     <div class="pr-details-title">
                         ${_('Pull request reviewers')}
@@ -137,7 +148,6 @@ $(function(){
   var defaultSourceRepoData = ${c.default_repo_data['source_refs_json']|n};
   var defaultTargetRepo = '${c.default_repo_data['target_repo_name']}';
   var defaultTargetRepoData = ${c.default_repo_data['target_refs_json']|n};
-  var targetRepoName = '${c.repo_name}';
 
   var $pullRequestForm = $('#pull_request_form');
   var $sourceRepo = $('#source_repo', $pullRequestForm);
@@ -145,6 +155,12 @@ $(function(){
   var $sourceRef = $('#source_ref', $pullRequestForm);
   var $targetRef = $('#target_ref', $pullRequestForm);
 
+  var sourceRepo = function() { return $sourceRepo.eq(0).val() };
+  var sourceRef = function() { return $sourceRef.eq(0).val().split(':') };
+
+  var targetRepo = function() { return $targetRepo.eq(0).val() };
+  var targetRef = function() { return $targetRef.eq(0).val().split(':') };
+
   var calculateContainerWidth = function() {
       var maxWidth = 0;
       var repoSelect2Containers = ['#source_repo', '#target_repo'];
@@ -204,6 +220,8 @@ $(function(){
   // custom code mirror
   var codeMirrorInstance = initPullRequestsCodeMirror('#pullrequest_desc');
 
+  reviewersController = new ReviewersController();
+
   var queryTargetRepo = function(self, query) {
       // cache ALL results if query is empty
       var cacheKey = query.term || '__';
@@ -213,7 +231,7 @@ $(function(){
           query.callback({results: cachedData.results});
       } else {
           $.ajax({
-              url: pyroutes.url('pullrequest_repo_destinations', {'repo_name': targetRepoName}),
+              url: pyroutes.url('pullrequest_repo_destinations', {'repo_name': templateContext.repo_name}),
               data: {query: query.term},
               dataType: 'json',
               type: 'GET',
@@ -246,55 +264,21 @@ $(function(){
       query.callback({results: data.results});
   };
 
-
-  var prButtonLockChecks = {
-      'compare': false,
-      'reviewers': false
-  };
-
-  var prButtonLock = function(lockEnabled, msg, scope) {
-      scope = scope || 'all';
-      if (scope == 'all'){
-          prButtonLockChecks['compare'] = !lockEnabled;
-          prButtonLockChecks['reviewers'] = !lockEnabled;
-      } else if (scope == 'compare') {
-          prButtonLockChecks['compare'] = !lockEnabled;
-      } else if (scope == 'reviewers'){
-          prButtonLockChecks['reviewers'] = !lockEnabled;
-      }
-      var checksMeet = prButtonLockChecks.compare && prButtonLockChecks.reviewers;
-      if (lockEnabled) {
-          $('#save').attr('disabled', 'disabled');
-      }
-      else if (checksMeet) {
-          $('#save').removeAttr('disabled');
-      }
-
-      if (msg) {
-          $('#pr_open_message').html(msg);
-      }
-  };
-
   var loadRepoRefDiffPreview = function() {
-      var sourceRepo = $sourceRepo.eq(0).val();
-      var sourceRef = $sourceRef.eq(0).val().split(':');
-
-      var targetRepo = $targetRepo.eq(0).val();
-      var targetRef = $targetRef.eq(0).val().split(':');
 
       var url_data = {
-          'repo_name': targetRepo,
-          'target_repo': sourceRepo,
-          'source_ref': targetRef[2],
+          'repo_name': targetRepo(),
+          'target_repo': sourceRepo(),
+          'source_ref': targetRef()[2],
           'source_ref_type': 'rev',
-          'target_ref': sourceRef[2],
+          'target_ref': sourceRef()[2],
           'target_ref_type': 'rev',
           'merge': true,
           '_': Date.now() // bypass browser caching
       }; // gather the source/target ref and repo here
 
-      if (sourceRef.length !== 3 || targetRef.length !== 3) {
-          prButtonLock(true, "${_('Please select origin and destination')}");
+      if (sourceRef().length !== 3 || targetRef().length !== 3) {
+          prButtonLock(true, "${_('Please select source and target')}");
           return;
       }
       var url = pyroutes.url('compare_url', url_data);
@@ -315,10 +299,11 @@ $(function(){
           .done(function(data) {
               loadRepoRefDiffPreview._currentRequest = null;
               $('#pull_request_overview').html(data);
+
               var commitElements = $(data).find('tr[commit_id]');
 
-              var prTitleAndDesc = getTitleAndDescription(sourceRef[1],
-                                                          commitElements, 5);
+              var prTitleAndDesc = getTitleAndDescription(
+                  sourceRef()[1], commitElements, 5);
 
               var title = prTitleAndDesc[0];
               var proposedDescription = prTitleAndDesc[1];
@@ -366,43 +351,6 @@ $(function(){
           });
   };
 
-  /**
-   Generate Title and Description for a PullRequest.
-   In case of 1 commits, the title and description is that one commit
-   in case of multiple commits, we iterate on them with max N number of commits,
-   and build description in a form
-   - commitN
-   - commitN+1
-   ...
-
-   Title is then constructed from branch names, or other references,
-   replacing '-' and '_' into spaces
-
-   * @param sourceRef
-   * @param elements
-   * @param limit
-   * @returns {*[]}
-   */
-  var getTitleAndDescription = function(sourceRef, elements, limit) {
-      var title = '';
-      var desc = '';
-
-      $.each($(elements).get().reverse().slice(0, limit), function(idx, value) {
-          var rawMessage = $(value).find('td.td-description .message').data('messageRaw');
-          desc += '- ' + rawMessage.split('\n')[0].replace(/\n+$/, "") + '\n';
-      });
-      // only 1 commit, use commit message as title
-      if (elements.length == 1) {
-          title = $(elements[0]).find('td.td-description .message').data('messageRaw').split('\n')[0];
-      }
-      else {
-          // use reference name
-          title = sourceRef.replace(/-/g, ' ').replace(/_/g, ' ').capitalizeFirstLetter();
-      }
-
-      return [title, desc]
-  };
-
   var Select2Box = function(element, overrides) {
     var globalDefaults = {
         dropdownAutoWidth: true,
@@ -459,7 +407,7 @@ $(function(){
   var targetRepoChanged = function(repoData) {
       // generate new DESC of target repo displayed next to select
       $('#target_repo_desc').html(
-          "<strong>${_('Destination repository')}</strong>: {0}".format(repoData['description'])
+          "<strong>${_('Target repository')}</strong>: {0}".format(repoData['description'])
       );
 
       // generate dynamic select2 for refs.
@@ -468,8 +416,7 @@ $(function(){
 
   };
 
-  var sourceRefSelect2 = Select2Box(
-    $sourceRef, {
+  var sourceRefSelect2 = Select2Box($sourceRef, {
       placeholder: "${_('Select commit reference')}",
       query: function(query) {
         var initialData = defaultSourceRepoData['refs']['select2_refs'];
@@ -499,12 +446,14 @@ $(function(){
 
   $sourceRef.on('change', function(e){
     loadRepoRefDiffPreview();
-    loadDefaultReviewers();
+    reviewersController.loadDefaultReviewers(
+        sourceRepo(), sourceRef(), targetRepo(), targetRef());
   });
 
   $targetRef.on('change', function(e){
     loadRepoRefDiffPreview();
-    loadDefaultReviewers();
+    reviewersController.loadDefaultReviewers(
+        sourceRepo(), sourceRef(), targetRepo(), targetRef());
   });
 
   $targetRepo.on('change', function(e){
@@ -515,7 +464,7 @@ $(function(){
 
       $.ajax({
           url: pyroutes.url('pullrequest_repo_refs',
-            {'repo_name': targetRepoName, 'target_repo_name':repoName}),
+            {'repo_name': templateContext.repo_name, 'target_repo_name':repoName}),
           data: {},
           dataType: 'json',
           type: 'GET',
@@ -531,43 +480,7 @@ $(function(){
 
   });
 
-  var loadDefaultReviewers = function() {
-    if (loadDefaultReviewers._currentRequest) {
-        loadDefaultReviewers._currentRequest.abort();
-    }
-    $('.calculate-reviewers').show();
-    prButtonLock(true, null, 'reviewers');
-
-    var url = pyroutes.url('repo_default_reviewers_data', {'repo_name': targetRepoName});
-
-    var sourceRepo = $sourceRepo.eq(0).val();
-    var sourceRef = $sourceRef.eq(0).val().split(':');
-    var targetRepo = $targetRepo.eq(0).val();
-    var targetRef = $targetRef.eq(0).val().split(':');
-    url += '?source_repo=' + sourceRepo;
-    url += '&source_ref=' + sourceRef[2];
-    url += '&target_repo=' + targetRepo;
-    url += '&target_ref=' + targetRef[2];
-
-    loadDefaultReviewers._currentRequest = $.get(url)
-        .done(function(data) {
-            loadDefaultReviewers._currentRequest = null;
-
-            // reset && add the reviewer based on selected repo
-            $('#review_members').html('');
-            for (var i = 0; i < data.reviewers.length; i++) {
-              var reviewer = data.reviewers[i];
-              addReviewMember(
-                  reviewer.user_id, reviewer.firstname,
-                  reviewer.lastname, reviewer.username,
-                  reviewer.gravatar_link, reviewer.reasons);
-            }
-            $('.calculate-reviewers').hide();
-            prButtonLock(false, null, 'reviewers');
-        });
-  };
-
-  prButtonLock(true, "${_('Please select origin and destination')}", 'all');
+  prButtonLock(true, "${_('Please select source and target')}", 'all');
 
   // auto-load on init, the target refs select2
   calculateContainerWidth();
@@ -578,10 +491,11 @@ $(function(){
   });
 
   % if c.default_source_ref:
-      // in case we have a pre-selected value, use it now
-      $sourceRef.select2('val', '${c.default_source_ref}');
-      loadRepoRefDiffPreview();
-      loadDefaultReviewers();
+  // in case we have a pre-selected value, use it now
+  $sourceRef.select2('val', '${c.default_source_ref}');
+  loadRepoRefDiffPreview();
+  reviewersController.loadDefaultReviewers(
+      sourceRepo(), sourceRef(), targetRepo(), targetRef());
   % endif
 
   ReviewerAutoComplete('#user');
diff --git a/rhodecode/templates/pullrequests/pullrequest_show.mako b/rhodecode/templates/pullrequests/pullrequest_show.mako
index 483ee7a4..588accb2 100644
--- a/rhodecode/templates/pullrequests/pullrequest_show.mako
+++ b/rhodecode/templates/pullrequests/pullrequest_show.mako
@@ -48,13 +48,13 @@
       <div class="summary-details block-left">
         <% summary = lambda n:{False:'summary-short'}.get(n) %>
         <div class="pr-details-title">
-            <a href="${h.url('pull_requests_global', pull_request_id=c.pull_request.pull_request_id)}">${_('Pull request #%s') % c.pull_request.pull_request_id}</a> ${_('From')} ${h.format_date(c.pull_request.created_on)}
+            <a href="${h.route_path('pull_requests_global', pull_request_id=c.pull_request.pull_request_id)}">${_('Pull request #%s') % c.pull_request.pull_request_id}</a> ${_('From')} ${h.format_date(c.pull_request.created_on)}
             %if c.allowed_to_update:
               <div id="delete_pullrequest" class="pull-right action_button ${'' if c.allowed_to_delete else 'disabled' }" style="clear:inherit;padding: 0">
                   % if c.allowed_to_delete:
                       ${h.secure_form(url('pullrequest_delete', repo_name=c.pull_request.target_repo.repo_name, pull_request_id=c.pull_request.pull_request_id),method='delete')}
                           ${h.submit('remove_%s' % c.pull_request.pull_request_id, _('Delete'),
-                        class_="btn btn-link btn-danger",onclick="return confirm('"+_('Confirm to delete this pull request')+"');")}
+                        class_="btn btn-link btn-danger no-margin",onclick="return confirm('"+_('Confirm to delete this pull request')+"');")}
                       ${h.end_form()}
                   % else:
                     ${_('Delete')}
@@ -68,7 +68,7 @@
         <div id="summary" class="fields pr-details-content">
            <div class="field">
             <div class="label-summary">
-                <label>${_('Origin')}:</label>
+                <label>${_('Source')}:</label>
             </div>
             <div class="input">
                 <div class="pr-origininfo">
@@ -297,7 +297,7 @@
            <div id="pr-save" class="field" style="display: none;">
             <div class="label-summary"></div>
             <div class="input">
-              <span id="edit_pull_request" class="btn btn-small">${_('Save Changes')}</span>
+              <span id="edit_pull_request" class="btn btn-small no-margin">${_('Save Changes')}</span>
             </div>
            </div>
         </div>
@@ -316,13 +316,27 @@
               </li>
             </ul>
         </div>
+
+        ## REVIEW RULES
+        <div id="review_rules" style="display: none" class="reviewers-title block-right">
+            <div class="pr-details-title">
+                ${_('Reviewer rules')}
+              %if c.allowed_to_update:
+                <span id="close_edit_reviewers" class="block-right action_button last-item" style="display: none;">${_('Close')}</span>
+              %endif
+            </div>
+            <div class="pr-reviewer-rules">
+                ## review rules will be appended here, by default reviewers logic
+            </div>
+            <input id="review_data" type="hidden" name="review_data" value="">
+        </div>
+
         ## REVIEWERS
         <div class="reviewers-title block-right">
           <div class="pr-details-title">
               ${_('Pull request reviewers')}
               %if c.allowed_to_update:
-                <span id="open_edit_reviewers" class="block-right action_button">${_('Edit')}</span>
-                <span id="close_edit_reviewers" class="block-right action_button" style="display: none;">${_('Close')}</span>
+                <span id="open_edit_reviewers" class="block-right action_button last-item">${_('Edit')}</span>
               %endif
           </div>
         </div>
@@ -330,8 +344,8 @@
           ## members goes here !
             <input type="hidden" name="__start__" value="review_members:sequence">
             <ul id="review_members" class="group_members">
-            %for member,reasons,status in c.pull_request_reviewers:
-              <li id="reviewer_${member.user_id}">
+            %for member,reasons,mandatory,status in c.pull_request_reviewers:
+              <li id="reviewer_${member.user_id}" class="reviewer_entry">
                 <div class="reviewers_member">
                     <div class="reviewer_status tooltip" title="${h.tooltip(h.commit_status_lbl(status[0][1].status if status else 'not_reviewed'))}">
                       <div class="${'flag_status %s' % (status[0][1].status if status else 'not_reviewed')} pull-left reviewer_member_status"></div>
@@ -348,30 +362,43 @@
                   %endfor
                   <input type="hidden" name="__end__" value="reasons: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="__end__" value="reviewer:mapping">
-                  %if c.allowed_to_update:
-                  <div class="reviewer_member_remove action_button" onclick="removeReviewMember(${member.user_id}, true)" style="visibility: hidden;">
-                      <i class="icon-remove-sign" ></i>
-                  </div>
-                  %endif
+                  % if mandatory:
+                        <div class="reviewer_member_mandatory_remove">
+                            <i class="icon-remove-sign"></i>
+                        </div>
+                        <div class="reviewer_member_mandatory">
+                            <i class="icon-lock" title="Mandatory reviewer"></i>
+                        </div>
+                  % else:
+                    %if c.allowed_to_update:
+                      <div class="reviewer_member_remove action_button" onclick="reviewersController.removeReviewMember(${member.user_id}, true)" style="visibility: hidden;">
+                          <i class="icon-remove-sign" ></i>
+                      </div>
+                    %endif
+                  % endif
                 </div>
               </li>
             %endfor
             </ul>
             <input type="hidden" name="__end__" value="review_members:sequence">
-          %if not c.pull_request.is_closed():
-          <div id="add_reviewer_input" class='ac' style="display: none;">
-            %if c.allowed_to_update:
-            <div class="reviewer_ac">
-               ${h.text('user', class_='ac-input', placeholder=_('Add reviewer or reviewer group'))}
-               <div id="reviewers_container"></div>
-            </div>
-            <div>
-             <button id="update_pull_request" class="btn btn-small">${_('Save Changes')}</button>
-            </div>
+
+            %if not c.pull_request.is_closed():
+                <div id="add_reviewer" class="ac" style="display: none;">
+                %if c.allowed_to_update:
+                    % if not c.forbid_adding_reviewers:
+                        <div id="add_reviewer_input" class="reviewer_ac">
+                           ${h.text('user', class_='ac-input', placeholder=_('Add reviewer or reviewer group'))}
+                           <div id="reviewers_container"></div>
+                        </div>
+                    % endif
+                    <div class="pull-right">
+                        <button id="update_pull_request" class="btn btn-small no-margin">${_('Save Changes')}</button>
+                    </div>
+                %endif
+                </div>
             %endif
-          </div>
-          %endif
         </div>
       </div>
   </div>
@@ -429,7 +456,7 @@
 
                     <div class="pull-right">
                         % if c.allowed_to_update and not c.pull_request.is_closed():
-                          <a id="update_commits" class="btn btn-primary pull-right">${_('Update commits')}</a>
+                          <a id="update_commits" class="btn btn-primary no-margin pull-right">${_('Update commits')}</a>
                         % else:
                           <a class="tooltip btn disabled pull-right" disabled="disabled" title="${_('Update is disabled for current view')}">${_('Update commits')}</a>
                         % endif
@@ -615,9 +642,10 @@
         versionController = new VersionController();
         versionController.init();
 
+        reviewersController = new ReviewersController();
 
         $(function(){
-            ReviewerAutoComplete('#user');
+
             // custom code mirror
             var codeMirrorInstance = initPullRequestsCodeMirror('#pr-description-input');
 
@@ -655,13 +683,13 @@
             var ReviewersPanel = {
               editButton: $('#open_edit_reviewers'),
               closeButton: $('#close_edit_reviewers'),
-              addButton: $('#add_reviewer_input'),
-              removeButtons: $('.reviewer_member_remove'),
+              addButton: $('#add_reviewer'),
+              removeButtons: $('.reviewer_member_remove,.reviewer_member_mandatory_remove,.reviewer_member_mandatory'),
 
               init: function() {
-                var that = this;
-                this.editButton.on('click', function(e) { that.edit(); });
-                this.closeButton.on('click', function(e) { that.close(); });
+                var self = this;
+                this.editButton.on('click', function(e) { self.edit(); });
+                this.closeButton.on('click', function(e) { self.close(); });
               },
 
               edit: function(event) {
@@ -669,6 +697,9 @@
                 this.closeButton.show();
                 this.addButton.show();
                 this.removeButtons.css('visibility', 'visible');
+                // review rules
+                reviewersController.loadReviewRules(
+                    ${c.pull_request.reviewer_data_json | n});
               },
 
               close: function(event) {
@@ -676,6 +707,8 @@
                 this.closeButton.hide();
                 this.addButton.hide();
                 this.removeButtons.css('visibility', 'hidden');
+                // hide review rules
+                reviewersController.hideReviewRules()
               }
             };
 
@@ -774,7 +807,8 @@
                 $(this).attr('disabled', 'disabled');
                 $(this).addClass('disabled');
                 $(this).html(_gettext('Saving...'));
-                updateReviewers(undefined, "${c.repo_name}", "${c.pull_request.pull_request_id}");
+                reviewersController.updateReviewers(
+                    "${c.repo_name}", "${c.pull_request.pull_request_id}");
             });
 
             $('#update_commits').on('click', function(e){
@@ -784,14 +818,16 @@
                 $(e.currentTarget).removeClass('btn-primary');
                 $(e.currentTarget).text(_gettext('Updating...'));
                 if(isDisabled){
-                    updateCommits("${c.repo_name}", "${c.pull_request.pull_request_id}");
+                    updateCommits(
+                        "${c.repo_name}", "${c.pull_request.pull_request_id}");
                 }
             });
             // fixing issue with caches on firefox
             $('#update_commits').removeAttr("disabled");
 
             $('#close_pull_request').on('click', function(e){
-                closePullRequest("${c.repo_name}", "${c.pull_request.pull_request_id}");
+                closePullRequest(
+                    "${c.repo_name}", "${c.pull_request.pull_request_id}");
             });
 
             $('.show-inline-comments').on('click', function(e){
@@ -818,6 +854,8 @@
             // initial injection
             injectCloseAction();
 
+            ReviewerAutoComplete('#user');
+
         })
       </script>
 
diff --git a/rhodecode/tests/functional/test_login.py b/rhodecode/tests/functional/test_login.py
index a7b4401b..82ded00d 100644
--- a/rhodecode/tests/functional/test_login.py
+++ b/rhodecode/tests/functional/test_login.py
@@ -25,7 +25,8 @@ import pytest
 
 from rhodecode.config.routing import ADMIN_PREFIX
 from rhodecode.tests import (
-    assert_session_flash, url, HG_REPO, TEST_USER_ADMIN_LOGIN)
+    assert_session_flash, url, HG_REPO, TEST_USER_ADMIN_LOGIN,
+    no_newline_id_generator)
 from rhodecode.tests.fixture import Fixture
 from rhodecode.tests.utils import AssertResponse, get_session_from_response
 from rhodecode.lib.auth import check_password
@@ -122,7 +123,7 @@ class TestLoginController(object):
         'ftp://some.ftp.server',
         'http://other.domain',
         '/\r\nX-Forwarded-Host: http://example.org',
-    ])
+    ], ids=no_newline_id_generator)
     def test_login_bad_came_froms(self, url_came_from):
         _url = '{}?came_from={}'.format(login_url, url_came_from)
         response = self.app.post(
diff --git a/rhodecode/tests/functional/test_pullrequests.py b/rhodecode/tests/functional/test_pullrequests.py
index e90d9ca9..1553ba01 100644
--- a/rhodecode/tests/functional/test_pullrequests.py
+++ b/rhodecode/tests/functional/test_pullrequests.py
@@ -295,8 +295,8 @@ class TestPullrequestsController:
     def test_comment_force_close_pull_request(self, pr_util, csrf_token):
         pull_request = pr_util.create_pull_request()
         pull_request_id = pull_request.pull_request_id
-        reviewers_data = [(1, ['reason']), (2, ['reason2'])]
-        PullRequestModel().update_reviewers(pull_request_id, reviewers_data)
+        PullRequestModel().update_reviewers(
+            pull_request_id, [(1, ['reason'], False), (2, ['reason2'], False)])
         author = pull_request.user_id
         repo = pull_request.target_repo.repo_id
         self.app.post(
@@ -345,6 +345,7 @@ class TestPullrequestsController:
                 ('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_desc', 'Description'),
                 ('pullrequest_title', 'Title'),
                 ('__start__', 'review_members:sequence'),
@@ -353,6 +354,7 @@ class TestPullrequestsController:
                         ('__start__', 'reasons:sequence'),
                             ('reason', 'Some reason'),
                         ('__end__', 'reasons:sequence'),
+                        ('mandatory', 'False'),
                     ('__end__', 'reviewer:mapping'),
                 ('__end__', 'review_members:sequence'),
                 ('__start__', 'revisions:sequence'),
@@ -365,8 +367,9 @@ class TestPullrequestsController:
             status=302)
 
         location = response.headers['Location']
-        pull_request_id = int(location.rsplit('/', 1)[1])
-        pull_request = PullRequest.get(pull_request_id)
+        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']]
@@ -403,6 +406,7 @@ class TestPullrequestsController:
                 ('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_desc', 'Description'),
                 ('pullrequest_title', 'Title'),
                 ('__start__', 'review_members:sequence'),
@@ -411,6 +415,7 @@ class TestPullrequestsController:
                         ('__start__', 'reasons:sequence'),
                             ('reason', 'Some reason'),
                         ('__end__', 'reasons:sequence'),
+                        ('mandatory', 'False'),
                     ('__end__', 'reviewer:mapping'),
                 ('__end__', 'review_members:sequence'),
                 ('__start__', 'revisions:sequence'),
@@ -422,21 +427,22 @@ class TestPullrequestsController:
             status=302)
 
         location = response.headers['Location']
-        pull_request_id = int(location.rsplit('/', 1)[1])
-        pull_request = PullRequest.get(pull_request_id)
+
+        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("wants you to review "
-                                                  "pull request #%d"
-                                                  % pull_request_id))
+                    Notification.subject.contains(
+                        "wants you to review pull request #%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, [])])
+            pull_request.pull_request_id, [(1, [], False)])
         assert len(notifications.all()) == 2
 
     def test_create_pull_request_stores_ancestor_commit_id(self, backend,
@@ -467,6 +473,7 @@ class TestPullrequestsController:
                 ('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_desc', 'Description'),
                 ('pullrequest_title', 'Title'),
                 ('__start__', 'review_members:sequence'),
@@ -475,6 +482,7 @@ class TestPullrequestsController:
                         ('__start__', 'reasons:sequence'),
                             ('reason', 'Some reason'),
                         ('__end__', 'reasons:sequence'),
+                        ('mandatory', 'False'),
                     ('__end__', 'reviewer:mapping'),
                 ('__end__', 'review_members:sequence'),
                 ('__start__', 'revisions:sequence'),
@@ -486,8 +494,10 @@ class TestPullrequestsController:
             status=302)
 
         location = response.headers['Location']
-        pull_request_id = int(location.rsplit('/', 1)[1])
-        pull_request = PullRequest.get(pull_request_id)
+
+        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
@@ -954,14 +964,7 @@ class TestPullrequestsController:
         assert target.text.strip() == 'tag: target'
         assert target.getchildren() == []
 
-    def test_description_is_escaped_on_index_page(self, backend, pr_util):
-        xss_description = "<script>alert('Hi!')</script>"
-        pull_request = pr_util.create_pull_request(description=xss_description)
-        response = self.app.get(url(
-            controller='pullrequests', action='show_all',
-            repo_name=pull_request.target_repo.repo_name))
-        response.mustcontain(
-            "&lt;script&gt;alert(&#39;Hi!&#39;)&lt;/script&gt;")
+
 
     @pytest.mark.parametrize('mergeable', [True, False])
     def test_shadow_repository_link(
@@ -1061,23 +1064,20 @@ def assert_pull_request_status(pull_request, expected_status):
     assert status == expected_status
 
 
-@pytest.mark.parametrize('action', ['show_all', 'index', 'create'])
+@pytest.mark.parametrize('action', ['index', 'create'])
 @pytest.mark.usefixtures("autologin_user")
-def test_redirects_to_repo_summary_for_svn_repositories(
-        backend_svn, app, action):
-    denied_actions = ['show_all', 'index', 'create']
-    for action in denied_actions:
-        response = app.get(url(
-            controller='pullrequests', action=action,
-            repo_name=backend_svn.repo_name))
-        assert response.status_int == 302
+def test_redirects_to_repo_summary_for_svn_repositories(backend_svn, app, action):
+    response = app.get(url(
+        controller='pullrequests', action=action,
+        repo_name=backend_svn.repo_name))
+    assert response.status_int == 302
 
-        # Not allowed, redirect to the summary
-        redirected = response.follow()
-        summary_url = url('summary_home', repo_name=backend_svn.repo_name)
+    # Not allowed, redirect to the summary
+    redirected = response.follow()
+    summary_url = url('summary_home', repo_name=backend_svn.repo_name)
 
-        # URL adds leading slash and path doesn't have it
-        assert redirected.req.path == summary_url
+    # URL adds leading slash and path doesn't have it
+    assert redirected.req.path == summary_url
 
 
 def test_delete_comment_returns_404_if_comment_does_not_exist(pylonsapp):
diff --git a/rhodecode/tests/models/test_pullrequest.py b/rhodecode/tests/models/test_pullrequest.py
index a5aea0e1..54efcf35 100644
--- a/rhodecode/tests/models/test_pullrequest.py
+++ b/rhodecode/tests/models/test_pullrequest.py
@@ -116,7 +116,7 @@ class TestPullRequestModel:
 
     def test_get_awaiting_my_review(self, pull_request):
         PullRequestModel().update_reviewers(
-            pull_request, [(pull_request.author, ['author'])])
+            pull_request, [(pull_request.author, ['author'], False)])
         prs = PullRequestModel().get_awaiting_my_review(
             pull_request.target_repo, user_id=pull_request.author.user_id)
         assert isinstance(prs, list)
@@ -124,7 +124,7 @@ class TestPullRequestModel:
 
     def test_count_awaiting_my_review(self, pull_request):
         PullRequestModel().update_reviewers(
-            pull_request, [(pull_request.author, ['author'])])
+            pull_request, [(pull_request.author, ['author'], False)])
         pr_count = PullRequestModel().count_awaiting_my_review(
             pull_request.target_repo, user_id=pull_request.author.user_id)
         assert pr_count == 1
diff --git a/rhodecode/tests/plugin.py b/rhodecode/tests/plugin.py
index 9450ccb7..13852583 100644
--- a/rhodecode/tests/plugin.py
+++ b/rhodecode/tests/plugin.py
@@ -986,10 +986,9 @@ class PRTestUtility(object):
         return reference
 
     def _get_reviewers(self):
-        model = UserModel()
         return [
-            model.get_by_username(TEST_USER_REGULAR_LOGIN),
-            model.get_by_username(TEST_USER_REGULAR2_LOGIN),
+            (TEST_USER_REGULAR_LOGIN, ['default1'], False),
+            (TEST_USER_REGULAR2_LOGIN, ['default2'], False),
         ]
 
     def update_source_repository(self, head=None):

From a27df6ef4a2a8909815978088ba521e886cbf558 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 30 May 2017 16:01:56 +0200
Subject: [PATCH 133/211] features: show new review rules in CE default
 reviewers

---
 .../images/ee_features/default_reviewers.png  | Bin 122022 -> 160468 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/rhodecode/public/images/ee_features/default_reviewers.png b/rhodecode/public/images/ee_features/default_reviewers.png
index f80db8ac2a5655b01a8a1f9651521bcec5b28288..89483e9a4aefb207931d64ab3c2c8d1f53f6906a 100644
GIT binary patch
literal 160468
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

literal 122022
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
F^k2uH&i()Z


From 55120caf0e837759c0699bd1cde86bf6e5da23e5 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 5 Jun 2017 17:09:03 +0200
Subject: [PATCH 134/211] reviewers: store additional review data.

G: changed rhodecode/model/db.py
---
 rhodecode/model/db.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index 50a8ad8d..efd1b09b 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -3968,15 +3968,21 @@ class RepoReviewRule(Base, BaseModel):
                     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 = {
+                '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:
                     users[member.user.username] = {
                         'user': member.user,
                         'source': 'user_group',
+                        'source_data': source_data,
                         'data': rule_user_group.rule_data()
                     }
 

From 587e36d7458c1c9b628d2f974ce28f700bca3342 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 1 Jun 2017 12:46:15 +0200
Subject: [PATCH 135/211] auth-plugins: updated description on auth_ldap plugin
 servers.

---
 rhodecode/authentication/plugins/auth_ldap.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/rhodecode/authentication/plugins/auth_ldap.py b/rhodecode/authentication/plugins/auth_ldap.py
index 848f803c..f387031d 100644
--- a/rhodecode/authentication/plugins/auth_ldap.py
+++ b/rhodecode/authentication/plugins/auth_ldap.py
@@ -71,15 +71,17 @@ class LdapSettingsSchema(AuthnPluginSettingsSchemaBase):
     host = colander.SchemaNode(
         colander.String(),
         default='',
-        description=_('Host of the LDAP Server \n'
-                      '(e.g., 192.168.2.154, or ldap-server.domain.com'),
+        description=_('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'),
         preparer=strip_whitespace,
         title=_('LDAP Host'),
         widget='string')
     port = colander.SchemaNode(
         colander.Int(),
         default=389,
-        description=_('Custom port that the LDAP server is listening on. Default: 389'),
+        description=_('Custom port that the LDAP server is listening on. '
+                      'Default value is: 389'),
         preparer=strip_whitespace,
         title=_('Port'),
         validator=colander.Range(min=0, max=65536),

From d47af44f72b15801fb3beca5a1f7389bcda8d5e9 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 5 Jun 2017 15:24:11 +0200
Subject: [PATCH 136/211] nix: update default.nix to be consistent with
 ordering with vcsserver.

---
 default.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/default.nix b/default.nix
index b7b0260d..96a917de 100644
--- a/default.nix
+++ b/default.nix
@@ -174,32 +174,33 @@ let
       '';
 
       postInstall = ''
+        echo "Writing meta information for rccontrol to nix-support/rccontrol"
+        mkdir -p $out/nix-support/rccontrol
+        cp -v rhodecode/VERSION $out/nix-support/rccontrol/version
+        echo "DONE: Meta information for rccontrol written"
+
         # python based programs need to be wrapped
-        ln -s ${self.supervisor}/bin/supervisor* $out/bin/
+        ln -s ${self.pyramid}/bin/* $out/bin/
         ln -s ${self.gunicorn}/bin/gunicorn $out/bin/
+        ln -s ${self.supervisor}/bin/supervisor* $out/bin/
         ln -s ${self.PasteScript}/bin/paster $out/bin/
         ln -s ${self.channelstream}/bin/channelstream $out/bin/
-        ln -s ${self.pyramid}/bin/* $out/bin/  #*/
 
         # rhodecode-tools
-        # TODO: johbo: re-think this. Do the tools import anything from enterprise?
         ln -s ${self.rhodecode-tools}/bin/rhodecode-* $out/bin/
 
         # note that condition should be restricted when adding further tools
-        for file in $out/bin/*; do  #*/
+        for file in $out/bin/*;
+        do
           wrapProgram $file \
-              --prefix PYTHONPATH : $PYTHONPATH \
               --prefix PATH : $PATH \
+              --prefix PYTHONPATH : $PYTHONPATH \
               --set PYTHONHASHSEED random
         done
 
         mkdir $out/etc
         cp configs/production.ini $out/etc
 
-        echo "Writing meta information for rccontrol to nix-support/rccontrol"
-        mkdir -p $out/nix-support/rccontrol
-        cp -v rhodecode/VERSION $out/nix-support/rccontrol/version
-        echo "DONE: Meta information for rccontrol written"
 
         # TODO: johbo: Make part of ac-tests
         if [ ! -f rhodecode/public/js/scripts.js ]; then

From 71fee00277edc442c13ccc62f94f53925f6e98cb Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 5 Jun 2017 15:16:04 +0200
Subject: [PATCH 137/211] home: moved home and repo group views into pyramid.

- fixed lots of tests related to those changes
- now main and subrepo group views are handled by pyramid.
---
 rhodecode/api/tests/test_get_gist.py          |  8 +--
 rhodecode/api/tests/test_get_pull_request.py  | 22 +++----
 rhodecode/api/tests/test_update_repo.py       |  7 ++-
 rhodecode/apps/__init__.py                    | 19 ++++++
 rhodecode/apps/_base/__init__.py              | 36 ++++++++++-
 .../home/tests}/test_home.py                  | 32 ++++++----
 rhodecode/apps/home/views.py                  | 62 ++++++++++++++++++-
 rhodecode/apps/login/views.py                 | 12 ++--
 .../tests/test_my_account_password.py         |  3 +-
 rhodecode/apps/repo_group/__init__.py         | 33 ++++++++++
 rhodecode/apps/repository/__init__.py         |  4 ++
 rhodecode/config/middleware.py                |  1 +
 rhodecode/config/routing.py                   | 10 ---
 rhodecode/controllers/admin/repo_groups.py    |  6 +-
 rhodecode/controllers/admin/repos.py          |  4 +-
 rhodecode/controllers/forks.py                |  2 +-
 rhodecode/controllers/home.py                 | 43 -------------
 rhodecode/events/base.py                      |  2 +-
 rhodecode/lib/auth.py                         | 22 ++++++-
 rhodecode/lib/base.py                         |  2 +-
 rhodecode/lib/helpers.py                      | 10 +--
 rhodecode/lib/utils.py                        |  7 ++-
 rhodecode/lib/utils2.py                       |  3 +-
 rhodecode/model/db.py                         | 17 +++--
 rhodecode/model/notification.py               |  4 +-
 rhodecode/model/repo.py                       |  1 +
 rhodecode/public/js/rhodecode/routes.js       |  3 +
 .../templates/admin/integrations/list.mako    |  2 +-
 .../admin/repo_groups/repo_group_edit.mako    |  2 +-
 .../templates/admin/repos/repo_creating.mako  |  2 +-
 .../admin/users/user_edit_advanced.mako       |  2 +-
 rhodecode/templates/base/base.mako            |  4 +-
 rhodecode/templates/base/perms_summary.mako   |  2 +-
 rhodecode/templates/base/root.mako            |  2 +-
 .../templates/data_table/_dt_elements.mako    |  4 +-
 rhodecode/templates/index_repo_group.mako     |  4 +-
 rhodecode/templates/login.mako                |  2 +-
 rhodecode/templates/password_reset.mako       |  2 +-
 rhodecode/templates/register.mako             |  2 +-
 rhodecode/tests/__init__.py                   |  3 +-
 rhodecode/tests/events/test_pullrequest.py    | 12 ++--
 rhodecode/tests/events/test_repo.py           |  1 -
 .../tests/functional/test_admin_gists.py      |  5 +-
 .../tests/functional/test_admin_my_account.py |  8 ++-
 .../functional/test_admin_repo_groups.py      | 21 +++++--
 .../tests/functional/test_delegated_admin.py  | 12 +++-
 rhodecode/tests/functional/test_login.py      | 15 +++--
 rhodecode/tests/functional/test_sessions.py   | 30 ++++++---
 rhodecode/tests/functional/test_summary.py    | 19 +++---
 .../tests/lib/middleware/test_simplevcs.py    | 18 ++----
 rhodecode/tests/lib/test_codeblocks.py        |  5 +-
 rhodecode/tests/lib/test_helpers.py           |  3 +-
 rhodecode/tests/lib/test_mako_emails.py       | 13 ++--
 .../tests/models/test_changeset_status.py     | 21 ++++---
 rhodecode/tests/models/test_notifications.py  |  6 +-
 rhodecode/tests/models/test_pullrequest.py    | 20 +++---
 .../tests/models/test_pullrequest_git.py      |  1 +
 rhodecode/tests/other/test_libs.py            | 14 ++++-
 .../tests/other/vcs_operations/conftest.py    |  8 +--
 .../test_vcs_calls_custom_auth_code_403.py    |  4 +-
 .../test_vcs_calls_custom_auth_code_404.py    |  4 +-
 ...est_vcs_calls_custom_auth_code_bad_code.py |  4 +-
 .../vcs_operations/test_vcs_operations.py     |  2 +-
 .../test_vcs_operations_locking.py            |  4 +-
 ...test_vcs_operations_locking_custom_code.py |  4 +-
 rhodecode/tests/plugin.py                     | 28 +++++++--
 rhodecode/tests/scripts/test_concurency.py    |  8 ---
 rhodecode/tests/utils.py                      | 31 ++++++----
 .../test_hg_vcsserver_cache_invalidation.py   |  5 +-
 69 files changed, 457 insertions(+), 277 deletions(-)
 rename rhodecode/{tests/functional => apps/home/tests}/test_home.py (83%)
 create mode 100644 rhodecode/apps/repo_group/__init__.py

diff --git a/rhodecode/api/tests/test_get_gist.py b/rhodecode/api/tests/test_get_gist.py
index b919e79a..9bb4226d 100644
--- a/rhodecode/api/tests/test_get_gist.py
+++ b/rhodecode/api/tests/test_get_gist.py
@@ -28,7 +28,7 @@ from rhodecode.api.tests.utils import (
 
 @pytest.mark.usefixtures("testuser_api", "app")
 class TestApiGetGist(object):
-    def test_api_get_gist(self, gist_util):
+    def test_api_get_gist(self, gist_util, http_host_stub):
         gist = gist_util.create_gist()
         gist_id = gist.gist_access_id
         gist_created_on = gist.created_on
@@ -45,14 +45,14 @@ class TestApiGetGist(object):
             'expires': -1.0,
             'gist_id': int(gist_id),
             'type': 'public',
-            'url': 'http://test.example.com:80/_admin/gists/%s' % (gist_id,),
+            'url': 'http://%s/_admin/gists/%s' % (http_host_stub, gist_id,),
             'acl_level': Gist.ACL_LEVEL_PUBLIC,
             'content': None,
         }
 
         assert_ok(id_, expected, given=response.body)
 
-    def test_api_get_gist_with_content(self, gist_util):
+    def test_api_get_gist_with_content(self, gist_util, http_host_stub):
         mapping = {
             u'filename1.txt': {'content': u'hello world'},
             u'filename1ą.txt': {'content': u'hello worldę'}
@@ -73,7 +73,7 @@ class TestApiGetGist(object):
             'expires': -1.0,
             'gist_id': int(gist_id),
             'type': 'public',
-            'url': 'http://test.example.com:80/_admin/gists/%s' % (gist_id,),
+            'url': 'http://%s/_admin/gists/%s' % (http_host_stub, gist_id,),
             'acl_level': Gist.ACL_LEVEL_PUBLIC,
             'content': {
                 u'filename1.txt': u'hello world',
diff --git a/rhodecode/api/tests/test_get_pull_request.py b/rhodecode/api/tests/test_get_pull_request.py
index 3018b6d5..e58c3099 100644
--- a/rhodecode/api/tests/test_get_pull_request.py
+++ b/rhodecode/api/tests/test_get_pull_request.py
@@ -19,13 +19,13 @@
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 
-import mock
 import pytest
 import urlobject
 from pylons import url
 
 from rhodecode.api.tests.utils import (
     build_data, api_call, assert_error, assert_ok)
+from rhodecode.lib.utils2 import safe_unicode
 
 pytestmark = pytest.mark.backends("git", "hg")
 
@@ -33,7 +33,7 @@ pytestmark = pytest.mark.backends("git", "hg")
 @pytest.mark.usefixtures("testuser_api", "app")
 class TestGetPullRequest(object):
 
-    def test_api_get_pull_request(self, pr_util):
+    def test_api_get_pull_request(self, pr_util, http_host_stub, http_host_only_stub):
         from rhodecode.model.pull_request import PullRequestModel
         pull_request = pr_util.create_pull_request(mergeable=True)
         id_, params = build_data(
@@ -50,16 +50,16 @@ class TestGetPullRequest(object):
                 'pullrequest_show',
                 repo_name=pull_request.target_repo.repo_name,
                 pull_request_id=pull_request.pull_request_id, qualified=True))
-        pr_url = unicode(
-            url_obj.with_netloc('test.example.com:80'))
-        source_url = unicode(
-            pull_request.source_repo.clone_url()
-                .with_netloc('test.example.com:80'))
-        target_url = unicode(
-            pull_request.target_repo.clone_url()
-                .with_netloc('test.example.com:80'))
-        shadow_url = unicode(
+
+        pr_url = safe_unicode(
+            url_obj.with_netloc(http_host_stub))
+        source_url = safe_unicode(
+            pull_request.source_repo.clone_url().with_netloc(http_host_only_stub))
+        target_url = safe_unicode(
+            pull_request.target_repo.clone_url().with_netloc(http_host_only_stub))
+        shadow_url = safe_unicode(
             PullRequestModel().get_shadow_clone_url(pull_request))
+
         expected = {
             'pull_request_id': pull_request.pull_request_id,
             'url': pr_url,
diff --git a/rhodecode/api/tests/test_update_repo.py b/rhodecode/api/tests/test_update_repo.py
index b90380b4..16543cb5 100644
--- a/rhodecode/api/tests/test_update_repo.py
+++ b/rhodecode/api/tests/test_update_repo.py
@@ -26,7 +26,7 @@ from rhodecode.tests import TEST_USER_ADMIN_LOGIN, TEST_USER_REGULAR_LOGIN
 from rhodecode.api.tests.utils import (
     build_data, api_call, assert_error, assert_ok, crash, jsonify)
 from rhodecode.tests.fixture import Fixture
-
+from rhodecode.tests.plugin import http_host_stub, http_host_only_stub
 
 fixture = Fixture()
 
@@ -71,14 +71,15 @@ class TestApiUpdateRepo(object):
         ({'repo_name': 'new_repo_name'},
          {
             'repo_name': 'new_repo_name',
-            'url': 'http://test.example.com:80/new_repo_name'
+            'url': 'http://{}/new_repo_name'.format(http_host_only_stub())
          }),
 
         ({'repo_name': 'test_group_for_update/{}'.format(UPDATE_REPO_NAME),
           '_group': 'test_group_for_update'},
          {
             'repo_name': 'test_group_for_update/{}'.format(UPDATE_REPO_NAME),
-            'url': 'http://test.example.com:80/test_group_for_update/{}'.format(UPDATE_REPO_NAME)
+            'url': 'http://{}/test_group_for_update/{}'.format(
+                http_host_only_stub(), UPDATE_REPO_NAME)
          }),
     ])
     def test_api_update_repo(self, updates, expected, backend):
diff --git a/rhodecode/apps/__init__.py b/rhodecode/apps/__init__.py
index e69de29b..7cb7ec08 100644
--- a/rhodecode/apps/__init__.py
+++ b/rhodecode/apps/__init__.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017 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/
diff --git a/rhodecode/apps/_base/__init__.py b/rhodecode/apps/_base/__init__.py
index 3f06d5c7..79197a0d 100644
--- a/rhodecode/apps/_base/__init__.py
+++ b/rhodecode/apps/_base/__init__.py
@@ -29,6 +29,7 @@ from rhodecode.lib.utils2 import StrictAttributeDict, safe_int, datetime_to_time
 from rhodecode.lib.vcs.exceptions import RepositoryRequirementError
 from rhodecode.lib.ext_json import json
 from rhodecode.model import repo
+from rhodecode.model import repo_group
 from rhodecode.model.db import User
 from rhodecode.model.scm import ScmModel
 
@@ -39,6 +40,12 @@ ADMIN_PREFIX = '/_admin'
 STATIC_FILE_PREFIX = '/_static'
 
 
+def add_route_with_slash(config,name, pattern, **kw):
+    config.add_route(name, pattern, **kw)
+    if not pattern.endswith('/'):
+        config.add_route(name + '_slash', pattern + '/', **kw)
+
+
 def get_format_ref_id(repo):
     """Returns a `repo` specific reference formatter function"""
     if h.is_svn(repo):
@@ -253,8 +260,7 @@ class RepoRoutePredicate(object):
         repo_name = info['match']['repo_name']
         repo_model = repo.RepoModel()
         by_name_match = repo_model.get_by_repo_name(repo_name, cache=True)
-        # if we match quickly from database, short circuit the operation,
-        # and validate repo based on the type.
+
         if by_name_match:
             # register this as request object we can re-use later
             request.db_repo = by_name_match
@@ -300,9 +306,33 @@ class RepoTypeRoutePredicate(object):
             return False
 
 
+class RepoGroupRoutePredicate(object):
+    def __init__(self, val, config):
+        self.val = val
+
+    def text(self):
+        return 'repo_group_route = %s' % self.val
+
+    phash = text
+
+    def __call__(self, info, request):
+        repo_group_name = info['match']['repo_group_name']
+        repo_group_model = repo_group.RepoGroupModel()
+        by_name_match = repo_group_model.get_by_group_name(
+            repo_group_name, cache=True)
+
+        if by_name_match:
+            # register this as request object we can re-use later
+            request.db_repo_group = by_name_match
+            return True
+
+        return False
+
 
 def includeme(config):
     config.add_route_predicate(
         'repo_route', RepoRoutePredicate)
     config.add_route_predicate(
-        'repo_accepted_types', RepoTypeRoutePredicate)
\ No newline at end of file
+        'repo_accepted_types', RepoTypeRoutePredicate)
+    config.add_route_predicate(
+        'repo_group_route', RepoGroupRoutePredicate)
diff --git a/rhodecode/tests/functional/test_home.py b/rhodecode/apps/home/tests/test_home.py
similarity index 83%
rename from rhodecode/tests/functional/test_home.py
rename to rhodecode/apps/home/tests/test_home.py
index dcadb243..e45aeae8 100644
--- a/rhodecode/tests/functional/test_home.py
+++ b/rhodecode/apps/home/tests/test_home.py
@@ -28,18 +28,25 @@ from rhodecode.model.meta import Session
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.settings import SettingsModel
-from rhodecode.tests import TestController, url
+from rhodecode.tests import TestController
 from rhodecode.tests.fixture import Fixture
 
 
 fixture = Fixture()
 
 
+def route_path(name, **kwargs):
+    return {
+        'home': '/',
+        'repo_group_home': '/{repo_group_name}'
+    }[name].format(**kwargs)
+
+
 class TestHomeController(TestController):
 
     def test_index(self):
         self.log_user()
-        response = self.app.get(url(controller='home', action='index'))
+        response = self.app.get(route_path('home'))
         # if global permission is set
         response.mustcontain('Add Repository')
 
@@ -49,7 +56,7 @@ class TestHomeController(TestController):
 
     def test_index_contains_statics_with_ver(self):
         self.log_user()
-        response = self.app.get(url(controller='home', action='index'))
+        response = self.app.get(route_path('home'))
 
         rhodecode_version_hash = c.rhodecode_version_hash
         response.mustcontain('style.css?ver={0}'.format(rhodecode_version_hash))
@@ -57,7 +64,7 @@ class TestHomeController(TestController):
 
     def test_index_contains_backend_specific_details(self, backend):
         self.log_user()
-        response = self.app.get(url(controller='home', action='index'))
+        response = self.app.get(route_path('home'))
         tip = backend.repo.get_commit().raw_id
 
         # html in javascript variable:
@@ -69,17 +76,16 @@ class TestHomeController(TestController):
 
     def test_index_with_anonymous_access_disabled(self):
         with fixture.anon_access(False):
-            response = self.app.get(url(controller='home', action='index'),
-                                    status=302)
+            response = self.app.get(route_path('home'), status=302)
             assert 'login' in response.location
 
     def test_index_page_on_groups(self, autologin_user, repo_group):
-        response = self.app.get(url('repo_group_home', group_name='gr1'))
+        response = self.app.get(route_path('repo_group_home', repo_group_name='gr1'))
         response.mustcontain("gr1/repo_in_group")
 
     def test_index_page_on_group_with_trailing_slash(
             self, autologin_user, repo_group):
-        response = self.app.get(url('repo_group_home', group_name='gr1') + '/')
+        response = self.app.get(route_path('repo_group_home', repo_group_name='gr1') + '/')
         response.mustcontain("gr1/repo_in_group")
 
     @pytest.fixture(scope='class')
@@ -93,15 +99,17 @@ class TestHomeController(TestController):
             RepoGroupModel().delete(repo_group='gr1', force_delete=True)
             Session().commit()
 
-    def test_index_with_name_with_tags(self, autologin_user):
-        user = User.get_by_username('test_admin')
+    def test_index_with_name_with_tags(self, user_util, autologin_user):
+        user = user_util.create_user()
+        username = user.username
         user.name = '<img src="/image1" onload="alert(\'Hello, World!\');">'
         user.lastname = (
             '<img src="/image2" onload="alert(\'Hello, World!\');">')
         Session().add(user)
         Session().commit()
+        user_util.create_repo(owner=username)
 
-        response = self.app.get(url(controller='home', action='index'))
+        response = self.app.get(route_path('home'))
         response.mustcontain(
             '&lt;img src=&#34;/image1&#34; onload=&#34;'
             'alert(&#39;Hello, World!&#39;);&#34;&gt;')
@@ -122,7 +130,7 @@ class TestHomeController(TestController):
         Session().commit()
         SettingsModel().invalidate_settings_cache()
 
-        response = self.app.get(url(controller='home', action='index'))
+        response = self.app.get(route_path('home'))
         if state is True:
             response.mustcontain(version_string)
         if state is False:
diff --git a/rhodecode/apps/home/views.py b/rhodecode/apps/home/views.py
index 6c02e0de..ea8dab63 100644
--- a/rhodecode/apps/home/views.py
+++ b/rhodecode/apps/home/views.py
@@ -25,12 +25,15 @@ from pyramid.view import view_config
 
 from rhodecode.apps._base import BaseAppView
 from rhodecode.lib import helpers as h
-from rhodecode.lib.auth import LoginRequired, NotAnonymous
+from rhodecode.lib.auth import LoginRequired, NotAnonymous, \
+    HasRepoGroupPermissionAnyDecorator
 from rhodecode.lib.index import searcher_from_config
 from rhodecode.lib.utils2 import safe_unicode, str2bool
+from rhodecode.lib.ext_json import json
 from rhodecode.model.db import func, Repository, RepoGroup
 from rhodecode.model.repo import RepoModel
-from rhodecode.model.scm import ScmModel
+from rhodecode.model.repo_group import RepoGroupModel
+from rhodecode.model.scm import ScmModel, RepoGroupList, RepoList
 from rhodecode.model.user import UserModel
 from rhodecode.model.user_group import UserGroupModel
 
@@ -143,7 +146,7 @@ class HomeView(BaseAppView):
                 'text': obj.group_name,
                 'type': 'group',
                 'obj': {},
-                'url': h.url('repo_group_home', group_name=obj.group_name)
+                'url': h.route_path('repo_group_home', repo_group_name=obj.group_name)
             }
             for obj in repo_groups_iter]
 
@@ -246,3 +249,56 @@ class HomeView(BaseAppView):
             'results': res
         }
         return data
+
+    def _get_groups_and_repos(self, repo_group_id=None):
+        # repo groups groups
+        repo_group_list = RepoGroup.get_all_repo_groups(group_id=repo_group_id)
+        _perms = ['group.read', 'group.write', 'group.admin']
+        repo_group_list_acl = RepoGroupList(repo_group_list, perm_set=_perms)
+        repo_group_data = RepoGroupModel().get_repo_groups_as_dict(
+            repo_group_list=repo_group_list_acl, admin=False)
+
+        # repositories
+        repo_list = Repository.get_all_repos(group_id=repo_group_id)
+        _perms = ['repository.read', 'repository.write', 'repository.admin']
+        repo_list_acl = RepoList(repo_list, perm_set=_perms)
+        repo_data = RepoModel().get_repos_as_dict(
+            repo_list=repo_list_acl, admin=False)
+
+        return repo_data, repo_group_data
+
+    @LoginRequired()
+    @view_config(
+        route_name='home', request_method='GET',
+        renderer='rhodecode:templates/index.mako')
+    def main_page(self):
+        c = self.load_default_context()
+        c.repo_group = None
+
+        repo_data, repo_group_data = self._get_groups_and_repos()
+        # json used to render the grids
+        c.repos_data = json.dumps(repo_data)
+        c.repo_groups_data = json.dumps(repo_group_data)
+
+        return self._get_template_context(c)
+
+    @LoginRequired()
+    @HasRepoGroupPermissionAnyDecorator(
+        'group.read', 'group.write', 'group.admin')
+    @view_config(
+        route_name='repo_group_home', request_method='GET',
+        renderer='rhodecode:templates/index_repo_group.mako')
+    @view_config(
+        route_name='repo_group_home_slash', request_method='GET',
+        renderer='rhodecode:templates/index_repo_group.mako')
+    def repo_group_main_page(self):
+        c = self.load_default_context()
+        c.repo_group = self.request.db_repo_group
+        repo_data, repo_group_data = self._get_groups_and_repos(
+            c.repo_group.group_id)
+
+        # json used to render the grids
+        c.repos_data = json.dumps(repo_data)
+        c.repo_groups_data = json.dumps(repo_group_data)
+
+        return self._get_template_context(c)
diff --git a/rhodecode/apps/login/views.py b/rhodecode/apps/login/views.py
index 64bc91a9..80429aac 100644
--- a/rhodecode/apps/login/views.py
+++ b/rhodecode/apps/login/views.py
@@ -25,7 +25,6 @@ import formencode
 import logging
 import urlparse
 
-from pylons import url
 from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config
 from recaptcha.client.captcha import submit
@@ -91,20 +90,21 @@ def get_came_from(request):
     came_from = safe_str(request.GET.get('came_from', ''))
     parsed = urlparse.urlparse(came_from)
     allowed_schemes = ['http', 'https']
+    default_came_from = h.route_path('home')
     if parsed.scheme and parsed.scheme not in allowed_schemes:
         log.error('Suspicious URL scheme detected %s for url %s' %
                   (parsed.scheme, parsed))
-        came_from = url('home')
+        came_from = default_came_from
     elif parsed.netloc and request.host != parsed.netloc:
         log.error('Suspicious NETLOC detected %s for url %s server url '
                   'is: %s' % (parsed.netloc, parsed, request.host))
-        came_from = url('home')
+        came_from = default_came_from
     elif any(bad_str in parsed.path for bad_str in ('\r', '\n')):
         log.error('Header injection detected `%s` for url %s server url ' %
                   (parsed.path, parsed))
-        came_from = url('home')
+        came_from = default_came_from
 
-    return came_from or url('home')
+    return came_from or default_came_from
 
 
 class LoginView(BaseAppView):
@@ -215,7 +215,7 @@ class LoginView(BaseAppView):
             action='user.logout', action_data=action_data,
             user=auth_user, commit=True)
         self.session.delete()
-        return HTTPFound(url('home'))
+        return HTTPFound(h.route_path('home'))
 
     @HasPermissionAnyDecorator(
         'hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')
diff --git a/rhodecode/apps/my_account/tests/test_my_account_password.py b/rhodecode/apps/my_account/tests/test_my_account_password.py
index 8c59e707..16ebbda4 100644
--- a/rhodecode/apps/my_account/tests/test_my_account_password.py
+++ b/rhodecode/apps/my_account/tests/test_my_account_password.py
@@ -132,6 +132,7 @@ class TestMyAccountPassword(TestController):
         self.app.post(route_path('my_account_password'), form_data)
 
         response = self.app.get(route_path('home'))
-        new_password_hash = response.session['rhodecode_user']['password']
+        session = response.get_session_from_response()
+        new_password_hash = session['rhodecode_user']['password']
 
         assert old_password_hash != new_password_hash
\ No newline at end of file
diff --git a/rhodecode/apps/repo_group/__init__.py b/rhodecode/apps/repo_group/__init__.py
new file mode 100644
index 00000000..fe0f0472
--- /dev/null
+++ b/rhodecode/apps/repo_group/__init__.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017 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/
+from rhodecode.apps._base import add_route_with_slash
+
+
+def includeme(config):
+
+    # Summary
+    add_route_with_slash(
+        config,
+        name='repo_group_home',
+        pattern='/{repo_group_name:.*?[^/]}', repo_group_route=True)
+
+    # Scan module for configuration decorators.
+    config.scan()
+
diff --git a/rhodecode/apps/repository/__init__.py b/rhodecode/apps/repository/__init__.py
index 8d1c116f..57eac222 100644
--- a/rhodecode/apps/repository/__init__.py
+++ b/rhodecode/apps/repository/__init__.py
@@ -22,6 +22,10 @@
 def includeme(config):
 
     # Summary
+    config.add_route(
+        name='repo_summary',
+        pattern='/{repo_name:.*?[^/]}', repo_route=True)
+
     config.add_route(
         name='repo_summary_explicit',
         pattern='/{repo_name:.*?[^/]}/summary', repo_route=True)
diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py
index 70678710..fd8bf257 100644
--- a/rhodecode/config/middleware.py
+++ b/rhodecode/config/middleware.py
@@ -292,6 +292,7 @@ def includeme(config):
     config.include('rhodecode.apps.login')
     config.include('rhodecode.apps.home')
     config.include('rhodecode.apps.repository')
+    config.include('rhodecode.apps.repo_group')
     config.include('rhodecode.apps.search')
     config.include('rhodecode.apps.user_profile')
     config.include('rhodecode.apps.my_account')
diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py
index bcacb1d4..341b0db5 100644
--- a/rhodecode/config/routing.py
+++ b/rhodecode/config/routing.py
@@ -184,9 +184,6 @@ def make_map(config):
     # CUSTOM ROUTES HERE
     #==========================================================================
 
-    # MAIN PAGE
-    rmap.connect('home', '/', controller='home', action='index')
-
     # ping and pylons error test
     rmap.connect('ping', '%s/ping' % (ADMIN_PREFIX,), controller='home', action='ping')
     rmap.connect('error_test', '%s/error_test' % (ADMIN_PREFIX,), controller='home', action='error_test')
@@ -1002,13 +999,6 @@ def make_map(config):
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
-    # must be here for proper group/repo catching pattern
-    _connect_with_slash(
-        rmap, 'repo_group_home', '/{group_name}',
-        controller='home', action='index_repo_group',
-        conditions={'function': check_group},
-        requirements=URL_NAME_REQUIREMENTS)
-
     # catch all, at the end
     _connect_with_slash(
         rmap, 'summary_home', '/{repo_name}', jsroute=True,
diff --git a/rhodecode/controllers/admin/repo_groups.py b/rhodecode/controllers/admin/repo_groups.py
index 69352ca6..ba0a40c7 100644
--- a/rhodecode/controllers/admin/repo_groups.py
+++ b/rhodecode/controllers/admin/repo_groups.py
@@ -193,10 +193,10 @@ class RepoGroupsController(BaseController):
             _new_group_name = form_result['group_name_full']
             repo_group_url = h.link_to(
                 _new_group_name,
-                h.url('repo_group_home', group_name=_new_group_name))
+                h.route_path('repo_group_home', repo_group_name=_new_group_name))
             h.flash(h.literal(_('Created repository group %s')
                     % repo_group_url), category='success')
-            # TODO: in futureaction_logger(, '', '', '', self.sa)
+            # TODO: in future action_logger(, '', '', '', self.sa)
         except formencode.Invalid as errors:
             return htmlfill.render(
                 render('admin/repo_groups/repo_group_add.mako'),
@@ -234,7 +234,6 @@ class RepoGroupsController(BaseController):
         #    <input type="hidden" name="_method" value="PUT" />
         # Or using helpers:
         #    h.form(url('repos_group', group_name=GROUP_NAME), method='put')
-        # url('repo_group_home', group_name=GROUP_NAME)
 
         c.repo_group = RepoGroupModel()._get_repo_group(group_name)
         can_create_in_root = self._can_create_repo_group()
@@ -284,7 +283,6 @@ class RepoGroupsController(BaseController):
         #    <input type="hidden" name="_method" value="DELETE" />
         # Or using helpers:
         #    h.form(url('repos_group', group_name=GROUP_NAME), method='delete')
-        # url('repo_group_home', group_name=GROUP_NAME)
 
         gr = c.repo_group = RepoGroupModel()._get_repo_group(group_name)
         repos = gr.repositories.all()
diff --git a/rhodecode/controllers/admin/repos.py b/rhodecode/controllers/admin/repos.py
index 22f265b3..0ed88c8c 100644
--- a/rhodecode/controllers/admin/repos.py
+++ b/rhodecode/controllers/admin/repos.py
@@ -185,7 +185,7 @@ class ReposController(BaseRepoController):
         except Exception as e:
             msg = self._log_creation_exception(e, form_result.get('repo_name'))
             h.flash(msg, category='error')
-            return redirect(url('home'))
+            return redirect(h.route_path('home'))
 
         return redirect(h.url('repo_creating_home',
                               repo_name=form_result['repo_name_full'],
@@ -265,7 +265,7 @@ class ReposController(BaseRepoController):
                 if task.failed():
                     msg = self._log_creation_exception(task.result, c.repo)
                     h.flash(msg, category='error')
-                    return redirect(url('home'), code=501)
+                    return redirect(h.route_path('home'), code=501)
 
         repo = Repository.get_by_repo_name(repo_name)
         if repo and repo.repo_state == Repository.STATE_CREATED:
diff --git a/rhodecode/controllers/forks.py b/rhodecode/controllers/forks.py
index 42118969..4cfc60ad 100644
--- a/rhodecode/controllers/forks.py
+++ b/rhodecode/controllers/forks.py
@@ -139,7 +139,7 @@ class ForksController(BaseRepoController):
         c.repo_info = Repository.get_by_repo_name(repo_name)
         if not c.repo_info:
             h.not_mapped_error(repo_name)
-            return redirect(url('home'))
+            return redirect(h.route_path('home'))
 
         defaults = self.__load_data(repo_name)
 
diff --git a/rhodecode/controllers/home.py b/rhodecode/controllers/home.py
index fb8198e7..22db964d 100644
--- a/rhodecode/controllers/home.py
+++ b/rhodecode/controllers/home.py
@@ -65,46 +65,3 @@ class HomeController(BaseController):
         msg = ('RhodeCode Enterprise %s test exception. Generation time: %s'
                % (c.rhodecode_name, time.time()))
         raise TestException(msg)
-
-    def _get_groups_and_repos(self, repo_group_id=None):
-        # repo groups groups
-        repo_group_list = RepoGroup.get_all_repo_groups(group_id=repo_group_id)
-        _perms = ['group.read', 'group.write', 'group.admin']
-        repo_group_list_acl = RepoGroupList(repo_group_list, perm_set=_perms)
-        repo_group_data = RepoGroupModel().get_repo_groups_as_dict(
-            repo_group_list=repo_group_list_acl, admin=False)
-
-        # repositories
-        repo_list = Repository.get_all_repos(group_id=repo_group_id)
-        _perms = ['repository.read', 'repository.write', 'repository.admin']
-        repo_list_acl = RepoList(repo_list, perm_set=_perms)
-        repo_data = RepoModel().get_repos_as_dict(
-            repo_list=repo_list_acl, admin=False)
-
-        return repo_data, repo_group_data
-
-    @LoginRequired()
-    def index(self):
-        c.repo_group = None
-
-        repo_data, repo_group_data = self._get_groups_and_repos()
-        # json used to render the grids
-        c.repos_data = json.dumps(repo_data)
-        c.repo_groups_data = json.dumps(repo_group_data)
-
-        return render('/index.mako')
-
-    @LoginRequired()
-    @HasRepoGroupPermissionAnyDecorator('group.read', 'group.write',
-                                        'group.admin')
-    def index_repo_group(self, group_name):
-        """GET /repo_group_name: Show a specific item"""
-        c.repo_group = RepoGroupModel()._get_repo_group(group_name)
-        repo_data, repo_group_data = self._get_groups_and_repos(
-            c.repo_group.group_id)
-
-        # json used to render the grids
-        c.repos_data = json.dumps(repo_data)
-        c.repo_groups_data = json.dumps(repo_group_data)
-
-        return render('index_repo_group.mako')
diff --git a/rhodecode/events/base.py b/rhodecode/events/base.py
index 2103b66b..50e366b9 100644
--- a/rhodecode/events/base.py
+++ b/rhodecode/events/base.py
@@ -82,7 +82,7 @@ class RhodecodeEvent(object):
         if self.request:
             from rhodecode.lib import helpers as h
             try:
-                return h.url('home', qualified=True)
+                return h.route_url('home')
             except Exception:
                 log.exception('Failed to fetch URL for server')
                 return default
diff --git a/rhodecode/lib/auth.py b/rhodecode/lib/auth.py
index ba6320bb..53d7fe50 100644
--- a/rhodecode/lib/auth.py
+++ b/rhodecode/lib/auth.py
@@ -1377,7 +1377,7 @@ class PermsDecorator(object):
             if anonymous:
                 came_from = self._get_came_from()
                 h.flash(_('You need to be signed in to view this page'),
-                               category='warning')
+                        category='warning')
                 raise HTTPFound(
                     h.route_path('login', _query={'came_from': came_from}))
 
@@ -1429,10 +1429,16 @@ class HasRepoPermissionAllDecorator(PermsDecorator):
     def check_permissions(self, user):
         perms = user.permissions
         repo_name = self._get_repo_name()
+
         try:
             user_perms = set([perms['repositories'][repo_name]])
         except KeyError:
+            log.debug('cannot locate repo with name: `%s` in permissions defs',
+                      repo_name)
             return False
+
+        log.debug('checking `%s` permissions for repo `%s`',
+                  user_perms, repo_name)
         if self.required_perms.issubset(user_perms):
             return True
         return False
@@ -1450,11 +1456,16 @@ class HasRepoPermissionAnyDecorator(PermsDecorator):
     def check_permissions(self, user):
         perms = user.permissions
         repo_name = self._get_repo_name()
+
         try:
             user_perms = set([perms['repositories'][repo_name]])
         except KeyError:
+            log.debug('cannot locate repo with name: `%s` in permissions defs',
+                      repo_name)
             return False
 
+        log.debug('checking `%s` permissions for repo `%s`',
+                  user_perms, repo_name)
         if self.required_perms.intersection(user_perms):
             return True
         return False
@@ -1476,8 +1487,12 @@ class HasRepoGroupPermissionAllDecorator(PermsDecorator):
         try:
             user_perms = set([perms['repositories_groups'][group_name]])
         except KeyError:
+            log.debug('cannot locate repo group with name: `%s` in permissions defs',
+                      group_name)
             return False
 
+        log.debug('checking `%s` permissions for repo group `%s`',
+                  user_perms, group_name)
         if self.required_perms.issubset(user_perms):
             return True
         return False
@@ -1496,11 +1511,16 @@ class HasRepoGroupPermissionAnyDecorator(PermsDecorator):
     def check_permissions(self, user):
         perms = user.permissions
         group_name = self._get_repo_group_name()
+
         try:
             user_perms = set([perms['repositories_groups'][group_name]])
         except KeyError:
+            log.debug('cannot locate repo group with name: `%s` in permissions defs',
+                      group_name)
             return False
 
+        log.debug('checking `%s` permissions for repo group `%s`',
+                  user_perms, group_name)
         if self.required_perms.intersection(user_perms):
             return True
         return False
diff --git a/rhodecode/lib/base.py b/rhodecode/lib/base.py
index 2eb86c77..463c1d8f 100644
--- a/rhodecode/lib/base.py
+++ b/rhodecode/lib/base.py
@@ -555,7 +555,7 @@ class BaseRepoController(BaseController):
                     "The repository at %(repo_name)s cannot be located.") %
                     {'repo_name': c.repo_name},
                     category='error', ignore_duplicate=True)
-                redirect(url('home'))
+                redirect(h.route_path('home'))
 
             # update last change according to VCS data
             if not missing_requirements:
diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py
index a5cd2294..4918ebe0 100644
--- a/rhodecode/lib/helpers.py
+++ b/rhodecode/lib/helpers.py
@@ -1534,7 +1534,7 @@ def breadcrumb_repo_link(repo):
     """
 
     path = [
-        link_to(group.name, url('repo_group_home', group_name=group.group_name))
+        link_to(group.name, route_path('repo_group_home', repo_group_name=group.group_name))
         for group in repo.groups_with_parents
     ] + [
         link_to(repo.just_name, url('summary_home', repo_name=repo.repo_name))
@@ -1960,24 +1960,24 @@ def get_last_path_part(file_node):
     return u'../' + path
 
 
-def route_url(*args, **kwds):
+def route_url(*args, **kwargs):
     """
     Wrapper around pyramids `route_url` (fully qualified url) function. 
     It is used to generate URLs from within pylons views or templates. 
     This will be removed when pyramid migration if finished.
     """
     req = get_current_request()
-    return req.route_url(*args, **kwds)
+    return req.route_url(*args, **kwargs)
 
 
-def route_path(*args, **kwds):
+def route_path(*args, **kwargs):
     """
     Wrapper around pyramids `route_path` function. It is used to generate
     URLs from within pylons views or templates. This will be removed when
     pyramid migration if finished.
     """
     req = get_current_request()
-    return req.route_path(*args, **kwds)
+    return req.route_path(*args, **kwargs)
 
 
 def route_path_or_none(*args, **kwargs):
diff --git a/rhodecode/lib/utils.py b/rhodecode/lib/utils.py
index a3f4fe3d..78240733 100644
--- a/rhodecode/lib/utils.py
+++ b/rhodecode/lib/utils.py
@@ -96,10 +96,11 @@ def repo_name_slug(value):
 # PERM DECORATOR HELPERS FOR EXTRACTING NAMES FOR PERM CHECKS
 #==============================================================================
 def get_repo_slug(request):
-    if isinstance(request, Request) and getattr(request, 'matchdict', None):
+    if isinstance(request, Request) and getattr(request, 'db_repo', None):
         # pyramid
-        _repo = request.matchdict.get('repo_name')
+        _repo = request.db_repo.repo_name
     else:
+        # TODO(marcink): remove after pylons migration...
         _repo = request.environ['pylons.routes_dict'].get('repo_name')
 
     if _repo:
@@ -110,7 +111,7 @@ def get_repo_slug(request):
 def get_repo_group_slug(request):
     if isinstance(request, Request) and getattr(request, 'matchdict', None):
         # pyramid
-        _group = request.matchdict.get('group_name')
+        _group = request.matchdict.get('repo_group_name')
     else:
         _group = request.environ['pylons.routes_dict'].get('group_name')
 
diff --git a/rhodecode/lib/utils2.py b/rhodecode/lib/utils2.py
index b23117e5..dfc7d75c 100644
--- a/rhodecode/lib/utils2.py
+++ b/rhodecode/lib/utils2.py
@@ -572,7 +572,8 @@ def credentials_filter(uri):
     return ''.join(uri)
 
 
-def get_clone_url(uri_tmpl, qualifed_home_url, repo_name, repo_id, **override):
+def get_clone_url(request, uri_tmpl, repo_name, repo_id, **override):
+    qualifed_home_url = request.route_url('home')
     parsed_url = urlobject.URLObject(qualifed_home_url)
     decoded_path = safe_unicode(urllib.unquote(parsed_url.path.rstrip('/')))
     args = {
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index efd1b09b..b3e6df51 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -44,8 +44,8 @@ from sqlalchemy.sql.expression import true
 from beaker.cache import cache_region
 from zope.cachedescriptors.property import Lazy as LazyProperty
 
-from pylons import url
 from pylons.i18n.translation import lazy_ugettext as _
+from pyramid.threadlocal import get_current_request
 
 from rhodecode.lib.vcs import get_vcs_instance
 from rhodecode.lib.vcs.backends.base import EmptyCommit, Reference
@@ -1774,7 +1774,7 @@ class Repository(Base, BaseModel):
             'repo_name': repo.repo_name,
             'repo_type': repo.repo_type,
             'clone_uri': repo.clone_uri or '',
-            'url': url('summary_home', repo_name=self.repo_name, qualified=True),
+            'url': repo.home_url(),
             'private': repo.private,
             'created_on': repo.created_on,
             'description': repo.description,
@@ -1908,7 +1908,6 @@ class Repository(Base, BaseModel):
         return clone_uri
 
     def clone_url(self, **override):
-        qualified_home_url = url('home', qualified=True)
 
         uri_tmpl = None
         if 'with_id' in override:
@@ -1930,11 +1929,16 @@ class Repository(Base, BaseModel):
                 # ie, not having tmpl_context set up
                 pass
 
-        return get_clone_url(uri_tmpl=uri_tmpl,
-                             qualifed_home_url=qualified_home_url,
+        request = get_current_request()
+        return get_clone_url(request=request,
+                             uri_tmpl=uri_tmpl,
                              repo_name=self.repo_name,
                              repo_id=self.repo_id, **override)
 
+    def home_url(self):
+        request = get_current_request()
+        return request.route_url('repo_summary', repo_name=self.repo_name)
+
     def set_state(self, state):
         self.repo_state = state
         Session().add(self)
@@ -3299,6 +3303,7 @@ class _PullRequestBase(BaseModel):
             return None
 
     def get_api_data(self):
+        from pylons import url
         from rhodecode.model.pull_request import PullRequestModel
         pull_request = self
         merge_status = PullRequestModel().merge_status(pull_request)
@@ -3690,6 +3695,8 @@ class Gist(Base, BaseModel):
 
     def gist_url(self):
         import rhodecode
+        from pylons import url
+
         alias_url = rhodecode.CONFIG.get('gist_alias_url')
         if alias_url:
             return alias_url.replace('{gistid}', self.gist_access_id)
diff --git a/rhodecode/model/notification.py b/rhodecode/model/notification.py
index 0872f59f..1af1b203 100644
--- a/rhodecode/model/notification.py
+++ b/rhodecode/model/notification.py
@@ -334,9 +334,9 @@ class EmailNotificationModel(BaseModel):
         """
 
         kwargs['rhodecode_instance_name'] = self.rhodecode_instance_name
-
+        instance_url = h.route_url('home')
         _kwargs = {
-            'instance_url': h.url('home', qualified=True),
+            'instance_url': instance_url,
             'whitespace_filter': self.whitespace_filter
         }
         _kwargs.update(kwargs)
diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py
index 507cc2d2..f08cbe6f 100644
--- a/rhodecode/model/repo.py
+++ b/rhodecode/model/repo.py
@@ -131,6 +131,7 @@ class RepoModel(BaseModel):
         :param repo_name:
         :return: repo object if matched else None
         """
+
         try:
             _repo_id = self._extract_id_from_repo_name(repo_name)
             if _repo_id:
diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js
index 81402391..ba7d6c96 100644
--- a/rhodecode/public/js/rhodecode/routes.js
+++ b/rhodecode/public/js/rhodecode/routes.js
@@ -99,6 +99,7 @@ function registerRCRoutes() {
     pyroutes.register('user_group_autocomplete_data', '/_user_groups', []);
     pyroutes.register('repo_list_data', '/_repos', []);
     pyroutes.register('goto_switcher_data', '/_goto_data', []);
+    pyroutes.register('repo_summary', '/%(repo_name)s', ['repo_name']);
     pyroutes.register('repo_summary_explicit', '/%(repo_name)s/summary', ['repo_name']);
     pyroutes.register('tags_home', '/%(repo_name)s/tags', ['repo_name']);
     pyroutes.register('branches_home', '/%(repo_name)s/branches', ['repo_name']);
@@ -121,6 +122,8 @@ function registerRCRoutes() {
     pyroutes.register('strip', '/%(repo_name)s/settings/strip', ['repo_name']);
     pyroutes.register('strip_check', '/%(repo_name)s/settings/strip_check', ['repo_name']);
     pyroutes.register('strip_execute', '/%(repo_name)s/settings/strip_execute', ['repo_name']);
+    pyroutes.register('repo_group_home', '/%(repo_group_name)s', ['repo_group_name']);
+    pyroutes.register('repo_group_home_slash', '/%(repo_group_name)s/', ['repo_group_name']);
     pyroutes.register('search', '/_admin/search', []);
     pyroutes.register('search_repo', '/%(repo_name)s/search', ['repo_name']);
     pyroutes.register('user_profile', '/_profiles/%(username)s', ['username']);
diff --git a/rhodecode/templates/admin/integrations/list.mako b/rhodecode/templates/admin/integrations/list.mako
index 8a9bb1cd..d418c0fb 100644
--- a/rhodecode/templates/admin/integrations/list.mako
+++ b/rhodecode/templates/admin/integrations/list.mako
@@ -164,7 +164,7 @@
               ${_('repo')}:${integration.repo.repo_name}
             </a>
             %elif integration.repo_group:
-            <a href="${h.url('repo_group_home', group_name=integration.repo_group.group_name)}">
+            <a href="${h.route_path('repo_group_home', repo_group_name=integration.repo_group.group_name)}">
               ${_('repogroup')}:${integration.repo_group.group_name}
               %if integration.child_repos_only:
               ${_('child repos only')}
diff --git a/rhodecode/templates/admin/repo_groups/repo_group_edit.mako b/rhodecode/templates/admin/repo_groups/repo_group_edit.mako
index 26ef6803..0b6f3730 100644
--- a/rhodecode/templates/admin/repo_groups/repo_group_edit.mako
+++ b/rhodecode/templates/admin/repo_groups/repo_group_edit.mako
@@ -13,7 +13,7 @@
     &raquo;
     ${h.link_to(_('Repository Groups'),h.url('repo_groups'))}
     %if c.repo_group.parent_group:
-        &raquo; ${h.link_to(c.repo_group.parent_group.name,h.url('repo_group_home',group_name=c.repo_group.parent_group.group_name))}
+        &raquo; ${h.link_to(c.repo_group.parent_group.name, h.route_path('repo_group_home', repo_group_name=c.repo_group.parent_group.group_name))}
     %endif
     &raquo; ${c.repo_group.name}
 </%def>
diff --git a/rhodecode/templates/admin/repos/repo_creating.mako b/rhodecode/templates/admin/repos/repo_creating.mako
index af934681..3a0cd96d 100644
--- a/rhodecode/templates/admin/repos/repo_creating.mako
+++ b/rhodecode/templates/admin/repos/repo_creating.mako
@@ -61,7 +61,7 @@
             }
         }
         else {
-            window.location = "${h.url('home')}";
+            window.location = "${h.route_path('home')}";
         }
     }
   });
diff --git a/rhodecode/templates/admin/users/user_edit_advanced.mako b/rhodecode/templates/admin/users/user_edit_advanced.mako
index 31b27be1..880af28e 100644
--- a/rhodecode/templates/admin/users/user_edit_advanced.mako
+++ b/rhodecode/templates/admin/users/user_edit_advanced.mako
@@ -59,7 +59,7 @@
         ${h.secure_form(h.url('create_personal_repo_group', user_id=c.user.user_id), method='post')}
 
         %if c.personal_repo_group:
-            <div class="panel-body-title-text">${_('Users personal repository group')} : ${h.link_to(c.personal_repo_group.group_name, url('repo_group_home', group_name=c.personal_repo_group.group_name))}</div>
+            <div class="panel-body-title-text">${_('Users personal repository group')} : ${h.link_to(c.personal_repo_group.group_name, h.route_path('repo_group_home', repo_group_name=c.personal_repo_group.group_name))}</div>
         %else:
             <div class="panel-body-title-text">
                 ${_('This user currently does not have a personal repository group')}
diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako
index e133b722..97c3f3d0 100644
--- a/rhodecode/templates/base/base.mako
+++ b/rhodecode/templates/base/base.mako
@@ -7,7 +7,7 @@
       <div id="header-inner" class="wrapper">
           <div id="logo">
               <div class="logo-wrapper">
-                  <a href="${h.url('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
+                  <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
               </div>
               %if c.rhodecode_name:
                <div class="branding">- ${h.branding(c.rhodecode_name)}</div>
@@ -343,7 +343,7 @@
             <ol class="links">
               <li>${h.link_to(_(u'My account'),h.route_path('my_account_profile'))}</li>
               % if c.rhodecode_user.personal_repo_group:
-                <li>${h.link_to(_(u'My personal group'), h.url('repo_group_home', group_name=c.rhodecode_user.personal_repo_group.group_name))}</li>
+                <li>${h.link_to(_(u'My personal group'), h.route_path('repo_group_home', repo_group_name=c.rhodecode_user.personal_repo_group.group_name))}</li>
               % endif
               <li class="logout">
               ${h.secure_form(h.route_path('logout'))}
diff --git a/rhodecode/templates/base/perms_summary.mako b/rhodecode/templates/base/perms_summary.mako
index af6773b5..773dfee5 100644
--- a/rhodecode/templates/base/perms_summary.mako
+++ b/rhodecode/templates/base/perms_summary.mako
@@ -126,7 +126,7 @@
                         %if section == 'repositories':
                             <a href="${h.url('summary_home',repo_name=k)}">${k}</a>
                         %elif section == 'repositories_groups':
-                            <a href="${h.url('repo_group_home',group_name=k)}">${k}</a>
+                            <a href="${h.route_path('repo_group_home', repo_group_name=k)}">${k}</a>
                         %elif section == 'user_groups':
                             ##<a href="${h.url('edit_users_group',user_group_id=k)}">${k}</a>
                             ${k}
diff --git a/rhodecode/templates/base/root.mako b/rhodecode/templates/base/root.mako
index 56b1f426..8f5e4236 100644
--- a/rhodecode/templates/base/root.mako
+++ b/rhodecode/templates/base/root.mako
@@ -84,7 +84,7 @@ c.template_context['default_user'] = {
             // register templateContext to pass template variables to JS
             var templateContext = ${h.json.dumps(c.template_context)|n};
 
-            var APPLICATION_URL = "${h.url('home').rstrip('/')}";
+            var APPLICATION_URL = "${h.route_path('home').rstrip('/')}";
             var ASSET_URL = "${h.asset('')}";
             var DEFAULT_RENDERER = "${h.get_visual_attr(c, 'default_renderer')}";
             var CSRF_TOKEN = "${getattr(c, 'csrf_token', '')}";
diff --git a/rhodecode/templates/data_table/_dt_elements.mako b/rhodecode/templates/data_table/_dt_elements.mako
index ac2de551..f5e78613 100644
--- a/rhodecode/templates/data_table/_dt_elements.mako
+++ b/rhodecode/templates/data_table/_dt_elements.mako
@@ -146,7 +146,7 @@
   <div class="menu_items_container hidden">
     <ul class="menu_items">
       <li>
-         <a href="${h.url('repo_group_home',group_name=repo_group_name)}">
+         <a href="${h.route_path('repo_group_home', repo_group_name=repo_group_name)}">
          <span class="icon">
              <i class="icon-file-text"></i>
          </span>
@@ -160,7 +160,7 @@
 
 <%def name="repo_group_name(repo_group_name, children_groups=None)">
   <div>
-    <a href="${h.url('repo_group_home',group_name=repo_group_name)}">
+    <a href="${h.route_path('repo_group_home', repo_group_name=repo_group_name)}">
     <i class="icon-folder-close" title="${_('Repository group')}"></i>
       %if children_groups:
           ${h.literal(' &raquo; '.join(children_groups))}
diff --git a/rhodecode/templates/index_repo_group.mako b/rhodecode/templates/index_repo_group.mako
index 2606c1d7..f8bf7ca9 100644
--- a/rhodecode/templates/index_repo_group.mako
+++ b/rhodecode/templates/index_repo_group.mako
@@ -10,9 +10,9 @@
 
 <%def name="breadcrumbs()">
     <span class="groups_breadcrumbs">
-    ${h.link_to(_(u'Home'),h.url('/'))}
+    ${h.link_to(_(u'Home'), h.route_path('home'))}
     %if c.repo_group.parent_group:
-        &raquo; ${h.link_to(c.repo_group.parent_group.name,h.url('repo_group_home',group_name=c.repo_group.parent_group.group_name))}
+        &raquo; ${h.link_to(c.repo_group.parent_group.name, h.route_path('repo_group_home', repo_group_name=c.repo_group.parent_group.group_name))}
     %endif
     &raquo; ${c.repo_group.name}
     </span>
diff --git a/rhodecode/templates/login.mako b/rhodecode/templates/login.mako
index 077a9eb2..6be8893c 100644
--- a/rhodecode/templates/login.mako
+++ b/rhodecode/templates/login.mako
@@ -14,7 +14,7 @@
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">
-                    <a href="${h.url('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
+                    <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
                 </div>
                 %if c.rhodecode_name:
                 <div class="branding"> ${h.branding(c.rhodecode_name)}</div>
diff --git a/rhodecode/templates/password_reset.mako b/rhodecode/templates/password_reset.mako
index fdca670b..f83aa66d 100644
--- a/rhodecode/templates/password_reset.mako
+++ b/rhodecode/templates/password_reset.mako
@@ -14,7 +14,7 @@
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">
-                    <a href="${h.url('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
+                    <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
                 </div>
                 %if c.rhodecode_name:
                 <div class="branding"> ${h.branding(c.rhodecode_name)}</div>
diff --git a/rhodecode/templates/register.mako b/rhodecode/templates/register.mako
index a248ac01..14f0aaeb 100644
--- a/rhodecode/templates/register.mako
+++ b/rhodecode/templates/register.mako
@@ -14,7 +14,7 @@
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">
-                    <a href="${h.url('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
+                    <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
                 </div>
                 %if c.rhodecode_name:
                 <div class="branding"> ${h.branding(c.rhodecode_name)}</div>
diff --git a/rhodecode/tests/__init__.py b/rhodecode/tests/__init__.py
index f998aee9..19bd5703 100644
--- a/rhodecode/tests/__init__.py
+++ b/rhodecode/tests/__init__.py
@@ -48,7 +48,6 @@ from rhodecode.model.db import User
 from rhodecode.lib import auth
 from rhodecode.lib.helpers import flash, link_to
 from rhodecode.lib.utils2 import safe_unicode, safe_str
-from rhodecode.tests.utils import get_session_from_response
 
 
 log = logging.getLogger(__name__)
@@ -178,7 +177,7 @@ def login_user_session(
     response = response.follow()
     assert response.status == '200 OK'
 
-    session = get_session_from_response(response)
+    session = response.get_session_from_response()
     assert 'rhodecode_user' in session
     rc_user = session['rhodecode_user']
     assert rc_user.get('username') == username
diff --git a/rhodecode/tests/events/test_pullrequest.py b/rhodecode/tests/events/test_pullrequest.py
index 0ec39b77..082765cd 100644
--- a/rhodecode/tests/events/test_pullrequest.py
+++ b/rhodecode/tests/events/test_pullrequest.py
@@ -42,7 +42,7 @@ from rhodecode.events import (
     PullRequestMergeEvent,
     PullRequestCloseEvent,
 ])
-def test_pullrequest_events_serialized(pr_util, EventClass):
+def test_pullrequest_events_serialized(EventClass, pr_util, config_stub):
     pr = pr_util.create_pull_request()
     event = EventClass(pr)
     data = event.as_dict()
@@ -51,15 +51,17 @@ def test_pullrequest_events_serialized(pr_util, EventClass):
     assert data['pullrequest']['pull_request_id'] == pr.pull_request_id
     assert data['pullrequest']['url']
 
+
 @pytest.mark.backends("git", "hg")
-def test_create_pull_request_events(pr_util):
+def test_create_pull_request_events(pr_util, config_stub):
     with EventCatcher() as event_catcher:
         pr_util.create_pull_request()
 
     assert PullRequestCreateEvent in event_catcher.events_types
 
+
 @pytest.mark.backends("git", "hg")
-def test_pullrequest_comment_events_serialized(pr_util):
+def test_pullrequest_comment_events_serialized(pr_util, config_stub):
     pr = pr_util.create_pull_request()
     comment = CommentsModel().get_comments(
         pr.target_repo.repo_id, pull_request=pr)[0]
@@ -73,7 +75,7 @@ def test_pullrequest_comment_events_serialized(pr_util):
 
 
 @pytest.mark.backends("git", "hg")
-def test_close_pull_request_events(pr_util, user_admin):
+def test_close_pull_request_events(pr_util, user_admin, config_stub):
     pr = pr_util.create_pull_request()
 
     with EventCatcher() as event_catcher:
@@ -83,7 +85,7 @@ def test_close_pull_request_events(pr_util, user_admin):
 
 
 @pytest.mark.backends("git", "hg")
-def test_close_pull_request_with_comment_events(pr_util, user_admin):
+def test_close_pull_request_with_comment_events(pr_util, user_admin, config_stub):
     pr = pr_util.create_pull_request()
 
     with EventCatcher() as event_catcher:
diff --git a/rhodecode/tests/events/test_repo.py b/rhodecode/tests/events/test_repo.py
index 337528c5..8b3b83c9 100644
--- a/rhodecode/tests/events/test_repo.py
+++ b/rhodecode/tests/events/test_repo.py
@@ -75,7 +75,6 @@ def test_vcs_repo_events_serialize(repo_stub, scm_extras, EventClass):
     assert data['repo']['url']
 
 
-
 @pytest.mark.parametrize('EventClass', [RepoPushEvent])
 def test_vcs_repo_push_event_serialize(repo_stub, scm_extras, EventClass):
     event = EventClass(repo_name=repo_stub.repo_name,
diff --git a/rhodecode/tests/functional/test_admin_gists.py b/rhodecode/tests/functional/test_admin_gists.py
index 1598e28d..606beeba 100644
--- a/rhodecode/tests/functional/test_admin_gists.py
+++ b/rhodecode/tests/functional/test_admin_gists.py
@@ -28,7 +28,6 @@ from rhodecode.model.meta import Session
 from rhodecode.tests import (
     TEST_USER_ADMIN_LOGIN, TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS,
     TestController, assert_session_flash, url)
-from rhodecode.tests.utils import AssertResponse
 
 
 class GistUtility(object):
@@ -273,7 +272,7 @@ class TestGistsController(TestController):
 
         response.mustcontain('added file: gist-show-me<')
 
-        assert_response = AssertResponse(response)
+        assert_response = response.assert_response()
         assert_response.element_equals_to(
             'div.rc-user span.user',
             '<a href="/_profiles/test_admin">test_admin</a></span>')
@@ -296,7 +295,7 @@ class TestGistsController(TestController):
         response = self.app.get(url('gist', gist_id=gist.gist_access_id))
         response.mustcontain('added file: gist-show-me-only-when-im-logged-in')
 
-        assert_response = AssertResponse(response)
+        assert_response = response.assert_response()
         assert_response.element_equals_to(
             'div.rc-user span.user',
             '<a href="/_profiles/test_admin">test_admin</a></span>')
diff --git a/rhodecode/tests/functional/test_admin_my_account.py b/rhodecode/tests/functional/test_admin_my_account.py
index be7b28fa..9686b2fa 100644
--- a/rhodecode/tests/functional/test_admin_my_account.py
+++ b/rhodecode/tests/functional/test_admin_my_account.py
@@ -31,6 +31,12 @@ from rhodecode.tests.utils import AssertResponse
 fixture = Fixture()
 
 
+def route_path(name, **kwargs):
+    return {
+        'home': '/',
+    }[name].format(**kwargs)
+
+
 class TestMyAccountController(TestController):
     test_user_1 = 'testme'
     test_user_1_password = '0jd83nHNS/d23n'
@@ -41,7 +47,7 @@ class TestMyAccountController(TestController):
         fixture.destroy_users(cls.destroy_users)
 
     def test_logout_form_contains_csrf(self, autologin_user, csrf_token):
-        response = self.app.get(url('home'))
+        response = self.app.get(route_path('home'))
         assert_response = AssertResponse(response)
         element = assert_response.get_element('.logout #csrf_token')
         assert element.value == csrf_token
diff --git a/rhodecode/tests/functional/test_admin_repo_groups.py b/rhodecode/tests/functional/test_admin_repo_groups.py
index 3bc5c6be..41e574de 100644
--- a/rhodecode/tests/functional/test_admin_repo_groups.py
+++ b/rhodecode/tests/functional/test_admin_repo_groups.py
@@ -31,6 +31,7 @@ from rhodecode.tests.fixture import Fixture
 fixture = Fixture()
 
 
+
 def test_update(app, csrf_token, autologin_user, user_util):
     repo_group = user_util.create_repo_group()
     description = 'description for newly created repo group'
@@ -123,11 +124,13 @@ class _BaseTest(TestController):
         # run the check page that triggers the flash message
         # response = self.app.get(url('repo_check_home', repo_name=repo_name))
         # assert response.json == {u'result': True}
+        repo_gr_url = h.route_path(
+            'repo_group_home', repo_group_name=repo_group_name)
+
         assert_session_flash(
             response,
-            u'Created repository group <a href="%s">%s</a>' % (
-                h.url('repo_group_home', group_name=repo_group_name),
-                repo_group_name_unicode))
+            'Created repository group <a href="%s">%s</a>' % (
+                repo_gr_url, repo_group_name_unicode))
 
         # # test if the repo group was created in the database
         new_repo_group = RepoGroupModel()._get_repo_group(
@@ -138,8 +141,7 @@ class _BaseTest(TestController):
         assert new_repo_group.group_description == description
 
         # test if the repository is visible in the list ?
-        response = self.app.get(
-            url('repo_group_home', group_name=repo_group_name))
+        response = self.app.get(repo_gr_url)
         response.mustcontain(repo_group_name)
 
         # test if the repository group was created on filesystem
@@ -173,7 +175,7 @@ class _BaseTest(TestController):
             assert_session_flash(
                 response,
                 u'Created repository group <a href="%s">%s</a>' % (
-                    h.url('repo_group_home', group_name=expected_group_name),
+                    h.route_path('repo_group_home', repo_group_name=expected_group_name),
                     expected_group_name_unicode))
         finally:
             RepoGroupModel().delete(expected_group_name_unicode)
@@ -199,6 +201,13 @@ class TestRepoGroupsControllerGIT(_BaseTest):
     REPO_TYPE = 'git'
 
 
+class TestRepoGroupsControllerNonAsciiGit(_BaseTest):
+    REPO_GROUP = None
+    NEW_REPO_GROUP = 'git_repo_ąć'
+    REPO = GIT_REPO
+    REPO_TYPE = 'git'
+
+
 class TestRepoGroupsControllerHG(_BaseTest):
     REPO_GROUP = None
     NEW_REPO_GROUP = 'hg_repo'
diff --git a/rhodecode/tests/functional/test_delegated_admin.py b/rhodecode/tests/functional/test_delegated_admin.py
index ea08185e..44a1d5ba 100644
--- a/rhodecode/tests/functional/test_delegated_admin.py
+++ b/rhodecode/tests/functional/test_delegated_admin.py
@@ -30,6 +30,12 @@ from rhodecode.tests.fixture import Fixture
 fixture = Fixture()
 
 
+def route_path(name, **kwargs):
+    return {
+        'home': '/',
+    }[name].format(**kwargs)
+
+
 class TestAdminUsersGroupsController(TestController):
 
     def test_regular_user_cannot_see_admin_interfaces(self, user_util):
@@ -37,7 +43,7 @@ class TestAdminUsersGroupsController(TestController):
         self.log_user(user.username, 'qweqwe')
 
         # check if in home view, such user doesn't see the "admin" menus
-        response = self.app.get(url('home'))
+        response = self.app.get(route_path('home'))
 
         assert_response = response.assert_response()
 
@@ -69,7 +75,7 @@ class TestAdminUsersGroupsController(TestController):
 
         self.log_user(username, 'qweqwe')
         # check if in home view, such user doesn't see the "admin" menus
-        response = self.app.get(url('home'))
+        response = self.app.get(route_path('home'))
 
         assert_response = response.assert_response()
 
@@ -109,7 +115,7 @@ class TestAdminUsersGroupsController(TestController):
 
         self.log_user(username, 'qweqwe')
         # check if in home view, such user doesn't see the "admin" menus
-        response = self.app.get(url('home'))
+        response = self.app.get(route_path('home'))
 
         assert_response = response.assert_response()
 
diff --git a/rhodecode/tests/functional/test_login.py b/rhodecode/tests/functional/test_login.py
index 82ded00d..a3044784 100644
--- a/rhodecode/tests/functional/test_login.py
+++ b/rhodecode/tests/functional/test_login.py
@@ -28,7 +28,6 @@ from rhodecode.tests import (
     assert_session_flash, url, HG_REPO, TEST_USER_ADMIN_LOGIN,
     no_newline_id_generator)
 from rhodecode.tests.fixture import Fixture
-from rhodecode.tests.utils import AssertResponse, get_session_from_response
 from rhodecode.lib.auth import check_password
 from rhodecode.model.auth_token import AuthTokenModel
 from rhodecode.model import validators
@@ -72,7 +71,7 @@ class TestLoginController(object):
                                  {'username': 'test_admin',
                                   'password': 'test12'})
         assert response.status == '302 Found'
-        session = get_session_from_response(response)
+        session = response.get_session_from_response()
         username = session['rhodecode_user'].get('username')
         assert username == 'test_admin'
         response = response.follow()
@@ -84,7 +83,7 @@ class TestLoginController(object):
                                   'password': 'test12'})
 
         assert response.status == '302 Found'
-        session = get_session_from_response(response)
+        session = response.get_session_from_response()
         username = session['rhodecode_user'].get('username')
         assert username == 'test_regular'
         response = response.follow()
@@ -184,7 +183,7 @@ class TestLoginController(object):
                                   'password': 'test123'})
 
         assert response.status == '302 Found'
-        session = get_session_from_response(response)
+        session = response.get_session_from_response()
         username = session['rhodecode_user'].get('username')
         assert username == temp_user
         response = response.follow()
@@ -213,7 +212,7 @@ class TestLoginController(object):
             }
         )
 
-        assertr = AssertResponse(response)
+        assertr = response.assert_response()
         msg = validators.ValidUsername()._messages['username_exists']
         msg = msg % {'username': uname}
         assertr.element_contains('#username+.error-message', msg)
@@ -231,7 +230,7 @@ class TestLoginController(object):
             }
         )
 
-        assertr = AssertResponse(response)
+        assertr = response.assert_response()
         msg = validators.UniqSystemEmail()()._messages['email_taken']
         assertr.element_contains('#email+.error-message', msg)
 
@@ -247,7 +246,7 @@ class TestLoginController(object):
                 'lastname': 'test'
             }
         )
-        assertr = AssertResponse(response)
+        assertr = response.assert_response()
         msg = validators.UniqSystemEmail()()._messages['email_taken']
         assertr.element_contains('#email+.error-message', msg)
 
@@ -301,7 +300,7 @@ class TestLoginController(object):
             }
         )
 
-        assertr = AssertResponse(response)
+        assertr = response.assert_response()
         msg = validators.ValidUsername()._messages['username_exists']
         msg = msg % {'username': usr}
         assertr.element_contains('#username+.error-message', msg)
diff --git a/rhodecode/tests/functional/test_sessions.py b/rhodecode/tests/functional/test_sessions.py
index 8a27b9ba..558bac52 100644
--- a/rhodecode/tests/functional/test_sessions.py
+++ b/rhodecode/tests/functional/test_sessions.py
@@ -21,8 +21,13 @@
 import mock
 import pytest
 
-from rhodecode.tests import TEST_USER_ADMIN_LOGIN, url
-from rhodecode.tests.utils import AssertResponse
+from rhodecode.tests import TEST_USER_ADMIN_LOGIN
+
+
+def route_path(name, **kwargs):
+    return {
+        'home': '/',
+    }[name].format(**kwargs)
 
 
 class TestSessionBehaviorOnPasswordChange(object):
@@ -39,18 +44,23 @@ class TestSessionBehaviorOnPasswordChange(object):
 
     def test_sessions_are_ok_when_password_is_not_changed(
             self, app, autologin_user):
-        response = app.get(url('home'))
-        assert_response = AssertResponse(response)
+        response = app.get(route_path('home'))
+        assert_response = response.assert_response()
         assert_response.element_contains(
             '#quick_login_link .menu_link_user', TEST_USER_ADMIN_LOGIN)
-        assert 'rhodecode_user' in response.session
-        assert response.session.was_invalidated is False
+
+        session = response.get_session_from_response()
+
+        assert 'rhodecode_user' in session
+        assert session.was_invalidated is False
 
     def test_sessions_invalidated_when_password_is_changed(
             self, app, autologin_user):
         self.password_changed_mock.return_value = True
-        response = app.get(url('home'))
-        assert_response = AssertResponse(response)
+        response = app.get(route_path('home'))
+        assert_response = response.assert_response()
         assert_response.element_contains('#quick_login_link .user', 'Sign in')
-        assert 'rhodecode_user' not in response.session
-        assert response.session.was_invalidated is True
+
+        session = response.get_session_from_response()
+        assert 'rhodecode_user' not in session
+        assert session.was_invalidated is True
diff --git a/rhodecode/tests/functional/test_summary.py b/rhodecode/tests/functional/test_summary.py
index 2f736bab..34187bcb 100644
--- a/rhodecode/tests/functional/test_summary.py
+++ b/rhodecode/tests/functional/test_summary.py
@@ -41,7 +41,7 @@ fixture = Fixture()
 
 
 class TestSummaryController(TestController):
-    def test_index(self, backend):
+    def test_index(self, backend, http_host_only_stub):
         self.log_user()
         repo_id = backend.repo.repo_id
         repo_name = backend.repo_name
@@ -61,12 +61,12 @@ class TestSummaryController(TestController):
         # clone url...
         response.mustcontain(
             'id="clone_url" readonly="readonly"'
-            ' value="http://test_admin@test.example.com:80/%s"' % (repo_name, ))
+            ' value="http://test_admin@%s/%s"' % (http_host_only_stub, repo_name, ))
         response.mustcontain(
             'id="clone_url_id" readonly="readonly"'
-            ' value="http://test_admin@test.example.com:80/_%s"' % (repo_id, ))
+            ' value="http://test_admin@%s/_%s"' % (http_host_only_stub, repo_id, ))
 
-    def test_index_svn_without_proxy(self, backend_svn):
+    def test_index_svn_without_proxy(self, backend_svn, http_host_only_stub):
         self.log_user()
         repo_id = backend_svn.repo.repo_id
         repo_name = backend_svn.repo_name
@@ -74,12 +74,13 @@ class TestSummaryController(TestController):
         # clone url...
         response.mustcontain(
             'id="clone_url" disabled'
-            ' value="http://test_admin@test.example.com:80/%s"' % (repo_name, ))
+            ' value="http://test_admin@%s/%s"' % (http_host_only_stub, repo_name, ))
         response.mustcontain(
             'id="clone_url_id" disabled'
-            ' value="http://test_admin@test.example.com:80/_%s"' % (repo_id, ))
+            ' value="http://test_admin@%s/_%s"' % (http_host_only_stub, repo_id, ))
 
-    def test_index_with_trailing_slash(self, autologin_user, backend):
+    def test_index_with_trailing_slash(self, autologin_user, backend,
+                                       http_host_only_stub):
         repo_id = backend.repo.repo_id
         repo_name = backend.repo_name
         with mock.patch('rhodecode.lib.helpers.is_svn_without_proxy',
@@ -91,10 +92,10 @@ class TestSummaryController(TestController):
         # clone url...
         response.mustcontain(
             'id="clone_url" readonly="readonly"'
-            ' value="http://test_admin@test.example.com:80/%s"' % (repo_name, ))
+            ' value="http://test_admin@%s/%s"' % (http_host_only_stub, repo_name, ))
         response.mustcontain(
             'id="clone_url_id" readonly="readonly"'
-            ' value="http://test_admin@test.example.com:80/_%s"' % (repo_id, ))
+            ' value="http://test_admin@%s/_%s"' % (http_host_only_stub, repo_id, ))
 
     def test_index_by_id(self, backend):
         self.log_user()
diff --git a/rhodecode/tests/lib/middleware/test_simplevcs.py b/rhodecode/tests/lib/middleware/test_simplevcs.py
index 936ca2dc..23e121d1 100644
--- a/rhodecode/tests/lib/middleware/test_simplevcs.py
+++ b/rhodecode/tests/lib/middleware/test_simplevcs.py
@@ -35,7 +35,6 @@ from rhodecode.model.meta import Session
 from rhodecode.tests import (
     HG_REPO, TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS)
 from rhodecode.tests.lib.middleware import mock_scm_app
-from rhodecode.tests.utils import set_anonymous_access
 
 
 class StubVCSController(simplevcs.SimpleVCS):
@@ -70,7 +69,7 @@ def vcscontroller(pylonsapp, config_stub):
     config_stub.testing_securitypolicy()
     config_stub.include('rhodecode.authentication')
 
-    set_anonymous_access(True)
+    #set_anonymous_access(True)
     controller = StubVCSController(pylonsapp, pylonsapp.config, None)
     app = HttpsFixup(controller, pylonsapp.config)
     app = CustomTestApp(app)
@@ -93,13 +92,6 @@ def _remove_default_user_from_query_cache():
     Session().expire(user)
 
 
-@pytest.fixture
-def disable_anonymous_user(request, pylonsapp):
-    set_anonymous_access(False)
-
-    @request.addfinalizer
-    def cleanup():
-        set_anonymous_access(True)
 
 
 def test_handles_exceptions_during_permissions_checks(
@@ -275,7 +267,7 @@ class TestShadowRepoExposure(object):
                 controller.vcs_repo_name ==
                 controller._get_repository_name(environ_stub))
 
-    def test_set_repo_names_with_shadow(self, pylonsapp, pr_util):
+    def test_set_repo_names_with_shadow(self, pylonsapp, pr_util, config_stub):
         """
         Check that the set_repo_names method sets correct names on a request
         to a shadow repo.
@@ -304,7 +296,7 @@ class TestShadowRepoExposure(object):
         assert controller.is_shadow_repo
 
     def test_set_repo_names_with_shadow_but_missing_pr(
-            self, pylonsapp, pr_util):
+            self, pylonsapp, pr_util, config_stub):
         """
         Checks that the set_repo_names method enforces matching target repos
         and pull request IDs.
@@ -326,7 +318,7 @@ class TestShadowRepoExposure(object):
 
 
 @pytest.mark.usefixtures('db')
-class TestGenerateVcsResponse:
+class TestGenerateVcsResponse(object):
 
     def test_ensures_that_start_response_is_called_early_enough(self):
         self.call_controller_with_response_body(iter(['a', 'b']))
@@ -418,7 +410,7 @@ class TestGenerateVcsResponse:
         return self.controller._invalidate_cache.called
 
 
-class TestInitializeGenerator:
+class TestInitializeGenerator(object):
 
     def test_drains_first_element(self):
         gen = self.factory(['__init__', 1, 2])
diff --git a/rhodecode/tests/lib/test_codeblocks.py b/rhodecode/tests/lib/test_codeblocks.py
index 66b9e1fb..27899dad 100644
--- a/rhodecode/tests/lib/test_codeblocks.py
+++ b/rhodecode/tests/lib/test_codeblocks.py
@@ -19,11 +19,12 @@
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import pytest
+from pygments.lexers import get_lexer_by_name
 
+from rhodecode.tests import no_newline_id_generator
 from rhodecode.lib.codeblocks import (
     tokenize_string, split_token_stream, rollup_tokenstream,
     render_tokenstream)
-from pygments.lexers import get_lexer_by_name
 
 
 class TestTokenizeString(object):
@@ -298,7 +299,7 @@ class TestRenderTokenStream(object):
             [('A', '', u'hel'), ('B', 'ins', u'lo')],
             '<span class="A">hel</span><span class="B"><ins>lo</ins></span>',
         ),
-    ])
+    ], ids=no_newline_id_generator)
     def test_render_tokenstream_with_ops(self, tokenstream, output):
         html = render_tokenstream(tokenstream)
         assert html == output
diff --git a/rhodecode/tests/lib/test_helpers.py b/rhodecode/tests/lib/test_helpers.py
index f9b213ce..6fea1b4c 100644
--- a/rhodecode/tests/lib/test_helpers.py
+++ b/rhodecode/tests/lib/test_helpers.py
@@ -27,6 +27,7 @@ from pylons.util import ContextObj
 from rhodecode.lib import helpers
 from rhodecode.lib.utils2 import AttributeDict
 from rhodecode.model.settings import IssueTrackerSettingsModel
+from rhodecode.tests import no_newline_id_generator
 
 
 @pytest.mark.parametrize('url, expected_url', [
@@ -204,7 +205,7 @@ def test_get_visual_attr(pylonsapp):
     ('just a string\n', False, 'just a string'),
     ('just a string\n next line', False, 'just a string...'),
     ('just a string\n next line', True, 'just a string\n...'),
-])
+], ids=no_newline_id_generator)
 def test_chop_at(test_text, inclusive, expected_text):
     assert helpers.chop_at_smart(
         test_text, '\n', inclusive, '...') == expected_text
diff --git a/rhodecode/tests/lib/test_mako_emails.py b/rhodecode/tests/lib/test_mako_emails.py
index edb29e89..10ac9507 100644
--- a/rhodecode/tests/lib/test_mako_emails.py
+++ b/rhodecode/tests/lib/test_mako_emails.py
@@ -7,13 +7,13 @@ from rhodecode.lib.utils2 import AttributeDict
 from rhodecode.model.notification import EmailNotificationModel
 
 
-def test_get_template_obj(pylonsapp):
+def test_get_template_obj(app):
     template = EmailNotificationModel().get_renderer(
         EmailNotificationModel.TYPE_TEST)
     assert isinstance(template, PartialRenderer)
 
 
-def test_render_email(pylonsapp):
+def test_render_email(app, http_host_only_stub):
     kwargs = {}
     subject, headers, body, body_plaintext = EmailNotificationModel().render_email(
         EmailNotificationModel.TYPE_TEST, **kwargs)
@@ -28,12 +28,13 @@ def test_render_email(pylonsapp):
     assert body_plaintext == 'Email Plaintext Body'
 
     # body
-    assert 'This is a notification ' \
-           'from RhodeCode. http://test.example.com:80/' in body
+    notification_footer = 'This is a notification from RhodeCode. http://%s/' \
+                          % http_host_only_stub
+    assert notification_footer in body
     assert 'Email Body' in body
 
 
-def test_render_pr_email(pylonsapp, user_admin):
+def test_render_pr_email(app, user_admin):
 
     ref = collections.namedtuple('Ref',
         'name, type')(
@@ -77,7 +78,7 @@ def test_render_pr_email(pylonsapp, user_admin):
     EmailNotificationModel.TYPE_COMMIT_COMMENT,
     EmailNotificationModel.TYPE_PULL_REQUEST_COMMENT
 ])
-def test_render_comment_subject_no_newlines(pylonsapp, mention, email_type):
+def test_render_comment_subject_no_newlines(app, mention, email_type):
     ref = collections.namedtuple('Ref',
         'name, type')(
         'fxies123', 'book'
diff --git a/rhodecode/tests/models/test_changeset_status.py b/rhodecode/tests/models/test_changeset_status.py
index 27ffe377..94e74586 100644
--- a/rhodecode/tests/models/test_changeset_status.py
+++ b/rhodecode/tests/models/test_changeset_status.py
@@ -30,7 +30,7 @@ pytestmark = [
 ]
 
 
-def test_new_pull_request_is_under_review(pr_util):
+def test_new_pull_request_is_under_review(pr_util, config_stub):
     pull_request = pr_util.create_pull_request()
 
     # Expect that review status "Under Review"
@@ -44,7 +44,7 @@ def test_new_pull_request_is_under_review(pr_util):
     db.ChangesetStatus.STATUS_UNDER_REVIEW,
 ])
 def test_pull_request_under_review_if_one_reviewer_voted(
-        pr_util, voted_status):
+        pr_util, voted_status, config_stub):
     pull_request = pr_util.create_pull_request()
     pr_util.create_status_votes(
         voted_status, pull_request.reviewers[0])
@@ -59,7 +59,7 @@ def test_pull_request_under_review_if_one_reviewer_voted(
     db.ChangesetStatus.STATUS_REJECTED,
     db.ChangesetStatus.STATUS_UNDER_REVIEW,
 ])
-def test_pull_request_has_voted_status_if_all_voted(pr_util, voted_status):
+def test_pull_request_has_voted_status_if_all_voted(pr_util, voted_status, config_stub):
     pull_request = pr_util.create_pull_request()
     pr_util.create_status_votes(
         voted_status, *pull_request.reviewers)
@@ -74,7 +74,8 @@ def test_pull_request_has_voted_status_if_all_voted(pr_util, voted_status):
     db.ChangesetStatus.STATUS_REJECTED,
     db.ChangesetStatus.STATUS_UNDER_REVIEW,
 ])
-def test_pull_request_stays_if_update_without_change(pr_util, voted_status):
+def test_pull_request_stays_if_update_without_change(
+        pr_util, voted_status, config_stub):
     pull_request = pr_util.create_pull_request()
     pr_util.create_status_votes(
         voted_status, *pull_request.reviewers)
@@ -92,7 +93,7 @@ def test_pull_request_stays_if_update_without_change(pr_util, voted_status):
     db.ChangesetStatus.STATUS_REJECTED,
     db.ChangesetStatus.STATUS_UNDER_REVIEW,
 ])
-def test_pull_request_under_review_if_update(pr_util, voted_status):
+def test_pull_request_under_review_if_update(pr_util, voted_status, config_stub):
     pull_request = pr_util.create_pull_request()
     pr_util.create_status_votes(
         voted_status, *pull_request.reviewers)
@@ -106,7 +107,7 @@ def test_pull_request_under_review_if_update(pr_util, voted_status):
     assert pull_request.calculated_review_status() == expected_review_status
 
 
-def test_commit_under_review_if_part_of_new_pull_request(pr_util):
+def test_commit_under_review_if_part_of_new_pull_request(pr_util, config_stub):
     pull_request = pr_util.create_pull_request()
     for commit_id in pull_request.revisions:
         status = ChangesetStatusModel().get_status(
@@ -120,7 +121,7 @@ def test_commit_under_review_if_part_of_new_pull_request(pr_util):
     db.ChangesetStatus.STATUS_UNDER_REVIEW,
 ])
 def test_commit_has_voted_status_after_vote_on_pull_request(
-        pr_util, voted_status):
+        pr_util, voted_status, config_stub):
     pull_request = pr_util.create_pull_request()
     pr_util.create_status_votes(
         voted_status, pull_request.reviewers[0])
@@ -130,7 +131,7 @@ def test_commit_has_voted_status_after_vote_on_pull_request(
         assert status == voted_status
 
 
-def test_commit_under_review_if_added_to_pull_request(pr_util):
+def test_commit_under_review_if_added_to_pull_request(pr_util, config_stub):
     pull_request = pr_util.create_pull_request()
     pr_util.create_status_votes(
         db.ChangesetStatus.STATUS_APPROVED, pull_request.reviewers[0])
@@ -147,7 +148,7 @@ def test_commit_under_review_if_added_to_pull_request(pr_util):
     db.ChangesetStatus.STATUS_UNDER_REVIEW,
 ])
 def test_commit_keeps_status_if_removed_from_pull_request(
-        pr_util, voted_status):
+        pr_util, voted_status, config_stub):
     pull_request = pr_util.create_pull_request()
     pr_util.add_one_commit()
     pr_util.create_status_votes(voted_status, pull_request.reviewers[0])
@@ -165,7 +166,7 @@ def test_commit_keeps_status_if_removed_from_pull_request(
     db.ChangesetStatus.STATUS_UNDER_REVIEW,
 ])
 def test_commit_keeps_status_if_unchanged_after_update_of_pull_request(
-        pr_util, voted_status):
+        pr_util, voted_status, config_stub):
     pull_request = pr_util.create_pull_request()
     commit_id = pull_request.revisions[-1]
     pr_util.create_status_votes(voted_status, pull_request.reviewers[0])
diff --git a/rhodecode/tests/models/test_notifications.py b/rhodecode/tests/models/test_notifications.py
index ed3c8d6e..90d516a3 100644
--- a/rhodecode/tests/models/test_notifications.py
+++ b/rhodecode/tests/models/test_notifications.py
@@ -30,7 +30,7 @@ from rhodecode.model.user import UserModel
 fixture = Fixture()
 
 
-class TestNotifications:
+class TestNotifications(object):
     destroy_users = set()
 
     @classmethod
@@ -38,7 +38,7 @@ class TestNotifications:
         fixture.destroy_users(cls.destroy_users)
 
     @pytest.fixture(autouse=True)
-    def create_users(self, request, pylonsapp):
+    def create_users(self, request, app):
         Session.remove()
         self.u1 = UserModel().create_or_update(
             username=u'u1', password=u'qweqwe',
@@ -62,7 +62,7 @@ class TestNotifications:
         self.destroy_users.add('u3')
 
     @pytest.fixture(autouse=True)
-    def _clean_notifications(self, request, pylonsapp):
+    def _clean_notifications(self, request, app):
         for n in Notification.query().all():
             Session().delete(n)
 
diff --git a/rhodecode/tests/models/test_pullrequest.py b/rhodecode/tests/models/test_pullrequest.py
index 54efcf35..564f56a5 100644
--- a/rhodecode/tests/models/test_pullrequest.py
+++ b/rhodecode/tests/models/test_pullrequest.py
@@ -41,7 +41,8 @@ pytestmark = [
 ]
 
 
-class TestPullRequestModel:
+@pytest.mark.usefixtures('config_stub')
+class TestPullRequestModel(object):
 
     @pytest.fixture
     def pull_request(self, request, backend, pr_util):
@@ -372,6 +373,7 @@ class TestPullRequestModel:
         assert type(title) == unicode
 
 
+@pytest.mark.usefixtures('config_stub')
 class TestIntegrationMerge(object):
     @pytest.mark.parametrize('extra_config', (
         {'vcs.hooks.protocol': 'http', 'vcs.hooks.direct_calls': False},
@@ -433,7 +435,7 @@ class TestIntegrationMerge(object):
     (True, 0, 1),
 ])
 def test_outdated_comments(
-        pr_util, use_outdated, inlines_count, outdated_count):
+        pr_util, use_outdated, inlines_count, outdated_count, config_stub):
     pull_request = pr_util.create_pull_request()
     pr_util.create_inline_comment(file_path='not_in_updated_diff')
 
@@ -465,6 +467,7 @@ def merge_extras(user_regular):
     return extras
 
 
+@pytest.mark.usefixtures('config_stub')
 class TestUpdateCommentHandling(object):
 
     @pytest.fixture(autouse=True, scope='class')
@@ -572,6 +575,7 @@ class TestUpdateCommentHandling(object):
             assert_inline_comments(pull_request, visible=0, outdated=1)
 
 
+@pytest.mark.usefixtures('config_stub')
 class TestUpdateChangedFiles(object):
 
     def test_no_changes_on_unchanged_diff(self, pr_util):
@@ -681,7 +685,7 @@ class TestUpdateChangedFiles(object):
             removed=['file_a', 'file_b', 'file_c'])
 
 
-def test_update_writes_snapshot_into_pull_request_version(pr_util):
+def test_update_writes_snapshot_into_pull_request_version(pr_util, config_stub):
     model = PullRequestModel()
     pull_request = pr_util.create_pull_request()
     pr_util.update_source_repository()
@@ -692,7 +696,7 @@ def test_update_writes_snapshot_into_pull_request_version(pr_util):
     assert len(model.get_versions(pull_request)) == 1
 
 
-def test_update_skips_new_version_if_unchanged(pr_util):
+def test_update_skips_new_version_if_unchanged(pr_util, config_stub):
     pull_request = pr_util.create_pull_request()
     model = PullRequestModel()
     model.update_commits(pull_request)
@@ -701,7 +705,7 @@ def test_update_skips_new_version_if_unchanged(pr_util):
     assert len(model.get_versions(pull_request)) == 0
 
 
-def test_update_assigns_comments_to_the_new_version(pr_util):
+def test_update_assigns_comments_to_the_new_version(pr_util, config_stub):
     model = PullRequestModel()
     pull_request = pr_util.create_pull_request()
     comment = pr_util.create_comment()
@@ -713,7 +717,7 @@ def test_update_assigns_comments_to_the_new_version(pr_util):
     assert comment.pull_request_version == model.get_versions(pull_request)[0]
 
 
-def test_update_adds_a_comment_to_the_pull_request_about_the_change(pr_util):
+def test_update_adds_a_comment_to_the_pull_request_about_the_change(pr_util, config_stub):
     model = PullRequestModel()
     pull_request = pr_util.create_pull_request()
     pr_util.update_source_repository()
@@ -745,7 +749,7 @@ def test_update_adds_a_comment_to_the_pull_request_about_the_change(pr_util):
     assert update_comment.text == expected_message
 
 
-def test_create_version_from_snapshot_updates_attributes(pr_util):
+def test_create_version_from_snapshot_updates_attributes(pr_util, config_stub):
     pull_request = pr_util.create_pull_request()
 
     # Avoiding default values
@@ -784,7 +788,7 @@ def test_create_version_from_snapshot_updates_attributes(pr_util):
     assert version.pull_request == pull_request
 
 
-def test_link_comments_to_version_only_updates_unlinked_comments(pr_util):
+def test_link_comments_to_version_only_updates_unlinked_comments(pr_util, config_stub):
     version1 = pr_util.create_version_of_pull_request()
     comment_linked = pr_util.create_comment(linked_to=version1)
     comment_unlinked = pr_util.create_comment()
diff --git a/rhodecode/tests/models/test_pullrequest_git.py b/rhodecode/tests/models/test_pullrequest_git.py
index 23b6fcc0..ce7eb01f 100644
--- a/rhodecode/tests/models/test_pullrequest_git.py
+++ b/rhodecode/tests/models/test_pullrequest_git.py
@@ -25,6 +25,7 @@ from rhodecode.lib.vcs.exceptions import CommitDoesNotExistError
 from rhodecode.model.pull_request import PullRequestModel
 
 
+@pytest.mark.usefixtures('config_stub')
 @pytest.mark.backends('git')
 class TestGetDiffForPrOrVersion(object):
 
diff --git a/rhodecode/tests/other/test_libs.py b/rhodecode/tests/other/test_libs.py
index 1eee5553..2a2acc82 100644
--- a/rhodecode/tests/other/test_libs.py
+++ b/rhodecode/tests/other/test_libs.py
@@ -332,8 +332,18 @@ def test_initials_gravatar_mapping_algo():
 ])
 def test_clone_url_generator(tmpl, repo_name, overrides, prefix, expected):
     from rhodecode.lib.utils2 import get_clone_url
-    clone_url = get_clone_url(uri_tmpl=tmpl, qualifed_home_url='http://vps1:8000'+prefix,
-                              repo_name=repo_name, repo_id=23, **overrides)
+
+    class RequestStub(object):
+        def request_url(self, name):
+            return 'http://vps1:8000' + prefix
+
+        def route_url(self, name):
+            return self.request_url(name)
+
+    clone_url = get_clone_url(
+        request=RequestStub(),
+        uri_tmpl=tmpl,
+        repo_name=repo_name, repo_id=23, **overrides)
     assert clone_url == expected
 
 
diff --git a/rhodecode/tests/other/vcs_operations/conftest.py b/rhodecode/tests/other/vcs_operations/conftest.py
index 36736605..0fd61906 100644
--- a/rhodecode/tests/other/vcs_operations/conftest.py
+++ b/rhodecode/tests/other/vcs_operations/conftest.py
@@ -41,8 +41,7 @@ from rhodecode.model.settings import SettingsModel
 from rhodecode.tests import (
     GIT_REPO, HG_REPO, TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS,)
 from rhodecode.tests.fixture import Fixture
-from rhodecode.tests.utils import (
-    set_anonymous_access, is_url_reachable, wait_for_url)
+from rhodecode.tests.utils import is_url_reachable, wait_for_url
 
 RC_LOG = os.path.join(tempfile.gettempdir(), 'rc.log')
 REPO_GROUP = 'a_repo_group'
@@ -188,11 +187,6 @@ def rc_web_server(
     return RcWebServer(rc_web_server_config)
 
 
-@pytest.fixture(scope='class', autouse=True)
-def disable_anonymous_user_access(pylonsapp):
-    set_anonymous_access(False)
-
-
 @pytest.fixture
 def disable_locking(pylonsapp):
     r = Repository.get_by_repo_name(GIT_REPO)
diff --git a/rhodecode/tests/other/vcs_operations/test_vcs_calls_custom_auth_code_403.py b/rhodecode/tests/other/vcs_operations/test_vcs_calls_custom_auth_code_403.py
index 08a37367..212daa93 100644
--- a/rhodecode/tests/other/vcs_operations/test_vcs_calls_custom_auth_code_403.py
+++ b/rhodecode/tests/other/vcs_operations/test_vcs_calls_custom_auth_code_403.py
@@ -43,8 +43,8 @@ def rc_web_server_config(testini_factory):
     return testini_factory(CUSTOM_PARAMS)
 
 
-@pytest.mark.usefixtures("disable_locking")
-class TestVCSOperationsOnCustomIniConfig:
+@pytest.mark.usefixtures("disable_locking", "disable_anonymous_user")
+class TestVCSOperationsOnCustomIniConfig(object):
 
     def test_clone_wrong_credentials_hg_ret_code(self, rc_web_server, tmpdir):
         clone_url = rc_web_server.repo_clone_url(HG_REPO, passwd='bad!')
diff --git a/rhodecode/tests/other/vcs_operations/test_vcs_calls_custom_auth_code_404.py b/rhodecode/tests/other/vcs_operations/test_vcs_calls_custom_auth_code_404.py
index d5b50b9b..30d89a28 100644
--- a/rhodecode/tests/other/vcs_operations/test_vcs_calls_custom_auth_code_404.py
+++ b/rhodecode/tests/other/vcs_operations/test_vcs_calls_custom_auth_code_404.py
@@ -43,8 +43,8 @@ def rc_web_server_config(testini_factory):
     return testini_factory(CUSTOM_PARAMS)
 
 
-@pytest.mark.usefixtures("disable_locking")
-class TestVCSOperationsOnCustomIniConfig:
+@pytest.mark.usefixtures("disable_locking", "disable_anonymous_user")
+class TestVCSOperationsOnCustomIniConfig(object):
 
     def test_clone_wrong_credentials_hg_ret_code(self, rc_web_server, tmpdir):
         clone_url = rc_web_server.repo_clone_url(HG_REPO, passwd='bad!')
diff --git a/rhodecode/tests/other/vcs_operations/test_vcs_calls_custom_auth_code_bad_code.py b/rhodecode/tests/other/vcs_operations/test_vcs_calls_custom_auth_code_bad_code.py
index 2c6d83a7..70f0004f 100644
--- a/rhodecode/tests/other/vcs_operations/test_vcs_calls_custom_auth_code_bad_code.py
+++ b/rhodecode/tests/other/vcs_operations/test_vcs_calls_custom_auth_code_bad_code.py
@@ -43,8 +43,8 @@ def rc_web_server_config(testini_factory):
     return testini_factory(CUSTOM_PARAMS)
 
 
-@pytest.mark.usefixtures("disable_locking")
-class TestVCSOperationsOnCustomIniConfig:
+@pytest.mark.usefixtures("disable_locking", "disable_anonymous_user")
+class TestVCSOperationsOnCustomIniConfig(object):
 
     def test_clone_wrong_credentials_hg_ret_code(self, rc_web_server, tmpdir):
         clone_url = rc_web_server.repo_clone_url(HG_REPO, passwd='bad!')
diff --git a/rhodecode/tests/other/vcs_operations/test_vcs_operations.py b/rhodecode/tests/other/vcs_operations/test_vcs_operations.py
index 179e3639..1d007326 100644
--- a/rhodecode/tests/other/vcs_operations/test_vcs_operations.py
+++ b/rhodecode/tests/other/vcs_operations/test_vcs_operations.py
@@ -48,7 +48,7 @@ from rhodecode.tests.other.vcs_operations import (
     HG_REPO_WITH_GROUP, GIT_REPO_WITH_GROUP)
 
 
-@pytest.mark.usefixtures("disable_locking")
+@pytest.mark.usefixtures("disable_locking", "disable_anonymous_user")
 class TestVCSOperations(object):
 
     def test_clone_hg_repo_by_admin(self, rc_web_server, tmpdir):
diff --git a/rhodecode/tests/other/vcs_operations/test_vcs_operations_locking.py b/rhodecode/tests/other/vcs_operations/test_vcs_operations_locking.py
index cdafed02..78b72ad8 100644
--- a/rhodecode/tests/other/vcs_operations/test_vcs_operations_locking.py
+++ b/rhodecode/tests/other/vcs_operations/test_vcs_operations_locking.py
@@ -50,8 +50,8 @@ def rc_web_server_config(testini_factory):
     return testini_factory(CUSTOM_PARAMS)
 
 
-@pytest.mark.usefixtures("disable_locking")
-class TestVCSOperationsOnCustomIniConfig:
+@pytest.mark.usefixtures("disable_locking", "disable_anonymous_user")
+class TestVCSOperationsOnCustomIniConfig(object):
 
     def test_clone_and_create_lock_hg(self, rc_web_server, tmpdir):
         # enable locking
diff --git a/rhodecode/tests/other/vcs_operations/test_vcs_operations_locking_custom_code.py b/rhodecode/tests/other/vcs_operations/test_vcs_operations_locking_custom_code.py
index 858d7bfd..09207205 100644
--- a/rhodecode/tests/other/vcs_operations/test_vcs_operations_locking_custom_code.py
+++ b/rhodecode/tests/other/vcs_operations/test_vcs_operations_locking_custom_code.py
@@ -49,8 +49,8 @@ def rc_web_server_config(testini_factory):
     return testini_factory(CUSTOM_PARAMS)
 
 
-@pytest.mark.usefixtures("disable_locking")
-class TestVCSOperationsOnCustomIniConfig:
+@pytest.mark.usefixtures("disable_locking", "disable_anonymous_user")
+class TestVCSOperationsOnCustomIniConfig(object):
 
     def test_clone_after_repo_was_locked_hg(self, rc_web_server, tmpdir):
         # lock repo
diff --git a/rhodecode/tests/plugin.py b/rhodecode/tests/plugin.py
index 13852583..9c724864 100644
--- a/rhodecode/tests/plugin.py
+++ b/rhodecode/tests/plugin.py
@@ -62,7 +62,7 @@ from rhodecode.tests import (
     login_user_session, get_new_dir, utils, TESTS_TMP_PATH,
     TEST_USER_ADMIN_LOGIN, TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR2_LOGIN,
     TEST_USER_REGULAR_PASS)
-from rhodecode.tests.utils import CustomTestApp
+from rhodecode.tests.utils import CustomTestApp, set_anonymous_access, add_test_routes
 from rhodecode.tests.fixture import Fixture
 
 
@@ -191,7 +191,15 @@ def http_host_stub():
     """
     Value of HTTP_HOST in the test run.
     """
-    return 'test.example.com:80'
+    return 'example.com:80'
+
+
+@pytest.fixture
+def http_host_only_stub():
+    """
+    Value of HTTP_HOST in the test run.
+    """
+    return http_host_stub().split(':')[0]
 
 
 @pytest.fixture
@@ -204,7 +212,7 @@ def http_environ(http_host_stub):
     to override this for a specific test case.
     """
     return {
-        'SERVER_NAME': http_host_stub.split(':')[0],
+        'SERVER_NAME': http_host_only_stub(),
         'SERVER_PORT': http_host_stub.split(':')[1],
         'HTTP_HOST': http_host_stub,
         'HTTP_USER_AGENT': 'rc-test-agent',
@@ -213,7 +221,7 @@ def http_environ(http_host_stub):
 
 
 @pytest.fixture(scope='function')
-def app(request, pylonsapp, http_environ):
+def app(request, config_stub, pylonsapp, http_environ):
     app = CustomTestApp(
         pylonsapp,
         extra_environ=http_environ)
@@ -1680,6 +1688,7 @@ def config_stub(request, request_stub):
     Set up pyramid.testing and return the Configurator.
     """
     config = pyramid.testing.setUp(request=request_stub)
+    add_test_routes(config)
 
     @request.addfinalizer
     def cleanup():
@@ -1700,7 +1709,7 @@ def StubIntegrationType():
 
         def __init__(self, settings):
             super(_StubIntegrationType, self).__init__(settings)
-            self.sent_events = [] # for testing
+            self.sent_events = []  # for testing
 
         def send_event(self, event):
             self.sent_events.append(event)
@@ -1811,3 +1820,12 @@ def local_dt_to_utc():
         return dt.replace(tzinfo=dateutil.tz.tzlocal()).astimezone(
             dateutil.tz.tzutc()).replace(tzinfo=None)
     return _factory
+
+
+@pytest.fixture
+def disable_anonymous_user(request, pylonsapp):
+    set_anonymous_access(False)
+
+    @request.addfinalizer
+    def cleanup():
+        set_anonymous_access(True)
diff --git a/rhodecode/tests/scripts/test_concurency.py b/rhodecode/tests/scripts/test_concurency.py
index 108e187b..3aaf1229 100644
--- a/rhodecode/tests/scripts/test_concurency.py
+++ b/rhodecode/tests/scripts/test_concurency.py
@@ -138,14 +138,6 @@ def create_test_repo(force=True):
     print 'done'
 
 
-def set_anonymous_access(enable=True):
-    sa = get_session()
-    user = sa.query(User).filter(User.username == 'default').one()
-    user.active = enable
-    sa.add(user)
-    sa.commit()
-
-
 def get_anonymous_access():
     sa = get_session()
     return sa.query(User).filter(User.username == 'default').one().active
diff --git a/rhodecode/tests/utils.py b/rhodecode/tests/utils.py
index 8a9871d1..2edc357b 100644
--- a/rhodecode/tests/utils.py
+++ b/rhodecode/tests/utils.py
@@ -94,6 +94,14 @@ class CustomTestResponse(TestResponse):
     def assert_response(self):
         return AssertResponse(self)
 
+    def get_session_from_response(self):
+        """
+        This returns the session from a response object. Pylons has some magic
+        to make the session available as `response.session`. But pyramid
+        doesn't expose it.
+        """
+        return self.request.environ['beaker.session']
+
 
 class TestRequest(Request):
 
@@ -109,9 +117,6 @@ class CustomTestApp(TestApp):
     RequestClass = TestRequest
 
 
-
-
-
 def set_anonymous_access(enabled):
     """(Dis)allows anonymous access depending on parameter `enabled`"""
     user = User.get_default_user()
@@ -357,16 +362,6 @@ def is_url_reachable(url):
     return True
 
 
-def get_session_from_response(response):
-    """
-    This returns the session from a response object. Pylons has some magic
-    to make the session available as `response.session`. But pyramid
-    doesn't expose it.
-    """
-    # TODO: Try to look up the session key also.
-    return response.request.environ['beaker.session']
-
-
 def repo_on_filesystem(repo_name):
     from rhodecode.lib import vcs
     from rhodecode.tests import TESTS_TMP_PATH
@@ -407,3 +402,13 @@ def commit_change(
             f_path=filename
         )
     return commit
+
+
+def add_test_routes(config):
+    """
+    Adds test routing that can be used in different functional tests
+
+    """
+    config.add_route(name='home', pattern='/')
+    config.add_route(name='repo_summary', pattern='/{repo_name}')
+    config.add_route(name='repo_group_home', pattern='/{repo_group_name}')
diff --git a/rhodecode/tests/vcs/test_hg_vcsserver_cache_invalidation.py b/rhodecode/tests/vcs/test_hg_vcsserver_cache_invalidation.py
index a42c6733..52e94fd8 100644
--- a/rhodecode/tests/vcs/test_hg_vcsserver_cache_invalidation.py
+++ b/rhodecode/tests/vcs/test_hg_vcsserver_cache_invalidation.py
@@ -114,7 +114,7 @@ class TestMercurialRemoteRepoInvalidation(object):
         return shadow_repo, source_ref, target_ref
 
     @pytest.mark.backends('hg')
-    def test_commit_does_not_exist_error_happens(self, pr_util, pylonsapp):
+    def test_commit_does_not_exist_error_happens(self, pr_util, app):
         """
         This test is somewhat special. It does not really test the system
         instead it is more or less a precondition for the
@@ -152,8 +152,7 @@ class TestMercurialRemoteRepoInvalidation(object):
             shadow_repo.get_commit(source_ref.commit_id)
 
     @pytest.mark.backends('hg')
-    def test_commit_does_not_exist_error_does_not_happen(
-            self, pr_util, pylonsapp):
+    def test_commit_does_not_exist_error_does_not_happen(self, pr_util, app):
         """
         This test simulates a pull request merge in which the pull operations
         are handled by a different VCSServer process than all other operations.

From 6a85677174aab6ba265f231d131465f4a5b3240f Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 5 Jun 2017 19:18:37 +0200
Subject: [PATCH 138/211] auth: re-use the get_current_request in fetching
 request in decorators.

- will later help porting to pyramid
---
 rhodecode/lib/auth.py | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/rhodecode/lib/auth.py b/rhodecode/lib/auth.py
index 53d7fe50..7bfa5140 100644
--- a/rhodecode/lib/auth.py
+++ b/rhodecode/lib/auth.py
@@ -1185,10 +1185,20 @@ class LoginRequired(object):
     def __call__(self, func):
         return get_cython_compat_decorator(self.__wrapper, func)
 
+    def _get_request(self):
+        from pyramid.threadlocal import get_current_request
+        pyramid_request = get_current_request()
+        if not pyramid_request:
+            # return global request of pylons in case pyramid isn't available
+            return request
+        return pyramid_request
+
     def __wrapper(self, func, *fargs, **fkwargs):
         from rhodecode.lib import helpers as h
         cls = fargs[0]
         user = cls._rhodecode_user
+        request = self._get_request()
+
         loc = "%s:%s" % (cls.__class__.__name__, func.__name__)
         log.debug('Starting login restriction checks for user: %s' % (user,))
         # check if our IP is allowed
@@ -1262,7 +1272,8 @@ class LoginRequired(object):
 class NotAnonymous(object):
     """
     Must be logged in to execute this function else
-    redirect to login page"""
+    redirect to login page
+    """
 
     def __call__(self, func):
         return get_cython_compat_decorator(self.__wrapper, func)
@@ -1288,6 +1299,8 @@ class NotAnonymous(object):
 
 
 class XHRRequired(object):
+    # TODO(marcink): remove this in favor of the predicates in pyramid routes
+
     def __call__(self, func):
         return get_cython_compat_decorator(self.__wrapper, func)
 
@@ -1303,10 +1316,10 @@ class XHRRequired(object):
 class HasAcceptedRepoType(object):
     """
     Check if requested repo is within given repo type aliases
-
-    TODO: anderson: not sure where to put this decorator
     """
 
+    # TODO(marcink): remove this in favor of the predicates in pyramid routes
+
     def __init__(self, *repo_type_list):
         self.repo_type_list = set(repo_type_list)
 
@@ -1595,6 +1608,7 @@ class PermsFunction(object):
         if not user:
             log.debug('Using user attribute from global request')
             # TODO: remove this someday,put as user as attribute here
+            request = self._get_request()
             user = request.user
 
         # init auth user if not already given

From 6680a287dacd8be26fa48115286c8727f5482242 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 5 Jun 2017 19:22:27 +0200
Subject: [PATCH 139/211] core: improve attach context attribute to rely
 strictly on already provided user.

---
 rhodecode/lib/base.py    | 8 +++-----
 rhodecode/subscribers.py | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/rhodecode/lib/base.py b/rhodecode/lib/base.py
index 463c1d8f..1b848fad 100644
--- a/rhodecode/lib/base.py
+++ b/rhodecode/lib/base.py
@@ -265,7 +265,7 @@ class BasicAuth(AuthBasicAuthenticator):
     __call__ = authenticate
 
 
-def attach_context_attributes(context, request):
+def attach_context_attributes(context, request, user_id):
     """
     Attach variables into template context called `c`, please note that
     request could be pylons or pyramid request in here.
@@ -387,9 +387,7 @@ def attach_context_attributes(context, request):
     context.csrf_token = auth.get_csrf_token()
     context.backends = rhodecode.BACKENDS.keys()
     context.backends.sort()
-    context.unread_notifications = NotificationModel().get_unread_cnt_for_user(
-        context.rhodecode_user.user_id)
-
+    context.unread_notifications = NotificationModel().get_unread_cnt_for_user(user_id)
     context.pyramid_request = pyramid.threadlocal.get_current_request()
 
 
@@ -440,7 +438,7 @@ class BaseController(WSGIController):
         """
         # on each call propagate settings calls into global settings.
         set_rhodecode_config(config)
-        attach_context_attributes(c, request)
+        attach_context_attributes(c, request, c.rhodecode_user.user_id)
 
         # TODO: Remove this when fixed in attach_context_attributes()
         c.repo_name = get_repo_slug(request)  # can be empty
diff --git a/rhodecode/subscribers.py b/rhodecode/subscribers.py
index 21528b68..df732d59 100644
--- a/rhodecode/subscribers.py
+++ b/rhodecode/subscribers.py
@@ -121,7 +121,7 @@ def add_pylons_context(event):
     # Setup the pylons context object ('c')
     context = ContextObj()
     context.rhodecode_user = auth_user
-    attach_context_attributes(context, request)
+    attach_context_attributes(context, request, request.user.user_id)
     pylons.tmpl_context._push_object(context)
 
 

From 50a0a1e75a8d95a8452884999b030bf97d3a2fa3 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 5 Jun 2017 20:04:28 +0200
Subject: [PATCH 140/211] emails: fixed qualified url in user registration
 email.

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

diff --git a/rhodecode/templates/email_templates/user_registration.mako b/rhodecode/templates/email_templates/user_registration.mako
index 13a38e79..38c21fd7 100644
--- a/rhodecode/templates/email_templates/user_registration.mako
+++ b/rhodecode/templates/email_templates/user_registration.mako
@@ -12,7 +12,7 @@ A new user `${user.username}` has registered on ${h.format_date(date)}
 - Username: ${user.username}
 - Full Name: ${user.firstname} ${user.lastname}
 - Email: ${user.email}
-- Profile link: ${h.route_path('user_profile', username=user.username, qualified=True)}
+- Profile link: ${h.route_url('user_profile', username=user.username)}
 
 ${self.plaintext_footer()}
 </%def>

From 18a356ec2aa00b3aaca657a57bd28bf9a0759fe6 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 5 Jun 2017 22:23:30 +0200
Subject: [PATCH 141/211] predicates: skip route matching for vcs type calls.

---
 rhodecode/apps/_base/__init__.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/rhodecode/apps/_base/__init__.py b/rhodecode/apps/_base/__init__.py
index 79197a0d..b042ec37 100644
--- a/rhodecode/apps/_base/__init__.py
+++ b/rhodecode/apps/_base/__init__.py
@@ -257,6 +257,11 @@ class RepoRoutePredicate(object):
     phash = text
 
     def __call__(self, info, request):
+
+        if hasattr(request, 'vcs_call'):
+            # skip vcs calls
+            return
+
         repo_name = info['match']['repo_name']
         repo_model = repo.RepoModel()
         by_name_match = repo_model.get_by_repo_name(repo_name, cache=True)
@@ -284,6 +289,9 @@ class RepoTypeRoutePredicate(object):
     phash = text
 
     def __call__(self, info, request):
+        if hasattr(request, 'vcs_call'):
+            # skip vcs calls
+            return
 
         rhodecode_db_repo = request.db_repo
 
@@ -316,6 +324,10 @@ class RepoGroupRoutePredicate(object):
     phash = text
 
     def __call__(self, info, request):
+        if hasattr(request, 'vcs_call'):
+            # skip vcs calls
+            return
+
         repo_group_name = info['match']['repo_group_name']
         repo_group_model = repo_group.RepoGroupModel()
         by_name_match = repo_group_model.get_by_group_name(

From dc01a7b73965f924402de105ebd449b9e91a7321 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 6 Jun 2017 09:30:12 +0200
Subject: [PATCH 142/211] security: fixed XSS inside the tooltip for author
 string.

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

diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py
index 4918ebe0..e0dde63a 100644
--- a/rhodecode/lib/helpers.py
+++ b/rhodecode/lib/helpers.py
@@ -894,7 +894,8 @@ def author_string(email):
         user = User.get_by_email(email, case_insensitive=True, cache=True)
         if user:
             if user.firstname or user.lastname:
-                return '%s %s &lt;%s&gt;' % (user.firstname, user.lastname, email)
+                return '%s %s &lt;%s&gt;' % (
+                    escape(user.firstname), escape(user.lastname), email)
             else:
                 return email
         else:

From 9757a7c0c39a66593e934e03912ad4f54684f315 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 6 Jun 2017 11:59:46 +0200
Subject: [PATCH 143/211] security: escape always the provided user data like
 firstname/lastname.

---
 rhodecode/model/user.py       | 18 +++++++++---------
 rhodecode/model/user_group.py |  9 +++++----
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py
index 62d16a3e..0e44a9a7 100644
--- a/rhodecode/model/user.py
+++ b/rhodecode/model/user.py
@@ -30,21 +30,21 @@ from pylons.i18n.translation import _
 
 import ipaddress
 from sqlalchemy.exc import DatabaseError
-from sqlalchemy.sql.expression import true, false
 
 from rhodecode import events
 from rhodecode.lib.user_log_filter import user_log_filter
 from rhodecode.lib.utils2 import (
     safe_unicode, get_current_rhodecode_user, action_logger_generic,
     AttributeDict, str2bool)
-from rhodecode.lib.caching_query import FromCache
-from rhodecode.model import BaseModel
-from rhodecode.model.auth_token import AuthTokenModel
-from rhodecode.model.db import (_hash_key,
-    or_, joinedload, User, UserToPerm, UserEmailMap, UserIpMap, UserLog)
 from rhodecode.lib.exceptions import (
     DefaultUserException, UserOwnsReposException, UserOwnsRepoGroupsException,
     UserOwnsUserGroupsException, NotAllowedToCreateUserError)
+from rhodecode.lib.caching_query import FromCache
+from rhodecode.model import BaseModel
+from rhodecode.model.auth_token import AuthTokenModel
+from rhodecode.model.db import (
+    _hash_key, true, false, or_, joinedload, User, UserToPerm,
+    UserEmailMap, UserIpMap, UserLog)
 from rhodecode.model.meta import Session
 from rhodecode.model.repo_group import RepoGroupModel
 
@@ -70,12 +70,12 @@ class UserModel(BaseModel):
 
         return {
             'id': user.user_id,
-            'first_name': user.name,
-            'last_name': user.lastname,
+            'first_name': h.escape(user.name),
+            'last_name': h.escape(user.lastname),
             'username': user.username,
             'email': user.email,
             'icon_link': h.gravatar_url(user.email, 30),
-            'value_display': h.person(user),
+            'value_display': h.escape(h.person(user)),
             'value': user.username,
             'value_type': 'user',
             'active': user.active,
diff --git a/rhodecode/model/user_group.py b/rhodecode/model/user_group.py
index a9cfca10..6e16f7bf 100644
--- a/rhodecode/model/user_group.py
+++ b/rhodecode/model/user_group.py
@@ -28,16 +28,17 @@ import logging
 import traceback
 
 from rhodecode.lib.utils2 import safe_str, safe_unicode
+from rhodecode.lib.exceptions import (
+    UserGroupAssignedException, RepoGroupAssignmentError)
+from rhodecode.lib.utils2 import (
+    get_current_rhodecode_user, action_logger_generic)
 from rhodecode.model import BaseModel
 from rhodecode.model.scm import UserGroupList
 from rhodecode.model.db import (
     true, func, User, UserGroupMember, UserGroup,
     UserGroupRepoToPerm, Permission, UserGroupToPerm, UserUserGroupToPerm,
     UserGroupUserGroupToPerm, UserGroupRepoGroupToPerm)
-from rhodecode.lib.exceptions import (
-    UserGroupAssignedException, RepoGroupAssignmentError)
-from rhodecode.lib.utils2 import (
-    get_current_rhodecode_user, action_logger_generic)
+
 
 log = logging.getLogger(__name__)
 

From 95eeb93a9a70d07ce1fa356f2a70b15d2d53e20d Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 6 Jun 2017 13:34:22 +0200
Subject: [PATCH 144/211] security: fixed tests.

---
 rhodecode/apps/home/tests/test_home.py | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/rhodecode/apps/home/tests/test_home.py b/rhodecode/apps/home/tests/test_home.py
index e45aeae8..a9be3b00 100644
--- a/rhodecode/apps/home/tests/test_home.py
+++ b/rhodecode/apps/home/tests/test_home.py
@@ -20,17 +20,16 @@
 
 
 import pytest
-from pylons import tmpl_context as c
 
 import rhodecode
-from rhodecode.model.db import Repository, User
+from rhodecode.model.db import Repository
 from rhodecode.model.meta import Session
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.settings import SettingsModel
 from rhodecode.tests import TestController
 from rhodecode.tests.fixture import Fixture
-
+from rhodecode.lib import helpers as h
 
 fixture = Fixture()
 
@@ -55,6 +54,8 @@ class TestHomeController(TestController):
             response.mustcontain('"name_raw": "%s"' % repo.repo_name)
 
     def test_index_contains_statics_with_ver(self):
+        from pylons import tmpl_context as c
+
         self.log_user()
         response = self.app.get(route_path('home'))
 
@@ -103,19 +104,15 @@ class TestHomeController(TestController):
         user = user_util.create_user()
         username = user.username
         user.name = '<img src="/image1" onload="alert(\'Hello, World!\');">'
-        user.lastname = (
-            '<img src="/image2" onload="alert(\'Hello, World!\');">')
+        user.lastname = '#"><img src=x onerror=prompt(document.cookie);>'
+
         Session().add(user)
         Session().commit()
         user_util.create_repo(owner=username)
 
         response = self.app.get(route_path('home'))
-        response.mustcontain(
-            '&lt;img src=&#34;/image1&#34; onload=&#34;'
-            'alert(&#39;Hello, World!&#39;);&#34;&gt;')
-        response.mustcontain(
-            '&lt;img src=&#34;/image2&#34; onload=&#34;'
-            'alert(&#39;Hello, World!&#39;);&#34;&gt;')
+        response.mustcontain(h.html_escape(h.escape(user.name)))
+        response.mustcontain(h.html_escape(h.escape(user.lastname)))
 
     @pytest.mark.parametrize("name, state", [
         ('Disabled', False),

From fc4694f91f6b4294851438b89dc2e4dac7ec82d0 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 6 Jun 2017 13:35:05 +0200
Subject: [PATCH 145/211] pyramid: removed pylons reference from apps.

- this can be completly removed from those views as they are pyramid only.
---
 rhodecode/apps/admin/views/open_source_licenses.py | 10 ++++++++--
 rhodecode/apps/admin/views/sessions.py             | 10 ++++++++--
 rhodecode/apps/admin/views/system_info.py          | 11 ++++++++---
 rhodecode/apps/channelstream/views.py              |  7 ++-----
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/rhodecode/apps/admin/views/open_source_licenses.py b/rhodecode/apps/admin/views/open_source_licenses.py
index 825cd7b8..04acf6b3 100644
--- a/rhodecode/apps/admin/views/open_source_licenses.py
+++ b/rhodecode/apps/admin/views/open_source_licenses.py
@@ -21,7 +21,7 @@
 import collections
 import logging
 
-from pylons import tmpl_context as c
+
 from pyramid.view import view_config
 
 from rhodecode.apps._base import BaseAppView
@@ -34,15 +34,21 @@ log = logging.getLogger(__name__)
 
 class OpenSourceLicensesAdminSettingsView(BaseAppView):
 
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+        self._register_global_c(c)
+        return c
+
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     @view_config(
         route_name='admin_settings_open_source', request_method='GET',
         renderer='rhodecode:templates/admin/settings/settings.mako')
     def open_source_licenses(self):
+        c = self.load_default_context()
         c.active = 'open_source'
         c.navlist = navigation_list(self.request)
         c.opensource_licenses = collections.OrderedDict(
             sorted(read_opensource_licenses().items(), key=lambda t: t[0]))
 
-        return {}
+        return self._get_template_context(c)
diff --git a/rhodecode/apps/admin/views/sessions.py b/rhodecode/apps/admin/views/sessions.py
index f77d1845..6e7654b7 100644
--- a/rhodecode/apps/admin/views/sessions.py
+++ b/rhodecode/apps/admin/views/sessions.py
@@ -20,7 +20,6 @@
 
 import logging
 
-from pylons import tmpl_context as c
 from pyramid.view import view_config
 from pyramid.httpexceptions import HTTPFound
 
@@ -37,6 +36,11 @@ log = logging.getLogger(__name__)
 
 
 class AdminSessionSettingsView(BaseAppView):
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+
+        self._register_global_c(c)
+        return c
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
@@ -44,6 +48,8 @@ class AdminSessionSettingsView(BaseAppView):
         route_name='admin_settings_sessions', request_method='GET',
         renderer='rhodecode:templates/admin/settings/settings.mako')
     def settings_sessions(self):
+        c = self.load_default_context()
+
         c.active = 'sessions'
         c.navlist = navigation_list(self.request)
 
@@ -59,7 +65,7 @@ class AdminSessionSettingsView(BaseAppView):
         c.session_expired_count = c.session_model.get_expired_count(
             older_than_seconds)
 
-        return {}
+        return self._get_template_context(c)
 
     @LoginRequired()
     @CSRFRequired()
diff --git a/rhodecode/apps/admin/views/system_info.py b/rhodecode/apps/admin/views/system_info.py
index ee9e93d2..8c0d33bc 100644
--- a/rhodecode/apps/admin/views/system_info.py
+++ b/rhodecode/apps/admin/views/system_info.py
@@ -22,7 +22,6 @@ import logging
 import urllib2
 import packaging.version
 
-from pylons import tmpl_context as c
 from pyramid.view import view_config
 
 import rhodecode
@@ -39,6 +38,10 @@ log = logging.getLogger(__name__)
 
 
 class AdminSystemInfoSettingsView(BaseAppView):
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+        self._register_global_c(c)
+        return c
 
     @staticmethod
     def get_update_data(update_url):
@@ -64,6 +67,7 @@ class AdminSystemInfoSettingsView(BaseAppView):
         renderer='rhodecode:templates/admin/settings/settings.mako')
     def settings_system_info(self):
         _ = self.request.translate
+        c = self.load_default_context()
 
         c.active = 'system'
         c.navlist = navigation_list(self.request)
@@ -164,7 +168,7 @@ class AdminSystemInfoSettingsView(BaseAppView):
             else:
                 self.request.session.flash(
                     'You are not allowed to do this', queue='warning')
-        return {}
+        return self._get_template_context(c)
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
@@ -173,6 +177,7 @@ class AdminSystemInfoSettingsView(BaseAppView):
         renderer='rhodecode:templates/admin/settings/settings_system_update.mako')
     def settings_system_info_check_update(self):
         _ = self.request.translate
+        c = self.load_default_context()
 
         update_url = self.get_update_url()
 
@@ -201,4 +206,4 @@ class AdminSystemInfoSettingsView(BaseAppView):
             c.should_upgrade = True
         c.important_notices = latest['general']
 
-        return {}
+        return self._get_template_context(c)
diff --git a/rhodecode/apps/channelstream/views.py b/rhodecode/apps/channelstream/views.py
index a3bd57c8..e0b09d4b 100644
--- a/rhodecode/apps/channelstream/views.py
+++ b/rhodecode/apps/channelstream/views.py
@@ -30,8 +30,6 @@ Channel Stream controller for rhodecode
 import logging
 import uuid
 
-from pylons import tmpl_context as c
-from pyramid.settings import asbool
 from pyramid.view import view_config
 from webob.exc import HTTPBadRequest, HTTPForbidden, HTTPBadGateway
 
@@ -46,7 +44,6 @@ from rhodecode.lib.channelstream import (
     update_history_from_logs,
     STATE_PUBLIC_KEYS)
 from rhodecode.lib.auth import NotAnonymous
-from rhodecode.lib.utils2 import str2bool
 
 log = logging.getLogger(__name__)
 
@@ -82,7 +79,7 @@ class ChannelstreamView(object):
             log.error('Incorrect permissions for requested channels')
             raise HTTPForbidden()
 
-        user = c.rhodecode_user
+        user = self._rhodecode_user
         if user.user_id:
             user_data = get_user_data(user.user_id)
         else:
@@ -95,7 +92,7 @@ class ChannelstreamView(object):
                 'display_name': None,
                 'display_link': None,
             }
-        user_data['permissions'] = c.rhodecode_user.permissions
+        user_data['permissions'] = self._rhodecode_user.permissions
         payload = {
             'username': user.username,
             'user_state': user_data,

From 3ab227d76c05ce3a906e03798ad080a52c3fd664 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 6 Jun 2017 14:12:49 +0200
Subject: [PATCH 146/211] navigation: remove # from url in options navigation
 entry.

- leaving '#' in url is not good behaviour, and menulink class prevents the click anyway.
---
 rhodecode/templates/base/base.mako | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako
index 97c3f3d0..edaf471f 100644
--- a/rhodecode/templates/base/base.mako
+++ b/rhodecode/templates/base/base.mako
@@ -243,7 +243,9 @@
           </li>
         %endif
         <li class="${is_active('options')}">
-          <a class="menulink" href="#" class="dropdown"><div class="menulabel">${_('Options')} <div class="show_more"></div></div></a>
+          <a class="menulink dropdown">
+              <div class="menulabel">${_('Options')} <div class="show_more"></div></div>
+          </a>
           <ul class="submenu">
              %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
                    <li><a href="${h.route_path('edit_repo',repo_name=c.repo_name)}">${_('Settings')}</a></li>

From 3d2de9920ea83cb391c9d1b79bcdbb61db369304 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 7 Jun 2017 09:26:39 +0200
Subject: [PATCH 147/211] docs: updated info about client usage.

---
 docs/usage/basic-vcs-commands.rst | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/usage/basic-vcs-commands.rst b/docs/usage/basic-vcs-commands.rst
index 9245bf5f..0a7f4d22 100644
--- a/docs/usage/basic-vcs-commands.rst
+++ b/docs/usage/basic-vcs-commands.rst
@@ -3,8 +3,13 @@
 Getting Started with VCS
 ------------------------
 
-When using |RCM|, you will be working with |git| or |hg| |repos| from the
-command line.
+When using |RCM|, you will be working with |git|, |svn| or |hg| |repos| from the
+command line or using a GUI client such as Tortoise, Tower or SourceTree.
+
+|RCM| uses a standard |git|, |svn| and |hg| protocols. So all tools that
+can interact with there protocols are supported, including Eclipse or PyCharm
+plugins.
+
 
 If you have never used either before, the following information should
 help you set up your local machine so that you can sync changes with the

From 53b4ac98f82378708e90f20393874b46de80624e Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 7 Jun 2017 13:23:21 +0200
Subject: [PATCH 148/211] repo-summary: re-implemented  summary view as
 pyramid.

- changed exception handler, to now work in pure pyramid mode
- changed missing requirements logic on repo based views that require vcs-connection
---
 rhodecode/apps/_base/__init__.py              |  15 +-
 rhodecode/apps/home/views.py                  |   2 +-
 rhodecode/apps/repository/__init__.py         |  31 ++-
 .../repository/tests/test_repo_summary.py}    | 254 ++++++++----------
 .../repository/views/repo_summary.py}         | 217 +++++++++------
 rhodecode/config/middleware.py                |  11 +-
 rhodecode/config/routing.py                   |  41 +--
 rhodecode/controllers/admin/repos.py          |   8 +-
 rhodecode/controllers/changelog.py            |  32 +--
 rhodecode/controllers/compare.py              |   4 +-
 rhodecode/controllers/feed.py                 |   5 +-
 rhodecode/controllers/files.py                |  10 +-
 rhodecode/controllers/pullrequests.py         |   2 +-
 rhodecode/lib/action_parser.py                |   3 +-
 rhodecode/lib/auth.py                         |   2 +-
 rhodecode/lib/base.py                         |   2 +-
 rhodecode/lib/helpers.py                      |   2 +-
 rhodecode/model/comment.py                    |  13 +-
 rhodecode/model/db.py                         |   7 +-
 rhodecode/model/pull_request.py               |  12 +-
 rhodecode/model/repo.py                       |   8 +-
 rhodecode/public/css/summary.less             |   1 +
 .../js/rhodecode/base/keyboard-bindings.js    |   2 +-
 rhodecode/public/js/rhodecode/routes.js       |  12 +-
 rhodecode/templates/admin/admin_log_base.mako |   2 +-
 .../templates/admin/integrations/list.mako    |   2 +-
 .../templates/admin/repos/repo_creating.mako  |   4 +-
 .../admin/repos/repo_edit_advanced.mako       |   2 +-
 .../admin/settings/settings_system.mako       |   2 +-
 rhodecode/templates/base/base.mako            |   4 +-
 rhodecode/templates/base/perms_summary.mako   |   2 +-
 .../templates/data_table/_dt_elements.mako    |   8 +-
 rhodecode/templates/forks/forks_data.mako     |   2 +-
 rhodecode/templates/journal/journal_data.mako |   2 +-
 .../pullrequests/pullrequest_show.mako        |   4 +-
 rhodecode/templates/search/search_commit.mako |   2 +-
 .../templates/search/search_content.mako      |   2 +-
 rhodecode/templates/search/search_path.mako   |   2 +-
 rhodecode/templates/summary/components.mako   |  14 +-
 .../summary/missing_requirements.mako         |  10 +-
 rhodecode/templates/summary/summary.mako      |   5 +-
 .../summary_commits.mako}                     |   0
 rhodecode/tests/events/test_repo.py           |   6 +-
 .../tests/functional/test_admin_repos.py      |  10 +-
 rhodecode/tests/functional/test_files.py      |   5 +-
 rhodecode/tests/functional/test_forks.py      |  11 +-
 rhodecode/tests/functional/test_login.py      |   4 +-
 .../tests/functional/test_pullrequests.py     |  10 +-
 rhodecode/tests/lib/test_base.py              |   4 +-
 rhodecode/tests/plugin.py                     |   9 +
 rhodecode/tests/utils.py                      |   1 +
 51 files changed, 415 insertions(+), 410 deletions(-)
 rename rhodecode/{tests/functional/test_summary.py => apps/repository/tests/test_repo_summary.py} (72%)
 rename rhodecode/{controllers/summary.py => apps/repository/views/repo_summary.py} (60%)
 rename rhodecode/templates/{changelog/changelog_summary_data.mako => summary/summary_commits.mako} (100%)

diff --git a/rhodecode/apps/_base/__init__.py b/rhodecode/apps/_base/__init__.py
index b042ec37..1709986c 100644
--- a/rhodecode/apps/_base/__init__.py
+++ b/rhodecode/apps/_base/__init__.py
@@ -105,9 +105,14 @@ class BaseAppView(object):
                 raise HTTPFound(
                     self.request.route_path('my_account_password'))
 
-    def _get_local_tmpl_context(self):
+    def _get_local_tmpl_context(self, include_app_defaults=False):
         c = TemplateArgs()
         c.auth_user = self.request.user
+        if include_app_defaults:
+            # NOTE(marcink): after full pyramid migration include_app_defaults
+            # should be turned on by default
+            from rhodecode.lib.base import attach_context_attributes
+            attach_context_attributes(c, self.request, self.request.user.user_id)
         return c
 
     def _register_global_c(self, tmpl_args):
@@ -154,8 +159,10 @@ class RepoAppView(BaseAppView):
             'Requirements are missing for repository %s: %s',
             self.db_repo_name, error.message)
 
-    def _get_local_tmpl_context(self):
-        c = super(RepoAppView, self)._get_local_tmpl_context()
+    def _get_local_tmpl_context(self, include_app_defaults=False):
+        c = super(RepoAppView, self)._get_local_tmpl_context(
+            include_app_defaults=include_app_defaults)
+
         # register common vars for this type of view
         c.rhodecode_db_repo = self.db_repo
         c.repo_name = self.db_repo_name
@@ -309,7 +316,7 @@ class RepoTypeRoutePredicate(object):
             #     _('Action not supported for %s.' % rhodecode_repo.alias)),
             #     category='warning')
             # return redirect(
-            #     url('summary_home', repo_name=cls.rhodecode_db_repo.repo_name))
+            #     route_path('repo_summary', repo_name=cls.rhodecode_db_repo.repo_name))
 
             return False
 
diff --git a/rhodecode/apps/home/views.py b/rhodecode/apps/home/views.py
index ea8dab63..d06e858c 100644
--- a/rhodecode/apps/home/views.py
+++ b/rhodecode/apps/home/views.py
@@ -123,7 +123,7 @@ class HomeView(BaseAppView):
                 'text': obj['name'],
                 'type': 'repo',
                 'obj': obj['dbrepo'],
-                'url': h.url('summary_home', repo_name=obj['name'])
+                'url': h.route_path('repo_summary', repo_name=obj['name'])
             }
             for obj in repo_iter]
 
diff --git a/rhodecode/apps/repository/__init__.py b/rhodecode/apps/repository/__init__.py
index 57eac222..2e080599 100644
--- a/rhodecode/apps/repository/__init__.py
+++ b/rhodecode/apps/repository/__init__.py
@@ -17,18 +17,33 @@
 # 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/
+from rhodecode.apps._base import add_route_with_slash
 
 
 def includeme(config):
 
     # Summary
-    config.add_route(
-        name='repo_summary',
-        pattern='/{repo_name:.*?[^/]}', repo_route=True)
-
+    # NOTE(marcink): one additional route is defined in very bottom, catch
+    # all pattern
     config.add_route(
         name='repo_summary_explicit',
         pattern='/{repo_name:.*?[^/]}/summary', repo_route=True)
+    config.add_route(
+        name='repo_summary_commits',
+        pattern='/{repo_name:.*?[^/]}/summary-commits', repo_route=True)
+
+    # refs data
+    config.add_route(
+        name='repo_refs_data',
+        pattern='/{repo_name:.*?[^/]}/refs-data', repo_route=True)
+
+    config.add_route(
+        name='repo_refs_changelog_data',
+        pattern='/{repo_name:.*?[^/]}/refs-data-changelog', repo_route=True)
+
+    config.add_route(
+        name='repo_stats',
+        pattern='/{repo_name:.*?[^/]}/repo_stats/{commit_id}', repo_route=True)
 
     # Tags
     config.add_route(
@@ -40,7 +55,6 @@ def includeme(config):
         name='branches_home',
         pattern='/{repo_name:.*?[^/]}/branches', repo_route=True)
 
-    # Bookmarks
     config.add_route(
         name='bookmarks_home',
         pattern='/{repo_name:.*?[^/]}/bookmarks', repo_route=True)
@@ -125,9 +139,10 @@ def includeme(config):
         pattern='/{repo_name:.*?[^/]}/settings/strip_execute', repo_route=True)
 
     # NOTE(marcink): needs to be at the end for catch-all
-    # config.add_route(
-    #     name='repo_summary',
-    #     pattern='/{repo_name:.*?[^/]}', repo_route=True)
+    add_route_with_slash(
+        config,
+        name='repo_summary',
+        pattern='/{repo_name:.*?[^/]}', repo_route=True)
 
     # Scan module for configuration decorators.
     config.scan()
diff --git a/rhodecode/tests/functional/test_summary.py b/rhodecode/apps/repository/tests/test_repo_summary.py
similarity index 72%
rename from rhodecode/tests/functional/test_summary.py
rename to rhodecode/apps/repository/tests/test_repo_summary.py
index 34187bcb..d8af2126 100644
--- a/rhodecode/tests/functional/test_summary.py
+++ b/rhodecode/apps/repository/tests/test_repo_summary.py
@@ -23,16 +23,16 @@ import re
 import mock
 import pytest
 
-from rhodecode.controllers import summary
+from rhodecode.apps.repository.views.repo_summary import RepoSummaryView
 from rhodecode.lib import helpers as h
 from rhodecode.lib.compat import OrderedDict
+from rhodecode.lib.utils2 import AttributeDict
 from rhodecode.lib.vcs.exceptions import RepositoryRequirementError
 from rhodecode.model.db import Repository
 from rhodecode.model.meta import Session
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.scm import ScmModel
-from rhodecode.tests import (
-    TestController, url, HG_REPO, assert_session_flash)
+from rhodecode.tests import assert_session_flash
 from rhodecode.tests.fixture import Fixture
 from rhodecode.tests.utils import AssertResponse, repo_on_filesystem
 
@@ -40,14 +40,31 @@ from rhodecode.tests.utils import AssertResponse, repo_on_filesystem
 fixture = Fixture()
 
 
-class TestSummaryController(TestController):
-    def test_index(self, backend, http_host_only_stub):
-        self.log_user()
+def route_path(name, params=None, **kwargs):
+    import urllib
+
+    base_url = {
+        'repo_summary': '/{repo_name}',
+        'repo_stats': '/{repo_name}/repo_stats/{commit_id}',
+        'repo_refs_data': '/{repo_name}/refs-data',
+        'repo_refs_changelog_data': '/{repo_name}/refs-data-changelog'
+
+    }[name].format(**kwargs)
+
+    if params:
+        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+    return base_url
+
+
+@pytest.mark.usefixtures('app')
+class TestSummaryView(object):
+    def test_index(self, autologin_user, backend, http_host_only_stub):
         repo_id = backend.repo.repo_id
         repo_name = backend.repo_name
         with mock.patch('rhodecode.lib.helpers.is_svn_without_proxy',
                         return_value=False):
-            response = self.app.get(url('summary_home', repo_name=repo_name))
+            response = self.app.get(
+                route_path('repo_summary', repo_name=repo_name))
 
         # repo type
         response.mustcontain(
@@ -66,11 +83,11 @@ class TestSummaryController(TestController):
             'id="clone_url_id" readonly="readonly"'
             ' value="http://test_admin@%s/_%s"' % (http_host_only_stub, repo_id, ))
 
-    def test_index_svn_without_proxy(self, backend_svn, http_host_only_stub):
-        self.log_user()
+    def test_index_svn_without_proxy(
+            self, autologin_user, backend_svn, http_host_only_stub):
         repo_id = backend_svn.repo.repo_id
         repo_name = backend_svn.repo_name
-        response = self.app.get(url('summary_home', repo_name=repo_name))
+        response = self.app.get(route_path('repo_summary', repo_name=repo_name))
         # clone url...
         response.mustcontain(
             'id="clone_url" disabled'
@@ -79,14 +96,15 @@ class TestSummaryController(TestController):
             'id="clone_url_id" disabled'
             ' value="http://test_admin@%s/_%s"' % (http_host_only_stub, repo_id, ))
 
-    def test_index_with_trailing_slash(self, autologin_user, backend,
-                                       http_host_only_stub):
+    def test_index_with_trailing_slash(
+            self, autologin_user, backend, http_host_only_stub):
+
         repo_id = backend.repo.repo_id
         repo_name = backend.repo_name
         with mock.patch('rhodecode.lib.helpers.is_svn_without_proxy',
                         return_value=False):
             response = self.app.get(
-                url('summary_home', repo_name=repo_name) + '/',
+                route_path('repo_summary', repo_name=repo_name) + '/',
                 status=200)
 
         # clone url...
@@ -97,11 +115,10 @@ class TestSummaryController(TestController):
             'id="clone_url_id" readonly="readonly"'
             ' value="http://test_admin@%s/_%s"' % (http_host_only_stub, repo_id, ))
 
-    def test_index_by_id(self, backend):
-        self.log_user()
+    def test_index_by_id(self, autologin_user, backend):
         repo_id = backend.repo.repo_id
-        response = self.app.get(url(
-            'summary_home', repo_name='_%s' % (repo_id,)))
+        response = self.app.get(
+            route_path('repo_summary', repo_name='_%s' % (repo_id,)))
 
         # repo type
         response.mustcontain(
@@ -112,10 +129,9 @@ class TestSummaryController(TestController):
             """<i class="icon-unlock-alt">"""
         )
 
-    def test_index_by_repo_having_id_path_in_name_hg(self):
-        self.log_user()
+    def test_index_by_repo_having_id_path_in_name_hg(self, autologin_user):
         fixture.create_repo(name='repo_1')
-        response = self.app.get(url('summary_home', repo_name='repo_1'))
+        response = self.app.get(route_path('repo_summary', repo_name='repo_1'))
 
         try:
             response.mustcontain("repo_1")
@@ -123,11 +139,11 @@ class TestSummaryController(TestController):
             RepoModel().delete(Repository.get_by_repo_name('repo_1'))
             Session().commit()
 
-    def test_index_with_anonymous_access_disabled(self):
-        with fixture.anon_access(False):
-            response = self.app.get(url('summary_home', repo_name=HG_REPO),
-                                    status=302)
-            assert 'login' in response.location
+    def test_index_with_anonymous_access_disabled(
+            self, backend, disable_anonymous_user):
+        response = self.app.get(
+            route_path('repo_summary', repo_name=backend.repo_name), status=302)
+        assert 'login' in response.location
 
     def _enable_stats(self, repo):
         r = Repository.get_by_repo_name(repo)
@@ -174,17 +190,15 @@ class TestSummaryController(TestController):
         },
     }
 
-    def test_repo_stats(self, backend, xhr_header):
-        self.log_user()
+    def test_repo_stats(self, autologin_user, backend, xhr_header):
         response = self.app.get(
-            url('repo_stats',
-                repo_name=backend.repo_name, commit_id='tip'),
+            route_path(
+                'repo_stats', repo_name=backend.repo_name, commit_id='tip'),
             extra_environ=xhr_header,
             status=200)
         assert re.match(r'6[\d\.]+ KiB', response.json['size'])
 
-    def test_repo_stats_code_stats_enabled(self, backend, xhr_header):
-        self.log_user()
+    def test_repo_stats_code_stats_enabled(self, autologin_user, backend, xhr_header):
         repo_name = backend.repo_name
 
         # codes stats
@@ -192,8 +206,8 @@ class TestSummaryController(TestController):
         ScmModel().mark_for_invalidation(repo_name)
 
         response = self.app.get(
-            url('repo_stats',
-                repo_name=backend.repo_name, commit_id='tip'),
+            route_path(
+                'repo_stats', repo_name=backend.repo_name, commit_id='tip'),
             extra_environ=xhr_header,
             status=200)
 
@@ -204,7 +218,7 @@ class TestSummaryController(TestController):
 
     def test_repo_refs_data(self, backend):
         response = self.app.get(
-            url('repo_refs_data', repo_name=backend.repo_name),
+            route_path('repo_refs_data', repo_name=backend.repo_name),
             status=200)
 
         # Ensure that there is the correct amount of items in the result
@@ -221,72 +235,68 @@ class TestSummaryController(TestController):
             Repository, 'scm_instance', side_effect=RepositoryRequirementError)
 
         with scm_patcher:
-            response = self.app.get(url('summary_home', repo_name=repo_name))
+            response = self.app.get(route_path('repo_summary', repo_name=repo_name))
         assert_response = AssertResponse(response)
         assert_response.element_contains(
             '.main .alert-warning strong', 'Missing requirements')
         assert_response.element_contains(
             '.main .alert-warning',
-            'These commits cannot be displayed, because this repository'
-            ' uses the Mercurial largefiles extension, which was not enabled.')
+            'Commits cannot be displayed, because this repository '
+            'uses one or more extensions, which was not enabled.')
 
     def test_missing_requirements_page_does_not_contains_switch_to(
-            self, backend):
-        self.log_user()
+            self, autologin_user, backend):
         repo_name = backend.repo_name
         scm_patcher = mock.patch.object(
             Repository, 'scm_instance', side_effect=RepositoryRequirementError)
 
         with scm_patcher:
-            response = self.app.get(url('summary_home', repo_name=repo_name))
+            response = self.app.get(route_path('repo_summary', repo_name=repo_name))
         response.mustcontain(no='Switch To')
 
 
-@pytest.mark.usefixtures('pylonsapp')
-class TestSwitcherReferenceData:
+@pytest.mark.usefixtures('app')
+class TestRepoLocation(object):
 
-    def test_creates_reference_urls_based_on_name(self):
-        references = {
-            'name': 'commit_id',
-        }
-        controller = summary.SummaryController()
-        is_svn = False
-        result = controller._switcher_reference_data(
-            'repo_name', references, is_svn)
-        expected_url = h.url(
-            'files_home', repo_name='repo_name', revision='name',
-            at='name')
-        assert result[0]['files_url'] == expected_url
+    @pytest.mark.parametrize("suffix", [u'', u'ąęł'], ids=['', 'non-ascii'])
+    def test_manual_delete(self, autologin_user, backend, suffix, csrf_token):
+        repo = backend.create_repo(name_suffix=suffix)
+        repo_name = repo.repo_name
 
-    def test_urls_contain_commit_id_if_slash_in_name(self):
-        references = {
-            'name/with/slash': 'commit_id',
-        }
-        controller = summary.SummaryController()
-        is_svn = False
-        result = controller._switcher_reference_data(
-            'repo_name', references, is_svn)
-        expected_url = h.url(
-            'files_home', repo_name='repo_name', revision='commit_id',
-            at='name/with/slash')
-        assert result[0]['files_url'] == expected_url
+        # delete from file system
+        RepoModel()._delete_filesystem_repo(repo)
 
-    def test_adds_reference_to_path_for_svn(self):
-        references = {
-            'name/with/slash': 'commit_id',
-        }
-        controller = summary.SummaryController()
-        is_svn = True
-        result = controller._switcher_reference_data(
-            'repo_name', references, is_svn)
-        expected_url = h.url(
-            'files_home', repo_name='repo_name', f_path='name/with/slash',
-            revision='commit_id', at='name/with/slash')
-        assert result[0]['files_url'] == expected_url
+        # test if the repo is still in the database
+        new_repo = RepoModel().get_by_repo_name(repo_name)
+        assert new_repo.repo_name == repo_name
+
+        # check if repo is not in the filesystem
+        assert not repo_on_filesystem(repo_name)
+        self.assert_repo_not_found_redirect(repo_name)
+
+    def assert_repo_not_found_redirect(self, repo_name):
+        # run the check page that triggers the other flash message
+        response = self.app.get(h.url('repo_check_home', repo_name=repo_name))
+        assert_session_flash(
+            response, 'The repository at %s cannot be located.' % repo_name)
 
 
-@pytest.mark.usefixtures('pylonsapp')
-class TestCreateReferenceData:
+@pytest.fixture()
+def summary_view(context_stub, request_stub, user_util):
+    """
+    Bootstrap view to test the view functions
+    """
+    request_stub.matched_route = AttributeDict(name='test_view')
+
+    request_stub.user = user_util.create_user().AuthUser
+    request_stub.db_repo = user_util.create_repo()
+
+    view = RepoSummaryView(context=context_stub, request=request_stub)
+    return view
+
+
+@pytest.mark.usefixtures('app')
+class TestCreateReferenceData(object):
 
     @pytest.fixture
     def example_refs(self):
@@ -297,14 +307,13 @@ class TestCreateReferenceData:
         ]
         return example_refs
 
-    def test_generates_refs_based_on_commit_ids(self, example_refs):
+    def test_generates_refs_based_on_commit_ids(self, example_refs, summary_view):
         repo = mock.Mock()
         repo.name = 'test-repo'
         repo.alias = 'git'
         full_repo_name = 'pytest-repo-group/' + repo.name
-        controller = summary.SummaryController()
 
-        result = controller._create_reference_data(
+        result = summary_view._create_reference_data(
             repo, full_repo_name, example_refs)
 
         expected_files_url = '/{}/files/'.format(full_repo_name)
@@ -333,13 +342,13 @@ class TestCreateReferenceData:
             }]
         assert result == expected_result
 
-    def test_generates_refs_with_path_for_svn(self, example_refs):
+    def test_generates_refs_with_path_for_svn(self, example_refs, summary_view):
         repo = mock.Mock()
         repo.name = 'test-repo'
         repo.alias = 'svn'
         full_repo_name = 'pytest-repo-group/' + repo.name
-        controller = summary.SummaryController()
-        result = controller._create_reference_data(
+
+        result = summary_view._create_reference_data(
             repo, full_repo_name, example_refs)
 
         expected_files_url = '/{}/files/'.format(full_repo_name)
@@ -373,35 +382,9 @@ class TestCreateReferenceData:
         assert result == expected_result
 
 
-@pytest.mark.usefixtures("app")
-class TestRepoLocation:
-
-    @pytest.mark.parametrize("suffix", [u'', u'ąęł'], ids=['', 'non-ascii'])
-    def test_manual_delete(self, autologin_user, backend, suffix, csrf_token):
-        repo = backend.create_repo(name_suffix=suffix)
-        repo_name = repo.repo_name
-
-        # delete from file system
-        RepoModel()._delete_filesystem_repo(repo)
-
-        # test if the repo is still in the database
-        new_repo = RepoModel().get_by_repo_name(repo_name)
-        assert new_repo.repo_name == repo_name
-
-        # check if repo is not in the filesystem
-        assert not repo_on_filesystem(repo_name)
-        self.assert_repo_not_found_redirect(repo_name)
-
-    def assert_repo_not_found_redirect(self, repo_name):
-        # run the check page that triggers the other flash message
-        response = self.app.get(url('repo_check_home', repo_name=repo_name))
-        assert_session_flash(
-            response, 'The repository at %s cannot be located.' % repo_name)
-
-
 class TestCreateFilesUrl(object):
-    def test_creates_non_svn_url(self):
-        controller = summary.SummaryController()
+
+    def test_creates_non_svn_url(self, summary_view):
         repo = mock.Mock()
         repo.name = 'abcde'
         full_repo_name = 'test-repo-group/' + repo.name
@@ -409,16 +392,15 @@ class TestCreateFilesUrl(object):
         raw_id = 'deadbeef0123456789'
         is_svn = False
 
-        with mock.patch.object(summary.h, 'url') as url_mock:
-            result = controller._create_files_url(
+        with mock.patch('rhodecode.lib.helpers.url') as url_mock:
+            result = summary_view._create_files_url(
                 repo, full_repo_name, ref_name, raw_id, is_svn)
         url_mock.assert_called_once_with(
             'files_home', repo_name=full_repo_name, f_path='',
             revision=ref_name, at=ref_name)
         assert result == url_mock.return_value
 
-    def test_creates_svn_url(self):
-        controller = summary.SummaryController()
+    def test_creates_svn_url(self, summary_view):
         repo = mock.Mock()
         repo.name = 'abcde'
         full_repo_name = 'test-repo-group/' + repo.name
@@ -426,16 +408,15 @@ class TestCreateFilesUrl(object):
         raw_id = 'deadbeef0123456789'
         is_svn = True
 
-        with mock.patch.object(summary.h, 'url') as url_mock:
-            result = controller._create_files_url(
+        with mock.patch('rhodecode.lib.helpers.url') as url_mock:
+            result = summary_view._create_files_url(
                 repo, full_repo_name, ref_name, raw_id, is_svn)
         url_mock.assert_called_once_with(
             'files_home', repo_name=full_repo_name, f_path=ref_name,
             revision=raw_id, at=ref_name)
         assert result == url_mock.return_value
 
-    def test_name_has_slashes(self):
-        controller = summary.SummaryController()
+    def test_name_has_slashes(self, summary_view):
         repo = mock.Mock()
         repo.name = 'abcde'
         full_repo_name = 'test-repo-group/' + repo.name
@@ -443,8 +424,8 @@ class TestCreateFilesUrl(object):
         raw_id = 'deadbeef0123456789'
         is_svn = False
 
-        with mock.patch.object(summary.h, 'url') as url_mock:
-            result = controller._create_files_url(
+        with mock.patch('rhodecode.lib.helpers.url') as url_mock:
+            result = summary_view._create_files_url(
                 repo, full_repo_name, ref_name, raw_id, is_svn)
         url_mock.assert_called_once_with(
             'files_home', repo_name=full_repo_name, f_path='', revision=raw_id,
@@ -463,42 +444,39 @@ class TestReferenceItems(object):
     def _format_function(name, id_):
         return 'format_function_{}_{}'.format(name, id_)
 
-    def test_creates_required_amount_of_items(self):
+    def test_creates_required_amount_of_items(self, summary_view):
         amount = 100
         refs = {
             'ref{}'.format(i): '{0:040d}'.format(i)
             for i in range(amount)
         }
 
-        controller = summary.SummaryController()
-
-        url_patcher = mock.patch.object(
-            controller, '_create_files_url')
-        svn_patcher = mock.patch.object(
-            summary.h, 'is_svn', return_value=False)
+        url_patcher = mock.patch.object(summary_view, '_create_files_url')
+        svn_patcher = mock.patch('rhodecode.lib.helpers.is_svn',
+                                 return_value=False)
 
         with url_patcher as url_mock, svn_patcher:
-            result = controller._create_reference_items(
+            result = summary_view._create_reference_items(
                 self.repo, self.repo_full_name, refs, self.ref_type,
                 self._format_function)
         assert len(result) == amount
         assert url_mock.call_count == amount
 
-    def test_single_item_details(self):
+    def test_single_item_details(self, summary_view):
         ref_name = 'ref1'
         ref_id = 'deadbeef'
         refs = {
             ref_name: ref_id
         }
 
-        controller = summary.SummaryController()
+        svn_patcher = mock.patch('rhodecode.lib.helpers.is_svn',
+                                 return_value=False)
+
         url_patcher = mock.patch.object(
-            controller, '_create_files_url', return_value=self.fake_url)
-        svn_patcher = mock.patch.object(
-            summary.h, 'is_svn', return_value=False)
+            summary_view, '_create_files_url', return_value=self.fake_url)
 
         with url_patcher as url_mock, svn_patcher:
-            result = controller._create_reference_items(
+            result = summary_view._create_reference_items(
                 self.repo, self.repo_full_name, refs, self.ref_type,
                 self._format_function)
 
diff --git a/rhodecode/controllers/summary.py b/rhodecode/apps/repository/views/repo_summary.py
similarity index 60%
rename from rhodecode/controllers/summary.py
rename to rhodecode/apps/repository/views/repo_summary.py
index 220ffab9..c5e9b98e 100644
--- a/rhodecode/controllers/summary.py
+++ b/rhodecode/apps/repository/views/repo_summary.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2017 RhodeCode GmbH
+# Copyright (C) 2011-2017 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
@@ -18,46 +18,51 @@
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
-"""
-Summary controller for RhodeCode Enterprise
-"""
-
 import logging
-from string import lower
+import string
+
+from pyramid.view import view_config
 
-from pylons import tmpl_context as c, request
-from pylons.i18n.translation import _
 from beaker.cache import cache_region
 
-from rhodecode.config.conf import (LANGUAGES_EXTENSIONS_MAP)
+
 from rhodecode.controllers import utils
-from rhodecode.controllers.changelog import _load_changelog_summary
+
+from rhodecode.apps._base import RepoAppView
+from rhodecode.config.conf import (LANGUAGES_EXTENSIONS_MAP)
 from rhodecode.lib import caches, helpers as h
-from rhodecode.lib.utils import jsonify
-from rhodecode.lib.utils2 import safe_str
-from rhodecode.lib.auth import (
-    LoginRequired, HasRepoPermissionAnyDecorator, XHRRequired)
-from rhodecode.lib.base import BaseRepoController, render
+from rhodecode.lib.helpers import RepoPage
+from rhodecode.lib.utils2 import safe_str, safe_int
+from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from rhodecode.lib.markup_renderer import MarkupRenderer, relative_links
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.vcs.backends.base import EmptyCommit
 from rhodecode.lib.vcs.exceptions import CommitError, EmptyRepositoryError
 from rhodecode.model.db import Statistics, CacheKey, User
+from rhodecode.model.meta import Session
 from rhodecode.model.repo import ReadmeFinder
-
+from rhodecode.model.scm import ScmModel
 
 log = logging.getLogger(__name__)
 
 
-class SummaryController(BaseRepoController):
+class RepoSummaryView(RepoAppView):
 
-    def __before__(self):
-        super(SummaryController, self).__before__()
+    def load_default_context(self):
+        c = self._get_local_tmpl_context(include_app_defaults=True)
 
-    def __get_readme_data(self, db_repo):
+        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
+        c.repo_info = self.db_repo
+        c.rhodecode_repo = None
+        if not c.repository_requirements_missing:
+            c.rhodecode_repo = self.rhodecode_vcs_repo
+
+        self._register_global_c(c)
+        return c
+
+    def _get_readme_data(self, db_repo, default_renderer):
         repo_name = db_repo.repo_name
         log.debug('Looking for README file')
-        default_renderer = c.visual.default_renderer
 
         @cache_region('long_term')
         def _generate_readme(cache_key):
@@ -113,16 +118,58 @@ class SummaryController(BaseRepoController):
             log.exception(
                 "Exception while trying to render the README")
 
+    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(**kw):
+            query_params = {
+                'size': size
+            }
+            query_params.update(kw)
+            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)
+        except EmptyRepositoryError:
+            collection = self.rhodecode_vcs_repo
+
+        c.repo_commits = RepoPage(
+            collection, page=p, items_per_page=size, url=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)
+
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
-    def index(self, repo_name):
+    @view_config(
+        route_name='repo_summary_commits', request_method='GET',
+        renderer='rhodecode:templates/summary/summary_commits.mako')
+    def summary_commits(self):
+        c = self.load_default_context()
+        self._load_commits_context(c)
+        return self._get_template_context(c)
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator(
+        'repository.read', 'repository.write', 'repository.admin')
+    @view_config(
+        route_name='repo_summary', request_method='GET',
+        renderer='rhodecode:templates/summary/summary.mako')
+    @view_config(
+        route_name='repo_summary_slash', request_method='GET',
+        renderer='rhodecode:templates/summary/summary.mako')
+    def summary(self):
+        c = self.load_default_context()
 
         # Prepare the clone URL
-
         username = ''
-        if c.rhodecode_user.username != User.DEFAULT_USER:
-            username = safe_str(c.rhodecode_user.username)
+        if self._rhodecode_user.username != User.DEFAULT_USER:
+            username = safe_str(self._rhodecode_user.username)
 
         _def_clone_uri = _def_clone_uri_by_id = c.clone_uri_tmpl
         if '{repo}' in _def_clone_uri:
@@ -132,23 +179,23 @@ class SummaryController(BaseRepoController):
             _def_clone_uri_by_id = _def_clone_uri.replace(
                 '_{repoid}', '{repo}')
 
-        c.clone_repo_url = c.rhodecode_db_repo.clone_url(
+        c.clone_repo_url = self.db_repo.clone_url(
             user=username, uri_tmpl=_def_clone_uri)
-        c.clone_repo_url_id = c.rhodecode_db_repo.clone_url(
+        c.clone_repo_url_id = self.db_repo.clone_url(
             user=username, uri_tmpl=_def_clone_uri_by_id)
 
         # If enabled, get statistics data
 
-        c.show_stats = bool(c.rhodecode_db_repo.enable_statistics)
+        c.show_stats = bool(self.db_repo.enable_statistics)
 
-        stats = self.sa.query(Statistics)\
-            .filter(Statistics.repository == c.rhodecode_db_repo)\
+        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 c.rhodecode_db_repo.enable_statistics
+            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,
@@ -164,51 +211,59 @@ class SummaryController(BaseRepoController):
             c.no_data = True
             c.trending_languages = json.dumps({})
 
-        c.enable_downloads = c.rhodecode_db_repo.enable_downloads
-        c.repository_followers = self.scm_model.get_followers(
-            c.rhodecode_db_repo)
-        c.repository_forks = self.scm_model.get_forks(c.rhodecode_db_repo)
-        c.repository_is_user_following = self.scm_model.is_following_repo(
-            c.repo_name, c.rhodecode_user.user_id)
+        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)
+        c.repository_is_user_following = scm_model.is_following_repo(
+            self.db_repo_name, self._rhodecode_user.user_id)
 
+        # first interaction with the VCS instance after here...
         if c.repository_requirements_missing:
-            return render('summary/missing_requirements.mako')
+            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(c.rhodecode_db_repo)
+            self._get_readme_data(self.db_repo, c.visual.default_renderer)
 
-        _load_changelog_summary()
+        # loads the summary commits template context
+        self._load_commits_context(c)
 
-        if request.is_xhr:
-            return render('changelog/changelog_summary_data.mako')
+        return self._get_template_context(c)
 
-        return render('summary/summary.mako')
+    def get_request_commit_id(self):
+        return self.request.matchdict['commit_id']
 
     @LoginRequired()
-    @XHRRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
-    @jsonify
-    def repo_stats(self, repo_name, commit_id):
+    @view_config(
+        route_name='repo_stats', request_method='GET',
+        renderer='json_ext')
+    def repo_stats(self):
+        commit_id = self.get_request_commit_id()
+
         _namespace = caches.get_repo_namespace_key(
-            caches.SUMMARY_STATS, repo_name)
-        show_stats = bool(c.rhodecode_db_repo.enable_statistics)
-        cache_manager = caches.get_cache_manager('repo_cache_long', _namespace)
+            caches.SUMMARY_STATS, self.db_repo_name)
+        show_stats = bool(self.db_repo.enable_statistics)
+        cache_manager = caches.get_cache_manager(
+            'repo_cache_long', _namespace)
         _cache_key = caches.compute_key_from_params(
-            repo_name, commit_id, show_stats)
+            self.db_repo_name, commit_id, show_stats)
 
         def compute_stats():
             code_stats = {}
             size = 0
             try:
-                scm_instance = c.rhodecode_db_repo.scm_instance()
+                scm_instance = self.db_repo.scm_instance()
                 commit = scm_instance.get_commit(commit_id)
 
                 for node in commit.get_filenodes_generator():
                     size += node.size
                     if not show_stats:
                         continue
-                    ext = lower(node.extension)
+                    ext = string.lower(node.extension)
                     ext_info = LANGUAGES_EXTENSIONS_MAP.get(ext)
                     if ext_info:
                         if ext in code_stats:
@@ -223,44 +278,41 @@ class SummaryController(BaseRepoController):
         stats = cache_manager.get(_cache_key, createfunc=compute_stats)
         return stats
 
-    def _switcher_reference_data(self, repo_name, references, is_svn):
-        """Prepare reference data for given `references`"""
-        items = []
-        for name, commit_id in references.items():
-            use_commit_id = '/' in name or is_svn
-            items.append({
-                'name': name,
-                'commit_id': commit_id,
-                'files_url': h.url(
-                    'files_home',
-                    repo_name=repo_name,
-                    f_path=name if is_svn else '',
-                    revision=commit_id if use_commit_id else name,
-                    at=name)
-            })
-        return items
-
     @LoginRequired()
-    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
-                                   'repository.admin')
-    @jsonify
-    def repo_refs_data(self, repo_name):
-        repo = c.rhodecode_repo
+    @HasRepoPermissionAnyDecorator(
+        'repository.read', 'repository.write', 'repository.admin')
+    @view_config(
+        route_name='repo_refs_data', request_method='GET',
+        renderer='json_ext')
+    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, repo_name, refs_to_create)
+        res = self._create_reference_data(
+            repo, self.db_repo_name, refs_to_create)
         data = {
             'more': False,
             'results': res
         }
         return data
 
-    @jsonify
-    def repo_refs_changelog_data(self, repo_name):
-        repo = c.rhodecode_repo
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator(
+        'repository.read', 'repository.write', 'repository.admin')
+    @view_config(
+        route_name='repo_refs_changelog_data', request_method='GET',
+        renderer='json_ext')
+    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'),
@@ -268,7 +320,8 @@ class SummaryController(BaseRepoController):
             # TODO: enable when vcs can handle bookmarks filters
             # (_("Bookmarks"), repo.bookmarks, "book"),
         ]
-        res = self._create_reference_data(repo, repo_name, refs_to_create)
+        res = self._create_reference_data(
+            repo, self.db_repo_name, refs_to_create)
         data = {
             'more': False,
             'results': res
@@ -284,7 +337,8 @@ class SummaryController(BaseRepoController):
                 result.append({
                     'text': title,
                     'children': self._create_reference_items(
-                        repo, full_repo_name, refs, ref_type, format_ref_id),
+                        repo, full_repo_name, refs, ref_type,
+                        format_ref_id),
                 })
         return result
 
@@ -304,8 +358,7 @@ class SummaryController(BaseRepoController):
             })
         return result
 
-    def _create_files_url(self, repo, full_repo_name, ref_name, raw_id,
-                          is_svn):
+    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.url(
             'files_home',
diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py
index fd8bf257..ba200994 100644
--- a/rhodecode/config/middleware.py
+++ b/rhodecode/config/middleware.py
@@ -39,11 +39,15 @@ from routes.middleware import RoutesMiddleware
 import routes.util
 
 import rhodecode
+
 from rhodecode.model import meta
 from rhodecode.config import patches
 from rhodecode.config.routing import STATIC_FILE_PREFIX
 from rhodecode.config.environment import (
     load_environment, load_pyramid_environment)
+
+from rhodecode.lib.vcs import VCSCommunicationError
+from rhodecode.lib.exceptions import VCSServerUnavailable
 from rhodecode.lib.middleware import csrf
 from rhodecode.lib.middleware.appenlight import wrap_in_appenlight_if_enabled
 from rhodecode.lib.middleware.error_handling import (
@@ -51,7 +55,7 @@ from rhodecode.lib.middleware.error_handling import (
 from rhodecode.lib.middleware.https_fixup import HttpsFixup
 from rhodecode.lib.middleware.vcs import VCSMiddleware
 from rhodecode.lib.plugins.utils import register_rhodecode_plugin
-from rhodecode.lib.utils2 import aslist as rhodecode_aslist
+from rhodecode.lib.utils2 import aslist as rhodecode_aslist, AttributeDict
 from rhodecode.subscribers import (
     scan_repositories_if_enabled, write_js_routes_if_enabled,
     write_metadata_if_needed)
@@ -221,7 +225,6 @@ def add_pylons_compat_data(registry, global_config, settings):
 
 def error_handler(exception, request):
     import rhodecode
-    from rhodecode.lib.utils2 import AttributeDict
     from rhodecode.lib import helpers
 
     rhodecode_title = rhodecode.CONFIG.get('rhodecode_title') or 'RhodeCode'
@@ -230,6 +233,8 @@ def error_handler(exception, request):
     # 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()
 
     def is_http_error(response):
         # error which should have traceback
@@ -257,6 +262,7 @@ def error_handler(exception, request):
     if hasattr(base_response, 'causes'):
         c.causes = base_response.causes
     c.messages = helpers.flash.pop_messages()
+
     response = render_to_response(
         '/errors/error_document.mako', {'c': c, 'h': helpers}, request=request,
         response=base_response)
@@ -404,7 +410,6 @@ def wrap_app_in_wsgi_middlewares(pyramid_app, config):
             pool = meta.Base.metadata.bind.engine.pool
             log.debug('sa pool status: %s', pool.status())
 
-
     return pyramid_app_with_cleanup
 
 
diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py
index 341b0db5..3cc9c085 100644
--- a/rhodecode/config/routing.py
+++ b/rhodecode/config/routing.py
@@ -117,8 +117,9 @@ class JSRoutesMapper(Mapper):
 
 def make_map(config):
     """Create, configure and return the routes Mapper"""
-    rmap = JSRoutesMapper(directory=config['pylons.paths']['controllers'],
-                  always_scan=config['debug'])
+    rmap = JSRoutesMapper(
+        directory=config['pylons.paths']['controllers'],
+        always_scan=config['debug'])
     rmap.minimization = False
     rmap.explicit = False
 
@@ -609,18 +610,6 @@ def make_map(config):
                  controller='admin/repos', action='repo_check',
                  requirements=URL_NAME_REQUIREMENTS)
 
-    rmap.connect('repo_stats', '/{repo_name}/repo_stats/{commit_id}',
-                 controller='summary', action='repo_stats',
-                 conditions={'function': check_repo},
-                 requirements=URL_NAME_REQUIREMENTS, jsroute=True)
-
-    rmap.connect('repo_refs_data', '/{repo_name}/refs-data',
-                 controller='summary', action='repo_refs_data',
-                 requirements=URL_NAME_REQUIREMENTS, jsroute=True)
-    rmap.connect('repo_refs_changelog_data', '/{repo_name}/refs-data-changelog',
-                 controller='summary', action='repo_refs_changelog_data',
-                 requirements=URL_NAME_REQUIREMENTS, jsroute=True)
-
     rmap.connect('changeset_home', '/{repo_name}/changeset/{revision}',
                  controller='changeset', revision='tip',
                  conditions={'function': check_repo},
@@ -834,19 +823,10 @@ def make_map(config):
                  conditions={'function': check_repo, 'method': ['DELETE']},
                  requirements=URL_NAME_REQUIREMENTS, jsroute=True)
 
-    rmap.connect('summary_home_explicit', '/{repo_name}/summary',
-                 controller='summary', conditions={'function': check_repo},
-                 requirements=URL_NAME_REQUIREMENTS)
-
     rmap.connect('changelog_home', '/{repo_name}/changelog', jsroute=True,
                  controller='changelog', conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
-    rmap.connect('changelog_summary_home', '/{repo_name}/changelog_summary',
-                 controller='changelog', action='changelog_summary',
-                 conditions={'function': check_repo},
-                 requirements=URL_NAME_REQUIREMENTS)
-
     rmap.connect('changelog_file_home',
                  '/{repo_name}/changelog/{revision}/{f_path}',
                  controller='changelog', f_path=None,
@@ -999,19 +979,4 @@ def make_map(config):
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
-    # catch all, at the end
-    _connect_with_slash(
-        rmap, 'summary_home', '/{repo_name}', jsroute=True,
-        controller='summary', action='index',
-        conditions={'function': check_repo},
-        requirements=URL_NAME_REQUIREMENTS)
-
     return rmap
-
-
-def _connect_with_slash(mapper, name, path, *args, **kwargs):
-    """
-    Connect a route with an optional trailing slash in `path`.
-    """
-    mapper.connect(name + '_slash', path + '/', *args, **kwargs)
-    mapper.connect(name, path, *args, **kwargs)
diff --git a/rhodecode/controllers/admin/repos.py b/rhodecode/controllers/admin/repos.py
index 0ed88c8c..ae9970b5 100644
--- a/rhodecode/controllers/admin/repos.py
+++ b/rhodecode/controllers/admin/repos.py
@@ -274,9 +274,9 @@ class ReposController(BaseRepoController):
                 h.flash(_('Created repository %s from %s')
                         % (repo.repo_name, clone_uri), category='success')
             else:
-                repo_url = h.link_to(repo.repo_name,
-                                     h.url('summary_home',
-                                           repo_name=repo.repo_name))
+                repo_url = h.link_to(
+                    repo.repo_name,
+                    h.route_path('repo_summary',repo_name=repo.repo_name))
                 fork = repo.fork
                 if fork:
                     fork_name = fork.repo_name
@@ -366,7 +366,7 @@ class ReposController(BaseRepoController):
             log.exception("Exception during unlocking")
             h.flash(_('An error occurred during unlocking'),
                     category='error')
-        return redirect(url('summary_home', repo_name=repo_name))
+        return redirect(h.route_path('repo_summary', repo_name=repo_name))
 
     @HasRepoPermissionAllDecorator('repository.admin')
     @auth.CSRFRequired()
diff --git a/rhodecode/controllers/changelog.py b/rhodecode/controllers/changelog.py
index d59780d3..7c2e7d9b 100644
--- a/rhodecode/controllers/changelog.py
+++ b/rhodecode/controllers/changelog.py
@@ -46,27 +46,6 @@ log = logging.getLogger(__name__)
 DEFAULT_CHANGELOG_SIZE = 20
 
 
-def _load_changelog_summary():
-    p = safe_int(request.GET.get('page'), 1)
-    size = safe_int(request.GET.get('size'), 10)
-
-    def url_generator(**kw):
-        return url('summary_home',
-                   repo_name=c.rhodecode_db_repo.repo_name, size=size, **kw)
-
-    pre_load = ['author', 'branch', 'date', 'message']
-    try:
-        collection = c.rhodecode_repo.get_commits(pre_load=pre_load)
-    except EmptyRepositoryError:
-        collection = c.rhodecode_repo
-
-    c.repo_commits = RepoPage(
-        collection, page=p, items_per_page=size, url=url_generator)
-    page_ids = [x.raw_id for x in c.repo_commits]
-    c.comments = c.rhodecode_db_repo.get_comments(page_ids)
-    c.statuses = c.rhodecode_db_repo.statuses(page_ids)
-
-
 class ChangelogController(BaseRepoController):
 
     def __before__(self):
@@ -211,7 +190,7 @@ class ChangelogController(BaseRepoController):
 
         except EmptyRepositoryError as e:
             h.flash(safe_str(e), category='warning')
-            return redirect(url('summary_home', repo_name=repo_name))
+            return redirect(h.route_path('repo_summary', repo_name=repo_name))
         except (RepositoryError, CommitDoesNotExistError, Exception) as e:
             msg = safe_str(e)
             log.exception(msg)
@@ -279,12 +258,3 @@ class ChangelogController(BaseRepoController):
             c.rhodecode_repo, c.pagination,
             prev_data=prev_data, next_data=next_data)
         return render('changelog/changelog_elements.mako')
-
-    @LoginRequired()
-    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
-                                   'repository.admin')
-    def changelog_summary(self, repo_name):
-        if request.environ.get('HTTP_X_PJAX'):
-            _load_changelog_summary()
-            return render('changelog/changelog_summary_data.mako')
-        raise HTTPNotFound()
diff --git a/rhodecode/controllers/compare.py b/rhodecode/controllers/compare.py
index c8dbcc92..0ffe24ce 100644
--- a/rhodecode/controllers/compare.py
+++ b/rhodecode/controllers/compare.py
@@ -63,14 +63,14 @@ class CompareController(BaseRepoController):
                 return repo.scm_instance().EMPTY_COMMIT
             h.flash(h.literal(_('There are no commits yet')),
                     category='warning')
-            redirect(url('summary_home', repo_name=repo.repo_name))
+            redirect(h.route_path('repo_summary', repo_name=repo.repo_name))
 
         except RepositoryError as e:
             msg = safe_str(e)
             log.exception(msg)
             h.flash(msg, category='warning')
             if not partial:
-                redirect(h.url('summary_home', repo_name=repo.repo_name))
+                redirect(h.route_path('repo_summary', repo_name=repo.repo_name))
             raise HTTPBadRequest()
 
     @LoginRequired()
diff --git a/rhodecode/controllers/feed.py b/rhodecode/controllers/feed.py
index c4fbbd31..2cf56426 100644
--- a/rhodecode/controllers/feed.py
+++ b/rhodecode/controllers/feed.py
@@ -113,7 +113,7 @@ class FeedController(BaseRepoController):
         def _generate_feed(cache_key):
             feed = Atom1Feed(
                 title=self.title % repo_name,
-                link=url('summary_home', repo_name=repo_name, qualified=True),
+                link=h.route_url('repo_summary', repo_name=repo_name),
                 description=self.description % repo_name,
                 language=self.language,
                 ttl=self.ttl
@@ -150,8 +150,7 @@ class FeedController(BaseRepoController):
         def _generate_feed(cache_key):
             feed = Rss201rev2Feed(
                 title=self.title % repo_name,
-                link=url('summary_home', repo_name=repo_name,
-                         qualified=True),
+                link=h.route_url('repo_summary', repo_name=repo_name),
                 description=self.description % repo_name,
                 language=self.language,
                 ttl=self.ttl
diff --git a/rhodecode/controllers/files.py b/rhodecode/controllers/files.py
index af5230f6..f80f7571 100644
--- a/rhodecode/controllers/files.py
+++ b/rhodecode/controllers/files.py
@@ -101,7 +101,7 @@ class FilesController(BaseRepoController):
                 add_new = ""
             h.flash(h.literal(
                 _('There are no files yet. %s') % add_new), category='warning')
-            redirect(h.url('summary_home', repo_name=repo_name))
+            redirect(h.route_path('repo_summary', repo_name=repo_name))
         except (CommitDoesNotExistError, LookupError):
             msg = _('No such commit exists for this repository')
             h.flash(msg, category='error')
@@ -669,14 +669,14 @@ class FilesController(BaseRepoController):
 
         # If there's no commit, redirect to repo summary
         if type(c.commit) is EmptyCommit:
-            redirect_url = "summary_home"
+            redirect_url = h.route_path('repo_summary', repo_name=c.repo_name)
         else:
-            redirect_url = "changeset_home"
+            redirect_url = url("changeset_home", repo_name=c.repo_name,
+                               revision='tip')
 
         if not filename:
             h.flash(_('No filename'), category='warning')
-            return redirect(url(redirect_url, repo_name=c.repo_name,
-                                revision='tip'))
+            return redirect(redirect_url)
 
         # extract the location from filename,
         # allows using foo/bar.txt syntax to create subdirectories
diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py
index 9166f2e1..266c1fb9 100644
--- a/rhodecode/controllers/pullrequests.py
+++ b/rhodecode/controllers/pullrequests.py
@@ -85,7 +85,7 @@ class PullrequestsController(BaseRepoController):
         except EmptyRepositoryError:
             h.flash(h.literal(_('There are no commits yet')),
                     category='warning')
-            redirect(url('summary_home', repo_name=source_repo.repo_name))
+            redirect(h.route_path('repo_summary', repo_name=source_repo.repo_name))
 
         commit_id = request.GET.get('commit')
         branch_ref = request.GET.get('branch')
diff --git a/rhodecode/lib/action_parser.py b/rhodecode/lib/action_parser.py
index 91a17b1e..6349d67e 100644
--- a/rhodecode/lib/action_parser.py
+++ b/rhodecode/lib/action_parser.py
@@ -161,8 +161,9 @@ class ActionParser(object):
         return action_map
 
     def get_fork_name(self):
+        from rhodecode.lib import helpers as h
         repo_name = self.action_params
-        _url = url('summary_home', repo_name=repo_name)
+        _url = h.route_path('repo_summary', repo_name=repo_name)
         return _('fork name %s') % link_to(self.action_params, _url)
 
     def get_user_name(self):
diff --git a/rhodecode/lib/auth.py b/rhodecode/lib/auth.py
index 7bfa5140..8ea3b1ae 100644
--- a/rhodecode/lib/auth.py
+++ b/rhodecode/lib/auth.py
@@ -1342,7 +1342,7 @@ class HasAcceptedRepoType(object):
                 _('Action not supported for %s.' % rhodecode_repo.alias)),
                 category='warning')
             return redirect(
-                url('summary_home', repo_name=cls.rhodecode_db_repo.repo_name))
+                h.route_path('repo_summary', repo_name=cls.rhodecode_db_repo.repo_name))
 
 
 class PermsDecorator(object):
diff --git a/rhodecode/lib/base.py b/rhodecode/lib/base.py
index 1b848fad..f386621b 100644
--- a/rhodecode/lib/base.py
+++ b/rhodecode/lib/base.py
@@ -580,7 +580,7 @@ class BaseRepoController(BaseController):
             'Requirements are missing for repository %s: %s',
             c.repo_name, error.message)
 
-        summary_url = url('summary_home', repo_name=c.repo_name)
+        summary_url = h.route_path('repo_summary', repo_name=c.repo_name)
         statistics_url = url('edit_repo_statistics', repo_name=c.repo_name)
         settings_update_url = url('repo', repo_name=c.repo_name)
         path = request.path
diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py
index e0dde63a..90239df1 100644
--- a/rhodecode/lib/helpers.py
+++ b/rhodecode/lib/helpers.py
@@ -1538,7 +1538,7 @@ def breadcrumb_repo_link(repo):
         link_to(group.name, route_path('repo_group_home', repo_group_name=group.group_name))
         for group in repo.groups_with_parents
     ] + [
-        link_to(repo.just_name, url('summary_home', repo_name=repo.repo_name))
+        link_to(repo.just_name, route_path('repo_summary', repo_name=repo.repo_name))
     ]
 
     return literal(' &raquo; '.join(path))
diff --git a/rhodecode/model/comment.py b/rhodecode/model/comment.py
index 1c487d0a..6c2d791d 100644
--- a/rhodecode/model/comment.py
+++ b/rhodecode/model/comment.py
@@ -268,8 +268,7 @@ class CommentsModel(BaseModel):
 
             target_repo_url = h.link_to(
                 repo.repo_name,
-                h.url('summary_home',
-                      repo_name=repo.repo_name, qualified=True))
+                h.route_url('repo_summary', repo_name=repo.repo_name))
 
             # commit specifics
             kwargs.update({
@@ -300,13 +299,11 @@ class CommentsModel(BaseModel):
                 qualified=True,)
 
             # set some variables for email notification
-            pr_target_repo_url = h.url(
-                'summary_home', repo_name=pr_target_repo.repo_name,
-                qualified=True)
+            pr_target_repo_url = h.route_url(
+                'repo_summary', repo_name=pr_target_repo.repo_name)
 
-            pr_source_repo_url = h.url(
-                'summary_home', repo_name=pr_source_repo.repo_name,
-                qualified=True)
+            pr_source_repo_url = h.route_url(
+                'repo_summary', repo_name=pr_source_repo.repo_name)
 
             # pull request specifics
             kwargs.update({
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index b3e6df51..9f937a28 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -1765,6 +1765,7 @@ class Repository(Base, BaseModel):
         # 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
@@ -1774,7 +1775,7 @@ class Repository(Base, BaseModel):
             'repo_name': repo.repo_name,
             'repo_type': repo.repo_type,
             'clone_uri': repo.clone_uri or '',
-            'url': repo.home_url(),
+            'url': RepoModel().get_url(self),
             'private': repo.private,
             'created_on': repo.created_on,
             'description': repo.description,
@@ -1935,10 +1936,6 @@ class Repository(Base, BaseModel):
                              repo_name=self.repo_name,
                              repo_id=self.repo_id, **override)
 
-    def home_url(self):
-        request = get_current_request()
-        return request.route_url('repo_summary', repo_name=self.repo_name)
-
     def set_state(self, state):
         self.repo_state = state
         Session().add(self)
diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py
index 41faf511..ff8aec6d 100644
--- a/rhodecode/model/pull_request.py
+++ b/rhodecode/model/pull_request.py
@@ -999,15 +999,11 @@ class PullRequestModel(BaseModel):
             qualified=True,)
 
         # set some variables for email notification
-        pr_target_repo_url = h.url(
-            'summary_home',
-            repo_name=pr_target_repo.repo_name,
-            qualified=True)
+        pr_target_repo_url = h.route_url(
+            'repo_summary', repo_name=pr_target_repo.repo_name)
 
-        pr_source_repo_url = h.url(
-            'summary_home',
-            repo_name=pr_source_repo.repo_name,
-            qualified=True)
+        pr_source_repo_url = h.route_url(
+            'repo_summary', repo_name=pr_source_repo.repo_name)
 
         # pull request specifics
         pull_request_commits = [
diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py
index f08cbe6f..74e9dd37 100644
--- a/rhodecode/model/repo.py
+++ b/rhodecode/model/repo.py
@@ -30,6 +30,7 @@ import time
 import traceback
 from datetime import datetime, timedelta
 
+from pyramid.threadlocal import get_current_request
 from zope.cachedescriptors.property import Lazy as LazyProperty
 
 from rhodecode import events
@@ -154,9 +155,10 @@ class RepoModel(BaseModel):
             repos = Repository.query().filter(Repository.group == root).all()
         return repos
 
-    def get_url(self, repo):
-        return h.url('summary_home', repo_name=safe_str(repo.repo_name),
-            qualified=True)
+    def get_url(self, repo, request=None):
+        if not request:
+            request = get_current_request()
+        return request.route_url('repo_summary', repo_name=safe_str(repo.repo_name))
 
     @classmethod
     def update_repoinfo(cls, repositories=None):
diff --git a/rhodecode/public/css/summary.less b/rhodecode/public/css/summary.less
index 716e7128..8b136dab 100644
--- a/rhodecode/public/css/summary.less
+++ b/rhodecode/public/css/summary.less
@@ -215,6 +215,7 @@
     float: left;
     display: block;
     position: relative;
+    width: 100%;
 
     // adds some space to make copy and paste easier
     .left-label,
diff --git a/rhodecode/public/js/rhodecode/base/keyboard-bindings.js b/rhodecode/public/js/rhodecode/base/keyboard-bindings.js
index 7d62b979..4db14fcc 100644
--- a/rhodecode/public/js/rhodecode/base/keyboard-bindings.js
+++ b/rhodecode/public/js/rhodecode/base/keyboard-bindings.js
@@ -62,7 +62,7 @@ function setRCMouseBindings(repoName, repoLandingRev) {
         // nav in repo context
         Mousetrap.bind(['g s'], function(e) {
             window.location = pyroutes.url(
-                'summary_home', {'repo_name': repoName});
+                'repo_summary', {'repo_name': repoName});
         });
         Mousetrap.bind(['g c'], function(e) {
             window.location = pyroutes.url(
diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js
index ba7d6c96..c9b42823 100644
--- a/rhodecode/public/js/rhodecode/routes.js
+++ b/rhodecode/public/js/rhodecode/routes.js
@@ -18,9 +18,6 @@ function registerRCRoutes() {
     pyroutes.register('gists', '/_admin/gists', []);
     pyroutes.register('new_gist', '/_admin/gists/new', []);
     pyroutes.register('toggle_following', '/_admin/toggle_following', []);
-    pyroutes.register('repo_stats', '/%(repo_name)s/repo_stats/%(commit_id)s', ['repo_name', 'commit_id']);
-    pyroutes.register('repo_refs_data', '/%(repo_name)s/refs-data', ['repo_name']);
-    pyroutes.register('repo_refs_changelog_data', '/%(repo_name)s/refs-data-changelog', ['repo_name']);
     pyroutes.register('changeset_home', '/%(repo_name)s/changeset/%(revision)s', ['repo_name', 'revision']);
     pyroutes.register('changeset_comment', '/%(repo_name)s/changeset/%(revision)s/comment', ['repo_name', 'revision']);
     pyroutes.register('changeset_comment_preview', '/%(repo_name)s/changeset/comment/preview', ['repo_name']);
@@ -46,8 +43,6 @@ function registerRCRoutes() {
     pyroutes.register('files_archive_home', '/%(repo_name)s/archive/%(fname)s', ['repo_name', 'fname']);
     pyroutes.register('files_nodelist_home', '/%(repo_name)s/nodelist/%(revision)s/%(f_path)s', ['repo_name', 'revision', 'f_path']);
     pyroutes.register('files_nodetree_full', '/%(repo_name)s/nodetree_full/%(commit_id)s/%(f_path)s', ['repo_name', 'commit_id', 'f_path']);
-    pyroutes.register('summary_home_slash', '/%(repo_name)s/', ['repo_name']);
-    pyroutes.register('summary_home', '/%(repo_name)s', ['repo_name']);
     pyroutes.register('favicon', '/favicon.ico', []);
     pyroutes.register('robots', '/robots.txt', []);
     pyroutes.register('auth_home', '/_admin/auth*traverse', []);
@@ -99,8 +94,11 @@ function registerRCRoutes() {
     pyroutes.register('user_group_autocomplete_data', '/_user_groups', []);
     pyroutes.register('repo_list_data', '/_repos', []);
     pyroutes.register('goto_switcher_data', '/_goto_data', []);
-    pyroutes.register('repo_summary', '/%(repo_name)s', ['repo_name']);
     pyroutes.register('repo_summary_explicit', '/%(repo_name)s/summary', ['repo_name']);
+    pyroutes.register('repo_summary_commits', '/%(repo_name)s/summary-commits', ['repo_name']);
+    pyroutes.register('repo_refs_data', '/%(repo_name)s/refs-data', ['repo_name']);
+    pyroutes.register('repo_refs_changelog_data', '/%(repo_name)s/refs-data-changelog', ['repo_name']);
+    pyroutes.register('repo_stats', '/%(repo_name)s/repo_stats/%(commit_id)s', ['repo_name', 'commit_id']);
     pyroutes.register('tags_home', '/%(repo_name)s/tags', ['repo_name']);
     pyroutes.register('branches_home', '/%(repo_name)s/branches', ['repo_name']);
     pyroutes.register('bookmarks_home', '/%(repo_name)s/bookmarks', ['repo_name']);
@@ -122,6 +120,8 @@ function registerRCRoutes() {
     pyroutes.register('strip', '/%(repo_name)s/settings/strip', ['repo_name']);
     pyroutes.register('strip_check', '/%(repo_name)s/settings/strip_check', ['repo_name']);
     pyroutes.register('strip_execute', '/%(repo_name)s/settings/strip_execute', ['repo_name']);
+    pyroutes.register('repo_summary', '/%(repo_name)s', ['repo_name']);
+    pyroutes.register('repo_summary_slash', '/%(repo_name)s/', ['repo_name']);
     pyroutes.register('repo_group_home', '/%(repo_group_name)s', ['repo_group_name']);
     pyroutes.register('repo_group_home_slash', '/%(repo_group_name)s/', ['repo_group_name']);
     pyroutes.register('search', '/_admin/search', []);
diff --git a/rhodecode/templates/admin/admin_log_base.mako b/rhodecode/templates/admin/admin_log_base.mako
index afef8ef5..e84725d2 100644
--- a/rhodecode/templates/admin/admin_log_base.mako
+++ b/rhodecode/templates/admin/admin_log_base.mako
@@ -45,7 +45,7 @@
         </td>
         <td class="td-componentname">
             %if l.repository is not None:
-              ${h.link_to(l.repository.repo_name,h.url('summary_home',repo_name=l.repository.repo_name))}
+              ${h.link_to(l.repository.repo_name, h.route_path('repo_summary',repo_name=l.repository.repo_name))}
             %else:
               ${l.repository_name}
             %endif
diff --git a/rhodecode/templates/admin/integrations/list.mako b/rhodecode/templates/admin/integrations/list.mako
index d418c0fb..3918302b 100644
--- a/rhodecode/templates/admin/integrations/list.mako
+++ b/rhodecode/templates/admin/integrations/list.mako
@@ -160,7 +160,7 @@
           </td>
           <td class="td-scope">
             %if integration.repo:
-            <a href="${h.url('summary_home', repo_name=integration.repo.repo_name)}">
+            <a href="${h.route_path('repo_summary', repo_name=integration.repo.repo_name)}">
               ${_('repo')}:${integration.repo.repo_name}
             </a>
             %elif integration.repo_group:
diff --git a/rhodecode/templates/admin/repos/repo_creating.mako b/rhodecode/templates/admin/repos/repo_creating.mako
index 3a0cd96d..0cfddf14 100644
--- a/rhodecode/templates/admin/repos/repo_creating.mako
+++ b/rhodecode/templates/admin/repos/repo_creating.mako
@@ -48,12 +48,12 @@
             if (jsonResponse === undefined) {
                 setTimeout(function () {
                     // we might have a backend problem, try dashboard again
-                    window.location = "${h.url('summary_home', repo_name = c.repo)}";
+                    window.location = "${h.route_path('repo_summary', repo_name = c.repo)}";
                 }, 3000);
             } else {
                 if (skipCheck || jsonResponse.result === true) {
                     // success, means go to dashboard
-                    window.location = "${h.url('summary_home', repo_name = c.repo)}";
+                    window.location = "${h.route_path('repo_summary', repo_name = c.repo)}";
                 } else {
                     // Schedule the next request when the current one's complete
                     setTimeout(worker, 1000);
diff --git a/rhodecode/templates/admin/repos/repo_edit_advanced.mako b/rhodecode/templates/admin/repos/repo_edit_advanced.mako
index 529843a4..7b8cbda3 100644
--- a/rhodecode/templates/admin/repos/repo_edit_advanced.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_advanced.mako
@@ -27,7 +27,7 @@
       ${h.secure_form(h.route_path('edit_repo_advanced_fork', repo_name=c.repo_info.repo_name), method='POST')}
 
         % if c.repo_info.fork:
-            <div class="panel-body-title-text">${h.literal(_('This repository is a fork of %(repo_link)s') % {'repo_link': h.link_to_if(c.has_origin_repo_read_perm,c.repo_info.fork.repo_name, h.url('summary_home', repo_name=c.repo_info.fork.repo_name))})}
+            <div class="panel-body-title-text">${h.literal(_('This repository is a fork of %(repo_link)s') % {'repo_link': h.link_to_if(c.has_origin_repo_read_perm,c.repo_info.fork.repo_name, h.route_path('repo_summary', repo_name=c.repo_info.fork.repo_name))})}
             | <button class="btn btn-link btn-danger" type="submit">Remove fork reference</button></div>
         % endif
 
diff --git a/rhodecode/templates/admin/settings/settings_system.mako b/rhodecode/templates/admin/settings/settings_system.mako
index 94e3e8e6..89117e3f 100644
--- a/rhodecode/templates/admin/settings/settings_system.mako
+++ b/rhodecode/templates/admin/settings/settings_system.mako
@@ -52,6 +52,6 @@
 <script>
     $('#check_for_update').click(function(e){
         $('#update_notice').show();
-        $('#update_notice').load("${h.route_path('admin_settings_system_update',version=c.rhodecode_version, platform=c.platform)}");
+        $('#update_notice').load("${h.route_path('admin_settings_system_update')}");
     })
 </script>
diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako
index edaf471f..be474416 100644
--- a/rhodecode/templates/base/base.mako
+++ b/rhodecode/templates/base/base.mako
@@ -186,7 +186,7 @@
     %if repo_instance.fork:
     <p>
         <i class="icon-code-fork"></i> ${_('Fork of')}
-        <a href="${h.url('summary_home',repo_name=repo_instance.fork.repo_name)}">${repo_instance.fork.repo_name}</a>
+        <a href="${h.route_path('repo_summary',repo_name=repo_instance.fork.repo_name)}">${repo_instance.fork.repo_name}</a>
     </p>
     %endif
 
@@ -225,7 +225,7 @@
   <div id="context-bar">
     <div class="wrapper">
       <ul id="context-pages" class="horizontal-list navigation">
-        <li class="${is_active('summary')}"><a class="menulink" href="${h.url('summary_home', repo_name=c.repo_name)}"><div class="menulabel">${_('Summary')}</div></a></li>
+        <li class="${is_active('summary')}"><a class="menulink" href="${h.route_path('repo_summary', repo_name=c.repo_name)}"><div class="menulabel">${_('Summary')}</div></a></li>
         <li class="${is_active('changelog')}"><a class="menulink" href="${h.url('changelog_home', repo_name=c.repo_name)}"><div class="menulabel">${_('Changelog')}</div></a></li>
         <li class="${is_active('files')}"><a class="menulink" href="${h.url('files_home', repo_name=c.repo_name, revision=c.rhodecode_db_repo.landing_rev[1])}"><div class="menulabel">${_('Files')}</div></a></li>
         <li class="${is_active('compare')}">
diff --git a/rhodecode/templates/base/perms_summary.mako b/rhodecode/templates/base/perms_summary.mako
index 773dfee5..1b22f0f2 100644
--- a/rhodecode/templates/base/perms_summary.mako
+++ b/rhodecode/templates/base/perms_summary.mako
@@ -124,7 +124,7 @@
                 <tr class="perm_row ${'%s_%s' % (section, section_perm.split('.')[-1])}">
                     <td class="td-componentname">
                         %if section == 'repositories':
-                            <a href="${h.url('summary_home',repo_name=k)}">${k}</a>
+                            <a href="${h.route_path('repo_summary',repo_name=k)}">${k}</a>
                         %elif section == 'repositories_groups':
                             <a href="${h.route_path('repo_group_home', repo_group_name=k)}">${k}</a>
                         %elif section == 'user_groups':
diff --git a/rhodecode/templates/data_table/_dt_elements.mako b/rhodecode/templates/data_table/_dt_elements.mako
index f5e78613..18d5690c 100644
--- a/rhodecode/templates/data_table/_dt_elements.mako
+++ b/rhodecode/templates/data_table/_dt_elements.mako
@@ -9,7 +9,7 @@
   <div class="menu_items_container hidden">
     <ul class="menu_items">
       <li>
-         <a title="${_('Summary')}" href="${h.url('summary_home',repo_name=repo_name)}">
+         <a title="${_('Summary')}" href="${h.route_path('repo_summary',repo_name=repo_name)}">
          <span>${_('Summary')}</span>
          </a>
       </li>
@@ -42,7 +42,7 @@
     %>
   <div class="${'repo_state_pending' if rstate == 'repo_state_pending' else ''} truncate">
     ##NAME
-    <a href="${h.route_path('edit_repo',repo_name=name) if admin else h.url('summary_home',repo_name=name)}">
+    <a href="${h.route_path('edit_repo',repo_name=name) if admin else h.route_path('repo_summary',repo_name=name)}">
 
     ##TYPE OF REPO
     %if h.is_hg(rtype):
@@ -64,7 +64,7 @@
     ${get_name(name)}
     </a>
     %if fork_of:
-      <a href="${h.url('summary_home',repo_name=fork_of.repo_name)}"><i class="icon-code-fork"></i></a>
+      <a href="${h.route_path('repo_summary',repo_name=fork_of.repo_name)}"><i class="icon-code-fork"></i></a>
     %endif
     %if rstate == 'repo_state_pending':
       <i class="icon-cogs" title="${_('Repository creating in progress...')}"></i>
@@ -282,7 +282,7 @@
 
 <%def name="pullrequest_target_repo(repo_name)">
     <div class="truncate">
-      ${h.link_to(repo_name,h.url('summary_home',repo_name=repo_name))}
+      ${h.link_to(repo_name,h.route_path('repo_summary',repo_name=repo_name))}
     </div>
 </%def>
 <%def name="pullrequest_status(status)">
diff --git a/rhodecode/templates/forks/forks_data.mako b/rhodecode/templates/forks/forks_data.mako
index 61a03ee0..78030ed7 100644
--- a/rhodecode/templates/forks/forks_data.mako
+++ b/rhodecode/templates/forks/forks_data.mako
@@ -16,7 +16,7 @@
               ${base.gravatar_with_user(f.user.email, 16)}
             </td>
             <td class="td-componentname">
-              ${h.link_to(f.repo_name,h.url('summary_home',repo_name=f.repo_name))}
+              ${h.link_to(f.repo_name,h.route_path('repo_summary',repo_name=f.repo_name))}
             </td>
             <td class="td-description">
                 <div class="truncate">${f.description}</div>
diff --git a/rhodecode/templates/journal/journal_data.mako b/rhodecode/templates/journal/journal_data.mako
index 1d932053..dd140016 100644
--- a/rhodecode/templates/journal/journal_data.mako
+++ b/rhodecode/templates/journal/journal_data.mako
@@ -20,7 +20,7 @@
                         <span class="journal_repo_name">
                         %if entry.repository is not None:
                           ${h.link_to(entry.repository.repo_name,
-                                      h.url('summary_home',repo_name=entry.repository.repo_name))}
+                                      h.route_path('repo_summary',repo_name=entry.repository.repo_name))}
                         %else:
                           ${entry.repository_name}
                         %endif
diff --git a/rhodecode/templates/pullrequests/pullrequest_show.mako b/rhodecode/templates/pullrequests/pullrequest_show.mako
index 588accb2..edbbe0b2 100644
--- a/rhodecode/templates/pullrequests/pullrequest_show.mako
+++ b/rhodecode/templates/pullrequests/pullrequest_show.mako
@@ -81,7 +81,7 @@
                       %endif
                     </span>
                     <span class="clone-url">
-                        <a href="${h.url('summary_home', repo_name=c.pull_request.source_repo.repo_name)}">${c.pull_request.source_repo.clone_url()}</a>
+                        <a href="${h.route_path('repo_summary', repo_name=c.pull_request.source_repo.repo_name)}">${c.pull_request.source_repo.clone_url()}</a>
                     </span>
                     <br/>
                     % if c.ancestor_commit:
@@ -113,7 +113,7 @@
                       %endif
                     </span>
                     <span class="clone-url">
-                        <a href="${h.url('summary_home', repo_name=c.pull_request.target_repo.repo_name)}">${c.pull_request.target_repo.clone_url()}</a>
+                        <a href="${h.route_path('repo_summary', repo_name=c.pull_request.target_repo.repo_name)}">${c.pull_request.target_repo.clone_url()}</a>
                     </span>
                 </div>
             </div>
diff --git a/rhodecode/templates/search/search_commit.mako b/rhodecode/templates/search/search_commit.mako
index 45670811..7844da46 100644
--- a/rhodecode/templates/search/search_commit.mako
+++ b/rhodecode/templates/search/search_commit.mako
@@ -27,7 +27,7 @@
                     %elif h.get_repo_type_by_name(entry.get('repository')) == 'svn':
                         <i class="icon-svn"></i>
                     %endif
-                    ${h.link_to(entry['repository'], h.url('summary_home',repo_name=entry['repository']))}
+                    ${h.link_to(entry['repository'], h.route_path('repo_summary',repo_name=entry['repository']))}
                 </td>
                 <td class="td-commit">
                     ${h.link_to(h._shorten_commit_id(entry['commit_id']),
diff --git a/rhodecode/templates/search/search_content.mako b/rhodecode/templates/search/search_content.mako
index aebe039d..20893279 100644
--- a/rhodecode/templates/search/search_content.mako
+++ b/rhodecode/templates/search/search_content.mako
@@ -49,7 +49,7 @@ ${h.code_highlight(
             %elif h.get_repo_type_by_name(entry.get('repository')) == 'svn':
                 <i class="icon-svn"></i>
             %endif
-            ${h.link_to(entry['repository'], h.url('summary_home',repo_name=entry['repository']))}
+            ${h.link_to(entry['repository'], h.route_path('repo_summary',repo_name=entry['repository']))}
           </h2>
           <div class="stats">
             ${h.link_to(h.literal(entry['f_path']), h.url('files_home',repo_name=entry['repository'],revision=entry.get('commit_id', 'tip'),f_path=entry['f_path']))}
diff --git a/rhodecode/templates/search/search_path.mako b/rhodecode/templates/search/search_path.mako
index 53725db2..ff7c55cc 100644
--- a/rhodecode/templates/search/search_path.mako
+++ b/rhodecode/templates/search/search_path.mako
@@ -16,7 +16,7 @@
                     %elif h.get_repo_type_by_name(entry.get('repository')) == 'svn':
                         <i class="icon-svn"></i>
                     %endif
-                    ${h.link_to(entry['repository'], h.url('summary_home',repo_name=entry['repository']))}
+                    ${h.link_to(entry['repository'], h.route_path('repo_summary',repo_name=entry['repository']))}
                 </td>
                 <td class="td-componentname">
                     ${h.link_to(h.literal(entry['f_path']),
diff --git a/rhodecode/templates/summary/components.mako b/rhodecode/templates/summary/components.mako
index 1f721f26..0c0353a7 100644
--- a/rhodecode/templates/summary/components.mako
+++ b/rhodecode/templates/summary/components.mako
@@ -1,28 +1,28 @@
 <%def name="refs_counters(branches, closed_branches, tags, bookmarks)">
     <span class="branchtag tag">
     <a href="${h.route_path('branches_home',repo_name=c.repo_name)}" class="childs">
-      <i class="icon-branch"></i>${ungettext(
+      <i class="icon-branch"></i>${_ungettext(
       '%(num)s Branch','%(num)s Branches', len(branches)) % {'num': len(branches)}}</a>
     </span>
 
     %if closed_branches:
     <span class="branchtag tag">
     <a href="${h.route_path('branches_home',repo_name=c.repo_name)}" class="childs">
-      <i class="icon-branch"></i>${ungettext(
+      <i class="icon-branch"></i>${_ungettext(
       '%(num)s Closed Branch', '%(num)s Closed Branches', len(closed_branches)) % {'num': len(closed_branches)}}</a>
     </span>
     %endif
 
     <span class="tagtag tag">
     <a href="${h.route_path('tags_home',repo_name=c.repo_name)}" class="childs">
-        <i class="icon-tag"></i>${ungettext(
+        <i class="icon-tag"></i>${_ungettext(
         '%(num)s Tag', '%(num)s Tags', len(tags)) % {'num': len(tags)}}</a>
     </span>
 
     %if bookmarks:
     <span class="booktag tag">
     <a href="${h.route_path('bookmarks_home',repo_name=c.repo_name)}" class="childs">
-        <i class="icon-bookmark"></i>${ungettext(
+        <i class="icon-bookmark"></i>${_ungettext(
         '%(num)s Bookmark', '%(num)s Bookmarks', len(bookmarks)) % {'num': len(bookmarks)}}</a>
     </span>
     %endif
@@ -92,15 +92,15 @@
 
                   ## commits
                   % if commit_rev == -1:
-                      ${ungettext('%(num)s Commit', '%(num)s Commits', 0) % {'num': 0}},
+                      ${_ungettext('%(num)s Commit', '%(num)s Commits', 0) % {'num': 0}},
                   % else:
                       <a href="${h.url('changelog_home', repo_name=c.repo_name)}">
-                        ${ungettext('%(num)s Commit', '%(num)s Commits', commit_rev) % {'num': commit_rev}}</a>,
+                        ${_ungettext('%(num)s Commit', '%(num)s Commits', commit_rev) % {'num': commit_rev}}</a>,
                   % endif
 
                   ## forks
                   <a title="${_('Number of Repository Forks')}" href="${h.url('repo_forks_home', repo_name=c.repo_name)}">
-                     ${c.repository_forks} ${ungettext('Fork', 'Forks', c.repository_forks)}</a>,
+                     ${c.repository_forks} ${_ungettext('Fork', 'Forks', c.repository_forks)}</a>,
 
                   ## repo size
                   % if commit_rev == -1:
diff --git a/rhodecode/templates/summary/missing_requirements.mako b/rhodecode/templates/summary/missing_requirements.mako
index e96cde64..6991361f 100644
--- a/rhodecode/templates/summary/missing_requirements.mako
+++ b/rhodecode/templates/summary/missing_requirements.mako
@@ -14,8 +14,14 @@
 
   <div class="alert alert-dismissable alert-warning">
     <strong>Missing requirements</strong>
-    These commits cannot be displayed, because this repository uses the Mercurial largefiles extension, which was not enabled.
-    Please <a href="${h.url('repo_vcs_settings', repo_name=c.repo_name)}">enable this extension in settings</a>, or contact the repository owner for help.
+    Commits cannot be displayed, because this repository uses one or more extensions, which was not enabled. <br/>
+    Please <a href="${h.url('repo_vcs_settings', repo_name=c.repo_name)}">enable extension in settings</a>, or contact the repository owner for help.
+    Missing extensions could be:
+<pre>
+
+- Mercurial largefiles
+- Git LFS
+</pre>
   </div>
 
 </%def>
diff --git a/rhodecode/templates/summary/summary.mako b/rhodecode/templates/summary/summary.mako
index 2cbc4938..63f7cc9e 100644
--- a/rhodecode/templates/summary/summary.mako
+++ b/rhodecode/templates/summary/summary.mako
@@ -36,7 +36,7 @@
      %endif
     <div class="table">
         <div id="shortlog_data">
-            <%include file='../changelog/changelog_summary_data.mako'/>
+            <%include file='summary_commits.mako'/>
         </div>
     </div>
 </div>
@@ -110,8 +110,7 @@ $(document).ready(function(){
 
         var callback = function (data) {
             % if c.show_stats:
-                showRepoStats(
-                    'lang_stats', data);
+                showRepoStats('lang_stats', data);
             % endif
         };
 
diff --git a/rhodecode/templates/changelog/changelog_summary_data.mako b/rhodecode/templates/summary/summary_commits.mako
similarity index 100%
rename from rhodecode/templates/changelog/changelog_summary_data.mako
rename to rhodecode/templates/summary/summary_commits.mako
diff --git a/rhodecode/tests/events/test_repo.py b/rhodecode/tests/events/test_repo.py
index 8b3b83c9..66d89180 100644
--- a/rhodecode/tests/events/test_repo.py
+++ b/rhodecode/tests/events/test_repo.py
@@ -56,7 +56,7 @@ def scm_extras(user_regular, repo_stub):
     RepoPreCreateEvent, RepoCreateEvent,
     RepoPreDeleteEvent, RepoDeleteEvent,
 ])
-def test_repo_events_serialized(repo_stub, EventClass):
+def test_repo_events_serialized(config_stub, repo_stub, EventClass):
     event = EventClass(repo_stub)
     data = event.as_dict()
     assert data['name'] == EventClass.name
@@ -67,7 +67,7 @@ def test_repo_events_serialized(repo_stub, EventClass):
 @pytest.mark.parametrize('EventClass', [
     RepoPrePullEvent, RepoPullEvent, RepoPrePushEvent
 ])
-def test_vcs_repo_events_serialize(repo_stub, scm_extras, EventClass):
+def test_vcs_repo_events_serialize(config_stub, repo_stub, scm_extras, EventClass):
     event = EventClass(repo_name=repo_stub.repo_name, extras=scm_extras)
     data = event.as_dict()
     assert data['name'] == EventClass.name
@@ -76,7 +76,7 @@ def test_vcs_repo_events_serialize(repo_stub, scm_extras, EventClass):
 
 
 @pytest.mark.parametrize('EventClass', [RepoPushEvent])
-def test_vcs_repo_push_event_serialize(repo_stub, scm_extras, EventClass):
+def test_vcs_repo_push_event_serialize(config_stub, repo_stub, scm_extras, EventClass):
     event = EventClass(repo_name=repo_stub.repo_name,
                        pushed_commit_ids=scm_extras['commit_ids'],
                        extras=scm_extras)
diff --git a/rhodecode/tests/functional/test_admin_repos.py b/rhodecode/tests/functional/test_admin_repos.py
index 92e4629d..eefbabe1 100644
--- a/rhodecode/tests/functional/test_admin_repos.py
+++ b/rhodecode/tests/functional/test_admin_repos.py
@@ -24,10 +24,10 @@ import mock
 import pytest
 
 from rhodecode.lib import auth
-from rhodecode.lib.utils2 import safe_str, str2bool, safe_unicode
-from rhodecode.lib.vcs.exceptions import RepositoryRequirementError
-from rhodecode.model.db import Repository, RepoGroup, UserRepoToPerm, User,\
-    Permission
+from rhodecode.lib.utils2 import safe_str, str2bool
+from rhodecode.lib import helpers as h
+from rhodecode.model.db import (
+    Repository, RepoGroup, UserRepoToPerm, User, Permission)
 from rhodecode.model.meta import Session
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.repo_group import RepoGroupModel
@@ -475,7 +475,7 @@ class TestAdminRepos(object):
         assert new_repo.description == description
 
         # test if the repository is visible in the list ?
-        response = self.app.get(url('summary_home', repo_name=repo_name))
+        response = self.app.get(h.route_path('repo_summary', repo_name=repo_name))
         response.mustcontain(repo_name)
         response.mustcontain(backend.alias)
 
diff --git a/rhodecode/tests/functional/test_files.py b/rhodecode/tests/functional/test_files.py
index cbc18225..d6473c12 100644
--- a/rhodecode/tests/functional/test_files.py
+++ b/rhodecode/tests/functional/test_files.py
@@ -796,11 +796,12 @@ class TestChangingFiles:
 
         # Not allowed, redirect to the summary
         redirected = response.follow()
-        summary_url = url('summary_home', repo_name=repo.repo_name)
+        summary_url = h.route_path('repo_summary', repo_name=repo.repo_name)
 
         # As there are no commits, displays the summary page with the error of
         # creating a file with no filename
-        assert redirected.req.path == summary_url
+
+        assert redirected.request.path == summary_url
 
     @pytest.mark.parametrize("location, filename", [
         ('/abs', 'foo'),
diff --git a/rhodecode/tests/functional/test_forks.py b/rhodecode/tests/functional/test_forks.py
index 5bd807b4..b5f1466e 100644
--- a/rhodecode/tests/functional/test_forks.py
+++ b/rhodecode/tests/functional/test_forks.py
@@ -22,6 +22,7 @@ import pytest
 
 from rhodecode.tests import *
 from rhodecode.tests.fixture import Fixture
+from rhodecode.lib import helpers as h
 
 from rhodecode.model.db import Repository
 from rhodecode.model.repo import RepoModel
@@ -147,7 +148,7 @@ class _BaseTest(TestController):
         assert fork_repo.fork.repo_name == repo_name
 
         # test if the repository is visible in the list ?
-        response = self.app.get(url('summary_home', repo_name=fork_name_full))
+        response = self.app.get(h.route_path('repo_summary', repo_name=fork_name_full))
         response.mustcontain(fork_name_full)
         response.mustcontain(self.REPO_TYPE)
 
@@ -193,7 +194,7 @@ class _BaseTest(TestController):
         assert fork_repo.fork.repo_name == repo_name
 
         # test if the repository is visible in the list ?
-        response = self.app.get(url('summary_home', repo_name=fork_name))
+        response = self.app.get(h.route_path('repo_summary', repo_name=fork_name))
         response.mustcontain(fork_name)
         response.mustcontain(self.REPO_TYPE)
         response.mustcontain('Fork of')
@@ -254,7 +255,7 @@ class TestHG(_BaseTest):
 
 @pytest.mark.usefixtures('app', 'autologin_user')
 @pytest.mark.skip_backends('git','hg')
-class TestSVNFork:
+class TestSVNFork(object):
 
     def test_fork_redirects(self, backend):
         denied_actions = ['fork','fork_create']
@@ -266,7 +267,7 @@ class TestSVNFork:
 
             # Not allowed, redirect to the summary
             redirected = response.follow()
-            summary_url = url('summary_home', repo_name=backend.repo_name)
+            summary_url = h.route_path('repo_summary', repo_name=backend.repo_name)
 
             # URL adds leading slash and path doesn't have it
-            assert redirected.req.path == summary_url
+            assert redirected.request.path == summary_url
diff --git a/rhodecode/tests/functional/test_login.py b/rhodecode/tests/functional/test_login.py
index a3044784..242310b3 100644
--- a/rhodecode/tests/functional/test_login.py
+++ b/rhodecode/tests/functional/test_login.py
@@ -29,6 +29,7 @@ from rhodecode.tests import (
     no_newline_id_generator)
 from rhodecode.tests.fixture import Fixture
 from rhodecode.lib.auth import check_password
+from rhodecode.lib import helpers as h
 from rhodecode.model.auth_token import AuthTokenModel
 from rhodecode.model import validators
 from rhodecode.model.db import User, Notification, UserApiKeys
@@ -105,8 +106,9 @@ class TestLoginController(object):
         with fixture.anon_access(False):
             kwargs = {'branch': 'stable'}
             response = self.app.get(
-                url('summary_home', repo_name=HG_REPO, **kwargs))
+                h.route_path('repo_summary', repo_name=HG_REPO, _query=kwargs))
             assert response.status == '302 Found'
+
             response_query = urlparse.parse_qsl(response.location)
             assert 'branch=stable' in response_query[0][1]
 
diff --git a/rhodecode/tests/functional/test_pullrequests.py b/rhodecode/tests/functional/test_pullrequests.py
index 1553ba01..422c3e61 100644
--- a/rhodecode/tests/functional/test_pullrequests.py
+++ b/rhodecode/tests/functional/test_pullrequests.py
@@ -24,13 +24,13 @@ from webob.exc import HTTPNotFound
 
 import rhodecode
 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)
 from rhodecode.model.meta import Session
 from rhodecode.model.pull_request import PullRequestModel
 from rhodecode.model.user import UserModel
-from rhodecode.model.repo import RepoModel
 from rhodecode.tests import (
     assert_session_flash, url, TEST_USER_ADMIN_LOGIN, TEST_USER_REGULAR_LOGIN)
 from rhodecode.tests.utils import AssertResponse
@@ -38,7 +38,7 @@ from rhodecode.tests.utils import AssertResponse
 
 @pytest.mark.usefixtures('app', 'autologin_user')
 @pytest.mark.backends("git", "hg")
-class TestPullrequestsController:
+class TestPullrequestsController(object):
 
     def test_index(self, backend):
         self.app.get(url(
@@ -47,7 +47,7 @@ class TestPullrequestsController:
 
     def test_option_menu_create_pull_request_exists(self, backend):
         repo_name = backend.repo_name
-        response = self.app.get(url('summary_home', repo_name=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>' % url(
             'pullrequest', repo_name=repo_name)
@@ -1074,10 +1074,10 @@ def test_redirects_to_repo_summary_for_svn_repositories(backend_svn, app, action
 
     # Not allowed, redirect to the summary
     redirected = response.follow()
-    summary_url = url('summary_home', repo_name=backend_svn.repo_name)
+    summary_url = h.route_path('repo_summary', repo_name=backend_svn.repo_name)
 
     # URL adds leading slash and path doesn't have it
-    assert redirected.req.path == summary_url
+    assert redirected.request.path == summary_url
 
 
 def test_delete_comment_returns_404_if_comment_does_not_exist(pylonsapp):
diff --git a/rhodecode/tests/lib/test_base.py b/rhodecode/tests/lib/test_base.py
index cd3288de..c453fad2 100644
--- a/rhodecode/tests/lib/test_base.py
+++ b/rhodecode/tests/lib/test_base.py
@@ -20,10 +20,10 @@
 
 import pytest
 from mock import Mock, patch
-from pylons import url
 
 from rhodecode.lib import base
 from rhodecode.lib.vcs.exceptions import RepositoryRequirementError
+from rhodecode.lib import helpers as h
 from rhodecode.model import db
 
 
@@ -165,7 +165,7 @@ class TestBaseRepoControllerHandleMissingRequirements(object):
             context_mock.repo_name = repo_name
             controller._handle_missing_requirements(error)
 
-        expected_url = url('summary_home', repo_name=repo_name)
+        expected_url = h.route_path('repo_summary', repo_name=repo_name)
         if should_redirect:
             redirect_mock.assert_called_once_with(expected_url)
         else:
diff --git a/rhodecode/tests/plugin.py b/rhodecode/tests/plugin.py
index 9c724864..1a3155e0 100644
--- a/rhodecode/tests/plugin.py
+++ b/rhodecode/tests/plugin.py
@@ -1682,6 +1682,15 @@ def request_stub():
     return request
 
 
+@pytest.fixture
+def context_stub():
+    """
+    Stub context object.
+    """
+    context = pyramid.testing.DummyResource()
+    return context
+
+
 @pytest.fixture
 def config_stub(request, request_stub):
     """
diff --git a/rhodecode/tests/utils.py b/rhodecode/tests/utils.py
index 2edc357b..d569ce57 100644
--- a/rhodecode/tests/utils.py
+++ b/rhodecode/tests/utils.py
@@ -123,6 +123,7 @@ def set_anonymous_access(enabled):
     user.active = enabled
     Session().add(user)
     Session().commit()
+    time.sleep(1.5)  # must sleep for cache (1s to expire)
     log.info('anonymous access is now: %s', enabled)
     assert enabled == User.get_default_user().active, (
         'Cannot set anonymous access')

From 53d41696e03146dcfbc614c35117434333180c99 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 7 Jun 2017 14:35:27 +0200
Subject: [PATCH 149/211] pull-requests: expose author in creation view to be
 consistent with show view.

---
 .../templates/pullrequests/pullrequest.mako   | 27 ++++++++++++++++---
 .../pullrequests/pullrequest_show.mako        |  2 +-
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/rhodecode/templates/pullrequests/pullrequest.mako b/rhodecode/templates/pullrequests/pullrequest.mako
index 3d5cd54b..178d4a38 100644
--- a/rhodecode/templates/pullrequests/pullrequest.mako
+++ b/rhodecode/templates/pullrequests/pullrequest.mako
@@ -20,15 +20,22 @@
 <div class="box">
     <div class="title">
         ${self.repo_page_title(c.rhodecode_db_repo)}
-        ${self.breadcrumbs()}
     </div>
 
     ${h.secure_form(url('pullrequest', repo_name=c.repo_name), method='post', id='pull_request_form')}
+
+        ${self.breadcrumbs()}
+
         <div class="box pr-summary">
 
             <div class="summary-details block-left">
 
-                <div class="form">
+
+                <div class="pr-details-title">
+                    ${_('Pull request summary')}
+                </div>
+
+                <div class="form" style="padding-top: 10px">
                     <!-- fields -->
 
                     <div class="fields" >
@@ -102,7 +109,21 @@
                 </div>
             </div>
             <div>
-                ## REIEW RULES
+                ## AUTHOR
+                <div class="reviewers-title block-right">
+                  <div class="pr-details-title">
+                      ${_('Author of this pull request')}
+                  </div>
+                </div>
+                <div class="block-right pr-details-content reviewers">
+                    <ul class="group_members">
+                      <li>
+                        ${self.gravatar_with_user(c.rhodecode_user.email, 16)}
+                      </li>
+                    </ul>
+                </div>
+
+                ## REVIEW RULES
                 <div id="review_rules" style="display: none" class="reviewers-title block-right">
                     <div class="pr-details-title">
                         ${_('Reviewer rules')}
diff --git a/rhodecode/templates/pullrequests/pullrequest_show.mako b/rhodecode/templates/pullrequests/pullrequest_show.mako
index edbbe0b2..35533ac8 100644
--- a/rhodecode/templates/pullrequests/pullrequest_show.mako
+++ b/rhodecode/templates/pullrequests/pullrequest_show.mako
@@ -306,7 +306,7 @@
         ## AUTHOR
         <div class="reviewers-title block-right">
           <div class="pr-details-title">
-              ${_('Author')}
+              ${_('Author of this pull request')}
           </div>
         </div>
         <div class="block-right pr-details-content reviewers">

From 36f3dd22fb6c5de4f4a9664d3cdd64abc47afdcb Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 8 Jun 2017 13:39:54 +0200
Subject: [PATCH 150/211] review-rules: extend code to support the forbid
 commit authors.

---
 rhodecode/__init__.py                         |  2 +-
 rhodecode/controllers/pullrequests.py         | 13 +++++---
 .../dbmigrate/versions/078_version_4_8_0.py   | 33 +++++++++++++++++++
 rhodecode/model/db.py                         |  1 +
 .../public/js/src/rhodecode/pullrequests.js   | 15 +++++++++
 5 files changed, 59 insertions(+), 5 deletions(-)
 create mode 100644 rhodecode/lib/dbmigrate/versions/078_version_4_8_0.py

diff --git a/rhodecode/__init__.py b/rhodecode/__init__.py
index a4e96a15..f7f7f132 100644
--- a/rhodecode/__init__.py
+++ b/rhodecode/__init__.py
@@ -51,7 +51,7 @@ PYRAMID_SETTINGS = {}
 EXTENSIONS = {}
 
 __version__ = ('.'.join((str(each) for each in VERSION[:3])))
-__dbversion__ = 77  # defines current db version for migrations
+__dbversion__ = 78  # defines current db version for migrations
 __platform__ = platform.system()
 __license__ = 'AGPLv3, and Commercial License'
 __author__ = 'RhodeCode GmbH'
diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py
index 266c1fb9..2c96fc55 100644
--- a/rhodecode/controllers/pullrequests.py
+++ b/rhodecode/controllers/pullrequests.py
@@ -261,8 +261,8 @@ class PullrequestsController(BaseRepoController):
 
         # recalculate reviewers logic, to make sure we can validate this
         reviewer_rules = get_default_reviewers_data(
-            c.rhodecode_user, source_db_repo, source_commit, target_db_repo,
-            target_commit)
+            c.rhodecode_user.get_instance(), source_db_repo,
+            source_commit, target_db_repo, target_commit)
 
         reviewers = validate_default_reviewers(
             _form['review_members'], reviewer_rules)
@@ -634,13 +634,18 @@ class PullrequestsController(BaseRepoController):
 
         c.forbid_adding_reviewers = False
         c.forbid_author_to_review = False
+        c.forbid_commit_author_to_review = False
 
         if pull_request_latest.reviewer_data and \
                         'rules' in pull_request_latest.reviewer_data:
             rules = pull_request_latest.reviewer_data['rules'] or {}
             try:
-                c.forbid_adding_reviewers = rules.get('forbid_adding_reviewers')
-                c.forbid_author_to_review = rules.get('forbid_author_to_review')
+                c.forbid_adding_reviewers = rules.get(
+                    'forbid_adding_reviewers')
+                c.forbid_author_to_review = rules.get(
+                    'forbid_author_to_review')
+                c.forbid_commit_author_to_review = rules.get(
+                    'forbid_commit_author_to_review')
             except Exception:
                 pass
 
diff --git a/rhodecode/lib/dbmigrate/versions/078_version_4_8_0.py b/rhodecode/lib/dbmigrate/versions/078_version_4_8_0.py
new file mode 100644
index 00000000..fa336578
--- /dev/null
+++ b/rhodecode/lib/dbmigrate/versions/078_version_4_8_0.py
@@ -0,0 +1,33 @@
+import logging
+
+from sqlalchemy import *
+from rhodecode.model import meta
+from rhodecode.lib.dbmigrate.versions import _reset_base, notify
+
+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_7_0_1 as db
+
+    repo_review_rule_table = db.RepoReviewRule.__table__
+
+    forbid_commit_author_to_review = Column(
+        "forbid_commit_author_to_review", Boolean(), nullable=True, default=False)
+    forbid_commit_author_to_review.create(table=repo_review_rule_table)
+
+    fixups(db, meta.Session)
+
+
+def downgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine
+
+
+def fixups(models, _SESSION):
+    pass
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index 9f937a28..3ea5e0c4 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -3907,6 +3907,7 @@ class RepoReviewRule(Base, BaseModel):
 
     use_authors_for_review = Column("use_authors_for_review", Boolean(), nullable=False, default=False)
     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)
     forbid_adding_reviewers = Column("forbid_adding_reviewers", Boolean(), nullable=False, default=False)
 
     rule_users = relationship('RepoReviewRuleUser')
diff --git a/rhodecode/public/js/src/rhodecode/pullrequests.js b/rhodecode/public/js/src/rhodecode/pullrequests.js
index 31948d0a..a04d3c0c 100644
--- a/rhodecode/public/js/src/rhodecode/pullrequests.js
+++ b/rhodecode/public/js/src/rhodecode/pullrequests.js
@@ -175,6 +175,21 @@ ReviewersController = function () {
                     _gettext('Author is not allowed to be a reviewer.'))
             )
         }
+        if (data.rules.forbid_commit_author_to_review) {
+
+            if (data.rules_data.forbidden_users) {
+                $.each(data.rules_data.forbidden_users, function(index, member_data) {
+                    self.forbidReviewUsers.push(member_data)
+                });
+
+            }
+
+            self.$rulesList.append(
+                self.addRule(
+                    _gettext('Commit Authors are not allowed to be a reviewer.'))
+            )
+        }
+
         return self.forbidReviewUsers
     };
 

From 47f9f32ad98914464edda7607263be0394ec5e1a Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 8 Jun 2017 16:11:33 +0200
Subject: [PATCH 151/211] events: expose permalink urls for different set of
 object.

- permalink url should provide a non-changeable url that can be used in
external sources with guarantee of beeing always valid.
---
 rhodecode/apps/repository/__init__.py         |  5 ++
 rhodecode/events/pullrequest.py               |  6 ++-
 rhodecode/events/repo.py                      | 24 +++++-----
 rhodecode/model/comment.py                    | 48 +++++++++++++------
 rhodecode/model/pull_request.py               | 19 ++++++--
 rhodecode/model/repo.py                       | 24 +++++++++-
 rhodecode/tests/events/test_pullrequest.py    |  2 +
 rhodecode/tests/events/test_repo.py           |  3 ++
 .../tests/functional/test_pullrequests.py     |  6 +--
 rhodecode/tests/utils.py                      |  8 ++++
 10 files changed, 107 insertions(+), 38 deletions(-)

diff --git a/rhodecode/apps/repository/__init__.py b/rhodecode/apps/repository/__init__.py
index 2e080599..36317b2b 100644
--- a/rhodecode/apps/repository/__init__.py
+++ b/rhodecode/apps/repository/__init__.py
@@ -32,6 +32,11 @@ def includeme(config):
         name='repo_summary_commits',
         pattern='/{repo_name:.*?[^/]}/summary-commits', repo_route=True)
 
+    # repo commits
+    config.add_route(
+        name='repo_commit',
+        pattern='/{repo_name:.*?[^/]}/changeset/{commit_id}', repo_route=True)
+
     # refs data
     config.add_route(
         name='repo_refs_data',
diff --git a/rhodecode/events/pullrequest.py b/rhodecode/events/pullrequest.py
index 705fb451..55261405 100644
--- a/rhodecode/events/pullrequest.py
+++ b/rhodecode/events/pullrequest.py
@@ -52,6 +52,8 @@ class PullRequestEvent(RepoEvent):
                 'issues': issues,
                 'pull_request_id': self.pullrequest.pull_request_id,
                 'url': PullRequestModel().get_url(self.pullrequest),
+                'permalink_url': PullRequestModel().get_url(
+                    self.pullrequest, permalink=True),
                 'status': self.pullrequest.calculated_review_status(),
                 'commits': commits,
             }
@@ -131,7 +133,9 @@ class PullRequestCommentEvent(PullRequestEvent):
                 'type': self.comment.comment_type,
                 'file': self.comment.f_path,
                 'line': self.comment.line_no,
-                'url': CommentsModel().get_url(self.comment)
+                'url': CommentsModel().get_url(self.comment),
+                'permalink_url': CommentsModel().get_url(
+                    self.comment, permalink=True),
             }
         })
         return data
diff --git a/rhodecode/events/repo.py b/rhodecode/events/repo.py
index a18aa810..67a3b417 100644
--- a/rhodecode/events/repo.py
+++ b/rhodecode/events/repo.py
@@ -35,9 +35,9 @@ def _commits_as_dict(commit_ids, repos):
     :param repos: list of repos to check
     """
     from rhodecode.lib.utils2 import extract_mentioned_users
-    from rhodecode.lib import helpers as h
     from rhodecode.lib.helpers import (
         urlify_commit_message, process_patterns, chop_at_smart)
+    from rhodecode.model.repo import RepoModel
 
     if not repos:
         raise Exception('no repo defined')
@@ -54,7 +54,7 @@ def _commits_as_dict(commit_ids, repos):
     reviewers = []
     for repo in repos:
         if not needed_commits:
-            return commits # return early if we have the commits we need
+            return commits  # return early if we have the commits we need
 
         vcs_repo = repo.scm_instance(cache=False)
         try:
@@ -63,16 +63,15 @@ def _commits_as_dict(commit_ids, repos):
                 try:
                     cs = vcs_repo.get_changeset(commit_id)
                 except CommitDoesNotExistError:
-                    continue # maybe its in next repo
+                    continue  # maybe its in next repo
 
                 cs_data = cs.__json__()
                 cs_data['mentions'] = extract_mentioned_users(cs_data['message'])
                 cs_data['reviewers'] = reviewers
-                cs_data['url'] = h.url('changeset_home',
-                    repo_name=repo.repo_name,
-                    revision=cs_data['raw_id'],
-                    qualified=True
-                )
+                cs_data['url'] = RepoModel().get_commit_url(
+                    repo, cs_data['raw_id'])
+                cs_data['permalink_url'] = RepoModel().get_commit_url(
+                    repo, cs_data['raw_id'], permalink=True)
                 urlified_message, issues_data = process_patterns(
                     cs_data['message'], repo.repo_name)
                 cs_data['issues'] = issues_data
@@ -130,6 +129,7 @@ class RepoEvent(RhodecodeEvent):
                 'repo_name': self.repo.repo_name,
                 'repo_type': self.repo.repo_type,
                 'url': RepoModel().get_url(self.repo),
+                'permalink_url': RepoModel().get_url(self.repo, permalink=True),
                 'extra_fields': extra_fields
             }
         })
@@ -242,7 +242,10 @@ class RepoPushEvent(RepoVCSEvent):
 
     def as_dict(self):
         data = super(RepoPushEvent, self).as_dict()
-        branch_url = repo_url = data['repo']['url']
+
+        def branch_url(branch_name):
+            return '{}/changelog?branch={}'.format(
+                data['repo']['url'], branch_name)
 
         commits = _commits_as_dict(
             commit_ids=self.pushed_commit_ids, repos=[self.repo])
@@ -258,8 +261,7 @@ class RepoPushEvent(RepoVCSEvent):
         branches = [
             {
                 'name': branch,
-                'url': '{}/changelog?branch={}'.format(
-                    data['repo']['url'], branch)
+                'url': branch_url(branch)
             }
             for branch in branches
         ]
diff --git a/rhodecode/model/comment.py b/rhodecode/model/comment.py
index 6c2d791d..7f6fe714 100644
--- a/rhodecode/model/comment.py
+++ b/rhodecode/model/comment.py
@@ -29,14 +29,14 @@ import collections
 from datetime import datetime
 
 from pylons.i18n.translation import _
-from pyramid.threadlocal import get_current_registry
+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
 from rhodecode.lib.channelstream import channelstream_request
 from rhodecode.lib.utils import action_logger
-from rhodecode.lib.utils2 import extract_mentioned_users
+from rhodecode.lib.utils2 import extract_mentioned_users, safe_str
 from rhodecode.model import BaseModel
 from rhodecode.model.db import (
     ChangesetComment, User, Notification, PullRequest, AttributeDict)
@@ -409,22 +409,40 @@ class CommentsModel(BaseModel):
         q = q.order_by(ChangesetComment.created_on)
         return q.all()
 
-    def get_url(self, comment):
+    def get_url(self, comment, request=None, permalink=False):
+        if not request:
+            request = get_current_request()
+
         comment = self.__get_commit_comment(comment)
         if comment.pull_request:
-            return h.url(
-                'pullrequest_show',
-                repo_name=comment.pull_request.target_repo.repo_name,
-                pull_request_id=comment.pull_request.pull_request_id,
-                anchor='comment-%s' % comment.comment_id,
-                qualified=True,)
+            pull_request = comment.pull_request
+            if permalink:
+                return request.route_url(
+                    'pull_requests_global',
+                    pull_request_id=pull_request.pull_request_id,
+                    _anchor='comment-%s' % comment.comment_id)
+            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='comment-%s' % comment.comment_id)
+
         else:
-            return h.url(
-                'changeset_home',
-                repo_name=comment.repo.repo_name,
-                revision=comment.revision,
-                anchor='comment-%s' % comment.comment_id,
-                qualified=True,)
+            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='comment-%s' % comment.comment_id)
+
+            else:
+                return request.route_url(
+                    'repo_commit', repo_name=safe_str(repo.repo_name),
+                    commit_id=commit_id,
+                    _anchor='comment-%s' % comment.comment_id)
 
     def get_comments(self, repo_id, revision=None, pull_request=None):
         """
diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py
index ff8aec6d..b2d9db35 100644
--- a/rhodecode/model/pull_request.py
+++ b/rhodecode/model/pull_request.py
@@ -31,6 +31,7 @@ import urllib
 
 from pylons.i18n.translation import _
 from pylons.i18n.translation import lazy_ugettext
+from pyramid.threadlocal import get_current_request
 from sqlalchemy import or_
 
 from rhodecode.lib import helpers as h, hooks_utils, diffs
@@ -961,11 +962,19 @@ class PullRequestModel(BaseModel):
         self.notify_reviewers(pull_request, ids_to_add)
         return ids_to_add, ids_to_remove
 
-    def get_url(self, pull_request):
-        return h.url('pullrequest_show',
-                     repo_name=safe_str(pull_request.target_repo.repo_name),
-                     pull_request_id=pull_request.pull_request_id,
-                     qualified=True)
+    def get_url(self, pull_request, request=None, permalink=False):
+        if not request:
+            request = get_current_request()
+
+        if permalink:
+            return request.route_url(
+                'pull_requests_global',
+                pull_request_id=pull_request.pull_request_id,)
+        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,)
 
     def get_shadow_clone_url(self, pull_request):
         """
diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py
index 74e9dd37..778f1e2b 100644
--- a/rhodecode/model/repo.py
+++ b/rhodecode/model/repo.py
@@ -155,10 +155,30 @@ class RepoModel(BaseModel):
             repos = Repository.query().filter(Repository.group == root).all()
         return repos
 
-    def get_url(self, repo, request=None):
+    def get_url(self, repo, request=None, permalink=False):
         if not request:
             request = get_current_request()
-        return request.route_url('repo_summary', repo_name=safe_str(repo.repo_name))
+
+        if permalink:
+            return request.route_url(
+                'repo_summary', repo_name=safe_str(repo.repo_id))
+        else:
+            return request.route_url(
+                'repo_summary', repo_name=safe_str(repo.repo_name))
+
+    def get_commit_url(self, repo, commit_id, request=None, permalink=False):
+        if not request:
+            request = get_current_request()
+
+        if permalink:
+            return request.route_url(
+                'repo_commit', repo_name=safe_str(repo.repo_id),
+                commit_id=commit_id)
+
+        else:
+            return request.route_url(
+                'repo_commit', repo_name=safe_str(repo.repo_name),
+                commit_id=commit_id)
 
     @classmethod
     def update_repoinfo(cls, repositories=None):
diff --git a/rhodecode/tests/events/test_pullrequest.py b/rhodecode/tests/events/test_pullrequest.py
index 082765cd..f8abfaf8 100644
--- a/rhodecode/tests/events/test_pullrequest.py
+++ b/rhodecode/tests/events/test_pullrequest.py
@@ -50,6 +50,7 @@ def test_pullrequest_events_serialized(EventClass, pr_util, config_stub):
     assert data['repo']['repo_name'] == pr.target_repo.repo_name
     assert data['pullrequest']['pull_request_id'] == pr.pull_request_id
     assert data['pullrequest']['url']
+    assert data['pullrequest']['permalink_url']
 
 
 @pytest.mark.backends("git", "hg")
@@ -71,6 +72,7 @@ def test_pullrequest_comment_events_serialized(pr_util, config_stub):
     assert data['repo']['repo_name'] == pr.target_repo.repo_name
     assert data['pullrequest']['pull_request_id'] == pr.pull_request_id
     assert data['pullrequest']['url']
+    assert data['pullrequest']['permalink_url']
     assert data['comment']['text'] == comment.text
 
 
diff --git a/rhodecode/tests/events/test_repo.py b/rhodecode/tests/events/test_repo.py
index 66d89180..5dd0de33 100644
--- a/rhodecode/tests/events/test_repo.py
+++ b/rhodecode/tests/events/test_repo.py
@@ -62,6 +62,7 @@ def test_repo_events_serialized(config_stub, repo_stub, EventClass):
     assert data['name'] == EventClass.name
     assert data['repo']['repo_name'] == repo_stub.repo_name
     assert data['repo']['url']
+    assert data['repo']['permalink_url']
 
 
 @pytest.mark.parametrize('EventClass', [
@@ -73,6 +74,7 @@ def test_vcs_repo_events_serialize(config_stub, repo_stub, scm_extras, EventClas
     assert data['name'] == EventClass.name
     assert data['repo']['repo_name'] == repo_stub.repo_name
     assert data['repo']['url']
+    assert data['repo']['permalink_url']
 
 
 @pytest.mark.parametrize('EventClass', [RepoPushEvent])
@@ -84,6 +86,7 @@ def test_vcs_repo_push_event_serialize(config_stub, repo_stub, scm_extras, Event
     assert data['name'] == EventClass.name
     assert data['repo']['repo_name'] == repo_stub.repo_name
     assert data['repo']['url']
+    assert data['repo']['permalink_url']
 
 
 def test_create_delete_repo_fires_events(backend):
diff --git a/rhodecode/tests/functional/test_pullrequests.py b/rhodecode/tests/functional/test_pullrequests.py
index 422c3e61..e7f79694 100644
--- a/rhodecode/tests/functional/test_pullrequests.py
+++ b/rhodecode/tests/functional/test_pullrequests.py
@@ -964,11 +964,9 @@ class TestPullrequestsController(object):
         assert target.text.strip() == 'tag: target'
         assert target.getchildren() == []
 
-
-
     @pytest.mark.parametrize('mergeable', [True, False])
     def test_shadow_repository_link(
-            self, mergeable, pr_util, http_host_stub):
+            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
@@ -979,7 +977,7 @@ class TestPullrequestsController(object):
         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_stub, repo=target_repo.name, pr_id=pr_id)
+            host=http_host_only_stub, repo=target_repo.name, pr_id=pr_id)
 
         response = self.app.get(url(
             controller='pullrequests', action='show',
diff --git a/rhodecode/tests/utils.py b/rhodecode/tests/utils.py
index d569ce57..5c7f0b1f 100644
--- a/rhodecode/tests/utils.py
+++ b/rhodecode/tests/utils.py
@@ -412,4 +412,12 @@ def add_test_routes(config):
     """
     config.add_route(name='home', pattern='/')
     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}')

From 7e11e618cab48a188719ccd91c0e966ab64a509a Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 8 Jun 2017 21:37:34 +0200
Subject: [PATCH 152/211] events: re-organizate events handling.

- pass in request from event to url functions to skip request lookup
- added some logging
- prepared for pyramid migration
---
 rhodecode/apps/repository/utils.py |  4 ++--
 rhodecode/config/middleware.py     |  6 ++++++
 rhodecode/events/__init__.py       | 13 ++++++++-----
 rhodecode/events/base.py           |  9 ++++-----
 rhodecode/events/pullrequest.py    |  1 +
 rhodecode/events/repo.py           | 15 +++++++++------
 rhodecode/model/integration.py     |  3 +++
 rhodecode/model/repo.py            |  6 ++++++
 8 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/rhodecode/apps/repository/utils.py b/rhodecode/apps/repository/utils.py
index f425a0b0..36324e38 100644
--- a/rhodecode/apps/repository/utils.py
+++ b/rhodecode/apps/repository/utils.py
@@ -22,7 +22,7 @@ from rhodecode.lib import helpers as h
 from rhodecode.lib.utils2 import safe_int
 
 
-def reviewer_as_json(user, reasons, mandatory):
+def reviewer_as_json(user, reasons=None, mandatory=False):
     """
     Returns json struct of a reviewer for frontend
 
@@ -33,7 +33,7 @@ def reviewer_as_json(user, reasons, mandatory):
 
     return {
         'user_id': user.user_id,
-        'reasons': reasons,
+        'reasons': reasons or [],
         'mandatory': mandatory,
         'username': user.username,
         'firstname': user.firstname,
diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py
index ba200994..ba14351e 100644
--- a/rhodecode/config/middleware.py
+++ b/rhodecode/config/middleware.py
@@ -318,6 +318,12 @@ def includeme(config):
     config.add_subscriber(write_metadata_if_needed, ApplicationCreated)
     config.add_subscriber(write_js_routes_if_enabled, ApplicationCreated)
 
+    # events
+    # TODO(marcink): this should be done when pyramid migration is finished
+    # config.add_subscriber(
+    #     'rhodecode.integrations.integrations_event_handler',
+    #     'rhodecode.events.RhodecodeEvent')
+
     # Set the authorization policy.
     authz_policy = ACLAuthorizationPolicy()
     config.set_authorization_policy(authz_policy)
diff --git a/rhodecode/events/__init__.py b/rhodecode/events/__init__.py
index 3fa9e066..96acb566 100644
--- a/rhodecode/events/__init__.py
+++ b/rhodecode/events/__init__.py
@@ -18,6 +18,8 @@
 
 import logging
 from pyramid.threadlocal import get_current_registry
+from rhodecode.events.base import RhodecodeEvent
+
 
 log = logging.getLogger(__name__)
 
@@ -32,20 +34,21 @@ def trigger(event, registry=None):
     # passing the registry as an argument to get rid of it.
     registry = registry or get_current_registry()
     registry.notify(event)
-    log.debug('event %s triggered', event)
+    log.debug('event %s triggered using registry %s', event, registry)
 
     # Until we can work around the problem that VCS operations do not have a
     # pyramid context to work with, we send the events to integrations directly
 
     # Later it will be possible to use regular pyramid subscribers ie:
-    #   config.add_subscriber(integrations_event_handler, RhodecodeEvent)
+    # config.add_subscriber(
+    #     'rhodecode.integrations.integrations_event_handler',
+    #     'rhodecode.events.RhodecodeEvent')
+    # trigger(event, request.registry)
+
     from rhodecode.integrations import integrations_event_handler
     if isinstance(event, RhodecodeEvent):
         integrations_event_handler(event)
 
-
-from rhodecode.events.base import RhodecodeEvent
-
 from rhodecode.events.user import (  # noqa
     UserPreCreate,
     UserPostCreate,
diff --git a/rhodecode/events/base.py b/rhodecode/events/base.py
index 50e366b9..281cadb8 100644
--- a/rhodecode/events/base.py
+++ b/rhodecode/events/base.py
@@ -33,12 +33,12 @@ log = logging.getLogger(__name__)
 
 class RhodecodeEvent(object):
     """
-    Base event class for all Rhodecode events
+    Base event class for all RhodeCode events
     """
     name = "RhodeCodeEvent"
 
-    def __init__(self):
-        self.request = get_current_request()
+    def __init__(self, request=None):
+        self.request = request or get_current_request()
         self.utc_timestamp = datetime.utcnow()
 
     @property
@@ -80,9 +80,8 @@ class RhodecodeEvent(object):
     def server_url(self):
         default = '<no server_url available>'
         if self.request:
-            from rhodecode.lib import helpers as h
             try:
-                return h.route_url('home')
+                return self.request.route_url('home')
             except Exception:
                 log.exception('Failed to fetch URL for server')
                 return default
diff --git a/rhodecode/events/pullrequest.py b/rhodecode/events/pullrequest.py
index 55261405..06704366 100644
--- a/rhodecode/events/pullrequest.py
+++ b/rhodecode/events/pullrequest.py
@@ -41,6 +41,7 @@ class PullRequestEvent(RepoEvent):
         data = super(PullRequestEvent, self).as_dict()
 
         commits = _commits_as_dict(
+            self,
             commit_ids=self.pullrequest.revisions,
             repos=[self.pullrequest.source_repo]
         )
diff --git a/rhodecode/events/repo.py b/rhodecode/events/repo.py
index 67a3b417..fbf49084 100644
--- a/rhodecode/events/repo.py
+++ b/rhodecode/events/repo.py
@@ -27,10 +27,11 @@ from rhodecode.lib.vcs.exceptions import CommitDoesNotExistError
 log = logging.getLogger(__name__)
 
 
-def _commits_as_dict(commit_ids, repos):
+def _commits_as_dict(event, commit_ids, repos):
     """
     Helper function to serialize commit_ids
 
+    :param event: class calling this method
     :param commit_ids: commits to get
     :param repos: list of repos to check
     """
@@ -69,9 +70,9 @@ def _commits_as_dict(commit_ids, repos):
                 cs_data['mentions'] = extract_mentioned_users(cs_data['message'])
                 cs_data['reviewers'] = reviewers
                 cs_data['url'] = RepoModel().get_commit_url(
-                    repo, cs_data['raw_id'])
+                    repo, cs_data['raw_id'], request=event.request)
                 cs_data['permalink_url'] = RepoModel().get_commit_url(
-                    repo, cs_data['raw_id'], permalink=True)
+                    repo, cs_data['raw_id'], request=event.request, permalink=True)
                 urlified_message, issues_data = process_patterns(
                     cs_data['message'], repo.repo_name)
                 cs_data['issues'] = issues_data
@@ -128,8 +129,10 @@ class RepoEvent(RhodecodeEvent):
                 'repo_id': self.repo.repo_id,
                 'repo_name': self.repo.repo_name,
                 'repo_type': self.repo.repo_type,
-                'url': RepoModel().get_url(self.repo),
-                'permalink_url': RepoModel().get_url(self.repo, permalink=True),
+                'url': RepoModel().get_url(
+                    self.repo, request=self.request),
+                'permalink_url': RepoModel().get_url(
+                    self.repo, request=self.request, permalink=True),
                 'extra_fields': extra_fields
             }
         })
@@ -248,7 +251,7 @@ class RepoPushEvent(RepoVCSEvent):
                 data['repo']['url'], branch_name)
 
         commits = _commits_as_dict(
-            commit_ids=self.pushed_commit_ids, repos=[self.repo])
+            self, commit_ids=self.pushed_commit_ids, repos=[self.repo])
 
         last_branch = None
         for commit in reversed(commits):
diff --git a/rhodecode/model/integration.py b/rhodecode/model/integration.py
index 72a7c02c..f8396800 100644
--- a/rhodecode/model/integration.py
+++ b/rhodecode/model/integration.py
@@ -96,6 +96,9 @@ class IntegrationModel(BaseModel):
         """ Send an event to an integration """
         handler = self.get_integration_handler(integration)
         if handler:
+            log.debug(
+                'events: sending event %s on integration %s using handler %s',
+                event, integration, handler)
             handler.send_event(event)
 
     def get_integrations(self, scope, IntegrationType=None):
diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py
index 778f1e2b..c3b8b565 100644
--- a/rhodecode/model/repo.py
+++ b/rhodecode/model/repo.py
@@ -159,6 +159,9 @@ class RepoModel(BaseModel):
         if not request:
             request = get_current_request()
 
+        if not request:
+            return
+
         if permalink:
             return request.route_url(
                 'repo_summary', repo_name=safe_str(repo.repo_id))
@@ -170,6 +173,9 @@ class RepoModel(BaseModel):
         if not request:
             request = get_current_request()
 
+        if not request:
+            return
+
         if permalink:
             return request.route_url(
                 'repo_commit', repo_name=safe_str(repo.repo_id),

From 1e5838512fc40c27a80ea5db57e208002d65cdf9 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 8 Jun 2017 22:44:21 +0200
Subject: [PATCH 153/211] auth: use pyramid only redirections.

---
 rhodecode/lib/auth.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/rhodecode/lib/auth.py b/rhodecode/lib/auth.py
index 8ea3b1ae..616fd926 100644
--- a/rhodecode/lib/auth.py
+++ b/rhodecode/lib/auth.py
@@ -35,8 +35,8 @@ from functools import wraps
 
 import ipaddress
 from pyramid.httpexceptions import HTTPForbidden, HTTPFound
-from pylons import url, request
-from pylons.controllers.util import abort, redirect
+from pylons import request
+from pylons.controllers.util import abort
 from pylons.i18n.translation import _
 from sqlalchemy.orm.exc import ObjectDeletedError
 from sqlalchemy.orm import joinedload
@@ -1265,7 +1265,7 @@ class LoginRequired(object):
             # we preserve the get PARAM
             came_from = request.path_qs
             log.debug('redirecting to login page with %s' % (came_from,))
-            return redirect(
+            raise HTTPFound(
                 h.route_path('login', _query={'came_from': came_from}))
 
 
@@ -1292,7 +1292,7 @@ class NotAnonymous(object):
             h.flash(_('You need to be a registered user to '
                       'perform this action'),
                     category='warning')
-            return redirect(
+            raise HTTPFound(
                 h.route_path('login', _query={'came_from': came_from}))
         else:
             return func(*fargs, **fkwargs)
@@ -1341,8 +1341,9 @@ class HasAcceptedRepoType(object):
             h.flash(h.literal(
                 _('Action not supported for %s.' % rhodecode_repo.alias)),
                 category='warning')
-            return redirect(
-                h.route_path('repo_summary', repo_name=cls.rhodecode_db_repo.repo_name))
+            raise HTTPFound(
+                h.route_path('repo_summary',
+                             repo_name=cls.rhodecode_db_repo.repo_name))
 
 
 class PermsDecorator(object):

From f11a476967818cbef60f52dab950011ac3c5cd01 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 9 Jun 2017 12:01:44 +0200
Subject: [PATCH 154/211] auth: prepare code for removal of pylons request in
 pyramid migration.

---
 rhodecode/lib/auth.py | 63 ++++++++++++++++++++++++++-----------------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/rhodecode/lib/auth.py b/rhodecode/lib/auth.py
index 616fd926..1ce5aaf1 100644
--- a/rhodecode/lib/auth.py
+++ b/rhodecode/lib/auth.py
@@ -35,9 +35,9 @@ from functools import wraps
 
 import ipaddress
 from pyramid.httpexceptions import HTTPForbidden, HTTPFound
-from pylons import request
-from pylons.controllers.util import abort
 from pylons.i18n.translation import _
+# NOTE(marcink): this has to be removed only after pyramid migration,
+# replace with _ = request.translate
 from sqlalchemy.orm.exc import ObjectDeletedError
 from sqlalchemy.orm import joinedload
 from zope.cachedescriptors.property import Lazy as LazyProperty
@@ -302,7 +302,8 @@ def _cached_perms_data(user_id, scope, user_is_admin,
         explicit, algo)
     return permissions.calculate()
 
-class PermOrigin:
+
+class PermOrigin(object):
     ADMIN = 'superadmin'
 
     REPO_USER = 'user:%s'
@@ -341,7 +342,6 @@ class PermOriginDict(dict):
     {'resource': [('read', 'default'), ('write', 'admin')]}
     """
 
-
     def __init__(self, *args, **kw):
         dict.__init__(self, *args, **kw)
         self.perm_origin_stack = {}
@@ -1114,6 +1114,17 @@ def get_csrf_token(session=None, force_new=False, save_if_missing=True):
     return session.get(csrf_token_key)
 
 
+def get_request(perm_class):
+    from pyramid.threadlocal import get_current_request
+    pyramid_request = get_current_request()
+    if not pyramid_request:
+        # return global request of pylons in case pyramid isn't available
+        # NOTE(marcink): this should be removed after migration to pyramid
+        from pylons import request
+        return request
+    return pyramid_request
+
+
 # CHECK DECORATORS
 class CSRFRequired(object):
     """
@@ -1144,7 +1155,12 @@ class CSRFRequired(object):
         supplied_token = self._get_csrf(_request)
         return supplied_token and supplied_token == cur_token
 
+    def _get_request(self):
+        return get_request(self)
+
     def __wrapper(self, func, *fargs, **fkwargs):
+        request = self._get_request()
+
         if request.method in self.except_methods:
             return func(*fargs, **fkwargs)
 
@@ -1157,8 +1173,8 @@ class CSRFRequired(object):
             reason = 'token-missing'
             supplied_token = self._get_csrf(request)
             if supplied_token and cur_token != supplied_token:
-                reason = 'token-mismatch [%s:%s]' % (cur_token or ''[:6],
-                                                     supplied_token or ''[:6])
+                reason = 'token-mismatch [%s:%s]' % (
+                    cur_token or ''[:6], supplied_token or ''[:6])
 
             csrf_message = \
                 ("Cross-site request forgery detected, request denied. See "
@@ -1186,12 +1202,7 @@ class LoginRequired(object):
         return get_cython_compat_decorator(self.__wrapper, func)
 
     def _get_request(self):
-        from pyramid.threadlocal import get_current_request
-        pyramid_request = get_current_request()
-        if not pyramid_request:
-            # return global request of pylons in case pyramid isn't available
-            return request
-        return pyramid_request
+        return get_request(self)
 
     def __wrapper(self, func, *fargs, **fkwargs):
         from rhodecode.lib import helpers as h
@@ -1278,10 +1289,14 @@ class NotAnonymous(object):
     def __call__(self, func):
         return get_cython_compat_decorator(self.__wrapper, func)
 
+    def _get_request(self):
+        return get_request(self)
+
     def __wrapper(self, func, *fargs, **fkwargs):
         import rhodecode.lib.helpers as h
         cls = fargs[0]
         self.user = cls._rhodecode_user
+        request = self._get_request()
 
         log.debug('Checking if user is not anonymous @%s' % cls)
 
@@ -1304,9 +1319,16 @@ class XHRRequired(object):
     def __call__(self, func):
         return get_cython_compat_decorator(self.__wrapper, func)
 
+    def _get_request(self):
+        return get_request(self)
+
     def __wrapper(self, func, *fargs, **fkwargs):
+        from pylons.controllers.util import abort
+        request = self._get_request()
+
         log.debug('Checking if request is XMLHttpRequest (XHR)')
         xhr_message = 'This is not a valid XMLHttpRequest (XHR) request'
+
         if not request.is_xhr:
             abort(400, detail=xhr_message)
 
@@ -1359,12 +1381,7 @@ class PermsDecorator(object):
         return get_cython_compat_decorator(self.__wrapper, func)
 
     def _get_request(self):
-        from pyramid.threadlocal import get_current_request
-        pyramid_request = get_current_request()
-        if not pyramid_request:
-            # return global request of pylons in case pyramid isn't available
-            return request
-        return pyramid_request
+        return get_request(self)
 
     def _get_came_from(self):
         _request = self._get_request()
@@ -1638,12 +1655,7 @@ class PermsFunction(object):
             return False
 
     def _get_request(self):
-        from pyramid.threadlocal import get_current_request
-        pyramid_request = get_current_request()
-        if not pyramid_request:
-            # return global request of pylons incase pyramid one isn't available
-            return request
-        return pyramid_request
+        return get_request(self)
 
     def _get_check_scope(self, cls_name):
         return {
@@ -1708,7 +1720,8 @@ class HasRepoPermissionAny(PermsFunction):
 
     def _get_repo_name(self):
         if not self.repo_name:
-            self.repo_name = get_repo_slug(request)
+            _request = self._get_request()
+            self.repo_name = get_repo_slug(_request)
         return self.repo_name
 
     def check_permissions(self, user):

From 5915f38fcfcd60dd2492132406ebe3edae02a930 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 13 Jun 2017 00:14:21 +0200
Subject: [PATCH 155/211] pull-request-api: updated logic of closing a PR via
 API call.

- consistent logic via web and API
- updated events
- updated proper close checks.
---
 .../api/tests/test_close_pull_request.py      |   1 +
 rhodecode/api/views/pull_request_api.py       | 154 +++++++++--------
 rhodecode/controllers/changeset.py            |   1 -
 rhodecode/controllers/pullrequests.py         | 163 ++++++++----------
 rhodecode/model/db.py                         |   4 +
 rhodecode/model/pull_request.py               |  52 ++++--
 rhodecode/public/js/rhodecode/routes.js       |   1 +
 .../public/js/src/rhodecode/pullrequests.js   |  10 --
 .../changeset/changeset_comment_block.mako    |   2 +-
 .../debug_style/collapsable-content.html      |   3 -
 .../pullrequests/pullrequest_show.mako        |   5 -
 .../tests/functional/test_pullrequests.py     |  61 ++++---
 12 files changed, 235 insertions(+), 222 deletions(-)

diff --git a/rhodecode/api/tests/test_close_pull_request.py b/rhodecode/api/tests/test_close_pull_request.py
index dc945ee2..9c523781 100644
--- a/rhodecode/api/tests/test_close_pull_request.py
+++ b/rhodecode/api/tests/test_close_pull_request.py
@@ -43,6 +43,7 @@ class TestClosePullRequest(object):
         response = api_call(self.app, params)
         expected = {
             'pull_request_id': pull_request_id,
+            'close_status': 'Rejected',
             'closed': True,
         }
         assert_ok(id_, expected, response.body)
diff --git a/rhodecode/api/views/pull_request_api.py b/rhodecode/api/views/pull_request_api.py
index 1cd43875..d46e95f4 100644
--- a/rhodecode/api/views/pull_request_api.py
+++ b/rhodecode/api/views/pull_request_api.py
@@ -21,6 +21,7 @@
 
 import logging
 
+from rhodecode import events
 from rhodecode.api import jsonrpc_method, JSONRPCError, JSONRPCValidationError
 from rhodecode.api.utils import (
     has_superadmin_permission, Optional, OAttr, get_repo_or_error,
@@ -35,8 +36,8 @@ from rhodecode.model.db import Session, ChangesetStatus, ChangesetComment
 from rhodecode.model.pull_request import PullRequestModel, MergeCheck
 from rhodecode.model.settings import SettingsModel
 from rhodecode.model.validation_schema import Invalid
-from rhodecode.model.validation_schema.schemas.reviewer_schema import \
-    ReviewerListSchema
+from rhodecode.model.validation_schema.schemas.reviewer_schema import(
+    ReviewerListSchema)
 
 log = logging.getLogger(__name__)
 
@@ -227,8 +228,9 @@ def get_pull_requests(request, apiuser, repoid, status=Optional('new')):
 
 
 @jsonrpc_method()
-def merge_pull_request(request, apiuser, repoid, pullrequestid,
-                       userid=Optional(OAttr('apiuser'))):
+def merge_pull_request(
+        request, apiuser, repoid, pullrequestid,
+        userid=Optional(OAttr('apiuser'))):
     """
     Merge the pull request specified by `pullrequestid` into its target
     repository.
@@ -307,63 +309,6 @@ def merge_pull_request(request, apiuser, repoid, pullrequestid,
     return merge_response
 
 
-@jsonrpc_method()
-def close_pull_request(request, apiuser, repoid, pullrequestid,
-                       userid=Optional(OAttr('apiuser'))):
-    """
-    Close the pull request specified by `pullrequestid`.
-
-    :param apiuser: This is filled automatically from the |authtoken|.
-    :type apiuser: AuthUser
-    :param repoid: Repository name or repository ID to which the pull
-        request belongs.
-    :type repoid: str or int
-    :param pullrequestid: ID of the pull request to be closed.
-    :type pullrequestid: int
-    :param userid: Close the pull request as this user.
-    :type userid: Optional(str or int)
-
-    Example output:
-
-    .. code-block:: bash
-
-        "id": <id_given_in_input>,
-        "result": {
-            "pull_request_id":  "<int>",
-            "closed":           "<bool>"
-        },
-        "error": null
-
-    """
-    repo = get_repo_or_error(repoid)
-    if not isinstance(userid, Optional):
-        if (has_superadmin_permission(apiuser) or
-                HasRepoPermissionAnyApi('repository.admin')(
-                    user=apiuser, repo_name=repo.repo_name)):
-            apiuser = get_user_or_error(userid)
-        else:
-            raise JSONRPCError('userid is not the same as your user')
-
-    pull_request = get_pull_request_or_error(pullrequestid)
-    if not PullRequestModel().check_user_update(
-            pull_request, apiuser, api=True):
-        raise JSONRPCError(
-            'pull request `%s` close failed, no permission to close.' % (
-                pullrequestid,))
-    if pull_request.is_closed():
-        raise JSONRPCError(
-            'pull request `%s` is already closed' % (pullrequestid,))
-
-    PullRequestModel().close_pull_request(
-        pull_request.pull_request_id, apiuser)
-    Session().commit()
-    data = {
-        'pull_request_id': pull_request.pull_request_id,
-        'closed': True,
-    }
-    return data
-
-
 @jsonrpc_method()
 def comment_pull_request(
         request, apiuser, repoid, pullrequestid, message=Optional(None),
@@ -610,7 +555,7 @@ def create_pull_request(
 def update_pull_request(
         request, apiuser, repoid, pullrequestid, title=Optional(''),
         description=Optional(''), reviewers=Optional(None),
-        update_commits=Optional(None), close_pull_request=Optional(None)):
+        update_commits=Optional(None)):
     """
     Updates a pull request.
 
@@ -632,8 +577,6 @@ def update_pull_request(
 
     :param update_commits: Trigger update of commits for this pull request
     :type: update_commits: Optional(bool)
-    :param close_pull_request: Close this pull request with rejected state
-    :type: close_pull_request: Optional(bool)
 
     Example output:
 
@@ -675,7 +618,6 @@ def update_pull_request(
             'pull request `%s` update failed, pull request is closed' % (
                 pullrequestid,))
 
-
     reviewer_objects = Optional.extract(reviewers) or []
     if reviewer_objects:
         schema = ReviewerListSchema()
@@ -718,11 +660,6 @@ def update_pull_request(
             [get_user_or_error(n).username for n in removed_reviewers])
         Session().commit()
 
-    if str2bool(Optional.extract(close_pull_request)):
-        PullRequestModel().close_pull_request_with_comment(
-            pull_request, apiuser, repo)
-        Session().commit()
-
     data = {
         'msg': 'Updated pull request `{}`'.format(
             pull_request.pull_request_id),
@@ -732,3 +669,80 @@ def update_pull_request(
     }
 
     return data
+
+
+@jsonrpc_method()
+def close_pull_request(
+        request, apiuser, repoid, pullrequestid,
+        userid=Optional(OAttr('apiuser')), message=Optional('')):
+    """
+    Close the pull request specified by `pullrequestid`.
+
+    :param apiuser: This is filled automatically from the |authtoken|.
+    :type apiuser: AuthUser
+    :param repoid: Repository name or repository ID to which the pull
+        request belongs.
+    :type repoid: str or int
+    :param pullrequestid: ID of the pull request to be closed.
+    :type pullrequestid: int
+    :param userid: Close the pull request as this user.
+    :type userid: Optional(str or int)
+    :param message: Optional message to close the Pull Request with. If not
+        specified it will be generated automatically.
+    :type message: Optional(str)
+
+    Example output:
+
+    .. code-block:: bash
+
+        "id": <id_given_in_input>,
+        "result": {
+            "pull_request_id":  "<int>",
+            "close_status":     "<str:status_lbl>,
+            "closed":           "<bool>"
+        },
+        "error": null
+
+    """
+    _ = request.translate
+
+    repo = get_repo_or_error(repoid)
+    if not isinstance(userid, Optional):
+        if (has_superadmin_permission(apiuser) or
+                HasRepoPermissionAnyApi('repository.admin')(
+                    user=apiuser, repo_name=repo.repo_name)):
+            apiuser = get_user_or_error(userid)
+        else:
+            raise JSONRPCError('userid is not the same as your user')
+
+    pull_request = get_pull_request_or_error(pullrequestid)
+
+    if pull_request.is_closed():
+        raise JSONRPCError(
+            'pull request `%s` is already closed' % (pullrequestid,))
+
+    # only owner or admin or person with write permissions
+    allowed_to_close = PullRequestModel().check_user_update(
+            pull_request, apiuser, api=True)
+
+    if not allowed_to_close:
+        raise JSONRPCError(
+            'pull request `%s` close failed, no permission to close.' % (
+                pullrequestid,))
+
+    # message we're using to close the PR, else it's automatically generated
+    message = Optional.extract(message)
+
+    # finally close the PR, with proper message comment
+    comment, status = PullRequestModel().close_pull_request_with_comment(
+        pull_request, apiuser, repo, message=message)
+    status_lbl = ChangesetStatus.get_status_lbl(status)
+
+    Session().commit()
+
+    data = {
+        'pull_request_id': pull_request.pull_request_id,
+        'close_status': status_lbl,
+        'closed': True,
+    }
+    return data
diff --git a/rhodecode/controllers/changeset.py b/rhodecode/controllers/changeset.py
index e5230579..bd95ef0e 100644
--- a/rhodecode/controllers/changeset.py
+++ b/rhodecode/controllers/changeset.py
@@ -368,7 +368,6 @@ class ChangesetController(BaseRepoController):
                 comment_type=comment_type,
                 resolves_comment_id=resolves_comment_id
             )
-            c.inline_comment = True if comment.line_no else False
 
             # get status if set !
             if status:
diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py
index 2c96fc55..aacfcf67 100644
--- a/rhodecode/controllers/pullrequests.py
+++ b/rhodecode/controllers/pullrequests.py
@@ -306,8 +306,6 @@ class PullrequestsController(BaseRepoController):
                     pull_request.reviewer_data)
             elif str2bool(request.POST.get('update_commits', 'false')):
                 self._update_commits(pull_request)
-            elif str2bool(request.POST.get('close_pull_request', 'false')):
-                self._reject_close(pull_request)
             elif str2bool(request.POST.get('edit_pull_request', 'false')):
                 self._edit_pull_request(pull_request)
             else:
@@ -462,14 +460,6 @@ class PullrequestsController(BaseRepoController):
         h.flash(_('Pull request reviewers updated.'), category='success')
         Session().commit()
 
-    def _reject_close(self, pull_request):
-        if pull_request.is_closed():
-            raise HTTPForbidden()
-
-        PullRequestModel().close_pull_request_with_comment(
-            pull_request, c.rhodecode_user, c.rhodecode_db_repo)
-        Session().commit()
-
     @LoginRequired()
     @NotAnonymous()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
@@ -888,6 +878,7 @@ class PullrequestsController(BaseRepoController):
         pull_request_id = safe_int(pull_request_id)
         pull_request = PullRequest.get_or_404(pull_request_id)
         if pull_request.is_closed():
+            log.debug('comment: forbidden because pull request is closed')
             raise HTTPForbidden()
 
         status = request.POST.get('changeset_status', None)
@@ -896,83 +887,78 @@ class PullrequestsController(BaseRepoController):
         resolves_comment_id = request.POST.get('resolves_comment_id', None)
         close_pull_request = request.POST.get('close_pull_request')
 
-        close_pr = False
-        # only owner or admin or person with write permissions
-        allowed_to_close = PullRequestModel().check_user_update(
-            pull_request, c.rhodecode_user)
-
-        if close_pull_request and allowed_to_close:
-            close_pr = True
-            pull_request_review_status = pull_request.calculated_review_status()
-            if pull_request_review_status == ChangesetStatus.STATUS_APPROVED:
-                # approved only if we have voting consent
-                status = ChangesetStatus.STATUS_APPROVED
-            else:
-                status = ChangesetStatus.STATUS_REJECTED
-
-        allowed_to_change_status = PullRequestModel().check_user_change_status(
-            pull_request, c.rhodecode_user)
-
-        if status and allowed_to_change_status:
-            message = (_('Status change %(transition_icon)s %(status)s')
-                       % {'transition_icon': '>',
-                          'status': ChangesetStatus.get_status_lbl(status)})
-            if close_pr:
-                message = _('Closing with') + ' ' + message
-            text = text or message
-        comm = CommentsModel().create(
-            text=text,
-            repo=c.rhodecode_db_repo.repo_id,
-            user=c.rhodecode_user.user_id,
-            pull_request=pull_request_id,
-            f_path=request.POST.get('f_path'),
-            line_no=request.POST.get('line'),
-            status_change=(ChangesetStatus.get_status_lbl(status)
-                           if status and allowed_to_change_status else None),
-            status_change_type=(status
-                                if status and allowed_to_change_status else None),
-            closing_pr=close_pr,
-            comment_type=comment_type,
-            resolves_comment_id=resolves_comment_id
-        )
-
-        if allowed_to_change_status:
-            old_calculated_status = pull_request.calculated_review_status()
-            # get status if set !
-            if status:
-                ChangesetStatusModel().set_status(
-                    c.rhodecode_db_repo.repo_id,
-                    status,
-                    c.rhodecode_user.user_id,
-                    comm,
-                    pull_request=pull_request_id
-                )
+        # the logic here should work like following, if we submit close
+        # pr comment, use `close_pull_request_with_comment` function
+        # else handle regular comment logic
+        user = c.rhodecode_user
+        repo = c.rhodecode_db_repo
 
+        if close_pull_request:
+            # only owner or admin or person with write permissions
+            allowed_to_close = PullRequestModel().check_user_update(
+                pull_request, c.rhodecode_user)
+            if not allowed_to_close:
+                log.debug('comment: forbidden because not allowed to close '
+                          'pull request %s', pull_request_id)
+                raise HTTPForbidden()
+            comment, status = PullRequestModel().close_pull_request_with_comment(
+                pull_request, user, repo, message=text)
             Session().flush()
-            events.trigger(events.PullRequestCommentEvent(pull_request, comm))
-            # we now calculate the status of pull request, and based on that
-            # calculation we set the commits status
-            calculated_status = pull_request.calculated_review_status()
-            if old_calculated_status != calculated_status:
-                PullRequestModel()._trigger_pull_request_hook(
-                    pull_request, c.rhodecode_user, 'review_status_change')
+            events.trigger(
+                events.PullRequestCommentEvent(pull_request, comment))
 
-            calculated_status_lbl = ChangesetStatus.get_status_lbl(
-                calculated_status)
+        else:
+            # regular comment case, could be inline, or one with status.
+            # for that one we check also permissions
 
-            if close_pr:
-                status_completed = (
-                    calculated_status in [ChangesetStatus.STATUS_APPROVED,
-                                          ChangesetStatus.STATUS_REJECTED])
-                if close_pull_request or status_completed:
-                    PullRequestModel().close_pull_request(
-                        pull_request_id, c.rhodecode_user)
-                else:
-                    h.flash(_('Closing pull request on other statuses than '
-                              'rejected or approved is forbidden. '
-                              'Calculated status from all reviewers '
-                              'is currently: %s') % calculated_status_lbl,
-                            category='warning')
+            allowed_to_change_status = PullRequestModel().check_user_change_status(
+                pull_request, c.rhodecode_user)
+
+            if status and allowed_to_change_status:
+                message = (_('Status change %(transition_icon)s %(status)s')
+                           % {'transition_icon': '>',
+                              'status': ChangesetStatus.get_status_lbl(status)})
+                text = text or message
+
+            comment = CommentsModel().create(
+                text=text,
+                repo=c.rhodecode_db_repo.repo_id,
+                user=c.rhodecode_user.user_id,
+                pull_request=pull_request_id,
+                f_path=request.POST.get('f_path'),
+                line_no=request.POST.get('line'),
+                status_change=(ChangesetStatus.get_status_lbl(status)
+                               if status and allowed_to_change_status else None),
+                status_change_type=(status
+                                    if status and allowed_to_change_status else None),
+                comment_type=comment_type,
+                resolves_comment_id=resolves_comment_id
+            )
+
+            if allowed_to_change_status:
+                # calculate old status before we change it
+                old_calculated_status = pull_request.calculated_review_status()
+
+                # get status if set !
+                if status:
+                    ChangesetStatusModel().set_status(
+                        c.rhodecode_db_repo.repo_id,
+                        status,
+                        c.rhodecode_user.user_id,
+                        comment,
+                        pull_request=pull_request_id
+                    )
+
+                Session().flush()
+                events.trigger(
+                    events.PullRequestCommentEvent(pull_request, comment))
+
+                # we now calculate the status of pull request, and based on that
+                # calculation we set the commits status
+                calculated_status = pull_request.calculated_review_status()
+                if old_calculated_status != calculated_status:
+                    PullRequestModel()._trigger_pull_request_hook(
+                        pull_request, c.rhodecode_user, 'review_status_change')
 
         Session().commit()
 
@@ -983,12 +969,11 @@ class PullrequestsController(BaseRepoController):
         data = {
             'target_id': h.safeid(h.safe_unicode(request.POST.get('f_path'))),
         }
-        if comm:
-            c.co = comm
-            c.inline_comment = True if comm.line_no else False
-            data.update(comm.get_dict())
-            data.update({'rendered_text':
-                             render('changeset/changeset_comment_block.mako')})
+        if comment:
+            c.co = comment
+            rendered_comment = render('changeset/changeset_comment_block.mako')
+            data.update(comment.get_dict())
+            data.update({'rendered_text': rendered_comment})
 
         return data
 
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index 3ea5e0c4..46ae100b 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -3107,6 +3107,10 @@ class ChangesetComment(Base, BaseModel):
     def is_todo(self):
         return self.comment_type == self.COMMENT_TYPE_TODO
 
+    @property
+    def is_inline(self):
+        return self.line_no and self.f_path
+
     def get_index_version(self, versions):
         return self.get_index_from_version(
             self.pull_request_version_id, versions)
diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py
index b2d9db35..dc0d43d7 100644
--- a/rhodecode/model/pull_request.py
+++ b/rhodecode/model/pull_request.py
@@ -34,6 +34,7 @@ from pylons.i18n.translation import lazy_ugettext
 from pyramid.threadlocal import get_current_request
 from sqlalchemy import or_
 
+from rhodecode import events
 from rhodecode.lib import helpers as h, hooks_utils, diffs
 from rhodecode.lib.compat import OrderedDict
 from rhodecode.lib.hooks_daemon import prepare_callback_daemon
@@ -1064,42 +1065,61 @@ class PullRequestModel(BaseModel):
             pull_request, pull_request.author, 'close')
         self._log_action('user_closed_pull_request', user, pull_request)
 
-    def close_pull_request_with_comment(self, pull_request, user, repo,
-                                        message=None):
-        status = ChangesetStatus.STATUS_REJECTED
+    def close_pull_request_with_comment(
+            self, pull_request, user, repo, message=None):
 
-        if not message:
-            message = (
-                _('Status change %(transition_icon)s %(status)s') % {
-                    'transition_icon': '>',
-                    'status': ChangesetStatus.get_status_lbl(status)})
+        pull_request_review_status = pull_request.calculated_review_status()
 
-        internal_message = _('Closing with') + ' ' + message
+        if pull_request_review_status == ChangesetStatus.STATUS_APPROVED:
+            # approved only if we have voting consent
+            status = ChangesetStatus.STATUS_APPROVED
+        else:
+            status = ChangesetStatus.STATUS_REJECTED
+        status_lbl = ChangesetStatus.get_status_lbl(status)
 
-        comm = CommentsModel().create(
-            text=internal_message,
+        default_message = (
+            _('Closing with status change {transition_icon} {status}.')
+        ).format(transition_icon='>', status=status_lbl)
+        text = message or default_message
+
+        # create a comment, and link it to new status
+        comment = CommentsModel().create(
+            text=text,
             repo=repo.repo_id,
             user=user.user_id,
             pull_request=pull_request.pull_request_id,
-            f_path=None,
-            line_no=None,
-            status_change=ChangesetStatus.get_status_lbl(status),
+            status_change=status_lbl,
             status_change_type=status,
             closing_pr=True
         )
 
+        # calculate old status before we change it
+        old_calculated_status = pull_request.calculated_review_status()
         ChangesetStatusModel().set_status(
             repo.repo_id,
             status,
             user.user_id,
-            comm,
+            comment=comment,
             pull_request=pull_request.pull_request_id
         )
-        Session().flush()
 
+        Session().flush()
+        events.trigger(events.PullRequestCommentEvent(pull_request, comment))
+        # we now calculate the status of pull request again, and based on that
+        # calculation trigger status change. This might happen in cases
+        # that non-reviewer admin closes a pr, which means his vote doesn't
+        # change the status, while if he's a reviewer this might change it.
+        calculated_status = pull_request.calculated_review_status()
+        if old_calculated_status != calculated_status:
+            self._trigger_pull_request_hook(
+                pull_request, user, 'review_status_change')
+
+        # finally close the PR
         PullRequestModel().close_pull_request(
             pull_request.pull_request_id, user)
 
+        return comment, status
+
     def merge_status(self, pull_request):
         if not self._is_merge_enabled(pull_request):
             return False, _('Server-side pull request merging is disabled.')
diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js
index c9b42823..4d237b25 100644
--- a/rhodecode/public/js/rhodecode/routes.js
+++ b/rhodecode/public/js/rhodecode/routes.js
@@ -96,6 +96,7 @@ function registerRCRoutes() {
     pyroutes.register('goto_switcher_data', '/_goto_data', []);
     pyroutes.register('repo_summary_explicit', '/%(repo_name)s/summary', ['repo_name']);
     pyroutes.register('repo_summary_commits', '/%(repo_name)s/summary-commits', ['repo_name']);
+    pyroutes.register('repo_commit', '/%(repo_name)s/changeset/%(commit_id)s', ['repo_name', 'commit_id']);
     pyroutes.register('repo_refs_data', '/%(repo_name)s/refs-data', ['repo_name']);
     pyroutes.register('repo_refs_changelog_data', '/%(repo_name)s/refs-data-changelog', ['repo_name']);
     pyroutes.register('repo_stats', '/%(repo_name)s/repo_stats/%(commit_id)s', ['repo_name', 'commit_id']);
diff --git a/rhodecode/public/js/src/rhodecode/pullrequests.js b/rhodecode/public/js/src/rhodecode/pullrequests.js
index a04d3c0c..517ed29e 100644
--- a/rhodecode/public/js/src/rhodecode/pullrequests.js
+++ b/rhodecode/public/js/src/rhodecode/pullrequests.js
@@ -367,16 +367,6 @@ var _updatePullRequest = function(repo_name, pull_request_id, postData) {
     ajaxPOST(url, postData, success);
 };
 
-/**
- * PULL REQUEST reject & close
- */
-var closePullRequest = function(repo_name, pull_request_id) {
-    var postData = {
-        '_method': 'put',
-        'close_pull_request': true};
-    _updatePullRequest(repo_name, pull_request_id, postData);
-};
-
 /**
  * PULL REQUEST update commits
  */
diff --git a/rhodecode/templates/changeset/changeset_comment_block.mako b/rhodecode/templates/changeset/changeset_comment_block.mako
index 77954242..19fafbc5 100644
--- a/rhodecode/templates/changeset/changeset_comment_block.mako
+++ b/rhodecode/templates/changeset/changeset_comment_block.mako
@@ -1,4 +1,4 @@
 ## this is a dummy html file for partial rendering on server and sending
 ## generated output via ajax after comment submit
 <%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>
-${comment.comment_block(c.co, inline=c.inline_comment)}
+${comment.comment_block(c.co, inline=c.co.is_inline)}
diff --git a/rhodecode/templates/debug_style/collapsable-content.html b/rhodecode/templates/debug_style/collapsable-content.html
index beaa42ba..f5fb4b84 100644
--- a/rhodecode/templates/debug_style/collapsable-content.html
+++ b/rhodecode/templates/debug_style/collapsable-content.html
@@ -949,9 +949,6 @@ $(document).ready(function() {
                 updateCommits("rhodecode-momentum", "720");
             });
 
-            $('#close_pull_request').on('click', function(e){
-                closePullRequest("rhodecode-momentum", "720");
-            });
         })
       </script>
 
diff --git a/rhodecode/templates/pullrequests/pullrequest_show.mako b/rhodecode/templates/pullrequests/pullrequest_show.mako
index 35533ac8..a823dbb4 100644
--- a/rhodecode/templates/pullrequests/pullrequest_show.mako
+++ b/rhodecode/templates/pullrequests/pullrequest_show.mako
@@ -825,11 +825,6 @@
             // fixing issue with caches on firefox
             $('#update_commits').removeAttr("disabled");
 
-            $('#close_pull_request').on('click', function(e){
-                closePullRequest(
-                    "${c.repo_name}", "${c.pull_request.pull_request_id}");
-            });
-
             $('.show-inline-comments').on('click', function(e){
                 var boxid = $(this).attr('data-comment-id');
                 var button = $(this);
diff --git a/rhodecode/tests/functional/test_pullrequests.py b/rhodecode/tests/functional/test_pullrequests.py
index e7f79694..7aec5729 100644
--- a/rhodecode/tests/functional/test_pullrequests.py
+++ b/rhodecode/tests/functional/test_pullrequests.py
@@ -237,7 +237,9 @@ class TestPullrequestsController(object):
         assertr.element_contains(
             'span[data-role="merge-message"]', str(expected_msg))
 
-    def test_comment_and_close_pull_request(self, pr_util, csrf_token):
+    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
@@ -249,11 +251,10 @@ class TestPullrequestsController(object):
                 repo_name=pull_request.target_repo.scm_instance().name,
                 pull_request_id=str(pull_request_id)),
             params={
-                'changeset_status': ChangesetStatus.STATUS_APPROVED,
                 'close_pull_request': '1',
                 'text': 'Closing a PR',
                 'csrf_token': csrf_token},
-            status=302)
+            extra_environ=xhr_header,)
 
         action = 'user_closed_pull_request:%d' % pull_request_id
         journal = UserLog.query()\
@@ -270,45 +271,26 @@ class TestPullrequestsController(object):
         status = ChangesetStatusModel().get_status(
             pull_request.source_repo, pull_request=pull_request)
         assert status == ChangesetStatus.STATUS_APPROVED
+        assert pull_request.comments[-1].text == 'Closing a PR'
 
-    def test_reject_and_close_pull_request(self, pr_util, csrf_token):
-        pull_request = pr_util.create_pull_request()
-        pull_request_id = pull_request.pull_request_id
-        response = self.app.post(
-            url(controller='pullrequests',
-                action='update',
-                repo_name=pull_request.target_repo.scm_instance().name,
-                pull_request_id=str(pull_request.pull_request_id)),
-            params={'close_pull_request': 'true', '_method': 'put',
-                    'csrf_token': csrf_token})
-
-        pull_request = PullRequest.get(pull_request_id)
-
-        assert response.json is True
-        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_force_close_pull_request(self, pr_util, csrf_token):
+    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), (2, ['reason2'], False)])
         author = pull_request.user_id
         repo = pull_request.target_repo.repo_id
+
         self.app.post(
             url(controller='pullrequests',
                 action='comment',
                 repo_name=pull_request.target_repo.scm_instance().name,
                 pull_request_id=str(pull_request_id)),
             params={
-                'changeset_status': 'rejected',
                 'close_pull_request': '1',
                 'csrf_token': csrf_token},
-            status=302)
+            extra_environ=xhr_header)
 
         pull_request = PullRequest.get(pull_request_id)
 
@@ -324,6 +306,31 @@ class TestPullrequestsController(object):
             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(
+            url(controller='pullrequests',
+                action='comment',
+                repo_name=pull_request.target_repo.scm_instance().name,
+                pull_request_id=str(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_create_pull_request(self, backend, csrf_token):
         commits = [
             {'message': 'ancestor'},

From 091c9d9d99aa86c899f764fd88ed2214d2c77879 Mon Sep 17 00:00:00 2001
From: Daniel Dourvaris <daniel@rhodecode.com>
Date: Wed, 14 Jun 2017 00:15:06 +0200
Subject: [PATCH 156/211] pull-requests: make sure to skip duplicates of
 reviewers via PR create method.

---
 rhodecode/model/pull_request.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py
index dc0d43d7..f13afc51 100644
--- a/rhodecode/model/pull_request.py
+++ b/rhodecode/model/pull_request.py
@@ -442,8 +442,12 @@ class PullRequestModel(BaseModel):
         # members / reviewers
         for reviewer_object in reviewers:
             user_id, reasons, mandatory = reviewer_object
-
             user = self._get_user(user_id)
+
+            # skip duplicates
+            if user.user_id in reviewer_ids:
+                continue
+
             reviewer_ids.add(user.user_id)
 
             reviewer = PullRequestReviewers()

From 930c7eebbd336a5e461d5c7dcb43cda410fed4b3 Mon Sep 17 00:00:00 2001
From: Daniel Dourvaris <daniel@rhodecode.com>
Date: Wed, 14 Jun 2017 11:07:54 +0200
Subject: [PATCH 157/211] api: attach the call context variables to request for
 later usage in API calls.

---
 rhodecode/api/__init__.py | 8 +++++++-
 rhodecode/lib/base.py     | 8 ++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/rhodecode/api/__init__.py b/rhodecode/api/__init__.py
index 6e4b889b..4b6b6883 100644
--- a/rhodecode/api/__init__.py
+++ b/rhodecode/api/__init__.py
@@ -35,8 +35,9 @@ from pyramid.httpexceptions import HTTPNotFound
 
 from rhodecode.api.exc import (
     JSONRPCBaseError, JSONRPCError, JSONRPCForbidden, JSONRPCValidationError)
+from rhodecode.apps._base import TemplateArgs
 from rhodecode.lib.auth import AuthUser
-from rhodecode.lib.base import get_ip_addr
+from rhodecode.lib.base import get_ip_addr, attach_context_attributes
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.utils2 import safe_str
 from rhodecode.lib.plugins.utils import get_plugin_settings
@@ -278,6 +279,11 @@ def request_view(request):
         'request': request,
         'apiuser': auth_u
     })
+
+    # register some common functions for usage
+    attach_context_attributes(TemplateArgs(), request, request.rpc_user.user_id,
+                              attach_to_request=True)
+
     try:
         ret_value = func(**call_params)
         return jsonrpc_response(request, ret_value)
diff --git a/rhodecode/lib/base.py b/rhodecode/lib/base.py
index f386621b..a1df8a05 100644
--- a/rhodecode/lib/base.py
+++ b/rhodecode/lib/base.py
@@ -265,7 +265,7 @@ class BasicAuth(AuthBasicAuthenticator):
     __call__ = authenticate
 
 
-def attach_context_attributes(context, request, user_id):
+def attach_context_attributes(context, request, user_id, attach_to_request=False):
     """
     Attach variables into template context called `c`, please note that
     request could be pylons or pyramid request in here.
@@ -388,7 +388,11 @@ def attach_context_attributes(context, request, user_id):
     context.backends = rhodecode.BACKENDS.keys()
     context.backends.sort()
     context.unread_notifications = NotificationModel().get_unread_cnt_for_user(user_id)
-    context.pyramid_request = pyramid.threadlocal.get_current_request()
+    if attach_to_request:
+        request.call_context = context
+    else:
+        context.pyramid_request = pyramid.threadlocal.get_current_request()
+
 
 
 def get_auth_user(environ):

From 2beb24a857b2d51ca04c63e64b77d03c9e2c4d86 Mon Sep 17 00:00:00 2001
From: Daniel Dourvaris <daniel@rhodecode.com>
Date: Wed, 14 Jun 2017 11:10:19 +0200
Subject: [PATCH 158/211] reviewers: added validation and default review rules
 via API calls.

- update/create pull request now validate and update the default reviewer rules.
---
 .../api/tests/test_create_pull_request.py     |  2 +-
 rhodecode/api/views/pull_request_api.py       | 77 +++++++++++++------
 rhodecode/controllers/pullrequests.py         |  6 +-
 rhodecode/lib/helpers.py                      | 17 ++--
 .../schemas/reviewer_schema.py                |  2 +-
 5 files changed, 71 insertions(+), 33 deletions(-)

diff --git a/rhodecode/api/tests/test_create_pull_request.py b/rhodecode/api/tests/test_create_pull_request.py
index 505beec5..431780c2 100644
--- a/rhodecode/api/tests/test_create_pull_request.py
+++ b/rhodecode/api/tests/test_create_pull_request.py
@@ -77,7 +77,7 @@ class TestCreatePullRequestApi(object):
         assert pull_request.source_repo.repo_name == data['source_repo']
         assert pull_request.target_repo.repo_name == data['target_repo']
         assert pull_request.revisions == [self.commit_ids['change']]
-        assert pull_request.reviewers == []
+        assert len(pull_request.reviewers) == 1
 
     @pytest.mark.backends("git", "hg")
     def test_create_with_empty_description(self, backend):
diff --git a/rhodecode/api/views/pull_request_api.py b/rhodecode/api/views/pull_request_api.py
index d46e95f4..054be318 100644
--- a/rhodecode/api/views/pull_request_api.py
+++ b/rhodecode/api/views/pull_request_api.py
@@ -482,24 +482,26 @@ def create_pull_request(
     :param description: Set the pull request description.
     :type description: Optional(str)
     :param reviewers: Set the new pull request reviewers list.
+        Reviewer defined by review rules will be added automatically to the
+        defined list.
     :type reviewers: Optional(list)
         Accepts username strings or objects of the format:
 
-            {'username': 'nick', 'reasons': ['original author'], 'mandatory': <bool>}
+            [{'username': 'nick', 'reasons': ['original author'], 'mandatory': <bool>}]
     """
 
-    source = get_repo_or_error(source_repo)
-    target = get_repo_or_error(target_repo)
+    source_db_repo =  get_repo_or_error(source_repo)
+    target_db_repo = get_repo_or_error(target_repo)
     if not has_superadmin_permission(apiuser):
         _perms = ('repository.admin', 'repository.write', 'repository.read',)
-        validate_repo_permissions(apiuser, source_repo, source, _perms)
+        validate_repo_permissions(apiuser, source_repo, source_db_repo, _perms)
 
-    full_source_ref = resolve_ref_or_error(source_ref, source)
-    full_target_ref = resolve_ref_or_error(target_ref, target)
-    source_commit = get_commit_or_error(full_source_ref, source)
-    target_commit = get_commit_or_error(full_target_ref, target)
-    source_scm = source.scm_instance()
-    target_scm = target.scm_instance()
+    full_source_ref = resolve_ref_or_error(source_ref, source_db_repo)
+    full_target_ref = resolve_ref_or_error(target_ref, target_db_repo)
+    source_commit = get_commit_or_error(full_source_ref, source_db_repo)
+    target_commit = get_commit_or_error(full_target_ref, target_db_repo)
+    source_scm = source_db_repo.scm_instance()
+    target_scm = target_db_repo.scm_instance()
 
     commit_ranges = target_scm.compare(
         target_commit.raw_id, source_commit.raw_id, source_scm,
@@ -515,6 +517,7 @@ def create_pull_request(
         raise JSONRPCError('no common ancestor found')
 
     reviewer_objects = Optional.extract(reviewers) or []
+
     if reviewer_objects:
         schema = ReviewerListSchema()
         try:
@@ -522,12 +525,28 @@ def create_pull_request(
         except Invalid as err:
             raise JSONRPCValidationError(colander_exc=err)
 
-    reviewers = []
-    for reviewer_object in reviewer_objects:
-        user = get_user_or_error(reviewer_object['username'])
-        reasons = reviewer_object['reasons']
-        mandatory = reviewer_object['mandatory']
-        reviewers.append((user.user_id, reasons, mandatory))
+        # validate users
+        for reviewer_object in reviewer_objects:
+            user = get_user_or_error(reviewer_object['username'])
+            reviewer_object['user_id'] = user.user_id
+
+    get_default_reviewers_data, get_validated_reviewers = \
+        PullRequestModel().get_reviewer_functions()
+
+    reviewer_rules = get_default_reviewers_data(
+        apiuser.get_instance(), source_db_repo,
+        source_commit, target_db_repo, target_commit)
+
+    # specified rules are later re-validated, thus we can assume users will
+    # eventually provide those that meet the reviewer criteria.
+    if not reviewer_objects:
+        reviewer_objects = reviewer_rules['reviewers']
+
+    try:
+        reviewers = get_validated_reviewers(
+            reviewer_objects, reviewer_rules)
+    except ValueError as e:
+        raise JSONRPCError('Reviewers Validation: {}'.format(e))
 
     pull_request_model = PullRequestModel()
     pull_request = pull_request_model.create(
@@ -573,7 +592,7 @@ def update_pull_request(
     :type reviewers: Optional(list)
         Accepts username strings or objects of the format:
 
-            {'username': 'nick', 'reasons': ['original author'], 'mandatory': <bool>}
+            [{'username': 'nick', 'reasons': ['original author'], 'mandatory': <bool>}]
 
     :param update_commits: Trigger update of commits for this pull request
     :type: update_commits: Optional(bool)
@@ -619,6 +638,7 @@ def update_pull_request(
                 pullrequestid,))
 
     reviewer_objects = Optional.extract(reviewers) or []
+
     if reviewer_objects:
         schema = ReviewerListSchema()
         try:
@@ -626,12 +646,23 @@ def update_pull_request(
         except Invalid as err:
             raise JSONRPCValidationError(colander_exc=err)
 
-    reviewers = []
-    for reviewer_object in reviewer_objects:
-        user = get_user_or_error(reviewer_object['username'])
-        reasons = reviewer_object['reasons']
-        mandatory = reviewer_object['mandatory']
-        reviewers.append((user.user_id, reasons, mandatory))
+        # validate users
+        for reviewer_object in reviewer_objects:
+            user = get_user_or_error(reviewer_object['username'])
+            reviewer_object['user_id'] = user.user_id
+
+        get_default_reviewers_data, get_validated_reviewers = \
+            PullRequestModel().get_reviewer_functions()
+
+        # re-use stored rules
+        reviewer_rules = pull_request.reviewer_data
+        try:
+            reviewers = get_validated_reviewers(
+                reviewer_objects, reviewer_rules)
+        except ValueError as e:
+            raise JSONRPCError('Reviewers Validation: {}'.format(e))
+    else:
+        reviewers = []
 
     title = Optional.extract(title)
     description = Optional.extract(description)
diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py
index aacfcf67..df7ed376 100644
--- a/rhodecode/controllers/pullrequests.py
+++ b/rhodecode/controllers/pullrequests.py
@@ -264,8 +264,8 @@ class PullrequestsController(BaseRepoController):
             c.rhodecode_user.get_instance(), source_db_repo,
             source_commit, target_db_repo, target_commit)
 
-        reviewers = validate_default_reviewers(
-            _form['review_members'], reviewer_rules)
+        given_reviewers = _form['review_members']
+        reviewers = validate_default_reviewers(given_reviewers, reviewer_rules)
 
         try:
             pull_request = PullRequestModel().create(
@@ -452,7 +452,7 @@ class PullrequestsController(BaseRepoController):
         try:
             reviewers = validate_default_reviewers(review_members, reviewer_rules)
         except ValueError as e:
-            log.error('Reviewers Validation:{}'.format(e))
+            log.error('Reviewers Validation: {}'.format(e))
             h.flash(e, category='error')
             return
 
diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py
index 90239df1..a6837573 100644
--- a/rhodecode/lib/helpers.py
+++ b/rhodecode/lib/helpers.py
@@ -1248,12 +1248,19 @@ def initials_gravatar(email_address, first_name, last_name, size=30):
     return klass.generate_svg(svg_type=svg_type)
 
 
-def gravatar_url(email_address, size=30):
-    # doh, we need to re-import those to mock it later
-    from pylons import tmpl_context as c
+def gravatar_url(email_address, size=30, request=None):
+    request = get_current_request()
+    if request and hasattr(request, 'call_context'):
+        _use_gravatar = request.call_context.visual.use_gravatar
+        _gravatar_url = request.call_context.visual.gravatar_url
+    else:
+        # doh, we need to re-import those to mock it later
+        from pylons import tmpl_context as c
 
-    _use_gravatar = c.visual.use_gravatar
-    _gravatar_url = c.visual.gravatar_url or User.DEFAULT_GRAVATAR_URL
+        _use_gravatar = c.visual.use_gravatar
+        _gravatar_url = c.visual.gravatar_url
+
+    _gravatar_url = _gravatar_url or User.DEFAULT_GRAVATAR_URL
 
     email_address = email_address or User.DEFAULT_USER_EMAIL
     if isinstance(email_address, unicode):
diff --git a/rhodecode/model/validation_schema/schemas/reviewer_schema.py b/rhodecode/model/validation_schema/schemas/reviewer_schema.py
index e76098b4..6285ee9d 100644
--- a/rhodecode/model/validation_schema/schemas/reviewer_schema.py
+++ b/rhodecode/model/validation_schema/schemas/reviewer_schema.py
@@ -24,7 +24,7 @@ from rhodecode.model.validation_schema import validators, preparers, types
 
 class ReviewerSchema(colander.MappingSchema):
     username = colander.SchemaNode(types.StrOrIntType())
-    reasons = colander.SchemaNode(colander.List(), missing=[])
+    reasons = colander.SchemaNode(colander.List(), missing=['no reason specified'])
     mandatory = colander.SchemaNode(colander.Boolean(), missing=False)
 
 

From 10162bb05073ff9e8f8dbe5ab3866cd68df5c83d Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 14 Jun 2017 11:23:27 +0200
Subject: [PATCH 159/211] cleanup: imports cleanup.

---
 rhodecode/controllers/admin/repo_groups.py |  2 +-
 rhodecode/controllers/admin/repos.py       | 10 +++-------
 rhodecode/controllers/admin/user_groups.py |  4 ++--
 rhodecode/controllers/changeset.py         |  3 +--
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/rhodecode/controllers/admin/repo_groups.py b/rhodecode/controllers/admin/repo_groups.py
index ba0a40c7..ac2fb15d 100644
--- a/rhodecode/controllers/admin/repo_groups.py
+++ b/rhodecode/controllers/admin/repo_groups.py
@@ -39,12 +39,12 @@ from rhodecode.lib.auth import (
     LoginRequired, NotAnonymous, HasPermissionAll,
     HasRepoGroupPermissionAll, HasRepoGroupPermissionAnyDecorator)
 from rhodecode.lib.base import BaseController, render
+from rhodecode.lib.utils2 import safe_int
 from rhodecode.model.db import RepoGroup, User
 from rhodecode.model.scm import RepoGroupList
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.forms import RepoGroupForm, RepoGroupPermsForm
 from rhodecode.model.meta import Session
-from rhodecode.lib.utils2 import safe_int
 
 
 log = logging.getLogger(__name__)
diff --git a/rhodecode/controllers/admin/repos.py b/rhodecode/controllers/admin/repos.py
index ae9970b5..5eeecc31 100644
--- a/rhodecode/controllers/admin/repos.py
+++ b/rhodecode/controllers/admin/repos.py
@@ -41,15 +41,11 @@ from rhodecode.lib.auth import (
     HasRepoGroupPermissionAny, HasRepoPermissionAnyDecorator)
 from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.ext_json import json
-from rhodecode.lib.exceptions import AttachedForksError
-from rhodecode.lib.utils import action_logger, repo_name_slug, jsonify
+from rhodecode.lib.utils import repo_name_slug, jsonify
 from rhodecode.lib.utils2 import safe_int, str2bool
-from rhodecode.lib.vcs import RepositoryError
-from rhodecode.model.db import (
-    User, Repository, UserFollowing, RepoGroup, RepositoryField)
+from rhodecode.model.db import (Repository, RepoGroup, RepositoryField)
 from rhodecode.model.forms import (
-    RepoForm, RepoFieldForm, RepoPermsForm, RepoVcsSettingsForm,
-    IssueTrackerPatternsForm)
+    RepoForm, RepoFieldForm, RepoVcsSettingsForm, IssueTrackerPatternsForm)
 from rhodecode.model.meta import Session
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.scm import ScmModel, RepoGroupList, RepoList
diff --git a/rhodecode/controllers/admin/user_groups.py b/rhodecode/controllers/admin/user_groups.py
index aadf4357..708bf2a6 100644
--- a/rhodecode/controllers/admin/user_groups.py
+++ b/rhodecode/controllers/admin/user_groups.py
@@ -35,6 +35,7 @@ from sqlalchemy.orm import joinedload
 
 from rhodecode.lib import auth
 from rhodecode.lib import helpers as h
+from rhodecode.lib.ext_json import json
 from rhodecode.lib.exceptions import UserGroupAssignedException,\
     RepoGroupAssignmentError
 from rhodecode.lib.utils import jsonify, action_logger
@@ -52,8 +53,7 @@ from rhodecode.model.forms import (
     UserGroupForm, UserGroupPermsForm, UserIndividualPermissionsForm,
     UserPermissionsForm)
 from rhodecode.model.meta import Session
-from rhodecode.lib.utils import action_logger
-from rhodecode.lib.ext_json import json
+
 
 log = logging.getLogger(__name__)
 
diff --git a/rhodecode/controllers/changeset.py b/rhodecode/controllers/changeset.py
index bd95ef0e..e2b6e3be 100644
--- a/rhodecode/controllers/changeset.py
+++ b/rhodecode/controllers/changeset.py
@@ -39,7 +39,7 @@ from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.compat import OrderedDict
 from rhodecode.lib.exceptions import StatusChangeOnClosedPullRequestError
 import rhodecode.lib.helpers as h
-from rhodecode.lib.utils import action_logger, jsonify
+from rhodecode.lib.utils import jsonify
 from rhodecode.lib.utils2 import safe_unicode
 from rhodecode.lib.vcs.backends.base import EmptyCommit
 from rhodecode.lib.vcs.exceptions import (
@@ -48,7 +48,6 @@ from rhodecode.model.db import ChangesetComment, ChangesetStatus
 from rhodecode.model.changeset_status import ChangesetStatusModel
 from rhodecode.model.comment import CommentsModel
 from rhodecode.model.meta import Session
-from rhodecode.model.repo import RepoModel
 
 
 log = logging.getLogger(__name__)

From c36f3f7abdee93d70fbb397ff6b211b50fe16422 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 14 Jun 2017 14:39:19 +0200
Subject: [PATCH 160/211] tests: removed soon-to-be deleted test for deprecated
 action_logger.

---
 rhodecode/tests/lib/test_utils.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/rhodecode/tests/lib/test_utils.py b/rhodecode/tests/lib/test_utils.py
index 808cccd7..d6553a9a 100644
--- a/rhodecode/tests/lib/test_utils.py
+++ b/rhodecode/tests/lib/test_utils.py
@@ -221,11 +221,6 @@ def platform_encodes_filenames():
     return path_with_latin1 != read_path
 
 
-def test_action_logger_action_size(pylonsapp, test_repo):
-    action = 'x' * 1200001
-    utils.action_logger(TEST_USER_ADMIN_LOGIN, action, test_repo, commit=True)
-
-
 @pytest.fixture
 def repo_groups(request):
     session = meta.Session()

From dbcc4881372f9de4295c832df9316c1f56f31219 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 14 Jun 2017 11:51:46 +0200
Subject: [PATCH 161/211] audit-logs: implement enum sources that should be
 re-used.

---
 rhodecode/api/views/repo_api.py                           | 3 ++-
 rhodecode/apps/repository/views/repo_settings_advanced.py | 3 ++-
 rhodecode/lib/audit_logger.py                             | 6 +++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/rhodecode/api/views/repo_api.py b/rhodecode/api/views/repo_api.py
index f78f4daf..6eb0a2f0 100644
--- a/rhodecode/api/views/repo_api.py
+++ b/rhodecode/api/views/repo_api.py
@@ -1181,7 +1181,8 @@ def delete_repo(request, apiuser, repoid, forks=Optional('')):
 
         audit_logger.store(
             action='repo.delete',
-            action_data={'repo_data': repo_data, 'source': 'api_call'},
+            action_data={'repo_data': repo_data,
+                         'source': audit_logger.SOURCE_API},
             user=apiuser, repo=repo, commit=False)
 
         ScmModel().mark_for_invalidation(repo_name, delete=True)
diff --git a/rhodecode/apps/repository/views/repo_settings_advanced.py b/rhodecode/apps/repository/views/repo_settings_advanced.py
index 8948e4f7..d6cb4492 100644
--- a/rhodecode/apps/repository/views/repo_settings_advanced.py
+++ b/rhodecode/apps/repository/views/repo_settings_advanced.py
@@ -101,7 +101,8 @@ class RepoSettingsView(RepoAppView):
                                          repo_name=self.db_repo.repo_name)
             audit_logger.store(
                 action='repo.delete',
-                action_data={'repo_data': repo_data, 'source': 'web_action'},
+                action_data={'repo_data': repo_data,
+                             'source': audit_logger.SOURCE_WEB},
                 user=self._rhodecode_user, repo=repo, commit=False)
 
             ScmModel().mark_for_invalidation(self.db_repo_name, delete=True)
diff --git a/rhodecode/lib/audit_logger.py b/rhodecode/lib/audit_logger.py
index 183af07c..0ce87d43 100644
--- a/rhodecode/lib/audit_logger.py
+++ b/rhodecode/lib/audit_logger.py
@@ -44,6 +44,9 @@ ACTIONS = {
     'repo.archive.download': {},
 }
 
+SOURCE_WEB = 'source_web'
+SOURCE_API = 'source_api'
+
 
 class UserWrap(object):
     """
@@ -114,7 +117,8 @@ def store(
         # repo action, when we know and have the repository object already
         audit_logger.store(
             action='repo.delete',
-            user=audit_logger.UserWrap(username='itried-login', ip_addr='8.8.8.8'),
+            action_data={'source': audit_logger.SOURCE_WEB, },
+            user=self._rhodecode_user,
             repo=repo_object)
 
         # without an user ?

From 3e76f233680c2a7bcaac3561d38182a20a329313 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 14 Jun 2017 12:39:51 +0200
Subject: [PATCH 162/211] audit-logs: added action logs for repository groups.

---
 rhodecode/controllers/admin/repo_groups.py | 74 +++++++++++-----------
 rhodecode/lib/audit_logger.py              |  5 ++
 rhodecode/model/repo_group.py              | 27 +++++++-
 3 files changed, 67 insertions(+), 39 deletions(-)

diff --git a/rhodecode/controllers/admin/repo_groups.py b/rhodecode/controllers/admin/repo_groups.py
index ac2fb15d..eb434a55 100644
--- a/rhodecode/controllers/admin/repo_groups.py
+++ b/rhodecode/controllers/admin/repo_groups.py
@@ -34,6 +34,7 @@ from pylons.i18n.translation import _, ungettext
 
 from rhodecode.lib import auth
 from rhodecode.lib import helpers as h
+from rhodecode.lib import audit_logger
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.auth import (
     LoginRequired, NotAnonymous, HasPermissionAll,
@@ -153,9 +154,6 @@ class RepoGroupsController(BaseController):
 
     @NotAnonymous()
     def index(self):
-        """GET /repo_groups: All items in the collection"""
-        # url('repo_groups')
-
         repo_group_list = RepoGroup.get_all_repo_groups()
         _perms = ['group.admin']
         repo_group_list_acl = RepoGroupList(repo_group_list, perm_set=_perms)
@@ -168,8 +166,6 @@ class RepoGroupsController(BaseController):
     @NotAnonymous()
     @auth.CSRFRequired()
     def create(self):
-        """POST /repo_groups: Create a new item"""
-        # url('repo_groups')
 
         parent_group_id = safe_int(request.POST.get('group_parent_id'))
         can_create = self._can_create_repo_group(parent_group_id)
@@ -183,20 +179,27 @@ class RepoGroupsController(BaseController):
         try:
             owner = c.rhodecode_user
             form_result = repo_group_form.to_python(dict(request.POST))
-            RepoGroupModel().create(
+            repo_group = RepoGroupModel().create(
                 group_name=form_result['group_name_full'],
                 group_description=form_result['group_description'],
                 owner=owner.user_id,
                 copy_permissions=form_result['group_copy_permissions']
             )
             Session().commit()
+            repo_group_data = repo_group.get_api_data()
             _new_group_name = form_result['group_name_full']
+
+            audit_logger.store(
+                action='repo_group.create',
+                action_data={'repo_group_data': repo_group_data},
+                user=c.rhodecode_user, commit=True)
+
             repo_group_url = h.link_to(
                 _new_group_name,
                 h.route_path('repo_group_home', repo_group_name=_new_group_name))
             h.flash(h.literal(_('Created repository group %s')
                     % repo_group_url), category='success')
-            # TODO: in future action_logger(, '', '', '', self.sa)
+
         except formencode.Invalid as errors:
             return htmlfill.render(
                 render('admin/repo_groups/repo_group_add.mako'),
@@ -216,8 +219,6 @@ class RepoGroupsController(BaseController):
     # perm checks inside
     @NotAnonymous()
     def new(self):
-        """GET /repo_groups/new: Form to create a new item"""
-        # url('new_repo_group')
         # perm check for admin, create_group perm or admin of parent_group
         parent_group_id = safe_int(request.GET.get('parent_group'))
         if not self._can_create_repo_group(parent_group_id):
@@ -229,11 +230,6 @@ class RepoGroupsController(BaseController):
     @HasRepoGroupPermissionAnyDecorator('group.admin')
     @auth.CSRFRequired()
     def update(self, group_name):
-        """PUT /repo_groups/group_name: Update an existing item"""
-        # Forms posted to this method should contain a hidden field:
-        #    <input type="hidden" name="_method" value="PUT" />
-        # Or using helpers:
-        #    h.form(url('repos_group', group_name=GROUP_NAME), method='put')
 
         c.repo_group = RepoGroupModel()._get_repo_group(group_name)
         can_create_in_root = self._can_create_repo_group()
@@ -249,16 +245,21 @@ class RepoGroupsController(BaseController):
             available_groups=c.repo_groups_choices,
             can_create_in_root=can_create_in_root, allow_disabled=True)()
 
+        old_values = c.repo_group.get_api_data()
         try:
             form_result = repo_group_form.to_python(dict(request.POST))
             gr_name = form_result['group_name']
             new_gr = RepoGroupModel().update(group_name, form_result)
+
+            audit_logger.store(
+                'repo_group.edit', action_data={'old_data': old_values},
+                user=c.rhodecode_user)
+
             Session().commit()
             h.flash(_('Updated repository group %s') % (gr_name,),
                     category='success')
             # we now have new name !
             group_name = new_gr.group_name
-            # TODO: in future action_logger(, '', '', '', self.sa)
         except formencode.Invalid as errors:
             c.active = 'settings'
             return htmlfill.render(
@@ -278,12 +279,6 @@ class RepoGroupsController(BaseController):
     @HasRepoGroupPermissionAnyDecorator('group.admin')
     @auth.CSRFRequired()
     def delete(self, group_name):
-        """DELETE /repo_groups/group_name: Delete an existing item"""
-        # Forms posted to this method should contain a hidden field:
-        #    <input type="hidden" name="_method" value="DELETE" />
-        # Or using helpers:
-        #    h.form(url('repos_group', group_name=GROUP_NAME), method='delete')
-
         gr = c.repo_group = RepoGroupModel()._get_repo_group(group_name)
         repos = gr.repositories.all()
         if repos:
@@ -305,11 +300,18 @@ class RepoGroupsController(BaseController):
             return redirect(url('repo_groups'))
 
         try:
+            old_values = gr.get_api_data()
             RepoGroupModel().delete(group_name)
+
+            audit_logger.store(
+                'repo_group.delete',
+                action_data={'old_data': old_values,
+                             'source': audit_logger.SOURCE_WEB},
+                user=c.rhodecode_user)
+
             Session().commit()
             h.flash(_('Removed repository group %s') % group_name,
                     category='success')
-            # TODO: in future action_logger(, '', '', '', self.sa)
         except Exception:
             log.exception("Exception during deletion of repository group")
             h.flash(_('Error occurred during deletion of repository group %s')
@@ -319,8 +321,7 @@ class RepoGroupsController(BaseController):
 
     @HasRepoGroupPermissionAnyDecorator('group.admin')
     def edit(self, group_name):
-        """GET /repo_groups/group_name/edit: Form to edit an existing item"""
-        # url('edit_repo_group', group_name=GROUP_NAME)
+
         c.active = 'settings'
 
         c.repo_group = RepoGroupModel()._get_repo_group(group_name)
@@ -344,8 +345,6 @@ class RepoGroupsController(BaseController):
 
     @HasRepoGroupPermissionAnyDecorator('group.admin')
     def edit_repo_group_advanced(self, group_name):
-        """GET /repo_groups/group_name/edit: Form to edit an existing item"""
-        # url('edit_repo_group', group_name=GROUP_NAME)
         c.active = 'advanced'
         c.repo_group = RepoGroupModel()._get_repo_group(group_name)
 
@@ -353,8 +352,6 @@ class RepoGroupsController(BaseController):
 
     @HasRepoGroupPermissionAnyDecorator('group.admin')
     def edit_repo_group_perms(self, group_name):
-        """GET /repo_groups/group_name/edit: Form to edit an existing item"""
-        # url('edit_repo_group', group_name=GROUP_NAME)
         c.active = 'perms'
         c.repo_group = RepoGroupModel()._get_repo_group(group_name)
         self.__load_defaults()
@@ -372,8 +369,6 @@ class RepoGroupsController(BaseController):
     def update_perms(self, group_name):
         """
         Update permissions for given repository group
-
-        :param group_name:
         """
 
         c.repo_group = RepoGroupModel()._get_repo_group(group_name)
@@ -391,14 +386,21 @@ class RepoGroupsController(BaseController):
         # iterate over all members(if in recursive mode) of this groups and
         # set the permissions !
         # this can be potentially heavy operation
-        RepoGroupModel().update_permissions(
+        changes = RepoGroupModel().update_permissions(
             c.repo_group,
-            form['perm_additions'], form['perm_updates'],
-            form['perm_deletions'], form['recursive'])
+            form['perm_additions'], form['perm_updates'], form['perm_deletions'],
+            form['recursive'])
+
+        action_data = {
+            'added': changes['added'],
+            'updated': changes['updated'],
+            'deleted': changes['deleted'],
+            'source': audit_logger.SOURCE_WEB
+        }
+        audit_logger.store(
+            'repo_group.edit.permissions', action_data=action_data,
+            user=c.rhodecode_user)
 
-        # TODO: implement this
-        # action_logger(c.rhodecode_user, 'admin_changed_repo_permissions',
-        #               repo_name, self.ip_addr, self.sa)
         Session().commit()
         h.flash(_('Repository Group permissions updated'), category='success')
         return redirect(url('edit_repo_group_perms', group_name=group_name))
diff --git a/rhodecode/lib/audit_logger.py b/rhodecode/lib/audit_logger.py
index 0ce87d43..4da3787e 100644
--- a/rhodecode/lib/audit_logger.py
+++ b/rhodecode/lib/audit_logger.py
@@ -42,6 +42,11 @@ ACTIONS = {
     'repo.delete': {},
     'repo.commit.strip': {},
     'repo.archive.download': {},
+
+    'repo_group.create': {},
+    'repo_group.edit': {},
+    'repo_group.edit.permissions': {},
+    'repo_group.delete': {},
 }
 
 SOURCE_WEB = 'source_web'
diff --git a/rhodecode/model/repo_group.py b/rhodecode/model/repo_group.py
index 9ffb65e4..5996b541 100644
--- a/rhodecode/model/repo_group.py
+++ b/rhodecode/model/repo_group.py
@@ -340,6 +340,12 @@ class RepoGroupModel(BaseModel):
 
         req_perms = ('usergroup.read', 'usergroup.write', 'usergroup.admin')
 
+        changes = {
+            'added': [],
+            'updated': [],
+            'deleted': []
+        }
+
         def _set_perm_user(obj, user, perm):
             if isinstance(obj, RepoGroup):
                 self.grant_user_permission(
@@ -382,7 +388,6 @@ class RepoGroupModel(BaseModel):
                     repo=obj, group_name=user_group)
 
         # start updates
-        updates = []
         log.debug('Now updating permissions for %s in recursive mode:%s',
                   repo_group, recursive)
 
@@ -408,10 +413,13 @@ class RepoGroupModel(BaseModel):
                 # in recursive mode
                 obj = repo_group
 
+            change_obj = obj.get_api_data()
+
             # update permissions
             for member_id, perm, member_type in perm_updates:
                 member_id = int(member_id)
                 if member_type == 'user':
+                    member_name = User.get(member_id).username
                     # this updates also current one if found
                     _set_perm_user(obj, user=member_id, perm=perm)
                 else:  # set for user group
@@ -420,10 +428,15 @@ class RepoGroupModel(BaseModel):
                                                          user=cur_user):
                         _set_perm_group(obj, users_group=member_id, perm=perm)
 
+                changes['updated'].append(
+                    {'change_obj': change_obj, 'type': member_type,
+                     'id': member_id, 'name': member_name, 'new_perm': perm})
+
             # set new permissions
             for member_id, perm, member_type in perm_additions:
                 member_id = int(member_id)
                 if member_type == 'user':
+                    member_name = User.get(member_id).username
                     _set_perm_user(obj, user=member_id, perm=perm)
                 else:  # set for user group
                     # check if we have permissions to alter this usergroup
@@ -432,10 +445,15 @@ class RepoGroupModel(BaseModel):
                                                          user=cur_user):
                         _set_perm_group(obj, users_group=member_id, perm=perm)
 
+                changes['added'].append(
+                    {'change_obj': change_obj, 'type': member_type,
+                     'id': member_id, 'name': member_name, 'new_perm': perm})
+
             # delete permissions
             for member_id, perm, member_type in perm_deletions:
                 member_id = int(member_id)
                 if member_type == 'user':
+                    member_name = User.get(member_id).username
                     _revoke_perm_user(obj, user=member_id)
                 else:  # set for user group
                     # check if we have permissions to alter this usergroup
@@ -444,13 +462,16 @@ class RepoGroupModel(BaseModel):
                                                          user=cur_user):
                         _revoke_perm_group(obj, user_group=member_id)
 
-            updates.append(obj)
+                changes['deleted'].append(
+                    {'change_obj': change_obj, 'type': member_type,
+                     'id': member_id, 'name': member_name, 'new_perm': perm})
+
             # if it's not recursive call for all,repos,groups
             # break the loop and don't proceed with other changes
             if recursive not in ['all', 'repos', 'groups']:
                 break
 
-        return updates
+        return changes
 
     def update(self, repo_group, form_data):
         try:

From 76180012120362133fdd00308cce282666ac88b7 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 14 Jun 2017 14:15:11 +0200
Subject: [PATCH 163/211] audit-logger: added convinience wrappers to store web
 or api action.

---
 rhodecode/lib/audit_logger.py | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/rhodecode/lib/audit_logger.py b/rhodecode/lib/audit_logger.py
index 4da3787e..5facaac6 100644
--- a/rhodecode/lib/audit_logger.py
+++ b/rhodecode/lib/audit_logger.py
@@ -99,11 +99,30 @@ def _store_log(action_name, action_data, user_id, username, user_data,
     return user_log
 
 
+def store_web(*args, **kwargs):
+    if 'action_data' not in kwargs:
+        kwargs['action_data'] = {}
+    kwargs['action_data'].update({
+        'source': SOURCE_WEB
+    })
+    return store(*args, **kwargs)
+
+
+def store_api(*args, **kwargs):
+    if 'action_data' not in kwargs:
+        kwargs['action_data'] = {}
+    kwargs['action_data'].update({
+        'source': SOURCE_API
+    })
+    return store(*args, **kwargs)
+
+
 def store(
         action, user, action_data=None, user_data=None, ip_addr=None,
         repo=None, sa_session=None, commit=False):
     """
-    Audit logger for various actions made by users, typically this results in a call such::
+    Audit logger for various actions made by users, typically this
+    results in a call such::
 
         from rhodecode.lib import audit_logger
 
@@ -126,6 +145,13 @@ def store(
             user=self._rhodecode_user,
             repo=repo_object)
 
+        # alternative wrapper to the above
+        audit_logger.store_web(
+            action='repo.delete',
+            action_data={},
+            user=self._rhodecode_user,
+            repo=repo_object)
+
         # without an user ?
         audit_logger.store(
             action='user.login.failure',

From 4bd5c08e8743c8752229e5833f80a75bdeb746fe Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 14 Jun 2017 14:38:59 +0200
Subject: [PATCH 164/211] audit-logs: added audit-logs on user actions.

- adding/deleting ips
- adding/deleting emails
- edit/create
---
 rhodecode/controllers/admin/users.py | 114 +++++++++++++++------------
 rhodecode/lib/audit_logger.py        |  20 ++++-
 rhodecode/model/user.py              |   4 +-
 3 files changed, 82 insertions(+), 56 deletions(-)

diff --git a/rhodecode/controllers/admin/users.py b/rhodecode/controllers/admin/users.py
index 20f8ecbf..73c735c0 100644
--- a/rhodecode/controllers/admin/users.py
+++ b/rhodecode/controllers/admin/users.py
@@ -31,15 +31,17 @@ from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
 
 from rhodecode.authentication.plugins import auth_rhodecode
+
+from rhodecode.lib import helpers as h
+from rhodecode.lib import auth
+from rhodecode.lib import audit_logger
+from rhodecode.lib.auth import (
+    LoginRequired, HasPermissionAllDecorator, AuthUser)
+from rhodecode.lib.base import BaseController, render
 from rhodecode.lib.exceptions import (
     DefaultUserException, UserOwnsReposException, UserOwnsRepoGroupsException,
     UserOwnsUserGroupsException, UserCreationError)
-from rhodecode.lib import helpers as h
-from rhodecode.lib import auth
-from rhodecode.lib.auth import (
-    LoginRequired, HasPermissionAllDecorator, AuthUser, generate_auth_token)
-from rhodecode.lib.base import BaseController, render
-from rhodecode.model.auth_token import AuthTokenModel
+from rhodecode.lib.utils2 import safe_int, AttributeDict
 
 from rhodecode.model.db import (
     PullRequestReviewers, User, UserEmailMap, UserIpMap, RepoGroup)
@@ -49,8 +51,6 @@ from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.user import UserModel
 from rhodecode.model.meta import Session
 from rhodecode.model.permission import PermissionModel
-from rhodecode.lib.utils import action_logger
-from rhodecode.lib.utils2 import datetime_to_time, safe_int, AttributeDict
 
 log = logging.getLogger(__name__)
 
@@ -88,7 +88,6 @@ class UsersController(BaseController):
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def create(self):
-        """POST /users: Create a new item"""
         c.default_extern_type = auth_rhodecode.RhodeCodeAuthPlugin.name
         user_model = UserModel()
         user_form = UserForm()()
@@ -96,9 +95,12 @@ class UsersController(BaseController):
             form_result = user_form.to_python(dict(request.POST))
             user = user_model.create(form_result)
             Session().flush()
+            creation_data = user.get_api_data()
             username = form_result['username']
-            action_logger(c.rhodecode_user, 'admin_created_user:%s' % username,
-                          None, self.ip_addr, self.sa)
+
+            audit_logger.store_web(
+                'user.create', action_data={'data': creation_data},
+                user=c.rhodecode_user)
 
             user_link = h.link_to(h.escape(username),
                                   url('edit_user',
@@ -125,8 +127,6 @@ class UsersController(BaseController):
 
     @HasPermissionAllDecorator('hg.admin')
     def new(self):
-        """GET /users/new: Form to create a new item"""
-        # url('new_user')
         c.default_extern_type = auth_rhodecode.RhodeCodeAuthPlugin.name
         self._get_personal_repo_group_template_vars()
         return render('admin/users/user_add.mako')
@@ -134,13 +134,7 @@ class UsersController(BaseController):
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def update(self, user_id):
-        """PUT /users/user_id: Update an existing item"""
-        # Forms posted to this method should contain a hidden field:
-        # <input type="hidden" name="_method" value="PUT" />
-        # Or using helpers:
-        #    h.form(url('update_user', user_id=ID),
-        #           method='put')
-        # url('user', user_id=ID)
+
         user_id = safe_int(user_id)
         c.user = User.get_or_404(user_id)
         c.active = 'profile'
@@ -152,6 +146,7 @@ class UsersController(BaseController):
                          old_data={'user_id': user_id,
                                    'email': c.user.email})()
         form_result = {}
+        old_values = c.user.get_api_data()
         try:
             form_result = _form.to_python(dict(request.POST))
             skip_attrs = ['extern_type', 'extern_name']
@@ -160,12 +155,15 @@ class UsersController(BaseController):
                 # forbid updating username for external accounts
                 skip_attrs.append('username')
 
-            UserModel().update_user(user_id, skip_attrs=skip_attrs, **form_result)
-            usr = form_result['username']
-            action_logger(c.rhodecode_user, 'admin_updated_user:%s' % usr,
-                          None, self.ip_addr, self.sa)
-            h.flash(_('User updated successfully'), category='success')
+            UserModel().update_user(
+                user_id, skip_attrs=skip_attrs, **form_result)
+
+            audit_logger.store_web(
+                'user.edit', action_data={'old_data': old_values},
+                user=c.rhodecode_user)
+
             Session().commit()
+            h.flash(_('User updated successfully'), category='success')
         except formencode.Invalid as errors:
             defaults = errors.value
             e = errors.error_dict or {}
@@ -188,13 +186,6 @@ class UsersController(BaseController):
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def delete(self, user_id):
-        """DELETE /users/user_id: Delete an existing item"""
-        # Forms posted to this method should contain a hidden field:
-        # <input type="hidden" name="_method" value="DELETE" />
-        # Or using helpers:
-        #    h.form(url('delete_user', user_id=ID),
-        #           method='delete')
-        # url('user', user_id=ID)
         user_id = safe_int(user_id)
         c.user = User.get_or_404(user_id)
 
@@ -249,10 +240,16 @@ class UsersController(BaseController):
                     _('Deleted %s user groups') % len(_user_groups),
                     category='success')
 
+        old_values = c.user.get_api_data()
         try:
             UserModel().delete(c.user, handle_repos=handle_repos,
                                handle_repo_groups=handle_repo_groups,
                                handle_user_groups=handle_user_groups)
+
+            audit_logger.store_web(
+                'user.delete', action_data={'old_data': old_values},
+                user=c.rhodecode_user)
+
             Session().commit()
             set_handle_flash_repos()
             set_handle_flash_repo_groups()
@@ -272,19 +269,25 @@ class UsersController(BaseController):
     def reset_password(self, user_id):
         """
         toggle reset password flag for this user
-
-        :param user_id:
         """
         user_id = safe_int(user_id)
         c.user = User.get_or_404(user_id)
         try:
             old_value = c.user.user_data.get('force_password_change')
             c.user.update_userdata(force_password_change=not old_value)
-            Session().commit()
+
             if old_value:
                 msg = _('Force password change disabled for user')
+                audit_logger.store_web(
+                    'user.edit.password_reset.disabled',
+                    user=c.rhodecode_user)
             else:
                 msg = _('Force password change enabled for user')
+                audit_logger.store_web(
+                    'user.edit.password_reset.enabled',
+                    user=c.rhodecode_user)
+
+            Session().commit()
             h.flash(msg, category='success')
         except Exception:
             log.exception("Exception during password reset for user")
@@ -298,8 +301,6 @@ class UsersController(BaseController):
     def create_personal_repo_group(self, user_id):
         """
         Create personal repository group for this user
-
-        :param user_id:
         """
         from rhodecode.model.repo_group import RepoGroupModel
 
@@ -428,8 +429,6 @@ class UsersController(BaseController):
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def update_global_perms(self, user_id):
-        """PUT /users_perm/user_id: Update an existing item"""
-        # url('user_perm', user_id=ID, method='put')
         user_id = safe_int(user_id)
         user = User.get_or_404(user_id)
         c.active = 'global_perms'
@@ -456,11 +455,13 @@ class UsersController(BaseController):
 
                 PermissionModel().update_user_permissions(form_result)
 
+            # TODO(marcink): implement global permissions
+            # audit_log.store_web('user.edit.permissions')
+
             Session().commit()
             h.flash(_('User global permissions updated successfully'),
                     category='success')
 
-            Session().commit()
         except formencode.Invalid as errors:
             defaults = errors.value
             c.user = user
@@ -512,16 +513,18 @@ class UsersController(BaseController):
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def add_email(self, user_id):
-        """POST /user_emails:Add an existing item"""
-        # url('user_emails', user_id=ID, method='put')
         user_id = safe_int(user_id)
         c.user = User.get_or_404(user_id)
 
         email = request.POST.get('new_email')
         user_model = UserModel()
-
+        user_data = c.user.get_api_data()
         try:
             user_model.add_extra_email(user_id, email)
+            audit_logger.store_web(
+                'user.edit.email.add',
+                action_data={'email': email, 'user': user_data},
+                user=c.rhodecode_user)
             Session().commit()
             h.flash(_("Added new email address `%s` for user account") % email,
                     category='success')
@@ -537,13 +540,18 @@ class UsersController(BaseController):
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def delete_email(self, user_id):
-        """DELETE /user_emails_delete/user_id: Delete an existing item"""
-        # url('user_emails_delete', user_id=ID, method='delete')
         user_id = safe_int(user_id)
         c.user = User.get_or_404(user_id)
         email_id = request.POST.get('del_email_id')
         user_model = UserModel()
+
+        email = UserEmailMap.query().get(email_id).email
+        user_data = c.user.get_api_data()
         user_model.delete_extra_email(user_id, email_id)
+        audit_logger.store_web(
+            'user.edit.email.delete',
+            action_data={'email': email, 'user': user_data},
+            user=c.rhodecode_user)
         Session().commit()
         h.flash(_("Removed email address from user account"), category='success')
         return redirect(url('edit_user_emails', user_id=user_id))
@@ -574,9 +582,6 @@ class UsersController(BaseController):
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def add_ip(self, user_id):
-        """POST /user_ips:Add an existing item"""
-        # url('user_ips', user_id=ID, method='put')
-
         user_id = safe_int(user_id)
         c.user = User.get_or_404(user_id)
         user_model = UserModel()
@@ -590,9 +595,14 @@ class UsersController(BaseController):
 
         desc = request.POST.get('description')
         added = []
+        user_data = c.user.get_api_data()
         for ip in ip_list:
             try:
                 user_model.add_extra_ip(user_id, ip, desc)
+                audit_logger.store_web(
+                    'user.edit.ip.add',
+                    action_data={'ip': ip, 'user': user_data},
+                    user=c.rhodecode_user)
                 Session().commit()
                 added.append(ip)
             except formencode.Invalid as error:
@@ -613,14 +623,18 @@ class UsersController(BaseController):
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def delete_ip(self, user_id):
-        """DELETE /user_ips_delete/user_id: Delete an existing item"""
-        # url('user_ips_delete', user_id=ID, method='delete')
         user_id = safe_int(user_id)
         c.user = User.get_or_404(user_id)
 
         ip_id = request.POST.get('del_ip_id')
         user_model = UserModel()
+        ip = UserIpMap.query().get(ip_id).ip_addr
+        user_data = c.user.get_api_data()
         user_model.delete_extra_ip(user_id, ip_id)
+        audit_logger.store_web(
+            'user.edit.ip.delete',
+            action_data={'ip': ip, 'user': user_data},
+            user=c.rhodecode_user)
         Session().commit()
         h.flash(_("Removed ip address from user whitelist"), category='success')
 
diff --git a/rhodecode/lib/audit_logger.py b/rhodecode/lib/audit_logger.py
index 5facaac6..fc49fac6 100644
--- a/rhodecode/lib/audit_logger.py
+++ b/rhodecode/lib/audit_logger.py
@@ -27,7 +27,7 @@ from rhodecode.model.db import User, UserLog, Repository
 
 log = logging.getLogger(__name__)
 
-
+# action as key, and expected action_data as value
 ACTIONS = {
     'user.login.success': {},
     'user.login.failure': {},
@@ -38,6 +38,19 @@ ACTIONS = {
 
     'repo.create': {},
     'repo.edit': {},
+    'user.create': {'data': {}},
+    'user.delete': {'old_data': {}},
+    'user.edit': {'old_data': {}},
+    'user.edit.permissions': {},
+    'user.edit.ip.add': {},
+    'user.edit.ip.delete': {},
+    'user.edit.token.add': {},
+    'user.edit.token.delete': {},
+    'user.edit.email.add': {},
+    'user.edit.email.delete': {},
+    'user.edit.password_reset.enabled': {},
+    'user.edit.password_reset.disabled': {},
+
     'repo.edit.permissions': {},
     'repo.delete': {},
     'repo.commit.strip': {},
@@ -117,9 +130,8 @@ def store_api(*args, **kwargs):
     return store(*args, **kwargs)
 
 
-def store(
-        action, user, action_data=None, user_data=None, ip_addr=None,
-        repo=None, sa_session=None, commit=False):
+def store(action, user, action_data=None, user_data=None, ip_addr=None,
+          repo=None, sa_session=None, commit=False):
     """
     Audit logger for various actions made by users, typically this
     results in a call such::
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py
index 0e44a9a7..92a39ad0 100644
--- a/rhodecode/model/user.py
+++ b/rhodecode/model/user.py
@@ -767,7 +767,7 @@ class UserModel(BaseModel):
         """
         user = self._get_user(user)
         obj = UserEmailMap.query().get(email_id)
-        if obj:
+        if obj and obj.user_id == user.user_id:
             self.sa.delete(obj)
 
     def parse_ip_range(self, ip_range):
@@ -824,7 +824,7 @@ class UserModel(BaseModel):
         """
         user = self._get_user(user)
         obj = UserIpMap.query().get(ip_id)
-        if obj:
+        if obj and obj.user_id == user.user_id:
             self.sa.delete(obj)
 
     def get_accounts_in_creation_order(self, current_user=None):

From 8ec82f1089ada25ef677d126884cc3e16538956b Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 14 Jun 2017 15:46:06 +0200
Subject: [PATCH 165/211] audit-logs: fill in some default values for the
 expected action data.

---
 rhodecode/lib/audit_logger.py | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/rhodecode/lib/audit_logger.py b/rhodecode/lib/audit_logger.py
index fc49fac6..8ae86768 100644
--- a/rhodecode/lib/audit_logger.py
+++ b/rhodecode/lib/audit_logger.py
@@ -29,15 +29,13 @@ log = logging.getLogger(__name__)
 
 # action as key, and expected action_data as value
 ACTIONS = {
-    'user.login.success': {},
-    'user.login.failure': {},
-    'user.logout': {},
+    'user.login.success': {'user_agent': ''},
+    'user.login.failure': {'user_agent': ''},
+    'user.logout': {'user_agent': ''},
     'user.password.reset_request': {},
-    'user.push': {},
-    'user.pull': {},
+    'user.push': {'user_agent': '', 'commit_ids': []},
+    'user.pull': {'user_agent': ''},
 
-    'repo.create': {},
-    'repo.edit': {},
     'user.create': {'data': {}},
     'user.delete': {'old_data': {}},
     'user.edit': {'old_data': {}},
@@ -51,15 +49,17 @@ ACTIONS = {
     'user.edit.password_reset.enabled': {},
     'user.edit.password_reset.disabled': {},
 
+    'repo.create': {'data': {}},
+    'repo.edit': {'old_data': {}},
     'repo.edit.permissions': {},
-    'repo.delete': {},
+    'repo.delete': {'old_data': {}},
     'repo.commit.strip': {},
     'repo.archive.download': {},
 
-    'repo_group.create': {},
-    'repo_group.edit': {},
+    'repo_group.create': {'data': {}},
+    'repo_group.edit': {'old_data': {}},
     'repo_group.edit.permissions': {},
-    'repo_group.delete': {},
+    'repo_group.delete': {'old_data': {}},
 }
 
 SOURCE_WEB = 'source_web'
@@ -175,8 +175,9 @@ def store(action, user, action_data=None, user_data=None, ip_addr=None,
     from rhodecode.lib.utils2 import safe_unicode
     from rhodecode.lib.auth import AuthUser
 
-    if action not in ACTIONS:
-        raise ValueError('Action `{}` not in valid actions'.format(action))
+    action_spec = ACTIONS.get(action, None)
+    if action_spec is None:
+        raise ValueError('Action `{}` is not supported'.format(action))
 
     if not sa_session:
         sa_session = meta.Session()

From 1be028f546800828f5e92d038b62ee092135a1c0 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 14 Jun 2017 15:45:17 +0200
Subject: [PATCH 166/211] audit-logs: moved async tasks from old deprecated
 action_logger.

---
 rhodecode/api/tests/test_update_repo.py |  4 +++-
 rhodecode/lib/audit_logger.py           |  1 +
 rhodecode/lib/celerylib/tasks.py        | 28 +++++++++++++++++++------
 rhodecode/model/db.py                   |  1 +
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/rhodecode/api/tests/test_update_repo.py b/rhodecode/api/tests/test_update_repo.py
index 16543cb5..0554dc06 100644
--- a/rhodecode/api/tests/test_update_repo.py
+++ b/rhodecode/api/tests/test_update_repo.py
@@ -116,7 +116,8 @@ class TestApiUpdateRepo(object):
         master_repo = backend.create_repo()
         repo = backend.create_repo()
         updates = {
-            'fork_of': master_repo.repo_name
+            'fork_of': master_repo.repo_name,
+            'fork_of_id': master_repo.repo_id
         }
         expected_api_data = repo.get_api_data(include_secrets=True)
         expected_api_data.update(updates)
@@ -131,6 +132,7 @@ class TestApiUpdateRepo(object):
         assert_ok(id_, expected, given=response.body)
         result = response.json['result']['repository']
         assert result['fork_of'] == master_repo.repo_name
+        assert result['fork_of_id'] == master_repo.repo_id
 
     def test_api_update_repo_fork_of_not_found(self, backend):
         master_repo_name = 'fake-parent-repo'
diff --git a/rhodecode/lib/audit_logger.py b/rhodecode/lib/audit_logger.py
index 8ae86768..91c9f426 100644
--- a/rhodecode/lib/audit_logger.py
+++ b/rhodecode/lib/audit_logger.py
@@ -50,6 +50,7 @@ ACTIONS = {
     'user.edit.password_reset.disabled': {},
 
     'repo.create': {'data': {}},
+    'repo.fork': {'data': {}},
     'repo.edit': {'old_data': {}},
     'repo.edit.permissions': {},
     'repo.delete': {'old_data': {}},
diff --git a/rhodecode/lib/celerylib/tasks.py b/rhodecode/lib/celerylib/tasks.py
index 3b40f228..3737ff60 100644
--- a/rhodecode/lib/celerylib/tasks.py
+++ b/rhodecode/lib/celerylib/tasks.py
@@ -31,12 +31,13 @@ from celery.task import task
 from pylons import config
 
 import rhodecode
+from rhodecode.lib import audit_logger
 from rhodecode.lib.celerylib import (
     run_task, dbsession, __get_lockkey, LockHeld, DaemonLock,
     get_session, vcsconnection, RhodecodeCeleryTask)
 from rhodecode.lib.hooks_base import log_create_repository
 from rhodecode.lib.rcmail.smtp_mailer import SmtpMailer
-from rhodecode.lib.utils import add_cache, action_logger
+from rhodecode.lib.utils import add_cache
 from rhodecode.lib.utils2 import safe_int, str2bool
 from rhodecode.model.db import Repository, User
 
@@ -141,7 +142,7 @@ def create_repo(form_data, cur_user):
         'enable_downloads', defs.get('repo_enable_downloads'))
 
     try:
-        RepoModel(DBS)._create_repo(
+        repo = RepoModel(DBS)._create_repo(
             repo_name=repo_name_full,
             repo_type=repo_type,
             description=description,
@@ -158,8 +159,6 @@ def create_repo(form_data, cur_user):
             enable_downloads=enable_downloads,
             state=state
         )
-
-        action_logger(cur_user, 'user_created_repo', repo_name_full, '', DBS)
         DBS.commit()
 
         # now create this repo on Filesystem
@@ -177,6 +176,15 @@ def create_repo(form_data, cur_user):
 
         # set new created state
         repo.set_state(Repository.STATE_CREATED)
+        repo_id = repo.repo_id
+        repo_data = repo.get_api_data()
+
+        audit_logger.store(
+            action='repo.create',
+            action_data={'data': repo_data},
+            user=cur_user,
+            repo=audit_logger.RepoWrap(repo_name=repo_name, repo_id=repo_id))
+
         DBS.commit()
     except Exception:
         log.warning('Exception occurred when creating repository, '
@@ -240,8 +248,7 @@ def create_repo_fork(form_data, cur_user):
             fork_of=fork_of,
             copy_fork_permissions=copy_fork_permissions
         )
-        action_logger(cur_user, 'user_forked_repo:%s' % repo_name_full,
-                      fork_of.repo_name, '', DBS)
+
         DBS.commit()
 
         base_path = Repository.base_path()
@@ -264,6 +271,15 @@ def create_repo_fork(form_data, cur_user):
 
         # set new created state
         repo.set_state(Repository.STATE_CREATED)
+
+        repo_id = repo.repo_id
+        repo_data = repo.get_api_data()
+        audit_logger.store(
+            action='repo.fork',
+            action_data={'data': repo_data},
+            user=cur_user,
+            repo=audit_logger.RepoWrap(repo_name=repo_name, repo_id=repo_id))
+
         DBS.commit()
     except Exception as e:
         log.warning('Exception %s occurred when forking repository, '
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index 46ae100b..c201248d 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -1782,6 +1782,7 @@ class Repository(Base, BaseModel):
             '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,

From 32d96c3e6a6df8c92e89e317284134c3f1666120 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 14 Jun 2017 15:04:03 +0200
Subject: [PATCH 167/211] action_logger: removed really not required actions of
 start/stop following a repository.

- this information just spams user information, and for product such as rhodecode this
doesn't make any sense to be stored.
---
 rhodecode/model/scm.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/rhodecode/model/scm.py b/rhodecode/model/scm.py
index 967aed3a..da44e410 100644
--- a/rhodecode/model/scm.py
+++ b/rhodecode/model/scm.py
@@ -47,7 +47,7 @@ from rhodecode.lib.auth import (
 from rhodecode.lib.exceptions import NonRelativePathError, IMCCommitError
 from rhodecode.lib import hooks_utils, caches
 from rhodecode.lib.utils import (
-    get_filesystem_repos, action_logger, make_db_config)
+    get_filesystem_repos, make_db_config)
 from rhodecode.lib.utils2 import (safe_str, safe_unicode)
 from rhodecode.lib.system_info import get_system_info
 from rhodecode.model import BaseModel
@@ -289,9 +289,6 @@ class ScmModel(BaseModel):
         if f is not None:
             try:
                 self.sa.delete(f)
-                action_logger(UserTemp(user_id),
-                              'stopped_following_repo',
-                              RepoTemp(follow_repo_id))
                 return
             except Exception:
                 log.error(traceback.format_exc())
@@ -302,10 +299,6 @@ class ScmModel(BaseModel):
             f.user_id = user_id
             f.follows_repo_id = follow_repo_id
             self.sa.add(f)
-
-            action_logger(UserTemp(user_id),
-                          'started_following_repo',
-                          RepoTemp(follow_repo_id))
         except Exception:
             log.error(traceback.format_exc())
             raise

From 8ae7a08fd349ecac93d528f51341632a8b34ef9e Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 14 Jun 2017 15:25:31 +0200
Subject: [PATCH 168/211] audit-logs: added audit logs on user groups admin
 page.

---
 rhodecode/controllers/admin/user_groups.py | 61 ++++++++++------------
 rhodecode/lib/audit_logger.py              |  7 +++
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/rhodecode/controllers/admin/user_groups.py b/rhodecode/controllers/admin/user_groups.py
index 708bf2a6..73e6f154 100644
--- a/rhodecode/controllers/admin/user_groups.py
+++ b/rhodecode/controllers/admin/user_groups.py
@@ -35,10 +35,11 @@ from sqlalchemy.orm import joinedload
 
 from rhodecode.lib import auth
 from rhodecode.lib import helpers as h
+from rhodecode.lib import audit_logger
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.exceptions import UserGroupAssignedException,\
     RepoGroupAssignmentError
-from rhodecode.lib.utils import jsonify, action_logger
+from rhodecode.lib.utils import jsonify
 from rhodecode.lib.utils2 import safe_unicode, str2bool, safe_int
 from rhodecode.lib.auth import (
     LoginRequired, NotAnonymous, HasUserGroupPermissionAnyDecorator,
@@ -105,8 +106,6 @@ class UserGroupsController(BaseController):
     # permission check inside
     @NotAnonymous()
     def index(self):
-        """GET /users_groups: All items in the collection"""
-        # url('users_groups')
 
         from rhodecode.lib.utils import PartialRenderer
         _render = PartialRenderer('data_table/_dt_elements.mako')
@@ -142,8 +141,6 @@ class UserGroupsController(BaseController):
     @HasPermissionAnyDecorator('hg.admin', 'hg.usergroup.create.true')
     @auth.CSRFRequired()
     def create(self):
-        """POST /users_groups: Create a new item"""
-        # url('users_groups')
 
         users_group_form = UserGroupForm()()
         try:
@@ -154,14 +151,16 @@ class UserGroupsController(BaseController):
                 owner=c.rhodecode_user.user_id,
                 active=form_result['users_group_active'])
             Session().flush()
-
+            creation_data = user_group.get_api_data()
             user_group_name = form_result['users_group_name']
-            action_logger(c.rhodecode_user,
-                          'admin_created_users_group:%s' % user_group_name,
-                          None, self.ip_addr, self.sa)
-            user_group_link = h.link_to(h.escape(user_group_name),
-                                        url('edit_users_group',
-                                            user_group_id=user_group.users_group_id))
+
+            audit_logger.store_web(
+                'user_group.create', action_data={'data': creation_data},
+                user=c.rhodecode_user)
+
+            user_group_link = h.link_to(
+                h.escape(user_group_name),
+                url('edit_users_group', user_group_id=user_group.users_group_id))
             h.flash(h.literal(_('Created user group %(user_group_link)s')
                               % {'user_group_link': user_group_link}),
                     category='success')
@@ -191,13 +190,6 @@ class UserGroupsController(BaseController):
     @HasUserGroupPermissionAnyDecorator('usergroup.admin')
     @auth.CSRFRequired()
     def update(self, user_group_id):
-        """PUT /user_groups/user_group_id: Update an existing item"""
-        # Forms posted to this method should contain a hidden field:
-        #    <input type="hidden" name="_method" value="PUT" />
-        # Or using helpers:
-        #    h.form(url('users_group', user_group_id=ID),
-        #           method='put')
-        # url('users_group', user_group_id=ID)
 
         user_group_id = safe_int(user_group_id)
         c.user_group = UserGroup.get_or_404(user_group_id)
@@ -207,6 +199,7 @@ class UserGroupsController(BaseController):
         users_group_form = UserGroupForm(
             edit=True, old_data=c.user_group.get_dict(), allow_disabled=True)()
 
+        old_values = c.user_group.get_api_data()
         try:
             form_result = users_group_form.to_python(request.POST)
             pstruct = peppercorn.parse(request.POST.items())
@@ -214,9 +207,11 @@ class UserGroupsController(BaseController):
 
             UserGroupModel().update(c.user_group, form_result)
             updated_user_group = form_result['users_group_name']
-            action_logger(c.rhodecode_user,
-                          'admin_updated_users_group:%s' % updated_user_group,
-                          None, self.ip_addr, self.sa)
+
+            audit_logger.store_web(
+                'user_group.edit', action_data={'old_data': old_values},
+                user=c.rhodecode_user)
+
             h.flash(_('Updated user group %s') % updated_user_group,
                     category='success')
             Session().commit()
@@ -241,19 +236,16 @@ class UserGroupsController(BaseController):
     @HasUserGroupPermissionAnyDecorator('usergroup.admin')
     @auth.CSRFRequired()
     def delete(self, user_group_id):
-        """DELETE /user_groups/user_group_id: Delete an existing item"""
-        # Forms posted to this method should contain a hidden field:
-        #    <input type="hidden" name="_method" value="DELETE" />
-        # Or using helpers:
-        #    h.form(url('users_group', user_group_id=ID),
-        #           method='delete')
-        # url('users_group', user_group_id=ID)
         user_group_id = safe_int(user_group_id)
         c.user_group = UserGroup.get_or_404(user_group_id)
         force = str2bool(request.POST.get('force'))
 
+        old_values = c.user_group.get_api_data()
         try:
             UserGroupModel().delete(c.user_group, force=force)
+            audit_logger.store_web(
+                'user.delete', action_data={'old_data': old_values},
+                user=c.rhodecode_user)
             Session().commit()
             h.flash(_('Successfully deleted user group'), category='success')
         except UserGroupAssignedException as e:
@@ -330,9 +322,9 @@ class UserGroupsController(BaseController):
         except RepoGroupAssignmentError:
             h.flash(_('Target group cannot be the same'), category='error')
             return redirect(url('edit_user_group_perms', user_group_id=user_group_id))
-        #TODO: implement this
-        #action_logger(c.rhodecode_user, 'admin_changed_repo_permissions',
-        #              repo_name, self.ip_addr, self.sa)
+
+        # TODO(marcink): implement global permissions
+        # audit_log.store_web('user_group.edit.permissions')
         Session().commit()
         h.flash(_('User Group permissions updated'), category='success')
         return redirect(url('edit_user_group_perms', user_group_id=user_group_id))
@@ -389,8 +381,6 @@ class UserGroupsController(BaseController):
     @HasUserGroupPermissionAnyDecorator('usergroup.admin')
     @auth.CSRFRequired()
     def update_global_perms(self, user_group_id):
-        """PUT /users_perm/user_group_id: Update an existing item"""
-        # url('users_group_perm', user_group_id=ID, method='put')
         user_group_id = safe_int(user_group_id)
         user_group = UserGroup.get_or_404(user_group_id)
         c.active = 'global_perms'
@@ -492,6 +482,9 @@ class UserGroupsController(BaseController):
     @XHRRequired()
     @jsonify
     def user_group_members(self, user_group_id):
+        """
+        Return members of given user group
+        """
         user_group_id = safe_int(user_group_id)
         user_group = UserGroup.get_or_404(user_group_id)
         group_members_obj = sorted((x.user for x in user_group.members),
diff --git a/rhodecode/lib/audit_logger.py b/rhodecode/lib/audit_logger.py
index 91c9f426..0b87385b 100644
--- a/rhodecode/lib/audit_logger.py
+++ b/rhodecode/lib/audit_logger.py
@@ -49,6 +49,13 @@ ACTIONS = {
     'user.edit.password_reset.enabled': {},
     'user.edit.password_reset.disabled': {},
 
+    'user_group.create': {'data': {}},
+    'user_group.delete': {'old_data': {}},
+    'user_group.edit': {'old_data': {}},
+    'user_group.edit.permissions': {},
+    'user_group.edit.member.add': {},
+    'user_group.edit.member.delete': {},
+
     'repo.create': {'data': {}},
     'repo.fork': {'data': {}},
     'repo.edit': {'old_data': {}},

From 8a3441e96e3016868f8856cc50528ae3dafa4f2f Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 14 Jun 2017 16:33:23 +0200
Subject: [PATCH 169/211] audit-logs: use specific web/api calls.

- also normalized action_data to specs.
---
 rhodecode/api/views/repo_api.py                    |  7 +++----
 rhodecode/apps/login/views.py                      | 13 +++++++------
 .../apps/repository/views/repo_permissions.py      |  2 +-
 rhodecode/apps/repository/views/repo_settings.py   |  2 +-
 .../repository/views/repo_settings_advanced.py     |  7 +++----
 rhodecode/apps/repository/views/repo_strip.py      |  2 +-
 rhodecode/controllers/admin/repo_groups.py         | 14 ++++++--------
 rhodecode/controllers/files.py                     |  2 +-
 rhodecode/lib/audit_logger.py                      |  2 +-
 rhodecode/lib/celerylib/tasks.py                   |  4 ++--
 10 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/rhodecode/api/views/repo_api.py b/rhodecode/api/views/repo_api.py
index 6eb0a2f0..d62c1292 100644
--- a/rhodecode/api/views/repo_api.py
+++ b/rhodecode/api/views/repo_api.py
@@ -1179,11 +1179,10 @@ def delete_repo(request, apiuser, repoid, forks=Optional('')):
         repo = audit_logger.RepoWrap(repo_id=None,
                                      repo_name=repo.repo_name)
 
-        audit_logger.store(
+        audit_logger.store_api(
             action='repo.delete',
-            action_data={'repo_data': repo_data,
-                         'source': audit_logger.SOURCE_API},
-            user=apiuser, repo=repo, commit=False)
+            action_data={'data': repo_data},
+            user=apiuser, repo=repo)
 
         ScmModel().mark_for_invalidation(repo_name, delete=True)
         Session().commit()
diff --git a/rhodecode/apps/login/views.py b/rhodecode/apps/login/views.py
index 80429aac..2797f886 100644
--- a/rhodecode/apps/login/views.py
+++ b/rhodecode/apps/login/views.py
@@ -172,7 +172,7 @@ class LoginView(BaseAppView):
                 username=self.request.params.get('username'),
                 ip_addr=self.request.remote_addr)
             action_data = {'user_agent': self.request.user_agent}
-            audit_logger.store(
+            audit_logger.store_web(
                 action='user.login.success', action_data=action_data,
                 user=audit_user, commit=True)
 
@@ -191,7 +191,7 @@ class LoginView(BaseAppView):
                 username=self.request.params.get('username'),
                 ip_addr=self.request.remote_addr)
             action_data = {'user_agent': self.request.user_agent}
-            audit_logger.store(
+            audit_logger.store_web(
                 action='user.login.failure', action_data=action_data,
                 user=audit_user, commit=True)
             return render_ctx
@@ -211,7 +211,7 @@ class LoginView(BaseAppView):
         log.info('Deleting session for user: `%s`', auth_user)
 
         action_data = {'user_agent': self.request.user_agent}
-        audit_logger.store(
+        audit_logger.store_web(
             action='user.logout', action_data=action_data,
             user=auth_user, commit=True)
         self.session.delete()
@@ -364,9 +364,10 @@ class LoginView(BaseAppView):
 
                 action_data = {'email': user_email,
                                'user_agent': self.request.user_agent}
-                audit_logger.store(action='user.password.reset_request',
-                                   action_data=action_data,
-                                   user=self._rhodecode_user, commit=True)
+                audit_logger.store_web(
+                    action='user.password.reset_request',
+                    action_data=action_data,
+                    user=self._rhodecode_user, commit=True)
                 return HTTPFound(self.request.route_path('reset_password'))
 
             except formencode.Invalid as errors:
diff --git a/rhodecode/apps/repository/views/repo_permissions.py b/rhodecode/apps/repository/views/repo_permissions.py
index 671e2cf5..305cf3b0 100644
--- a/rhodecode/apps/repository/views/repo_permissions.py
+++ b/rhodecode/apps/repository/views/repo_permissions.py
@@ -87,7 +87,7 @@ class RepoSettingsPermissionsView(RepoAppView):
             'updated': changes['updated'],
             'deleted': changes['deleted'],
         }
-        audit_logger.store(
+        audit_logger.store_web(
             'repo.edit.permissions', action_data=action_data,
             user=self._rhodecode_user, repo=self.db_repo)
 
diff --git a/rhodecode/apps/repository/views/repo_settings.py b/rhodecode/apps/repository/views/repo_settings.py
index b1227f83..dcf8be72 100644
--- a/rhodecode/apps/repository/views/repo_settings.py
+++ b/rhodecode/apps/repository/views/repo_settings.py
@@ -162,7 +162,7 @@ class RepoSettingsView(RepoAppView):
             RepoModel().update(self.db_repo, **validated_updates)
             ScmModel().mark_for_invalidation(new_repo_name)
 
-            audit_logger.store(
+            audit_logger.store_web(
                 'repo.edit', action_data={'old_data': old_values},
                 user=self._rhodecode_user, repo=self.db_repo)
 
diff --git a/rhodecode/apps/repository/views/repo_settings_advanced.py b/rhodecode/apps/repository/views/repo_settings_advanced.py
index d6cb4492..fc480bbb 100644
--- a/rhodecode/apps/repository/views/repo_settings_advanced.py
+++ b/rhodecode/apps/repository/views/repo_settings_advanced.py
@@ -99,11 +99,10 @@ class RepoSettingsView(RepoAppView):
 
             repo = audit_logger.RepoWrap(repo_id=None,
                                          repo_name=self.db_repo.repo_name)
-            audit_logger.store(
+            audit_logger.store_web(
                 action='repo.delete',
-                action_data={'repo_data': repo_data,
-                             'source': audit_logger.SOURCE_WEB},
-                user=self._rhodecode_user, repo=repo, commit=False)
+                action_data={'data': repo_data},
+                user=self._rhodecode_user, repo=repo)
 
             ScmModel().mark_for_invalidation(self.db_repo_name, delete=True)
             h.flash(
diff --git a/rhodecode/apps/repository/views/repo_strip.py b/rhodecode/apps/repository/views/repo_strip.py
index 50edf21e..0f77d6b9 100644
--- a/rhodecode/apps/repository/views/repo_strip.py
+++ b/rhodecode/apps/repository/views/repo_strip.py
@@ -101,7 +101,7 @@ class StripView(RepoAppView):
                     commit['rev'], c.repo_info.repo_name, user))
                 data[commit['rev']] = True
 
-                audit_logger.store(
+                audit_logger.store_web(
                     action='repo.commit.strip',
                     action_data={'commit_id': commit['rev']},
                     repo=self.db_repo,
diff --git a/rhodecode/controllers/admin/repo_groups.py b/rhodecode/controllers/admin/repo_groups.py
index eb434a55..2bff202f 100644
--- a/rhodecode/controllers/admin/repo_groups.py
+++ b/rhodecode/controllers/admin/repo_groups.py
@@ -189,9 +189,9 @@ class RepoGroupsController(BaseController):
             repo_group_data = repo_group.get_api_data()
             _new_group_name = form_result['group_name_full']
 
-            audit_logger.store(
+            audit_logger.store_web(
                 action='repo_group.create',
-                action_data={'repo_group_data': repo_group_data},
+                action_data={'data': repo_group_data},
                 user=c.rhodecode_user, commit=True)
 
             repo_group_url = h.link_to(
@@ -251,7 +251,7 @@ class RepoGroupsController(BaseController):
             gr_name = form_result['group_name']
             new_gr = RepoGroupModel().update(group_name, form_result)
 
-            audit_logger.store(
+            audit_logger.store_web(
                 'repo_group.edit', action_data={'old_data': old_values},
                 user=c.rhodecode_user)
 
@@ -303,10 +303,9 @@ class RepoGroupsController(BaseController):
             old_values = gr.get_api_data()
             RepoGroupModel().delete(group_name)
 
-            audit_logger.store(
+            audit_logger.store_web(
                 'repo_group.delete',
-                action_data={'old_data': old_values,
-                             'source': audit_logger.SOURCE_WEB},
+                action_data={'old_data': old_values},
                 user=c.rhodecode_user)
 
             Session().commit()
@@ -395,9 +394,8 @@ class RepoGroupsController(BaseController):
             'added': changes['added'],
             'updated': changes['updated'],
             'deleted': changes['deleted'],
-            'source': audit_logger.SOURCE_WEB
         }
-        audit_logger.store(
+        audit_logger.store_web(
             'repo_group.edit.permissions', action_data=action_data,
             user=c.rhodecode_user)
 
diff --git a/rhodecode/controllers/files.py b/rhodecode/controllers/files.py
index f80f7571..d05a5577 100644
--- a/rhodecode/controllers/files.py
+++ b/rhodecode/controllers/files.py
@@ -814,7 +814,7 @@ class FilesController(BaseRepoController):
                 archive = cached_archive_path
 
         # store download action
-        audit_logger.store(
+        audit_logger.store_web(
             action='repo.archive.download',
             action_data={'user_agent': request.user_agent,
                          'archive_name': archive_name,
diff --git a/rhodecode/lib/audit_logger.py b/rhodecode/lib/audit_logger.py
index 0b87385b..b3f5b4ba 100644
--- a/rhodecode/lib/audit_logger.py
+++ b/rhodecode/lib/audit_logger.py
@@ -149,7 +149,7 @@ def store(action, user, action_data=None, user_data=None, ip_addr=None,
         audit_logger.store(
             action='repo.edit', user=self._rhodecode_user)
         audit_logger.store(
-            action='repo.delete', action_data={'repo_data': repo_data},
+            action='repo.delete', action_data={'data': repo_data},
             user=audit_logger.UserWrap(username='itried-login', ip_addr='8.8.8.8'))
 
         # repo action
diff --git a/rhodecode/lib/celerylib/tasks.py b/rhodecode/lib/celerylib/tasks.py
index 3737ff60..e2da04a3 100644
--- a/rhodecode/lib/celerylib/tasks.py
+++ b/rhodecode/lib/celerylib/tasks.py
@@ -179,7 +179,7 @@ def create_repo(form_data, cur_user):
         repo_id = repo.repo_id
         repo_data = repo.get_api_data()
 
-        audit_logger.store(
+        audit_logger.store_web(
             action='repo.create',
             action_data={'data': repo_data},
             user=cur_user,
@@ -274,7 +274,7 @@ def create_repo_fork(form_data, cur_user):
 
         repo_id = repo.repo_id
         repo_data = repo.get_api_data()
-        audit_logger.store(
+        audit_logger.store_web(
             action='repo.fork',
             action_data={'data': repo_data},
             user=cur_user,

From 926a79e98ed0dd6bed23b1166f5c68d9fdfdffcf Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Sat, 17 Jun 2017 15:22:50 +0200
Subject: [PATCH 170/211] audit-logs: implemented pull request and comment
 events.

---
 .../api/tests/test_close_pull_request.py      |  7 +--
 .../api/tests/test_comment_pull_request.py    |  7 +--
 rhodecode/api/tests/test_get_pull_request.py  |  4 +-
 .../api/tests/test_merge_pull_request.py      |  8 +--
 .../api/tests/test_update_pull_request.py     |  9 ++-
 rhodecode/api/views/pull_request_api.py       |  4 +-
 rhodecode/controllers/admin/users.py          |  2 +-
 rhodecode/controllers/changeset.py            |  2 +-
 rhodecode/controllers/files.py                |  2 +-
 rhodecode/controllers/pullrequests.py         |  9 +--
 rhodecode/lib/audit_logger.py                 | 19 +++++-
 rhodecode/lib/utils.py                        | 62 -------------------
 rhodecode/model/comment.py                    | 38 ++++++++----
 rhodecode/model/db.py                         | 60 ++++++++++++++----
 rhodecode/model/pull_request.py               | 52 ++++++++++++----
 .../functional/test_admin_permissions.py      |  3 +
 .../tests/functional/test_pullrequests.py     | 54 ++++++++--------
 rhodecode/tests/models/test_pullrequest.py    | 12 ++--
 rhodecode/tests/plugin.py                     | 12 +---
 19 files changed, 196 insertions(+), 170 deletions(-)

diff --git a/rhodecode/api/tests/test_close_pull_request.py b/rhodecode/api/tests/test_close_pull_request.py
index 9c523781..f19adc0b 100644
--- a/rhodecode/api/tests/test_close_pull_request.py
+++ b/rhodecode/api/tests/test_close_pull_request.py
@@ -47,13 +47,12 @@ class TestClosePullRequest(object):
             'closed': True,
         }
         assert_ok(id_, expected, response.body)
-        action = 'user_closed_pull_request:%d' % pull_request_id
         journal = UserLog.query()\
-            .filter(UserLog.user_id == author)\
+            .filter(UserLog.user_id == author) \
+            .order_by('user_log_id') \
             .filter(UserLog.repository_id == repo)\
-            .filter(UserLog.action == action)\
             .all()
-        assert len(journal) == 1
+        assert journal[-1].action == 'repo.pull_request.close'
 
     @pytest.mark.backends("git", "hg")
     def test_api_close_pull_request_already_closed_error(self, pr_util):
diff --git a/rhodecode/api/tests/test_comment_pull_request.py b/rhodecode/api/tests/test_comment_pull_request.py
index 98b0d528..23f30ebe 100644
--- a/rhodecode/api/tests/test_comment_pull_request.py
+++ b/rhodecode/api/tests/test_comment_pull_request.py
@@ -62,13 +62,12 @@ class TestCommentPullRequest(object):
         }
         assert_ok(id_, expected, response.body)
 
-        action = 'user_commented_pull_request:%d' % pull_request_id
         journal = UserLog.query()\
             .filter(UserLog.user_id == author)\
-            .filter(UserLog.repository_id == repo)\
-            .filter(UserLog.action == action)\
+            .filter(UserLog.repository_id == repo) \
+            .order_by('user_log_id') \
             .all()
-        assert len(journal) == 2
+        assert journal[-1].action == 'repo.pull_request.comment.create'
 
     @pytest.mark.backends("git", "hg")
     def test_api_comment_pull_request_change_status(
diff --git a/rhodecode/api/tests/test_get_pull_request.py b/rhodecode/api/tests/test_get_pull_request.py
index e58c3099..5bd54348 100644
--- a/rhodecode/api/tests/test_get_pull_request.py
+++ b/rhodecode/api/tests/test_get_pull_request.py
@@ -33,7 +33,7 @@ pytestmark = pytest.mark.backends("git", "hg")
 @pytest.mark.usefixtures("testuser_api", "app")
 class TestGetPullRequest(object):
 
-    def test_api_get_pull_request(self, pr_util, http_host_stub, http_host_only_stub):
+    def test_api_get_pull_request(self, pr_util, http_host_only_stub):
         from rhodecode.model.pull_request import PullRequestModel
         pull_request = pr_util.create_pull_request(mergeable=True)
         id_, params = build_data(
@@ -52,7 +52,7 @@ class TestGetPullRequest(object):
                 pull_request_id=pull_request.pull_request_id, qualified=True))
 
         pr_url = safe_unicode(
-            url_obj.with_netloc(http_host_stub))
+            url_obj.with_netloc(http_host_only_stub))
         source_url = safe_unicode(
             pull_request.source_repo.clone_url().with_netloc(http_host_only_stub))
         target_url = safe_unicode(
diff --git a/rhodecode/api/tests/test_merge_pull_request.py b/rhodecode/api/tests/test_merge_pull_request.py
index f948baf6..adc9b0c7 100644
--- a/rhodecode/api/tests/test_merge_pull_request.py
+++ b/rhodecode/api/tests/test_merge_pull_request.py
@@ -95,13 +95,13 @@ class TestMergePullRequest(object):
 
         assert_ok(id_, expected, response.body)
 
-        action = 'user_merged_pull_request:%d' % (pull_request_id, )
         journal = UserLog.query()\
             .filter(UserLog.user_id == author)\
-            .filter(UserLog.repository_id == repo)\
-            .filter(UserLog.action == action)\
+            .filter(UserLog.repository_id == repo) \
+            .order_by('user_log_id') \
             .all()
-        assert len(journal) == 1
+        assert journal[-2].action == 'repo.pull_request.merge'
+        assert journal[-1].action == 'repo.pull_request.close'
 
         id_, params = build_data(
             self.apikey, 'merge_pull_request',
diff --git a/rhodecode/api/tests/test_update_pull_request.py b/rhodecode/api/tests/test_update_pull_request.py
index 28dd0889..4f2e1ce9 100644
--- a/rhodecode/api/tests/test_update_pull_request.py
+++ b/rhodecode/api/tests/test_update_pull_request.py
@@ -33,7 +33,7 @@ class TestUpdatePullRequest(object):
 
     @pytest.mark.backends("git", "hg")
     def test_api_update_pull_request_title_or_description(
-            self, pr_util, silence_action_logger, no_notifications):
+            self, pr_util, no_notifications):
         pull_request = pr_util.create_pull_request()
 
         id_, params = build_data(
@@ -61,7 +61,7 @@ class TestUpdatePullRequest(object):
 
     @pytest.mark.backends("git", "hg")
     def test_api_try_update_closed_pull_request(
-            self, pr_util, silence_action_logger, no_notifications):
+            self, pr_util, no_notifications):
         pull_request = pr_util.create_pull_request()
         PullRequestModel().close_pull_request(
             pull_request, TEST_USER_ADMIN_LOGIN)
@@ -78,8 +78,7 @@ class TestUpdatePullRequest(object):
         assert_error(id_, expected, response.body)
 
     @pytest.mark.backends("git", "hg")
-    def test_api_update_update_commits(
-            self, pr_util, silence_action_logger, no_notifications):
+    def test_api_update_update_commits(self, pr_util, no_notifications):
         commits = [
             {'message': 'a'},
             {'message': 'b', 'added': [FileNode('file_b', 'test_content\n')]},
@@ -119,7 +118,7 @@ class TestUpdatePullRequest(object):
 
     @pytest.mark.backends("git", "hg")
     def test_api_update_change_reviewers(
-            self, user_util, pr_util, silence_action_logger, no_notifications):
+            self, user_util, pr_util, no_notifications):
         a = user_util.create_user()
         b = user_util.create_user()
         c = user_util.create_user()
diff --git a/rhodecode/api/views/pull_request_api.py b/rhodecode/api/views/pull_request_api.py
index 054be318..2c15f81a 100644
--- a/rhodecode/api/views/pull_request_api.py
+++ b/rhodecode/api/views/pull_request_api.py
@@ -669,7 +669,7 @@ def update_pull_request(
     if title or description:
         PullRequestModel().edit(
             pull_request, title or pull_request.title,
-            description or pull_request.description)
+            description or pull_request.description, apiuser)
         Session().commit()
 
     commit_changes = {"added": [], "common": [], "removed": []}
@@ -683,7 +683,7 @@ def update_pull_request(
     reviewers_changes = {"added": [], "removed": []}
     if reviewers:
         added_reviewers, removed_reviewers = \
-            PullRequestModel().update_reviewers(pull_request, reviewers)
+            PullRequestModel().update_reviewers(pull_request, reviewers, apiuser)
 
         reviewers_changes['added'] = sorted(
             [get_user_or_error(n).username for n in added_reviewers])
diff --git a/rhodecode/controllers/admin/users.py b/rhodecode/controllers/admin/users.py
index 73c735c0..da901028 100644
--- a/rhodecode/controllers/admin/users.py
+++ b/rhodecode/controllers/admin/users.py
@@ -628,8 +628,8 @@ class UsersController(BaseController):
 
         ip_id = request.POST.get('del_ip_id')
         user_model = UserModel()
-        ip = UserIpMap.query().get(ip_id).ip_addr
         user_data = c.user.get_api_data()
+        ip = UserIpMap.query().get(ip_id).ip_addr
         user_model.delete_extra_ip(user_id, ip_id)
         audit_logger.store_web(
             'user.edit.ip.delete',
diff --git a/rhodecode/controllers/changeset.py b/rhodecode/controllers/changeset.py
index e2b6e3be..42f04359 100644
--- a/rhodecode/controllers/changeset.py
+++ b/rhodecode/controllers/changeset.py
@@ -440,7 +440,7 @@ class ChangesetController(BaseRepoController):
         owner = (comment.author.user_id == c.rhodecode_user.user_id)
         is_repo_admin = h.HasRepoPermissionAny('repository.admin')(c.repo_name)
         if h.HasPermissionAny('hg.admin')() or is_repo_admin or owner:
-            CommentsModel().delete(comment=comment)
+            CommentsModel().delete(comment=comment, user=c.rhodecode_user)
             Session().commit()
             return True
         else:
diff --git a/rhodecode/controllers/files.py b/rhodecode/controllers/files.py
index d05a5577..82fbfe58 100644
--- a/rhodecode/controllers/files.py
+++ b/rhodecode/controllers/files.py
@@ -38,7 +38,7 @@ from rhodecode.lib import diffs, helpers as h, caches
 from rhodecode.lib import audit_logger
 from rhodecode.lib.codeblocks import (
     filenode_as_lines_tokens, filenode_as_annotated_lines_tokens)
-from rhodecode.lib.utils import jsonify, action_logger
+from rhodecode.lib.utils import jsonify
 from rhodecode.lib.utils2 import (
     convert_line_endings, detect_mode, safe_str, str2bool)
 from rhodecode.lib.auth import (
diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py
index df7ed376..c697a23f 100644
--- a/rhodecode/controllers/pullrequests.py
+++ b/rhodecode/controllers/pullrequests.py
@@ -317,7 +317,7 @@ class PullrequestsController(BaseRepoController):
         try:
             PullRequestModel().edit(
                 pull_request, request.POST.get('title'),
-                request.POST.get('description'))
+                request.POST.get('description'), c.rhodecode_user)
         except ValueError:
             msg = _(u'Cannot update closed pull requests.')
             h.flash(msg, category='error')
@@ -456,7 +456,8 @@ class PullrequestsController(BaseRepoController):
             h.flash(e, category='error')
             return
 
-        PullRequestModel().update_reviewers(pull_request_id, reviewers)
+        PullRequestModel().update_reviewers(
+            pull_request_id, reviewers, c.rhodecode_user)
         h.flash(_('Pull request reviewers updated.'), category='success')
         Session().commit()
 
@@ -476,7 +477,7 @@ class PullrequestsController(BaseRepoController):
 
         # only owner can delete it !
         if allowed_to_delete:
-            PullRequestModel().delete(pull_request)
+            PullRequestModel().delete(pull_request, c.rhodecode_user)
             Session().commit()
             h.flash(_('Successfully deleted pull request'),
                     category='success')
@@ -997,7 +998,7 @@ class PullrequestsController(BaseRepoController):
         is_repo_admin = h.HasRepoPermissionAny('repository.admin')(c.repo_name)
         if h.HasPermissionAny('hg.admin')() or is_repo_admin or is_owner:
             old_calculated_status = co.pull_request.calculated_review_status()
-            CommentsModel().delete(comment=co)
+            CommentsModel().delete(comment=co, user=c.rhodecode_user)
             Session().commit()
             calculated_status = co.pull_request.calculated_review_status()
             if old_calculated_status != calculated_status:
diff --git a/rhodecode/lib/audit_logger.py b/rhodecode/lib/audit_logger.py
index b3f5b4ba..a79ee7ec 100644
--- a/rhodecode/lib/audit_logger.py
+++ b/rhodecode/lib/audit_logger.py
@@ -28,7 +28,7 @@ from rhodecode.model.db import User, UserLog, Repository
 log = logging.getLogger(__name__)
 
 # action as key, and expected action_data as value
-ACTIONS = {
+ACTIONS_V1 = {
     'user.login.success': {'user_agent': ''},
     'user.login.failure': {'user_agent': ''},
     'user.logout': {'user_agent': ''},
@@ -64,11 +64,28 @@ ACTIONS = {
     'repo.commit.strip': {},
     'repo.archive.download': {},
 
+    'repo.pull_request.create': '',
+    'repo.pull_request.edit': '',
+    'repo.pull_request.delete': '',
+    'repo.pull_request.close': '',
+    'repo.pull_request.merge': '',
+    'repo.pull_request.vote': '',
+    'repo.pull_request.comment.create': '',
+    'repo.pull_request.comment.delete': '',
+
+    'repo.pull_request.reviewer.add': '',
+    'repo.pull_request.reviewer.delete': '',
+
+    'repo.commit.comment.create': '',
+    'repo.commit.comment.delete': '',
+    'repo.commit.vote': '',
+
     'repo_group.create': {'data': {}},
     'repo_group.edit': {'old_data': {}},
     'repo_group.edit.permissions': {},
     'repo_group.delete': {'old_data': {}},
 }
+ACTIONS = ACTIONS_V1
 
 SOURCE_WEB = 'source_web'
 SOURCE_API = 'source_api'
diff --git a/rhodecode/lib/utils.py b/rhodecode/lib/utils.py
index 78240733..a1e8cb1c 100644
--- a/rhodecode/lib/utils.py
+++ b/rhodecode/lib/utils.py
@@ -139,68 +139,6 @@ def get_user_group_slug(request):
     return _group
 
 
-def action_logger(user, action, repo, ipaddr='', sa=None, commit=False):
-    """
-    Action logger for various actions made by users
-
-    :param user: user that made this action, can be a unique username string or
-        object containing user_id attribute
-    :param action: action to log, should be on of predefined unique actions for
-        easy translations
-    :param repo: string name of repository or object containing repo_id,
-        that action was made on
-    :param ipaddr: optional ip address from what the action was made
-    :param sa: optional sqlalchemy session
-
-    """
-
-    if not sa:
-        sa = meta.Session()
-    # if we don't get explicit IP address try to get one from registered user
-    # in tmpl context var
-    if not ipaddr:
-        ipaddr = getattr(get_current_rhodecode_user(), 'ip_addr', '')
-
-    try:
-        if getattr(user, 'user_id', None):
-            user_obj = User.get(user.user_id)
-        elif isinstance(user, basestring):
-            user_obj = User.get_by_username(user)
-        else:
-            raise Exception('You have to provide a user object or a username')
-
-        if getattr(repo, 'repo_id', None):
-            repo_obj = Repository.get(repo.repo_id)
-            repo_name = repo_obj.repo_name
-        elif isinstance(repo, basestring):
-            repo_name = repo.lstrip('/')
-            repo_obj = Repository.get_by_repo_name(repo_name)
-        else:
-            repo_obj = None
-            repo_name = ''
-
-        user_log = UserLog()
-        user_log.user_id = user_obj.user_id
-        user_log.username = user_obj.username
-        action = safe_unicode(action)
-        user_log.action = action[:1200000]
-
-        user_log.repository = repo_obj
-        user_log.repository_name = repo_name
-
-        user_log.action_date = datetime.datetime.now()
-        user_log.user_ip = ipaddr
-        sa.add(user_log)
-
-        log.info('Logging action:`%s` on repo:`%s` by user:%s ip:%s',
-                 action, safe_unicode(repo), user_obj, ipaddr)
-        if commit:
-            sa.commit()
-    except Exception:
-        log.error(traceback.format_exc())
-        raise
-
-
 def get_filesystem_repos(path, recursive=False, skip_removed_repos=True):
     """
     Scans given path for repos and return (name,(type,path)) tuple
diff --git a/rhodecode/model/comment.py b/rhodecode/model/comment.py
index 7f6fe714..82815b37 100644
--- a/rhodecode/model/comment.py
+++ b/rhodecode/model/comment.py
@@ -34,8 +34,8 @@ from sqlalchemy.sql.expression import null
 from sqlalchemy.sql.functions import coalesce
 
 from rhodecode.lib import helpers as h, diffs
+from rhodecode.lib import audit_logger
 from rhodecode.lib.channelstream import channelstream_request
-from rhodecode.lib.utils import action_logger
 from rhodecode.lib.utils2 import extract_mentioned_users, safe_str
 from rhodecode.model import BaseModel
 from rhodecode.model.db import (
@@ -163,6 +163,13 @@ class CommentsModel(BaseModel):
 
         return todos
 
+    def _log_audit_action(self, action, action_data, user, comment):
+        audit_logger.store(
+            action=action,
+            action_data=action_data,
+            user=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,
@@ -337,13 +344,15 @@ class CommentsModel(BaseModel):
                 email_kwargs=kwargs,
             )
 
-        action = (
-            'user_commented_pull_request:{}'.format(
-                comment.pull_request.pull_request_id)
-            if comment.pull_request
-            else 'user_commented_revision:{}'.format(comment.revision)
-        )
-        action_logger(user, action, comment.repo)
+        Session().flush()
+        if comment.pull_request:
+            action = 'repo.pull_request.comment.create'
+        else:
+            action = 'repo.commit.comment.create'
+
+        comment_data = comment.get_api_data()
+        self._log_audit_action(
+            action, {'data': comment_data}, user, comment)
 
         registry = get_current_registry()
         rhodecode_plugins = getattr(registry, 'rhodecode_plugins', {})
@@ -385,15 +394,22 @@ class CommentsModel(BaseModel):
 
         return comment
 
-    def delete(self, comment):
+    def delete(self, comment, user):
         """
         Deletes given comment
-
-        :param comment_id:
         """
         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}, user, comment)
+
         return comment
 
     def get_all_comments(self, repo_id, revision=None, pull_request=None):
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index c201248d..8643d82c 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -3122,6 +3122,25 @@ class ChangesetComment(Base, BaseModel):
         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
+        }
+        return data
+
+    def __json__(self):
+        data = dict()
+        data.update(self.get_api_data())
+        return data
+
 
 class ChangesetStatus(Base, BaseModel):
     __tablename__ = 'changeset_statuses'
@@ -3173,6 +3192,19 @@ class ChangesetStatus(Base, BaseModel):
     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 _PullRequestBase(BaseModel):
     """
@@ -3304,15 +3336,19 @@ class _PullRequestBase(BaseModel):
         else:
             return None
 
-    def get_api_data(self):
-        from pylons import url
+    def get_api_data(self, with_merge_state=True):
         from rhodecode.model.pull_request import PullRequestModel
-        pull_request = self
-        merge_status = PullRequestModel().merge_status(pull_request)
 
-        pull_request_url = url(
-            'pullrequest_show', repo_name=self.target_repo.repo_name,
-            pull_request_id=self.pull_request_id, qualified=True)
+        pull_request = self
+        if with_merge_state:
+            merge_status = PullRequestModel().merge_status(pull_request)
+            merge_state = {
+                'status': merge_status[0],
+                'message': safe_unicode(merge_status[1]),
+            }
+        else:
+            merge_state = {'status': 'not_available',
+                           'message': 'not_available'}
 
         merge_data = {
             'clone_url': PullRequestModel().get_shadow_clone_url(pull_request),
@@ -3323,7 +3359,7 @@ class _PullRequestBase(BaseModel):
 
         data = {
             'pull_request_id': pull_request.pull_request_id,
-            'url': pull_request_url,
+            'url': PullRequestModel().get_url(pull_request),
             'title': pull_request.title,
             'description': pull_request.description,
             'status': pull_request.status,
@@ -3331,10 +3367,7 @@ class _PullRequestBase(BaseModel):
             'updated_on': pull_request.updated_on,
             'commit_ids': pull_request.revisions,
             'review_status': pull_request.calculated_review_status(),
-            'mergeable': {
-                'status': merge_status[0],
-                'message': unicode(merge_status[1]),
-            },
+            'mergeable': merge_state,
             'source': {
                 'clone_url': pull_request.source_repo.clone_url(),
                 'repository': pull_request.source_repo.repo_name,
@@ -3389,7 +3422,8 @@ class PullRequest(Base, _PullRequestBase):
 
     reviewers = relationship('PullRequestReviewers',
                              cascade="all, delete, delete-orphan")
-    statuses = relationship('ChangesetStatus')
+    statuses = relationship('ChangesetStatus',
+                            cascade="all, delete, delete-orphan")
     comments = relationship('ChangesetComment',
                             cascade="all, delete, delete-orphan")
     versions = relationship('PullRequestVersion',
diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py
index f13afc51..90b9277b 100644
--- a/rhodecode/model/pull_request.py
+++ b/rhodecode/model/pull_request.py
@@ -36,11 +36,11 @@ from sqlalchemy import or_
 
 from rhodecode import events
 from rhodecode.lib import helpers as h, hooks_utils, diffs
+from rhodecode.lib import audit_logger
 from rhodecode.lib.compat import OrderedDict
 from rhodecode.lib.hooks_daemon import prepare_callback_daemon
 from rhodecode.lib.markup_renderer import (
     DEFAULT_COMMENTS_RENDERER, RstTemplateRenderer)
-from rhodecode.lib.utils import action_logger
 from rhodecode.lib.utils2 import safe_unicode, safe_str, md5_safe
 from rhodecode.lib.vcs.backends.base import (
     Reference, MergeResponse, MergeFailureReason, UpdateFailureReason)
@@ -470,6 +470,11 @@ class PullRequestModel(BaseModel):
         self._trigger_pull_request_hook(
             pull_request, created_by_user, 'create')
 
+        creation_data = pull_request.get_api_data(with_merge_state=False)
+        self._log_audit_action(
+            'repo.pull_request.create', {'data': creation_data},
+            created_by_user, pull_request)
+
         return pull_request
 
     def _trigger_pull_request_hook(self, pull_request, user, action):
@@ -520,7 +525,12 @@ class PullRequestModel(BaseModel):
             log.debug(
                 "Merge was successful, updating the pull request comments.")
             self._comment_and_close_pr(pull_request, user, merge_state)
-            self._log_action('user_merged_pull_request', user, pull_request)
+
+            self._log_audit_action(
+                'repo.pull_request.merge',
+                {'merge_state': merge_state.__dict__},
+                user, pull_request)
+
         else:
             log.warn("Merge failed, not updating the pull request.")
         return merge_state
@@ -899,8 +909,9 @@ class PullRequestModel(BaseModel):
         renderer = RstTemplateRenderer()
         return renderer.render('pull_request_update.mako', **params)
 
-    def edit(self, pull_request, title, description):
+    def edit(self, pull_request, title, description, user):
         pull_request = self.__get_pull_request(pull_request)
+        old_data = pull_request.get_api_data(with_merge_state=False)
         if pull_request.is_closed():
             raise ValueError('This pull request is closed')
         if title:
@@ -908,8 +919,11 @@ class PullRequestModel(BaseModel):
         pull_request.description = description
         pull_request.updated_on = datetime.datetime.now()
         Session().add(pull_request)
+        self._log_audit_action(
+            'repo.pull_request.edit', {'old_data': old_data},
+            user, pull_request)
 
-    def update_reviewers(self, pull_request, reviewer_data):
+    def update_reviewers(self, pull_request, reviewer_data, user):
         """
         Update the reviewers in the pull request
 
@@ -946,8 +960,11 @@ class PullRequestModel(BaseModel):
             reviewer.pull_request = pull_request
             reviewer.reasons = reviewers[uid]['reasons']
             # NOTE(marcink): mandatory shouldn't be changed now
-            #reviewer.mandatory = reviewers[uid]['reasons']
+            # reviewer.mandatory = reviewers[uid]['reasons']
             Session().add(reviewer)
+            self._log_audit_action(
+                'repo.pull_request.reviewer.add', {'data': reviewer.get_dict()},
+                user, pull_request)
 
         for uid in ids_to_remove:
             changed = True
@@ -958,7 +975,11 @@ class PullRequestModel(BaseModel):
             # use .all() in case we accidentally added the same person twice
             # this CAN happen due to the lack of DB checks
             for obj in reviewers:
+                old_data = obj.get_dict()
                 Session().delete(obj)
+                self._log_audit_action(
+                    'repo.pull_request.reviewer.delete',
+                    {'old_data': old_data}, user, pull_request)
 
         if changed:
             pull_request.updated_on = datetime.datetime.now()
@@ -1054,9 +1075,13 @@ class PullRequestModel(BaseModel):
             email_kwargs=kwargs,
         )
 
-    def delete(self, pull_request):
+    def delete(self, pull_request, user):
         pull_request = self.__get_pull_request(pull_request)
+        old_data = pull_request.get_api_data(with_merge_state=False)
         self._cleanup_merge_workspace(pull_request)
+        self._log_audit_action(
+            'repo.pull_request.delete', {'old_data': old_data},
+            user, pull_request)
         Session().delete(pull_request)
 
     def close_pull_request(self, pull_request, user):
@@ -1067,7 +1092,8 @@ class PullRequestModel(BaseModel):
         Session().add(pull_request)
         self._trigger_pull_request_hook(
             pull_request, pull_request.author, 'close')
-        self._log_action('user_closed_pull_request', user, pull_request)
+        self._log_audit_action(
+            'repo.pull_request.close', {}, user, pull_request)
 
     def close_pull_request_with_comment(
             self, pull_request, user, repo, message=None):
@@ -1402,12 +1428,12 @@ class PullRequestModel(BaseModel):
         settings = settings_model.get_general_settings()
         return settings.get('rhodecode_hg_use_rebase_for_merging', False)
 
-    def _log_action(self, action, user, pull_request):
-        action_logger(
-            user,
-            '{action}:{pr_id}'.format(
-                action=action, pr_id=pull_request.pull_request_id),
-            pull_request.target_repo)
+    def _log_audit_action(self, action, action_data, user, pull_request):
+        audit_logger.store(
+            action=action,
+            action_data=action_data,
+            user=user,
+            repo=pull_request.target_repo)
 
     def get_reviewer_functions(self):
         """
diff --git a/rhodecode/tests/functional/test_admin_permissions.py b/rhodecode/tests/functional/test_admin_permissions.py
index cba80010..a5e69308 100644
--- a/rhodecode/tests/functional/test_admin_permissions.py
+++ b/rhodecode/tests/functional/test_admin_permissions.py
@@ -199,6 +199,9 @@ class TestAdminPermissionsController(TestController):
             url('edit_user_ips', user_id=default_user_id),
             params={'_method': 'delete', 'del_ip_id': del_ip_id,
                     'csrf_token': self.csrf_token})
+
+        assert_session_flash(response, 'Removed ip address from user whitelist')
+
         clear_all_caches()
         response = self.app.get(url('admin_permissions_ips'))
         response.mustcontain('All IP addresses are allowed')
diff --git a/rhodecode/tests/functional/test_pullrequests.py b/rhodecode/tests/functional/test_pullrequests.py
index 7aec5729..1a103f5f 100644
--- a/rhodecode/tests/functional/test_pullrequests.py
+++ b/rhodecode/tests/functional/test_pullrequests.py
@@ -27,7 +27,7 @@ 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)
+    PullRequest, ChangesetStatus, UserLog, Notification, ChangesetComment)
 from rhodecode.model.meta import Session
 from rhodecode.model.pull_request import PullRequestModel
 from rhodecode.model.user import UserModel
@@ -256,29 +256,32 @@ class TestPullrequestsController(object):
                 'csrf_token': csrf_token},
             extra_environ=xhr_header,)
 
-        action = 'user_closed_pull_request:%d' % pull_request_id
         journal = UserLog.query()\
             .filter(UserLog.user_id == author)\
-            .filter(UserLog.repository_id == repo)\
-            .filter(UserLog.action == action)\
+            .filter(UserLog.repository_id == repo) \
+            .order_by('user_log_id') \
             .all()
-        assert len(journal) == 1
+        assert journal[-1].action == 'repo.pull_request.close'
 
         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_APPROVED
-        assert pull_request.comments[-1].text == 'Closing a PR'
+        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), (2, ['reason2'], False)])
+            pull_request_id, [(1, ['reason'], False), (2, ['reason2'], False)],
+            pull_request.author)
         author = pull_request.user_id
         repo = pull_request.target_repo.repo_id
 
@@ -294,12 +297,11 @@ class TestPullrequestsController(object):
 
         pull_request = PullRequest.get(pull_request_id)
 
-        action = 'user_closed_pull_request:%d' % pull_request_id
-        journal = UserLog.query().filter(
-            UserLog.user_id == author,
-            UserLog.repository_id == repo,
-            UserLog.action == action).all()
-        assert len(journal) == 1
+        journal = UserLog.query()\
+            .filter(UserLog.user_id == author, UserLog.repository_id == repo) \
+            .order_by('user_log_id') \
+            .all()
+        assert journal[-1].action == 'repo.pull_request.close'
 
         # check only the latest status, not the review status
         status = ChangesetStatusModel().get_status(
@@ -449,7 +451,8 @@ class TestPullrequestsController(object):
 
         # Change reviewers and check that a notification was made
         PullRequestModel().update_reviewers(
-            pull_request.pull_request_id, [(1, [], False)])
+            pull_request.pull_request_id, [(1, [], False)],
+            pull_request.author)
         assert len(notifications.all()) == 2
 
     def test_create_pull_request_stores_ancestor_commit_id(self, backend,
@@ -541,25 +544,20 @@ class TestPullrequestsController(object):
             pull_request, ChangesetStatus.STATUS_APPROVED)
 
         # Check the relevant log entries were added
-        user_logs = UserLog.query() \
-            .filter(UserLog.version == UserLog.VERSION_1) \
-            .order_by('-user_log_id').limit(3)
+        user_logs = UserLog.query().order_by('-user_log_id').limit(3)
         actions = [log.action for log in user_logs]
         pr_commit_ids = PullRequestModel()._get_commit_ids(pull_request)
         expected_actions = [
-            u'user_closed_pull_request:%d' % pull_request_id,
-            u'user_merged_pull_request:%d' % pull_request_id,
-            # The action below reflect that the post push actions were executed
-            u'user_commented_pull_request:%d' % pull_request_id,
+             u'repo.pull_request.close',
+             u'repo.pull_request.merge',
+             u'repo.pull_request.comment.create'
         ]
         assert actions == expected_actions
 
-        user_logs = UserLog.query() \
-            .filter(UserLog.version == UserLog.VERSION_2) \
-            .order_by('-user_log_id').limit(1)
-        actions = [log.action for log in user_logs]
-        assert actions == ['user.push']
-        assert user_logs[0].action_data['commit_ids'] == pr_commit_ids
+        user_logs = UserLog.query().order_by('-user_log_id').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['post_push']
diff --git a/rhodecode/tests/models/test_pullrequest.py b/rhodecode/tests/models/test_pullrequest.py
index 564f56a5..fc360041 100644
--- a/rhodecode/tests/models/test_pullrequest.py
+++ b/rhodecode/tests/models/test_pullrequest.py
@@ -50,7 +50,9 @@ class TestPullRequestModel(object):
         A pull request combined with multiples patches.
         """
         BackendClass = get_backend(backend.alias)
-        self.merge_patcher = mock.patch.object(BackendClass, 'merge')
+        self.merge_patcher = mock.patch.object(
+            BackendClass, 'merge', return_value=MergeResponse(
+            False, False, None, MergeFailureReason.UNKNOWN))
         self.workspace_remove_patcher = mock.patch.object(
             BackendClass, 'cleanup_merge_workspace')
 
@@ -117,7 +119,8 @@ class TestPullRequestModel(object):
 
     def test_get_awaiting_my_review(self, pull_request):
         PullRequestModel().update_reviewers(
-            pull_request, [(pull_request.author, ['author'], False)])
+            pull_request, [(pull_request.author, ['author'], False)],
+            pull_request.author)
         prs = PullRequestModel().get_awaiting_my_review(
             pull_request.target_repo, user_id=pull_request.author.user_id)
         assert isinstance(prs, list)
@@ -125,13 +128,14 @@ class TestPullRequestModel(object):
 
     def test_count_awaiting_my_review(self, pull_request):
         PullRequestModel().update_reviewers(
-            pull_request, [(pull_request.author, ['author'], False)])
+            pull_request, [(pull_request.author, ['author'], False)],
+            pull_request.author)
         pr_count = PullRequestModel().count_awaiting_my_review(
             pull_request.target_repo, user_id=pull_request.author.user_id)
         assert pr_count == 1
 
     def test_delete_calls_cleanup_merge(self, pull_request):
-        PullRequestModel().delete(pull_request)
+        PullRequestModel().delete(pull_request, pull_request.author)
 
         self.workspace_remove_mock.assert_called_once_with(
             self.workspace_id)
diff --git a/rhodecode/tests/plugin.py b/rhodecode/tests/plugin.py
index 1a3155e0..63106b8e 100644
--- a/rhodecode/tests/plugin.py
+++ b/rhodecode/tests/plugin.py
@@ -892,7 +892,7 @@ class RepoServer(object):
 
 
 @pytest.fixture
-def pr_util(backend, request):
+def pr_util(backend, request, config_stub):
     """
     Utility for tests of models and for functional tests around pull requests.
 
@@ -1085,7 +1085,7 @@ class PRTestUtility(object):
         # request will already be deleted.
         pull_request = PullRequest().get(self.pull_request_id)
         if pull_request:
-            PullRequestModel().delete(pull_request)
+            PullRequestModel().delete(pull_request, pull_request.author)
             Session().commit()
 
         if self.notification_patcher:
@@ -1648,14 +1648,6 @@ def no_notifications(request):
     request.addfinalizer(notification_patcher.stop)
 
 
-@pytest.fixture
-def silence_action_logger(request):
-    notification_patcher = mock.patch(
-        'rhodecode.lib.utils.action_logger')
-    notification_patcher.start()
-    request.addfinalizer(notification_patcher.stop)
-
-
 @pytest.fixture(scope='session')
 def repeat(request):
     """

From 1eff40ea8968c73066ecde405ee4fa6405d81290 Mon Sep 17 00:00:00 2001
From: Daniel Dourvaris <daniel@rhodecode.com>
Date: Thu, 15 Jun 2017 23:32:01 +0200
Subject: [PATCH 171/211] docs: added example how to secure login page from
 brute force attacks.

---
 docs/admin/nginx-config-example.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/admin/nginx-config-example.rst b/docs/admin/nginx-config-example.rst
index c76a7205..7f55d38f 100644
--- a/docs/admin/nginx-config-example.rst
+++ b/docs/admin/nginx-config-example.rst
@@ -5,7 +5,10 @@ Use the following example to configure Nginx as a your web server.
 
 
 .. code-block:: nginx
+    ## rate limiter for certain pages to prevent brute force attacks
+    limit_req_zone  $binary_remote_addr  zone=dl_limit:10m   rate=1r/s;
 
+    ## custom log format
     log_format log_custom '$remote_addr - $remote_user [$time_local] '
                           '"$request" $status $body_bytes_sent '
                           '"$http_referer" "$http_user_agent" '
@@ -109,6 +112,12 @@ Use the following example to configure Nginx as a your web server.
             proxy_set_header Connection  "upgrade";
         }
 
+        location /_admin/login {
+            ## rate limit this endpoint
+            limit_req  zone=dl_limit  burst=10  nodelay;
+            try_files $uri @rhode;
+        }
+
         location / {
             try_files $uri @rhode;
         }

From ea90ac1210b743e08109dba05b3c53991c44045f Mon Sep 17 00:00:00 2001
From: Marcin Lulek <mlulek@rhodecode.com>
Date: Sat, 17 Jun 2017 16:06:06 +0200
Subject: [PATCH 172/211] security: fix self-xss inside repo strip view.

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

diff --git a/rhodecode/apps/repository/views/repo_strip.py b/rhodecode/apps/repository/views/repo_strip.py
index 0f77d6b9..0c14e3e8 100644
--- a/rhodecode/apps/repository/views/repo_strip.py
+++ b/rhodecode/apps/repository/views/repo_strip.py
@@ -23,6 +23,7 @@ from pyramid.view import view_config
 
 from rhodecode.apps._base import RepoAppView
 from rhodecode.lib import audit_logger
+from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import (LoginRequired, HasRepoPermissionAnyDecorator,
     NotAnonymous)
 from rhodecode.lib.ext_json import json
@@ -64,10 +65,11 @@ class StripView(RepoAppView):
         for i in range(1, 11):
             chset = 'changeset_id-%d' % (i,)
             check = rp.get(chset)
+
             if check:
                 data[i] = self.db_repo.get_changeset(rp[chset])
                 if isinstance(data[i], EmptyCommit):
-                    data[i] = {'rev': None, 'commit': rp[chset]}
+                    data[i] = {'rev': None, 'commit': h.escape(rp[chset])}
                 else:
                     data[i] = {'rev': data[i].raw_id, 'branch': data[i].branch,
                                'author': data[i].author,

From 779587086e1d499334dae7b13f40f6028ee0f53f Mon Sep 17 00:00:00 2001
From: Marcin Lulek <mlulek@rhodecode.com>
Date: Sat, 17 Jun 2017 17:06:57 +0200
Subject: [PATCH 173/211] security: fixed self-xss inside file views.

---
 rhodecode/controllers/files.py           | 44 ++++++++++++------------
 rhodecode/tests/functional/test_files.py | 17 +++++----
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/rhodecode/controllers/files.py b/rhodecode/controllers/files.py
index 82fbfe58..0c2dda11 100644
--- a/rhodecode/controllers/files.py
+++ b/rhodecode/controllers/files.py
@@ -124,9 +124,8 @@ class FilesController(BaseRepoController):
             if file_node.is_dir():
                 raise RepositoryError('The given path is a directory')
         except CommitDoesNotExistError:
-            msg = _('No such commit exists for this repository')
-            log.exception(msg)
-            h.flash(msg, category='error')
+            log.exception('No such commit exists for this repository')
+            h.flash(_('No such commit exists for this repository'), category='error')
             raise HTTPNotFound()
         except RepositoryError as e:
             h.flash(safe_str(e), category='error')
@@ -450,7 +449,7 @@ class FilesController(BaseRepoController):
         c.file = self.__get_filenode_or_redirect(repo_name, c.commit, f_path)
 
         c.default_message = _(
-            'Deleted file %s via RhodeCode Enterprise') % (f_path)
+            'Deleted file {} via RhodeCode Enterprise').format(f_path)
         c.f_path = f_path
         node_path = f_path
         author = c.rhodecode_user.full_contact
@@ -469,8 +468,9 @@ class FilesController(BaseRepoController):
                 author=author,
             )
 
-            h.flash(_('Successfully deleted file %s') % f_path,
-                    category='success')
+            h.flash(
+                _('Successfully deleted file `{}`').format(
+                    h.escape(f_path)), category='success')
         except Exception:
             msg = _('Error occurred during commit')
             log.exception(msg)
@@ -503,7 +503,7 @@ class FilesController(BaseRepoController):
         c.file = self.__get_filenode_or_redirect(repo_name, c.commit, f_path)
 
         c.default_message = _(
-            'Deleted file %s via RhodeCode Enterprise') % (f_path)
+            'Deleted file {} via RhodeCode Enterprise').format(f_path)
         c.f_path = f_path
 
         return render('files/files_delete.mako')
@@ -537,7 +537,7 @@ class FilesController(BaseRepoController):
             return redirect(url('files_home', repo_name=c.repo_name,
                             revision=c.commit.raw_id, f_path=f_path))
         c.default_message = _(
-            'Edited file %s via RhodeCode Enterprise') % (f_path)
+            'Edited file {} via RhodeCode Enterprise').format(f_path)
         c.f_path = f_path
         old_content = c.file.content
         sl = old_content.splitlines(1)
@@ -575,12 +575,12 @@ class FilesController(BaseRepoController):
                 parent_commit=c.commit,
             )
 
-            h.flash(_('Successfully committed to %s') % f_path,
-                    category='success')
+            h.flash(
+                _('Successfully committed changes to file `{}`').format(
+                    h.escape(f_path)), category='success')
         except Exception:
-            msg = _('Error occurred during commit')
-            log.exception(msg)
-            h.flash(msg, category='error')
+            log.exception('Error occurred during commit')
+            h.flash(_('Error occurred during commit'), category='error')
         return redirect(url('changeset_home',
                             repo_name=c.repo_name, revision='tip'))
 
@@ -612,7 +612,7 @@ class FilesController(BaseRepoController):
             return redirect(url('files_home', repo_name=c.repo_name,
                             revision=c.commit.raw_id, f_path=f_path))
         c.default_message = _(
-            'Edited file %s via RhodeCode Enterprise') % (f_path)
+            'Edited file {} via RhodeCode Enterprise').format(f_path)
         c.f_path = f_path
 
         return render('files/files_edit.mako')
@@ -704,8 +704,9 @@ class FilesController(BaseRepoController):
                 author=author,
             )
 
-            h.flash(_('Successfully committed to %s') % node_path,
-                    category='success')
+            h.flash(
+                _('Successfully committed new file `{}`').format(
+                    h.escape(node_path)), category='success')
         except NonRelativePathError as e:
             h.flash(_(
                 'The location specified must be a relative path and must not '
@@ -713,11 +714,10 @@ class FilesController(BaseRepoController):
             return redirect(url('changeset_home', repo_name=c.repo_name,
                                 revision='tip'))
         except (NodeError, NodeAlreadyExistsError) as e:
-            h.flash(_(e), category='error')
+            h.flash(_(h.escape(e)), category='error')
         except Exception:
-            msg = _('Error occurred during commit')
-            log.exception(msg)
-            h.flash(msg, category='error')
+            log.exception('Error occurred during commit')
+            h.flash(_('Error occurred during commit'), category='error')
         return redirect(url('changeset_home',
                             repo_name=c.repo_name, revision='tip'))
 
@@ -801,7 +801,7 @@ class FilesController(BaseRepoController):
         if not use_cached_archive:
             # generate new archive
             fd, archive = tempfile.mkstemp()
-            log.debug('Creating new temp archive in %s' % (archive,))
+            log.debug('Creating new temp archive in %s', archive)
             try:
                 commit.archive_repo(archive, kind=fileformat, subrepos=subrepos)
             except ImproperArchiveTypeError:
@@ -809,7 +809,7 @@ class FilesController(BaseRepoController):
             if archive_cache_enabled:
                 # if we generated the archive and we have cache enabled
                 # let's use this for future
-                log.debug('Storing new archive in %s' % (cached_archive_path,))
+                log.debug('Storing new archive in %s', cached_archive_path)
                 shutil.move(archive, cached_archive_path)
                 archive = cached_archive_path
 
diff --git a/rhodecode/tests/functional/test_files.py b/rhodecode/tests/functional/test_files.py
index d6473c12..3ecdecc6 100644
--- a/rhodecode/tests/functional/test_files.py
+++ b/rhodecode/tests/functional/test_files.py
@@ -758,9 +758,8 @@ class TestChangingFiles:
                 'csrf_token': csrf_token,
             },
             status=302)
-        assert_session_flash(
-            response, 'Successfully committed to %s'
-            % os.path.join(filename))
+        assert_session_flash(response,
+            'Successfully committed new file `{}`'.format(os.path.join(filename)))
 
     def test_add_file_into_repo_missing_filename(self, backend, csrf_token):
         response = self.app.post(
@@ -848,9 +847,9 @@ class TestChangingFiles:
                 'csrf_token': csrf_token,
             },
             status=302)
-        assert_session_flash(
-            response, 'Successfully committed to %s'
-            % os.path.join(location, filename))
+        assert_session_flash(response,
+            'Successfully committed new file `{}`'.format(
+                os.path.join(location, filename)))
 
     def test_edit_file_view(self, backend):
         response = self.app.get(
@@ -894,7 +893,7 @@ class TestChangingFiles:
             },
             status=302)
         assert_session_flash(
-            response, 'Successfully committed to vcs/nodes.py')
+            response, 'Successfully committed changes to file `vcs/nodes.py`')
         tip = repo.get_commit(commit_idx=-1)
         assert tip.message == 'I committed'
 
@@ -921,7 +920,7 @@ class TestChangingFiles:
             },
             status=302)
         assert_session_flash(
-            response, 'Successfully committed to vcs/nodes.py')
+            response, 'Successfully committed changes to file `vcs/nodes.py`')
         tip = repo.get_commit(commit_idx=-1)
         assert tip.message == 'Edited file vcs/nodes.py via RhodeCode Enterprise'
 
@@ -961,7 +960,7 @@ class TestChangingFiles:
             },
             status=302)
         assert_session_flash(
-            response, 'Successfully deleted file vcs/nodes.py')
+            response, 'Successfully deleted file `vcs/nodes.py`')
 
 
 def assert_files_in_response(response, files, params):

From 0e6fcd4658c34aeb0423b354eeb061715f7d4ede Mon Sep 17 00:00:00 2001
From: Marcin Lulek <mlulek@rhodecode.com>
Date: Mon, 19 Jun 2017 09:20:07 +0200
Subject: [PATCH 174/211] security: added missing csrf checks in few missing
 views.

---
 rhodecode/apps/admin/views/sessions.py               |  2 +-
 rhodecode/apps/admin/views/svn_config.py             |  2 +-
 rhodecode/apps/admin/views/users.py                  |  1 +
 rhodecode/apps/repository/views/repo_caches.py       |  4 +++-
 .../apps/repository/views/repo_settings_advanced.py  |  1 +
 rhodecode/apps/repository/views/repo_strip.py        |  4 +++-
 rhodecode/templates/admin/repos/repo_edit_strip.mako | 12 ++++++++----
 7 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/rhodecode/apps/admin/views/sessions.py b/rhodecode/apps/admin/views/sessions.py
index 6e7654b7..3ce78c44 100644
--- a/rhodecode/apps/admin/views/sessions.py
+++ b/rhodecode/apps/admin/views/sessions.py
@@ -68,8 +68,8 @@ class AdminSessionSettingsView(BaseAppView):
         return self._get_template_context(c)
 
     @LoginRequired()
-    @CSRFRequired()
     @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
     @view_config(
         route_name='admin_settings_sessions_cleanup', request_method='POST')
     def settings_sessions_cleanup(self):
diff --git a/rhodecode/apps/admin/views/svn_config.py b/rhodecode/apps/admin/views/svn_config.py
index a0c5ad7e..c1c92bef 100644
--- a/rhodecode/apps/admin/views/svn_config.py
+++ b/rhodecode/apps/admin/views/svn_config.py
@@ -33,8 +33,8 @@ log = logging.getLogger(__name__)
 class SvnConfigAdminSettingsView(BaseAppView):
 
     @LoginRequired()
-    @CSRFRequired()
     @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
     @view_config(
         route_name='admin_settings_vcs_svn_generate_cfg',
         request_method='POST', renderer='json')
diff --git a/rhodecode/apps/admin/views/users.py b/rhodecode/apps/admin/views/users.py
index 6647051e..f726e2a9 100644
--- a/rhodecode/apps/admin/views/users.py
+++ b/rhodecode/apps/admin/views/users.py
@@ -251,6 +251,7 @@ class AdminUsersView(BaseAppView, DataGridAppView):
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
     @view_config(
         route_name='edit_user_groups_management_updates', request_method='POST')
     def groups_management_updates(self):
diff --git a/rhodecode/apps/repository/views/repo_caches.py b/rhodecode/apps/repository/views/repo_caches.py
index 2a017277..963f6f35 100644
--- a/rhodecode/apps/repository/views/repo_caches.py
+++ b/rhodecode/apps/repository/views/repo_caches.py
@@ -24,7 +24,8 @@ from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config
 
 from rhodecode.apps._base import RepoAppView
-from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
+from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator, \
+    CSRFRequired
 from rhodecode.lib import helpers as h
 from rhodecode.model.meta import Session
 from rhodecode.model.scm import ScmModel
@@ -55,6 +56,7 @@ class RepoCachesView(RepoAppView):
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.admin')
+    @CSRFRequired()
     @view_config(
         route_name='edit_repo_caches', request_method='POST')
     def repo_caches_purge(self):
diff --git a/rhodecode/apps/repository/views/repo_settings_advanced.py b/rhodecode/apps/repository/views/repo_settings_advanced.py
index fc480bbb..f652ef13 100644
--- a/rhodecode/apps/repository/views/repo_settings_advanced.py
+++ b/rhodecode/apps/repository/views/repo_settings_advanced.py
@@ -73,6 +73,7 @@ class RepoSettingsView(RepoAppView):
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.admin')
+    @CSRFRequired()
     @view_config(
         route_name='edit_repo_advanced_delete', request_method='POST',
         renderer='rhodecode:templates/admin/repos/repo_edit.mako')
diff --git a/rhodecode/apps/repository/views/repo_strip.py b/rhodecode/apps/repository/views/repo_strip.py
index 0c14e3e8..a56d98f8 100644
--- a/rhodecode/apps/repository/views/repo_strip.py
+++ b/rhodecode/apps/repository/views/repo_strip.py
@@ -25,7 +25,7 @@ from rhodecode.apps._base import RepoAppView
 from rhodecode.lib import audit_logger
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import (LoginRequired, HasRepoPermissionAnyDecorator,
-    NotAnonymous)
+                                NotAnonymous, CSRFRequired)
 from rhodecode.lib.ext_json import json
 
 log = logging.getLogger(__name__)
@@ -55,6 +55,7 @@ class StripView(RepoAppView):
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.admin')
+    @CSRFRequired()
     @view_config(
         route_name='strip_check', request_method='POST',
         renderer='json', xhr=True)
@@ -80,6 +81,7 @@ class StripView(RepoAppView):
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.admin')
+    @CSRFRequired()
     @view_config(
         route_name='strip_execute', request_method='POST',
         renderer='json', xhr=True)
diff --git a/rhodecode/templates/admin/repos/repo_edit_strip.mako b/rhodecode/templates/admin/repos/repo_edit_strip.mako
index ccec32f2..b90932c5 100644
--- a/rhodecode/templates/admin/repos/repo_edit_strip.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_strip.mako
@@ -104,7 +104,9 @@ delOld = function(number){
 
 };
 
-var result_data;
+var resultData = {
+    'csrf_token': CSRF_TOKEN
+};
 
 checkCommits = function() {
     var postData = $('form').serialize();
@@ -116,14 +118,16 @@ checkCommits = function() {
     btn.addClass('disabled');
 
     var success = function (data) {
-        result_data = {};
+        resultData = {
+            'csrf_token': CSRF_TOKEN
+        };
         var i = 0;
         var result = '<ol>';
         $.each(data, function(index, value){
             i= index;
             var box = $('#box-'+index);
             if (value.rev){
-                result_data[index] = JSON.stringify(value);
+                resultData[index] = JSON.stringify(value);
 
                 var verifiedHtml = (
                         '<li style="line-height:1.2em">' +
@@ -185,7 +189,7 @@ strip = function() {
         $('#results').html(result);
 
     };
-    ajaxPOST(url, result_data, success, null);
+    ajaxPOST(url, resultData, success, null);
     var btn = $('#strip_action');
     btn.remove();
 

From dabc0de3dfbab3a32f4bbb61a5a1ca696846fc5f Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 19 Jun 2017 10:10:19 +0200
Subject: [PATCH 175/211] notifications: fixed problem with 500 errors on
 non-numeric notification id given.

---
 rhodecode/controllers/admin/notifications.py | 31 ++++----------------
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/rhodecode/controllers/admin/notifications.py b/rhodecode/controllers/admin/notifications.py
index d0901dd4..fe7ff6b5 100644
--- a/rhodecode/controllers/admin/notifications.py
+++ b/rhodecode/controllers/admin/notifications.py
@@ -48,10 +48,6 @@ log = logging.getLogger(__name__)
 
 class NotificationsController(BaseController):
     """REST Controller styled on the Atom Publishing Protocol"""
-    # To properly map this controller, ensure your config/routing.py
-    # file has a resource setup:
-    #     map.resource('notification', 'notifications', controller='_admin/notifications',
-    #         path_prefix='/_admin', name_prefix='_admin_')
 
     @LoginRequired()
     @NotAnonymous()
@@ -62,8 +58,8 @@ class NotificationsController(BaseController):
         """GET /_admin/notifications: All items in the collection"""
         # url('notifications')
         c.user = c.rhodecode_user
-        notif = NotificationModel().get_for_user(c.rhodecode_user.user_id,
-                                            filter_=request.GET.getall('type'))
+        notif = NotificationModel().get_for_user(
+            c.rhodecode_user.user_id, filter_=request.GET.getall('type'))
 
         p = safe_int(request.GET.get('page', 1), 1)
         notifications_url = webhelpers.paginate.PageURL(
@@ -86,7 +82,6 @@ class NotificationsController(BaseController):
 
         return render('admin/notifications/notifications.mako')
 
-
     @auth.CSRFRequired()
     def mark_all_read(self):
         if request.is_xhr:
@@ -115,15 +110,8 @@ class NotificationsController(BaseController):
 
     @auth.CSRFRequired()
     def update(self, notification_id):
-        """PUT /_admin/notifications/id: Update an existing item"""
-        # Forms posted to this method should contain a hidden field:
-        #    <input type="hidden" name="_method" value="PUT" />
-        # Or using helpers:
-        #    h.form(url('notification', notification_id=ID),
-        #           method='put')
-        # url('notification', notification_id=ID)
+        no = Notification.get_or_404(notification_id)
         try:
-            no = Notification.get(notification_id)
             if self._has_permissions(no):
                 # deletes only notification2user
                 NotificationModel().mark_read(c.rhodecode_user.user_id, no)
@@ -136,15 +124,8 @@ class NotificationsController(BaseController):
 
     @auth.CSRFRequired()
     def delete(self, notification_id):
-        """DELETE /_admin/notifications/id: Delete an existing item"""
-        # Forms posted to this method should contain a hidden field:
-        #    <input type="hidden" name="_method" value="DELETE" />
-        # Or using helpers:
-        #    h.form(url('notification', notification_id=ID),
-        #           method='delete')
-        # url('notification', notification_id=ID)
+        no = Notification.get_or_404(notification_id)
         try:
-            no = Notification.get(notification_id)
             if self._has_permissions(no):
                 # deletes only notification2user
                 NotificationModel().delete(c.rhodecode_user.user_id, no)
@@ -156,10 +137,8 @@ class NotificationsController(BaseController):
         raise HTTPBadRequest()
 
     def show(self, notification_id):
-        """GET /_admin/notifications/id: Show a specific item"""
-        # url('notification', notification_id=ID)
         c.user = c.rhodecode_user
-        no = Notification.get(notification_id)
+        no = Notification.get_or_404(notification_id)
 
         if no and self._has_permissions(no):
             unotification = NotificationModel()\

From aa3bffd198c3404847688ae0d596b5aa35bfd7dd Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 19 Jun 2017 13:25:15 +0200
Subject: [PATCH 176/211] pull-requests: prepare the migration of pull request
 to pyramid.

- this is half the code because of problems found during porting
- partially moved the urls, and flipped the logic into pyramid code
- needs more work in core for full switch.
---
 .../repository/views/repo_pull_requests.py    | 416 +++++++++++++++++-
 rhodecode/controllers/pullrequests.py         |  19 +-
 rhodecode/lib/action_parser.py                |   5 +-
 rhodecode/lib/base.py                         |   5 +
 rhodecode/model/comment.py                    |   3 +-
 rhodecode/model/pull_request.py               |   9 +-
 .../changelog/changelog_elements.mako         |   2 +-
 .../changeset/changeset_file_comment.mako     |   4 +-
 .../templates/data_table/_dt_elements.mako    |   2 +-
 .../templates/summary/summary_commits.mako    |   2 +-
 10 files changed, 436 insertions(+), 31 deletions(-)

diff --git a/rhodecode/apps/repository/views/repo_pull_requests.py b/rhodecode/apps/repository/views/repo_pull_requests.py
index ce59f7b7..6e66b33d 100644
--- a/rhodecode/apps/repository/views/repo_pull_requests.py
+++ b/rhodecode/apps/repository/views/repo_pull_requests.py
@@ -20,18 +20,23 @@
 
 import logging
 
+import collections
+from pyramid.httpexceptions import HTTPFound, HTTPNotFound
 from pyramid.view import view_config
 
 from rhodecode.apps._base import RepoAppView, DataGridAppView
-from rhodecode.lib import helpers as h
-from rhodecode.lib import audit_logger
+from rhodecode.lib import helpers as h, diffs, codeblocks
 from rhodecode.lib.auth import (
     LoginRequired, HasRepoPermissionAnyDecorator)
 from rhodecode.lib.utils import PartialRenderer
-from rhodecode.lib.utils2 import str2bool
+from rhodecode.lib.utils2 import str2bool, safe_int, safe_str
+from rhodecode.lib.vcs.backends.base import EmptyCommit
+from rhodecode.lib.vcs.exceptions import CommitDoesNotExistError, \
+    RepositoryRequirementError, NodeDoesNotExistError
 from rhodecode.model.comment import CommentsModel
-from rhodecode.model.db import PullRequest
-from rhodecode.model.pull_request import PullRequestModel
+from rhodecode.model.db import PullRequest, PullRequestVersion, \
+    ChangesetComment, ChangesetStatus
+from rhodecode.model.pull_request import PullRequestModel, MergeCheck
 
 log = logging.getLogger(__name__)
 
@@ -39,11 +44,11 @@ log = logging.getLogger(__name__)
 class RepoPullRequestsView(RepoAppView, DataGridAppView):
 
     def load_default_context(self):
-        c = self._get_local_tmpl_context()
-
+        c = self._get_local_tmpl_context(include_app_defaults=True)
         # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
         c.repo_info = self.db_repo
-
+        c.REVIEW_STATUS_APPROVED = ChangesetStatus.STATUS_APPROVED
+        c.REVIEW_STATUS_REJECTED = ChangesetStatus.STATUS_REJECTED
         self._register_global_c(c)
         return c
 
@@ -182,3 +187,398 @@ class RepoPullRequestsView(RepoAppView, DataGridAppView):
             filter_type=filter_type, opened_by=opened_by, statuses=statuses)
 
         return data
+
+    def _get_pr_version(self, pull_request_id, version=None):
+        pull_request_id = safe_int(pull_request_id)
+        at_version = None
+
+        if version and version == 'latest':
+            pull_request_ver = PullRequest.get(pull_request_id)
+            pull_request_obj = pull_request_ver
+            _org_pull_request_obj = pull_request_obj
+            at_version = 'latest'
+        elif version:
+            pull_request_ver = PullRequestVersion.get_or_404(version)
+            pull_request_obj = pull_request_ver
+            _org_pull_request_obj = pull_request_ver.pull_request
+            at_version = pull_request_ver.pull_request_version_id
+        else:
+            _org_pull_request_obj = pull_request_obj = PullRequest.get_or_404(
+                pull_request_id)
+
+        pull_request_display_obj = PullRequest.get_pr_display_object(
+            pull_request_obj, _org_pull_request_obj)
+
+        return _org_pull_request_obj, pull_request_obj, \
+               pull_request_display_obj, at_version
+
+    def _get_diffset(self, source_repo_name, source_repo,
+                     source_ref_id, target_ref_id,
+                     target_commit, source_commit, diff_limit, fulldiff,
+                     file_limit, display_inline_comments):
+
+        vcs_diff = PullRequestModel().get_diff(
+            source_repo, source_ref_id, target_ref_id)
+
+        diff_processor = diffs.DiffProcessor(
+            vcs_diff, format='newdiff', diff_limit=diff_limit,
+            file_limit=file_limit, show_full_diff=fulldiff)
+
+        _parsed = diff_processor.prepare()
+
+        def _node_getter(commit):
+            def get_node(fname):
+                try:
+                    return commit.get_node(fname)
+                except NodeDoesNotExistError:
+                    return None
+
+            return get_node
+
+        diffset = codeblocks.DiffSet(
+            repo_name=self.db_repo_name,
+            source_repo_name=source_repo_name,
+            source_node_getter=_node_getter(target_commit),
+            target_node_getter=_node_getter(source_commit),
+            comments=display_inline_comments
+        )
+        diffset = diffset.render_patchset(
+            _parsed, target_commit.raw_id, source_commit.raw_id)
+
+        return diffset
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator(
+        'repository.read', 'repository.write', 'repository.admin')
+    # @view_config(
+    #     route_name='pullrequest_show', request_method='GET',
+    #     renderer='rhodecode:templates/pullrequests/pullrequest_show.mako')
+    def pull_request_show(self):
+        pull_request_id = safe_int(
+            self.request.matchdict.get('pull_request_id'))
+        c = self.load_default_context()
+
+        version = self.request.GET.get('version')
+        from_version = self.request.GET.get('from_version') or version
+        merge_checks = self.request.GET.get('merge_checks')
+        c.fulldiff = str2bool(self.request.GET.get('fulldiff'))
+
+        (pull_request_latest,
+         pull_request_at_ver,
+         pull_request_display_obj,
+         at_version) = self._get_pr_version(
+            pull_request_id, version=version)
+        pr_closed = pull_request_latest.is_closed()
+
+        if pr_closed and (version or from_version):
+            # not allow to browse versions
+            raise HTTPFound(h.route_path(
+                'pullrequest_show', repo_name=self.db_repo_name,
+                pull_request_id=pull_request_id))
+
+        versions = pull_request_display_obj.versions()
+
+        c.at_version = at_version
+        c.at_version_num = (at_version
+                            if at_version and at_version != 'latest'
+                            else None)
+        c.at_version_pos = ChangesetComment.get_index_from_version(
+            c.at_version_num, versions)
+
+        (prev_pull_request_latest,
+         prev_pull_request_at_ver,
+         prev_pull_request_display_obj,
+         prev_at_version) = self._get_pr_version(
+            pull_request_id, version=from_version)
+
+        c.from_version = prev_at_version
+        c.from_version_num = (prev_at_version
+                              if prev_at_version and prev_at_version != 'latest'
+                              else None)
+        c.from_version_pos = ChangesetComment.get_index_from_version(
+            c.from_version_num, versions)
+
+        # define if we're in COMPARE mode or VIEW at version mode
+        compare = at_version != prev_at_version
+
+        # pull_requests repo_name we opened it against
+        # ie. target_repo must match
+        if self.db_repo_name != pull_request_at_ver.target_repo.repo_name:
+            raise HTTPNotFound()
+
+        c.shadow_clone_url = PullRequestModel().get_shadow_clone_url(
+            pull_request_at_ver)
+
+        c.pull_request = pull_request_display_obj
+        c.pull_request_latest = pull_request_latest
+
+        if compare or (at_version and not at_version == 'latest'):
+            c.allowed_to_change_status = False
+            c.allowed_to_update = False
+            c.allowed_to_merge = False
+            c.allowed_to_delete = False
+            c.allowed_to_comment = False
+            c.allowed_to_close = False
+        else:
+            can_change_status = PullRequestModel().check_user_change_status(
+                pull_request_at_ver, self._rhodecode_user)
+            c.allowed_to_change_status = can_change_status and not pr_closed
+
+            c.allowed_to_update = PullRequestModel().check_user_update(
+                pull_request_latest, self._rhodecode_user) and not pr_closed
+            c.allowed_to_merge = PullRequestModel().check_user_merge(
+                pull_request_latest, self._rhodecode_user) and not pr_closed
+            c.allowed_to_delete = PullRequestModel().check_user_delete(
+                pull_request_latest, self._rhodecode_user) and not pr_closed
+            c.allowed_to_comment = not pr_closed
+            c.allowed_to_close = c.allowed_to_merge and not pr_closed
+
+        c.forbid_adding_reviewers = False
+        c.forbid_author_to_review = False
+        c.forbid_commit_author_to_review = False
+
+        if pull_request_latest.reviewer_data and \
+                        'rules' in pull_request_latest.reviewer_data:
+            rules = pull_request_latest.reviewer_data['rules'] or {}
+            try:
+                c.forbid_adding_reviewers = rules.get(
+                    'forbid_adding_reviewers')
+                c.forbid_author_to_review = rules.get(
+                    'forbid_author_to_review')
+                c.forbid_commit_author_to_review = rules.get(
+                    'forbid_commit_author_to_review')
+            except Exception:
+                pass
+
+        # check merge capabilities
+        _merge_check = MergeCheck.validate(
+            pull_request_latest, user=self._rhodecode_user)
+        c.pr_merge_errors = _merge_check.error_details
+        c.pr_merge_possible = not _merge_check.failed
+        c.pr_merge_message = _merge_check.merge_msg
+
+        c.pull_request_review_status = _merge_check.review_status
+        if merge_checks:
+            self.request.override_renderer = \
+                'rhodecode:templates/pullrequests/pullrequest_merge_checks.mako'
+            return self._get_template_context(c)
+
+        comments_model = CommentsModel()
+
+        # reviewers and statuses
+        c.pull_request_reviewers = pull_request_at_ver.reviewers_statuses()
+        allowed_reviewers = [x[0].user_id for x in c.pull_request_reviewers]
+
+        # GENERAL COMMENTS with versions #
+        q = comments_model._all_general_comments_of_pull_request(pull_request_latest)
+        q = q.order_by(ChangesetComment.comment_id.asc())
+        general_comments = q
+
+        # pick comments we want to render at current version
+        c.comment_versions = comments_model.aggregate_comments(
+            general_comments, versions, c.at_version_num)
+        c.comments = c.comment_versions[c.at_version_num]['until']
+
+        # INLINE COMMENTS with versions  #
+        q = comments_model._all_inline_comments_of_pull_request(pull_request_latest)
+        q = q.order_by(ChangesetComment.comment_id.asc())
+        inline_comments = q
+
+        c.inline_versions = comments_model.aggregate_comments(
+            inline_comments, versions, c.at_version_num, inline=True)
+
+        # inject latest version
+        latest_ver = PullRequest.get_pr_display_object(
+            pull_request_latest, pull_request_latest)
+
+        c.versions = versions + [latest_ver]
+
+        # if we use version, then do not show later comments
+        # than current version
+        display_inline_comments = collections.defaultdict(
+            lambda: collections.defaultdict(list))
+        for co in inline_comments:
+            if c.at_version_num:
+                # pick comments that are at least UPTO given version, so we
+                # don't render comments for higher version
+                should_render = co.pull_request_version_id and \
+                                co.pull_request_version_id <= c.at_version_num
+            else:
+                # showing all, for 'latest'
+                should_render = True
+
+            if should_render:
+                display_inline_comments[co.f_path][co.line_no].append(co)
+
+        # load diff data into template context, if we use compare mode then
+        # diff is calculated based on changes between versions of PR
+
+        source_repo = pull_request_at_ver.source_repo
+        source_ref_id = pull_request_at_ver.source_ref_parts.commit_id
+
+        target_repo = pull_request_at_ver.target_repo
+        target_ref_id = pull_request_at_ver.target_ref_parts.commit_id
+
+        if compare:
+            # in compare switch the diff base to latest commit from prev version
+            target_ref_id = prev_pull_request_display_obj.revisions[0]
+
+        # despite opening commits for bookmarks/branches/tags, we always
+        # convert this to rev to prevent changes after bookmark or branch change
+        c.source_ref_type = 'rev'
+        c.source_ref = source_ref_id
+
+        c.target_ref_type = 'rev'
+        c.target_ref = target_ref_id
+
+        c.source_repo = source_repo
+        c.target_repo = target_repo
+
+        c.commit_ranges = []
+        source_commit = EmptyCommit()
+        target_commit = EmptyCommit()
+        c.missing_requirements = False
+
+        source_scm = source_repo.scm_instance()
+        target_scm = target_repo.scm_instance()
+
+        # try first shadow repo, fallback to regular repo
+        try:
+            commits_source_repo = pull_request_latest.get_shadow_repo()
+        except Exception:
+            log.debug('Failed to get shadow repo', exc_info=True)
+            commits_source_repo = source_scm
+
+        c.commits_source_repo = commits_source_repo
+        commit_cache = {}
+        try:
+            pre_load = ["author", "branch", "date", "message"]
+            show_revs = pull_request_at_ver.revisions
+            for rev in show_revs:
+                comm = commits_source_repo.get_commit(
+                    commit_id=rev, pre_load=pre_load)
+                c.commit_ranges.append(comm)
+                commit_cache[comm.raw_id] = comm
+
+            # Order here matters, we first need to get target, and then
+            # the source
+            target_commit = commits_source_repo.get_commit(
+                commit_id=safe_str(target_ref_id))
+
+            source_commit = commits_source_repo.get_commit(
+                commit_id=safe_str(source_ref_id))
+
+        except CommitDoesNotExistError:
+            log.warning(
+                'Failed to get commit from `{}` repo'.format(
+                    commits_source_repo), exc_info=True)
+        except RepositoryRequirementError:
+            log.warning(
+                'Failed to get all required data from repo', exc_info=True)
+            c.missing_requirements = True
+
+        c.ancestor = None  # set it to None, to hide it from PR view
+
+        try:
+            ancestor_id = source_scm.get_common_ancestor(
+                source_commit.raw_id, target_commit.raw_id, target_scm)
+            c.ancestor_commit = source_scm.get_commit(ancestor_id)
+        except Exception:
+            c.ancestor_commit = None
+
+        c.statuses = source_repo.statuses(
+            [x.raw_id for x in c.commit_ranges])
+
+        # auto collapse if we have more than limit
+        collapse_limit = diffs.DiffProcessor._collapse_commits_over
+        c.collapse_all_commits = len(c.commit_ranges) > collapse_limit
+        c.compare_mode = compare
+
+        # diff_limit is the old behavior, will cut off the whole diff
+        # if the limit is applied  otherwise will just hide the
+        # big files from the front-end
+        diff_limit = c.visual.cut_off_limit_diff
+        file_limit = c.visual.cut_off_limit_file
+
+        c.missing_commits = False
+        if (c.missing_requirements
+            or isinstance(source_commit, EmptyCommit)
+            or source_commit == target_commit):
+
+            c.missing_commits = True
+        else:
+
+            c.diffset = self._get_diffset(
+                c.source_repo.repo_name, commits_source_repo,
+                source_ref_id, target_ref_id,
+                target_commit, source_commit,
+                diff_limit, c.fulldiff, file_limit, display_inline_comments)
+
+            c.limited_diff = c.diffset.limited_diff
+
+            # calculate removed files that are bound to comments
+            comment_deleted_files = [
+                fname for fname in display_inline_comments
+                if fname not in c.diffset.file_stats]
+
+            c.deleted_files_comments = collections.defaultdict(dict)
+            for fname, per_line_comments in display_inline_comments.items():
+                if fname in comment_deleted_files:
+                    c.deleted_files_comments[fname]['stats'] = 0
+                    c.deleted_files_comments[fname]['comments'] = list()
+                    for lno, comments in per_line_comments.items():
+                        c.deleted_files_comments[fname]['comments'].extend(
+                            comments)
+
+        # this is a hack to properly display links, when creating PR, the
+        # compare view and others uses different notation, and
+        # compare_commits.mako renders links based on the target_repo.
+        # We need to swap that here to generate it properly on the html side
+        c.target_repo = c.source_repo
+
+        c.commit_statuses = ChangesetStatus.STATUSES
+
+        c.show_version_changes = not pr_closed
+        if c.show_version_changes:
+            cur_obj = pull_request_at_ver
+            prev_obj = prev_pull_request_at_ver
+
+            old_commit_ids = prev_obj.revisions
+            new_commit_ids = cur_obj.revisions
+            commit_changes = PullRequestModel()._calculate_commit_id_changes(
+                old_commit_ids, new_commit_ids)
+            c.commit_changes_summary = commit_changes
+
+            # calculate the diff for commits between versions
+            c.commit_changes = []
+            mark = lambda cs, fw: list(
+                h.itertools.izip_longest([], cs, fillvalue=fw))
+            for c_type, raw_id in mark(commit_changes.added, 'a') \
+                                + mark(commit_changes.removed, 'r') \
+                                + mark(commit_changes.common, 'c'):
+
+                if raw_id in commit_cache:
+                    commit = commit_cache[raw_id]
+                else:
+                    try:
+                        commit = commits_source_repo.get_commit(raw_id)
+                    except CommitDoesNotExistError:
+                        # in case we fail extracting still use "dummy" commit
+                        # for display in commit diff
+                        commit = h.AttributeDict(
+                            {'raw_id': raw_id,
+                             'message': 'EMPTY or MISSING COMMIT'})
+                c.commit_changes.append([c_type, commit])
+
+            # current user review statuses for each version
+            c.review_versions = {}
+            if self._rhodecode_user.user_id in allowed_reviewers:
+                for co in general_comments:
+                    if co.author.user_id == self._rhodecode_user.user_id:
+                        # each comment has a status change
+                        status = co.status_change
+                        if status:
+                            _ver_pr = status[0].comment.pull_request_version_id
+                            c.review_versions[_ver_pr] = status[0]
+
+        return self._get_template_context(c)
diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py
index c697a23f..2d344789 100644
--- a/rhodecode/controllers/pullrequests.py
+++ b/rhodecode/controllers/pullrequests.py
@@ -282,8 +282,9 @@ class PullrequestsController(BaseRepoController):
             h.flash(msg, category='error')
             return redirect(url('pullrequest_home', repo_name=repo_name))
 
-        return redirect(url('pullrequest_show', repo_name=target_repo,
-                            pull_request_id=pull_request.pull_request_id))
+        raise HTTPFound(
+            h.route_path('pullrequest_show', repo_name=target_repo,
+                         pull_request_id=pull_request.pull_request_id))
 
     @LoginRequired()
     @NotAnonymous()
@@ -420,10 +421,10 @@ class PullrequestsController(BaseRepoController):
                 scm=pull_request.target_repo.repo_type)
             self._merge_pull_request(pull_request, user, extras)
 
-        return redirect(url(
-            'pullrequest_show',
-            repo_name=pull_request.target_repo.repo_name,
-            pull_request_id=pull_request.pull_request_id))
+        raise HTTPFound(
+            h.route_path('pullrequest_show',
+                         repo_name=pull_request.target_repo.repo_name,
+                         pull_request_id=pull_request.pull_request_id))
 
     def _merge_pull_request(self, pull_request, user, extras):
         merge_resp = PullRequestModel().merge(
@@ -964,8 +965,10 @@ class PullrequestsController(BaseRepoController):
         Session().commit()
 
         if not request.is_xhr:
-            return redirect(h.url('pullrequest_show', repo_name=repo_name,
-                                  pull_request_id=pull_request_id))
+            raise HTTPFound(
+                h.route_path('pullrequest_show',
+                             repo_name=repo_name,
+                             pull_request_id=pull_request_id))
 
         data = {
             'target_id': h.safeid(h.safe_unicode(request.POST.get('f_path'))),
diff --git a/rhodecode/lib/action_parser.py b/rhodecode/lib/action_parser.py
index 6349d67e..3fd57efc 100644
--- a/rhodecode/lib/action_parser.py
+++ b/rhodecode/lib/action_parser.py
@@ -175,6 +175,7 @@ class ActionParser(object):
         return group_name
 
     def get_pull_request(self):
+        from rhodecode.lib import helpers as h
         pull_request_id = self.action_params
         if self.is_deleted():
             repo_name = self.user_log.repository_name
@@ -182,8 +183,8 @@ class ActionParser(object):
             repo_name = self.user_log.repository.repo_name
         return link_to(
             _('Pull request #%s') % pull_request_id,
-            url('pullrequest_show', repo_name=repo_name,
-                pull_request_id=pull_request_id))
+            h.route_path('pullrequest_show', repo_name=repo_name,
+                         pull_request_id=pull_request_id))
 
     def get_archive_name(self):
         archive_name = self.action_params
diff --git a/rhodecode/lib/base.py b/rhodecode/lib/base.py
index a1df8a05..7e532a98 100644
--- a/rhodecode/lib/base.py
+++ b/rhodecode/lib/base.py
@@ -330,6 +330,11 @@ def attach_context_attributes(context, request, user_id, attach_to_request=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'))
+
     # AppEnlight
     context.appenlight_enabled = str2bool(config.get('appenlight', 'false'))
     context.appenlight_api_public_key = config.get(
diff --git a/rhodecode/model/comment.py b/rhodecode/model/comment.py
index 82815b37..43a7376e 100644
--- a/rhodecode/model/comment.py
+++ b/rhodecode/model/comment.py
@@ -438,8 +438,7 @@ class CommentsModel(BaseModel):
                     pull_request_id=pull_request.pull_request_id,
                     _anchor='comment-%s' % comment.comment_id)
             else:
-                return request.route_url(
-                    'pullrequest_show',
+                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='comment-%s' % comment.comment_id)
diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py
index 90b9277b..92145885 100644
--- a/rhodecode/model/pull_request.py
+++ b/rhodecode/model/pull_request.py
@@ -997,8 +997,7 @@ class PullRequestModel(BaseModel):
                 'pull_requests_global',
                 pull_request_id=pull_request.pull_request_id,)
         else:
-            return request.route_url(
-                'pullrequest_show',
+            return request.route_url('pullrequest_show',
                 repo_name=safe_str(pull_request.target_repo.repo_name),
                 pull_request_id=pull_request.pull_request_id,)
 
@@ -1027,11 +1026,9 @@ class PullRequestModel(BaseModel):
         pr_source_repo = pull_request_obj.source_repo
         pr_target_repo = pull_request_obj.target_repo
 
-        pr_url = h.url(
-            'pullrequest_show',
+        pr_url = h.route_url('pullrequest_show',
             repo_name=pr_target_repo.repo_name,
-            pull_request_id=pull_request_obj.pull_request_id,
-            qualified=True,)
+            pull_request_id=pull_request_obj.pull_request_id,)
 
         # set some variables for email notification
         pr_target_repo_url = h.route_url(
diff --git a/rhodecode/templates/changelog/changelog_elements.mako b/rhodecode/templates/changelog/changelog_elements.mako
index 4f36b651..d3adee3e 100644
--- a/rhodecode/templates/changelog/changelog_elements.mako
+++ b/rhodecode/templates/changelog/changelog_elements.mako
@@ -23,7 +23,7 @@
     %if c.statuses.get(commit.raw_id):
       <div class="changeset-status-ico">
         %if c.statuses.get(commit.raw_id)[2]:
-          <a class="tooltip" title="${_('Commit status: %s\nClick to open associated pull request #%s') % (h.commit_status_lbl(c.statuses.get(commit.raw_id)[0]), c.statuses.get(commit.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(commit.raw_id)[3],pull_request_id=c.statuses.get(commit.raw_id)[2])}">
+          <a class="tooltip" title="${_('Commit status: %s\nClick to open associated pull request #%s') % (h.commit_status_lbl(c.statuses.get(commit.raw_id)[0]), c.statuses.get(commit.raw_id)[2])}" href="${h.route_path('pullrequest_show',repo_name=c.statuses.get(commit.raw_id)[3],pull_request_id=c.statuses.get(commit.raw_id)[2])}">
             <div class="${'flag_status %s' % c.statuses.get(commit.raw_id)[0]}"></div>
           </a>
         %else:
diff --git a/rhodecode/templates/changeset/changeset_file_comment.mako b/rhodecode/templates/changeset/changeset_file_comment.mako
index d4e51c4b..0ee5973e 100644
--- a/rhodecode/templates/changeset/changeset_file_comment.mako
+++ b/rhodecode/templates/changeset/changeset_file_comment.mako
@@ -61,7 +61,7 @@
           % else:
               <div class="status-change">
                   % if comment.pull_request:
-                      <a href="${h.url('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id)}">
+                      <a href="${h.route_path('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id)}">
                           % if comment.status_change:
                               ${_('pull request #%s') % comment.pull_request.pull_request_id}:
                           % else:
@@ -122,7 +122,7 @@
                         </a>
                       % else:
                         <div title="${_('Comment from pull request version {0}').format(pr_index_ver)}">
-                            <a href="${h.url('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id, version=comment.pull_request_version_id)}">
+                            <a href="${h.route_path('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id, version=comment.pull_request_version_id)}">
                             <code class="pr-version-num">
                                 ${'v{}'.format(pr_index_ver)}
                             </code>
diff --git a/rhodecode/templates/data_table/_dt_elements.mako b/rhodecode/templates/data_table/_dt_elements.mako
index 18d5690c..c26fd812 100644
--- a/rhodecode/templates/data_table/_dt_elements.mako
+++ b/rhodecode/templates/data_table/_dt_elements.mako
@@ -299,7 +299,7 @@
 </%def>
 
 <%def name="pullrequest_name(pull_request_id, target_repo_name, short=False)">
-    <a href="${h.url('pullrequest_show',repo_name=target_repo_name,pull_request_id=pull_request_id)}">
+    <a href="${h.route_path('pullrequest_show',repo_name=target_repo_name,pull_request_id=pull_request_id)}">
       % if short:
         #${pull_request_id}
       % else:
diff --git a/rhodecode/templates/summary/summary_commits.mako b/rhodecode/templates/summary/summary_commits.mako
index d4ebe7e5..46547052 100644
--- a/rhodecode/templates/summary/summary_commits.mako
+++ b/rhodecode/templates/summary/summary_commits.mako
@@ -18,7 +18,7 @@
             %if c.statuses.get(cs.raw_id):
                 <div class="changeset-status-ico shortlog">
                     %if c.statuses.get(cs.raw_id)[2]:
-                    <a class="tooltip" title="${_('Commit status: %s\nClick to open associated pull request #%s') % (c.statuses.get(cs.raw_id)[0], c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">
+                    <a class="tooltip" title="${_('Commit status: %s\nClick to open associated pull request #%s') % (c.statuses.get(cs.raw_id)[0], c.statuses.get(cs.raw_id)[2])}" href="${h.route_path('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">
                         <div class="${'flag_status %s' % c.statuses.get(cs.raw_id)[0]}"></div>
                     </a>
                     %else:

From 91e65dd798873a0abe54c6484b2f168bfcf9e144 Mon Sep 17 00:00:00 2001
From: Marcin Lulek <mlulek@rhodecode.com>
Date: Mon, 19 Jun 2017 10:56:31 +0200
Subject: [PATCH 177/211] User: use new escaped hybrid properties for usage in
 code.

- Allows introducing the safer method of reading first/last names from users.
---
 rhodecode/model/db.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index 8643d82c..6b30a194 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -571,6 +571,16 @@ class User(Base, BaseModel):
     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
+        return h.escape(self.name)
+
+    @hybrid_property
+    def last_name(self):
+        from rhodecode.lib import helpers as h
+        return h.escape(self.lastname)
+
     @hybrid_property
     def api_key(self):
         """

From ad54b9a57d832e94fdcb09895962150a7ce0edb4 Mon Sep 17 00:00:00 2001
From: Marcin Lulek <mlulek@rhodecode.com>
Date: Mon, 19 Jun 2017 15:14:02 +0200
Subject: [PATCH 178/211] security: use new safe escaped user attributes across
 the application.

- will fix all possible XSS attack vectors.
---
 rhodecode/apps/admin/views/users.py           |  4 ++--
 rhodecode/apps/home/tests/test_home.py        |  4 ++--
 rhodecode/apps/repository/utils.py            |  4 ++--
 rhodecode/controllers/admin/user_groups.py    |  4 ++--
 rhodecode/controllers/pullrequests.py         |  3 +--
 rhodecode/lib/auth.py                         |  2 ++
 rhodecode/lib/channelstream.py                |  4 ++--
 rhodecode/lib/helpers.py                      |  8 ++++----
 rhodecode/model/db.py                         | 20 +++++++++++--------
 rhodecode/model/pull_request.py               |  4 ++--
 rhodecode/model/user.py                       |  9 +++++++--
 .../public/js/src/rhodecode/pullrequests.js   |  4 ++--
 .../admin/my_account/my_account_profile.mako  |  4 ++--
 rhodecode/templates/base/root.mako            |  4 ++--
 .../email_templates/user_registration.mako    |  4 ++--
 rhodecode/templates/users/user_profile.mako   |  4 ++--
 .../tests/functional/test_admin_gists.py      |  7 ++-----
 17 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/rhodecode/apps/admin/views/users.py b/rhodecode/apps/admin/views/users.py
index f726e2a9..40f84c59 100644
--- a/rhodecode/apps/admin/views/users.py
+++ b/rhodecode/apps/admin/views/users.py
@@ -127,8 +127,8 @@ class AdminUsersView(BaseAppView, DataGridAppView):
             users_data.append({
                 "username": h.gravatar_with_user(user.username),
                 "email": user.email,
-                "first_name": h.escape(user.name),
-                "last_name": h.escape(user.lastname),
+                "first_name": user.first_name,
+                "last_name": user.last_name,
                 "last_login": h.format_date(user.last_login),
                 "last_activity": h.format_date(user.last_activity),
                 "active": h.bool2icon(user.active),
diff --git a/rhodecode/apps/home/tests/test_home.py b/rhodecode/apps/home/tests/test_home.py
index a9be3b00..badda298 100644
--- a/rhodecode/apps/home/tests/test_home.py
+++ b/rhodecode/apps/home/tests/test_home.py
@@ -111,8 +111,8 @@ class TestHomeController(TestController):
         user_util.create_repo(owner=username)
 
         response = self.app.get(route_path('home'))
-        response.mustcontain(h.html_escape(h.escape(user.name)))
-        response.mustcontain(h.html_escape(h.escape(user.lastname)))
+        response.mustcontain(h.html_escape(user.first_name))
+        response.mustcontain(h.html_escape(user.last_name))
 
     @pytest.mark.parametrize("name, state", [
         ('Disabled', False),
diff --git a/rhodecode/apps/repository/utils.py b/rhodecode/apps/repository/utils.py
index 36324e38..4d905bb0 100644
--- a/rhodecode/apps/repository/utils.py
+++ b/rhodecode/apps/repository/utils.py
@@ -36,8 +36,8 @@ def reviewer_as_json(user, reasons=None, mandatory=False):
         'reasons': reasons or [],
         'mandatory': mandatory,
         'username': user.username,
-        'firstname': user.firstname,
-        'lastname': user.lastname,
+        'first_name': user.first_name,
+        'last_name': user.last_name,
         'gravatar_link': h.gravatar_url(user.email, 14),
     }
 
diff --git a/rhodecode/controllers/admin/user_groups.py b/rhodecode/controllers/admin/user_groups.py
index 73e6f154..5d834060 100644
--- a/rhodecode/controllers/admin/user_groups.py
+++ b/rhodecode/controllers/admin/user_groups.py
@@ -493,8 +493,8 @@ class UserGroupsController(BaseController):
         group_members = [
             {
                 'id': user.user_id,
-                'first_name': user.name,
-                'last_name': user.lastname,
+                'first_name': user.first_name,
+                'last_name': user.last_name,
                 'username': user.username,
                 'icon_link': h.gravatar_url(user.email, 30),
                 'value_display': h.person(user.email),
diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py
index 2d344789..55a558e0 100644
--- a/rhodecode/controllers/pullrequests.py
+++ b/rhodecode/controllers/pullrequests.py
@@ -21,8 +21,6 @@
 """
 pull requests controller for rhodecode for initializing pull requests
 """
-import types
-
 import peppercorn
 import formencode
 import logging
@@ -33,6 +31,7 @@ from pylons import request, tmpl_context as c, url
 from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
 from pyramid.threadlocal import get_current_registry
+from pyramid.httpexceptions import HTTPFound
 from sqlalchemy.sql import func
 from sqlalchemy.sql.expression import or_
 
diff --git a/rhodecode/lib/auth.py b/rhodecode/lib/auth.py
index 1ce5aaf1..b9f8d968 100644
--- a/rhodecode/lib/auth.py
+++ b/rhodecode/lib/auth.py
@@ -807,6 +807,8 @@ class AuthUser(object):
         self.ip_addr = ip_addr
         self.name = ''
         self.lastname = ''
+        self.first_name = ''
+        self.last_name = ''
         self.email = ''
         self.is_authenticated = False
         self.admin = False
diff --git a/rhodecode/lib/channelstream.py b/rhodecode/lib/channelstream.py
index 99669743..93192274 100644
--- a/rhodecode/lib/channelstream.py
+++ b/rhodecode/lib/channelstream.py
@@ -77,8 +77,8 @@ def get_user_data(user_id):
     return {
         'id': user.user_id,
         'username': user.username,
-        'first_name': user.name,
-        'last_name': user.lastname,
+        'first_name': user.first_name,
+        'last_name': user.last_name,
         'icon_link': h.gravatar_url(user.email, 60),
         'display_name': h.person(user, 'username_or_name_or_email'),
         'display_link': h.link_to_user(user),
diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py
index a6837573..2329cb1e 100644
--- a/rhodecode/lib/helpers.py
+++ b/rhodecode/lib/helpers.py
@@ -893,9 +893,9 @@ def author_string(email):
     if email:
         user = User.get_by_email(email, case_insensitive=True, cache=True)
         if user:
-            if user.firstname or user.lastname:
+            if user.first_name or user.last_name:
                 return '%s %s &lt;%s&gt;' % (
-                    escape(user.firstname), escape(user.lastname), email)
+                    user.first_name, user.last_name, email)
             else:
                 return email
         else:
@@ -1144,14 +1144,14 @@ class InitialsGravatar(object):
         # first push the email initials
         prefix, server = email_address.split('@', 1)
 
-        # check if prefix is maybe a 'firstname.lastname' syntax
+        # check if prefix is maybe a 'first_name.last_name' syntax
         _dot_split = prefix.rsplit('.', 1)
         if len(_dot_split) == 2:
             initials = [_dot_split[0][0], _dot_split[1][0]]
         else:
             initials = [prefix[0], server[0]]
 
-        # then try to replace either firtname or lastname
+        # then try to replace either first_name or last_name
         fn_letter = (first_name or " ")[0].strip()
         ln_letter = (last_name.split(' ', 1)[-1] or " ")[0].strip()
 
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index 6b30a194..a8de2d34 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -574,12 +574,16 @@ class User(Base, BaseModel):
     @hybrid_property
     def first_name(self):
         from rhodecode.lib import helpers as h
-        return h.escape(self.name)
+        if self.name:
+            return h.escape(self.name)
+        return self.name
 
     @hybrid_property
     def last_name(self):
         from rhodecode.lib import helpers as h
-        return h.escape(self.lastname)
+        if self.lastname:
+            return h.escape(self.lastname)
+        return self.lastname
 
     @hybrid_property
     def api_key(self):
@@ -700,7 +704,7 @@ class User(Base, BaseModel):
 
     @property
     def username_and_name(self):
-        return '%s (%s %s)' % (self.username, self.firstname, self.lastname)
+        return '%s (%s %s)' % (self.username, self.first_name, self.last_name)
 
     @property
     def username_or_name_or_email(self):
@@ -709,20 +713,20 @@ class User(Base, BaseModel):
 
     @property
     def full_name(self):
-        return '%s %s' % (self.firstname, self.lastname)
+        return '%s %s' % (self.first_name, self.last_name)
 
     @property
     def full_name_or_username(self):
-        return ('%s %s' % (self.firstname, self.lastname)
-                if (self.firstname and self.lastname) else self.username)
+        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.firstname, self.lastname, self.email)
+        return '%s %s <%s>' % (self.first_name, self.last_name, self.email)
 
     @property
     def short_contact(self):
-        return '%s %s' % (self.firstname, self.lastname)
+        return '%s %s' % (self.first_name, self.last_name)
 
     @property
     def is_admin(self):
diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py
index 92145885..f81c680a 100644
--- a/rhodecode/model/pull_request.py
+++ b/rhodecode/model/pull_request.py
@@ -1291,8 +1291,8 @@ class PullRequestModel(BaseModel):
             'user': {
                 'user_id': repo.user.user_id,
                 'username': repo.user.username,
-                'firstname': repo.user.firstname,
-                'lastname': repo.user.lastname,
+                'firstname': repo.user.first_name,
+                'lastname': repo.user.last_name,
                 'gravatar_link': h.gravatar_url(repo.user.email, 14),
             },
             'description': h.chop_at_smart(repo.description, '\n'),
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py
index 92a39ad0..f0a162f1 100644
--- a/rhodecode/model/user.py
+++ b/rhodecode/model/user.py
@@ -70,8 +70,8 @@ class UserModel(BaseModel):
 
         return {
             'id': user.user_id,
-            'first_name': h.escape(user.name),
-            'last_name': h.escape(user.lastname),
+            'first_name': user.first_name,
+            'last_name': user.last_name,
             'username': user.username,
             'email': user.email,
             'icon_link': h.gravatar_url(user.email, 30),
@@ -679,6 +679,11 @@ class UserModel(BaseModel):
             # TODO: johbo: Think about this and find a clean solution
             user_data = dbuser.get_dict()
             user_data.update(dbuser.get_api_data(include_secrets=True))
+            user_data.update({
+                # set explicit the safe escaped values
+                'first_name': dbuser.first_name,
+                'last_name': dbuser.last_name,
+            })
 
             for k, v in user_data.iteritems():
                 # properties of auth user we dont update
diff --git a/rhodecode/public/js/src/rhodecode/pullrequests.js b/rhodecode/public/js/src/rhodecode/pullrequests.js
index 517ed29e..732a5db8 100644
--- a/rhodecode/public/js/src/rhodecode/pullrequests.js
+++ b/rhodecode/public/js/src/rhodecode/pullrequests.js
@@ -227,8 +227,8 @@ ReviewersController = function () {
                 for (var i = 0; i < data.reviewers.length; i++) {
                   var reviewer = data.reviewers[i];
                   self.addReviewMember(
-                      reviewer.user_id, reviewer.firstname,
-                      reviewer.lastname, reviewer.username,
+                      reviewer.user_id, reviewer.first_name,
+                      reviewer.last_name, reviewer.username,
                       reviewer.gravatar_link, reviewer.reasons,
                       reviewer.mandatory);
                 }
diff --git a/rhodecode/templates/admin/my_account/my_account_profile.mako b/rhodecode/templates/admin/my_account/my_account_profile.mako
index a844042f..8c6694a4 100644
--- a/rhodecode/templates/admin/my_account/my_account_profile.mako
+++ b/rhodecode/templates/admin/my_account/my_account_profile.mako
@@ -32,7 +32,7 @@
                 ${_('First Name')}:
             </div>
             <div class="right-content">
-                ${c.user.firstname}
+                ${c.user.first_name}
             </div>
         </div>
         <div class="fieldset">
@@ -40,7 +40,7 @@
                 ${_('Last Name')}:
             </div>
             <div class="right-content">
-                ${c.user.lastname}
+                ${c.user.last_name}
             </div>
         </div>
         <div class="fieldset">
diff --git a/rhodecode/templates/base/root.mako b/rhodecode/templates/base/root.mako
index 8f5e4236..fe9145db 100644
--- a/rhodecode/templates/base/root.mako
+++ b/rhodecode/templates/base/root.mako
@@ -12,8 +12,8 @@ if getattr(c, 'rhodecode_user', None) and c.rhodecode_user.user_id:
     c.template_context['rhodecode_user']['username'] = c.rhodecode_user.username
     c.template_context['rhodecode_user']['email'] = c.rhodecode_user.email
     c.template_context['rhodecode_user']['notification_status'] = c.rhodecode_user.get_instance().user_data.get('notification_status', True)
-    c.template_context['rhodecode_user']['first_name'] = c.rhodecode_user.name
-    c.template_context['rhodecode_user']['last_name'] = c.rhodecode_user.lastname
+    c.template_context['rhodecode_user']['first_name'] = c.rhodecode_user.first_name
+    c.template_context['rhodecode_user']['last_name'] = c.rhodecode_user.last_name
 
 c.template_context['visual']['default_renderer'] = h.get_visual_attr(c, 'default_renderer')
 c.template_context['default_user'] = {
diff --git a/rhodecode/templates/email_templates/user_registration.mako b/rhodecode/templates/email_templates/user_registration.mako
index 38c21fd7..a4fffd54 100644
--- a/rhodecode/templates/email_templates/user_registration.mako
+++ b/rhodecode/templates/email_templates/user_registration.mako
@@ -10,7 +10,7 @@ RhodeCode new user registration: ${user.username}
 A new user `${user.username}` has registered on ${h.format_date(date)}
 
 - Username: ${user.username}
-- Full Name: ${user.firstname} ${user.lastname}
+- Full Name: ${user.first_name} ${user.last_name}
 - Email: ${user.email}
 - Profile link: ${h.route_url('user_profile', username=user.username)}
 
@@ -21,7 +21,7 @@ ${self.plaintext_footer()}
 <table style="text-align:left;vertical-align:middle;">
     <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;"><h4><a href="${h.route_url('user_profile', username=user.username)}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('New user %(user)s has registered on %(date)s') % {'user': user.username, 'date': h.format_date(date)}}</a></h4></td></tr>
     <tr><td style="padding-right:20px;padding-top:20px;">${_('Username')}</td><td style="line-height:1;padding-top:20px;"><img style="margin-bottom:-5px;text-align:left;border:1px solid #dbd9da" src="${h.gravatar_url(user.email, 16)}" height="16" width="16">&nbsp;${user.username}</td></tr>
-    <tr><td style="padding-right:20px;">${_('Full Name')}</td><td>${user.firstname} ${user.lastname}</td></tr>
+    <tr><td style="padding-right:20px;">${_('Full Name')}</td><td>${user.first_name} ${user.last_name}</td></tr>
     <tr><td style="padding-right:20px;">${_('Email')}</td><td>${user.email}</td></tr>
     <tr><td style="padding-right:20px;">${_('Profile')}</td><td><a href="${h.route_url('user_profile', username=user.username)}">${h.route_url('user_profile', username=user.username)}</a></td></tr>
 </table>
\ No newline at end of file
diff --git a/rhodecode/templates/users/user_profile.mako b/rhodecode/templates/users/user_profile.mako
index 2b057550..13b750b1 100644
--- a/rhodecode/templates/users/user_profile.mako
+++ b/rhodecode/templates/users/user_profile.mako
@@ -35,7 +35,7 @@
                 ${_('First name')}:
             </div>
             <div class="right-content">
-                ${c.user.firstname}
+                ${c.user.first_name}
             </div>
         </div>
         <div class="fieldset">
@@ -43,7 +43,7 @@
                 ${_('Last name')}:
             </div>
             <div class="right-content">
-                ${c.user.lastname}
+                ${c.user.last_name}
             </div>
         </div>
         <div class="fieldset">
diff --git a/rhodecode/tests/functional/test_admin_gists.py b/rhodecode/tests/functional/test_admin_gists.py
index 606beeba..1de8d777 100644
--- a/rhodecode/tests/functional/test_admin_gists.py
+++ b/rhodecode/tests/functional/test_admin_gists.py
@@ -336,9 +336,7 @@ class TestGistsController(TestController):
 
     def test_user_first_name_is_escaped(self, user_util, create_gist):
         xss_atack_string = '"><script>alert(\'First Name\')</script>'
-        xss_escaped_string = (
-            '&#34;&gt;&lt;script&gt;alert(&#39;First Name&#39;)&lt;/script'
-            '&gt;')
+        xss_escaped_string = h.html_escape(h.escape(xss_atack_string))
         password = 'test'
         user = user_util.create_user(
             firstname=xss_atack_string, password=password)
@@ -348,8 +346,7 @@ class TestGistsController(TestController):
 
     def test_user_last_name_is_escaped(self, user_util, create_gist):
         xss_atack_string = '"><script>alert(\'Last Name\')</script>'
-        xss_escaped_string = (
-            '&#34;&gt;&lt;script&gt;alert(&#39;Last Name&#39;)&lt;/script&gt;')
+        xss_escaped_string = h.html_escape(h.escape(xss_atack_string))
         password = 'test'
         user = user_util.create_user(
             lastname=xss_atack_string, password=password)

From f442430df86cbe9565f5e31be48d5357401df2c6 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 19 Jun 2017 15:30:09 +0200
Subject: [PATCH 179/211] my-account: moved emails config into pyramid views.

---
 rhodecode/apps/my_account/__init__.py         | 10 ++
 .../tests/test_my_account_emails.py           | 93 +++++++++++++++++++
 rhodecode/apps/my_account/views.py            | 63 ++++++++++++-
 rhodecode/config/routing.py                   |  7 --
 rhodecode/controllers/admin/my_account.py     | 36 -------
 .../admin/my_account/my_account.mako          |  2 +-
 .../admin/my_account/my_account_emails.mako   |  8 +-
 .../tests/functional/test_admin_my_account.py | 52 +----------
 8 files changed, 171 insertions(+), 100 deletions(-)
 create mode 100644 rhodecode/apps/my_account/tests/test_my_account_emails.py

diff --git a/rhodecode/apps/my_account/__init__.py b/rhodecode/apps/my_account/__init__.py
index 5025147b..3b3b3fa5 100644
--- a/rhodecode/apps/my_account/__init__.py
+++ b/rhodecode/apps/my_account/__init__.py
@@ -46,6 +46,16 @@ def includeme(config):
         name='my_account_auth_tokens_delete',
         pattern=ADMIN_PREFIX + '/my_account/auth_tokens/delete')
 
+    config.add_route(
+        name='my_account_emails',
+        pattern=ADMIN_PREFIX + '/my_account/emails')
+    config.add_route(
+        name='my_account_emails_add',
+        pattern=ADMIN_PREFIX + '/my_account/emails/new')
+    config.add_route(
+        name='my_account_emails_delete',
+        pattern=ADMIN_PREFIX + '/my_account/emails/delete')
+
     # channelstream test
     config.add_route(
         name='my_account_notifications_test_channelstream',
diff --git a/rhodecode/apps/my_account/tests/test_my_account_emails.py b/rhodecode/apps/my_account/tests/test_my_account_emails.py
new file mode 100644
index 00000000..4b690ebe
--- /dev/null
+++ b/rhodecode/apps/my_account/tests/test_my_account_emails.py
@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2017 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
+
+from rhodecode.apps._base import ADMIN_PREFIX
+from rhodecode.model.db import User, UserEmailMap
+from rhodecode.tests import (
+    TestController, TEST_USER_ADMIN_LOGIN, TEST_USER_REGULAR_EMAIL,
+    assert_session_flash)
+from rhodecode.tests.fixture import Fixture
+
+fixture = Fixture()
+
+
+def route_path(name, **kwargs):
+    return {
+        'my_account_emails':
+            ADMIN_PREFIX + '/my_account/emails',
+        'my_account_emails_add':
+            ADMIN_PREFIX + '/my_account/emails/new',
+        'my_account_emails_delete':
+            ADMIN_PREFIX + '/my_account/emails/delete',
+    }[name].format(**kwargs)
+
+
+class TestMyAccountEmails(TestController):
+    def test_my_account_my_emails(self):
+        self.log_user()
+        response = self.app.get(route_path('my_account_emails'))
+        response.mustcontain('No additional emails specified')
+
+    def test_my_account_my_emails_add_existing_email(self):
+        self.log_user()
+        response = self.app.get(route_path('my_account_emails'))
+        response.mustcontain('No additional emails specified')
+        response = self.app.post(route_path('my_account_emails_add'),
+                                 {'new_email': TEST_USER_REGULAR_EMAIL,
+                                  'csrf_token': self.csrf_token})
+        assert_session_flash(response, 'This e-mail address is already taken')
+
+    def test_my_account_my_emails_add_mising_email_in_form(self):
+        self.log_user()
+        response = self.app.get(route_path('my_account_emails'))
+        response.mustcontain('No additional emails specified')
+        response = self.app.post(route_path('my_account_emails_add'),
+                                 {'csrf_token': self.csrf_token})
+        assert_session_flash(response, 'Please enter an email address')
+
+    def test_my_account_my_emails_add_remove(self):
+        self.log_user()
+        response = self.app.get(route_path('my_account_emails'))
+        response.mustcontain('No additional emails specified')
+
+        response = self.app.post(route_path('my_account_emails_add'),
+                                 {'new_email': 'foo@barz.com',
+                                  'csrf_token': self.csrf_token})
+
+        response = self.app.get(route_path('my_account_emails'))
+
+        email_id = UserEmailMap.query().filter(
+            UserEmailMap.user == User.get_by_username(
+                TEST_USER_ADMIN_LOGIN)).filter(
+            UserEmailMap.email == 'foo@barz.com').one().email_id
+
+        response.mustcontain('foo@barz.com')
+        response.mustcontain('<input id="del_email_id" name="del_email_id" '
+                             'type="hidden" value="%s" />' % email_id)
+
+        response = self.app.post(
+            route_path('my_account_emails_delete'), {
+                'del_email_id': email_id,
+                'csrf_token': self.csrf_token})
+        assert_session_flash(response, 'Email successfully deleted')
+        response = self.app.get(route_path('my_account_emails'))
+        response.mustcontain('No additional emails specified')
diff --git a/rhodecode/apps/my_account/views.py b/rhodecode/apps/my_account/views.py
index 5287a67b..12473d42 100644
--- a/rhodecode/apps/my_account/views.py
+++ b/rhodecode/apps/my_account/views.py
@@ -21,6 +21,7 @@
 import logging
 import datetime
 
+import formencode
 from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config
 
@@ -32,6 +33,7 @@ from rhodecode.lib.channelstream import channelstream_request, \
     ChannelstreamException
 from rhodecode.lib.utils2 import safe_int, md5
 from rhodecode.model.auth_token import AuthTokenModel
+from rhodecode.model.db import UserEmailMap
 from rhodecode.model.meta import Session
 from rhodecode.model.user import UserModel
 from rhodecode.model.validation_schema.schemas import user_schema
@@ -161,7 +163,7 @@ class MyAccountView(BaseAppView):
     @NotAnonymous()
     @CSRFRequired()
     @view_config(
-        route_name='my_account_auth_tokens_add', request_method='POST')
+        route_name='my_account_auth_tokens_add', request_method='POST',)
     def my_account_auth_tokens_add(self):
         _ = self.request.translate
         c = self.load_default_context()
@@ -196,6 +198,65 @@ class MyAccountView(BaseAppView):
 
         return HTTPFound(h.route_path('my_account_auth_tokens'))
 
+    @LoginRequired()
+    @NotAnonymous()
+    @view_config(
+        route_name='my_account_emails', request_method='GET',
+        renderer='rhodecode:templates/admin/my_account/my_account.mako')
+    def my_account_emails(self):
+        _ = self.request.translate
+
+        c = self.load_default_context()
+        c.active = 'emails'
+
+        c.user_email_map = UserEmailMap.query()\
+            .filter(UserEmailMap.user == c.user).all()
+        return self._get_template_context(c)
+
+    @LoginRequired()
+    @NotAnonymous()
+    @CSRFRequired()
+    @view_config(
+        route_name='my_account_emails_add', request_method='POST')
+    def my_account_emails_add(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+
+        email = self.request.POST.get('new_email')
+
+        try:
+            UserModel().add_extra_email(c.user.user_id, email)
+            Session().commit()
+            h.flash(_("Added new email address `%s` for user account") % email,
+                    category='success')
+        except formencode.Invalid as error:
+            msg = error.error_dict['email']
+            h.flash(msg, category='error')
+        except Exception:
+            log.exception("Exception in my_account_emails")
+            h.flash(_('An error occurred during email saving'),
+                    category='error')
+        return HTTPFound(h.route_path('my_account_emails'))
+
+    @LoginRequired()
+    @NotAnonymous()
+    @CSRFRequired()
+    @view_config(
+        route_name='my_account_emails_delete', request_method='POST')
+    def my_account_emails_delete(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+
+        del_email_id = self.request.POST.get('del_email_id')
+        if del_email_id:
+
+            UserModel().delete_extra_email(
+                c.user.user_id, del_email_id)
+            Session().commit()
+            h.flash(_("Email successfully deleted"),
+                    category='success')
+        return HTTPFound(h.route_path('my_account_emails'))
+
     @LoginRequired()
     @NotAnonymous()
     @CSRFRequired()
diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py
index 3cc9c085..41a4658c 100644
--- a/rhodecode/config/routing.py
+++ b/rhodecode/config/routing.py
@@ -497,13 +497,6 @@ def make_map(config):
         m.connect('my_account_perms', '/my_account/perms',
                   action='my_account_perms', conditions={'method': ['GET']})
 
-        m.connect('my_account_emails', '/my_account/emails',
-                  action='my_account_emails', conditions={'method': ['GET']})
-        m.connect('my_account_emails', '/my_account/emails',
-                  action='my_account_emails_add', conditions={'method': ['POST']})
-        m.connect('my_account_emails', '/my_account/emails',
-                  action='my_account_emails_delete', conditions={'method': ['DELETE']})
-
         m.connect('my_account_notifications', '/my_account/notifications',
                   action='my_notifications',
                   conditions={'method': ['GET']})
diff --git a/rhodecode/controllers/admin/my_account.py b/rhodecode/controllers/admin/my_account.py
index e5413d21..e6a1e50b 100644
--- a/rhodecode/controllers/admin/my_account.py
+++ b/rhodecode/controllers/admin/my_account.py
@@ -200,42 +200,6 @@ class MyAccountController(BaseController):
 
         return render('admin/my_account/my_account.mako')
 
-    def my_account_emails(self):
-        c.active = 'emails'
-        self.__load_data()
-
-        c.user_email_map = UserEmailMap.query()\
-            .filter(UserEmailMap.user == c.user).all()
-        return render('admin/my_account/my_account.mako')
-
-    @auth.CSRFRequired()
-    def my_account_emails_add(self):
-        email = request.POST.get('new_email')
-
-        try:
-            UserModel().add_extra_email(c.rhodecode_user.user_id, email)
-            Session().commit()
-            h.flash(_("Added new email address `%s` for user account") % email,
-                    category='success')
-        except formencode.Invalid as error:
-            msg = error.error_dict['email']
-            h.flash(msg, category='error')
-        except Exception:
-            log.exception("Exception in my_account_emails")
-            h.flash(_('An error occurred during email saving'),
-                    category='error')
-        return redirect(url('my_account_emails'))
-
-    @auth.CSRFRequired()
-    def my_account_emails_delete(self):
-        email_id = request.POST.get('del_email_id')
-        user_model = UserModel()
-        user_model.delete_extra_email(c.rhodecode_user.user_id, email_id)
-        Session().commit()
-        h.flash(_("Removed email address from user account"),
-                category='success')
-        return redirect(url('my_account_emails'))
-
     def _extract_ordering(self, request):
         column_index = safe_int(request.GET.get('order[0][column]'))
         order_dir = request.GET.get('order[0][dir]', 'desc')
diff --git a/rhodecode/templates/admin/my_account/my_account.mako b/rhodecode/templates/admin/my_account/my_account.mako
index 0117d280..f0a268ec 100644
--- a/rhodecode/templates/admin/my_account/my_account.mako
+++ b/rhodecode/templates/admin/my_account/my_account.mako
@@ -34,7 +34,7 @@
           % if my_account_oauth_url:
           <li class="${'active' if c.active=='oauth' else ''}"><a href="${my_account_oauth_url}">${_('OAuth Identities')}</a></li>
           % endif
-          <li class="${'active' if c.active=='emails' else ''}"><a href="${h.url('my_account_emails')}">${_('Emails')}</a></li>
+          <li class="${'active' if c.active=='emails' else ''}"><a href="${h.route_path('my_account_emails')}">${_('Emails')}</a></li>
           <li class="${'active' if c.active=='repos' else ''}"><a href="${h.url('my_account_repos')}">${_('Repositories')}</a></li>
           <li class="${'active' if c.active=='watched' else ''}"><a href="${h.url('my_account_watched')}">${_('Watched')}</a></li>
           <li class="${'active' if c.active=='pullrequests' else ''}"><a href="${h.url('my_account_pullrequests')}">${_('Pull Requests')}</a></li>
diff --git a/rhodecode/templates/admin/my_account/my_account_emails.mako b/rhodecode/templates/admin/my_account/my_account_emails.mako
index 00c2cf0a..8a9aeed7 100644
--- a/rhodecode/templates/admin/my_account/my_account_emails.mako
+++ b/rhodecode/templates/admin/my_account/my_account_emails.mako
@@ -25,10 +25,10 @@
                         <span class="user email">${em.email}</span>
                     </td>
                     <td class="td-action">
-                        ${h.secure_form(url('my_account_emails'),method='delete')}
+                        ${h.secure_form(h.route_path('my_account_emails_delete'), method='POST')}
                             ${h.hidden('del_email_id',em.email_id)}
-                            <button class="btn btn-link btn-danger" type="submit" id="remove_email_%s" % em.email_id
-                                    onclick="return confirm('${_('Confirm to delete this email: %s') % em.email}');">
+                            <button class="btn btn-link btn-danger" type="submit" id="${'remove_email_%s'.format(em.email_id)}"
+                                    onclick="return confirm('${_('Confirm to delete this email: {}').format(em.email)}');">
                                 ${_('Delete')}
                             </button>
                         ${h.end_form()}
@@ -48,7 +48,7 @@
         </div>
 
         <div>
-            ${h.secure_form(url('my_account_emails'), method='post')}
+            ${h.secure_form(h.route_path('my_account_emails_add'), method='POST')}
             <div class="form">
                 <!-- fields -->
                 <div class="fields">
diff --git a/rhodecode/tests/functional/test_admin_my_account.py b/rhodecode/tests/functional/test_admin_my_account.py
index 9686b2fa..385b05b4 100644
--- a/rhodecode/tests/functional/test_admin_my_account.py
+++ b/rhodecode/tests/functional/test_admin_my_account.py
@@ -23,8 +23,7 @@ import pytest
 from rhodecode.lib import helpers as h
 from rhodecode.model.db import User, UserFollowing, Repository
 from rhodecode.tests import (
-    TestController, url, TEST_USER_ADMIN_LOGIN, TEST_USER_REGULAR_EMAIL,
-    assert_session_flash)
+    TestController, url, TEST_USER_ADMIN_LOGIN, assert_session_flash)
 from rhodecode.tests.fixture import Fixture
 from rhodecode.tests.utils import AssertResponse
 
@@ -90,56 +89,7 @@ class TestMyAccountController(TestController):
         response.mustcontain('"name_raw": %s' % pr.pull_request_id)
         response.mustcontain('TestMyAccountPR')
 
-    def test_my_account_my_emails(self):
-        self.log_user()
-        response = self.app.get(url('my_account_emails'))
-        response.mustcontain('No additional emails specified')
 
-    def test_my_account_my_emails_add_existing_email(self):
-        self.log_user()
-        response = self.app.get(url('my_account_emails'))
-        response.mustcontain('No additional emails specified')
-        response = self.app.post(url('my_account_emails'),
-                                 {'new_email': TEST_USER_REGULAR_EMAIL,
-                                  'csrf_token': self.csrf_token})
-        assert_session_flash(response, 'This e-mail address is already taken')
-
-    def test_my_account_my_emails_add_mising_email_in_form(self):
-        self.log_user()
-        response = self.app.get(url('my_account_emails'))
-        response.mustcontain('No additional emails specified')
-        response = self.app.post(url('my_account_emails'),
-                                 {'csrf_token': self.csrf_token})
-        assert_session_flash(response, 'Please enter an email address')
-
-    def test_my_account_my_emails_add_remove(self):
-        self.log_user()
-        response = self.app.get(url('my_account_emails'))
-        response.mustcontain('No additional emails specified')
-
-        response = self.app.post(url('my_account_emails'),
-                                 {'new_email': 'foo@barz.com',
-                                  'csrf_token': self.csrf_token})
-
-        response = self.app.get(url('my_account_emails'))
-
-        from rhodecode.model.db import UserEmailMap
-        email_id = UserEmailMap.query().filter(
-            UserEmailMap.user == User.get_by_username(
-                TEST_USER_ADMIN_LOGIN)).filter(
-                    UserEmailMap.email == 'foo@barz.com').one().email_id
-
-        response.mustcontain('foo@barz.com')
-        response.mustcontain('<input id="del_email_id" name="del_email_id" '
-                             'type="hidden" value="%s" />' % email_id)
-
-        response = self.app.post(
-            url('my_account_emails'), {
-                'del_email_id': email_id, '_method': 'delete',
-                'csrf_token': self.csrf_token})
-        assert_session_flash(response, 'Removed email address from user account')
-        response = self.app.get(url('my_account_emails'))
-        response.mustcontain('No additional emails specified')
 
     @pytest.mark.parametrize(
         "name, attrs", [

From cc531629819742e87cf057cab30b2ea2192e2133 Mon Sep 17 00:00:00 2001
From: Marcin Lulek <mlulek@rhodecode.com>
Date: Mon, 19 Jun 2017 18:15:57 +0200
Subject: [PATCH 180/211] security: use 404 instead of 403 code on permission
 decorator to prevent resource discovery attacks.

---
 rhodecode/lib/auth.py                             | 6 +++---
 rhodecode/tests/functional/test_admin_settings.py | 6 +++---
 rhodecode/tests/functional/test_forks.py          | 2 +-
 rhodecode/tests/functional/test_integrations.py   | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/rhodecode/lib/auth.py b/rhodecode/lib/auth.py
index b9f8d968..6d237c0b 100644
--- a/rhodecode/lib/auth.py
+++ b/rhodecode/lib/auth.py
@@ -34,7 +34,7 @@ import traceback
 from functools import wraps
 
 import ipaddress
-from pyramid.httpexceptions import HTTPForbidden, HTTPFound
+from pyramid.httpexceptions import HTTPForbidden, HTTPFound, HTTPNotFound
 from pylons.i18n.translation import _
 # NOTE(marcink): this has to be removed only after pyramid migration,
 # replace with _ = request.translate
@@ -1415,8 +1415,8 @@ class PermsDecorator(object):
                     h.route_path('login', _query={'came_from': came_from}))
 
             else:
-                # redirect with forbidden ret code
-                raise HTTPForbidden()
+                # redirect with 404 to prevent resource discovery
+                raise HTTPNotFound()
 
     def check_permissions(self, user):
         """Dummy function for overriding"""
diff --git a/rhodecode/tests/functional/test_admin_settings.py b/rhodecode/tests/functional/test_admin_settings.py
index 33847664..4d58af62 100644
--- a/rhodecode/tests/functional/test_admin_settings.py
+++ b/rhodecode/tests/functional/test_admin_settings.py
@@ -462,7 +462,7 @@ class TestOpenSourceLicenses(object):
             '.panel-heading', 'Licenses of Third Party Packages')
 
     def test_forbidden_when_normal_user(self, autologin_regular_user):
-        self.app.get(self._get_url(), status=403)
+        self.app.get(self._get_url(), status=404)
 
 
 @pytest.mark.usefixtures('app')
@@ -475,7 +475,7 @@ class TestUserSessions(object):
         }[name]
 
     def test_forbidden_when_normal_user(self, autologin_regular_user):
-        self.app.get(self._get_url(), status=403)
+        self.app.get(self._get_url(), status=404)
 
     def test_show_sessions_page(self, autologin_user):
         response = self.app.get(self._get_url(), status=200)
@@ -502,7 +502,7 @@ class TestAdminSystemInfo(object):
         }[name]
 
     def test_forbidden_when_normal_user(self, autologin_regular_user):
-        self.app.get(self._get_url(), status=403)
+        self.app.get(self._get_url(), status=404)
 
     def test_system_info_page(self, autologin_user):
         response = self.app.get(self._get_url())
diff --git a/rhodecode/tests/functional/test_forks.py b/rhodecode/tests/functional/test_forks.py
index b5f1466e..58ecff1f 100644
--- a/rhodecode/tests/functional/test_forks.py
+++ b/rhodecode/tests/functional/test_forks.py
@@ -75,7 +75,7 @@ class _BaseTest(TestController):
         repo_name = self.REPO
         self.app.post(
             url(controller='forks', action='fork_create', repo_name=repo_name),
-            {'csrf_token': self.csrf_token}, status=403)
+            {'csrf_token': self.csrf_token}, status=404)
 
     def test_index_with_fork(self):
         self.log_user()
diff --git a/rhodecode/tests/functional/test_integrations.py b/rhodecode/tests/functional/test_integrations.py
index ebde5aff..aad85e41 100644
--- a/rhodecode/tests/functional/test_integrations.py
+++ b/rhodecode/tests/functional/test_integrations.py
@@ -214,7 +214,7 @@ def _post_integration_test_helper(app, url, csrf_token, repo, repo_group,
     checks if the redirect url is correct.
     """
 
-    app.post(url, params={}, status=403) # missing csrf check
+    app.post(url, params={}, status=403)  # missing csrf check
     response = app.post(url, params={'csrf_token': csrf_token})
     assert response.status_code == 200
     assert 'Errors exist' in response.body

From e919908333599841f0d7505d36f3e6975bc23285 Mon Sep 17 00:00:00 2001
From: Marcin Lulek <mlulek@rhodecode.com>
Date: Mon, 19 Jun 2017 21:15:37 +0200
Subject: [PATCH 181/211] security: make sure the admin of repo can only delete
 comments which are from the same repo.

- fixes IDOR issue
- protects against other people comment deletion by repo admins.
---
 rhodecode/controllers/changeset.py            | 12 ++++++---
 rhodecode/controllers/pullrequests.py         | 27 +++++++++++--------
 .../tests/functional/test_pullrequests.py     | 21 ++++++++-------
 3 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/rhodecode/controllers/changeset.py b/rhodecode/controllers/changeset.py
index 42f04359..772afb72 100644
--- a/rhodecode/controllers/changeset.py
+++ b/rhodecode/controllers/changeset.py
@@ -40,7 +40,7 @@ from rhodecode.lib.compat import OrderedDict
 from rhodecode.lib.exceptions import StatusChangeOnClosedPullRequestError
 import rhodecode.lib.helpers as h
 from rhodecode.lib.utils import jsonify
-from rhodecode.lib.utils2 import safe_unicode
+from rhodecode.lib.utils2 import safe_unicode, safe_int
 from rhodecode.lib.vcs.backends.base import EmptyCommit
 from rhodecode.lib.vcs.exceptions import (
     RepositoryError, CommitDoesNotExistError, NodeDoesNotExistError)
@@ -431,15 +431,19 @@ class ChangesetController(BaseRepoController):
     @auth.CSRFRequired()
     @jsonify
     def delete_comment(self, repo_name, comment_id):
-        comment = ChangesetComment.get(comment_id)
+        comment = ChangesetComment.get_or_404(safe_int(comment_id))
         if not comment:
             log.debug('Comment with id:%s not found, skipping', comment_id)
             # comment already deleted in another call probably
             return True
 
-        owner = (comment.author.user_id == c.rhodecode_user.user_id)
         is_repo_admin = h.HasRepoPermissionAny('repository.admin')(c.repo_name)
-        if h.HasPermissionAny('hg.admin')() or is_repo_admin or owner:
+        super_admin = h.HasPermissionAny('hg.admin')()
+        comment_owner = (comment.author.user_id == c.rhodecode_user.user_id)
+        is_repo_comment = comment.repo.repo_name == c.repo_name
+        comment_repo_admin = is_repo_admin and is_repo_comment
+
+        if super_admin or comment_owner or comment_repo_admin:
             CommentsModel().delete(comment=comment, user=c.rhodecode_user)
             Session().commit()
             return True
diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py
index 55a558e0..72fc717f 100644
--- a/rhodecode/controllers/pullrequests.py
+++ b/rhodecode/controllers/pullrequests.py
@@ -987,25 +987,30 @@ class PullrequestsController(BaseRepoController):
     @auth.CSRFRequired()
     @jsonify
     def delete_comment(self, repo_name, comment_id):
-        return self._delete_comment(comment_id)
+        comment = ChangesetComment.get_or_404(safe_int(comment_id))
+        if not comment:
+            log.debug('Comment with id:%s not found, skipping', comment_id)
+            # comment already deleted in another call probably
+            return True
 
-    def _delete_comment(self, comment_id):
-        comment_id = safe_int(comment_id)
-        co = ChangesetComment.get_or_404(comment_id)
-        if co.pull_request.is_closed():
+        if comment.pull_request.is_closed():
             # don't allow deleting comments on closed pull request
             raise HTTPForbidden()
 
-        is_owner = co.author.user_id == c.rhodecode_user.user_id
         is_repo_admin = h.HasRepoPermissionAny('repository.admin')(c.repo_name)
-        if h.HasPermissionAny('hg.admin')() or is_repo_admin or is_owner:
-            old_calculated_status = co.pull_request.calculated_review_status()
-            CommentsModel().delete(comment=co, user=c.rhodecode_user)
+        super_admin = h.HasPermissionAny('hg.admin')()
+        comment_owner = comment.author.user_id == c.rhodecode_user.user_id
+        is_repo_comment = comment.repo.repo_name == c.repo_name
+        comment_repo_admin = is_repo_admin and is_repo_comment
+
+        if super_admin or comment_owner or comment_repo_admin:
+            old_calculated_status = comment.pull_request.calculated_review_status()
+            CommentsModel().delete(comment=comment, user=c.rhodecode_user)
             Session().commit()
-            calculated_status = co.pull_request.calculated_review_status()
+            calculated_status = comment.pull_request.calculated_review_status()
             if old_calculated_status != calculated_status:
                 PullRequestModel()._trigger_pull_request_hook(
-                    co.pull_request, c.rhodecode_user, 'review_status_change')
+                    comment.pull_request, c.rhodecode_user, 'review_status_change')
             return True
         else:
             raise HTTPForbidden()
diff --git a/rhodecode/tests/functional/test_pullrequests.py b/rhodecode/tests/functional/test_pullrequests.py
index 1a103f5f..cd4ab03c 100644
--- a/rhodecode/tests/functional/test_pullrequests.py
+++ b/rhodecode/tests/functional/test_pullrequests.py
@@ -1060,6 +1060,17 @@ class TestPullrequestsControllerDelete(object):
         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):
+
+        pull_request = pr_util.create_pull_request(
+            author=user_admin.username, enable_notifications=False)
+
+        self.app.get(url(
+            controller='pullrequests', action='delete_comment',
+            repo_name=pull_request.target_repo.scm_instance().name,
+            comment_id=1024404), status=404)
+
 
 def assert_pull_request_status(pull_request, expected_status):
     status = ChangesetStatusModel().calculated_review_status(
@@ -1081,13 +1092,3 @@ def test_redirects_to_repo_summary_for_svn_repositories(backend_svn, app, action
 
     # URL adds leading slash and path doesn't have it
     assert redirected.request.path == summary_url
-
-
-def test_delete_comment_returns_404_if_comment_does_not_exist(pylonsapp):
-    # TODO: johbo: Global import not possible because models.forms blows up
-    from rhodecode.controllers.pullrequests import PullrequestsController
-    controller = PullrequestsController()
-    patcher = mock.patch(
-        'rhodecode.model.db.BaseModel.get', return_value=None)
-    with pytest.raises(HTTPNotFound), patcher:
-        controller._delete_comment(1)

From 214e9059ec066e4e5645e16361f1c477fd1d49ec Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 20 Jun 2017 00:11:36 +0200
Subject: [PATCH 182/211] my-account: moved few my account views into pyramid.

---
 rhodecode/apps/my_account/__init__.py         | 20 +++++
 .../tests/test_my_account_simple_views.py     | 76 ++++++++++++++++
 rhodecode/apps/my_account/views.py            | 88 ++++++++++++++++++-
 rhodecode/config/routing.py                   | 17 ----
 rhodecode/controllers/admin/my_account.py     | 60 +------------
 rhodecode/public/js/rhodecode/routes.js       |  8 ++
 .../admin/my_account/my_account.mako          |  8 +-
 .../my_account/my_account_notifications.mako  |  2 +-
 .../tests/functional/test_admin_my_account.py | 22 -----
 9 files changed, 197 insertions(+), 104 deletions(-)
 create mode 100644 rhodecode/apps/my_account/tests/test_my_account_simple_views.py

diff --git a/rhodecode/apps/my_account/__init__.py b/rhodecode/apps/my_account/__init__.py
index 3b3b3fa5..388f714b 100644
--- a/rhodecode/apps/my_account/__init__.py
+++ b/rhodecode/apps/my_account/__init__.py
@@ -56,6 +56,26 @@ def includeme(config):
         name='my_account_emails_delete',
         pattern=ADMIN_PREFIX + '/my_account/emails/delete')
 
+    config.add_route(
+        name='my_account_repos',
+        pattern=ADMIN_PREFIX + '/my_account/repos')
+
+    config.add_route(
+        name='my_account_watched',
+        pattern=ADMIN_PREFIX + '/my_account/watched')
+
+    config.add_route(
+        name='my_account_perms',
+        pattern=ADMIN_PREFIX + '/my_account/perms')
+
+    config.add_route(
+        name='my_account_notifications',
+        pattern=ADMIN_PREFIX + '/my_account/notifications')
+
+    config.add_route(
+        name='my_account_notifications_toggle_visibility',
+        pattern=ADMIN_PREFIX + '/my_account/toggle_visibility')
+
     # channelstream test
     config.add_route(
         name='my_account_notifications_test_channelstream',
diff --git a/rhodecode/apps/my_account/tests/test_my_account_simple_views.py b/rhodecode/apps/my_account/tests/test_my_account_simple_views.py
new file mode 100644
index 00000000..9620ac1e
--- /dev/null
+++ b/rhodecode/apps/my_account/tests/test_my_account_simple_views.py
@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2017 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
+
+from rhodecode.apps._base import ADMIN_PREFIX
+from rhodecode.model.db import User, UserEmailMap, Repository, UserFollowing
+from rhodecode.tests import (
+    TestController, TEST_USER_ADMIN_LOGIN, TEST_USER_REGULAR_EMAIL,
+    assert_session_flash)
+from rhodecode.tests.fixture import Fixture
+
+fixture = Fixture()
+
+
+def route_path(name, **kwargs):
+    return {
+        'my_account_repos':
+            ADMIN_PREFIX + '/my_account/repos',
+        'my_account_watched':
+            ADMIN_PREFIX + '/my_account/watched',
+        'my_account_perms':
+            ADMIN_PREFIX + '/my_account/perms',
+        'my_account_notifications':
+            ADMIN_PREFIX + '/my_account/notifications',
+    }[name].format(**kwargs)
+
+
+class TestMyAccountSimpleViews(TestController):
+
+    def test_my_account_my_repos(self, autologin_user):
+        response = self.app.get(route_path('my_account_repos'))
+        repos = Repository.query().filter(
+            Repository.user == User.get_by_username(
+                TEST_USER_ADMIN_LOGIN)).all()
+        for repo in repos:
+            response.mustcontain('"name_raw": "%s"' % repo.repo_name)
+
+    def test_my_account_my_watched(self, autologin_user):
+        response = self.app.get(route_path('my_account_watched'))
+
+        repos = UserFollowing.query().filter(
+            UserFollowing.user == User.get_by_username(
+                TEST_USER_ADMIN_LOGIN)).all()
+        for repo in repos:
+            response.mustcontain(
+                '"name_raw": "%s"' % repo.follows_repository.repo_name)
+
+    def test_my_account_perms(self, autologin_user):
+        response = self.app.get(route_path('my_account_perms'))
+        assert_response = response.assert_response()
+        assert assert_response.get_elements('.perm_tag.none')
+        assert assert_response.get_elements('.perm_tag.read')
+        assert assert_response.get_elements('.perm_tag.write')
+        assert assert_response.get_elements('.perm_tag.admin')
+
+    def test_my_account_notifications(self, autologin_user):
+        response = self.app.get(route_path('my_account_notifications'))
+        response.mustcontain('Test flash message')
diff --git a/rhodecode/apps/my_account/views.py b/rhodecode/apps/my_account/views.py
index 12473d42..e2af22c6 100644
--- a/rhodecode/apps/my_account/views.py
+++ b/rhodecode/apps/my_account/views.py
@@ -28,14 +28,18 @@ from pyramid.view import view_config
 from rhodecode.apps._base import BaseAppView
 from rhodecode import forms
 from rhodecode.lib import helpers as h
+from rhodecode.lib.ext_json import json
 from rhodecode.lib.auth import LoginRequired, NotAnonymous, CSRFRequired
 from rhodecode.lib.channelstream import channelstream_request, \
     ChannelstreamException
 from rhodecode.lib.utils2 import safe_int, md5
 from rhodecode.model.auth_token import AuthTokenModel
-from rhodecode.model.db import UserEmailMap
+from rhodecode.model.db import (
+    Repository, PullRequest, UserEmailMap, User, UserFollowing, joinedload)
 from rhodecode.model.meta import Session
+from rhodecode.model.scm import RepoList
 from rhodecode.model.user import UserModel
+from rhodecode.model.repo import RepoModel
 from rhodecode.model.validation_schema.schemas import user_schema
 
 log = logging.getLogger(__name__)
@@ -290,3 +294,85 @@ class MyAccountView(BaseAppView):
             return {"response": 'ERROR: {}'.format(e.__class__.__name__)}
         return {"response": 'Channelstream data sent. '
                             'You should see a new live message now.'}
+
+    def _load_my_repos_data(self, watched=False):
+        if watched:
+            admin = False
+            follows_repos = Session().query(UserFollowing)\
+                .filter(UserFollowing.user_id == self._rhodecode_user.user_id)\
+                .options(joinedload(UserFollowing.follows_repository))\
+                .all()
+            repo_list = [x.follows_repository for x in follows_repos]
+        else:
+            admin = True
+            repo_list = Repository.get_all_repos(
+                user_id=self._rhodecode_user.user_id)
+            repo_list = RepoList(repo_list, perm_set=[
+                'repository.read', 'repository.write', 'repository.admin'])
+
+        repos_data = RepoModel().get_repos_as_dict(
+            repo_list=repo_list, admin=admin)
+        # json used to render the grid
+        return json.dumps(repos_data)
+
+    @LoginRequired()
+    @NotAnonymous()
+    @view_config(
+        route_name='my_account_repos', request_method='GET',
+        renderer='rhodecode:templates/admin/my_account/my_account.mako')
+    def my_account_repos(self):
+        c = self.load_default_context()
+        c.active = 'repos'
+
+        # json used to render the grid
+        c.data = self._load_my_repos_data()
+        return self._get_template_context(c)
+
+    @LoginRequired()
+    @NotAnonymous()
+    @view_config(
+        route_name='my_account_watched', request_method='GET',
+        renderer='rhodecode:templates/admin/my_account/my_account.mako')
+    def my_account_watched(self):
+        c = self.load_default_context()
+        c.active = 'watched'
+
+        # json used to render the grid
+        c.data = self._load_my_repos_data(watched=True)
+        return self._get_template_context(c)
+
+    @LoginRequired()
+    @NotAnonymous()
+    @view_config(
+        route_name='my_account_perms', request_method='GET',
+        renderer='rhodecode:templates/admin/my_account/my_account.mako')
+    def my_account_perms(self):
+        c = self.load_default_context()
+        c.active = 'perms'
+
+        c.perm_user = c.auth_user
+        return self._get_template_context(c)
+
+    @LoginRequired()
+    @NotAnonymous()
+    @view_config(
+        route_name='my_account_notifications', request_method='GET',
+        renderer='rhodecode:templates/admin/my_account/my_account.mako')
+    def my_notifications(self):
+        c = self.load_default_context()
+        c.active = 'notifications'
+
+        return self._get_template_context(c)
+
+    @LoginRequired()
+    @NotAnonymous()
+    @CSRFRequired()
+    @view_config(
+        route_name='my_account_notifications_toggle_visibility',
+        request_method='POST', renderer='json_ext')
+    def my_notifications_toggle_visibility(self):
+        user = self._rhodecode_db_user
+        new_status = not user.user_data.get('notification_status', True)
+        user.update_userdata(notification_status=new_status)
+        Session().commit()
+        return user.user_data['notification_status']
\ No newline at end of file
diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py
index 41a4658c..3b33cd98 100644
--- a/rhodecode/config/routing.py
+++ b/rhodecode/config/routing.py
@@ -485,26 +485,9 @@ def make_map(config):
         m.connect('my_account_password', '/my_account/password',
                   action='my_account_password', conditions={'method': ['GET']})
 
-        m.connect('my_account_repos', '/my_account/repos',
-                  action='my_account_repos', conditions={'method': ['GET']})
-
-        m.connect('my_account_watched', '/my_account/watched',
-                  action='my_account_watched', conditions={'method': ['GET']})
-
         m.connect('my_account_pullrequests', '/my_account/pull_requests',
                   action='my_account_pullrequests', conditions={'method': ['GET']})
 
-        m.connect('my_account_perms', '/my_account/perms',
-                  action='my_account_perms', conditions={'method': ['GET']})
-
-        m.connect('my_account_notifications', '/my_account/notifications',
-                  action='my_notifications',
-                  conditions={'method': ['GET']})
-        m.connect('my_account_notifications_toggle_visibility',
-                  '/my_account/toggle_visibility',
-                  action='my_notifications_toggle_visibility',
-                  conditions={'method': ['POST']})
-
     # NOTIFICATION REST ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/notifications') as m:
diff --git a/rhodecode/controllers/admin/my_account.py b/rhodecode/controllers/admin/my_account.py
index e6a1e50b..16dfcf4e 100644
--- a/rhodecode/controllers/admin/my_account.py
+++ b/rhodecode/controllers/admin/my_account.py
@@ -29,26 +29,22 @@ import formencode
 from formencode import htmlfill
 from pyramid.httpexceptions import HTTPFound
 
-from pylons import request, tmpl_context as c, url
+from pylons import request, tmpl_context as c
 from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
-from sqlalchemy.orm import joinedload
 
 from rhodecode.lib import helpers as h
 from rhodecode.lib import auth
 from rhodecode.lib.auth import (
     LoginRequired, NotAnonymous, AuthUser)
 from rhodecode.lib.base import BaseController, render
-from rhodecode.lib.utils import jsonify
 from rhodecode.lib.utils2 import safe_int, str2bool
 from rhodecode.lib.ext_json import json
 
 from rhodecode.model.db import (
     Repository, PullRequest, UserEmailMap, User, UserFollowing)
 from rhodecode.model.forms import UserForm
-from rhodecode.model.scm import RepoList
 from rhodecode.model.user import UserModel
-from rhodecode.model.repo import RepoModel
 from rhodecode.model.meta import Session
 from rhodecode.model.pull_request import PullRequestModel
 from rhodecode.model.comment import CommentsModel
@@ -78,26 +74,6 @@ class MyAccountController(BaseController):
         c.auth_user = AuthUser(
             user_id=c.rhodecode_user.user_id, ip_addr=self.ip_addr)
 
-    def _load_my_repos_data(self, watched=False):
-        if watched:
-            admin = False
-            follows_repos = Session().query(UserFollowing)\
-                .filter(UserFollowing.user_id == c.rhodecode_user.user_id)\
-                .options(joinedload(UserFollowing.follows_repository))\
-                .all()
-            repo_list = [x.follows_repository for x in follows_repos]
-        else:
-            admin = True
-            repo_list = Repository.get_all_repos(
-                user_id=c.rhodecode_user.user_id)
-            repo_list = RepoList(repo_list, perm_set=[
-                'repository.read', 'repository.write', 'repository.admin'])
-
-        repos_data = RepoModel().get_repos_as_dict(
-            repo_list=repo_list, admin=admin)
-        # json used to render the grid
-        return json.dumps(repos_data)
-
     @auth.CSRFRequired()
     def my_account_update(self):
         """
@@ -177,29 +153,6 @@ class MyAccountController(BaseController):
             force_defaults=False
         )
 
-    def my_account_repos(self):
-        c.active = 'repos'
-        self.__load_data()
-
-        # json used to render the grid
-        c.data = self._load_my_repos_data()
-        return render('admin/my_account/my_account.mako')
-
-    def my_account_watched(self):
-        c.active = 'watched'
-        self.__load_data()
-
-        # json used to render the grid
-        c.data = self._load_my_repos_data(watched=True)
-        return render('admin/my_account/my_account.mako')
-
-    def my_account_perms(self):
-        c.active = 'perms'
-        self.__load_data()
-        c.perm_user = c.auth_user
-
-        return render('admin/my_account/my_account.mako')
-
     def _extract_ordering(self, request):
         column_index = safe_int(request.GET.get('order[0][column]'))
         order_dir = request.GET.get('order[0][dir]', 'desc')
@@ -280,15 +233,4 @@ class MyAccountController(BaseController):
         else:
             return json.dumps(data)
 
-    def my_notifications(self):
-        c.active = 'notifications'
-        return render('admin/my_account/my_account.mako')
 
-    @auth.CSRFRequired()
-    @jsonify
-    def my_notifications_toggle_visibility(self):
-        user = c.rhodecode_user.get_instance()
-        new_status = not user.user_data.get('notification_status', True)
-        user.update_userdata(notification_status=new_status)
-        Session().commit()
-        return user.user_data['notification_status']
diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js
index 4d237b25..18ddcba4 100644
--- a/rhodecode/public/js/rhodecode/routes.js
+++ b/rhodecode/public/js/rhodecode/routes.js
@@ -134,6 +134,14 @@ function registerRCRoutes() {
     pyroutes.register('my_account_auth_tokens', '/_admin/my_account/auth_tokens', []);
     pyroutes.register('my_account_auth_tokens_add', '/_admin/my_account/auth_tokens/new', []);
     pyroutes.register('my_account_auth_tokens_delete', '/_admin/my_account/auth_tokens/delete', []);
+    pyroutes.register('my_account_emails', '/_admin/my_account/emails', []);
+    pyroutes.register('my_account_emails_add', '/_admin/my_account/emails/new', []);
+    pyroutes.register('my_account_emails_delete', '/_admin/my_account/emails/delete', []);
+    pyroutes.register('my_account_repos', '/_admin/my_account/repos', []);
+    pyroutes.register('my_account_watched', '/_admin/my_account/watched', []);
+    pyroutes.register('my_account_perms', '/_admin/my_account/perms', []);
+    pyroutes.register('my_account_notifications', '/_admin/my_account/notifications', []);
+    pyroutes.register('my_account_notifications_toggle_visibility', '/_admin/my_account/toggle_visibility', []);
     pyroutes.register('my_account_notifications_test_channelstream', '/_admin/my_account/test_channelstream', []);
     pyroutes.register('apiv2', '/_admin/api', []);
 }
diff --git a/rhodecode/templates/admin/my_account/my_account.mako b/rhodecode/templates/admin/my_account/my_account.mako
index f0a268ec..ff8896af 100644
--- a/rhodecode/templates/admin/my_account/my_account.mako
+++ b/rhodecode/templates/admin/my_account/my_account.mako
@@ -35,11 +35,11 @@
           <li class="${'active' if c.active=='oauth' else ''}"><a href="${my_account_oauth_url}">${_('OAuth Identities')}</a></li>
           % endif
           <li class="${'active' if c.active=='emails' else ''}"><a href="${h.route_path('my_account_emails')}">${_('Emails')}</a></li>
-          <li class="${'active' if c.active=='repos' else ''}"><a href="${h.url('my_account_repos')}">${_('Repositories')}</a></li>
-          <li class="${'active' if c.active=='watched' else ''}"><a href="${h.url('my_account_watched')}">${_('Watched')}</a></li>
+          <li class="${'active' if c.active=='repos' else ''}"><a href="${h.route_path('my_account_repos')}">${_('Repositories')}</a></li>
+          <li class="${'active' if c.active=='watched' else ''}"><a href="${h.route_path('my_account_watched')}">${_('Watched')}</a></li>
           <li class="${'active' if c.active=='pullrequests' else ''}"><a href="${h.url('my_account_pullrequests')}">${_('Pull Requests')}</a></li>
-          <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('my_account_perms')}">${_('Permissions')}</a></li>
-          <li class="${'active' if c.active=='my_notifications' else ''}"><a href="${h.url('my_account_notifications')}">${_('Live Notifications')}</a></li>
+          <li class="${'active' if c.active=='perms' else ''}"><a href="${h.route_path('my_account_perms')}">${_('Permissions')}</a></li>
+          <li class="${'active' if c.active=='my_notifications' else ''}"><a href="${h.route_path('my_account_notifications')}">${_('Live Notifications')}</a></li>
         </ul>
     </div>
 
diff --git a/rhodecode/templates/admin/my_account/my_account_notifications.mako b/rhodecode/templates/admin/my_account/my_account_notifications.mako
index e71e465f..1c53e966 100644
--- a/rhodecode/templates/admin/my_account/my_account_notifications.mako
+++ b/rhodecode/templates/admin/my_account/my_account_notifications.mako
@@ -1,7 +1,7 @@
 <template is="dom-bind" id="notificationsPage">
 <iron-ajax id="toggleNotifications"
            method="post"
-           url="${url('my_account_notifications_toggle_visibility')}"
+           url="${h.route_path('my_account_notifications_toggle_visibility')}"
            content-type="application/json"
            loading="{{changeNotificationsLoading}}"
            on-response="handleNotifications"
diff --git a/rhodecode/tests/functional/test_admin_my_account.py b/rhodecode/tests/functional/test_admin_my_account.py
index 385b05b4..8b8d48e5 100644
--- a/rhodecode/tests/functional/test_admin_my_account.py
+++ b/rhodecode/tests/functional/test_admin_my_account.py
@@ -57,26 +57,6 @@ class TestMyAccountController(TestController):
 
         response.mustcontain('value="test_admin')
 
-    def test_my_account_my_repos(self):
-        self.log_user()
-        response = self.app.get(url('my_account_repos'))
-        repos = Repository.query().filter(
-            Repository.user == User.get_by_username(
-                TEST_USER_ADMIN_LOGIN)).all()
-        for repo in repos:
-            response.mustcontain('"name_raw": "%s"' % repo.repo_name)
-
-    def test_my_account_my_watched(self):
-        self.log_user()
-        response = self.app.get(url('my_account_watched'))
-
-        repos = UserFollowing.query().filter(
-            UserFollowing.user == User.get_by_username(
-                TEST_USER_ADMIN_LOGIN)).all()
-        for repo in repos:
-            response.mustcontain(
-                '"name_raw": "%s"' % repo.follows_repository.repo_name)
-
     @pytest.mark.backends("git", "hg")
     def test_my_account_my_pullrequests(self, pr_util):
         self.log_user()
@@ -89,8 +69,6 @@ class TestMyAccountController(TestController):
         response.mustcontain('"name_raw": %s' % pr.pull_request_id)
         response.mustcontain('TestMyAccountPR')
 
-
-
     @pytest.mark.parametrize(
         "name, attrs", [
             ('firstname', {'firstname': 'new_username'}),

From 37c0465603fead5aa94e1b1c5cb3997b372247b4 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 20 Jun 2017 13:23:15 +0200
Subject: [PATCH 183/211] my-account: use audit logs for email and token
 actions.

---
 .../tests/test_my_account_auth_tokens.py      |  2 +-
 rhodecode/apps/my_account/views.py            | 30 ++++++++++++++++---
 rhodecode/model/auth_token.py                 | 12 ++++----
 rhodecode/model/db.py                         | 13 ++++++++
 .../my_account/my_account_auth_tokens.mako    |  4 +--
 5 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/rhodecode/apps/my_account/tests/test_my_account_auth_tokens.py b/rhodecode/apps/my_account/tests/test_my_account_auth_tokens.py
index 88abf0b0..7bba9c18 100644
--- a/rhodecode/apps/my_account/tests/test_my_account_auth_tokens.py
+++ b/rhodecode/apps/my_account/tests/test_my_account_auth_tokens.py
@@ -103,7 +103,7 @@ class TestMyAccountAuthTokens(TestController):
 
         response = self.app.post(
             route_path('my_account_auth_tokens_delete'),
-            {'del_auth_token': keys[0].api_key, 'csrf_token': self.csrf_token})
+            {'del_auth_token': keys[0].user_api_key_id, 'csrf_token': self.csrf_token})
         assert_session_flash(response, 'Auth token successfully deleted')
 
         user = User.get(user_id)
diff --git a/rhodecode/apps/my_account/views.py b/rhodecode/apps/my_account/views.py
index e2af22c6..7afa6271 100644
--- a/rhodecode/apps/my_account/views.py
+++ b/rhodecode/apps/my_account/views.py
@@ -28,6 +28,7 @@ from pyramid.view import view_config
 from rhodecode.apps._base import BaseAppView
 from rhodecode import forms
 from rhodecode.lib import helpers as h
+from rhodecode.lib import audit_logger
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.auth import LoginRequired, NotAnonymous, CSRFRequired
 from rhodecode.lib.channelstream import channelstream_request, \
@@ -35,7 +36,7 @@ from rhodecode.lib.channelstream import channelstream_request, \
 from rhodecode.lib.utils2 import safe_int, md5
 from rhodecode.model.auth_token import AuthTokenModel
 from rhodecode.model.db import (
-    Repository, PullRequest, UserEmailMap, User, UserFollowing, joinedload)
+    Repository, UserEmailMap, UserApiKeys, UserFollowing, joinedload)
 from rhodecode.model.meta import Session
 from rhodecode.model.scm import RepoList
 from rhodecode.model.user import UserModel
@@ -178,7 +179,13 @@ class MyAccountView(BaseAppView):
 
         token = AuthTokenModel().create(
             c.user.user_id, description, lifetime, role)
+        token_data = token.get_api_data()
+
         self.maybe_attach_token_scope(token)
+        audit_logger.store(
+            action='user.edit.token.add',
+            action_data={'data': {'token': token_data}},
+            user=self._rhodecode_user, )
         Session().commit()
 
         h.flash(_("Auth token successfully created"), category='success')
@@ -196,7 +203,14 @@ class MyAccountView(BaseAppView):
         del_auth_token = self.request.POST.get('del_auth_token')
 
         if del_auth_token:
+            token = UserApiKeys.get_or_404(del_auth_token, pyramid_exc=True)
+            token_data = token.get_api_data()
+
             AuthTokenModel().delete(del_auth_token, c.user.user_id)
+            audit_logger.store(
+                action='user.edit.token.delete',
+                action_data={'data': {'token': token_data}},
+                user=self._rhodecode_user,)
             Session().commit()
             h.flash(_("Auth token successfully deleted"), category='success')
 
@@ -230,6 +244,11 @@ class MyAccountView(BaseAppView):
 
         try:
             UserModel().add_extra_email(c.user.user_id, email)
+            audit_logger.store(
+                action='user.edit.email.add',
+                action_data={'data': {'email': email}},
+                user=self._rhodecode_user,)
+
             Session().commit()
             h.flash(_("Added new email address `%s` for user account") % email,
                     category='success')
@@ -253,9 +272,12 @@ class MyAccountView(BaseAppView):
 
         del_email_id = self.request.POST.get('del_email_id')
         if del_email_id:
-
-            UserModel().delete_extra_email(
-                c.user.user_id, del_email_id)
+            email = UserEmailMap.get_or_404(del_email_id, pyramid_exc=True).email
+            UserModel().delete_extra_email(c.user.user_id, del_email_id)
+            audit_logger.store(
+                action='user.edit.email.delete',
+                action_data={'data': {'email': email}},
+                user=self._rhodecode_user,)
             Session().commit()
             h.flash(_("Email successfully deleted"),
                     category='success')
diff --git a/rhodecode/model/auth_token.py b/rhodecode/model/auth_token.py
index e8883070..6b8467fc 100644
--- a/rhodecode/model/auth_token.py
+++ b/rhodecode/model/auth_token.py
@@ -59,20 +59,20 @@ class AuthTokenModel(BaseModel):
 
         return new_auth_token
 
-    def delete(self, api_key, user=None):
+    def delete(self, auth_token_id, user=None):
         """
         Deletes given api_key, if user is set it also filters the object for
         deletion by given user.
         """
-        api_key = UserApiKeys.query().filter(UserApiKeys.api_key == api_key)
+        auth_token = UserApiKeys.query().filter(
+            UserApiKeys.user_api_key_id == auth_token_id)
 
         if user:
             user = self._get_user(user)
-            api_key = api_key.filter(UserApiKeys.user_id == user.user_id)
-
-        api_key = api_key.scalar()
+            auth_token = auth_token.filter(UserApiKeys.user_id == user.user_id)
+            auth_token = auth_token.scalar()
         try:
-            Session().delete(api_key)
+            Session().delete(auth_token)
         except Exception:
             log.error(traceback.format_exc())
             raise
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index a8de2d34..3b6b444b 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -1018,6 +1018,14 @@ class UserApiKeys(Base, BaseModel):
         }
         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
+
     @property
     def expired(self):
         if self.expires == -1:
@@ -1049,6 +1057,11 @@ class UserApiKeys(Base, BaseModel):
     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'
diff --git a/rhodecode/templates/admin/my_account/my_account_auth_tokens.mako b/rhodecode/templates/admin/my_account/my_account_auth_tokens.mako
index 4daa2dc3..43a5fd2b 100644
--- a/rhodecode/templates/admin/my_account/my_account_auth_tokens.mako
+++ b/rhodecode/templates/admin/my_account/my_account_auth_tokens.mako
@@ -43,9 +43,9 @@
                 </td>
                 <td class="td-action">
                     ${h.secure_form(h.route_path('my_account_auth_tokens_delete'), method='post')}
-                        ${h.hidden('del_auth_token',auth_token.api_key)}
+                        ${h.hidden('del_auth_token', auth_token.user_api_key_id)}
                         <button class="btn btn-link btn-danger" type="submit"
-                                onclick="return confirm('${_('Confirm to remove this auth token: %s') % auth_token.api_key}');">
+                                onclick="return confirm('${_('Confirm to remove this auth token: %s') % auth_token.token_obfuscated}');">
                             ${_('Delete')}
                         </button>
                     ${h.end_form()}

From effa0f53ce32c817d44d3b1c9454195f2cc0a981 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 20 Jun 2017 13:53:44 +0200
Subject: [PATCH 184/211] users-admin: moved views into pyramid for editing
 emails and ips.

- added audit-logging
- added few additional tests
---
 rhodecode/apps/admin/__init__.py              |  27 +++
 .../apps/admin/tests/test_admin_users.py      | 143 +++++++++++-
 rhodecode/apps/admin/views/users.py           | 219 +++++++++++++++++-
 rhodecode/config/routing.py                   |  13 --
 rhodecode/controllers/admin/users.py          | 150 ------------
 rhodecode/public/js/rhodecode/routes.js       |   7 +
 .../admin/permissions/permissions_ips.mako    |   4 +-
 .../templates/admin/users/user_edit.mako      |   4 +-
 .../admin/users/user_edit_auth_tokens.mako    |   8 +-
 .../admin/users/user_edit_emails.mako         |   6 +-
 .../templates/admin/users/user_edit_ips.mako  |   8 +-
 .../functional/test_admin_permissions.py      |  30 ++-
 .../tests/functional/test_admin_users.py      |  63 -----
 13 files changed, 426 insertions(+), 256 deletions(-)

diff --git a/rhodecode/apps/admin/__init__.py b/rhodecode/apps/admin/__init__.py
index fbaf3fd6..47d992a7 100644
--- a/rhodecode/apps/admin/__init__.py
+++ b/rhodecode/apps/admin/__init__.py
@@ -64,6 +64,11 @@ def admin_routes(config):
         name='admin_settings_sessions_cleanup',
         pattern='/settings/sessions/cleanup')
 
+    # global permissions
+    config.add_route(
+        name='admin_permissions_ips',
+        pattern='/permissions/ips')
+
     # users admin
     config.add_route(
         name='users',
@@ -84,6 +89,28 @@ def admin_routes(config):
         name='edit_user_auth_tokens_delete',
         pattern='/users/{user_id:\d+}/edit/auth_tokens/delete')
 
+    # user emails
+    config.add_route(
+        name='edit_user_emails',
+        pattern='/users/{user_id:\d+}/edit/emails')
+    config.add_route(
+        name='edit_user_emails_add',
+        pattern='/users/{user_id:\d+}/edit/emails/new')
+    config.add_route(
+        name='edit_user_emails_delete',
+        pattern='/users/{user_id:\d+}/edit/emails/delete')
+
+    # user IPs
+    config.add_route(
+        name='edit_user_ips',
+        pattern='/users/{user_id:\d+}/edit/ips')
+    config.add_route(
+        name='edit_user_ips_add',
+        pattern='/users/{user_id:\d+}/edit/ips/new')
+    config.add_route(
+        name='edit_user_ips_delete',
+        pattern='/users/{user_id:\d+}/edit/ips/delete')
+
     # user groups management
     config.add_route(
         name='edit_user_groups_management',
diff --git a/rhodecode/apps/admin/tests/test_admin_users.py b/rhodecode/apps/admin/tests/test_admin_users.py
index 76664a89..52fc143f 100644
--- a/rhodecode/apps/admin/tests/test_admin_users.py
+++ b/rhodecode/apps/admin/tests/test_admin_users.py
@@ -20,7 +20,9 @@
 
 import pytest
 
-from rhodecode.model.db import User, UserApiKeys
+from rhodecode.model.db import User, UserApiKeys, UserEmailMap
+from rhodecode.model.meta import Session
+from rhodecode.model.user import UserModel
 
 from rhodecode.tests import (
     TestController, TEST_USER_REGULAR_LOGIN, assert_session_flash)
@@ -44,6 +46,20 @@ def route_path(name, params=None, **kwargs):
             ADMIN_PREFIX + '/users/{user_id}/edit/auth_tokens/new',
         'edit_user_auth_tokens_delete':
             ADMIN_PREFIX + '/users/{user_id}/edit/auth_tokens/delete',
+
+        'edit_user_emails':
+            ADMIN_PREFIX + '/users/{user_id}/edit/emails',
+        'edit_user_emails_add':
+            ADMIN_PREFIX + '/users/{user_id}/edit/emails/new',
+        'edit_user_emails_delete':
+            ADMIN_PREFIX + '/users/{user_id}/edit/emails/delete',
+
+        'edit_user_ips':
+            ADMIN_PREFIX + '/users/{user_id}/edit/ips',
+        'edit_user_ips_add':
+            ADMIN_PREFIX + '/users/{user_id}/edit/ips/new',
+        'edit_user_ips_delete':
+            ADMIN_PREFIX + '/users/{user_id}/edit/ips/delete',
     }[name].format(**kwargs)
 
     if params:
@@ -135,8 +151,131 @@ class TestAdminUsersView(TestController):
 
         response = self.app.post(
             route_path('edit_user_auth_tokens_delete', user_id=user_id),
-            {'del_auth_token': keys[0].api_key, 'csrf_token': self.csrf_token})
+            {'del_auth_token': keys[0].user_api_key_id,
+             'csrf_token': self.csrf_token})
 
         assert_session_flash(response, 'Auth token successfully deleted')
         keys = UserApiKeys.query().filter(UserApiKeys.user_id == user_id).all()
         assert 2 == len(keys)
+
+    def test_ips(self):
+        self.log_user()
+        user = User.get_by_username(TEST_USER_REGULAR_LOGIN)
+        response = self.app.get(route_path('edit_user_ips', user_id=user.user_id))
+        response.mustcontain('All IP addresses are allowed')
+
+    @pytest.mark.parametrize("test_name, ip, ip_range, failure", [
+        ('127/24', '127.0.0.1/24', '127.0.0.0 - 127.0.0.255', False),
+        ('10/32', '10.0.0.10/32', '10.0.0.10 - 10.0.0.10', False),
+        ('0/16', '0.0.0.0/16', '0.0.0.0 - 0.0.255.255', False),
+        ('0/8', '0.0.0.0/8', '0.0.0.0 - 0.255.255.255', False),
+        ('127_bad_mask', '127.0.0.1/99', '127.0.0.1 - 127.0.0.1', True),
+        ('127_bad_ip', 'foobar', 'foobar', True),
+    ])
+    def test_ips_add(self, user_util, test_name, ip, ip_range, failure):
+        self.log_user()
+        user = user_util.create_user(username=test_name)
+        user_id = user.user_id
+
+        response = self.app.post(
+            route_path('edit_user_ips_add', user_id=user_id),
+            params={'new_ip': ip, 'csrf_token': self.csrf_token})
+
+        if failure:
+            assert_session_flash(
+                response, 'Please enter a valid IPv4 or IpV6 address')
+            response = self.app.get(route_path('edit_user_ips', user_id=user_id))
+
+            response.mustcontain(no=[ip])
+            response.mustcontain(no=[ip_range])
+
+        else:
+            response = self.app.get(route_path('edit_user_ips', user_id=user_id))
+            response.mustcontain(ip)
+            response.mustcontain(ip_range)
+
+    def test_ips_delete(self, user_util):
+        self.log_user()
+        user = user_util.create_user()
+        user_id = user.user_id
+        ip = '127.0.0.1/32'
+        ip_range = '127.0.0.1 - 127.0.0.1'
+        new_ip = UserModel().add_extra_ip(user_id, ip)
+        Session().commit()
+        new_ip_id = new_ip.ip_id
+
+        response = self.app.get(route_path('edit_user_ips', user_id=user_id))
+        response.mustcontain(ip)
+        response.mustcontain(ip_range)
+
+        self.app.post(
+            route_path('edit_user_ips_delete', user_id=user_id),
+            params={'del_ip_id': new_ip_id, 'csrf_token': self.csrf_token})
+
+        response = self.app.get(route_path('edit_user_ips', user_id=user_id))
+        response.mustcontain('All IP addresses are allowed')
+        response.mustcontain(no=[ip])
+        response.mustcontain(no=[ip_range])
+
+    def test_emails(self):
+        self.log_user()
+        user = User.get_by_username(TEST_USER_REGULAR_LOGIN)
+        response = self.app.get(route_path('edit_user_emails', user_id=user.user_id))
+        response.mustcontain('No additional emails specified')
+
+    def test_emails_add(self, user_util):
+        self.log_user()
+        user = user_util.create_user()
+        user_id = user.user_id
+
+        self.app.post(
+            route_path('edit_user_emails_add', user_id=user_id),
+            params={'new_email': 'example@rhodecode.com',
+                    'csrf_token': self.csrf_token})
+
+        response = self.app.get(route_path('edit_user_emails', user_id=user_id))
+        response.mustcontain('example@rhodecode.com')
+
+    def test_emails_add_existing_email(self, user_util, user_regular):
+        existing_email = user_regular.email
+
+        self.log_user()
+        user = user_util.create_user()
+        user_id = user.user_id
+
+        response = self.app.post(
+            route_path('edit_user_emails_add', user_id=user_id),
+            params={'new_email': existing_email,
+                    'csrf_token': self.csrf_token})
+        assert_session_flash(
+            response, 'This e-mail address is already taken')
+
+        response = self.app.get(route_path('edit_user_emails', user_id=user_id))
+        response.mustcontain(no=[existing_email])
+
+    def test_emails_delete(self, user_util):
+        self.log_user()
+        user = user_util.create_user()
+        user_id = user.user_id
+
+        self.app.post(
+            route_path('edit_user_emails_add', user_id=user_id),
+            params={'new_email': 'example@rhodecode.com',
+                    'csrf_token': self.csrf_token})
+
+        response = self.app.get(route_path('edit_user_emails', user_id=user_id))
+        response.mustcontain('example@rhodecode.com')
+
+        user_email = UserEmailMap.query()\
+            .filter(UserEmailMap.email == 'example@rhodecode.com') \
+            .filter(UserEmailMap.user_id == user_id)\
+            .one()
+
+        del_email_id = user_email.email_id
+        self.app.post(
+            route_path('edit_user_emails_delete', user_id=user_id),
+            params={'del_email_id': del_email_id,
+                    'csrf_token': self.csrf_token})
+
+        response = self.app.get(route_path('edit_user_emails', user_id=user_id))
+        response.mustcontain(no=['example@rhodecode.com'])
\ No newline at end of file
diff --git a/rhodecode/apps/admin/views/users.py b/rhodecode/apps/admin/views/users.py
index 40f84c59..0a37c4ab 100644
--- a/rhodecode/apps/admin/views/users.py
+++ b/rhodecode/apps/admin/views/users.py
@@ -20,15 +20,16 @@
 
 import logging
 import datetime
+import formencode
 
 from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config
 from sqlalchemy.sql.functions import coalesce
 
-from rhodecode.lib.helpers import Page
-from rhodecode.lib.ext_json import json
-
 from rhodecode.apps._base import BaseAppView, DataGridAppView
+
+from rhodecode.lib import audit_logger
+from rhodecode.lib.ext_json import json
 from rhodecode.lib.auth import (
     LoginRequired, HasPermissionAllDecorator, CSRFRequired)
 from rhodecode.lib import helpers as h
@@ -37,7 +38,7 @@ from rhodecode.lib.utils2 import safe_int, safe_unicode
 from rhodecode.model.auth_token import AuthTokenModel
 from rhodecode.model.user import UserModel
 from rhodecode.model.user_group import UserGroupModel
-from rhodecode.model.db import User, or_
+from rhodecode.model.db import User, or_, UserIpMap, UserEmailMap, UserApiKeys
 from rhodecode.model.meta import Session
 
 log = logging.getLogger(__name__)
@@ -194,15 +195,23 @@ class AdminUsersView(BaseAppView, DataGridAppView):
 
         user_id = self.request.matchdict.get('user_id')
         c.user = User.get_or_404(user_id, pyramid_exc=True)
+
         self._redirect_for_default_user(c.user.username)
 
+        user_data = c.user.get_api_data()
         lifetime = safe_int(self.request.POST.get('lifetime'), -1)
         description = self.request.POST.get('description')
         role = self.request.POST.get('role')
 
         token = AuthTokenModel().create(
             c.user.user_id, description, lifetime, role)
+        token_data = token.get_api_data()
+
         self.maybe_attach_token_scope(token)
+        audit_logger.store(
+            action='user.edit.token.add',
+            action_data={'data': {'token': token_data, 'user': user_data}},
+            user=self._rhodecode_user, )
         Session().commit()
 
         h.flash(_("Auth token successfully created"), category='success')
@@ -220,16 +229,214 @@ class AdminUsersView(BaseAppView, DataGridAppView):
         user_id = self.request.matchdict.get('user_id')
         c.user = User.get_or_404(user_id, pyramid_exc=True)
         self._redirect_for_default_user(c.user.username)
+        user_data = c.user.get_api_data()
 
         del_auth_token = self.request.POST.get('del_auth_token')
 
         if del_auth_token:
+            token = UserApiKeys.get_or_404(del_auth_token, pyramid_exc=True)
+            token_data = token.get_api_data()
+
             AuthTokenModel().delete(del_auth_token, c.user.user_id)
+            audit_logger.store(
+                action='user.edit.token.delete',
+                action_data={'data': {'token': token_data, 'user': user_data}},
+                user=self._rhodecode_user,)
             Session().commit()
             h.flash(_("Auth token successfully deleted"), category='success')
 
         return HTTPFound(h.route_path('edit_user_auth_tokens', user_id=user_id))
 
+
+
+
+
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @view_config(
+        route_name='edit_user_emails', request_method='GET',
+        renderer='rhodecode:templates/admin/users/user_edit.mako')
+    def emails(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+
+        user_id = self.request.matchdict.get('user_id')
+        c.user = User.get_or_404(user_id, pyramid_exc=True)
+        self._redirect_for_default_user(c.user.username)
+
+        c.active = 'emails'
+        c.user_email_map = UserEmailMap.query() \
+            .filter(UserEmailMap.user == c.user).all()
+
+        return self._get_template_context(c)
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='edit_user_emails_add', request_method='POST')
+    def emails_add(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+
+        user_id = self.request.matchdict.get('user_id')
+        c.user = User.get_or_404(user_id, pyramid_exc=True)
+        self._redirect_for_default_user(c.user.username)
+
+        email = self.request.POST.get('new_email')
+        user_data = c.user.get_api_data()
+        try:
+            UserModel().add_extra_email(c.user.user_id, email)
+            audit_logger.store_web(
+                'user.edit.email.add',
+                action_data={'email': email, 'user': user_data},
+                user=self._rhodecode_user)
+            Session().commit()
+            h.flash(_("Added new email address `%s` for user account") % email,
+                    category='success')
+        except formencode.Invalid as error:
+            msg = error.error_dict['email']
+            h.flash(msg, category='error')
+        except Exception:
+            log.exception("Exception during email saving")
+            h.flash(_('An error occurred during email saving'),
+                    category='error')
+        raise HTTPFound(h.route_path('edit_user_emails', user_id=user_id))
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='edit_user_emails_delete', request_method='POST')
+    def emails_delete(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+
+        user_id = self.request.matchdict.get('user_id')
+        c.user = User.get_or_404(user_id, pyramid_exc=True)
+        self._redirect_for_default_user(c.user.username)
+
+        email_id = self.request.POST.get('del_email_id')
+        user_model = UserModel()
+
+        email = UserEmailMap.query().get(email_id).email
+        user_data = c.user.get_api_data()
+        user_model.delete_extra_email(c.user.user_id, email_id)
+        audit_logger.store_web(
+            'user.edit.email.delete',
+            action_data={'email': email, 'user': user_data},
+            user=self._rhodecode_user)
+        Session().commit()
+        h.flash(_("Removed email address from user account"),
+                category='success')
+        raise HTTPFound(h.route_path('edit_user_emails', user_id=user_id))
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @view_config(
+        route_name='edit_user_ips', request_method='GET',
+        renderer='rhodecode:templates/admin/users/user_edit.mako')
+    def ips(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+
+        user_id = self.request.matchdict.get('user_id')
+        c.user = User.get_or_404(user_id, pyramid_exc=True)
+        self._redirect_for_default_user(c.user.username)
+
+        c.active = 'ips'
+        c.user_ip_map = UserIpMap.query() \
+            .filter(UserIpMap.user == c.user).all()
+
+        c.inherit_default_ips = c.user.inherit_default_permissions
+        c.default_user_ip_map = UserIpMap.query() \
+            .filter(UserIpMap.user == User.get_default_user()).all()
+
+        return self._get_template_context(c)
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='edit_user_ips_add', request_method='POST')
+    def ips_add(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+
+        user_id = self.request.matchdict.get('user_id')
+        c.user = User.get_or_404(user_id, pyramid_exc=True)
+        # NOTE(marcink): this view is allowed for default users, as we can
+        # edit their IP white list
+
+        user_model = UserModel()
+        desc = self.request.POST.get('description')
+        try:
+            ip_list = user_model.parse_ip_range(
+                self.request.POST.get('new_ip'))
+        except Exception as e:
+            ip_list = []
+            log.exception("Exception during ip saving")
+            h.flash(_('An error occurred during ip saving:%s' % (e,)),
+                    category='error')
+        added = []
+        user_data = c.user.get_api_data()
+        for ip in ip_list:
+            try:
+                user_model.add_extra_ip(c.user.user_id, ip, desc)
+                audit_logger.store_web(
+                    'user.edit.ip.add',
+                    action_data={'ip': ip, 'user': user_data},
+                    user=self._rhodecode_user)
+                Session().commit()
+                added.append(ip)
+            except formencode.Invalid as error:
+                msg = error.error_dict['ip']
+                h.flash(msg, category='error')
+            except Exception:
+                log.exception("Exception during ip saving")
+                h.flash(_('An error occurred during ip saving'),
+                        category='error')
+        if added:
+            h.flash(
+                _("Added ips %s to user whitelist") % (', '.join(ip_list), ),
+                category='success')
+        if 'default_user' in self.request.POST:
+            # case for editing global IP list we do it for 'DEFAULT' user
+            raise HTTPFound(h.route_path('admin_permissions_ips'))
+        raise HTTPFound(h.route_path('edit_user_ips', user_id=user_id))
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='edit_user_ips_delete', request_method='POST')
+    def ips_delete(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+
+        user_id = self.request.matchdict.get('user_id')
+        c.user = User.get_or_404(user_id, pyramid_exc=True)
+        # NOTE(marcink): this view is allowed for default users, as we can
+        # edit their IP white list
+
+        ip_id = self.request.POST.get('del_ip_id')
+        user_model = UserModel()
+        user_data = c.user.get_api_data()
+        ip = UserIpMap.query().get(ip_id).ip_addr
+        user_model.delete_extra_ip(c.user.user_id, ip_id)
+        audit_logger.store_web(
+            'user.edit.ip.delete',
+            action_data={'ip': ip, 'user': user_data},
+            user=self._rhodecode_user)
+        Session().commit()
+        h.flash(_("Removed ip address from user whitelist"), category='success')
+
+        if 'default_user' in self.request.POST:
+            # case for editing global IP list we do it for 'DEFAULT' user
+            raise HTTPFound(h.route_path('admin_permissions_ips'))
+        raise HTTPFound(h.route_path('edit_user_ips', user_id=user_id))
+
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     @view_config(
@@ -301,8 +508,8 @@ class AdminUsersView(BaseAppView, DataGridAppView):
                 kw['filter'] = filter_term
             return self.request.current_route_path(_query=kw)
 
-        c.audit_logs = Page(user_log, page=p, items_per_page=10,
-                          url=url_generator)
+        c.audit_logs = h.Page(
+            user_log, page=p, items_per_page=10, url=url_generator)
         c.filter_term = filter_term
         return self._get_template_context(c)
 
diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py
index 3b33cd98..e56cb930 100644
--- a/rhodecode/config/routing.py
+++ b/rhodecode/config/routing.py
@@ -287,19 +287,6 @@ def make_map(config):
         m.connect('edit_user_perms_summary', '/users/{user_id}/edit/permissions_summary',
                   action='edit_perms_summary', conditions={'method': ['GET']})
 
-        m.connect('edit_user_emails', '/users/{user_id}/edit/emails',
-                  action='edit_emails', conditions={'method': ['GET']})
-        m.connect('edit_user_emails', '/users/{user_id}/edit/emails',
-                  action='add_email', conditions={'method': ['PUT']})
-        m.connect('edit_user_emails', '/users/{user_id}/edit/emails',
-                  action='delete_email', conditions={'method': ['DELETE']})
-
-        m.connect('edit_user_ips', '/users/{user_id}/edit/ips',
-                  action='edit_ips', conditions={'method': ['GET']})
-        m.connect('edit_user_ips', '/users/{user_id}/edit/ips',
-                  action='add_ip', conditions={'method': ['PUT']})
-        m.connect('edit_user_ips', '/users/{user_id}/edit/ips',
-                  action='delete_ip', conditions={'method': ['DELETE']})
 
     # ADMIN USER GROUPS REST ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
diff --git a/rhodecode/controllers/admin/users.py b/rhodecode/controllers/admin/users.py
index da901028..b1b4c15b 100644
--- a/rhodecode/controllers/admin/users.py
+++ b/rhodecode/controllers/admin/users.py
@@ -491,153 +491,3 @@ class UsersController(BaseController):
 
         return render('admin/users/user_edit.mako')
 
-    @HasPermissionAllDecorator('hg.admin')
-    def edit_emails(self, user_id):
-        user_id = safe_int(user_id)
-        c.user = User.get_or_404(user_id)
-        if c.user.username == User.DEFAULT_USER:
-            h.flash(_("You can't edit this user"), category='warning')
-            return redirect(h.route_path('users'))
-
-        c.active = 'emails'
-        c.user_email_map = UserEmailMap.query() \
-            .filter(UserEmailMap.user == c.user).all()
-
-        defaults = c.user.get_dict()
-        return htmlfill.render(
-            render('admin/users/user_edit.mako'),
-            defaults=defaults,
-            encoding="UTF-8",
-            force_defaults=False)
-
-    @HasPermissionAllDecorator('hg.admin')
-    @auth.CSRFRequired()
-    def add_email(self, user_id):
-        user_id = safe_int(user_id)
-        c.user = User.get_or_404(user_id)
-
-        email = request.POST.get('new_email')
-        user_model = UserModel()
-        user_data = c.user.get_api_data()
-        try:
-            user_model.add_extra_email(user_id, email)
-            audit_logger.store_web(
-                'user.edit.email.add',
-                action_data={'email': email, 'user': user_data},
-                user=c.rhodecode_user)
-            Session().commit()
-            h.flash(_("Added new email address `%s` for user account") % email,
-                    category='success')
-        except formencode.Invalid as error:
-            msg = error.error_dict['email']
-            h.flash(msg, category='error')
-        except Exception:
-            log.exception("Exception during email saving")
-            h.flash(_('An error occurred during email saving'),
-                    category='error')
-        return redirect(url('edit_user_emails', user_id=user_id))
-
-    @HasPermissionAllDecorator('hg.admin')
-    @auth.CSRFRequired()
-    def delete_email(self, user_id):
-        user_id = safe_int(user_id)
-        c.user = User.get_or_404(user_id)
-        email_id = request.POST.get('del_email_id')
-        user_model = UserModel()
-
-        email = UserEmailMap.query().get(email_id).email
-        user_data = c.user.get_api_data()
-        user_model.delete_extra_email(user_id, email_id)
-        audit_logger.store_web(
-            'user.edit.email.delete',
-            action_data={'email': email, 'user': user_data},
-            user=c.rhodecode_user)
-        Session().commit()
-        h.flash(_("Removed email address from user account"), category='success')
-        return redirect(url('edit_user_emails', user_id=user_id))
-
-    @HasPermissionAllDecorator('hg.admin')
-    def edit_ips(self, user_id):
-        user_id = safe_int(user_id)
-        c.user = User.get_or_404(user_id)
-        if c.user.username == User.DEFAULT_USER:
-            h.flash(_("You can't edit this user"), category='warning')
-            return redirect(h.route_path('users'))
-
-        c.active = 'ips'
-        c.user_ip_map = UserIpMap.query() \
-            .filter(UserIpMap.user == c.user).all()
-
-        c.inherit_default_ips = c.user.inherit_default_permissions
-        c.default_user_ip_map = UserIpMap.query() \
-            .filter(UserIpMap.user == User.get_default_user()).all()
-
-        defaults = c.user.get_dict()
-        return htmlfill.render(
-            render('admin/users/user_edit.mako'),
-            defaults=defaults,
-            encoding="UTF-8",
-            force_defaults=False)
-
-    @HasPermissionAllDecorator('hg.admin')
-    @auth.CSRFRequired()
-    def add_ip(self, user_id):
-        user_id = safe_int(user_id)
-        c.user = User.get_or_404(user_id)
-        user_model = UserModel()
-        try:
-            ip_list = user_model.parse_ip_range(request.POST.get('new_ip'))
-        except Exception as e:
-            ip_list = []
-            log.exception("Exception during ip saving")
-            h.flash(_('An error occurred during ip saving:%s' % (e,)),
-                    category='error')
-
-        desc = request.POST.get('description')
-        added = []
-        user_data = c.user.get_api_data()
-        for ip in ip_list:
-            try:
-                user_model.add_extra_ip(user_id, ip, desc)
-                audit_logger.store_web(
-                    'user.edit.ip.add',
-                    action_data={'ip': ip, 'user': user_data},
-                    user=c.rhodecode_user)
-                Session().commit()
-                added.append(ip)
-            except formencode.Invalid as error:
-                msg = error.error_dict['ip']
-                h.flash(msg, category='error')
-            except Exception:
-                log.exception("Exception during ip saving")
-                h.flash(_('An error occurred during ip saving'),
-                        category='error')
-        if added:
-            h.flash(
-                _("Added ips %s to user whitelist") % (', '.join(ip_list), ),
-                category='success')
-        if 'default_user' in request.POST:
-            return redirect(url('admin_permissions_ips'))
-        return redirect(url('edit_user_ips', user_id=user_id))
-
-    @HasPermissionAllDecorator('hg.admin')
-    @auth.CSRFRequired()
-    def delete_ip(self, user_id):
-        user_id = safe_int(user_id)
-        c.user = User.get_or_404(user_id)
-
-        ip_id = request.POST.get('del_ip_id')
-        user_model = UserModel()
-        user_data = c.user.get_api_data()
-        ip = UserIpMap.query().get(ip_id).ip_addr
-        user_model.delete_extra_ip(user_id, ip_id)
-        audit_logger.store_web(
-            'user.edit.ip.delete',
-            action_data={'ip': ip, 'user': user_data},
-            user=c.rhodecode_user)
-        Session().commit()
-        h.flash(_("Removed ip address from user whitelist"), category='success')
-
-        if 'default_user' in request.POST:
-            return redirect(url('admin_permissions_ips'))
-        return redirect(url('edit_user_ips', user_id=user_id))
diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js
index 18ddcba4..527cf64f 100644
--- a/rhodecode/public/js/rhodecode/routes.js
+++ b/rhodecode/public/js/rhodecode/routes.js
@@ -73,11 +73,18 @@ function registerRCRoutes() {
     pyroutes.register('admin_settings_system_update', '_admin/settings/system/updates', []);
     pyroutes.register('admin_settings_sessions', '_admin/settings/sessions', []);
     pyroutes.register('admin_settings_sessions_cleanup', '_admin/settings/sessions/cleanup', []);
+    pyroutes.register('admin_permissions_ips', '_admin/permissions/ips', []);
     pyroutes.register('users', '_admin/users', []);
     pyroutes.register('users_data', '_admin/users_data', []);
     pyroutes.register('edit_user_auth_tokens', '_admin/users/%(user_id)s/edit/auth_tokens', ['user_id']);
     pyroutes.register('edit_user_auth_tokens_add', '_admin/users/%(user_id)s/edit/auth_tokens/new', ['user_id']);
     pyroutes.register('edit_user_auth_tokens_delete', '_admin/users/%(user_id)s/edit/auth_tokens/delete', ['user_id']);
+    pyroutes.register('edit_user_emails', '_admin/users/%(user_id)s/edit/emails', ['user_id']);
+    pyroutes.register('edit_user_emails_add', '_admin/users/%(user_id)s/edit/emails/new', ['user_id']);
+    pyroutes.register('edit_user_emails_delete', '_admin/users/%(user_id)s/edit/emails/delete', ['user_id']);
+    pyroutes.register('edit_user_ips', '_admin/users/%(user_id)s/edit/ips', ['user_id']);
+    pyroutes.register('edit_user_ips_add', '_admin/users/%(user_id)s/edit/ips/new', ['user_id']);
+    pyroutes.register('edit_user_ips_delete', '_admin/users/%(user_id)s/edit/ips/delete', ['user_id']);
     pyroutes.register('edit_user_groups_management', '_admin/users/%(user_id)s/edit/groups_management', ['user_id']);
     pyroutes.register('edit_user_groups_management_updates', '_admin/users/%(user_id)s/edit/edit_user_groups_management/updates', ['user_id']);
     pyroutes.register('edit_user_audit_logs', '_admin/users/%(user_id)s/edit/audit', ['user_id']);
diff --git a/rhodecode/templates/admin/permissions/permissions_ips.mako b/rhodecode/templates/admin/permissions/permissions_ips.mako
index e8b6a324..ed12400e 100644
--- a/rhodecode/templates/admin/permissions/permissions_ips.mako
+++ b/rhodecode/templates/admin/permissions/permissions_ips.mako
@@ -20,7 +20,7 @@
               <td class="td-iprange"><div class="ip">${h.ip_range(ip.ip_addr)}</div></td>
               <td class="td-description"><div class="ip">${ip.description}</div></td>
               <td class="td-action">
-                ${h.secure_form(url('edit_user_ips', user_id=c.user.user_id),method='delete')}
+                ${h.secure_form(h.route_path('edit_user_ips_delete', user_id=c.user.user_id), method='POST')}
                     ${h.hidden('del_ip_id',ip.ip_id)}
                     ${h.hidden('default_user', 'True')}
                     ${h.submit('remove_',_('Delete'),id="remove_ip_%s" % ip.ip_id,
@@ -40,7 +40,7 @@
       </table>
     </div>
 
-    ${h.secure_form(url('edit_user_ips', user_id=c.user.user_id),method='put')}
+    ${h.secure_form(h.route_path('edit_user_ips_add', user_id=c.user.user_id), method='POST')}
       <div class="form">
         <!-- fields -->
         <div class="fields">
diff --git a/rhodecode/templates/admin/users/user_edit.mako b/rhodecode/templates/admin/users/user_edit.mako
index c12b7fdf..fec9176c 100644
--- a/rhodecode/templates/admin/users/user_edit.mako
+++ b/rhodecode/templates/admin/users/user_edit.mako
@@ -40,8 +40,8 @@
           <li class="${'active' if c.active=='advanced' else ''}"><a href="${h.url('edit_user_advanced', user_id=c.user.user_id)}">${_('Advanced')}</a></li>
           <li class="${'active' if c.active=='global_perms' else ''}"><a href="${h.url('edit_user_global_perms', user_id=c.user.user_id)}">${_('Global permissions')}</a></li>
           <li class="${'active' if c.active=='perms_summary' else ''}"><a href="${h.url('edit_user_perms_summary', user_id=c.user.user_id)}">${_('Permissions summary')}</a></li>
-          <li class="${'active' if c.active=='emails' else ''}"><a href="${h.url('edit_user_emails', user_id=c.user.user_id)}">${_('Emails')}</a></li>
-          <li class="${'active' if c.active=='ips' else ''}"><a href="${h.url('edit_user_ips', user_id=c.user.user_id)}">${_('Ip Whitelist')}</a></li>
+          <li class="${'active' if c.active=='emails' else ''}"><a href="${h.route_path('edit_user_emails', user_id=c.user.user_id)}">${_('Emails')}</a></li>
+          <li class="${'active' if c.active=='ips' else ''}"><a href="${h.route_path('edit_user_ips', user_id=c.user.user_id)}">${_('Ip Whitelist')}</a></li>
           <li class="${'active' if c.active=='groups' else ''}"><a href="${h.route_path('edit_user_groups_management', user_id=c.user.user_id)}">${_('User Groups Management')}</a></li>
           <li class="${'active' if c.active=='audit' else ''}"><a href="${h.route_path('edit_user_audit_logs', user_id=c.user.user_id)}">${_('User audit')}</a></li>
         </ul>
diff --git a/rhodecode/templates/admin/users/user_edit_auth_tokens.mako b/rhodecode/templates/admin/users/user_edit_auth_tokens.mako
index a38d4ff9..4ff370fe 100644
--- a/rhodecode/templates/admin/users/user_edit_auth_tokens.mako
+++ b/rhodecode/templates/admin/users/user_edit_auth_tokens.mako
@@ -38,10 +38,10 @@
                          %endif
                     </td>
                     <td class="td-action">
-                        ${h.secure_form(h.route_path('edit_user_auth_tokens_delete', user_id=c.user.user_id), method='post')}
-                            ${h.hidden('del_auth_token',auth_token.api_key)}
+                        ${h.secure_form(h.route_path('edit_user_auth_tokens_delete', user_id=c.user.user_id), method='POST')}
+                            ${h.hidden('del_auth_token', auth_token.user_api_key_id)}
                             <button class="btn btn-link btn-danger" type="submit"
-                                    onclick="return confirm('${_('Confirm to remove this auth token: %s') % auth_token.api_key}');">
+                                    onclick="return confirm('${_('Confirm to remove this auth token: %s') % auth_token.token_obfuscated}');">
                                 ${_('Delete')}
                             </button>
                         ${h.end_form()}
@@ -55,7 +55,7 @@
         </div>
 
         <div class="user_auth_tokens">
-            ${h.secure_form(h.route_path('edit_user_auth_tokens_add', user_id=c.user.user_id), method='post')}
+            ${h.secure_form(h.route_path('edit_user_auth_tokens_add', user_id=c.user.user_id), method='POST')}
             <div class="form form-vertical">
                 <!-- fields -->
                 <div class="fields">
diff --git a/rhodecode/templates/admin/users/user_edit_emails.mako b/rhodecode/templates/admin/users/user_edit_emails.mako
index dc953c2f..6fe14d7b 100644
--- a/rhodecode/templates/admin/users/user_edit_emails.mako
+++ b/rhodecode/templates/admin/users/user_edit_emails.mako
@@ -24,8 +24,8 @@
                         <span class="user email">${em.email}</span>
                     </td>
                     <td class="td-action">
-                        ${h.secure_form(url('edit_user_emails', user_id=c.user.user_id),method='delete')}
-                            ${h.hidden('del_email_id',em.email_id)}
+                        ${h.secure_form(h.route_path('edit_user_emails_delete', user_id=c.user.user_id), method='POST')}
+                            ${h.hidden('del_email_id', em.email_id)}
                             <button class="btn btn-link btn-danger" type="submit"
                                     onclick="return confirm('${_('Confirm to delete this email: %s') % em.email}');">
                                 ${_('Delete')}
@@ -46,7 +46,7 @@
           </table>
         </div>
 
-        ${h.secure_form(url('edit_user_emails', user_id=c.user.user_id),method='put')}
+        ${h.secure_form(h.route_path('edit_user_emails_add', user_id=c.user.user_id), method='POST')}
         <div class="form">
             <!-- fields -->
             <div class="fields">
diff --git a/rhodecode/templates/admin/users/user_edit_ips.mako b/rhodecode/templates/admin/users/user_edit_ips.mako
index 6d80c1e7..522a1926 100644
--- a/rhodecode/templates/admin/users/user_edit_ips.mako
+++ b/rhodecode/templates/admin/users/user_edit_ips.mako
@@ -30,9 +30,9 @@
             <td class="td-iprange"><div class="ip">${h.ip_range(ip.ip_addr)}</div></td>
             <td class="td-description"><div class="ip">${ip.description}</div></td>
             <td class="td-action">
-                ${h.secure_form(url('edit_user_ips', user_id=c.user.user_id),method='delete')}
-                    ${h.hidden('del_ip_id',ip.ip_id)}
-                    ${h.submit('remove_',_('Delete'),id="remove_ip_%s" % ip.ip_id,
+                ${h.secure_form(h.route_path('edit_user_ips_delete', user_id=c.user.user_id), method='POST')}
+                    ${h.hidden('del_ip_id', ip.ip_id)}
+                    ${h.submit('remove_', _('Delete'),id="remove_ip_%s" % ip.ip_id,
                     class_="btn btn-link btn-danger", onclick="return confirm('"+_('Confirm to delete this ip: %s') % ip.ip_addr+"');")}
                 ${h.end_form()}
             </td>
@@ -51,7 +51,7 @@
 </div>
 
         <div>
-    ${h.secure_form(url('edit_user_ips', user_id=c.user.user_id),method='put')}
+    ${h.secure_form(h.route_path('edit_user_ips_add', user_id=c.user.user_id), method='POST')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
diff --git a/rhodecode/tests/functional/test_admin_permissions.py b/rhodecode/tests/functional/test_admin_permissions.py
index a5e69308..b017ec31 100644
--- a/rhodecode/tests/functional/test_admin_permissions.py
+++ b/rhodecode/tests/functional/test_admin_permissions.py
@@ -25,6 +25,24 @@ from rhodecode.tests import (
     TestController, url, clear_all_caches, assert_session_flash)
 
 
+def route_path(name, params=None, **kwargs):
+    import urllib
+    from rhodecode.apps._base import ADMIN_PREFIX
+
+    base_url = {
+        'edit_user_ips':
+            ADMIN_PREFIX + '/users/{user_id}/edit/ips',
+        'edit_user_ips_add':
+            ADMIN_PREFIX + '/users/{user_id}/edit/ips/new',
+        'edit_user_ips_delete':
+            ADMIN_PREFIX + '/users/{user_id}/edit/ips/delete',
+    }[name].format(**kwargs)
+
+    if params:
+        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+    return base_url
+
+
 class TestAdminPermissionsController(TestController):
 
     @pytest.fixture(scope='class', autouse=True)
@@ -181,10 +199,9 @@ class TestAdminPermissionsController(TestController):
 
         # ADD
         default_user_id = User.get_default_user().user_id
-        response = self.app.post(
-            url('edit_user_ips', user_id=default_user_id),
-            params={'new_ip': '127.0.0.0/24', '_method': 'put',
-                    'csrf_token': self.csrf_token})
+        self.app.post(
+            route_path('edit_user_ips_add', user_id=default_user_id),
+            params={'new_ip': '127.0.0.0/24', 'csrf_token': self.csrf_token})
 
         response = self.app.get(url('admin_permissions_ips'))
         response.mustcontain('127.0.0.0/24')
@@ -196,9 +213,8 @@ class TestAdminPermissionsController(TestController):
                                              default_user_id).first().ip_id
 
         response = self.app.post(
-            url('edit_user_ips', user_id=default_user_id),
-            params={'_method': 'delete', 'del_ip_id': del_ip_id,
-                    'csrf_token': self.csrf_token})
+            route_path('edit_user_ips_delete', user_id=default_user_id),
+            params={'del_ip_id': del_ip_id, 'csrf_token': self.csrf_token})
 
         assert_session_flash(response, 'Removed ip address from user whitelist')
 
diff --git a/rhodecode/tests/functional/test_admin_users.py b/rhodecode/tests/functional/test_admin_users.py
index 9425ee9e..ab3d7b21 100644
--- a/rhodecode/tests/functional/test_admin_users.py
+++ b/rhodecode/tests/functional/test_admin_users.py
@@ -510,66 +510,3 @@ class TestAdminUsersController(TestController):
             element = assert_response.get_element(css_selector)
             assert element.value == default_permissions[permission]
 
-    def test_ips(self):
-        self.log_user()
-        user = User.get_by_username(TEST_USER_REGULAR_LOGIN)
-        response = self.app.get(url('edit_user_ips', user_id=user.user_id))
-        response.mustcontain('All IP addresses are allowed')
-
-    @pytest.mark.parametrize("test_name, ip, ip_range, failure", [
-        ('127/24', '127.0.0.1/24', '127.0.0.0 - 127.0.0.255', False),
-        ('10/32', '10.0.0.10/32', '10.0.0.10 - 10.0.0.10', False),
-        ('0/16', '0.0.0.0/16', '0.0.0.0 - 0.0.255.255', False),
-        ('0/8', '0.0.0.0/8', '0.0.0.0 - 0.255.255.255', False),
-        ('127_bad_mask', '127.0.0.1/99', '127.0.0.1 - 127.0.0.1', True),
-        ('127_bad_ip', 'foobar', 'foobar', True),
-    ])
-    def test_add_ip(self, test_name, ip, ip_range, failure):
-        self.log_user()
-        user = User.get_by_username(TEST_USER_REGULAR_LOGIN)
-        user_id = user.user_id
-
-        response = self.app.post(url('edit_user_ips', user_id=user_id),
-                                 params={'new_ip': ip, '_method': 'put',
-                                         'csrf_token': self.csrf_token})
-
-        if failure:
-            assert_session_flash(
-                response, 'Please enter a valid IPv4 or IpV6 address')
-            response = self.app.get(url('edit_user_ips', user_id=user_id))
-            response.mustcontain(no=[ip])
-            response.mustcontain(no=[ip_range])
-
-        else:
-            response = self.app.get(url('edit_user_ips', user_id=user_id))
-            response.mustcontain(ip)
-            response.mustcontain(ip_range)
-
-        # cleanup
-        for del_ip in UserIpMap.query().filter(
-                UserIpMap.user_id == user_id).all():
-            Session().delete(del_ip)
-            Session().commit()
-
-    def test_delete_ip(self):
-        self.log_user()
-        user = User.get_by_username(TEST_USER_REGULAR_LOGIN)
-        user_id = user.user_id
-        ip = '127.0.0.1/32'
-        ip_range = '127.0.0.1 - 127.0.0.1'
-        new_ip = UserModel().add_extra_ip(user_id, ip)
-        Session().commit()
-        new_ip_id = new_ip.ip_id
-
-        response = self.app.get(url('edit_user_ips', user_id=user_id))
-        response.mustcontain(ip)
-        response.mustcontain(ip_range)
-
-        self.app.post(url('edit_user_ips', user_id=user_id),
-                      params={'_method': 'delete', 'del_ip_id': new_ip_id,
-                              'csrf_token': self.csrf_token})
-
-        response = self.app.get(url('edit_user_ips', user_id=user_id))
-        response.mustcontain('All IP addresses are allowed')
-        response.mustcontain(no=[ip])
-        response.mustcontain(no=[ip_range])

From e5ba163e0cea519168476ddf90268a2c7723c9d0 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 20 Jun 2017 16:06:36 +0200
Subject: [PATCH 185/211] audit-logs: consistent data between my-account and
 admin user logs.

---
 rhodecode/apps/admin/views/users.py |  9 ++-------
 rhodecode/apps/my_account/views.py  | 16 ++++++++--------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/rhodecode/apps/admin/views/users.py b/rhodecode/apps/admin/views/users.py
index 0a37c4ab..d81760fa 100644
--- a/rhodecode/apps/admin/views/users.py
+++ b/rhodecode/apps/admin/views/users.py
@@ -208,7 +208,7 @@ class AdminUsersView(BaseAppView, DataGridAppView):
         token_data = token.get_api_data()
 
         self.maybe_attach_token_scope(token)
-        audit_logger.store(
+        audit_logger.store_web(
             action='user.edit.token.add',
             action_data={'data': {'token': token_data, 'user': user_data}},
             user=self._rhodecode_user, )
@@ -238,7 +238,7 @@ class AdminUsersView(BaseAppView, DataGridAppView):
             token_data = token.get_api_data()
 
             AuthTokenModel().delete(del_auth_token, c.user.user_id)
-            audit_logger.store(
+            audit_logger.store_web(
                 action='user.edit.token.delete',
                 action_data={'data': {'token': token_data, 'user': user_data}},
                 user=self._rhodecode_user,)
@@ -247,11 +247,6 @@ class AdminUsersView(BaseAppView, DataGridAppView):
 
         return HTTPFound(h.route_path('edit_user_auth_tokens', user_id=user_id))
 
-
-
-
-
-
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     @view_config(
diff --git a/rhodecode/apps/my_account/views.py b/rhodecode/apps/my_account/views.py
index 7afa6271..ad9cb7eb 100644
--- a/rhodecode/apps/my_account/views.py
+++ b/rhodecode/apps/my_account/views.py
@@ -182,9 +182,9 @@ class MyAccountView(BaseAppView):
         token_data = token.get_api_data()
 
         self.maybe_attach_token_scope(token)
-        audit_logger.store(
+        audit_logger.store_web(
             action='user.edit.token.add',
-            action_data={'data': {'token': token_data}},
+            action_data={'data': {'token': token_data, 'user': 'self'}},
             user=self._rhodecode_user, )
         Session().commit()
 
@@ -207,9 +207,9 @@ class MyAccountView(BaseAppView):
             token_data = token.get_api_data()
 
             AuthTokenModel().delete(del_auth_token, c.user.user_id)
-            audit_logger.store(
+            audit_logger.store_web(
                 action='user.edit.token.delete',
-                action_data={'data': {'token': token_data}},
+                action_data={'data': {'token': token_data, 'user': 'self'}},
                 user=self._rhodecode_user,)
             Session().commit()
             h.flash(_("Auth token successfully deleted"), category='success')
@@ -244,9 +244,9 @@ class MyAccountView(BaseAppView):
 
         try:
             UserModel().add_extra_email(c.user.user_id, email)
-            audit_logger.store(
+            audit_logger.store_web(
                 action='user.edit.email.add',
-                action_data={'data': {'email': email}},
+                action_data={'data': {'email': email, 'user': 'self'}},
                 user=self._rhodecode_user,)
 
             Session().commit()
@@ -274,9 +274,9 @@ class MyAccountView(BaseAppView):
         if del_email_id:
             email = UserEmailMap.get_or_404(del_email_id, pyramid_exc=True).email
             UserModel().delete_extra_email(c.user.user_id, del_email_id)
-            audit_logger.store(
+            audit_logger.store_web(
                 action='user.edit.email.delete',
-                action_data={'data': {'email': email}},
+                action_data={'data': {'email': email, 'user': 'self'}},
                 user=self._rhodecode_user,)
             Session().commit()
             h.flash(_("Email successfully deleted"),

From d00d73858a6a40733d23cf4ecf0d369a137b5c74 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 20 Jun 2017 16:35:14 +0200
Subject: [PATCH 186/211] audit-logs: updated action data attrbiutes.

---
 rhodecode/lib/audit_logger.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/rhodecode/lib/audit_logger.py b/rhodecode/lib/audit_logger.py
index a79ee7ec..e5539b85 100644
--- a/rhodecode/lib/audit_logger.py
+++ b/rhodecode/lib/audit_logger.py
@@ -40,12 +40,12 @@ ACTIONS_V1 = {
     'user.delete': {'old_data': {}},
     'user.edit': {'old_data': {}},
     'user.edit.permissions': {},
-    'user.edit.ip.add': {},
-    'user.edit.ip.delete': {},
-    'user.edit.token.add': {},
-    'user.edit.token.delete': {},
-    'user.edit.email.add': {},
-    'user.edit.email.delete': {},
+    'user.edit.ip.add': {'ip': {}, 'user': {}},
+    'user.edit.ip.delete': {'ip': {}, 'user': {}},
+    'user.edit.token.add': {'token': {}, 'user': {}},
+    'user.edit.token.delete': {'token': {}, 'user': {}},
+    'user.edit.email.add': {'email': ''},
+    'user.edit.email.delete': {'email': ''},
     'user.edit.password_reset.enabled': {},
     'user.edit.password_reset.disabled': {},
 
@@ -61,9 +61,9 @@ ACTIONS_V1 = {
     'repo.edit': {'old_data': {}},
     'repo.edit.permissions': {},
     'repo.delete': {'old_data': {}},
-    'repo.commit.strip': {},
-    'repo.archive.download': {},
-
+    'repo.commit.strip': {'commit_id': ''},
+    'repo.archive.download': {'user_agent': '', 'archive_name': '',
+                              'archive_spec': '', 'archive_cached': ''},
     'repo.pull_request.create': '',
     'repo.pull_request.edit': '',
     'repo.pull_request.delete': '',

From 5c99ddb207d91238b253db91b68fb7ef9505f821 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 20 Jun 2017 16:35:40 +0200
Subject: [PATCH 187/211] audit-logs: added *basic* support for NOT query term
 in audit logs.

---
 rhodecode/lib/helpers.py         |  1 +
 rhodecode/lib/user_log_filter.py | 27 +++++++++++++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py
index 2329cb1e..9f3f2778 100644
--- a/rhodecode/lib/helpers.py
+++ b/rhodecode/lib/helpers.py
@@ -1837,6 +1837,7 @@ def journal_filter_help():
         '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' +
diff --git a/rhodecode/lib/user_log_filter.py b/rhodecode/lib/user_log_filter.py
index e0a7f8bd..86f8cbe1 100644
--- a/rhodecode/lib/user_log_filter.py
+++ b/rhodecode/lib/user_log_filter.py
@@ -23,10 +23,10 @@ import logging
 from whoosh.qparser.default import QueryParser, query
 from whoosh.qparser.dateparse import DateParserPlugin
 from whoosh.fields import (TEXT, Schema, DATETIME)
-from sqlalchemy.sql.expression import or_, and_, func
+from sqlalchemy.sql.expression import or_, and_, not_, func
 
 from rhodecode.model.db import UserLog
-from rhodecode.lib.utils2 import remove_prefix, remove_suffix
+from rhodecode.lib.utils2 import remove_prefix, remove_suffix, safe_unicode
 
 # JOURNAL SCHEMA used only to generate queries in journal. We use whoosh
 # querylang to build sql queries and filter journals
@@ -54,7 +54,7 @@ def user_log_filter(user_log, search_term):
     if search_term:
         qp = QueryParser('repository', schema=JOURNAL_SCHEMA)
         qp.add_plugin(DateParserPlugin())
-        qry = qp.parse(unicode(search_term))
+        qry = qp.parse(safe_unicode(search_term))
         log.debug('Filtering using parsed query %r' % qry)
 
     def wildcard_handler(col, wc_term):
@@ -89,16 +89,27 @@ def user_log_filter(user_log, search_term):
             return func.lower(field).startswith(func.lower(val))
         elif isinstance(term, query.DateRange):
             return and_(field >= val[0], field <= val[1])
+        elif isinstance(term, query.Not):
+            return not_(field == val)
         return func.lower(field) == func.lower(val)
 
-    if isinstance(qry, (query.And, query.Term, query.Prefix, query.Wildcard,
-                        query.DateRange)):
+    if isinstance(qry, (query.And, query.Not, query.Term, query.Prefix,
+                        query.Wildcard, query.DateRange)):
         if not isinstance(qry, query.And):
             qry = [qry]
+
         for term in qry:
-            field = term.fieldname
-            val = (term.text if not isinstance(term, query.DateRange)
-                   else [term.startdate, term.enddate])
+            if isinstance(term, query.Not):
+                not_term = [z for z in term.leaves()][0]
+                field = not_term.fieldname
+                val = not_term.text
+            elif isinstance(term, query.DateRange):
+                field = term.fieldname
+                val = [term.startdate, term.enddate]
+            else:
+                field = term.fieldname
+                val = term.text
+
             user_log = user_log.filter(get_filterion(field, val, term))
     elif isinstance(qry, query.Or):
         filters = []

From 60285c8c7f881dcb6a683f83df70f27e0112bd71 Mon Sep 17 00:00:00 2001
From: Marcin Lulek <mlulek@rhodecode.com>
Date: Tue, 20 Jun 2017 19:09:02 +0200
Subject: [PATCH 188/211] security: don't use literal in notifications.

- exposes security problems
- we don't store any html anyway in the subject
---
 .../admin/notifications/show_notification.mako        | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/rhodecode/templates/admin/notifications/show_notification.mako b/rhodecode/templates/admin/notifications/show_notification.mako
index 0f0cb939..e6397ff3 100644
--- a/rhodecode/templates/admin/notifications/show_notification.mako
+++ b/rhodecode/templates/admin/notifications/show_notification.mako
@@ -9,7 +9,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_('Notifications'),h.url('notifications'))}
+    ${h.link_to(_('Notifications'), h.url('notifications'))}
     &raquo;
     ${_('Show notification')}
 </%def>
@@ -23,11 +23,6 @@
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
-        ##<ul class="links">
-        ##    <li>
-        ##      <span ><a href="#">${_('Compose message')}</a></span>
-        ##    </li>
-        ##</ul>
     </div>
     <div class="table">
       <div id="notification_${c.notification.notification_id}" class="main-content-full">
@@ -41,7 +36,9 @@
           </div>
         </div>
         <div class="notification-body">
-        <div class="notification-subject">${h.literal(c.notification.subject)}</div>
+        <div class="notification-subject">
+            <h3>${_('Subject')}: ${c.notification.subject}</h3>
+        </div>
         %if c.notification.body:
             ${h.render(c.notification.body, renderer=c.visual.default_renderer, mentions=True)}
         %endif

From ffb80aaa1a3f6c175e9bff315b8bee3b3523d027 Mon Sep 17 00:00:00 2001
From: Marcin Lulek <mlulek@rhodecode.com>
Date: Tue, 20 Jun 2017 19:39:19 +0200
Subject: [PATCH 189/211] security: use 404 instead of 403 in case missing
 permissions for comment deletion.

- prevents resource discovery
---
 rhodecode/controllers/changeset.py    | 4 +++-
 rhodecode/controllers/pullrequests.py | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/rhodecode/controllers/changeset.py b/rhodecode/controllers/changeset.py
index 772afb72..cd5a8ee3 100644
--- a/rhodecode/controllers/changeset.py
+++ b/rhodecode/controllers/changeset.py
@@ -448,7 +448,9 @@ class ChangesetController(BaseRepoController):
             Session().commit()
             return True
         else:
-            raise HTTPForbidden()
+            log.warning('No permissions for user %s to delete comment_id: %s',
+                        c.rhodecode_user, comment_id)
+            raise HTTPNotFound()
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py
index 72fc717f..9cec339d 100644
--- a/rhodecode/controllers/pullrequests.py
+++ b/rhodecode/controllers/pullrequests.py
@@ -1013,4 +1013,6 @@ class PullrequestsController(BaseRepoController):
                     comment.pull_request, c.rhodecode_user, 'review_status_change')
             return True
         else:
-            raise HTTPForbidden()
+            log.warning('No permissions for user %s to delete comment_id: %s',
+                        c.rhodecode_user, comment_id)
+            raise HTTPNotFound()

From 3aa700c43554986e39aaec924fa7995345031759 Mon Sep 17 00:00:00 2001
From: Marcin Lulek <mlulek@rhodecode.com>
Date: Tue, 20 Jun 2017 20:02:24 +0200
Subject: [PATCH 190/211] security: escape the returned paths of files and
 directories. Nodes function is used for autocomplete in files view, it
 prevents from XSS type of attack in file search.

---
 rhodecode/model/scm.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rhodecode/model/scm.py b/rhodecode/model/scm.py
index da44e410..1a74da93 100644
--- a/rhodecode/model/scm.py
+++ b/rhodecode/model/scm.py
@@ -496,7 +496,7 @@ class ScmModel(BaseModel):
 
                     if not flat:
                         _data = {
-                            "name": f.unicode_path,
+                            "name": h.escape(f.unicode_path),
                             "type": "file",
                             }
                         if extended_info:
@@ -522,7 +522,7 @@ class ScmModel(BaseModel):
                     _data = d.unicode_path
                     if not flat:
                         _data = {
-                            "name": d.unicode_path,
+                            "name": h.escape(d.unicode_path),
                             "type": "dir",
                             }
                     if extended_info:

From a9ea42785b8cd8d3516622502429706a2927c7a2 Mon Sep 17 00:00:00 2001
From: Marcin Lulek <mlulek@rhodecode.com>
Date: Tue, 20 Jun 2017 20:59:58 +0200
Subject: [PATCH 191/211] security: fix self-xss inside the email add
 functionality.

---
 rhodecode/apps/admin/views/users.py | 3 +--
 rhodecode/apps/my_account/views.py  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/rhodecode/apps/admin/views/users.py b/rhodecode/apps/admin/views/users.py
index d81760fa..2bce5082 100644
--- a/rhodecode/apps/admin/views/users.py
+++ b/rhodecode/apps/admin/views/users.py
@@ -291,8 +291,7 @@ class AdminUsersView(BaseAppView, DataGridAppView):
             h.flash(_("Added new email address `%s` for user account") % email,
                     category='success')
         except formencode.Invalid as error:
-            msg = error.error_dict['email']
-            h.flash(msg, category='error')
+            h.flash(h.escape(error.error_dict['email']), category='error')
         except Exception:
             log.exception("Exception during email saving")
             h.flash(_('An error occurred during email saving'),
diff --git a/rhodecode/apps/my_account/views.py b/rhodecode/apps/my_account/views.py
index ad9cb7eb..d3741b09 100644
--- a/rhodecode/apps/my_account/views.py
+++ b/rhodecode/apps/my_account/views.py
@@ -253,8 +253,7 @@ class MyAccountView(BaseAppView):
             h.flash(_("Added new email address `%s` for user account") % email,
                     category='success')
         except formencode.Invalid as error:
-            msg = error.error_dict['email']
-            h.flash(msg, category='error')
+            h.flash(h.escape(error.error_dict['email']), category='error')
         except Exception:
             log.exception("Exception in my_account_emails")
             h.flash(_('An error occurred during email saving'),

From 25436a736529befb1024a71fe58349f95ba44800 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 21 Jun 2017 12:03:14 +0200
Subject: [PATCH 192/211] audit-logs: implemented full audit logs across
 application.

- Fixes #5321
- Api+web actions
- To be extended while we develop new features.
---
 rhodecode/api/views/repo_api.py               | 22 +++++++++-----
 rhodecode/api/views/repo_group_api.py         | 17 +++++++++++
 rhodecode/api/views/user_api.py               | 18 +++++++++--
 rhodecode/api/views/user_group_api.py         | 30 +++++++++++++++++--
 rhodecode/apps/admin/views/users.py           | 20 +++++--------
 rhodecode/apps/login/views.py                 |  9 +++---
 rhodecode/apps/my_account/views.py            | 16 +++++-----
 .../views/repo_settings_advanced.py           |  5 ++--
 rhodecode/apps/repository/views/repo_strip.py |  6 ++--
 rhodecode/controllers/admin/repo_groups.py    | 17 ++++++-----
 rhodecode/controllers/admin/user_groups.py    |  5 +++-
 rhodecode/controllers/files.py                | 10 +++----
 rhodecode/lib/audit_logger.py                 | 22 +++++++-------
 rhodecode/lib/celerylib/tasks.py              | 10 +++----
 rhodecode/lib/hooks_base.py                   |  4 +--
 rhodecode/model/user_group.py                 |  9 ++++--
 16 files changed, 141 insertions(+), 79 deletions(-)

diff --git a/rhodecode/api/views/repo_api.py b/rhodecode/api/views/repo_api.py
index d62c1292..c98f5b5d 100644
--- a/rhodecode/api/views/repo_api.py
+++ b/rhodecode/api/views/repo_api.py
@@ -917,12 +917,13 @@ def update_repo(
 
     ref_choices, _labels = ScmModel().get_repo_landing_revs(repo=repo)
 
+    old_values = repo.get_api_data()
     schema = repo_schema.RepoSchema().bind(
         repo_type_options=rhodecode.BACKENDS.keys(),
         repo_ref_options=ref_choices,
         # user caller
         user=apiuser,
-        old_values=repo.get_api_data())
+        old_values=old_values)
     try:
         schema_data = schema.deserialize(dict(
             # we save old value, users cannot change type
@@ -967,6 +968,9 @@ def update_repo(
 
     try:
         RepoModel().update(repo, **validated_updates)
+        audit_logger.store_api(
+            'repo.edit', action_data={'old_data': old_values},
+            user=apiuser, repo=repo)
         Session().commit()
         return {
             'msg': 'updated repo ID:%s %s' % (repo.repo_id, repo.repo_name),
@@ -1173,15 +1177,14 @@ def delete_repo(request, apiuser, repoid, forks=Optional('')):
                 'Cannot delete `%s` it still contains attached forks' %
                 (repo.repo_name,)
             )
-        repo_data = repo.get_api_data()
+        old_data = repo.get_api_data()
         RepoModel().delete(repo, forks=forks)
 
         repo = audit_logger.RepoWrap(repo_id=None,
                                      repo_name=repo.repo_name)
 
         audit_logger.store_api(
-            action='repo.delete',
-            action_data={'data': repo_data},
+            'repo.delete', action_data={'old_data': old_data},
             user=apiuser, repo=repo)
 
         ScmModel().mark_for_invalidation(repo_name, delete=True)
@@ -1472,7 +1475,7 @@ def comment_commit(
         rc_config = SettingsModel().get_all_settings()
         renderer = rc_config.get('rhodecode_markup_renderer', 'rst')
         status_change_label = ChangesetStatus.get_status_lbl(status)
-        comm = CommentsModel().create(
+        comment = CommentsModel().create(
             message, repo, user, commit_id=commit_id,
             status_change=status_change_label,
             status_change_type=status,
@@ -1484,7 +1487,7 @@ def comment_commit(
             # also do a status change
             try:
                 ChangesetStatusModel().set_status(
-                    repo, status, user, comm, revision=commit_id,
+                    repo, status, user, comment, revision=commit_id,
                     dont_allow_on_closed_pull_request=True
                 )
             except StatusChangeOnClosedPullRequestError:
@@ -1498,7 +1501,7 @@ def comment_commit(
         return {
             'msg': (
                 'Commented on commit `%s` for repository `%s`' % (
-                    comm.revision, repo.repo_name)),
+                    comment.revision, repo.repo_name)),
             'status_change': status,
             'success': True,
         }
@@ -1879,6 +1882,11 @@ def strip(request, apiuser, repoid, revision, branch):
 
     try:
         ScmModel().strip(repo, revision, branch)
+        audit_logger.store_api(
+            'repo.commit.strip', action_data={'commit_id': revision},
+            repo=repo,
+            user=apiuser, commit=True)
+
         return {
             'msg': 'Stripped commit %s from repo `%s`' % (
                 revision, repo.repo_name),
diff --git a/rhodecode/api/views/repo_group_api.py b/rhodecode/api/views/repo_group_api.py
index 06dc5fad..edb9bcd0 100644
--- a/rhodecode/api/views/repo_group_api.py
+++ b/rhodecode/api/views/repo_group_api.py
@@ -27,6 +27,7 @@ from rhodecode.api.utils import (
     has_superadmin_permission, Optional, OAttr, get_user_or_error,
     get_repo_group_or_error, get_perm_or_error, get_user_group_or_error,
     get_origin, validate_repo_group_permissions, validate_set_owner_permissions)
+from rhodecode.lib import audit_logger
 from rhodecode.lib.auth import (
     HasRepoGroupPermissionAnyApi, HasUserGroupPermissionAnyApi)
 from rhodecode.model.db import Session
@@ -222,6 +223,13 @@ def create_repo_group(
             group_name=validated_group_name,
             group_description=schema_data['repo_group_name'],
             copy_permissions=schema_data['repo_group_copy_permissions'])
+        Session().flush()
+
+        repo_group_data = repo_group.get_api_data()
+        audit_logger.store_api(
+            'repo_group.create', action_data={'data': repo_group_data},
+            user=apiuser)
+
         Session().commit()
         return {
             'msg': 'Created new repo group `%s`' % validated_group_name,
@@ -310,8 +318,13 @@ def update_repo_group(
         enable_locking=schema_data['repo_group_enable_locking'],
     )
 
+    old_data = repo_group.get_api_data()
     try:
         RepoGroupModel().update(repo_group, validated_updates)
+        audit_logger.store_api(
+            'repo_group.edit', action_data={'old_data': old_data},
+            user=apiuser)
+
         Session().commit()
         return {
             'msg': 'updated repository group ID:%s %s' % (
@@ -365,8 +378,12 @@ def delete_repo_group(request, apiuser, repogroupid):
         validate_repo_group_permissions(
             apiuser, repogroupid, repo_group, ('group.admin',))
 
+    old_data = repo_group.get_api_data()
     try:
         RepoGroupModel().delete(repo_group)
+        audit_logger.store_api(
+            'repo_group.delete', action_data={'old_data': old_data},
+            user=apiuser)
         Session().commit()
         return {
             'msg': 'deleted repo group ID:%s %s' %
diff --git a/rhodecode/api/views/user_api.py b/rhodecode/api/views/user_api.py
index c401e54e..61c696b2 100644
--- a/rhodecode/api/views/user_api.py
+++ b/rhodecode/api/views/user_api.py
@@ -23,6 +23,7 @@ import logging
 from rhodecode.api import jsonrpc_method, JSONRPCError, JSONRPCForbidden
 from rhodecode.api.utils import (
     Optional, OAttr, has_superadmin_permission, get_user_or_error, store_update)
+from rhodecode.lib import audit_logger
 from rhodecode.lib.auth import AuthUser, PasswordGenerator
 from rhodecode.lib.exceptions import DefaultUserException
 from rhodecode.lib.utils2 import safe_int, str2bool
@@ -251,6 +252,12 @@ def create_user(request, apiuser, username, email, password=Optional(''),
             force_password_change=Optional.extract(force_password_change),
             create_repo_group=create_repo_group
         )
+        Session().flush()
+        creation_data = user.get_api_data()
+        audit_logger.store_api(
+            'user.create', action_data={'data': creation_data},
+            user=apiuser)
+
         Session().commit()
         return {
             'msg': 'created new user `%s`' % username,
@@ -326,7 +333,7 @@ def update_user(request, apiuser, userid, username=Optional(None),
         raise JSONRPCForbidden()
 
     user = get_user_or_error(userid)
-
+    old_data = user.get_api_data()
     # only non optional arguments will be stored in updates
     updates = {}
 
@@ -343,6 +350,9 @@ def update_user(request, apiuser, userid, username=Optional(None),
         store_update(updates, extern_type, 'extern_type')
 
         user = UserModel().update_user(user, **updates)
+        audit_logger.store_api(
+            'user.edit', action_data={'old_data': old_data},
+            user=apiuser)
         Session().commit()
         return {
             'msg': 'updated user ID:%s %s' % (user.user_id, user.username),
@@ -405,9 +415,13 @@ def delete_user(request, apiuser, userid):
         raise JSONRPCForbidden()
 
     user = get_user_or_error(userid)
-
+    old_data = user.get_api_data()
     try:
         UserModel().delete(userid)
+        audit_logger.store_api(
+            'user.delete', action_data={'old_data': old_data},
+            user=apiuser)
+
         Session().commit()
         return {
             'msg': 'deleted user ID:%s %s' % (user.user_id, user.username),
diff --git a/rhodecode/api/views/user_group_api.py b/rhodecode/api/views/user_group_api.py
index 902ea29e..b2918dae 100644
--- a/rhodecode/api/views/user_group_api.py
+++ b/rhodecode/api/views/user_group_api.py
@@ -24,6 +24,7 @@ from rhodecode.api import jsonrpc_method, JSONRPCError, JSONRPCForbidden
 from rhodecode.api.utils import (
     Optional, OAttr, store_update, has_superadmin_permission, get_origin,
     get_user_or_error, get_user_group_or_error, get_perm_or_error)
+from rhodecode.lib import audit_logger
 from rhodecode.lib.auth import HasUserGroupPermissionAnyApi, HasPermissionAnyApi
 from rhodecode.lib.exceptions import UserGroupAssignedException
 from rhodecode.model.db import Session
@@ -217,13 +218,18 @@ def create_user_group(
         owner = get_user_or_error(owner)
         active = Optional.extract(active)
         description = Optional.extract(description)
-        ug = UserGroupModel().create(
+        user_group = UserGroupModel().create(
             name=group_name, description=description, owner=owner,
             active=active)
+        Session().flush()
+        creation_data = user_group.get_api_data()
+        audit_logger.store_api(
+            'user_group.create', action_data={'data': creation_data},
+            user=apiuser)
         Session().commit()
         return {
             'msg': 'created new user group `%s`' % group_name,
-            'user_group': ug.get_api_data()
+            'user_group': creation_data
         }
     except Exception:
         log.exception("Error occurred during creation of user group")
@@ -291,6 +297,7 @@ def update_user_group(request, apiuser, usergroupid, group_name=Optional(''),
     if not isinstance(owner, Optional):
         owner = get_user_or_error(owner)
 
+    old_data = user_group.get_api_data()
     updates = {}
     store_update(updates, group_name, 'users_group_name')
     store_update(updates, description, 'user_group_description')
@@ -298,6 +305,9 @@ def update_user_group(request, apiuser, usergroupid, group_name=Optional(''),
     store_update(updates, active, 'users_group_active')
     try:
         UserGroupModel().update(user_group, updates)
+        audit_logger.store_api(
+            'user_group.edit', action_data={'old_data': old_data},
+            user=apiuser)
         Session().commit()
         return {
             'msg': 'updated user group ID:%s %s' % (
@@ -359,8 +369,12 @@ def delete_user_group(request, apiuser, usergroupid):
             raise JSONRPCError(
                 'user group `%s` does not exist' % (usergroupid,))
 
+    old_data = user_group.get_api_data()
     try:
         UserGroupModel().delete(user_group)
+        audit_logger.store_api(
+            'user_group.delete', action_data={'old_data': old_data},
+            user=apiuser)
         Session().commit()
         return {
             'msg': 'deleted user group ID:%s %s' % (
@@ -438,6 +452,12 @@ def add_user_to_user_group(request, apiuser, usergroupid, userid):
             user.username, user_group.users_group_name
         )
         msg = msg if success else 'User is already in that group'
+        if success:
+            user_data = user.get_api_data()
+            audit_logger.store_api(
+                'user_group.edit.member.add', action_data={'user': user_data},
+                user=apiuser)
+
         Session().commit()
 
         return {
@@ -501,6 +521,12 @@ def remove_user_from_user_group(request, apiuser, usergroupid, userid):
             user.username, user_group.users_group_name
         )
         msg = msg if success else "User wasn't in group"
+        if success:
+            user_data = user.get_api_data()
+            audit_logger.store_api(
+                'user_group.edit.member.delete', action_data={'user': user_data},
+                user=apiuser)
+
         Session().commit()
         return {'success': success, 'msg': msg}
     except Exception:
diff --git a/rhodecode/apps/admin/views/users.py b/rhodecode/apps/admin/views/users.py
index 2bce5082..0802f1e1 100644
--- a/rhodecode/apps/admin/views/users.py
+++ b/rhodecode/apps/admin/views/users.py
@@ -209,8 +209,8 @@ class AdminUsersView(BaseAppView, DataGridAppView):
 
         self.maybe_attach_token_scope(token)
         audit_logger.store_web(
-            action='user.edit.token.add',
-            action_data={'data': {'token': token_data, 'user': user_data}},
+            'user.edit.token.add', action_data={
+                'data': {'token': token_data, 'user': user_data}},
             user=self._rhodecode_user, )
         Session().commit()
 
@@ -239,8 +239,8 @@ class AdminUsersView(BaseAppView, DataGridAppView):
 
             AuthTokenModel().delete(del_auth_token, c.user.user_id)
             audit_logger.store_web(
-                action='user.edit.token.delete',
-                action_data={'data': {'token': token_data, 'user': user_data}},
+                'user.edit.token.delete', action_data={
+                    'data': {'token': token_data, 'user': user_data}},
                 user=self._rhodecode_user,)
             Session().commit()
             h.flash(_("Auth token successfully deleted"), category='success')
@@ -284,8 +284,7 @@ class AdminUsersView(BaseAppView, DataGridAppView):
         try:
             UserModel().add_extra_email(c.user.user_id, email)
             audit_logger.store_web(
-                'user.edit.email.add',
-                action_data={'email': email, 'user': user_data},
+                'user.edit.email.add', action_data={'email': email, 'user': user_data},
                 user=self._rhodecode_user)
             Session().commit()
             h.flash(_("Added new email address `%s` for user account") % email,
@@ -318,8 +317,7 @@ class AdminUsersView(BaseAppView, DataGridAppView):
         user_data = c.user.get_api_data()
         user_model.delete_extra_email(c.user.user_id, email_id)
         audit_logger.store_web(
-            'user.edit.email.delete',
-            action_data={'email': email, 'user': user_data},
+            'user.edit.email.delete', action_data={'email': email, 'user': user_data},
             user=self._rhodecode_user)
         Session().commit()
         h.flash(_("Removed email address from user account"),
@@ -379,8 +377,7 @@ class AdminUsersView(BaseAppView, DataGridAppView):
             try:
                 user_model.add_extra_ip(c.user.user_id, ip, desc)
                 audit_logger.store_web(
-                    'user.edit.ip.add',
-                    action_data={'ip': ip, 'user': user_data},
+                    'user.edit.ip.add', action_data={'ip': ip, 'user': user_data},
                     user=self._rhodecode_user)
                 Session().commit()
                 added.append(ip)
@@ -420,8 +417,7 @@ class AdminUsersView(BaseAppView, DataGridAppView):
         ip = UserIpMap.query().get(ip_id).ip_addr
         user_model.delete_extra_ip(c.user.user_id, ip_id)
         audit_logger.store_web(
-            'user.edit.ip.delete',
-            action_data={'ip': ip, 'user': user_data},
+            'user.edit.ip.delete', action_data={'ip': ip, 'user': user_data},
             user=self._rhodecode_user)
         Session().commit()
         h.flash(_("Removed ip address from user whitelist"), category='success')
diff --git a/rhodecode/apps/login/views.py b/rhodecode/apps/login/views.py
index 2797f886..7bd76cf4 100644
--- a/rhodecode/apps/login/views.py
+++ b/rhodecode/apps/login/views.py
@@ -173,7 +173,7 @@ class LoginView(BaseAppView):
                 ip_addr=self.request.remote_addr)
             action_data = {'user_agent': self.request.user_agent}
             audit_logger.store_web(
-                action='user.login.success', action_data=action_data,
+                'user.login.success', action_data=action_data,
                 user=audit_user, commit=True)
 
             raise HTTPFound(c.came_from, headers=headers)
@@ -192,7 +192,7 @@ class LoginView(BaseAppView):
                 ip_addr=self.request.remote_addr)
             action_data = {'user_agent': self.request.user_agent}
             audit_logger.store_web(
-                action='user.login.failure', action_data=action_data,
+                'user.login.failure', action_data=action_data,
                 user=audit_user, commit=True)
             return render_ctx
 
@@ -212,7 +212,7 @@ class LoginView(BaseAppView):
 
         action_data = {'user_agent': self.request.user_agent}
         audit_logger.store_web(
-            action='user.logout', action_data=action_data,
+            'user.logout', action_data=action_data,
             user=auth_user, commit=True)
         self.session.delete()
         return HTTPFound(h.route_path('home'))
@@ -365,8 +365,7 @@ class LoginView(BaseAppView):
                 action_data = {'email': user_email,
                                'user_agent': self.request.user_agent}
                 audit_logger.store_web(
-                    action='user.password.reset_request',
-                    action_data=action_data,
+                    'user.password.reset_request', action_data=action_data,
                     user=self._rhodecode_user, commit=True)
                 return HTTPFound(self.request.route_path('reset_password'))
 
diff --git a/rhodecode/apps/my_account/views.py b/rhodecode/apps/my_account/views.py
index d3741b09..dede36f5 100644
--- a/rhodecode/apps/my_account/views.py
+++ b/rhodecode/apps/my_account/views.py
@@ -183,8 +183,8 @@ class MyAccountView(BaseAppView):
 
         self.maybe_attach_token_scope(token)
         audit_logger.store_web(
-            action='user.edit.token.add',
-            action_data={'data': {'token': token_data, 'user': 'self'}},
+            'user.edit.token.add', action_data={
+                'data': {'token': token_data, 'user': 'self'}},
             user=self._rhodecode_user, )
         Session().commit()
 
@@ -208,8 +208,8 @@ class MyAccountView(BaseAppView):
 
             AuthTokenModel().delete(del_auth_token, c.user.user_id)
             audit_logger.store_web(
-                action='user.edit.token.delete',
-                action_data={'data': {'token': token_data, 'user': 'self'}},
+                'user.edit.token.delete', action_data={
+                    'data': {'token': token_data, 'user': 'self'}},
                 user=self._rhodecode_user,)
             Session().commit()
             h.flash(_("Auth token successfully deleted"), category='success')
@@ -245,8 +245,8 @@ class MyAccountView(BaseAppView):
         try:
             UserModel().add_extra_email(c.user.user_id, email)
             audit_logger.store_web(
-                action='user.edit.email.add',
-                action_data={'data': {'email': email, 'user': 'self'}},
+                'user.edit.email.add', action_data={
+                    'data': {'email': email, 'user': 'self'}},
                 user=self._rhodecode_user,)
 
             Session().commit()
@@ -274,8 +274,8 @@ class MyAccountView(BaseAppView):
             email = UserEmailMap.get_or_404(del_email_id, pyramid_exc=True).email
             UserModel().delete_extra_email(c.user.user_id, del_email_id)
             audit_logger.store_web(
-                action='user.edit.email.delete',
-                action_data={'data': {'email': email, 'user': 'self'}},
+                'user.edit.email.delete', action_data={
+                    'data': {'email': email, 'user': 'self'}},
                 user=self._rhodecode_user,)
             Session().commit()
             h.flash(_("Email successfully deleted"),
diff --git a/rhodecode/apps/repository/views/repo_settings_advanced.py b/rhodecode/apps/repository/views/repo_settings_advanced.py
index f652ef13..986a36ff 100644
--- a/rhodecode/apps/repository/views/repo_settings_advanced.py
+++ b/rhodecode/apps/repository/views/repo_settings_advanced.py
@@ -95,14 +95,13 @@ class RepoSettingsView(RepoAppView):
                     handle_forks = 'delete'
                     h.flash(_('Deleted %s forks') % _forks, category='success')
 
-            repo_data = self.db_repo.get_api_data()
+            old_data = self.db_repo.get_api_data()
             RepoModel().delete(self.db_repo, forks=handle_forks)
 
             repo = audit_logger.RepoWrap(repo_id=None,
                                          repo_name=self.db_repo.repo_name)
             audit_logger.store_web(
-                action='repo.delete',
-                action_data={'data': repo_data},
+                'repo.delete', action_data={'old_data': old_data},
                 user=self._rhodecode_user, repo=repo)
 
             ScmModel().mark_for_invalidation(self.db_repo_name, delete=True)
diff --git a/rhodecode/apps/repository/views/repo_strip.py b/rhodecode/apps/repository/views/repo_strip.py
index a56d98f8..c711b41e 100644
--- a/rhodecode/apps/repository/views/repo_strip.py
+++ b/rhodecode/apps/repository/views/repo_strip.py
@@ -106,10 +106,8 @@ class StripView(RepoAppView):
                 data[commit['rev']] = True
 
                 audit_logger.store_web(
-                    action='repo.commit.strip',
-                    action_data={'commit_id': commit['rev']},
-                    repo=self.db_repo,
-                    user=self._rhodecode_user, commit=True)
+                    'repo.commit.strip', action_data={'commit_id': commit['rev']},
+                    repo=self.db_repo, user=self._rhodecode_user, commit=True)
 
             except Exception as e:
                 data[commit['rev']] = False
diff --git a/rhodecode/controllers/admin/repo_groups.py b/rhodecode/controllers/admin/repo_groups.py
index 2bff202f..87629d87 100644
--- a/rhodecode/controllers/admin/repo_groups.py
+++ b/rhodecode/controllers/admin/repo_groups.py
@@ -185,14 +185,16 @@ class RepoGroupsController(BaseController):
                 owner=owner.user_id,
                 copy_permissions=form_result['group_copy_permissions']
             )
-            Session().commit()
-            repo_group_data = repo_group.get_api_data()
-            _new_group_name = form_result['group_name_full']
+            Session().flush()
 
+            repo_group_data = repo_group.get_api_data()
             audit_logger.store_web(
-                action='repo_group.create',
-                action_data={'data': repo_group_data},
-                user=c.rhodecode_user, commit=True)
+                'repo_group.create', action_data={'data': repo_group_data},
+                user=c.rhodecode_user)
+
+            Session().commit()
+
+            _new_group_name = form_result['group_name_full']
 
             repo_group_url = h.link_to(
                 _new_group_name,
@@ -304,8 +306,7 @@ class RepoGroupsController(BaseController):
             RepoGroupModel().delete(group_name)
 
             audit_logger.store_web(
-                'repo_group.delete',
-                action_data={'old_data': old_values},
+                'repo_group.delete', action_data={'old_data': old_values},
                 user=c.rhodecode_user)
 
             Session().commit()
diff --git a/rhodecode/controllers/admin/user_groups.py b/rhodecode/controllers/admin/user_groups.py
index 5d834060..f91831f4 100644
--- a/rhodecode/controllers/admin/user_groups.py
+++ b/rhodecode/controllers/admin/user_groups.py
@@ -205,13 +205,16 @@ class UserGroupsController(BaseController):
             pstruct = peppercorn.parse(request.POST.items())
             form_result['users_group_members'] = pstruct['user_group_members']
 
-            UserGroupModel().update(c.user_group, form_result)
+            user_group, added_members, removed_members = \
+                UserGroupModel().update(c.user_group, form_result)
             updated_user_group = form_result['users_group_name']
 
             audit_logger.store_web(
                 'user_group.edit', action_data={'old_data': old_values},
                 user=c.rhodecode_user)
 
+            # TODO(marcink): use added/removed to set user_group.edit.member.add
+
             h.flash(_('Updated user group %s') % updated_user_group,
                     category='success')
             Session().commit()
diff --git a/rhodecode/controllers/files.py b/rhodecode/controllers/files.py
index 0c2dda11..6a4216f0 100644
--- a/rhodecode/controllers/files.py
+++ b/rhodecode/controllers/files.py
@@ -815,11 +815,11 @@ class FilesController(BaseRepoController):
 
         # store download action
         audit_logger.store_web(
-            action='repo.archive.download',
-            action_data={'user_agent': request.user_agent,
-                         'archive_name': archive_name,
-                         'archive_spec': fname,
-                         'archive_cached': use_cached_archive},
+            'repo.archive.download', action_data={
+                'user_agent': request.user_agent,
+                'archive_name': archive_name,
+                'archive_spec': fname,
+                'archive_cached': use_cached_archive},
             user=c.rhodecode_user,
             repo=dbrepo,
             commit=True
diff --git a/rhodecode/lib/audit_logger.py b/rhodecode/lib/audit_logger.py
index e5539b85..d7b5d0fb 100644
--- a/rhodecode/lib/audit_logger.py
+++ b/rhodecode/lib/audit_logger.py
@@ -53,8 +53,8 @@ ACTIONS_V1 = {
     'user_group.delete': {'old_data': {}},
     'user_group.edit': {'old_data': {}},
     'user_group.edit.permissions': {},
-    'user_group.edit.member.add': {},
-    'user_group.edit.member.delete': {},
+    'user_group.edit.member.add': {'user': {}},
+    'user_group.edit.member.delete': {'user': {}},
 
     'repo.create': {'data': {}},
     'repo.fork': {'data': {}},
@@ -76,8 +76,8 @@ ACTIONS_V1 = {
     'repo.pull_request.reviewer.add': '',
     'repo.pull_request.reviewer.delete': '',
 
-    'repo.commit.comment.create': '',
-    'repo.commit.comment.delete': '',
+    'repo.commit.comment.create': {'data': {}},
+    'repo.commit.comment.delete': {'data': {}},
     'repo.commit.vote': '',
 
     'repo_group.create': {'data': {}},
@@ -164,34 +164,32 @@ def store(action, user, action_data=None, user_data=None, ip_addr=None,
         from rhodecode.lib import audit_logger
 
         audit_logger.store(
-            action='repo.edit', user=self._rhodecode_user)
+            'repo.edit', user=self._rhodecode_user)
         audit_logger.store(
-            action='repo.delete', action_data={'data': repo_data},
+            'repo.delete', action_data={'data': repo_data},
             user=audit_logger.UserWrap(username='itried-login', ip_addr='8.8.8.8'))
 
         # repo action
         audit_logger.store(
-            action='repo.delete',
+            'repo.delete',
             user=audit_logger.UserWrap(username='itried-login', ip_addr='8.8.8.8'),
             repo=audit_logger.RepoWrap(repo_name='some-repo'))
 
         # repo action, when we know and have the repository object already
         audit_logger.store(
-            action='repo.delete',
-            action_data={'source': audit_logger.SOURCE_WEB, },
+            'repo.delete', action_data={'source': audit_logger.SOURCE_WEB, },
             user=self._rhodecode_user,
             repo=repo_object)
 
         # alternative wrapper to the above
         audit_logger.store_web(
-            action='repo.delete',
-            action_data={},
+            'repo.delete', action_data={},
             user=self._rhodecode_user,
             repo=repo_object)
 
         # without an user ?
         audit_logger.store(
-            action='user.login.failure',
+            'user.login.failure',
             user=audit_logger.UserWrap(
                     username=self.request.params.get('username'),
                     ip_addr=self.request.remote_addr))
diff --git a/rhodecode/lib/celerylib/tasks.py b/rhodecode/lib/celerylib/tasks.py
index e2da04a3..34e96a2f 100644
--- a/rhodecode/lib/celerylib/tasks.py
+++ b/rhodecode/lib/celerylib/tasks.py
@@ -179,9 +179,8 @@ def create_repo(form_data, cur_user):
         repo_id = repo.repo_id
         repo_data = repo.get_api_data()
 
-        audit_logger.store_web(
-            action='repo.create',
-            action_data={'data': repo_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))
 
@@ -274,9 +273,8 @@ def create_repo_fork(form_data, cur_user):
 
         repo_id = repo.repo_id
         repo_data = repo.get_api_data()
-        audit_logger.store_web(
-            action='repo.fork',
-            action_data={'data': repo_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))
 
diff --git a/rhodecode/lib/hooks_base.py b/rhodecode/lib/hooks_base.py
index 1d919b01..08ee8724 100644
--- a/rhodecode/lib/hooks_base.py
+++ b/rhodecode/lib/hooks_base.py
@@ -158,7 +158,7 @@ def post_pull(extras):
         ip_addr=extras.ip)
     repo = audit_logger.RepoWrap(repo_name=extras.repository)
     audit_logger.store(
-        action='user.pull', action_data={
+        'user.pull', action_data={
             'user_agent': extras.user_agent},
         user=audit_user, repo=repo, commit=True)
 
@@ -199,7 +199,7 @@ def post_push(extras):
         username=extras.username, ip_addr=extras.ip)
     repo = audit_logger.RepoWrap(repo_name=extras.repository)
     audit_logger.store(
-        action='user.push', action_data={
+        'user.push', action_data={
             'user_agent': extras.user_agent,
             'commit_ids': commit_ids[:10000]},
         user=audit_user, repo=repo, commit=True)
diff --git a/rhodecode/model/user_group.py b/rhodecode/model/user_group.py
index 6e16f7bf..0a883147 100644
--- a/rhodecode/model/user_group.py
+++ b/rhodecode/model/user_group.py
@@ -175,7 +175,7 @@ class UserGroupModel(BaseModel):
                 user_id for user_id in current_members_ids
                 if user_id not in user_id_list]
 
-        return (added_members, deleted_members)
+        return added_members, deleted_members
 
     def _set_users_as_members(self, user_group, user_ids):
         user_group.members = []
@@ -191,6 +191,7 @@ class UserGroupModel(BaseModel):
         self._set_users_as_members(user_group, user_ids)
         self._log_user_changes('added to', user_group, added)
         self._log_user_changes('removed from', user_group, removed)
+        return added, removed
 
     def _clean_members_data(self, members_data):
         if not members_data:
@@ -225,12 +226,16 @@ class UserGroupModel(BaseModel):
 
             user_group.user = owner
 
+        added_user_ids = []
+        removed_user_ids = []
         if 'users_group_members' in form_data:
             members_id_list = self._clean_members_data(
                 form_data['users_group_members'])
-            self._update_members_from_user_ids(user_group, members_id_list)
+            added_user_ids, removed_user_ids = \
+                self._update_members_from_user_ids(user_group, members_id_list)
 
         self.sa.add(user_group)
+        return user_group, added_user_ids, removed_user_ids
 
     def delete(self, user_group, force=False):
         """

From af07c911dc994cb75eafd3df60c2a4c9b8d712be Mon Sep 17 00:00:00 2001
From: Marcin Lulek <mlulek@rhodecode.com>
Date: Wed, 21 Jun 2017 12:23:46 +0200
Subject: [PATCH 193/211] security: use safe escaped version of description for
 repo and repo group to potentially prevent any XSS attacks on returned data.

---
 rhodecode/model/db.py           | 43 ++++++++++++++++++++++++++++++---
 rhodecode/model/pull_request.py |  2 +-
 rhodecode/model/repo.py         |  2 +-
 rhodecode/model/repo_group.py   |  2 +-
 4 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index 3b6b444b..3e6399e0 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -1026,6 +1026,11 @@ class UserApiKeys(Base, BaseModel):
             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:
@@ -1111,6 +1116,11 @@ class UserIpMap(Base, BaseModel):
     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(ip_addr, strict=False)
@@ -1198,6 +1208,11 @@ class UserGroup(Base, BaseModel):
 
     user = relationship('User')
 
+    @hybrid_property
+    def description_safe(self):
+        from rhodecode.lib import helpers as h
+        return h.escape(self.description)
+
     @hybrid_property
     def group_data(self):
         if not self._group_data:
@@ -1495,6 +1510,11 @@ class Repository(Base, BaseModel):
         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]
@@ -1805,7 +1825,7 @@ class Repository(Base, BaseModel):
             'url': RepoModel().get_url(self),
             'private': repo.private,
             'created_on': repo.created_on,
-            'description': repo.description,
+            'description': repo.description_safe,
             'landing_rev': repo.landing_rev,
             'owner': repo.user.username,
             'fork_of': repo.fork.repo_name if repo.fork else None,
@@ -2204,8 +2224,13 @@ class RepoGroup(Base, BaseModel):
         self.parent_group = parent_group
 
     def __unicode__(self):
-        return u"<%s('id:%s:%s')>" % (self.__class__.__name__, self.group_id,
-                                      self.group_name)
+        return u"<%s('id:%s:%s')>" % (
+            self.__class__.__name__, self.group_id, self.group_name)
+
+    @hybrid_property
+    def description_safe(self):
+        from rhodecode.lib import helpers as h
+        return h.escape(self.group_description)
 
     @classmethod
     def _generate_choice(cls, repo_group):
@@ -2436,7 +2461,7 @@ class RepoGroup(Base, BaseModel):
         data = {
             'group_id': group.group_id,
             'group_name': group.group_name,
-            'group_description': group.group_description,
+            '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,
@@ -3302,6 +3327,11 @@ class _PullRequestBase(BaseModel):
     def reviewer_data_json(self):
         return json.dumps(self.reviewer_data)
 
+    @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 []
@@ -3739,6 +3769,11 @@ class Gist(Base, BaseModel):
     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_, pyramid_exc=False):
 
diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py
index f81c680a..39d43801 100644
--- a/rhodecode/model/pull_request.py
+++ b/rhodecode/model/pull_request.py
@@ -1295,7 +1295,7 @@ class PullRequestModel(BaseModel):
                 'lastname': repo.user.last_name,
                 'gravatar_link': h.gravatar_url(repo.user.email, 14),
             },
-            'description': h.chop_at_smart(repo.description, '\n'),
+            'description': h.chop_at_smart(repo.description_safe, '\n'),
             'refs': {
                 'all_refs': all_refs,
                 'selected_ref': selected_ref,
diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py
index c3b8b565..d0aef028 100644
--- a/rhodecode/model/repo.py
+++ b/rhodecode/model/repo.py
@@ -257,7 +257,7 @@ class RepoModel(BaseModel):
                 "last_changeset": last_rev(repo.repo_name, cs_cache),
                 "last_changeset_raw": cs_cache.get('revision'),
 
-                "desc": desc(repo.description),
+                "desc": desc(repo.description_safe),
                 "owner": user_profile(repo.user.username),
 
                 "state": state(repo.repo_state),
diff --git a/rhodecode/model/repo_group.py b/rhodecode/model/repo_group.py
index 5996b541..f29a32d5 100644
--- a/rhodecode/model/repo_group.py
+++ b/rhodecode/model/repo_group.py
@@ -711,7 +711,7 @@ class RepoGroupModel(BaseModel):
                 "menu": quick_menu(group.group_name),
                 "name": repo_group_lnk(group.group_name),
                 "name_raw": group.group_name,
-                "desc": desc(group.group_description, group.personal),
+                "desc": desc(group.description_safe, group.personal),
                 "top_level_repos": 0,
                 "owner": user_profile(group.user.username)
             }

From 749f784ad907dd0887536d42f49cca7809fc758d Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 21 Jun 2017 13:28:12 +0200
Subject: [PATCH 194/211] user-group-api: use simple schema validator to be
 consistent how we validate user group names during creation between API and
 WEB.

---
 rhodecode/api/tests/test_create_user_group.py | 13 ++++
 rhodecode/api/views/user_group_api.py         | 37 ++++++---
 .../schemas/user_group_schema.py              | 78 +++++++++++++++++++
 3 files changed, 119 insertions(+), 9 deletions(-)
 create mode 100644 rhodecode/model/validation_schema/schemas/user_group_schema.py

diff --git a/rhodecode/api/tests/test_create_user_group.py b/rhodecode/api/tests/test_create_user_group.py
index e5fe4f65..b8fdd6a8 100644
--- a/rhodecode/api/tests/test_create_user_group.py
+++ b/rhodecode/api/tests/test_create_user_group.py
@@ -112,3 +112,16 @@ class TestCreateUserGroup(object):
 
         expected = 'failed to create group `%s`' % (group_name,)
         assert_error(id_, expected, given=response.body)
+
+    def test_api_create_user_group_with_wrong_name(self, user_util):
+
+        group_name = 'wrong NAME <>'
+        id_, params = build_data(
+            self.apikey, 'create_user_group', group_name=group_name)
+        response = api_call(self.app, params)
+
+        expected = {"user_group_name":
+                        "Allowed in name are letters, numbers, and `-`, `_`, "
+                        "`.` Name must start with a letter or number. "
+                        "Got `{}`".format(group_name)}
+        assert_error(id_, expected, given=response.body)
diff --git a/rhodecode/api/views/user_group_api.py b/rhodecode/api/views/user_group_api.py
index b2918dae..8455b8a8 100644
--- a/rhodecode/api/views/user_group_api.py
+++ b/rhodecode/api/views/user_group_api.py
@@ -20,7 +20,8 @@
 
 import logging
 
-from rhodecode.api import jsonrpc_method, JSONRPCError, JSONRPCForbidden
+from rhodecode.api import jsonrpc_method, JSONRPCError, JSONRPCForbidden, \
+    JSONRPCValidationError
 from rhodecode.api.utils import (
     Optional, OAttr, store_update, has_superadmin_permission, get_origin,
     get_user_or_error, get_user_group_or_error, get_perm_or_error)
@@ -30,6 +31,8 @@ from rhodecode.lib.exceptions import UserGroupAssignedException
 from rhodecode.model.db import Session
 from rhodecode.model.scm import UserGroupList
 from rhodecode.model.user_group import UserGroupModel
+from rhodecode.model import validation_schema
+from rhodecode.model.validation_schema.schemas import user_group_schema
 
 log = logging.getLogger(__name__)
 
@@ -211,16 +214,32 @@ def create_user_group(
     if UserGroupModel().get_by_name(group_name):
         raise JSONRPCError("user group `%s` already exist" % (group_name,))
 
-    try:
-        if isinstance(owner, Optional):
-            owner = apiuser.user_id
+    if isinstance(owner, Optional):
+        owner = apiuser.user_id
 
-        owner = get_user_or_error(owner)
-        active = Optional.extract(active)
-        description = Optional.extract(description)
+    owner = get_user_or_error(owner)
+    active = Optional.extract(active)
+    description = Optional.extract(description)
+
+    schema = user_group_schema.UserGroupSchema().bind(
+        # user caller
+        user=apiuser)
+    try:
+        schema_data = schema.deserialize(dict(
+            user_group_name=group_name,
+            user_group_description=description,
+            user_group_owner=owner.username,
+            user_group_active=active,
+            ))
+    except validation_schema.Invalid as err:
+        raise JSONRPCValidationError(colander_exc=err)
+
+    try:
         user_group = UserGroupModel().create(
-            name=group_name, description=description, owner=owner,
-            active=active)
+            name=schema_data['user_group_name'],
+            description=schema_data['user_group_description'],
+            owner=owner,
+            active=schema_data['user_group_active'])
         Session().flush()
         creation_data = user_group.get_api_data()
         audit_logger.store_api(
diff --git a/rhodecode/model/validation_schema/schemas/user_group_schema.py b/rhodecode/model/validation_schema/schemas/user_group_schema.py
new file mode 100644
index 00000000..217ebd11
--- /dev/null
+++ b/rhodecode/model/validation_schema/schemas/user_group_schema.py
@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017 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 re
+import colander
+
+from rhodecode.model.validation_schema import types, validators
+from rhodecode.translation import _
+
+
+@colander.deferred
+def deferred_user_group_name_validator(node, kw):
+
+    def name_validator(node, value):
+
+        msg = _('Allowed in name are letters, numbers, and `-`, `_`, `.` '
+                'Name must start with a letter or number. Got `{}`').format(value)
+
+        if not re.match(r'^[a-zA-Z0-9]{1}[a-zA-Z0-9\-\_\.]+$', value):
+            raise colander.Invalid(node, msg)
+
+    return name_validator
+
+
+@colander.deferred
+def deferred_user_group_owner_validator(node, kw):
+
+    def owner_validator(node, value):
+        from rhodecode.model.db import User
+        existing = User.get_by_username(value)
+        if not existing:
+            msg = _(u'User group owner with id `{}` does not exists').format(value)
+            raise colander.Invalid(node, msg)
+
+    return owner_validator
+
+
+class UserGroupSchema(colander.Schema):
+
+    user_group_name = colander.SchemaNode(
+        colander.String(),
+        validator=deferred_user_group_name_validator)
+
+    user_group_description = colander.SchemaNode(
+        colander.String(), missing='')
+
+    user_group_owner = colander.SchemaNode(
+        colander.String(),
+        validator=deferred_user_group_owner_validator)
+
+    user_group_active = colander.SchemaNode(
+        types.StringBooleanType(),
+        missing=False)
+
+    def deserialize(self, cstruct):
+        """
+        Custom deserialize that allows to chain validation, and verify
+        permissions, and as last step uniqueness
+        """
+
+        appstruct = super(UserGroupSchema, self).deserialize(cstruct)
+        return appstruct

From 9c7ed2caf3c9d9ec2e5a07a18bb8ce55d63e3492 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 21 Jun 2017 15:36:24 +0200
Subject: [PATCH 195/211] user-api: use simple schema validator to be
 consistent how we validate between API and web views.

---
 rhodecode/api/tests/test_create_user.py       | 16 ++++-
 rhodecode/api/views/user_api.py               | 51 +++++++++++---
 rhodecode/api/views/user_group_api.py         |  4 +-
 .../validation_schema/schemas/user_schema.py  | 66 ++++++++++++++++++-
 4 files changed, 123 insertions(+), 14 deletions(-)

diff --git a/rhodecode/api/tests/test_create_user.py b/rhodecode/api/tests/test_create_user.py
index 32c9e202..e866c39f 100644
--- a/rhodecode/api/tests/test_create_user.py
+++ b/rhodecode/api/tests/test_create_user.py
@@ -59,6 +59,21 @@ class TestCreateUser(object):
         expected = "email `%s` already exist" % (TEST_USER_REGULAR_EMAIL,)
         assert_error(id_, expected, given=response.body)
 
+    def test_api_create_user_with_wrong_username(self):
+        bad_username = '<> HELLO WORLD <>'
+        id_, params = build_data(
+            self.apikey, 'create_user',
+            username=bad_username,
+            email='new@email.com',
+            password='trololo')
+        response = api_call(self.app, params)
+
+        expected = {'username':
+                        "Username may only contain alphanumeric characters "
+                        "underscores, periods or dashes and must begin with "
+                        "alphanumeric character or underscore"}
+        assert_error(id_, expected, given=response.body)
+
     def test_api_create_user(self):
         username = 'test_new_api_user'
         email = username + "@foo.com"
@@ -175,7 +190,6 @@ class TestCreateUser(object):
             fixture.destroy_repo_group(username)
             fixture.destroy_user(usr.user_id)
 
-
     @mock.patch.object(UserModel, 'create_or_update', crash)
     def test_api_create_user_when_exception_happened(self):
 
diff --git a/rhodecode/api/views/user_api.py b/rhodecode/api/views/user_api.py
index 61c696b2..4d18b89e 100644
--- a/rhodecode/api/views/user_api.py
+++ b/rhodecode/api/views/user_api.py
@@ -20,7 +20,8 @@
 
 import logging
 
-from rhodecode.api import jsonrpc_method, JSONRPCError, JSONRPCForbidden
+from rhodecode.api import (
+    jsonrpc_method, JSONRPCError, JSONRPCForbidden, JSONRPCValidationError)
 from rhodecode.api.utils import (
     Optional, OAttr, has_superadmin_permission, get_user_or_error, store_update)
 from rhodecode.lib import audit_logger
@@ -29,6 +30,8 @@ from rhodecode.lib.exceptions import DefaultUserException
 from rhodecode.lib.utils2 import safe_int, str2bool
 from rhodecode.model.db import Session, User, Repository
 from rhodecode.model.user import UserModel
+from rhodecode.model import validation_schema
+from rhodecode.model.validation_schema.schemas import user_schema
 
 log = logging.getLogger(__name__)
 
@@ -238,17 +241,45 @@ def create_user(request, apiuser, username, email, password=Optional(''),
     if isinstance(create_repo_group, basestring):
         create_repo_group = str2bool(create_repo_group)
 
+    username = Optional.extract(username)
+    password = Optional.extract(password)
+    email = Optional.extract(email)
+    first_name = Optional.extract(firstname)
+    last_name = Optional.extract(lastname)
+    active = Optional.extract(active)
+    admin = Optional.extract(admin)
+    extern_type = Optional.extract(extern_type)
+    extern_name = Optional.extract(extern_name)
+
+    schema = user_schema.UserSchema().bind(
+        # user caller
+        user=apiuser)
+    try:
+        schema_data = schema.deserialize(dict(
+            username=username,
+            email=email,
+            password=password,
+            first_name=first_name,
+            last_name=last_name,
+            active=active,
+            admin=admin,
+            extern_type=extern_type,
+            extern_name=extern_name,
+            ))
+    except validation_schema.Invalid as err:
+        raise JSONRPCValidationError(colander_exc=err)
+
     try:
         user = UserModel().create_or_update(
-            username=Optional.extract(username),
-            password=Optional.extract(password),
-            email=Optional.extract(email),
-            firstname=Optional.extract(firstname),
-            lastname=Optional.extract(lastname),
-            active=Optional.extract(active),
-            admin=Optional.extract(admin),
-            extern_type=Optional.extract(extern_type),
-            extern_name=Optional.extract(extern_name),
+            username=schema_data['username'],
+            password=schema_data['password'],
+            email=schema_data['email'],
+            firstname=schema_data['first_name'],
+            lastname=schema_data['last_name'],
+            active=schema_data['active'],
+            admin=schema_data['admin'],
+            extern_type=schema_data['extern_type'],
+            extern_name=schema_data['extern_name'],
             force_password_change=Optional.extract(force_password_change),
             create_repo_group=create_repo_group
         )
diff --git a/rhodecode/api/views/user_group_api.py b/rhodecode/api/views/user_group_api.py
index 8455b8a8..074a6089 100644
--- a/rhodecode/api/views/user_group_api.py
+++ b/rhodecode/api/views/user_group_api.py
@@ -20,8 +20,8 @@
 
 import logging
 
-from rhodecode.api import jsonrpc_method, JSONRPCError, JSONRPCForbidden, \
-    JSONRPCValidationError
+from rhodecode.api import (
+    jsonrpc_method, JSONRPCError, JSONRPCForbidden, JSONRPCValidationError)
 from rhodecode.api.utils import (
     Optional, OAttr, store_update, has_superadmin_permission, get_origin,
     get_user_or_error, get_user_group_or_error, get_perm_or_error)
diff --git a/rhodecode/model/validation_schema/schemas/user_schema.py b/rhodecode/model/validation_schema/schemas/user_schema.py
index 34014b2d..b01f8781 100644
--- a/rhodecode/model/validation_schema/schemas/user_schema.py
+++ b/rhodecode/model/validation_schema/schemas/user_schema.py
@@ -18,10 +18,12 @@
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
+import re
 import colander
 
 from rhodecode import forms
 from rhodecode.model.db import User
+from rhodecode.model.validation_schema import types, validators
 from rhodecode.translation import _
 from rhodecode.lib.auth import check_password
 
@@ -52,10 +54,72 @@ class ChangePasswordSchema(colander.Schema):
         widget=forms.widget.CheckedPasswordWidget(redisplay=True),
         validator=colander.Length(min=6))
 
-
     def validator(self, form, values):
         if values['current_password'] == values['new_password']:
             exc = colander.Invalid(form)
             exc['new_password'] = _('New password must be different '
                                     'to old password')
             raise exc
+
+
+@colander.deferred
+def deferred_username_validator(node, kw):
+
+    def name_validator(node, value):
+        msg = _(
+            u'Username may only contain alphanumeric characters '
+            u'underscores, periods or dashes and must begin with '
+            u'alphanumeric character or underscore')
+
+        if not re.match(r'^[\w]{1}[\w\-\.]{0,254}$', value):
+            raise colander.Invalid(node, msg)
+
+    return name_validator
+
+
+@colander.deferred
+def deferred_email_validator(node, kw):
+    # NOTE(marcink): we might provide uniqueness validation later here...
+    return colander.Email()
+
+
+class UserSchema(colander.Schema):
+    username = colander.SchemaNode(
+        colander.String(),
+        validator=deferred_username_validator)
+
+    email = colander.SchemaNode(
+        colander.String(),
+        validator=deferred_email_validator)
+
+    password = colander.SchemaNode(
+        colander.String(), missing='')
+
+    first_name = colander.SchemaNode(
+        colander.String(), missing='')
+
+    last_name = colander.SchemaNode(
+        colander.String(), missing='')
+
+    active = colander.SchemaNode(
+        types.StringBooleanType(),
+        missing=False)
+
+    admin = colander.SchemaNode(
+        types.StringBooleanType(),
+        missing=False)
+
+    extern_name = colander.SchemaNode(
+        colander.String(), missing='')
+
+    extern_type = colander.SchemaNode(
+        colander.String(), missing='')
+
+    def deserialize(self, cstruct):
+        """
+        Custom deserialize that allows to chain validation, and verify
+        permissions, and as last step uniqueness
+        """
+
+        appstruct = super(UserSchema, self).deserialize(cstruct)
+        return appstruct

From c315ee8d305e9b6cb40fcec0dc47c915676e95e0 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 23 Jun 2017 11:45:51 +0200
Subject: [PATCH 196/211] security: use custom writer for RST rendering to
 prevent injection of javascript: tags.

---
 rhodecode/lib/markup_renderer.py | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/rhodecode/lib/markup_renderer.py b/rhodecode/lib/markup_renderer.py
index df7e0ead..3060c665 100644
--- a/rhodecode/lib/markup_renderer.py
+++ b/rhodecode/lib/markup_renderer.py
@@ -34,6 +34,8 @@ from mako.template import Template as MakoTemplate
 
 from docutils.core import publish_parts
 from docutils.parsers.rst import directives
+from docutils import writers
+from docutils.writers import html4css1
 import markdown
 
 from rhodecode.lib.markdown_ext import GithubFlavoredMarkdownExtension
@@ -46,6 +48,31 @@ log = logging.getLogger(__name__)
 DEFAULT_COMMENTS_RENDERER = 'rst'
 
 
+class CustomHTMLTranslator(writers.html4css1.HTMLTranslator):
+    """
+    Custom HTML Translator used for sandboxing potential
+    JS injections in ref links
+    """
+
+    def visit_reference(self, node):
+        if 'refuri' in node.attributes:
+            refuri = node['refuri']
+            if ':' in refuri:
+                prefix, link = refuri.lstrip().split(':', 1)
+                if prefix == 'javascript':
+                    # we don't allow javascript type of refs...
+                    node['refuri'] = 'javascript:alert("SandBoxedJavascript")'
+
+        # old style class requires this...
+        return html4css1.HTMLTranslator.visit_reference(self, node)
+
+
+class RhodeCodeWriter(writers.html4css1.Writer):
+    def __init__(self):
+        writers.Writer.__init__(self)
+        self.translator_class = CustomHTMLTranslator
+
+
 def relative_links(html_source, server_path):
     if not html_source:
         return html_source
@@ -341,7 +368,7 @@ class MarkupRenderer(object):
                 directives.register_directive(k, v)
 
             parts = publish_parts(source=source,
-                                  writer_name="html4css1",
+                                  writer=RhodeCodeWriter(),
                                   settings_overrides=docutils_settings)
 
             return parts['html_title'] + parts["fragment"]

From ccf69ffec7341c7ba83274b362425ddce6946cdd Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 23 Jun 2017 12:22:39 +0200
Subject: [PATCH 197/211] audit-logs: don't use old style parser for new audit
 logs.

---
 rhodecode/lib/action_parser.py | 37 ++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/rhodecode/lib/action_parser.py b/rhodecode/lib/action_parser.py
index 3fd57efc..5b8092ea 100644
--- a/rhodecode/lib/action_parser.py
+++ b/rhodecode/lib/action_parser.py
@@ -42,8 +42,13 @@ def action_parser(user_log, feed=False, parse_cs=False):
     :param feed: use output for feeds (no html and fancy icons)
     :param parse_cs: parse Changesets into VCS instances
     """
-    ap = ActionParser(user_log, feed=False, parse_commits=False)
-    return ap.callbacks()
+    if user_log.version == 'v2':
+        ap = AuditLogParser(user_log)
+        return ap.callbacks()
+    else:
+        # old style
+        ap = ActionParser(user_log, feed=False, parse_commits=False)
+        return ap.callbacks()
 
 
 class ActionParser(object):
@@ -304,6 +309,34 @@ class ActionParser(object):
         return self.user_log.repository is None
 
 
+class AuditLogParser(object):
+    def __init__(self, audit_log_entry):
+        self.audit_log_entry = audit_log_entry
+
+    def get_icon(self, action):
+        return 'icon-rhodecode'
+
+    def callbacks(self):
+        action_str = self.audit_log_entry.action
+
+        def callback():
+            # returned callbacks we need to call to get
+            action = action_str \
+                .replace('[', '<span class="journal_highlight">')\
+                .replace(']', '</span>')
+            return literal(action)
+
+        def icon():
+            tmpl = """<i class="%s" alt="%s"></i>"""
+            ico = self.get_icon(action_str)
+            return literal(tmpl % (ico, action_str))
+
+        action_params_func = _no_params_func
+
+        return [
+            callback, action_params_func, icon]
+
+
 def _no_params_func():
     return ""
 

From 710d7ad0b591440d4f4b63cb9a348687ccdec197 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 23 Jun 2017 15:06:05 +0200
Subject: [PATCH 198/211] docs: updated webhook documentation.

---
 docs/integrations/webhook.rst | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/docs/integrations/webhook.rst b/docs/integrations/webhook.rst
index d74221a0..559ba8ef 100644
--- a/docs/integrations/webhook.rst
+++ b/docs/integrations/webhook.rst
@@ -3,9 +3,9 @@
 Webhook integration
 ===================
 
-The Webhook integration allows you to POST events such as repository pushes
-or pull requests to a custom http endpoint as a json dict with details of the
-event.
+The :ref:`creating-integrations` integration allows you to POST events such as
+repository pushes or pull requests to a custom http endpoint as a JSON dict
+with details of the event.
 
 Starting from 4.5.0 release, webhook integration allows to use variables
 inside the URL. For example in URL `https://server-example.com/${repo_name}`
@@ -14,8 +14,10 @@ triggered from. Some of the variables like
 `${branch}` will result in webhook be called multiple times when multiple
 branches are pushed.
 
-Some of the variables like `${pull_request_id}` will be replaced only in
-the pull request related events.
+Starting from 4.8.0 also repository extra fields can be used. A format to use
+them is `${extra:field_key}`. It's usefull to use them to specify custom
+repo only parameters. Some of the variables like `${pull_request_id}`
+will be replaced only in the pull request related events.
 
 To create a webhook integration, select "webhook" in the integration settings
 and use the URL and key from your any previous custom webhook created. See

From fb20d49bf1eb43a70b6503245e977f54eb0cc9dd Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 23 Jun 2017 15:06:22 +0200
Subject: [PATCH 199/211] docs: updated repo extra fields documentation.

---
 docs/admin/repo-extra-fields.rst | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/docs/admin/repo-extra-fields.rst b/docs/admin/repo-extra-fields.rst
index a29a0a2b..7c756a42 100644
--- a/docs/admin/repo-extra-fields.rst
+++ b/docs/admin/repo-extra-fields.rst
@@ -3,8 +3,12 @@
 Repository Extra Fields
 =======================
 
-Extra fields attached to a |repo| allow you to configure additional actions for
-|RCX|. To install and read more about |RCX|, see the :ref:`install-rcx` section.
+Extra fields attached to a |repo| allow you to configure additional fields for
+each repository. This allows storing custom data per-repository.
+
+It can be used in :ref:`integrations-webhook` or in |RCX|.
+To install and read more about |RCX|, see the :ref:`install-rcx` section.
+
 
 Enabling Extra Fields
 ---------------------
@@ -27,9 +31,14 @@ To configure extra fields per repository, use the following steps:
 
 .. image:: ../images/extra-repo-fields.png
 
+The most important is the `New field key` variable which under the value will
+be stored. It needs to be unique for each repository. The label and description
+will be generated in repository settings where users can actually save some
+values inside generated extra fields.
 
-Example Usage
--------------
+
+Example Usage in extensions
+---------------------------
 
 To use the extra fields in an extension, see the example below. For more
 information and examples, see the :ref:`extensions-hooks-ref` section.

From 5fc0ee97f92a31f40043b49cf2c0a00ece8186f7 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 23 Jun 2017 15:06:31 +0200
Subject: [PATCH 200/211] docs: added CI integration docs.

---
 docs/index.rst                     |  2 +-
 docs/integrations/ci.rst           | 97 ++++++++++++++++++++++++++++++
 docs/integrations/integrations.rst |  3 +-
 3 files changed, 100 insertions(+), 2 deletions(-)
 create mode 100644 docs/integrations/ci.rst

diff --git a/docs/index.rst b/docs/index.rst
index 9160f8d2..5b567512 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -20,7 +20,7 @@ and commit files and |repos| while managing their security permissions.
 * Migration from existing databases.
 * |RCM| SDK.
 * Built-in analytics
-* Built in integrations including: Slack, Jenkins, Webhooks, Jira, Redmine, Hipchat
+* Built in integrations including: Slack, Webhooks (used for Jenkins/TeamCity and other CIs), Jira, Redmine, Hipchat
 * Pluggable authentication system.
 * Support for AD, |LDAP|, Crowd, CAS, PAM.
 * Support for external authentication via Oauth Google, Github, Bitbucket, Twitter.
diff --git a/docs/integrations/ci.rst b/docs/integrations/ci.rst
new file mode 100644
index 00000000..7f5bca4e
--- /dev/null
+++ b/docs/integrations/ci.rst
@@ -0,0 +1,97 @@
+.. _integrations-ci:
+
+CI Server integration
+=====================
+
+
+RhodeCode :ref:`integrations-webhook` integration is a powerfull tool to allow
+interaction with systems like Jenkin, Bamboo, TeamCity, CircleCi or any other
+CI server that allows triggering a build using HTTP call.
+
+Below are few examples on how to use :ref:`integrations-webhook` to trigger
+a CI build.
+
+
+General Webhook
++++++++++++++++
+
+:ref:`integrations-webhook` allows sending a JSON payload information to specified
+url with GET or POST methods. There are several variables that could be used
+in the URL greatly extending the flexibility of this type of integration.
+
+Most of the modern CI systems such as Jenkins, TeamCity, Bamboo or CircleCi
+allows triggering builds via GET or POST calls.
+
+:ref:`integrations-webhook` can be either specified per each repository or
+globally, if your CI maps directly to all your projects a global
+:ref:`integrations-webhook` integration can be created and will trigger builds
+for each change in projects. If only some projects allow triggering builds a
+global integration will also work because mostly a CI system will ignore a
+call for unspecified builds.
+
+
+.. note::
+
+    A quick note on security. It's recommended to allow IP restrictions
+    to only allow RhodeCode server to trigger builds. If you need to
+    specify username and password this could be done by embedding it into a
+    trigger URL, e.g. `http://user:password@server.com/job/${project_id}
+
+
+If users require to provide any custom parameters, they can be stored for each
+project inside the :ref:`repo-xtra`. For example to migrate a current job that
+has a numeric build id, storing this as `jenkins_build_id` key extra field
+the url would look like that::
+
+    http://server/job/${extra:jenkins_build_id}/
+
+
+.. note::
+
+    Please note that some variables will result in multiple calls.
+    e.g. for |HG| specifying `${branch}` will trigger as many builds as how
+    many branches the suer actually pushed. Same applies to `${commit_id}`
+    This will trigger many builds if many commits are pushed. This allows
+    triggering individual builds for each pushed commit.
+
+
+Jenkins
++++++++
+
+To use Jenkins CI with RhodeCode, a Jenkins Build with Parameters should be used.
+Plugin details are available here: https://wiki.jenkins.io/display/JENKINS/Build+With+Parameters+Plugin
+
+If the plugin is configured, RhodeCode can trigger builds automatically by
+calling such example url provided in :ref:`integrations-webhook` integration::
+
+    http://server/job/${project_id}/build-branch-${branch}/buildWithParameters?token=TOKEN&PARAMETER=value&PARAMETER2=value2
+
+
+Team City
++++++++++
+
+To use TeamCity CI it's enough to call the API and provide a buildId.
+Example url after configuring :ref:`repo-xtra` would look like that::
+
+    http://teacmtiyserver/viewType.html?buildTypeId=${extra:tc_build_id}
+
+
+Each project can have many build configurations.
+buildTypeId which is a unique ID for each build configuration (job).
+
+
+CircleCi
+++++++++
+
+To use CircleCi, a POST call needs to be triggered. Example build url would
+look like this::
+
+    http://cicleCiServer/project/${repo_type}/${username}/${repo_id}/tree/${branch}
+
+
+Circle Ci expects format of::
+
+    POST: /project/:vcs-type/:username/:project/tree/:branch
+
+
+CircleCi API documentation can be found here: https://circleci.com/docs/api/v1-reference/
diff --git a/docs/integrations/integrations.rst b/docs/integrations/integrations.rst
index 8a705e2d..9cb4f9e1 100644
--- a/docs/integrations/integrations.rst
+++ b/docs/integrations/integrations.rst
@@ -17,7 +17,8 @@ Type/Name                       |RC| Edition    Description
 :ref:`integrations-slack`       |RCCEshort|     https://slack.com/
 :ref:`integrations-hipchat`     |RCCEshort|     https://www.hipchat.com/
 :ref:`integrations-webhook`     |RCCEshort|     POST events as `json` to a custom url
-:ref:`integrations-email`       |RCEEshort|     Send repo push commits by email
+:ref:`integrations-ci`          |RCCEshort|     Trigger Builds for Common CI Systems
+:ref:`integrations-email`       |RCCEshort|     Send repo push commits by email
 :ref:`integrations-redmine`     |RCEEshort|     Close/Resolve/Reference redmine issues
 :ref:`integrations-jira`        |RCEEshort|     Close/Resolve/Reference JIRA issues
 ============================    ============    =====================================

From cb6d81f435dd9d7e194e8a0358beec545e412331 Mon Sep 17 00:00:00 2001
From: Marcin Lulek <mlulek@rhodecode.com>
Date: Mon, 26 Jun 2017 14:48:15 +0200
Subject: [PATCH 201/211] security: escape flash messaged VCS errors to prevent
 XSS atacks.

---
 rhodecode/controllers/changelog.py         | 17 ++++++-------
 rhodecode/controllers/compare.py           | 28 ++++++++++++----------
 rhodecode/controllers/files.py             | 11 ++++-----
 rhodecode/lib/vcs/backends/base.py         |  2 +-
 rhodecode/tests/functional/test_compare.py | 20 ++++++++++++++--
 rhodecode/tests/functional/test_files.py   |  4 ++--
 6 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/rhodecode/controllers/changelog.py b/rhodecode/controllers/changelog.py
index 7c2e7d9b..cf057e6f 100644
--- a/rhodecode/controllers/changelog.py
+++ b/rhodecode/controllers/changelog.py
@@ -67,13 +67,11 @@ class ChangelogController(BaseRepoController):
         except EmptyRepositoryError:
             if not redirect_after:
                 return None
-            h.flash(h.literal(_('There are no commits yet')),
-                    category='warning')
+            h.flash(_('There are no commits yet'), category='warning')
             redirect(url('changelog_home', repo_name=repo.repo_name))
         except RepositoryError as e:
-            msg = safe_str(e)
-            log.exception(msg)
-            h.flash(msg, category='warning')
+            log.exception(safe_str(e))
+            h.flash(safe_str(h.escape(e)), category='warning')
             if not partial:
                 redirect(h.url('changelog_home', repo_name=repo.repo_name))
             raise HTTPBadRequest()
@@ -113,7 +111,7 @@ class ChangelogController(BaseRepoController):
 
     def _check_if_valid_branch(self, branch_name, repo_name, f_path):
         if branch_name not in c.rhodecode_repo.branches_all:
-            h.flash('Branch {} is not found.'.format(branch_name),
+            h.flash('Branch {} is not found.'.format(h.escape(branch_name)),
                     category='warning')
             redirect(url('changelog_file_home', repo_name=repo_name,
                          revision=branch_name, f_path=f_path or ''))
@@ -189,12 +187,11 @@ class ChangelogController(BaseRepoController):
                 collection, p, chunk_size, c.branch_name, dynamic=f_path)
 
         except EmptyRepositoryError as e:
-            h.flash(safe_str(e), category='warning')
+            h.flash(safe_str(h.escape(e)), category='warning')
             return redirect(h.route_path('repo_summary', repo_name=repo_name))
         except (RepositoryError, CommitDoesNotExistError, Exception) as e:
-            msg = safe_str(e)
-            log.exception(msg)
-            h.flash(msg, category='error')
+            log.exception(safe_str(e))
+            h.flash(safe_str(h.escape(e)), category='error')
             return redirect(url('changelog_home', repo_name=repo_name))
 
         if (request.environ.get('HTTP_X_PARTIAL_XHR')
diff --git a/rhodecode/controllers/compare.py b/rhodecode/controllers/compare.py
index 0ffe24ce..4162f319 100644
--- a/rhodecode/controllers/compare.py
+++ b/rhodecode/controllers/compare.py
@@ -24,7 +24,7 @@ Compare controller for showing differences between two commits/refs/tags etc.
 
 import logging
 
-from webob.exc import HTTPBadRequest
+from webob.exc import HTTPBadRequest, HTTPNotFound
 from pylons import request, tmpl_context as c, url
 from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
@@ -66,9 +66,8 @@ class CompareController(BaseRepoController):
             redirect(h.route_path('repo_summary', repo_name=repo.repo_name))
 
         except RepositoryError as e:
-            msg = safe_str(e)
-            log.exception(msg)
-            h.flash(msg, category='warning')
+            log.exception(safe_str(e))
+            h.flash(safe_str(h.escape(e)), category='warning')
             if not partial:
                 redirect(h.route_path('repo_summary', repo_name=repo.repo_name))
             raise HTTPBadRequest()
@@ -86,6 +85,10 @@ class CompareController(BaseRepoController):
         target_repo = request.GET.get('target_repo', source_repo)
         c.source_repo = Repository.get_by_repo_name(source_repo)
         c.target_repo = Repository.get_by_repo_name(target_repo)
+
+        if c.source_repo is None or c.target_repo is None:
+            raise HTTPNotFound()
+
         c.source_ref = c.target_ref = _('Select commit')
         c.source_ref_type = ""
         c.target_ref_type = ""
@@ -141,18 +144,17 @@ class CompareController(BaseRepoController):
         target_repo = Repository.get_by_repo_name(target_repo_name)
 
         if source_repo is None:
-            msg = _('Could not find the original repo: %(repo)s') % {
-                'repo': source_repo}
-
-            log.error(msg)
-            h.flash(msg, category='error')
+            log.error('Could not find the source repo: {}'
+                      .format(source_repo_name))
+            h.flash(_('Could not find the source repo: `{}`')
+                    .format(h.escape(source_repo_name)), category='error')
             return redirect(url('compare_home', repo_name=c.repo_name))
 
         if target_repo is None:
-            msg = _('Could not find the other repo: %(repo)s') % {
-                'repo': target_repo_name}
-            log.error(msg)
-            h.flash(msg, category='error')
+            log.error('Could not find the target repo: {}'
+                      .format(source_repo_name))
+            h.flash(_('Could not find the target repo: `{}`')
+                    .format(h.escape(target_repo_name)), category='error')
             return redirect(url('compare_home', repo_name=c.repo_name))
 
         source_scm = source_repo.scm_instance()
diff --git a/rhodecode/controllers/files.py b/rhodecode/controllers/files.py
index 6a4216f0..34424dcc 100644
--- a/rhodecode/controllers/files.py
+++ b/rhodecode/controllers/files.py
@@ -107,7 +107,7 @@ class FilesController(BaseRepoController):
             h.flash(msg, category='error')
             raise HTTPNotFound()
         except RepositoryError as e:
-            h.flash(safe_str(e), category='error')
+            h.flash(safe_str(h.escape(e)), category='error')
             raise HTTPNotFound()
 
     def __get_filenode_or_redirect(self, repo_name, commit, path):
@@ -128,7 +128,7 @@ class FilesController(BaseRepoController):
             h.flash(_('No such commit exists for this repository'), category='error')
             raise HTTPNotFound()
         except RepositoryError as e:
-            h.flash(safe_str(e), category='error')
+            h.flash(safe_str(h.escape(e)), category='error')
             raise HTTPNotFound()
 
         return file_node
@@ -256,7 +256,7 @@ class FilesController(BaseRepoController):
                     repo_name, c.commit.raw_id, f_path)
 
         except RepositoryError as e:
-            h.flash(safe_str(e), category='error')
+            h.flash(safe_str(h.escape(e)), category='error')
             raise HTTPNotFound()
 
         if request.environ.get('HTTP_X_PJAX'):
@@ -472,9 +472,8 @@ class FilesController(BaseRepoController):
                 _('Successfully deleted file `{}`').format(
                     h.escape(f_path)), category='success')
         except Exception:
-            msg = _('Error occurred during commit')
-            log.exception(msg)
-            h.flash(msg, category='error')
+            log.exception('Error during commit operation')
+            h.flash(_('Error occurred during commit'), category='error')
         return redirect(url('changeset_home',
                             repo_name=c.repo_name, revision='tip'))
 
diff --git a/rhodecode/lib/vcs/backends/base.py b/rhodecode/lib/vcs/backends/base.py
index 51262945..33fee412 100644
--- a/rhodecode/lib/vcs/backends/base.py
+++ b/rhodecode/lib/vcs/backends/base.py
@@ -1066,7 +1066,7 @@ class BaseCommit(object):
     def no_node_at_path(self, path):
         return NodeDoesNotExistError(
             u"There is no file nor directory at the given path: "
-            u"'%s' at commit %s" % (safe_unicode(path), self.short_id))
+            u"`%s` at commit %s" % (safe_unicode(path), self.short_id))
 
     def _fix_path(self, path):
         """
diff --git a/rhodecode/tests/functional/test_compare.py b/rhodecode/tests/functional/test_compare.py
index d262a3b3..56b2414e 100644
--- a/rhodecode/tests/functional/test_compare.py
+++ b/rhodecode/tests/functional/test_compare.py
@@ -489,7 +489,22 @@ class TestCompareController(object):
         compare_page = ComparePage(response)
         compare_page.contains_commits(commits=[commit1], ancestors=[commit0])
 
-    def test_errors_when_comparing_unknown_repo(self, backend):
+    def test_errors_when_comparing_unknown_source_repo(self, backend):
+        repo = backend.repo
+        badrepo = 'badrepo'
+
+        response = self.app.get(
+            url('compare_url',
+                repo_name=badrepo,
+                source_ref_type="rev",
+                source_ref='tip',
+                target_ref_type="rev",
+                target_ref='tip',
+                target_repo=repo.repo_name,
+                merge='1',),
+            status=404)
+
+    def test_errors_when_comparing_unknown_target_repo(self, backend):
         repo = backend.repo
         badrepo = 'badrepo'
 
@@ -504,7 +519,8 @@ class TestCompareController(object):
                 merge='1',),
             status=302)
         redirected = response.follow()
-        redirected.mustcontain('Could not find the other repo: %s' % badrepo)
+        redirected.mustcontain(
+            'Could not find the target repo: `{}`'.format(badrepo))
 
     def test_compare_not_in_preview_mode(self, backend_stub):
         commit0 = backend_stub.repo.get_commit(commit_idx=0)
diff --git a/rhodecode/tests/functional/test_files.py b/rhodecode/tests/functional/test_files.py
index 3ecdecc6..005c73b7 100644
--- a/rhodecode/tests/functional/test_files.py
+++ b/rhodecode/tests/functional/test_files.py
@@ -484,7 +484,7 @@ class TestRawFileHandling(object):
 
         msg = (
             "There is no file nor directory at the given path: "
-            "&#39;%s&#39; at commit %s" % (f_path, commit.short_id))
+            "`%s` at commit %s" % (f_path, commit.short_id))
         response.mustcontain(msg)
 
     def test_raw_ok(self, backend):
@@ -517,7 +517,7 @@ class TestRawFileHandling(object):
                                     f_path=f_path), status=404)
         msg = (
             "There is no file nor directory at the given path: "
-            "&#39;%s&#39; at commit %s" % (f_path, commit.short_id))
+            "`%s` at commit %s" % (f_path, commit.short_id))
         response.mustcontain(msg)
 
     def test_raw_svg_should_not_be_rendered(self, backend):

From 2500061c51b1eb6f5eb34875bd19db9b9f5885ad Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 26 Jun 2017 13:55:07 +0200
Subject: [PATCH 202/211] auth-token: only delete token if it exists.

---
 rhodecode/model/auth_token.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/rhodecode/model/auth_token.py b/rhodecode/model/auth_token.py
index 6b8467fc..87ebe41b 100644
--- a/rhodecode/model/auth_token.py
+++ b/rhodecode/model/auth_token.py
@@ -71,11 +71,13 @@ class AuthTokenModel(BaseModel):
             user = self._get_user(user)
             auth_token = auth_token.filter(UserApiKeys.user_id == user.user_id)
             auth_token = auth_token.scalar()
-        try:
-            Session().delete(auth_token)
-        except Exception:
-            log.error(traceback.format_exc())
-            raise
+
+        if auth_token:
+            try:
+                Session().delete(auth_token)
+            except Exception:
+                log.error(traceback.format_exc())
+                raise
 
     def get_auth_tokens(self, user, show_expired=True):
         user = self._get_user(user)

From 002332dbc2d93d5a8aeaf4d0a007fda8b3ffdb4b Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 27 Jun 2017 15:44:49 +0200
Subject: [PATCH 203/211] markup-renderer: use safe fetching of attributes to
 prevent from errors on malformed html.

---
 rhodecode/lib/markup_renderer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rhodecode/lib/markup_renderer.py b/rhodecode/lib/markup_renderer.py
index 3060c665..e37f362b 100644
--- a/rhodecode/lib/markup_renderer.py
+++ b/rhodecode/lib/markup_renderer.py
@@ -83,12 +83,12 @@ def relative_links(html_source, server_path):
         return html_source
 
     for el in doc.cssselect('img, video'):
-        src = el.attrib['src']
+        src = el.attrib.get('src')
         if src:
             el.attrib['src'] = relative_path(src, server_path)
 
     for el in doc.cssselect('a:not(.gfm)'):
-        src = el.attrib['href']
+        src = el.attrib.get('href')
         if src:
             el.attrib['href'] = relative_path(src, server_path)
 

From 8ed9abe306c9ded809099bca73354cd1d39e0d4e Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 27 Jun 2017 17:19:54 +0200
Subject: [PATCH 204/211] docs: updated api documentation

---
 docs/api/methods/pull-request-methods.rst | 18 +++++++---
 docs/api/methods/repo-methods.rst         | 44 +++++++++++++++++++++++
 2 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/docs/api/methods/pull-request-methods.rst b/docs/api/methods/pull-request-methods.rst
index 7474205a..e26bf5a6 100644
--- a/docs/api/methods/pull-request-methods.rst
+++ b/docs/api/methods/pull-request-methods.rst
@@ -6,7 +6,7 @@ pull_request methods
 close_pull_request 
 ------------------
 
-.. py:function:: close_pull_request(apiuser, repoid, pullrequestid, userid=<Optional:<OptionalAttr:apiuser>>)
+.. py:function:: close_pull_request(apiuser, repoid, pullrequestid, userid=<Optional:<OptionalAttr:apiuser>>, message=<Optional:''>)
 
    Close the pull request specified by `pullrequestid`.
 
@@ -19,6 +19,9 @@ close_pull_request
    :type pullrequestid: int
    :param userid: Close the pull request as this user.
    :type userid: Optional(str or int)
+   :param message: Optional message to close the Pull Request with. If not
+       specified it will be generated automatically.
+   :type message: Optional(str)
 
    Example output:
 
@@ -27,6 +30,7 @@ close_pull_request
        "id": <id_given_in_input>,
        "result": {
            "pull_request_id":  "<int>",
+           "close_status":     "<str:status_lbl>,
            "closed":           "<bool>"
        },
        "error": null
@@ -105,10 +109,12 @@ create_pull_request
    :param description: Set the pull request description.
    :type description: Optional(str)
    :param reviewers: Set the new pull request reviewers list.
+       Reviewer defined by review rules will be added automatically to the
+       defined list.
    :type reviewers: Optional(list)
        Accepts username strings or objects of the format:
 
-           {'username': 'nick', 'reasons': ['original author']}
+           [{'username': 'nick', 'reasons': ['original author'], 'mandatory': <bool>}]
 
 
 get_pull_request 
@@ -320,7 +326,7 @@ merge_pull_request
 update_pull_request 
 -------------------
 
-.. py:function:: update_pull_request(apiuser, repoid, pullrequestid, title=<Optional:''>, description=<Optional:''>, reviewers=<Optional:None>, update_commits=<Optional:None>, close_pull_request=<Optional:None>)
+.. py:function:: update_pull_request(apiuser, repoid, pullrequestid, title=<Optional:''>, description=<Optional:''>, reviewers=<Optional:None>, update_commits=<Optional:None>)
 
    Updates a pull request.
 
@@ -336,10 +342,12 @@ update_pull_request
    :type description: Optional(str)
    :param reviewers: Update pull request reviewers list with new value.
    :type reviewers: Optional(list)
+       Accepts username strings or objects of the format:
+
+           [{'username': 'nick', 'reasons': ['original author'], 'mandatory': <bool>}]
+
    :param update_commits: Trigger update of commits for this pull request
    :type: update_commits: Optional(bool)
-   :param close_pull_request: Close this pull request with rejected state
-   :type: close_pull_request: Optional(bool)
 
    Example output:
 
diff --git a/docs/api/methods/repo-methods.rst b/docs/api/methods/repo-methods.rst
index 0b754a66..6dbc3d7b 100644
--- a/docs/api/methods/repo-methods.rst
+++ b/docs/api/methods/repo-methods.rst
@@ -527,6 +527,7 @@ get_repo_settings
            "id": 237,
            "result": {
                "extensions_largefiles": true,
+               "extensions_evolve": true,
                "hooks_changegroup_push_logger": true,
                "hooks_changegroup_repo_size": false,
                "hooks_outgoing_pull_logger": true,
@@ -762,6 +763,49 @@ lock
      }
 
 
+maintenance 
+-----------
+
+.. py:function:: maintenance(apiuser, repoid)
+
+   Triggers a maintenance on the given repository.
+
+   This command can only be run using an |authtoken| with admin
+   rights to the specified repository. For more information,
+   see :ref:`config-token-ref`.
+
+   This command takes the following options:
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: The repository name or repository ID.
+   :type repoid: str or int
+
+   Example output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : {
+       "msg": "executed maintenance command",
+       "executed_actions": [
+          <action_message>, <action_message2>...
+       ],
+       "repository": "<repository name>"
+     }
+     error :  null
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error :  {
+       "Unable to execute maintenance on `<reponame>`"
+     }
+
+
 pull 
 ----
 

From f123e5af43a6483df848faf47860ce2017f9fa9e Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 27 Jun 2017 21:02:25 +0200
Subject: [PATCH 205/211] manifest: added ee_features directory for images

---
 MANIFEST.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MANIFEST.in b/MANIFEST.in
index e0a6a29b..3e292ac8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -33,6 +33,7 @@ include rhodecode/public/502.html
 # images, css
 include rhodecode/public/css/*.css
 include rhodecode/public/images/*.*
+include rhodecode/public/images/ee_features/*.*
 
 # sound files
 include rhodecode/public/sounds/*.mp3

From 372c7c267c403eec7652072c747786e33b7dbc05 Mon Sep 17 00:00:00 2001
From: Daniel Dourvaris <daniel@rhodecode.com>
Date: Wed, 28 Jun 2017 21:02:21 +0200
Subject: [PATCH 206/211] tooltip: use consistent h.tooltip usage to set
 tooltips.

---
 rhodecode/templates/admin/gists/show.mako            |  2 +-
 .../templates/admin/repos/repo_edit_permissions.mako |  2 +-
 .../templates/admin/settings/settings_email.mako     |  2 +-
 .../templates/admin/settings/settings_sessions.mako  |  2 +-
 rhodecode/templates/base/base.mako                   |  6 +++---
 rhodecode/templates/bookmarks/bookmarks_data.mako    |  6 +++---
 rhodecode/templates/branches/branches_data.mako      |  6 +++---
 rhodecode/templates/changelog/changelog.mako         |  2 +-
 .../templates/changelog/changelog_elements.mako      |  6 +++---
 .../templates/changelog/changelog_file_history.mako  |  2 +-
 rhodecode/templates/changeset/changeset.mako         |  6 +++---
 rhodecode/templates/codeblocks/diffs.mako            |  6 +++---
 rhodecode/templates/codeblocks/source.mako           |  5 +++--
 rhodecode/templates/data_table/_dt_elements.mako     | 12 ++++++------
 rhodecode/templates/files/base.mako                  |  6 +++---
 rhodecode/templates/files/file_authors_box.mako      |  2 +-
 rhodecode/templates/files/files_browser_tree.mako    |  4 ++--
 rhodecode/templates/forks/forks_data.mako            |  2 +-
 .../templates/pullrequests/pullrequest_show.mako     |  4 ++--
 rhodecode/templates/summary/base.mako                |  4 ++--
 rhodecode/templates/summary/summary.mako             |  2 +-
 rhodecode/templates/summary/summary_commits.mako     |  6 +++---
 rhodecode/templates/tags/tags_data.mako              |  6 +++---
 23 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/rhodecode/templates/admin/gists/show.mako b/rhodecode/templates/admin/gists/show.mako
index 91d70852..175dd19c 100644
--- a/rhodecode/templates/admin/gists/show.mako
+++ b/rhodecode/templates/admin/gists/show.mako
@@ -73,7 +73,7 @@
                     </div>
 
                     <div class="author">
-                        <div title="${c.file_last_commit.author}">
+                        <div title="${h.tooltip(c.file_last_commit.author)}">
                           ${self.gravatar_with_user(c.file_last_commit.author, 16)} - ${_('created')} ${h.age_component(c.file_last_commit.date)}
                         </div>
 
diff --git a/rhodecode/templates/admin/repos/repo_edit_permissions.mako b/rhodecode/templates/admin/repos/repo_edit_permissions.mako
index 50deba3d..02b6ac6f 100644
--- a/rhodecode/templates/admin/repos/repo_edit_permissions.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_permissions.mako
@@ -39,7 +39,7 @@
                     <tr>
                         <td colspan="4">
                             <span class="private_repo_msg">
-                            <strong title="${_user.permission}">${_('private repository')}</strong>
+                            <strong title="${h.tooltip(_user.permission)}">${_('private repository')}</strong>
                             </span>
                         </td>
                         <td class="private_repo_msg">
diff --git a/rhodecode/templates/admin/settings/settings_email.mako b/rhodecode/templates/admin/settings/settings_email.mako
index b3f82a0c..8f399beb 100644
--- a/rhodecode/templates/admin/settings/settings_email.mako
+++ b/rhodecode/templates/admin/settings/settings_email.mako
@@ -23,7 +23,7 @@
         <dl class="dl-horizontal settings">
         %for dt, dd, tt in elems:
           <dt >${dt}:</dt>
-          <dd  title="${tt}">${dd}</dd>
+          <dd  title="${h.tooltip(tt)}">${dd}</dd>
         %endfor
         </dl>
     </div>
diff --git a/rhodecode/templates/admin/settings/settings_sessions.mako b/rhodecode/templates/admin/settings/settings_sessions.mako
index 8618223a..e805c204 100644
--- a/rhodecode/templates/admin/settings/settings_sessions.mako
+++ b/rhodecode/templates/admin/settings/settings_sessions.mako
@@ -16,7 +16,7 @@
         <dl class="dl-horizontal settings">
         %for dt, dd, tt in elems:
           <dt>${dt}:</dt>
-          <dd title="${tt}">${dd}</dd>
+          <dd title="${h.tooltip(tt)}">${dd}</dd>
         %endfor
         </dl>
     </div>
diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako
index be474416..949c5c15 100644
--- a/rhodecode/templates/base/base.mako
+++ b/rhodecode/templates/base/base.mako
@@ -90,7 +90,7 @@
     <dl class="dl-horizontal">
     %for dt, dd, title, show_items in elements:
       <dt>${dt}:</dt>
-      <dd title="${title}">
+      <dd title="${h.tooltip(title)}">
       %if callable(dd):
           ## allow lazy evaluation of elements
           ${dd()}
@@ -134,7 +134,7 @@
 
 <%def name="gravatar_with_user(contact, size=16, show_disabled=False)">
   <% email = h.email_or_none(contact) %>
-  <div class="rc-user tooltip" title="${h.author_string(email)}">
+  <div class="rc-user tooltip" title="${h.tooltip(h.author_string(email))}">
     ${self.gravatar(email, size)}
     <span class="${'user user-disabled' if show_disabled else 'user'}"> ${h.link_to_user(contact)}</span>
   </div>
@@ -234,7 +234,7 @@
         ## TODO: anderson: ideally it would have a function on the scm_instance "enable_pullrequest() and enable_fork()"
         %if c.rhodecode_db_repo.repo_type in ['git','hg']:
           <li class="${is_active('showpullrequest')}">
-            <a class="menulink" href="${h.route_path('pullrequest_show_all', repo_name=c.repo_name)}" title="${_('Show Pull Requests for %s') % c.repo_name}">
+            <a class="menulink" href="${h.route_path('pullrequest_show_all', repo_name=c.repo_name)}" title="${h.tooltip(_('Show Pull Requests for %s') % c.repo_name)}">
               %if c.repository_pull_requests:
                 <span class="pr_notifications">${c.repository_pull_requests}</span>
               %endif
diff --git a/rhodecode/templates/bookmarks/bookmarks_data.mako b/rhodecode/templates/bookmarks/bookmarks_data.mako
index 3bf5db1f..aac67b54 100644
--- a/rhodecode/templates/bookmarks/bookmarks_data.mako
+++ b/rhodecode/templates/bookmarks/bookmarks_data.mako
@@ -10,7 +10,7 @@
 
 
 <%def name="name(name, files_url)">
-     <span class="tag booktag" title="${_('Bookmark %s') % (name,)}">
+     <span class="tag booktag" title="${h.tooltip(_('Bookmark %s') % (name,))}">
      <a href="${files_url}">
          <i class="icon-bookmark"></i>
          ${name}
@@ -23,11 +23,11 @@
 </%def>
 
 <%def name="author(author)">
-    <span class="tooltip" title="${author}">${h.link_to_user(author)}</span>
+    <span class="tooltip" title="${h.tooltip(author)}">${h.link_to_user(author)}</span>
 </%def>
 
 <%def name="commit(message, commit_id, commit_idx)">
     <div>
-        <pre><a title="${message}" href="${h.url('files_home',repo_name=c.repo_name,revision=commit_id)}">r${commit_idx}:${h.short_id(commit_id)}</a></pre>
+        <pre><a title="${h.tooltip(message)}" href="${h.url('files_home',repo_name=c.repo_name,revision=commit_id)}">r${commit_idx}:${h.short_id(commit_id)}</a></pre>
     </div>
 </%def>
diff --git a/rhodecode/templates/branches/branches_data.mako b/rhodecode/templates/branches/branches_data.mako
index f3729e32..99798f5e 100644
--- a/rhodecode/templates/branches/branches_data.mako
+++ b/rhodecode/templates/branches/branches_data.mako
@@ -9,7 +9,7 @@
 </%def>
 
 <%def name="name(name, files_url)">
-     <span class="tag branchtag" title="${_('Branch %s') % (name,)}">
+     <span class="tag branchtag" title="${h.tooltip(_('Branch %s') % (name,))}">
      <a href="${files_url}"><i class="icon-code-fork"></i>${name}
         %if name in c.closed_branches:
             [closed]
@@ -23,11 +23,11 @@
 </%def>
 
 <%def name="author(author)">
-    <span class="tooltip" title="${author}">${h.link_to_user(author)}</span>
+    <span class="tooltip" title="${h.tooltip(author)}">${h.link_to_user(author)}</span>
 </%def>
 
 <%def name="commit(message, commit_id, commit_idx)">
     <div>
-        <pre><a title="${message}" href="${h.url('files_home',repo_name=c.repo_name,revision=commit_id)}">r${commit_idx}:${h.short_id(commit_id)}</a></pre>
+        <pre><a title="${h.tooltip(message)}" href="${h.url('files_home',repo_name=c.repo_name,revision=commit_id)}">r${commit_idx}:${h.short_id(commit_id)}</a></pre>
     </div>
 </%def>
diff --git a/rhodecode/templates/changelog/changelog.mako b/rhodecode/templates/changelog/changelog.mako
index d49137f0..dabb94ef 100644
--- a/rhodecode/templates/changelog/changelog.mako
+++ b/rhodecode/templates/changelog/changelog.mako
@@ -37,7 +37,7 @@
                 %if c.rhodecode_db_repo.fork:
                     <span>
                         <a  id="compare_fork_button"
-                            title="${_('Compare fork with %s' % c.rhodecode_db_repo.fork.repo_name)}"
+                            title="${h.tooltip(_('Compare fork with %s' % c.rhodecode_db_repo.fork.repo_name))}"
                             class="btn btn-small"
                             href="${h.url('compare_url',
                                 repo_name=c.rhodecode_db_repo.fork.repo_name,
diff --git a/rhodecode/templates/changelog/changelog_elements.mako b/rhodecode/templates/changelog/changelog_elements.mako
index d3adee3e..43c77eba 100644
--- a/rhodecode/templates/changelog/changelog_elements.mako
+++ b/rhodecode/templates/changelog/changelog_elements.mako
@@ -100,7 +100,7 @@
 
         ## branch
         %if commit.branch:
-          <span class="tag branchtag" title="${_('Branch %s') % commit.branch}">
+          <span class="tag branchtag" title="${h.tooltip(_('Branch %s') % commit.branch)}">
              <a href="${h.url('changelog_home',repo_name=c.repo_name,branch=commit.branch)}"><i class="icon-code-fork"></i>${h.shorter(commit.branch)}</a>
           </span>
         %endif
@@ -108,7 +108,7 @@
         ## bookmarks
         %if h.is_hg(c.rhodecode_repo):
             %for book in commit.bookmarks:
-                <span class="tag booktag" title="${_('Bookmark %s') % book}">
+                <span class="tag booktag" title="${h.tooltip(_('Bookmark %s') % book)}">
                   <a href="${h.url('files_home',repo_name=c.repo_name,revision=commit.raw_id)}"><i class="icon-bookmark"></i>${h.shorter(book)}</a>
                 </span>
             %endfor
@@ -116,7 +116,7 @@
 
         ## tags
         %for tag in commit.tags:
-          <span class="tag tagtag"  title="${_('Tag %s') % tag}">
+          <span class="tag tagtag"  title="${h.tooltip(_('Tag %s') % tag)}">
             <a href="${h.url('files_home',repo_name=c.repo_name,revision=commit.raw_id)}"><i class="icon-tag"></i>${h.shorter(tag)}</a>
           </span>
         %endfor
diff --git a/rhodecode/templates/changelog/changelog_file_history.mako b/rhodecode/templates/changelog/changelog_file_history.mako
index a2921133..5c5b1093 100644
--- a/rhodecode/templates/changelog/changelog_file_history.mako
+++ b/rhodecode/templates/changelog/changelog_file_history.mako
@@ -14,7 +14,7 @@
             </td>
             <td class="td-message">
                 <div class="log-container">
-                    <div class="message_history" title="${cs.message}">
+                    <div class="message_history" title="${h.tooltip(cs.message)}">
                         <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">
                             ${h.shorter(cs.message, 75)}
                         </a>
diff --git a/rhodecode/templates/changeset/changeset.mako b/rhodecode/templates/changeset/changeset.mako
index 840728ed..16cc965a 100644
--- a/rhodecode/templates/changeset/changeset.mako
+++ b/rhodecode/templates/changeset/changeset.mako
@@ -109,20 +109,20 @@
 
             %if h.is_hg(c.rhodecode_repo):
               %for book in c.commit.bookmarks:
-              <span class="booktag tag" title="${_('Bookmark %s') % book}">
+              <span class="booktag tag" title="${h.tooltip(_('Bookmark %s') % book)}">
                 <a href="${h.url('files_home',repo_name=c.repo_name,revision=c.commit.raw_id)}"><i class="icon-bookmark"></i>${h.shorter(book)}</a>
               </span>
               %endfor
             %endif
 
             %for tag in c.commit.tags:
-             <span class="tagtag tag"  title="${_('Tag %s') % tag}">
+             <span class="tagtag tag"  title="${h.tooltip(_('Tag %s') % tag)}">
               <a href="${h.url('files_home',repo_name=c.repo_name,revision=c.commit.raw_id)}"><i class="icon-tag"></i>${tag}</a>
              </span>
             %endfor
 
             %if c.commit.branch:
-              <span class="branchtag tag" title="${_('Branch %s') % c.commit.branch}">
+              <span class="branchtag tag" title="${h.tooltip(_('Branch %s') % c.commit.branch)}">
                 <a href="${h.url('files_home',repo_name=c.repo_name,revision=c.commit.raw_id)}"><i class="icon-code-fork"></i>${h.shorter(c.commit.branch)}</a>
               </span>
             %endif
diff --git a/rhodecode/templates/codeblocks/diffs.mako b/rhodecode/templates/codeblocks/diffs.mako
index 298b6718..75554339 100644
--- a/rhodecode/templates/codeblocks/diffs.mako
+++ b/rhodecode/templates/codeblocks/diffs.mako
@@ -114,7 +114,7 @@ collapse_all = len(diffset.files) > collapse_when_files_over
     <div class="diffset-heading ${diffset.limited_diff and 'diffset-heading-warning' or ''}">
         %if commit:
             <div class="pull-right">
-                <a class="btn tooltip" title="${_('Browse Files at revision {}').format(commit.raw_id)}" href="${h.url('files_home',repo_name=diffset.repo_name, revision=commit.raw_id, f_path='')}">
+                <a class="btn tooltip" title="${h.tooltip(_('Browse Files at revision {}').format(commit.raw_id))}" href="${h.url('files_home',repo_name=diffset.repo_name, revision=commit.raw_id, f_path='')}">
                     ${_('Browse Files')}
                 </a>
             </div>
@@ -640,13 +640,13 @@ from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
 
                 <a
                   class="btn ${c.diffmode == 'sideside' and 'btn-primary'} tooltip"
-                  title="${_('View side by side')}"
+                  title="${h.tooltip(_('View side by side'))}"
                   href="${h.url_replace(diffmode='sideside')}">
                     <span>${_('Side by Side')}</span>
                 </a>
                 <a
                   class="btn ${c.diffmode == 'unified' and 'btn-primary'} tooltip"
-                  title="${_('View unified')}" href="${h.url_replace(diffmode='unified')}">
+                  title="${h.tooltip(_('View unified'))}" href="${h.url_replace(diffmode='unified')}">
                     <span>${_('Unified')}</span>
                 </a>
             </div>
diff --git a/rhodecode/templates/codeblocks/source.mako b/rhodecode/templates/codeblocks/source.mako
index 5f0bbcf9..ddc5be6c 100644
--- a/rhodecode/templates/codeblocks/source.mako
+++ b/rhodecode/templates/codeblocks/source.mako
@@ -5,6 +5,7 @@
     from rhodecode.lib.codeblocks import render_tokenstream
     # avoid module lookup for performance
     html_escape = h.html_escape
+    tooltip = h.tooltip
     %>
     <tr class="cb-line cb-line-fresh ${'cb-annotate' if show_annotation else ''}"
     %if annotation:
@@ -15,13 +16,13 @@
     % if annotation:
         % if show_annotation:
             <td class="cb-annotate-info tooltip"
-                title="Author: ${annotation.author | entity}<br>Date: ${annotation.date}<br>Message: ${annotation.message | entity}"
+                title="Author: ${tooltip(annotation.author) | entity}<br>Date: ${annotation.date}<br>Message: ${annotation.message | entity}"
             >
               ${h.gravatar_with_user(annotation.author, 16) | n}
               <div class="cb-annotate-message truncate-wrap">${h.chop_at_smart(annotation.message, '\n', suffix_if_chopped='...')}</div>
             </td>
             <td class="cb-annotate-message-spacer">
-                <a class="tooltip" href="#show-previous-annotation" onclick="return annotationController.previousAnnotation('${annotation.raw_id}', '${c.f_path}')" title="${_('view annotation from before this change')}">
+                <a class="tooltip" href="#show-previous-annotation" onclick="return annotationController.previousAnnotation('${annotation.raw_id}', '${c.f_path}')" title="${tooltip(_('view annotation from before this change'))}">
                     <i class="icon-left"></i>
                 </a>
             </td>
diff --git a/rhodecode/templates/data_table/_dt_elements.mako b/rhodecode/templates/data_table/_dt_elements.mako
index c26fd812..57345e1f 100644
--- a/rhodecode/templates/data_table/_dt_elements.mako
+++ b/rhodecode/templates/data_table/_dt_elements.mako
@@ -92,22 +92,22 @@
 
 <%def name="rss(name)">
   %if c.rhodecode_user.username != h.DEFAULT_USER:
-    <a title="${_('Subscribe to %s rss feed')% name}" href="${h.url('rss_feed_home',repo_name=name,auth_token=c.rhodecode_user.feed_token)}"><i class="icon-rss-sign"></i></a>
+    <a title="${h.tooltip(_('Subscribe to %s rss feed')% name)}" href="${h.url('rss_feed_home',repo_name=name,auth_token=c.rhodecode_user.feed_token)}"><i class="icon-rss-sign"></i></a>
   %else:
-    <a title="${_('Subscribe to %s rss feed')% name}" href="${h.url('rss_feed_home',repo_name=name)}"><i class="icon-rss-sign"></i></a>
+    <a title="${h.tooltip(_('Subscribe to %s rss feed')% name)}" href="${h.url('rss_feed_home',repo_name=name)}"><i class="icon-rss-sign"></i></a>
   %endif
 </%def>
 
 <%def name="atom(name)">
   %if c.rhodecode_user.username != h.DEFAULT_USER:
-    <a title="${_('Subscribe to %s atom feed')% name}" href="${h.url('atom_feed_home',repo_name=name,auth_token=c.rhodecode_user.feed_token)}"><i class="icon-rss-sign"></i></a>
+    <a title="${h.tooltip(_('Subscribe to %s atom feed')% name)}" href="${h.url('atom_feed_home',repo_name=name,auth_token=c.rhodecode_user.feed_token)}"><i class="icon-rss-sign"></i></a>
   %else:
-    <a title="${_('Subscribe to %s atom feed')% name}" href="${h.url('atom_feed_home',repo_name=name)}"><i class="icon-rss-sign"></i></a>
+    <a title="${h.tooltip(_('Subscribe to %s atom feed')% name)}" href="${h.url('atom_feed_home',repo_name=name)}"><i class="icon-rss-sign"></i></a>
   %endif
 </%def>
 
 <%def name="user_gravatar(email, size=16)">
-  <div class="rc-user tooltip" title="${h.author_string(email)}">
+  <div class="rc-user tooltip" title="${h.tooltip(h.author_string(email))}">
     ${base.gravatar(email, 16)}
   </div>
 </%def>
@@ -134,7 +134,7 @@
     %elif repo_state == 'repo_state_created':
         <div class="tag tag1">${_('Created')}</div>
     %else:
-        <div class="tag alert2" title="${repo_state}">invalid</div>
+        <div class="tag alert2" title="${h.tooltip(repo_state)}">invalid</div>
     %endif
   </div>
 </%def>
diff --git a/rhodecode/templates/files/base.mako b/rhodecode/templates/files/base.mako
index acfeb6c9..fc9a7548 100644
--- a/rhodecode/templates/files/base.mako
+++ b/rhodecode/templates/files/base.mako
@@ -7,20 +7,20 @@
 
     %if h.is_hg(c.rhodecode_repo):
         %for book in commit.bookmarks:
-            <span class="booktag tag" title="${_('Bookmark %s') % book}">
+            <span class="booktag tag" title="${h.tooltip(_('Bookmark %s') % book)}">
               <a href="${h.url('files_home',repo_name=c.repo_name,revision=commit.raw_id)}"><i class="icon-bookmark"></i>${h.shorter(book)}</a>
             </span>
         %endfor
     %endif
 
     %for tag in commit.tags:
-        <span class="tagtag tag"  title="${_('Tag %s') % tag}">
+        <span class="tagtag tag"  title="${h.tooltip(_('Tag %s') % tag)}">
             <a href="${h.url('files_home',repo_name=c.repo_name,revision=commit.raw_id)}"><i class="icon-tag"></i>${tag}</a>
         </span>
     %endfor
 
     %if commit.branch:
-        <span class="branchtag tag" title="${_('Branch %s') % commit.branch}">
+        <span class="branchtag tag" title="${h.tooltip(_('Branch %s') % commit.branch)}">
           <a href="${h.url('files_home',repo_name=c.repo_name,revision=commit.raw_id)}"><i class="icon-code-fork"></i>${h.shorter(commit.branch)}</a>
         </span>
     %endif
diff --git a/rhodecode/templates/files/file_authors_box.mako b/rhodecode/templates/files/file_authors_box.mako
index fcf683ea..c23fd858 100644
--- a/rhodecode/templates/files/file_authors_box.mako
+++ b/rhodecode/templates/files/file_authors_box.mako
@@ -15,7 +15,7 @@
 <ul class="sidebar-right-content">
     % for email, user in sorted(c.authors, key=lambda e: c.file_last_commit.author_email!=e[0]):
     <li class="file_author">
-        <div class="rc-user tooltip" title="${h.author_string(email)}">
+        <div class="rc-user tooltip" title="${h.tooltip(h.author_string(email))}">
           ${base.gravatar(email, 16)}
           <span class="user">${h.link_to_user(user)}</span>
         </div>
diff --git a/rhodecode/templates/files/files_browser_tree.mako b/rhodecode/templates/files/files_browser_tree.mako
index d7e828db..5d074037 100644
--- a/rhodecode/templates/files/files_browser_tree.mako
+++ b/rhodecode/templates/files/files_browser_tree.mako
@@ -58,14 +58,14 @@
               </td>
               <td class="td-hash" data-attr-name="commit_id">
                   % if c.full_load:
-                  <div class="tooltip" title="${node.last_commit.message}">
+                  <div class="tooltip" title="${h.tooltip(node.last_commit.message)}">
                       <pre data-commit-id="${node.last_commit.raw_id}">r${node.last_commit.revision}:${node.last_commit.short_id}</pre>
                   </div>
                   % endif
               </td>
               <td class="td-user" data-attr-name="author">
                   % if c.full_load:
-                  <span data-author="${node.last_commit.author}" title="${node.last_commit.author}">${h.gravatar_with_user(node.last_commit.author)|n}</span>
+                  <span data-author="${node.last_commit.author}" title="${h.tooltip(node.last_commit.author)}">${h.gravatar_with_user(node.last_commit.author)|n}</span>
                   % endif
               </td>
             %else:
diff --git a/rhodecode/templates/forks/forks_data.mako b/rhodecode/templates/forks/forks_data.mako
index 78030ed7..d02a7fb8 100644
--- a/rhodecode/templates/forks/forks_data.mako
+++ b/rhodecode/templates/forks/forks_data.mako
@@ -25,7 +25,7 @@
                 ${h.age_component(f.created_on, time_is_local=True)}
             </td>
             <td class="td-compare">
-                <a title="${_('Compare fork with %s' % c.repo_name)}"
+                <a title="${h.tooltip(_('Compare fork with %s' % c.repo_name))}"
                    href="${h.url('compare_url',repo_name=c.repo_name, source_ref_type=c.rhodecode_db_repo.landing_rev[0],source_ref=c.rhodecode_db_repo.landing_rev[1],target_repo=f.repo_name,target_ref_type=c.rhodecode_db_repo.landing_rev[0],target_ref=c.rhodecode_db_repo.landing_rev[1], merge=1)}"
                    class="btn-link"><i class="icon-loop"></i> ${_('Compare fork')}</a>
             </td>
diff --git a/rhodecode/templates/pullrequests/pullrequest_show.mako b/rhodecode/templates/pullrequests/pullrequest_show.mako
index a823dbb4..0b8b2abe 100644
--- a/rhodecode/templates/pullrequests/pullrequest_show.mako
+++ b/rhodecode/templates/pullrequests/pullrequest_show.mako
@@ -369,7 +369,7 @@
                             <i class="icon-remove-sign"></i>
                         </div>
                         <div class="reviewer_member_mandatory">
-                            <i class="icon-lock" title="Mandatory reviewer"></i>
+                            <i class="icon-lock" title="${h.tooltip(_('Mandatory reviewer'))}"></i>
                         </div>
                   % else:
                     %if c.allowed_to_update:
@@ -500,7 +500,7 @@
                                 <tr id="row-${commit.raw_id}" commit_id="${commit.raw_id}" class="compare_select">
                                 <td>
                                     <div class="commit-change-indicator color-${c_type}-border">
-                                      <div class="commit-change-content color-${c_type} tooltip" title="${cc_title}">
+                                      <div class="commit-change-content color-${c_type} tooltip" title="${h.tooltip(cc_title)}">
                                         ${c_type.upper()}
                                       </div>
                                     </div>
diff --git a/rhodecode/templates/summary/base.mako b/rhodecode/templates/summary/base.mako
index 687a8101..1ab74481 100644
--- a/rhodecode/templates/summary/base.mako
+++ b/rhodecode/templates/summary/base.mako
@@ -10,8 +10,8 @@
 
 
 <%def name="head_extra()">
-    <link href="${h.url('atom_feed_home',repo_name=c.rhodecode_db_repo.repo_name,auth_token=c.rhodecode_user.feed_token)}" rel="alternate" title="${_('%s ATOM feed') % c.repo_name}" type="application/atom+xml" />
-    <link href="${h.url('rss_feed_home',repo_name=c.rhodecode_db_repo.repo_name,auth_token=c.rhodecode_user.feed_token)}" rel="alternate" title="${_('%s RSS feed') % c.repo_name}" type="application/rss+xml" />
+    <link href="${h.url('atom_feed_home',repo_name=c.rhodecode_db_repo.repo_name,auth_token=c.rhodecode_user.feed_token)}" rel="alternate" title="${h.tooltip(_('%s ATOM feed') % c.repo_name)}" type="application/atom+xml" />
+    <link href="${h.url('rss_feed_home',repo_name=c.rhodecode_db_repo.repo_name,auth_token=c.rhodecode_user.feed_token)}" rel="alternate" title="${h.tooltip(_('%s RSS feed') % c.repo_name)}" type="application/rss+xml" />
 </%def>
 
 
diff --git a/rhodecode/templates/summary/summary.mako b/rhodecode/templates/summary/summary.mako
index 63f7cc9e..7ec018f4 100644
--- a/rhodecode/templates/summary/summary.mako
+++ b/rhodecode/templates/summary/summary.mako
@@ -44,7 +44,7 @@
 %if c.readme_data:
 <div id="readme" class="anchor">
 <div class="box" >
-    <div class="title" title="${_('Readme file from commit %s:%s') % (c.rhodecode_db_repo.landing_rev[0], c.rhodecode_db_repo.landing_rev[1])}">
+    <div class="title" title="${h.tooltip(_('Readme file from commit %s:%s') % (c.rhodecode_db_repo.landing_rev[0], c.rhodecode_db_repo.landing_rev[1]))}">
         <h3 class="breadcrumbs">
             <a href="${h.url('files_home',repo_name=c.repo_name,revision='tip',f_path=c.readme_file)}">${c.readme_file}</a>
         </h3>
diff --git a/rhodecode/templates/summary/summary_commits.mako b/rhodecode/templates/summary/summary_commits.mako
index 46547052..6538e307 100644
--- a/rhodecode/templates/summary/summary_commits.mako
+++ b/rhodecode/templates/summary/summary_commits.mako
@@ -59,21 +59,21 @@
           <div class="autoexpand">
             %if h.is_hg(c.rhodecode_repo):
                 %for book in cs.bookmarks:
-                     <span class="booktag tag" title="${_('Bookmark %s') % book}">
+                     <span class="booktag tag" title="${h.tooltip(_('Bookmark %s') % book)}">
                      <a href="${h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id)}"><i class="icon-bookmark"></i>${h.shorter(book)}</a>
                      </span>
                 %endfor
             %endif
             ## tags
             %for tag in cs.tags:
-             <span class="tagtag tag" title="${_('Tag %s') % tag}">
+             <span class="tagtag tag" title="${h.tooltip(_('Tag %s') % tag)}">
              <a href="${h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id)}"><i class="icon-tag"></i>${h.shorter(tag)}</a>
              </span>
             %endfor
 
             ## branch
             %if cs.branch:
-             <span class="branchtag tag" title="${_('Branch %s') % cs.branch}">
+             <span class="branchtag tag" title="${h.tooltip(_('Branch %s') % cs.branch)}">
               <a href="${h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch)}"><i class="icon-code-fork"></i>${h.shorter(cs.branch)}</a>
              </span>
             %endif
diff --git a/rhodecode/templates/tags/tags_data.mako b/rhodecode/templates/tags/tags_data.mako
index ee37461c..23c05e64 100644
--- a/rhodecode/templates/tags/tags_data.mako
+++ b/rhodecode/templates/tags/tags_data.mako
@@ -9,7 +9,7 @@
 </%def>
 
 <%def name="name(name, files_url)">
-     <span class="tagtag tag" title="${_('Tag %s') % (name,)}">
+     <span class="tagtag tag" title="${h.tooltip(_('Tag %s') % (name,))}">
      <a href="${files_url}"><i class="icon-tag"></i>${name}</a>
      </span>
 </%def>
@@ -19,11 +19,11 @@
 </%def>
 
 <%def name="author(author)">
-    <span class="tooltip" title="${author}">${h.link_to_user(author)}</span>
+    <span class="tooltip" title="${h.tooltip(author)}">${h.link_to_user(author)}</span>
 </%def>
 
 <%def name="commit(message, commit_id, commit_idx)">
     <div>
-        <pre><a title="${message}" href="${h.url('files_home',repo_name=c.repo_name,revision=commit_id)}">r${commit_idx}:${h.short_id(commit_id)}</a></pre>
+        <pre><a title="${h.tooltip(message)}" href="${h.url('files_home',repo_name=c.repo_name,revision=commit_id)}">r${commit_idx}:${h.short_id(commit_id)}</a></pre>
     </div>
 </%def>

From f53db19687be18e68e33aeae32ce3954ff1905ec Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 28 Jun 2017 14:03:57 +0200
Subject: [PATCH 207/211] diffs: simplified the datastructure of fillediff.
 Hopefully this will allow better Garbage Collection.

---
 rhodecode/controllers/changeset.py        |  6 ++-
 rhodecode/controllers/compare.py          |  6 ++-
 rhodecode/lib/codeblocks.py               | 20 ++++-----
 rhodecode/templates/codeblocks/diffs.mako | 55 +++++++++++------------
 4 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/rhodecode/controllers/changeset.py b/rhodecode/controllers/changeset.py
index cd5a8ee3..88ce4c99 100644
--- a/rhodecode/controllers/changeset.py
+++ b/rhodecode/controllers/changeset.py
@@ -267,8 +267,10 @@ class ChangesetController(BaseRepoController):
                     repo_name=c.repo_name,
                     source_node_getter=_node_getter(commit1),
                     target_node_getter=_node_getter(commit2),
-                    comments=inline_comments
-                ).render_patchset(_parsed, commit1.raw_id, commit2.raw_id)
+                    comments=inline_comments)
+                diffset = diffset.render_patchset(
+                    _parsed, commit1.raw_id, commit2.raw_id)
+
                 c.changes[commit.raw_id] = diffset
             else:
                 # downloads/raw we only need RAW diff nothing else
diff --git a/rhodecode/controllers/compare.py b/rhodecode/controllers/compare.py
index 4162f319..5fa38733 100644
--- a/rhodecode/controllers/compare.py
+++ b/rhodecode/controllers/compare.py
@@ -271,11 +271,13 @@ class CompareController(BaseRepoController):
                     return None
             return get_node
 
-        c.diffset = codeblocks.DiffSet(
+        diffset = codeblocks.DiffSet(
             repo_name=source_repo.repo_name,
             source_node_getter=_node_getter(source_commit),
             target_node_getter=_node_getter(target_commit),
-        ).render_patchset(_parsed, source_ref, target_ref)
+        )
+        c.diffset = diffset.render_patchset(
+            _parsed, source_ref, target_ref)
 
         c.preview_mode = merge
         c.source_commit = source_commit
diff --git a/rhodecode/lib/codeblocks.py b/rhodecode/lib/codeblocks.py
index a31bf6d4..ab1c1c1e 100644
--- a/rhodecode/lib/codeblocks.py
+++ b/rhodecode/lib/codeblocks.py
@@ -471,31 +471,29 @@ class DiffSet(object):
         source_file_type = source_lexer.name
         target_file_type = target_lexer.name
 
-        op_hunks = patch['chunks'][0]
-        hunks = patch['chunks'][1:]
-
         filediff = AttributeDict({
             'source_file_path': source_file_path,
             'target_file_path': target_file_path,
             'source_filenode': source_filenode,
             'target_filenode': target_filenode,
-            'hunks': [],
             'source_file_type': target_file_type,
             'target_file_type': source_file_type,
-            'patch': patch,
+            'patch': {'filename': patch['filename'], 'stats': patch['stats']},
+            'operation': patch['operation'],
             'source_mode': patch['stats']['old_mode'],
             'target_mode': patch['stats']['new_mode'],
             'limited_diff': isinstance(patch, LimitedDiffContainer),
+            'hunks': [],
             'diffset': self,
         })
 
-        for hunk in hunks:
+        for hunk in patch['chunks'][1:]:
             hunkbit = self.parse_hunk(hunk, source_file, target_file)
-            hunkbit.filediff = filediff
+            hunkbit.source_file_path = source_file_path
+            hunkbit.target_file_path = target_file_path
             filediff.hunks.append(hunkbit)
 
         left_comments = {}
-
         if source_file_path in self.comments_store:
             for lineno, comments in self.comments_store[source_file_path].items():
                 left_comments[lineno] = comments
@@ -503,8 +501,8 @@ class DiffSet(object):
         if target_file_path in self.comments_store:
             for lineno, comments in self.comments_store[target_file_path].items():
                 left_comments[lineno] = comments
-
         filediff.left_comments = left_comments
+
         return filediff
 
     def parse_hunk(self, hunk, source_file, target_file):
@@ -519,6 +517,7 @@ class DiffSet(object):
         before, after = [], []
 
         for line in hunk['lines']:
+
             if line['action'] == 'unmod':
                 result.lines.extend(
                     self.parse_lines(before, after, source_file, target_file))
@@ -567,7 +566,8 @@ class DiffSet(object):
                     before_tokens = [('nonl', before['line'])]
                 else:
                     before_tokens = self.get_line_tokens(
-                        line_text=before['line'], line_number=before['old_lineno'],
+                        line_text=before['line'],
+                        line_number=before['old_lineno'],
                         file=source_file)
                 original.lineno = before['old_lineno']
                 original.content = before['line']
diff --git a/rhodecode/templates/codeblocks/diffs.mako b/rhodecode/templates/codeblocks/diffs.mako
index 75554339..28c56017 100644
--- a/rhodecode/templates/codeblocks/diffs.mako
+++ b/rhodecode/templates/codeblocks/diffs.mako
@@ -147,14 +147,14 @@ collapse_all = len(diffset.files) > collapse_when_files_over
     %for i, filediff in enumerate(diffset.files):
 
         <%
-        lines_changed = filediff['patch']['stats']['added'] + filediff['patch']['stats']['deleted']
+        lines_changed = filediff.patch['stats']['added'] + filediff.patch['stats']['deleted']
         over_lines_changed_limit = lines_changed > lines_changed_limit
         %>
         <input ${collapse_all and 'checked' or ''} class="filediff-collapse-state" id="filediff-collapse-${id(filediff)}" type="checkbox">
         <div
             class="filediff"
-            data-f-path="${filediff['patch']['filename']}"
-            id="a_${h.FID('', filediff['patch']['filename'])}">
+            data-f-path="${filediff.patch['filename']}"
+            id="a_${h.FID('', filediff.patch['filename'])}">
             <label for="filediff-collapse-${id(filediff)}" class="filediff-heading">
                 <div class="filediff-collapse-indicator"></div>
                 ${diff_ops(filediff)}
@@ -162,7 +162,7 @@ collapse_all = len(diffset.files) > collapse_when_files_over
             ${diff_menu(filediff, use_comments=use_comments)}
             <table class="cb cb-diff-${c.diffmode} code-highlight ${over_lines_changed_limit and 'cb-collapsed' or ''}">
         %if not filediff.hunks:
-            %for op_id, op_text in filediff['patch']['stats']['ops'].items():
+            %for op_id, op_text in filediff.patch['stats']['ops'].items():
                 <tr>
                     <td class="cb-text cb-${op_class(op_id)}" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=6'}>
                         %if op_id == DEL_FILENODE:
@@ -176,7 +176,7 @@ collapse_all = len(diffset.files) > collapse_when_files_over
                 </tr>
             %endfor
         %endif
-        %if filediff.patch['is_limited_diff']:
+        %if filediff.limited_diff:
                 <tr class="cb-warning cb-collapser">
                     <td class="cb-text" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=6'}>
                         ${_('The requested commit is too big and content was truncated.')} <a href="${link_for(fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a>
@@ -322,7 +322,6 @@ collapse_all = len(diffset.files) > collapse_when_files_over
 
 <%def name="diff_ops(filediff)">
 <%
-stats = filediff['patch']['stats']
 from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
     MOD_FILENODE, RENAMED_FILENODE, CHMOD_FILENODE, BIN_FILENODE, COPIED_FILENODE
 %>
@@ -330,9 +329,9 @@ from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
         %if filediff.source_file_path and filediff.target_file_path:
             %if filediff.source_file_path != filediff.target_file_path:
                  ## file was renamed, or copied
-                %if RENAMED_FILENODE in stats['ops']:
+                %if RENAMED_FILENODE in filediff.patch['stats']['ops']:
                     <strong>${filediff.target_file_path}</strong> ⬅ <del>${filediff.source_file_path}</del>
-                %elif COPIED_FILENODE in stats['ops']:
+                %elif COPIED_FILENODE in filediff.patch['stats']['ops']:
                     <strong>${filediff.target_file_path}</strong> ⬅ ${filediff.source_file_path}
                 %endif
             %else:
@@ -350,19 +349,19 @@ from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
         %endif
     </span>
     <span class="pill-group" style="float: left">
-        %if filediff.patch['is_limited_diff']:
+        %if filediff.limited_diff:
         <span class="pill tooltip" op="limited" title="The stats for this diff are not complete">limited diff</span>
         %endif
 
-        %if RENAMED_FILENODE in stats['ops']:
+        %if RENAMED_FILENODE in filediff.patch['stats']['ops']:
         <span class="pill" op="renamed">renamed</span>
         %endif
 
-        %if COPIED_FILENODE in stats['ops']:
+        %if COPIED_FILENODE in filediff.patch['stats']['ops']:
         <span class="pill" op="copied">copied</span>
         %endif
 
-        %if NEW_FILENODE in stats['ops']:
+        %if NEW_FILENODE in filediff.patch['stats']['ops']:
         <span class="pill" op="created">created</span>
             %if filediff['target_mode'].startswith('120'):
         <span class="pill" op="symlink">symlink</span>
@@ -371,11 +370,11 @@ from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
             %endif
         %endif
 
-        %if DEL_FILENODE in stats['ops']:
+        %if DEL_FILENODE in filediff.patch['stats']['ops']:
         <span class="pill" op="removed">removed</span>
         %endif
 
-        %if CHMOD_FILENODE in stats['ops']:
+        %if CHMOD_FILENODE in filediff.patch['stats']['ops']:
         <span class="pill" op="mode">
             ${nice_mode(filediff['source_mode'])} ➡ ${nice_mode(filediff['target_mode'])}
         </span>
@@ -385,17 +384,17 @@ from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
     <a class="pill filediff-anchor" href="#a_${h.FID('', filediff.patch['filename'])}">¶</a>
 
     <span class="pill-group" style="float: right">
-        %if BIN_FILENODE in stats['ops']:
+        %if BIN_FILENODE in filediff.patch['stats']['ops']:
         <span class="pill" op="binary">binary</span>
-            %if MOD_FILENODE in stats['ops']:
+            %if MOD_FILENODE in filediff.patch['stats']['ops']:
             <span class="pill" op="modified">modified</span>
             %endif
         %endif
-        %if stats['added']:
-        <span class="pill" op="added">+${stats['added']}</span>
+        %if filediff.patch['stats']['added']:
+        <span class="pill" op="added">+${filediff.patch['stats']['added']}</span>
         %endif
-        %if stats['deleted']:
-        <span class="pill" op="deleted">-${stats['deleted']}</span>
+        %if filediff.patch['stats']['deleted']:
+        <span class="pill" op="deleted">-${filediff.patch['stats']['deleted']}</span>
         %endif
     </span>
 
@@ -408,7 +407,7 @@ from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
 <%def name="diff_menu(filediff, use_comments=False)">
     <div class="filediff-menu">
 %if filediff.diffset.source_ref:
-    %if filediff.patch['operation'] in ['D', 'M']:
+    %if filediff.operation in ['D', 'M']:
         <a
             class="tooltip"
             href="${h.url('files_home',repo_name=filediff.diffset.repo_name,f_path=filediff.source_file_path,revision=filediff.diffset.source_ref)}"
@@ -424,7 +423,7 @@ from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
             ${_('Show file before')}
         </span> |
     %endif
-    %if filediff.patch['operation'] in ['A', 'M']:
+    %if filediff.operation in ['A', 'M']:
         <a
             class="tooltip"
             href="${h.url('files_home',repo_name=filediff.diffset.source_repo_name,f_path=filediff.target_file_path,revision=filediff.diffset.target_ref)}"
@@ -460,10 +459,10 @@ from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
 
         ## TODO: dan: refactor ignorews_url and context_url into the diff renderer same as diffmode=unified/sideside. Also use ajax to load more context (by clicking hunks)
         %if hasattr(c, 'ignorews_url'):
-        ${c.ignorews_url(request.GET, h.FID('', filediff['patch']['filename']))}
+        ${c.ignorews_url(request.GET, h.FID('', filediff.patch['filename']))}
         %endif
         %if hasattr(c, 'context_url'):
-        ${c.context_url(request.GET, h.FID('', filediff['patch']['filename']))}
+        ${c.context_url(request.GET, h.FID('', filediff.patch['filename']))}
         %endif
 
         %if use_comments:
@@ -503,9 +502,9 @@ from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
     <%
     old_line_anchor, new_line_anchor = None, None
     if line.original.lineno:
-        old_line_anchor = diff_line_anchor(hunk.filediff.source_file_path, line.original.lineno, 'o')
+        old_line_anchor = diff_line_anchor(hunk.source_file_path, line.original.lineno, 'o')
     if line.modified.lineno:
-        new_line_anchor = diff_line_anchor(hunk.filediff.target_file_path, line.modified.lineno, 'n')
+        new_line_anchor = diff_line_anchor(hunk.target_file_path, line.modified.lineno, 'n')
     %>
 
     <tr class="cb-line">
@@ -579,9 +578,9 @@ from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
     <%
     old_line_anchor, new_line_anchor = None, None
     if old_line_no:
-        old_line_anchor = diff_line_anchor(hunk.filediff.source_file_path, old_line_no, 'o')
+        old_line_anchor = diff_line_anchor(hunk.source_file_path, old_line_no, 'o')
     if new_line_no:
-        new_line_anchor = diff_line_anchor(hunk.filediff.target_file_path, new_line_no, 'n')
+        new_line_anchor = diff_line_anchor(hunk.target_file_path, new_line_no, 'n')
     %>
     <tr class="cb-line">
         <td class="cb-data ${action_class(action)}">

From eb83813cc91fff6d3939f58f8faff9c0a4291d30 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 28 Jun 2017 14:01:46 +0200
Subject: [PATCH 208/211] dependencies: bumped objgraph to 3.1.0.

---
 pkgs/python-packages.nix | 6 +++---
 requirements.txt         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix
index 28d541fd..a68148fe 100644
--- a/pkgs/python-packages.nix
+++ b/pkgs/python-packages.nix
@@ -1082,13 +1082,13 @@
     };
   };
   objgraph = super.buildPythonPackage {
-    name = "objgraph-2.0.0";
+    name = "objgraph-3.1.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/d7/33/ace750b59247496ed769b170586c5def7202683f3d98e737b75b767ff29e/objgraph-2.0.0.tar.gz";
-      md5 = "25b0d5e5adc74aa63ead15699614159c";
+      url = "https://pypi.python.org/packages/f4/b3/082e54e62094cb2ec84f8d5a49e0142cef99016491cecba83309cff920ae/objgraph-3.1.0.tar.gz";
+      md5 = "eddbd96039796bfbd13eee403701e64a";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
diff --git a/requirements.txt b/requirements.txt
index 883c79c3..50c23cef 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -38,7 +38,7 @@ meld3==1.0.2
 msgpack-python==0.4.8
 MySQL-python==1.2.5
 nose==1.3.6
-objgraph==2.0.0
+objgraph==3.1.0
 packaging==15.2
 paramiko==1.15.1
 Paste==2.0.3

From 33b557522fbad6b04f536aa4eb9a091a5cc0a02d Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 27 Jun 2017 17:26:40 +0200
Subject: [PATCH 209/211] i18n: generated new translation files

---
 rhodecode/i18n/rhodecode.pot                  | 2563 +++++++++--------
 rhodecode/public/js/rhodecode/i18n/be.js      |    9 +
 rhodecode/public/js/rhodecode/i18n/de.js      |    9 +
 rhodecode/public/js/rhodecode/i18n/en.js      |    9 +
 rhodecode/public/js/rhodecode/i18n/es.js      |    9 +
 rhodecode/public/js/rhodecode/i18n/fr.js      |    9 +
 rhodecode/public/js/rhodecode/i18n/it.js      |    9 +
 rhodecode/public/js/rhodecode/i18n/ja.js      |    9 +
 .../js/rhodecode/i18n/js_translations.js      |    9 +
 rhodecode/public/js/rhodecode/i18n/pl.js      |    9 +
 rhodecode/public/js/rhodecode/i18n/pt.js      |    9 +
 rhodecode/public/js/rhodecode/i18n/ru.js      |    9 +
 rhodecode/public/js/rhodecode/i18n/zh.js      |    9 +
 13 files changed, 1475 insertions(+), 1196 deletions(-)

diff --git a/rhodecode/i18n/rhodecode.pot b/rhodecode/i18n/rhodecode.pot
index cd24c880..5c1b0c51 100644
--- a/rhodecode/i18n/rhodecode.pot
+++ b/rhodecode/i18n/rhodecode.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rhodecode-enterprise-ce 4.7.0\n"
+"Project-Id-Version: rhodecode-enterprise-ce 4.8.0\n"
 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
-"POT-Creation-Date: 2017-04-07 13:01+0200\n"
+"POT-Creation-Date: 2017-06-27 17:25+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,7 +24,7 @@ msgid "Global"
 msgstr ""
 
 #: rhodecode/apps/admin/navigation.py:84
-#: rhodecode/templates/admin/repos/repo_edit.mako:52
+#: rhodecode/templates/admin/repos/repo_edit.mako:55
 msgid "VCS"
 msgstr ""
 
@@ -37,7 +37,7 @@ msgid "Remap and Rescan"
 msgstr ""
 
 #: rhodecode/apps/admin/navigation.py:87
-#: rhodecode/templates/admin/repos/repo_edit.mako:58
+#: rhodecode/templates/admin/repos/repo_edit.mako:61
 msgid "Issue Tracker"
 msgstr ""
 
@@ -48,7 +48,7 @@ msgstr ""
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:97
 #: rhodecode/templates/admin/users/user_add.mako:86
 #: rhodecode/templates/admin/users/user_edit_profile.mako:65
-#: rhodecode/templates/admin/users/users.mako:64
+#: rhodecode/templates/admin/users/users.mako:65
 #: rhodecode/templates/email_templates/user_registration.mako:25
 #: rhodecode/templates/users/user_profile.mako:51
 msgid "Email"
@@ -75,7 +75,7 @@ msgstr ""
 #: rhodecode/templates/admin/integrations/new.mako:17
 #: rhodecode/templates/admin/integrations/new.mako:23
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:51
-#: rhodecode/templates/admin/repos/repo_edit.mako:72
+#: rhodecode/templates/admin/repos/repo_edit.mako:75
 #: rhodecode/templates/base/base.mako:82
 msgid "Integrations"
 msgstr ""
@@ -97,11 +97,11 @@ msgstr ""
 msgid "Labs"
 msgstr ""
 
-#: rhodecode/apps/admin/views/sessions.py:86
+#: rhodecode/apps/admin/views/sessions.py:92
 msgid "Cleaned up old sessions"
 msgstr ""
 
-#: rhodecode/apps/admin/views/sessions.py:92
+#: rhodecode/apps/admin/views/sessions.py:98
 msgid "Failed to cleanup up old sessions"
 msgstr ""
 
@@ -113,245 +113,409 @@ msgstr ""
 msgid "Failed to generate the Apache configuration for Subversion."
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:95
+#: rhodecode/apps/admin/views/system_info.py:99
 msgid "Note: please make sure this server can access `${url}` for the update link to work"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:98
+#: rhodecode/apps/admin/views/system_info.py:102
 msgid "Update info"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:100
+#: rhodecode/apps/admin/views/system_info.py:104
 msgid "Check for updates"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:105
+#: rhodecode/apps/admin/views/system_info.py:109
 msgid "RhodeCode Version"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:106
+#: rhodecode/apps/admin/views/system_info.py:110
 msgid "RhodeCode Server IP"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:107
+#: rhodecode/apps/admin/views/system_info.py:111
 msgid "RhodeCode Server ID"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:108
+#: rhodecode/apps/admin/views/system_info.py:112
 msgid "RhodeCode Configuration"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:109
-msgid "Workers"
-msgstr ""
-
-#: rhodecode/apps/admin/views/system_info.py:110
-msgid "Worker Type"
+#: rhodecode/apps/admin/views/system_info.py:113
+msgid "RhodeCode Certificate"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:114
-msgid "Database"
+msgid "Workers"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:115
-msgid "Database version"
+msgid "Worker Type"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:119
-msgid "Platform"
+msgid "Database"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:120
+msgid "Database version"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:124
+msgid "Platform"
+msgstr ""
+
+#: rhodecode/apps/admin/views/system_info.py:125
 msgid "Platform UUID"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:121
+#: rhodecode/apps/admin/views/system_info.py:126
 msgid "Python version"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:122
+#: rhodecode/apps/admin/views/system_info.py:127
 msgid "Python path"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:126
+#: rhodecode/apps/admin/views/system_info.py:131
 msgid "CPU"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:127
+#: rhodecode/apps/admin/views/system_info.py:132
 msgid "Load"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:128
+#: rhodecode/apps/admin/views/system_info.py:133
 msgid "Memory"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:129
+#: rhodecode/apps/admin/views/system_info.py:134
 msgid "Uptime"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:133
+#: rhodecode/apps/admin/views/system_info.py:138
 msgid "Storage location"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:134
+#: rhodecode/apps/admin/views/system_info.py:139
 msgid "Storage info"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:135
+#: rhodecode/apps/admin/views/system_info.py:140
 msgid "Storage inodes"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:137
+#: rhodecode/apps/admin/views/system_info.py:142
 msgid "Gist storage location"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:138
+#: rhodecode/apps/admin/views/system_info.py:143
 msgid "Gist storage info"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:140
+#: rhodecode/apps/admin/views/system_info.py:145
 msgid "Archive cache storage location"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:141
+#: rhodecode/apps/admin/views/system_info.py:146
 msgid "Archive cache info"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:143
+#: rhodecode/apps/admin/views/system_info.py:148
 msgid "Temp storage location"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:144
+#: rhodecode/apps/admin/views/system_info.py:149
 msgid "Temp storage info"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:146
+#: rhodecode/apps/admin/views/system_info.py:151
 msgid "Search info"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:147
+#: rhodecode/apps/admin/views/system_info.py:152
 msgid "Search location"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:151
+#: rhodecode/apps/admin/views/system_info.py:156
 msgid "VCS Backends"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:152
+#: rhodecode/apps/admin/views/system_info.py:157
 msgid "VCS Server"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:153
+#: rhodecode/apps/admin/views/system_info.py:158
 msgid "GIT"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:154
+#: rhodecode/apps/admin/views/system_info.py:159
 msgid "HG"
 msgstr ""
 
-#: rhodecode/apps/admin/views/system_info.py:155
+#: rhodecode/apps/admin/views/system_info.py:160
 msgid "SVN"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:60
-#: rhodecode/controllers/admin/users.py:359
-#: rhodecode/controllers/admin/users.py:380
+#: rhodecode/apps/admin/views/users.py:63
+#: rhodecode/controllers/admin/users.py:360
+#: rhodecode/controllers/admin/users.py:381
 #: rhodecode/controllers/admin/users.py:412
 #: rhodecode/controllers/admin/users.py:486
-#: rhodecode/controllers/admin/users.py:499
-#: rhodecode/controllers/admin/users.py:557
 msgid "You can't edit this user"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:178
-#: rhodecode/apps/my_account/views.py:138
+#: rhodecode/apps/admin/views/users.py:168
+#: rhodecode/apps/my_account/views.py:148
 #: rhodecode/controllers/admin/gists.py:62
 msgid "forever"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:179
-#: rhodecode/apps/my_account/views.py:139
+#: rhodecode/apps/admin/views/users.py:169
+#: rhodecode/apps/my_account/views.py:149
 #: rhodecode/controllers/admin/gists.py:63
 msgid "5 minutes"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:180
-#: rhodecode/apps/my_account/views.py:140
+#: rhodecode/apps/admin/views/users.py:170
+#: rhodecode/apps/my_account/views.py:150
 #: rhodecode/controllers/admin/gists.py:64
 msgid "1 hour"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:181
-#: rhodecode/apps/my_account/views.py:141
+#: rhodecode/apps/admin/views/users.py:171
+#: rhodecode/apps/my_account/views.py:151
 #: rhodecode/controllers/admin/gists.py:65
 msgid "1 day"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:182
-#: rhodecode/apps/my_account/views.py:142
+#: rhodecode/apps/admin/views/users.py:172
+#: rhodecode/apps/my_account/views.py:152
 #: rhodecode/controllers/admin/gists.py:66
 msgid "1 month"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:184
-#: rhodecode/apps/my_account/views.py:144
+#: rhodecode/apps/admin/views/users.py:174
+#: rhodecode/apps/my_account/views.py:154
 #: rhodecode/controllers/admin/gists.py:70
 msgid "Lifetime"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:188
-#: rhodecode/apps/my_account/views.py:148
+#: rhodecode/apps/admin/views/users.py:178
+#: rhodecode/apps/my_account/views.py:158
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:16
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:16
 msgid "Role"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:219
-#: rhodecode/apps/my_account/views.py:175
+#: rhodecode/apps/admin/views/users.py:217
+#: rhodecode/apps/my_account/views.py:191
 msgid "Auth token successfully created"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:240
-#: rhodecode/apps/my_account/views.py:192
+#: rhodecode/apps/admin/views/users.py:246
+#: rhodecode/apps/my_account/views.py:215
 msgid "Auth token successfully deleted"
 msgstr ""
 
-#: rhodecode/apps/admin/views/users.py:284
+#: rhodecode/apps/admin/views/users.py:290
+#: rhodecode/apps/my_account/views.py:253
+#, python-format
+msgid "Added new email address `%s` for user account"
+msgstr ""
+
+#: rhodecode/apps/admin/views/users.py:296
+#: rhodecode/apps/my_account/views.py:259
+msgid "An error occurred during email saving"
+msgstr ""
+
+#: rhodecode/apps/admin/views/users.py:323
+msgid "Removed email address from user account"
+msgstr ""
+
+#: rhodecode/apps/admin/views/users.py:372
+#, python-format
+msgid "An error occurred during ip saving:%s"
+msgstr ""
+
+#: rhodecode/apps/admin/views/users.py:389
+msgid "An error occurred during ip saving"
+msgstr ""
+
+#: rhodecode/apps/admin/views/users.py:393
+#, python-format
+msgid "Added ips %s to user whitelist"
+msgstr ""
+
+#: rhodecode/apps/admin/views/users.py:423
+msgid "Removed ip address from user whitelist"
+msgstr ""
+
+#: rhodecode/apps/admin/views/users.py:472
 msgid "Groups successfully changed"
 msgstr ""
 
-#: rhodecode/apps/login/views.py:247 rhodecode/apps/login/views.py:316
+#: rhodecode/apps/home/views.py:197 rhodecode/apps/home/views.py:230
+#: rhodecode/controllers/pullrequests.py:191
+#: rhodecode/templates/admin/my_account/my_account.mako:38
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:128
+#: rhodecode/templates/admin/repos/repo_add.mako:15
+#: rhodecode/templates/admin/repos/repo_add.mako:19
+#: rhodecode/templates/admin/users/user_edit_advanced.mako:11
+#: rhodecode/templates/base/base.mako:76 rhodecode/templates/base/base.mako:148
+#: rhodecode/templates/base/base.mako:575
+msgid "Repositories"
+msgstr ""
+
+#: rhodecode/apps/home/views.py:223
+msgid "Groups"
+msgstr ""
+
+#: rhodecode/apps/home/views.py:243
+#, python-format
+msgid "Commits in %(repo)s"
+msgstr ""
+
+#: rhodecode/apps/login/views.py:270 rhodecode/apps/login/views.py:339
 msgid "Bad captcha"
 msgstr ""
 
-#: rhodecode/apps/login/views.py:256
+#: rhodecode/apps/login/views.py:279
 msgid "You have successfully registered with RhodeCode"
 msgstr ""
 
-#: rhodecode/apps/login/views.py:292
+#: rhodecode/apps/login/views.py:315
 msgid "If such email exists, a password reset link was sent to it."
 msgstr ""
 
-#: rhodecode/apps/login/views.py:298
+#: rhodecode/apps/login/views.py:321
 msgid "Password reset has been disabled."
 msgstr ""
 
-#: rhodecode/apps/login/views.py:381
+#: rhodecode/apps/login/views.py:410
 msgid "Given reset token is invalid"
 msgstr ""
 
-#: rhodecode/apps/login/views.py:389
+#: rhodecode/apps/login/views.py:418
 msgid "Your password reset was successful, a new password has been sent to your email"
 msgstr ""
 
-#: rhodecode/apps/my_account/views.py:115
+#: rhodecode/apps/my_account/views.py:125
 msgid "Error occurred during update of user password"
 msgstr ""
 
-#: rhodecode/apps/my_account/views.py:122
+#: rhodecode/apps/my_account/views.py:132
 msgid "Successfully updated password"
 msgstr ""
 
+#: rhodecode/apps/my_account/views.py:281
+msgid "Email successfully deleted"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_caches.py:70
+msgid "Cache invalidation successful"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_caches.py:74
+msgid "An error occurred during cache invalidation"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_permissions.py:95
+msgid "Repository permissions updated"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_settings.py:171
+msgid "Repository {} updated successfully"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_settings.py:175
+msgid "Error occurred during update of repository {}"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:93
+#, python-format
+msgid "Detached %s forks"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:96
+#, python-format
+msgid "Deleted %s forks"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:109
+#, python-format
+msgid "Deleted repository `%s`"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:116
+msgid "detach or delete"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:117
+msgid "Cannot delete `{repo}` it still contains attached forks. Try using {delete_or_detach} option."
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:127
+#, python-format
+msgid "An error occurred during deletion of `%s`"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:152
+msgid "Updated repository visibility in public journal"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:156
+msgid "An error occurred during setting this repository in public journal"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:184
+msgid "Nothing"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:186
+#, python-format
+msgid "Marked repo %s as fork of %s"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:193
+msgid "An error occurred during this operation"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:217
+msgid "Locked repository"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:220
+msgid "Unlocked repository"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_settings_advanced.py:223
+#: rhodecode/controllers/admin/repos.py:363
+msgid "An error occurred during unlocking"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_summary.py:293
+msgid "Branch"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_summary.py:294
+msgid "Tag"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_summary.py:295
+msgid "Bookmark"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_summary.py:318
+#: rhodecode/controllers/files.py:1021 rhodecode/model/pull_request.py:1345
+#: rhodecode/model/scm.py:775 rhodecode/templates/base/vcs_settings.mako:255
+msgid "Branches"
+msgstr ""
+
+#: rhodecode/apps/repository/views/repo_summary.py:319
+msgid "Closed branches"
+msgstr ""
+
 #: rhodecode/apps/svn_support/events.py:30
 msgid "Configuration for Apaache mad_dav_svn changed."
 msgstr ""
@@ -408,7 +572,7 @@ msgid "The Port in use by the Atlassian CROWD Server"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:69
-#: rhodecode/authentication/plugins/auth_ldap.py:84
+#: rhodecode/authentication/plugins/auth_ldap.py:86
 msgid "Port"
 msgstr ""
 
@@ -436,7 +600,7 @@ msgstr ""
 msgid "Admin Groups"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_crowd.py:215
+#: rhodecode/authentication/plugins/auth_crowd.py:216
 msgid "CROWD"
 msgstr ""
 
@@ -483,126 +647,129 @@ msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:74
 msgid ""
-"Host of the LDAP Server \n"
-"(e.g., 192.168.2.154, or ldap-server.domain.com"
+"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:77
+#: rhodecode/authentication/plugins/auth_ldap.py:78
 msgid "LDAP Host"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:82
-msgid "Custom port that the LDAP server is listening on. Default: 389"
+#: rhodecode/authentication/plugins/auth_ldap.py:83
+msgid "Custom port that the LDAP server is listening on. Default value is: 389"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:90
+#: rhodecode/authentication/plugins/auth_ldap.py:92
 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 admin@mydomain.com"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:95
+#: rhodecode/authentication/plugins/auth_ldap.py:97
 msgid "Account"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:100
+#: rhodecode/authentication/plugins/auth_ldap.py:102
 msgid "Password to authenticate for given user DN."
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:103
+#: rhodecode/authentication/plugins/auth_ldap.py:105
 #: rhodecode/templates/login.mako:50 rhodecode/templates/register.mako:48
 #: rhodecode/templates/admin/my_account/my_account.mako:30
 #: rhodecode/templates/admin/users/user_add.mako:44
-#: rhodecode/templates/base/base.mako:313
+#: rhodecode/templates/base/base.mako:315
 #: rhodecode/templates/debug_style/login.html:45
 msgid "Password"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:108
+#: rhodecode/authentication/plugins/auth_ldap.py:110
 msgid "TLS Type"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:109
+#: rhodecode/authentication/plugins/auth_ldap.py:111
 msgid "Connection Security"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:115
-msgid "Require Cert over TLS?"
+#: rhodecode/authentication/plugins/auth_ldap.py:117
+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:116
+#: rhodecode/authentication/plugins/auth_ldap.py:120
 msgid "Certificate Checks"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:122
+#: rhodecode/authentication/plugins/auth_ldap.py:126
 msgid ""
 "Base DN to search. Dynamic bind is supported. Add `$login` marker in it to be replaced with current user credentials \n"
 "(e.g., dc=mydomain,dc=com, or ou=Users,dc=mydomain,dc=com)"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:127
+#: rhodecode/authentication/plugins/auth_ldap.py:131
 msgid "Base DN"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:132
+#: rhodecode/authentication/plugins/auth_ldap.py:136
 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:137
+#: rhodecode/authentication/plugins/auth_ldap.py:141
 msgid "LDAP Search Filter"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:143
+#: rhodecode/authentication/plugins/auth_ldap.py:147
 msgid "How deep to search LDAP. If unsure set to SUBTREE"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:144
+#: rhodecode/authentication/plugins/auth_ldap.py:148
 msgid "LDAP Search Scope"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:150
+#: rhodecode/authentication/plugins/auth_ldap.py:154
 msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:152
+#: rhodecode/authentication/plugins/auth_ldap.py:156
 msgid "Login Attribute"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:153
+#: rhodecode/authentication/plugins/auth_ldap.py:157
 msgid "The LDAP Login attribute of the CN must be specified"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:158
+#: rhodecode/authentication/plugins/auth_ldap.py:162
 msgid "LDAP Attribute to map to first name (e.g., givenName)"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:161
+#: rhodecode/authentication/plugins/auth_ldap.py:165
 msgid "First Name Attribute"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:166
+#: rhodecode/authentication/plugins/auth_ldap.py:170
 msgid "LDAP Attribute to map to last name (e.g., sn)"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:169
+#: rhodecode/authentication/plugins/auth_ldap.py:173
 msgid "Last Name Attribute"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:174
+#: rhodecode/authentication/plugins/auth_ldap.py:178
 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:179
+#: rhodecode/authentication/plugins/auth_ldap.py:183
 msgid "Email Attribute"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:360
+#: rhodecode/authentication/plugins/auth_ldap.py:365
 msgid "LDAP"
 msgstr ""
 
@@ -634,74 +801,71 @@ msgstr ""
 msgid "Rhodecode Token Auth"
 msgstr ""
 
-#: rhodecode/controllers/changelog.py:91 rhodecode/controllers/compare.py:64
-#: rhodecode/controllers/pullrequests.py:204
+#: rhodecode/controllers/changelog.py:70 rhodecode/controllers/compare.py:64
+#: rhodecode/controllers/pullrequests.py:85
 msgid "There are no commits yet"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:77
+#: rhodecode/controllers/changeset.py:76
 msgid "Show whitespace"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:78
+#: rhodecode/controllers/changeset.py:77
 msgid "Show whitespace for all diffs"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:84
+#: rhodecode/controllers/changeset.py:83
 msgid "Ignore whitespace"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:85
+#: rhodecode/controllers/changeset.py:84
 msgid "Ignore whitespace for all diffs"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:141
+#: rhodecode/controllers/changeset.py:140
 msgid "Increase context"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:142
+#: rhodecode/controllers/changeset.py:141
 msgid "Increase context for all diffs"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:190 rhodecode/controllers/files.py:106
-#: rhodecode/controllers/files.py:127
+#: rhodecode/controllers/changeset.py:189 rhodecode/controllers/files.py:106
+#: rhodecode/controllers/files.py:128
 msgid "No such commit exists for this repository"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:344
-#: rhodecode/controllers/pullrequests.py:985
-#: rhodecode/model/pull_request.py:1055
+#: rhodecode/controllers/changeset.py:343
+#: rhodecode/controllers/pullrequests.py:919
 #, python-format
 msgid "Status change %(transition_icon)s %(status)s"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:389
+#: rhodecode/controllers/changeset.py:387
 msgid "Changing the status of a commit associated with a closed pull request is not allowed"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:89
+#: rhodecode/controllers/compare.py:92
 msgid "Select commit"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:144
-#, python-format
-msgid "Could not find the original repo: %(repo)s"
+#: rhodecode/controllers/compare.py:149
+msgid "Could not find the source repo: `{}`"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:152
-#, python-format
-msgid "Could not find the other repo: %(repo)s"
+#: rhodecode/controllers/compare.py:156
+msgid "Could not find the target repo: `{}`"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:164
+#: rhodecode/controllers/compare.py:166
 msgid "The comparison of two different kinds of remote repos is not available"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:202
+#: rhodecode/controllers/compare.py:204
 msgid "Could not compare repos with different large file settings"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:242
+#: rhodecode/controllers/compare.py:244
 #, python-format
 msgid "Repositories unrelated. Cannot compare commit %(commit1)s from repository %(repo1)s with commit %(commit2)s from repository %(repo2)s."
 msgstr ""
@@ -725,51 +889,47 @@ msgstr ""
 msgid "There are no files yet. %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:435 rhodecode/controllers/files.py:488
-#: rhodecode/controllers/files.py:519 rhodecode/controllers/files.py:594
-#: rhodecode/controllers/files.py:639 rhodecode/controllers/files.py:730
+#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:487
+#: rhodecode/controllers/files.py:518 rhodecode/controllers/files.py:593
+#: rhodecode/controllers/files.py:638 rhodecode/controllers/files.py:729
 #, python-format
 msgid "This repository has been locked by %s on %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:443 rhodecode/controllers/files.py:496
+#: rhodecode/controllers/files.py:442 rhodecode/controllers/files.py:495
 msgid "You can only delete files with revision being a valid branch "
 msgstr ""
 
-#: rhodecode/controllers/files.py:452 rhodecode/controllers/files.py:505
-#, python-format
-msgid "Deleted file %s via RhodeCode Enterprise"
+#: rhodecode/controllers/files.py:451 rhodecode/controllers/files.py:504
+msgid "Deleted file {} via RhodeCode Enterprise"
 msgstr ""
 
 #: rhodecode/controllers/files.py:472
-#, python-format
-msgid "Successfully deleted file %s"
+msgid "Successfully deleted file `{}`"
 msgstr ""
 
-#: rhodecode/controllers/files.py:475 rhodecode/controllers/files.py:581
-#: rhodecode/controllers/files.py:718
+#: rhodecode/controllers/files.py:476 rhodecode/controllers/files.py:582
+#: rhodecode/controllers/files.py:719
 msgid "Error occurred during commit"
 msgstr ""
 
-#: rhodecode/controllers/files.py:527 rhodecode/controllers/files.py:602
+#: rhodecode/controllers/files.py:526 rhodecode/controllers/files.py:601
 msgid "You can only edit files with revision being a valid branch "
 msgstr ""
 
-#: rhodecode/controllers/files.py:539 rhodecode/controllers/files.py:614
-#, python-format
-msgid "Edited file %s via RhodeCode Enterprise"
+#: rhodecode/controllers/files.py:538 rhodecode/controllers/files.py:613
+msgid "Edited file {} via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/controllers/files.py:556
+#: rhodecode/controllers/files.py:555
 msgid "No changes"
 msgstr ""
 
-#: rhodecode/controllers/files.py:578 rhodecode/controllers/files.py:707
-#, python-format
-msgid "Successfully committed to %s"
+#: rhodecode/controllers/files.py:578
+msgid "Successfully committed changes to file `{}`"
 msgstr ""
 
-#: rhodecode/controllers/files.py:652 rhodecode/controllers/files.py:741
+#: rhodecode/controllers/files.py:651 rhodecode/controllers/files.py:740
 msgid "Added file via RhodeCode Enterprise"
 msgstr ""
 
@@ -777,39 +937,37 @@ msgstr ""
 msgid "No filename"
 msgstr ""
 
+#: rhodecode/controllers/files.py:707
+msgid "Successfully committed new file `{}`"
+msgstr ""
+
 #: rhodecode/controllers/files.py:710
 msgid "The location specified must be a relative path and must not contain .. in the path"
 msgstr ""
 
-#: rhodecode/controllers/files.py:764
+#: rhodecode/controllers/files.py:763
 msgid "Downloads disabled"
 msgstr ""
 
-#: rhodecode/controllers/files.py:770
+#: rhodecode/controllers/files.py:769
 #, python-format
 msgid "Unknown revision %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:772
+#: rhodecode/controllers/files.py:771
 msgid "Empty repository"
 msgstr ""
 
-#: rhodecode/controllers/files.py:774 rhodecode/controllers/files.py:808
+#: rhodecode/controllers/files.py:773 rhodecode/controllers/files.py:807
 msgid "Unknown archive type"
 msgstr ""
 
-#: rhodecode/controllers/files.py:993
+#: rhodecode/controllers/files.py:1000
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/controllers/files.py:1014 rhodecode/controllers/summary.py:277
-#: rhodecode/model/pull_request.py:1280 rhodecode/model/scm.py:782
-#: rhodecode/templates/base/vcs_settings.mako:242
-msgid "Branches"
-msgstr ""
-
-#: rhodecode/controllers/files.py:1018 rhodecode/model/scm.py:797
-#: rhodecode/templates/base/vcs_settings.mako:267
+#: rhodecode/controllers/files.py:1025 rhodecode/model/scm.py:790
+#: rhodecode/templates/base/vcs_settings.mako:280
 msgid "Tags"
 msgstr ""
 
@@ -818,27 +976,6 @@ msgstr ""
 msgid "An error occurred during repository forking %s"
 msgstr ""
 
-#: rhodecode/controllers/home.py:207
-msgid "Groups"
-msgstr ""
-
-#: rhodecode/controllers/home.py:214 rhodecode/controllers/home.py:249
-#: rhodecode/controllers/pullrequests.py:310
-#: rhodecode/templates/admin/my_account/my_account.mako:38
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:128
-#: rhodecode/templates/admin/repos/repo_add.mako:15
-#: rhodecode/templates/admin/repos/repo_add.mako:19
-#: rhodecode/templates/admin/users/user_edit_advanced.mako:11
-#: rhodecode/templates/base/base.mako:76 rhodecode/templates/base/base.mako:148
-#: rhodecode/templates/base/base.mako:572
-msgid "Repositories"
-msgstr ""
-
-#: rhodecode/controllers/home.py:227
-#, python-format
-msgid "Commits in %(repo)s"
-msgstr ""
-
 #: rhodecode/controllers/journal.py:107 rhodecode/controllers/journal.py:150
 msgid "public journal"
 msgstr ""
@@ -847,80 +984,58 @@ msgstr ""
 msgid "journal"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:218
+#: rhodecode/controllers/pullrequests.py:99
 msgid "Commit does not exist"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:335
+#: rhodecode/controllers/pullrequests.py:216
 msgid "Pull request requires a title with min. 3 chars"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:337
+#: rhodecode/controllers/pullrequests.py:218
 msgid "Error creating pull request: {}"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:385
+#: rhodecode/controllers/pullrequests.py:276
 msgid "Successfully opened new pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:388
-msgid "Error occurred during sending pull request"
+#: rhodecode/controllers/pullrequests.py:279
+msgid "Error occurred during creation of this pull request."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:431
+#: rhodecode/controllers/pullrequests.py:322
 msgid "Cannot update closed pull requests."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:437
+#: rhodecode/controllers/pullrequests.py:328
 msgid "Pull request title & description updated."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:455
+#: rhodecode/controllers/pullrequests.py:346
 msgid "Pull request updated to \"{source_commit_id}\" with {count_added} added, {count_removed} removed commits. Source of changes: {change_source}"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:472
+#: rhodecode/controllers/pullrequests.py:363
 msgid "Reload page"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:546
+#: rhodecode/controllers/pullrequests.py:437
 msgid "Pull request was successfully merged and closed."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:588
+#: rhodecode/controllers/pullrequests.py:461
+msgid "Pull request reviewers updated."
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:482
 msgid "Successfully deleted pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:592
+#: rhodecode/controllers/pullrequests.py:486
 msgid "Your are not allowed to delete this pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:989
-#: rhodecode/model/pull_request.py:1059
-msgid "Closing with"
-msgstr ""
-
-#: rhodecode/controllers/pullrequests.py:1039
-#, python-format
-msgid "Closing pull request on other statuses than rejected or approved is forbidden. Calculated status from all reviewers is currently: %s"
-msgstr ""
-
-#: rhodecode/controllers/summary.py:251
-msgid "Branch"
-msgstr ""
-
-#: rhodecode/controllers/summary.py:252
-msgid "Tag"
-msgstr ""
-
-#: rhodecode/controllers/summary.py:253
-msgid "Bookmark"
-msgstr ""
-
-#: rhodecode/controllers/summary.py:278
-msgid "Closed branches"
-msgstr ""
-
 #: rhodecode/controllers/admin/defaults.py:84
 msgid "Default settings updated successfully"
 msgstr ""
@@ -976,89 +1091,73 @@ msgstr ""
 msgid "%(expiry)s - current value"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:78
+#: rhodecode/controllers/admin/my_account.py:70
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:138
+#: rhodecode/controllers/admin/my_account.py:110
 msgid "Your account was updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:153
-#: rhodecode/controllers/admin/users.py:184
+#: rhodecode/controllers/admin/my_account.py:125
+#: rhodecode/controllers/admin/users.py:182
 #, python-format
 msgid "Error occurred during update of user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:222
-#: rhodecode/controllers/admin/users.py:527
-#, python-format
-msgid "Added new email address `%s` for user account"
-msgstr ""
-
-#: rhodecode/controllers/admin/my_account.py:229
-#: rhodecode/controllers/admin/users.py:534
-msgid "An error occurred during email saving"
-msgstr ""
-
-#: rhodecode/controllers/admin/my_account.py:239
-#: rhodecode/controllers/admin/users.py:549
-msgid "Removed email address from user account"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:112
+#: rhodecode/controllers/admin/permissions.py:107
 msgid "Application permissions updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:127
-#: rhodecode/controllers/admin/permissions.py:176
-#: rhodecode/controllers/admin/permissions.py:230
+#: rhodecode/controllers/admin/permissions.py:122
+#: rhodecode/controllers/admin/permissions.py:171
+#: rhodecode/controllers/admin/permissions.py:225
 msgid "Error occurred during update of permissions"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:161
+#: rhodecode/controllers/admin/permissions.py:156
 msgid "Object permissions updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:215
+#: rhodecode/controllers/admin/permissions.py:210
 msgid "Global permissions updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/repo_groups.py:197
+#: rhodecode/controllers/admin/repo_groups.py:202
 #, python-format
 msgid "Created repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repo_groups.py:210
+#: rhodecode/controllers/admin/repo_groups.py:215
 #, python-format
 msgid "Error occurred during creation of repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repo_groups.py:258
+#: rhodecode/controllers/admin/repo_groups.py:261
 #, python-format
 msgid "Updated repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repo_groups.py:274
+#: rhodecode/controllers/admin/repo_groups.py:276
 #, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repo_groups.py:296
+#: rhodecode/controllers/admin/repo_groups.py:291
 #, python-format
 msgid "This group contains %(num)d repository and cannot be deleted"
 msgid_plural "This group contains %(num)d repositories and cannot be deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/controllers/admin/repo_groups.py:305
+#: rhodecode/controllers/admin/repo_groups.py:300
 #, python-format
 msgid "This group contains %(num)d subgroup and cannot be deleted"
 msgid_plural "This group contains %(num)d subgroups and cannot be deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/controllers/admin/repo_groups.py:312
+#: rhodecode/controllers/admin/repo_groups.py:313
 #, python-format
 msgid "Removed repository group %s"
 msgstr ""
@@ -1068,366 +1167,285 @@ msgstr ""
 msgid "Error occurred during deletion of repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repo_groups.py:388
-#: rhodecode/controllers/admin/user_groups.py:323
+#: rhodecode/controllers/admin/repo_groups.py:381
+#: rhodecode/controllers/admin/user_groups.py:318
 msgid "Cannot change permission for yourself as admin"
 msgstr ""
 
-#: rhodecode/controllers/admin/repo_groups.py:405
+#: rhodecode/controllers/admin/repo_groups.py:404
 msgid "Repository Group permissions updated"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:129
+#: rhodecode/controllers/admin/repos.py:125
 #, python-format
 msgid "Error creating repository %s: invalid certificate"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:133
+#: rhodecode/controllers/admin/repos.py:129
 #, python-format
 msgid "Error creating repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:274
+#: rhodecode/controllers/admin/repos.py:270
 #, python-format
 msgid "Created repository %s from %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:283
+#: rhodecode/controllers/admin/repos.py:279
 #, python-format
 msgid "Forked repository %s as %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:286
+#: rhodecode/controllers/admin/repos.py:282
 #, python-format
 msgid "Created repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:327
-#, python-format
-msgid "Repository %s updated successfully"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:346
-#, python-format
-msgid "Error occurred during update of repository %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:374
-#, python-format
-msgid "Detached %s forks"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:377
-#, python-format
-msgid "Deleted %s forks"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:382
-#, python-format
-msgid "Deleted repository %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:385
-#, python-format
-msgid "Cannot delete %s it still contains attached forks"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:390
-#, python-format
-msgid "An error occurred during deletion of %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:443
-msgid "Repository permissions updated"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:474
+#: rhodecode/controllers/admin/repos.py:319
 msgid "An error occurred during creation of field"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:489
+#: rhodecode/controllers/admin/repos.py:334
 msgid "An error occurred during removal of field"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:528
-msgid "Updated repository visibility in public journal"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:532
-msgid "An error occurred during setting this repository in public journal"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:556
-msgid "Nothing"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:558
-#, python-format
-msgid "Marked repo %s as fork of %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:565
-msgid "An error occurred during this operation"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:583
-msgid "Locked repository"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:586
-msgid "Unlocked repository"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:589
-#: rhodecode/controllers/admin/repos.py:618
-msgid "An error occurred during unlocking"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:608
+#: rhodecode/controllers/admin/repos.py:353
 msgid "Unlocked"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:612
+#: rhodecode/controllers/admin/repos.py:357
 msgid "Locked"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:614
+#: rhodecode/controllers/admin/repos.py:359
 #, python-format
 msgid "Repository has been %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:629
-msgid "Cache invalidation successful"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:633
-msgid "An error occurred during cache invalidation"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:653
+#: rhodecode/controllers/admin/repos.py:373
 msgid "Pulled from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:656
+#: rhodecode/controllers/admin/repos.py:376
 msgid "An error occurred during pull from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:678
+#: rhodecode/controllers/admin/repos.py:397
 msgid "An error occurred during deletion of repository stats"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:725
+#: rhodecode/controllers/admin/repos.py:443
 msgid "Error occurred during deleting issue tracker entry"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:728
-#: rhodecode/controllers/admin/settings.py:381
+#: rhodecode/controllers/admin/repos.py:446
+#: rhodecode/controllers/admin/settings.py:384
 msgid "Removed issue tracker entry"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:758
-#: rhodecode/controllers/admin/settings.py:428
+#: rhodecode/controllers/admin/repos.py:476
+#: rhodecode/controllers/admin/settings.py:431
 msgid "Updated issue tracker entries"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:819
+#: rhodecode/controllers/admin/repos.py:537
 #: rhodecode/controllers/admin/settings.py:147
-#: rhodecode/controllers/admin/settings.py:619
+#: rhodecode/controllers/admin/settings.py:622
 msgid "Some form inputs contain invalid data."
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:837
+#: rhodecode/controllers/admin/repos.py:555
 msgid "Error occurred during updating repository VCS settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:841
+#: rhodecode/controllers/admin/repos.py:559
 #: rhodecode/controllers/admin/settings.py:176
 msgid "Updated VCS settings"
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:172
-#: rhodecode/controllers/admin/settings.py:283
+#: rhodecode/controllers/admin/settings.py:286
 msgid "Error occurred during updating application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:223
+#: rhodecode/controllers/admin/settings.py:226
 #, python-format
 msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:279
+#: rhodecode/controllers/admin/settings.py:282
 msgid "Updated application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:345
+#: rhodecode/controllers/admin/settings.py:348
 msgid "Updated visualisation settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:348
+#: rhodecode/controllers/admin/settings.py:351
 msgid "Error occurred during updating visualisation settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:441
+#: rhodecode/controllers/admin/settings.py:444
 msgid "Please enter email address"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:459
+#: rhodecode/controllers/admin/settings.py:462
 msgid "Send email task created"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:492
+#: rhodecode/controllers/admin/settings.py:495
 msgid "Added new hook"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:507
+#: rhodecode/controllers/admin/settings.py:510
 msgid "Updated hooks"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:511
+#: rhodecode/controllers/admin/settings.py:514
 msgid "Error occurred during hook creation"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:640
+#: rhodecode/controllers/admin/settings.py:643
 msgid "Error occurred during updating labs settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:645
+#: rhodecode/controllers/admin/settings.py:648
 msgid "Updated Labs settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:165
+#: rhodecode/controllers/admin/user_groups.py:164
 #, python-format
 msgid "Created user group %(user_group_link)s"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:179
+#: rhodecode/controllers/admin/user_groups.py:178
 #, python-format
 msgid "Error occurred during creation of user group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:220
+#: rhodecode/controllers/admin/user_groups.py:218
 #, python-format
 msgid "Updated user group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:236
+#: rhodecode/controllers/admin/user_groups.py:234
 #, python-format
 msgid "Error occurred during update of user group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:258
+#: rhodecode/controllers/admin/user_groups.py:253
 msgid "Successfully deleted user group"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:263
+#: rhodecode/controllers/admin/user_groups.py:258
 msgid "An error occurred during deletion of user group"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:331
+#: rhodecode/controllers/admin/user_groups.py:326
 msgid "Target group cannot be the same"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:337
+#: rhodecode/controllers/admin/user_groups.py:332
 msgid "User Group permissions updated"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:422
+#: rhodecode/controllers/admin/user_groups.py:415
 msgid "User Group global permissions updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:437
+#: rhodecode/controllers/admin/user_groups.py:430
 #: rhodecode/controllers/admin/users.py:477
 msgid "An error occurred during permissions saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:481
+#: rhodecode/controllers/admin/user_groups.py:474
 msgid "User Group synchronization updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:485
+#: rhodecode/controllers/admin/user_groups.py:478
 msgid "An error occurred during synchronization update"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:106
+#: rhodecode/controllers/admin/users.py:108
 #, python-format
 msgid "Created user %(user_link)s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:122
+#: rhodecode/controllers/admin/users.py:124
 #, python-format
 msgid "Error occurred during creation of user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:167
+#: rhodecode/controllers/admin/users.py:166
 msgid "User updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:218
+#: rhodecode/controllers/admin/users.py:209
 #, python-format
 msgid "Detached %s repositories"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:223
+#: rhodecode/controllers/admin/users.py:214
 #, python-format
 msgid "Deleted %s repositories"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:231
+#: rhodecode/controllers/admin/users.py:222
 #, python-format
 msgid "Detached %s repository groups"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:236
+#: rhodecode/controllers/admin/users.py:227
 #, python-format
 msgid "Deleted %s repository groups"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:244
+#: rhodecode/controllers/admin/users.py:235
 #, python-format
 msgid "Detached %s user groups"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:249
+#: rhodecode/controllers/admin/users.py:240
 #, python-format
 msgid "Deleted %s user groups"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:260
+#: rhodecode/controllers/admin/users.py:257
 msgid "Successfully deleted user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:266
+#: rhodecode/controllers/admin/users.py:263
 msgid "An error occurred during deletion of user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:285
+#: rhodecode/controllers/admin/users.py:280
 msgid "Force password change disabled for user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:287
+#: rhodecode/controllers/admin/users.py:285
 msgid "Force password change enabled for user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:291
+#: rhodecode/controllers/admin/users.py:294
 msgid "An error occurred during password reset for user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:324
+#: rhodecode/controllers/admin/users.py:325
 #, python-format
 msgid "Linked repository group `%s` as personal"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:330
+#: rhodecode/controllers/admin/users.py:331
 #, python-format
 msgid "Created repository group `%s`"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:334
+#: rhodecode/controllers/admin/users.py:335
 #, python-format
 msgid "Repository group `%s` is already taken"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:339
+#: rhodecode/controllers/admin/users.py:340
 msgid "An error occurred during repository group creation for user"
 msgstr ""
 
@@ -1435,81 +1453,63 @@ msgstr ""
 msgid "The user participates as reviewer in pull requests and cannot be deleted. You can set the user to \"inactive\" instead of deleting it."
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:461
+#: rhodecode/controllers/admin/users.py:462
 msgid "User global permissions updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:589
-#, python-format
-msgid "An error occurred during ip saving:%s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:604
-msgid "An error occurred during ip saving"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:608
-#, python-format
-msgid "Added ips %s to user whitelist"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:626
-msgid "Removed ip address from user whitelist"
-msgstr ""
-
-#: rhodecode/events/pullrequest.py:68
+#: rhodecode/events/pullrequest.py:71
 msgid "pullrequest created"
 msgstr ""
 
-#: rhodecode/events/pullrequest.py:77
+#: rhodecode/events/pullrequest.py:80
 msgid "pullrequest closed"
 msgstr ""
 
-#: rhodecode/events/pullrequest.py:86
+#: rhodecode/events/pullrequest.py:89
 msgid "pullrequest commits updated"
 msgstr ""
 
-#: rhodecode/events/pullrequest.py:95
+#: rhodecode/events/pullrequest.py:98
 msgid "pullrequest review changed"
 msgstr ""
 
-#: rhodecode/events/pullrequest.py:104
+#: rhodecode/events/pullrequest.py:107
 msgid "pullrequest merged"
 msgstr ""
 
-#: rhodecode/events/pullrequest.py:113
+#: rhodecode/events/pullrequest.py:116
 msgid "pullrequest commented"
 msgstr ""
 
-#: rhodecode/events/repo.py:138
+#: rhodecode/events/repo.py:148
 msgid "repository pre create"
 msgstr ""
 
-#: rhodecode/events/repo.py:147
+#: rhodecode/events/repo.py:157
 msgid "repository created"
 msgstr ""
 
-#: rhodecode/events/repo.py:156
+#: rhodecode/events/repo.py:166
 msgid "repository pre delete"
 msgstr ""
 
-#: rhodecode/events/repo.py:165
+#: rhodecode/events/repo.py:175
 msgid "repository deleted"
 msgstr ""
 
-#: rhodecode/events/repo.py:201
+#: rhodecode/events/repo.py:211
 msgid "repository pre pull"
 msgstr ""
 
-#: rhodecode/events/repo.py:210
+#: rhodecode/events/repo.py:220
 msgid "repository pull"
 msgstr ""
 
-#: rhodecode/events/repo.py:219
+#: rhodecode/events/repo.py:229
 msgid "repository pre push"
 msgstr ""
 
-#: rhodecode/events/repo.py:230
+#: rhodecode/events/repo.py:240
 msgid "repository push"
 msgstr ""
 
@@ -1541,7 +1541,7 @@ msgstr ""
 msgid "user pre update"
 msgstr ""
 
-#: rhodecode/forms/__init__.py:32 rhodecode/templates/admin/gists/new.mako:62
+#: rhodecode/forms/__init__.py:35 rhodecode/templates/admin/gists/new.mako:62
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87
 #: rhodecode/templates/admin/my_account/my_account_emails.mako:65
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:107
@@ -1552,8 +1552,8 @@ msgstr ""
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:68
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:66
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:80
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:111
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:161
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:110
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:195
 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:44
 #: rhodecode/templates/admin/settings/settings_global.mako:140
 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:16
@@ -1563,13 +1563,13 @@ msgstr ""
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:83
 #: rhodecode/templates/admin/users/user_edit_emails.mako:63
-#: rhodecode/templates/admin/users/user_edit_ips.mako:70
+#: rhodecode/templates/admin/users/user_edit_ips.mako:71
 #: rhodecode/templates/admin/users/user_edit_profile.mako:135
 #: rhodecode/templates/base/default_perms_box.mako:89
 msgid "Reset"
 msgstr ""
 
-#: rhodecode/forms/__init__.py:33 rhodecode/templates/admin/gists/show.mako:49
+#: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:49
 #: rhodecode/templates/admin/integrations/list.mako:211
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49
 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32
@@ -1578,13 +1578,13 @@ msgstr ""
 #: rhodecode/templates/admin/settings/settings_hooks.mako:46
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45
 #: rhodecode/templates/admin/users/user_edit_emails.mako:31
-#: rhodecode/templates/admin/users/user_edit_ips.mako:34
+#: rhodecode/templates/admin/users/user_edit_ips.mako:35
 #: rhodecode/templates/base/issue_tracker_settings.mako:69
-#: rhodecode/templates/base/vcs_settings.mako:251
-#: rhodecode/templates/base/vcs_settings.mako:276
-#: rhodecode/templates/changeset/changeset_file_comment.mako:137
-#: rhodecode/templates/changeset/changeset_file_comment.mako:139
+#: rhodecode/templates/base/vcs_settings.mako:264
+#: rhodecode/templates/base/vcs_settings.mako:289
 #: rhodecode/templates/changeset/changeset_file_comment.mako:142
+#: rhodecode/templates/changeset/changeset_file_comment.mako:144
+#: rhodecode/templates/changeset/changeset_file_comment.mako:147
 #: rhodecode/templates/data_table/_dt_elements.mako:123
 #: rhodecode/templates/data_table/_dt_elements.mako:184
 #: rhodecode/templates/data_table/_dt_elements.mako:198
@@ -1732,16 +1732,15 @@ msgstr ""
 
 #: rhodecode/integrations/types/slack.py:60 rhodecode/templates/login.mako:43
 #: rhodecode/templates/register.mako:41
-#: rhodecode/templates/admin/admin_log.mako:7
+#: rhodecode/templates/admin/admin_log_base.mako:6
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:24
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:24
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:69
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:70
 #: rhodecode/templates/admin/users/user_add.mako:35
-#: rhodecode/templates/admin/users/user_edit_audit.mako:22
 #: rhodecode/templates/admin/users/user_edit_profile.mako:39
-#: rhodecode/templates/admin/users/users.mako:62
-#: rhodecode/templates/base/base.mako:304
+#: rhodecode/templates/admin/users/users.mako:63
+#: rhodecode/templates/base/base.mako:306
 #: rhodecode/templates/debug_style/login.html:36
 #: rhodecode/templates/email_templates/user_registration.mako:23
 #: rhodecode/templates/users/user_profile.mako:27
@@ -1776,180 +1775,180 @@ msgstr ""
 msgid "Send events such as repo pushes and pull requests to your slack channel."
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:152
+#: rhodecode/integrations/types/webhook.py:164
 msgid "Webhook URL"
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:154
+#: rhodecode/integrations/types/webhook.py:166
 msgid "URL of the webhook to receive POST event. Following variables are allowed to be used: {vars}. 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:168
+#: rhodecode/integrations/types/webhook.py:180
 msgid "Secret Token"
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:169
+#: rhodecode/integrations/types/webhook.py:181
 msgid "String used to validate received payloads."
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:178
+#: rhodecode/integrations/types/webhook.py:190
 msgid "Call Method"
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:179
+#: rhodecode/integrations/types/webhook.py:191
 msgid "Select if the webhook call should be made with POST or GET."
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:192
+#: rhodecode/integrations/types/webhook.py:204
 msgid "Webhook"
 msgstr ""
 
-#: rhodecode/integrations/types/webhook.py:193
+#: rhodecode/integrations/types/webhook.py:205
 msgid "Post json events to a webhook endpoint"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:89
+#: rhodecode/lib/action_parser.py:94
 msgid "[deleted] repository"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:92 rhodecode/lib/action_parser.py:110
+#: rhodecode/lib/action_parser.py:97 rhodecode/lib/action_parser.py:115
 msgid "[created] repository"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:95
+#: rhodecode/lib/action_parser.py:100
 msgid "[created] repository as fork"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:98 rhodecode/lib/action_parser.py:113
+#: rhodecode/lib/action_parser.py:103 rhodecode/lib/action_parser.py:118
 msgid "[forked] repository"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:101 rhodecode/lib/action_parser.py:116
+#: rhodecode/lib/action_parser.py:106 rhodecode/lib/action_parser.py:121
 msgid "[updated] repository"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:104
+#: rhodecode/lib/action_parser.py:109
 msgid "[downloaded] archive from repository"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:107
+#: rhodecode/lib/action_parser.py:112
 msgid "[delete] repository"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:119
+#: rhodecode/lib/action_parser.py:124
 msgid "[created] user"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:122
+#: rhodecode/lib/action_parser.py:127
 msgid "[updated] user"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:125
+#: rhodecode/lib/action_parser.py:130
 msgid "[created] user group"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:128
+#: rhodecode/lib/action_parser.py:133
 msgid "[updated] user group"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:131
+#: rhodecode/lib/action_parser.py:136
 msgid "[commented] on commit in repository"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:134
+#: rhodecode/lib/action_parser.py:139
 msgid "[commented] on pull request for"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:137
+#: rhodecode/lib/action_parser.py:142
 msgid "[closed] pull request for"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:140
+#: rhodecode/lib/action_parser.py:145
 msgid "[merged] pull request for"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:143
+#: rhodecode/lib/action_parser.py:148
 msgid "[pushed] into"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:146
+#: rhodecode/lib/action_parser.py:151
 msgid "[committed via RhodeCode] into repository"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:149
+#: rhodecode/lib/action_parser.py:154
 msgid "[pulled from remote] into repository"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:152
+#: rhodecode/lib/action_parser.py:157
 msgid "[pulled] from"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:155
+#: rhodecode/lib/action_parser.py:160
 msgid "[started following] repository"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:158
+#: rhodecode/lib/action_parser.py:163
 msgid "[stopped following] repository"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:166
+#: rhodecode/lib/action_parser.py:172
 #, python-format
 msgid "fork name %s"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:183
+#: rhodecode/lib/action_parser.py:190
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51
 #, python-format
 msgid "Pull request #%s"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:216
+#: rhodecode/lib/action_parser.py:223
 #, python-format
 msgid "Show all combined commits %s->%s"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:220
+#: rhodecode/lib/action_parser.py:227
 msgid "compare view"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:227
+#: rhodecode/lib/action_parser.py:234
 #, python-format
 msgid " and %(num)s more commits"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:279
+#: rhodecode/lib/action_parser.py:286
 #, python-format
 msgid "Deleted branch: %s"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:282
+#: rhodecode/lib/action_parser.py:289
 #, python-format
 msgid "Created tag: %s"
 msgstr ""
 
-#: rhodecode/lib/action_parser.py:295
+#: rhodecode/lib/action_parser.py:302
 msgid "Commit not found"
 msgstr ""
 
-#: rhodecode/lib/auth.py:1197
+#: rhodecode/lib/auth.py:1220
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
 
-#: rhodecode/lib/auth.py:1281
+#: rhodecode/lib/auth.py:1309
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 
-#: rhodecode/lib/auth.py:1329
+#: rhodecode/lib/auth.py:1366
 #, python-format
 msgid "Action not supported for %s."
 msgstr ""
 
-#: rhodecode/lib/auth.py:1379
+#: rhodecode/lib/auth.py:1412
 msgid "You need to be signed in to view this page"
 msgstr ""
 
-#: rhodecode/lib/base.py:549
+#: rhodecode/lib/base.py:561
 #, python-format
 msgid "The repository at %(repo_name)s cannot be located."
 msgstr ""
@@ -1974,20 +1973,21 @@ msgstr ""
 msgid "Click to select line"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1517
+#: rhodecode/lib/helpers.py:1527
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1521
+#: rhodecode/lib/helpers.py:1531
 msgid "No Files"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1800
+#: rhodecode/lib/helpers.py:1836
 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"
@@ -2002,7 +2002,21 @@ msgid ""
 "     \"username:test AND repository:test*\"\n"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1820
+#: rhodecode/lib/helpers.py:1859
+msgid ""
+"Example filter terms for `{searcher}` search:\n"
+"{terms}\n"
+"Generate wildcards using '*' character:\n"
+"     \"repo_name:vcs*\" - search everything starting with 'vcs'\n"
+"     \"repo_name:*vcs*\" - search for repository containing 'vcs'\n"
+"\n"
+"Optional AND / OR operators in queries\n"
+"     \"repo_name:vcs OR repo_name:test\"\n"
+"     \"owner:test AND repo_name:test*\"\n"
+"More: {search_doc}"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:1875
 #, 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 ""
@@ -2042,7 +2056,7 @@ msgstr ""
 #: rhodecode/lib/utils2.py:515
 #: rhodecode/public/js/rhodecode-components.js:33659
 #: rhodecode/public/js/scripts.js:25507
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174
 msgid "just now"
 msgstr ""
@@ -2076,7 +2090,7 @@ msgstr ""
 #: 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:2339
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 rhodecode/model/db.py:2410
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 rhodecode/model/db.py:2482
 msgid "Repository no access"
 msgstr ""
 
@@ -2109,7 +2123,7 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 rhodecode/model/db.py:2411
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 rhodecode/model/db.py:2483
 msgid "Repository read access"
 msgstr ""
 
@@ -2142,7 +2156,7 @@ msgstr ""
 #: 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:2341
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 rhodecode/model/db.py:2412
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 rhodecode/model/db.py:2484
 msgid "Repository write access"
 msgstr ""
 
@@ -2175,7 +2189,7 @@ msgstr ""
 #: 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:2342
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2343 rhodecode/model/db.py:2413
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2343 rhodecode/model/db.py:2485
 msgid "Repository admin access"
 msgstr ""
 
@@ -2248,7 +2262,7 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 rhodecode/model/db.py:2431
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 rhodecode/model/db.py:2503
 msgid "Repository creation disabled"
 msgstr ""
 
@@ -2281,7 +2295,7 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2361
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2362 rhodecode/model/db.py:2432
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2362 rhodecode/model/db.py:2504
 msgid "Repository creation enabled"
 msgstr ""
 
@@ -2314,7 +2328,7 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2365
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2366 rhodecode/model/db.py:2436
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2366 rhodecode/model/db.py:2508
 msgid "Repository forking disabled"
 msgstr ""
 
@@ -2347,7 +2361,7 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 rhodecode/model/db.py:2437
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 rhodecode/model/db.py:2509
 msgid "Repository forking enabled"
 msgstr ""
 
@@ -2401,7 +2415,7 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3050
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3051 rhodecode/model/db.py:3121
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3051 rhodecode/model/db.py:3212
 msgid "Not Reviewed"
 msgstr ""
 
@@ -2434,7 +2448,7 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3051
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3052 rhodecode/model/db.py:3122
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3052 rhodecode/model/db.py:3213
 msgid "Approved"
 msgstr ""
 
@@ -2467,7 +2481,7 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3052
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3053 rhodecode/model/db.py:3123
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3053 rhodecode/model/db.py:3214
 msgid "Rejected"
 msgstr ""
 
@@ -2500,7 +2514,7 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3053
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3054 rhodecode/model/db.py:3124
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3054 rhodecode/model/db.py:3215
 msgid "Under Review"
 msgstr ""
 
@@ -2530,7 +2544,7 @@ msgstr ""
 #: 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:2344
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 rhodecode/model/db.py:2415
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 rhodecode/model/db.py:2487
 msgid "Repository group no access"
 msgstr ""
 
@@ -2560,7 +2574,7 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 rhodecode/model/db.py:2416
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 rhodecode/model/db.py:2488
 msgid "Repository group read access"
 msgstr ""
 
@@ -2590,7 +2604,7 @@ msgstr ""
 #: 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:2346
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 rhodecode/model/db.py:2417
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 rhodecode/model/db.py:2489
 msgid "Repository group write access"
 msgstr ""
 
@@ -2620,7 +2634,7 @@ msgstr ""
 #: 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:2347
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2348 rhodecode/model/db.py:2418
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2348 rhodecode/model/db.py:2490
 msgid "Repository group admin access"
 msgstr ""
 
@@ -2649,7 +2663,7 @@ msgstr ""
 #: 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:2349
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 rhodecode/model/db.py:2420
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 rhodecode/model/db.py:2492
 msgid "User group no access"
 msgstr ""
 
@@ -2678,7 +2692,7 @@ msgstr ""
 #: 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:2350
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2351 rhodecode/model/db.py:2421
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2351 rhodecode/model/db.py:2493
 msgid "User group read access"
 msgstr ""
 
@@ -2707,7 +2721,7 @@ msgstr ""
 #: 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:2351
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 rhodecode/model/db.py:2422
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 rhodecode/model/db.py:2494
 msgid "User group write access"
 msgstr ""
 
@@ -2736,7 +2750,7 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 rhodecode/model/db.py:2423
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 rhodecode/model/db.py:2495
 msgid "User group admin access"
 msgstr ""
 
@@ -2765,7 +2779,7 @@ msgstr ""
 #: 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:2354
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 rhodecode/model/db.py:2425
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 rhodecode/model/db.py:2497
 msgid "Repository Group creation disabled"
 msgstr ""
 
@@ -2794,7 +2808,7 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 rhodecode/model/db.py:2426
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 rhodecode/model/db.py:2498
 msgid "Repository Group creation enabled"
 msgstr ""
 
@@ -2823,7 +2837,7 @@ msgstr ""
 #: 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:2357
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 rhodecode/model/db.py:2428
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 rhodecode/model/db.py:2500
 msgid "User Group creation disabled"
 msgstr ""
 
@@ -2852,7 +2866,7 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2358
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2359 rhodecode/model/db.py:2429
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2359 rhodecode/model/db.py:2501
 msgid "User Group creation enabled"
 msgstr ""
 
@@ -2881,7 +2895,7 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 rhodecode/model/db.py:2439
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 rhodecode/model/db.py:2511
 msgid "Registration disabled"
 msgstr ""
 
@@ -2910,7 +2924,7 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2369
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2370 rhodecode/model/db.py:2440
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2370 rhodecode/model/db.py:2512
 msgid "User Registration with manual account activation"
 msgstr ""
 
@@ -2939,7 +2953,7 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 rhodecode/model/db.py:2441
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 rhodecode/model/db.py:2513
 msgid "User Registration with automatic account activation"
 msgstr ""
 
@@ -2968,7 +2982,7 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2376
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2377 rhodecode/model/db.py:2447
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2377 rhodecode/model/db.py:2519
 #: rhodecode/model/permission.py:95
 msgid "Manual activation of external account"
 msgstr ""
@@ -2998,7 +3012,7 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2377
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2378 rhodecode/model/db.py:2448
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2378 rhodecode/model/db.py:2520
 #: rhodecode/model/permission.py:96
 msgid "Automatic activation of external account"
 msgstr ""
@@ -3022,7 +3036,7 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 rhodecode/model/db.py:2433
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 rhodecode/model/db.py:2505
 msgid "Repository creation enabled with write permission to a repository group"
 msgstr ""
 
@@ -3045,7 +3059,7 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 rhodecode/model/db.py:2434
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 rhodecode/model/db.py:2506
 msgid "Repository creation disabled with write permission to a repository group"
 msgstr ""
 
@@ -3065,7 +3079,7 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2337
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2338 rhodecode/model/db.py:2408
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2338 rhodecode/model/db.py:2480
 msgid "RhodeCode Super Administrator"
 msgstr ""
 
@@ -3083,7 +3097,7 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2379
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2380 rhodecode/model/db.py:2450
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2380 rhodecode/model/db.py:2522
 msgid "Inherit object permissions from default user disabled"
 msgstr ""
 
@@ -3101,7 +3115,7 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2380
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2381 rhodecode/model/db.py:2451
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2381 rhodecode/model/db.py:2523
 msgid "Inherit object permissions from default user enabled"
 msgstr ""
 
@@ -3111,7 +3125,7 @@ msgstr ""
 #: 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:954
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:955 rhodecode/model/db.py:1008
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:955 rhodecode/model/db.py:1043
 msgid "all"
 msgstr ""
 
@@ -3121,7 +3135,7 @@ msgstr ""
 #: 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:955
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 rhodecode/model/db.py:1009
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 rhodecode/model/db.py:1044
 msgid "http/web interface"
 msgstr ""
 
@@ -3131,7 +3145,7 @@ msgstr ""
 #: 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:956
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 rhodecode/model/db.py:1010
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 rhodecode/model/db.py:1045
 msgid "vcs (git/hg/svn protocol)"
 msgstr ""
 
@@ -3141,7 +3155,7 @@ msgstr ""
 #: 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:957
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 rhodecode/model/db.py:1011
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 rhodecode/model/db.py:1046
 msgid "api calls"
 msgstr ""
 
@@ -3151,7 +3165,7 @@ msgstr ""
 #: 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:958
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 rhodecode/model/db.py:1012
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 rhodecode/model/db.py:1047
 msgid "feed access"
 msgstr ""
 
@@ -3161,62 +3175,62 @@ msgstr ""
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2108
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2109 rhodecode/model/db.py:2179
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2109 rhodecode/model/db.py:2248
 msgid "No parent"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2372
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2373 rhodecode/model/db.py:2443
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2373 rhodecode/model/db.py:2515
 msgid "Password reset enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 rhodecode/model/db.py:2444
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 rhodecode/model/db.py:2516
 msgid "Password reset hidden"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374
-#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 rhodecode/model/db.py:2445
+#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 rhodecode/model/db.py:2517
 msgid "Password reset disabled"
 msgstr ""
 
-#: rhodecode/lib/index/whoosh.py:149
+#: rhodecode/lib/index/whoosh.py:150
 msgid "Invalid search query. Try quoting it."
 msgstr ""
 
-#: rhodecode/lib/index/whoosh.py:151
+#: rhodecode/lib/index/whoosh.py:152
 msgid "There is no index to search in. Please run whoosh indexer"
 msgstr ""
 
-#: rhodecode/lib/index/whoosh.py:156
+#: rhodecode/lib/index/whoosh.py:157
 msgid "An error occurred during this search operation"
 msgstr ""
 
-#: rhodecode/lib/index/whoosh.py:164
+#: rhodecode/lib/index/whoosh.py:165
 msgid "Index Type"
 msgstr ""
 
-#: rhodecode/lib/index/whoosh.py:165
+#: rhodecode/lib/index/whoosh.py:166
 msgid "File Index"
 msgstr ""
 
-#: rhodecode/lib/index/whoosh.py:166 rhodecode/lib/index/whoosh.py:171
+#: rhodecode/lib/index/whoosh.py:167 rhodecode/lib/index/whoosh.py:172
 msgid "Indexed documents"
 msgstr ""
 
-#: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:173
+#: rhodecode/lib/index/whoosh.py:169 rhodecode/lib/index/whoosh.py:174
 msgid "Last update"
 msgstr ""
 
-#: rhodecode/lib/index/whoosh.py:170
+#: rhodecode/lib/index/whoosh.py:171
 msgid "Commit index"
 msgstr ""
 
-#: rhodecode/model/comment.py:368
+#: rhodecode/model/comment.py:374
 msgid "made a comment"
 msgstr ""
 
-#: rhodecode/model/comment.py:369
+#: rhodecode/model/comment.py:375
 msgid "Show it now"
 msgstr ""
 
@@ -3302,7 +3316,7 @@ msgstr ""
 #: rhodecode/model/permission.py:79
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:11
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:126
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:11
 msgid "None"
 msgstr ""
@@ -3310,7 +3324,7 @@ msgstr ""
 #: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74
 #: rhodecode/model/permission.py:80
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:12
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:12
 msgid "Read"
 msgstr ""
@@ -3318,10 +3332,10 @@ msgstr ""
 #: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75
 #: rhodecode/model/permission.py:81
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:13
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:14
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:13
-#: rhodecode/templates/changeset/changeset_file_comment.mako:266
-#: rhodecode/templates/changeset/changeset_file_comment.mako:316
+#: rhodecode/templates/changeset/changeset_file_comment.mako:271
+#: rhodecode/templates/changeset/changeset_file_comment.mako:321
 msgid "Write"
 msgstr ""
 
@@ -3344,7 +3358,7 @@ msgstr ""
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:13
 #: rhodecode/templates/admin/repos/repo_add.mako:13
 #: rhodecode/templates/admin/repos/repo_add.mako:17
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:15
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:14
 #: rhodecode/templates/admin/repos/repos.mako:13
 #: rhodecode/templates/admin/settings/settings.mako:12
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:11
@@ -3354,9 +3368,9 @@ msgstr ""
 #: rhodecode/templates/admin/users/user_add.mako:11
 #: rhodecode/templates/admin/users/user_edit.mako:12
 #: rhodecode/templates/admin/users/users.mako:13
-#: rhodecode/templates/admin/users/users.mako:75
-#: rhodecode/templates/base/base.mako:409
-#: rhodecode/templates/base/base.mako:416
+#: rhodecode/templates/admin/users/users.mako:76
+#: rhodecode/templates/base/base.mako:412
+#: rhodecode/templates/base/base.mako:419
 msgid "Admin"
 msgstr ""
 
@@ -3387,79 +3401,79 @@ msgstr ""
 msgid "Disable password recovery"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:78
+#: rhodecode/model/pull_request.py:80
 msgid "This pull request can be automatically merged."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:80
+#: rhodecode/model/pull_request.py:82
 msgid "This pull request cannot be merged because of an unhandled exception."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:83
+#: rhodecode/model/pull_request.py:85
 msgid "This pull request cannot be merged because of merge conflicts."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:85
+#: rhodecode/model/pull_request.py:87
 msgid "This pull request could not be merged because push to target failed."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:88
+#: rhodecode/model/pull_request.py:90
 msgid "This pull request cannot be merged because the target is not a head."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:91
+#: rhodecode/model/pull_request.py:93
 msgid "This pull request cannot be merged because the source contains more branches than the target."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:94
+#: rhodecode/model/pull_request.py:96
 msgid "This pull request cannot be merged because the target has multiple heads."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:97
+#: rhodecode/model/pull_request.py:99
 msgid "This pull request cannot be merged because the target repository is locked."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:100
+#: rhodecode/model/pull_request.py:102
 msgid "This pull request cannot be merged because the target or the source reference is missing."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:103
+#: rhodecode/model/pull_request.py:105
 msgid "This pull request cannot be merged because the target reference is missing."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:106
+#: rhodecode/model/pull_request.py:108
 msgid "This pull request cannot be merged because the source reference is missing."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:109
+#: rhodecode/model/pull_request.py:111
 msgid "This pull request cannot be merged because of conflicts related to sub repositories."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:115
+#: rhodecode/model/pull_request.py:117
 msgid "Pull request update successful."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:117
+#: rhodecode/model/pull_request.py:119
 msgid "Pull request update failed because of an unknown error."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:119
+#: rhodecode/model/pull_request.py:121
 msgid "No update needed because the source and target have not changed."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:121
-msgid "Pull request cannot be updated because the reference type is not supported for an update."
+#: rhodecode/model/pull_request.py:123
+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:124
+#: rhodecode/model/pull_request.py:126
 msgid "This pull request cannot be updated because the target reference is missing."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:127
+#: rhodecode/model/pull_request.py:129
 msgid "This pull request cannot be updated because the source reference is missing."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:524
+#: rhodecode/model/pull_request.py:544
 #, python-format
 msgid ""
 "Merge pull request #%(pr_id)s from %(source_repo)s %(source_ref_name)s\n"
@@ -3467,86 +3481,90 @@ msgid ""
 " %(pr_title)s"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:556
+#: rhodecode/model/pull_request.py:576
 msgid "Pull request merged and closed"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1087
+#: rhodecode/model/pull_request.py:1108
+msgid "Closing with status change {transition_icon} {status}."
+msgstr ""
+
+#: rhodecode/model/pull_request.py:1152
 msgid "Server-side pull request merging is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1089
+#: rhodecode/model/pull_request.py:1154
 msgid "This pull request is closed."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1101
+#: rhodecode/model/pull_request.py:1166
 msgid "Pull request merging is not supported."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1119
+#: rhodecode/model/pull_request.py:1184
 msgid "Target repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1122
+#: rhodecode/model/pull_request.py:1187
 msgid "Source repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1279 rhodecode/model/scm.py:790
+#: rhodecode/model/pull_request.py:1344 rhodecode/model/scm.py:783
 msgid "Bookmarks"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1284
+#: rhodecode/model/pull_request.py:1349
 msgid "Commit IDs"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1287
+#: rhodecode/model/pull_request.py:1352
 msgid "Closed Branches"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1411
+#: rhodecode/model/pull_request.py:1493
 msgid "User `{}` not allowed to perform merge."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1424
+#: rhodecode/model/pull_request.py:1506
 msgid "Pull request reviewer approval is pending."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1439
+#: rhodecode/model/pull_request.py:1521
 msgid "Cannot merge, {} TODO still not resolved."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1442
+#: rhodecode/model/pull_request.py:1524
 msgid "Cannot merge, {} TODOs still not resolved."
 msgstr ""
 
-#: rhodecode/model/scm.py:768
+#: rhodecode/model/scm.py:761
 msgid "latest tip"
 msgstr ""
 
-#: rhodecode/model/user.py:126
+#: rhodecode/model/user.py:166
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:292
+#: rhodecode/model/user.py:332
 #, python-format
 msgid "You can't edit this user (`%(username)s`) since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:462
+#: rhodecode/model/user.py:502
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:470
+#: rhodecode/model/user.py:510
 #, python-format
 msgid "user \"%s\" still owns %s repositories and cannot be removed. Switch owners or remove those repositories:%s"
 msgstr ""
 
-#: rhodecode/model/user.py:479
+#: rhodecode/model/user.py:519
 #, python-format
 msgid "user \"%s\" still owns %s repository groups and cannot be removed. Switch owners or remove those repository groups:%s"
 msgstr ""
 
-#: rhodecode/model/user.py:488
+#: rhodecode/model/user.py:528
 #, python-format
 msgid "user \"%s\" still owns %s user groups and cannot be removed. Switch owners or remove those user groups:%s"
 msgstr ""
@@ -3570,6 +3588,7 @@ msgid "Username \"%(username)s\" is forbidden"
 msgstr ""
 
 #: rhodecode/model/validators.py:164
+#: rhodecode/model/validation_schema/schemas/user_schema.py:69
 msgid "Username may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character or underscore"
 msgstr ""
 
@@ -3675,94 +3694,107 @@ msgstr ""
 msgid "Repository group with name \"%(repo)s\" exists in group \"%(group)s\""
 msgstr ""
 
-#: rhodecode/model/validators.py:620
+#: rhodecode/model/validators.py:581
+#: rhodecode/model/validation_schema/schemas/repo_schema.py:219
+msgid "Repository name cannot end with .git"
+msgstr ""
+
+#: rhodecode/model/validators.py:640
 #, python-format
 msgid "invalid clone url for %(rtype)s repository"
 msgstr ""
 
-#: rhodecode/model/validators.py:621
+#: rhodecode/model/validators.py:641
 #, python-format
 msgid "Invalid clone url, provide a valid clone url starting with one of %(allowed_prefixes)s"
 msgstr ""
 
-#: rhodecode/model/validators.py:650
+#: rhodecode/model/validators.py:670
 msgid "Fork have to be the same type as parent"
 msgstr ""
 
-#: rhodecode/model/validators.py:665
+#: rhodecode/model/validators.py:685
 msgid "You do not have the permission to create repositories in this group."
 msgstr ""
 
-#: rhodecode/model/validators.py:668
-#: rhodecode/model/validation_schema/schemas/repo_schema.py:102
+#: rhodecode/model/validators.py:688
+#: rhodecode/model/validation_schema/schemas/repo_schema.py:125
 msgid "You do not have the permission to store repositories in the root location."
 msgstr ""
 
-#: rhodecode/model/validators.py:728
+#: rhodecode/model/validators.py:748
 msgid "This username or user group name is not valid"
 msgstr ""
 
-#: rhodecode/model/validators.py:846
+#: rhodecode/model/validators.py:879
 msgid "This is not a valid path"
 msgstr ""
 
-#: rhodecode/model/validators.py:861
+#: rhodecode/model/validators.py:894
 msgid "This e-mail address is already taken"
 msgstr ""
 
-#: rhodecode/model/validators.py:881
+#: rhodecode/model/validators.py:914
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr ""
 
-#: rhodecode/model/validators.py:902
+#: rhodecode/model/validators.py:935
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 
-#: rhodecode/model/validators.py:933
-#: rhodecode/model/validation_schema/validators.py:16
-#: rhodecode/model/validation_schema/validators.py:29
+#: rhodecode/model/validators.py:966
+#: rhodecode/model/validation_schema/validators.py:40
+#: rhodecode/model/validation_schema/validators.py:53
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr ""
 
-#: rhodecode/model/validators.py:934
+#: rhodecode/model/validators.py:967
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
 
-#: rhodecode/model/validators.py:961
+#: rhodecode/model/validators.py:994
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
 
-#: rhodecode/model/validators.py:976
+#: rhodecode/model/validators.py:1009
 #, python-format
 msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name"
 msgstr ""
 
-#: rhodecode/model/validators.py:979
+#: rhodecode/model/validators.py:1012
 #, python-format
 msgid "The plugin \"%(plugin_id)s\" is missing an includeme function."
 msgstr ""
 
-#: rhodecode/model/validators.py:982
+#: rhodecode/model/validators.py:1015
 #, python-format
 msgid "Can not load plugin \"%(plugin_id)s\""
 msgstr ""
 
-#: rhodecode/model/validators.py:984
+#: rhodecode/model/validators.py:1017
 #, python-format
 msgid "No plugin available with ID \"%(plugin_id)s\""
 msgstr ""
 
-#: rhodecode/model/validation_schema/validators.py:37
+#: rhodecode/model/validation_schema/validators.py:61
 msgid "Invalid glob pattern"
 msgstr ""
 
-#: rhodecode/model/validation_schema/validators.py:46
+#: rhodecode/model/validation_schema/validators.py:70
 msgid "Name must start with a letter or number. Got `{}`"
 msgstr ""
 
+#: rhodecode/model/validation_schema/validators.py:132
+msgid "Invalid clone url, provide a valid clone url starting with one of {allowed_prefixes}"
+msgstr ""
+
+#: rhodecode/model/validation_schema/validators.py:138
+msgid "invalid clone url for {repo_type} repository"
+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"
@@ -3831,253 +3863,261 @@ msgid "Repo group owner with id `{}` does not exists"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:130
-#: rhodecode/model/validation_schema/schemas/repo_schema.py:181
+#: rhodecode/model/validation_schema/schemas/repo_schema.py:204
 msgid "Repository with name `{}` already exists"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:135
-#: rhodecode/model/validation_schema/schemas/repo_schema.py:186
+#: rhodecode/model/validation_schema/schemas/repo_schema.py:209
 msgid "Repository group with name `{}` already exists"
 msgstr ""
 
-#: rhodecode/model/validation_schema/schemas/repo_schema.py:48
+#: rhodecode/model/validation_schema/schemas/repo_schema.py:55
 msgid "Repo owner with id `{}` does not exists"
 msgstr ""
 
-#: rhodecode/model/validation_schema/schemas/repo_schema.py:68
+#: rhodecode/model/validation_schema/schemas/repo_schema.py:91
 msgid "Fork with id `{}` does not exists"
 msgstr ""
 
-#: rhodecode/model/validation_schema/schemas/repo_schema.py:71
+#: rhodecode/model/validation_schema/schemas/repo_schema.py:94
 msgid "Cannot set fork of parameter of this repository to itself"
 msgstr ""
 
-#: rhodecode/model/validation_schema/schemas/repo_schema.py:96
-#: rhodecode/model/validation_schema/schemas/repo_schema.py:100
+#: rhodecode/model/validation_schema/schemas/repo_schema.py:119
+#: rhodecode/model/validation_schema/schemas/repo_schema.py:123
 msgid "Repository group `{}` does not exist"
 msgstr ""
 
-#: rhodecode/model/validation_schema/schemas/user_schema.py:36
+#: 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:38
 msgid "Password is incorrect"
 msgstr ""
 
-#: rhodecode/model/validation_schema/schemas/user_schema.py:59
+#: rhodecode/model/validation_schema/schemas/user_schema.py:60
 msgid "New password must be different to old password"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:31663
 #: rhodecode/public/js/scripts.js:23511
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29
 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87
 msgid "No results"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:33594
 #: rhodecode/public/js/scripts.js:25442
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109
 msgid "{0} year"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:33595
 #: rhodecode/public/js/scripts.js:25443
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110
 msgid "{0} month"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:33596
 #: rhodecode/public/js/scripts.js:25444
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111
 msgid "{0} day"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:33597
 #: rhodecode/public/js/scripts.js:25445
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112
 msgid "{0} hour"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:33598
 #: rhodecode/public/js/scripts.js:25446
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:91
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113
 msgid "{0} min"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:33599
 #: rhodecode/public/js/scripts.js:25447
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114
 msgid "{0} sec"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:33619
 #: rhodecode/public/js/scripts.js:25467
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134
 msgid "in {0}"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:33627
 #: rhodecode/public/js/scripts.js:25475
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142
 msgid "{0} ago"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:33639
 #: rhodecode/public/js/scripts.js:25487
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154
 msgid "{0}, {1} ago"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:33641
 #: rhodecode/public/js/scripts.js:25489
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156
 msgid "in {0}, {1}"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:33645
 #: rhodecode/public/js/scripts.js:25493
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160
 msgid "{0} and {1}"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:33647
 #: rhodecode/public/js/scripts.js:25495
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162
 msgid "{0} and {1} ago"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:33649
 #: rhodecode/public/js/scripts.js:25497
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164
 msgid "in {0} and {1}"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:47492
 #: rhodecode/public/js/scripts.js:39340
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4
 msgid "Loading more results..."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:47495
 #: rhodecode/public/js/scripts.js:39343
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7
 msgid "Searching..."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:47498
 #: rhodecode/public/js/scripts.js:39346
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10
 msgid "No matches found"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:47501
 #: rhodecode/public/js/scripts.js:39349
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13
 msgid "Loading failed"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:47505
 #: rhodecode/public/js/scripts.js:39353
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:17
 msgid "One result is available, press enter to select it."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:47507
 #: rhodecode/public/js/scripts.js:39355
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95
 #: 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/rhodecode-components.js:47512
 #: rhodecode/public/js/scripts.js:39360
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24
 msgid "Please enter {0} or more character"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:47514
 #: rhodecode/public/js/scripts.js:39362
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26
 msgid "Please enter {0} or more characters"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:47519
 #: rhodecode/public/js/scripts.js:39367
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31
 msgid "Please delete {0} character"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:47521
 #: rhodecode/public/js/scripts.js:39369
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33
 msgid "Please delete {0} characters"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:47525
 #: rhodecode/public/js/scripts.js:39373
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37
 msgid "You can only select {0} item"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:47527
 #: rhodecode/public/js/scripts.js:39375
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39
 msgid "You can only select {0} items"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:48456
 #: rhodecode/public/js/scripts.js:40304
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78
 #: rhodecode/public/js/src/rhodecode/changelog.js:35
 msgid "showing {0} out of {1} commit"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:48458
 #: rhodecode/public/js/scripts.js:40306
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79
 #: rhodecode/public/js/src/rhodecode/changelog.js:37
 msgid "showing {0} out of {1} commits"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:48891
 #: rhodecode/public/js/scripts.js:40739
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46
 #: rhodecode/public/js/src/rhodecode/codemirror.js:296
 msgid "Set status to Approved"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:48910
 #: rhodecode/public/js/scripts.js:40758
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47
 #: rhodecode/public/js/src/rhodecode/codemirror.js:315
 msgid "Set status to Rejected"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:48929
 #: rhodecode/public/js/scripts.js:40777
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58
 #: rhodecode/public/js/src/rhodecode/codemirror.js:334
 #: rhodecode/templates/email_templates/commit_comment.mako:99
 #: rhodecode/templates/email_templates/pull_request_comment.mako:107
@@ -4086,42 +4126,42 @@ msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:48949
 #: rhodecode/public/js/scripts.js:40797
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33
 #: rhodecode/public/js/src/rhodecode/codemirror.js:354
 msgid "Note Comment"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:49315
 #: rhodecode/public/js/scripts.js:41163
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77
 #: rhodecode/public/js/src/rhodecode/comments.js:125
 msgid "resolve comment"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:49399
 #: rhodecode/public/js/scripts.js:41247
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53
 #: rhodecode/public/js/src/rhodecode/comments.js:209
 msgid "Status Review"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:49414
 #: rhodecode/public/js/scripts.js:41262
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10
 #: rhodecode/public/js/src/rhodecode/comments.js:224
 msgid "Comment text will be set automatically based on currently selected status ({0}) ..."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:49571
 #: rhodecode/public/js/scripts.js:41419
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55
 #: rhodecode/public/js/src/rhodecode/comments.js:381
 msgid "Submitting..."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:49622
 #: rhodecode/public/js/scripts.js:41470
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18
 #: rhodecode/public/js/src/rhodecode/comments.js:432
 #: rhodecode/templates/files/files_browser_tree.mako:51
 msgid "Loading ..."
@@ -4129,105 +4169,170 @@ msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:49727
 #: rhodecode/public/js/scripts.js:41575
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12
 #: rhodecode/public/js/src/rhodecode/comments.js:537
 msgid "Delete this comment?"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:49798
 #: rhodecode/public/js/scripts.js:41646
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17
 #: rhodecode/public/js/src/rhodecode/comments.js:608
 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:49875
 #: rhodecode/public/js/scripts.js:41723
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16
 #: rhodecode/public/js/src/rhodecode/comments.js:685
 msgid "Leave a comment on line {0}."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:49989
 #: rhodecode/public/js/scripts.js:41837
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59
 #: rhodecode/public/js/src/rhodecode/comments.js:799
 msgid "TODO from comment {0} was fixed."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:50195
 #: rhodecode/public/js/scripts.js:42043
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81
 #: rhodecode/public/js/src/rhodecode/files.js:150
 msgid "truncated result"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:50197
 #: rhodecode/public/js/scripts.js:42045
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82
 #: rhodecode/public/js/src/rhodecode/files.js:152
 msgid "truncated results"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:50206
 #: rhodecode/public/js/scripts.js:42054
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25
 #: rhodecode/public/js/src/rhodecode/files.js:161
 msgid "No matching files"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:50341
 #: rhodecode/public/js/scripts.js:42189
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44
 #: rhodecode/public/js/src/rhodecode/files.js:296
 msgid "Selection link"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:50381
 #: rhodecode/public/js/scripts.js:42229
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54
 #: rhodecode/public/js/src/rhodecode/followers.js:26
 msgid "Stop following this repository"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:50382
 #: rhodecode/public/js/scripts.js:42230
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61
 #: rhodecode/public/js/src/rhodecode/followers.js:27
 msgid "Unfollow"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:50391
 #: rhodecode/public/js/scripts.js:42239
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52
 #: rhodecode/public/js/src/rhodecode/followers.js:36
 msgid "Start following this repository"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode-components.js:50392
 #: rhodecode/public/js/scripts.js:42240
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14
 #: rhodecode/public/js/src/rhodecode/followers.js:37
 msgid "Follow"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:50849
-#: rhodecode/public/js/scripts.js:42697
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:213
+#: rhodecode/public/js/rhodecode-components.js:50770
+#: rhodecode/public/js/rhodecode-components.js:50779
+#: rhodecode/public/js/scripts.js:42618 rhodecode/public/js/scripts.js:42627
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:134
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:143
+msgid "All reviewers must vote."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode-components.js:50784
+#: rhodecode/public/js/scripts.js:42632
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:148
+msgid "At least {0} reviewer must vote."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode-components.js:50790
+#: rhodecode/public/js/scripts.js:42638
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:154
+msgid "At least {0} reviewers must vote."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode-components.js:50797
+#: rhodecode/public/js/scripts.js:42645
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:161
+msgid "Reviewers picked from source code changes."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode-components.js:50804
+#: rhodecode/public/js/scripts.js:42652
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:4
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:168
+msgid "Adding new reviewers is forbidden."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode-components.js:50811
+#: rhodecode/public/js/scripts.js:42659
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:175
+msgid "Author is not allowed to be a reviewer."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode-components.js:50825
+#: rhodecode/public/js/scripts.js:42673
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:189
+msgid "Commit Authors are not allowed to be a reviewer."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode-components.js:50972
+#: rhodecode/public/js/scripts.js:42820
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:336
+msgid "User `{0}` not allowed to be a reviewer"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode-components.js:51099
+#: rhodecode/public/js/scripts.js:42947
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:463
 msgid "added manually by \"{0}\""
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:51420
-#: rhodecode/public/js/scripts.js:43268
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61
+#: rhodecode/public/js/rhodecode-components.js:51101
+#: rhodecode/public/js/scripts.js:42949
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:465
+msgid "member of \"{0}\""
+msgstr ""
+
+#: rhodecode/public/js/rhodecode-components.js:51682
+#: rhodecode/public/js/scripts.js:43530
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69
 #: rhodecode/public/js/src/rhodecode.js:142
 msgid "file"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode-components.js:51440
-#: rhodecode/public/js/scripts.js:43288
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42
+#: rhodecode/public/js/rhodecode-components.js:51702
+#: rhodecode/public/js/scripts.js:43550
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49
 #: rhodecode/public/js/src/rhodecode.js:162
 msgid "Show more"
 msgstr ""
@@ -4242,150 +4347,150 @@ msgstr ""
 msgid "Add another comment"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:4
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9
 #: rhodecode/public/js/src/i18n_messages.js:5
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:325
 msgid "Close"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13
 msgid "Diff to Commit "
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15
 #: rhodecode/public/js/src/i18n_messages.js:4
 msgid "Invite reviewers to this discussion"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21
 msgid "No bookmarks available yet."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22
 msgid "No branches available yet."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23
 msgid "No gists available yet."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26
 msgid "No pull requests available yet."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27
 msgid "No repositories available yet."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28
 msgid "No repository groups available yet."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30
 msgid "No tags available yet."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31
 msgid "No user groups available yet."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32
 msgid "No users available yet."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35
 #: rhodecode/templates/changelog/changelog.mako:61
 msgid "Open new pull request"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36
 msgid "Open new pull request for selected commit"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42
 msgid "Saving..."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45
 #: rhodecode/public/js/src/i18n_messages.js:6
 #: rhodecode/templates/admin/settings/settings_email.mako:48
 msgid "Send"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48
 msgid "Show at Commit "
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50
 msgid "Show selected commit __S"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51
 msgid "Show selected commits __S ... __E"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56
 #: rhodecode/public/js/src/i18n_messages.js:7
 msgid "Switch to chat"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57
 #: rhodecode/public/js/src/i18n_messages.js:8
 msgid "Switch to comment"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60
 msgid "There are currently no open pull requests requiring your participation."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62
 msgid "Updating..."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67
 #: rhodecode/templates/admin/auth/auth_settings.mako:71
 msgid "disabled"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68
 #: rhodecode/templates/admin/auth/auth_settings.mako:71
 msgid "enabled"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70
 msgid "files"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67
-#: rhodecode/templates/pullrequests/pullrequest.mako:108
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75
+#: rhodecode/templates/pullrequests/pullrequest.mako:140
 msgid "loading..."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80
 msgid "specify commit"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83
 msgid "{0} active out of {1} users"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88
 msgid "{0} days"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90
 msgid "{0} hours"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93
 msgid "{0} months"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94
 msgid "{0} out of {1} users"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98
 msgid "{0} years"
 msgstr ""
 
@@ -4467,7 +4572,7 @@ msgstr ""
 #: rhodecode/templates/admin/my_account/my_account_watched.mako:31
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:53
 #: rhodecode/templates/admin/repos/repo_add_base.mako:9
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:15
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:16
 #: rhodecode/templates/admin/repos/repos.mako:54
 #: rhodecode/templates/admin/user_groups/user_groups.mako:55
 #: rhodecode/templates/admin/users/user_edit_groups.mako:54
@@ -4475,7 +4580,7 @@ msgstr ""
 #: rhodecode/templates/bookmarks/bookmarks.mako:59
 #: rhodecode/templates/branches/branches.mako:58
 #: rhodecode/templates/files/files_browser_tree.mako:5
-#: rhodecode/templates/pullrequests/pullrequests.mako:100
+#: rhodecode/templates/pullrequests/pullrequests.mako:110
 #: rhodecode/templates/tags/tags.mako:59
 msgid "Name"
 msgstr ""
@@ -4490,7 +4595,7 @@ msgstr ""
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56
 #: rhodecode/templates/admin/repos/repo_add_base.mako:43
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:29
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:98
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:127
 #: rhodecode/templates/admin/repos/repos.mako:57
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:43
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42
@@ -4498,9 +4603,10 @@ msgstr ""
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:15
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:67
 #: rhodecode/templates/admin/users/user_edit_groups.mako:59
+#: rhodecode/templates/admin/users/user_edit_ips.mako:12
 #: rhodecode/templates/base/issue_tracker_settings.mako:10
-#: rhodecode/templates/changeset/changeset.mako:53
-#: rhodecode/templates/compare/compare_commits.mako:20
+#: rhodecode/templates/changeset/changeset.mako:73
+#: rhodecode/templates/compare/compare_commits.mako:21
 #: rhodecode/templates/email_templates/commit_comment.mako:89
 #: rhodecode/templates/email_templates/pull_request_review.mako:41
 #: rhodecode/templates/email_templates/pull_request_review.mako:75
@@ -4508,9 +4614,9 @@ msgstr ""
 #: rhodecode/templates/files/file_tree_detail.mako:12
 #: rhodecode/templates/forks/fork.mako:48
 #: rhodecode/templates/forks/forks_data.mako:9
-#: rhodecode/templates/pullrequests/pullrequest.mako:47
+#: rhodecode/templates/pullrequests/pullrequest.mako:54
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:163
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:460
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:487
 #: rhodecode/templates/summary/components.mako:73
 msgid "Description"
 msgstr ""
@@ -4521,7 +4627,7 @@ msgstr ""
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:24
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:60
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:5
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:80
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:109
 #: rhodecode/templates/admin/repos/repos.mako:65
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24
@@ -4544,13 +4650,13 @@ msgstr ""
 #: rhodecode/templates/bookmarks/bookmarks.mako:66
 #: rhodecode/templates/branches/branches.mako:65
 #: rhodecode/templates/changelog/changelog.mako:107
-#: rhodecode/templates/changelog/changelog_summary_data.mako:8
 #: rhodecode/templates/changeset/changeset.mako:36
-#: rhodecode/templates/compare/compare_commits.mako:18
+#: rhodecode/templates/compare/compare_commits.mako:19
 #: rhodecode/templates/email_templates/commit_comment.mako:49
 #: rhodecode/templates/email_templates/commit_comment.mako:88
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:458
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:485
 #: rhodecode/templates/search/search_commit.mako:6
+#: rhodecode/templates/summary/summary_commits.mako:8
 #: rhodecode/templates/tags/tags.mako:66
 msgid "Commit"
 msgstr ""
@@ -4565,7 +4671,7 @@ msgid "Home"
 msgstr ""
 
 #: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:35
-#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:329
+#: rhodecode/templates/login.mako:75 rhodecode/templates/base/base.mako:332
 #: rhodecode/templates/debug_style/login.html:60
 msgid "Sign In"
 msgstr ""
@@ -4588,13 +4694,13 @@ msgstr ""
 
 #: rhodecode/templates/login.mako:68 rhodecode/templates/password_reset.mako:37
 #: rhodecode/templates/base/base.mako:46
-#: rhodecode/templates/errors/error_document.mako:64
+#: rhodecode/templates/errors/error_document.mako:63
 msgid "Support"
 msgstr ""
 
 #: rhodecode/templates/login.mako:69 rhodecode/templates/password_reset.mako:38
 #: rhodecode/templates/files/files_add.mako:54
-#: rhodecode/templates/files/files_add.mako:65
+#: rhodecode/templates/files/files_add.mako:71
 msgid "or"
 msgstr ""
 
@@ -4653,7 +4759,7 @@ msgstr ""
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:79
 #: rhodecode/templates/admin/users/user_add.mako:68
 #: rhodecode/templates/admin/users/user_edit_profile.mako:47
-#: rhodecode/templates/admin/users/users.mako:66
+#: rhodecode/templates/admin/users/users.mako:67
 msgid "First Name"
 msgstr ""
 
@@ -4663,7 +4769,7 @@ msgstr ""
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:88
 #: rhodecode/templates/admin/users/user_add.mako:77
 #: rhodecode/templates/admin/users/user_edit_profile.mako:56
-#: rhodecode/templates/admin/users/users.mako:68
+#: rhodecode/templates/admin/users/users.mako:69
 msgid "Last Name"
 msgstr ""
 
@@ -4675,36 +4781,32 @@ msgstr ""
 msgid "Create Account"
 msgstr ""
 
-#: rhodecode/templates/admin/admin.mako:5
-#: rhodecode/templates/admin/admin.mako:15
+#: rhodecode/templates/admin/admin_audit_logs.mako:5
 #: rhodecode/templates/base/base.mako:75
-msgid "Admin journal"
+msgid "Admin audit logs"
 msgstr ""
 
-#: rhodecode/templates/admin/admin.mako:13
-msgid "journal filter..."
+#: rhodecode/templates/admin/admin_audit_logs.mako:13
+msgid "filter..."
 msgstr ""
 
-#: rhodecode/templates/admin/admin.mako:14
+#: rhodecode/templates/admin/admin_audit_logs.mako:14
 #: rhodecode/templates/admin/users/user_edit_audit.mako:15
 msgid "filter"
 msgstr ""
 
-#: rhodecode/templates/admin/admin.mako:15
-#: rhodecode/templates/journal/journal.mako:14
-#, python-format
-msgid "%s entry"
-msgid_plural "%s entries"
-msgstr[0] ""
-msgstr[1] ""
+#: rhodecode/templates/admin/admin_audit_logs.mako:15
+msgid "Audit logs"
+msgstr ""
 
-#: rhodecode/templates/admin/admin.mako:17
+#: rhodecode/templates/admin/admin_audit_logs.mako:17
 #: rhodecode/templates/admin/users/user_edit_audit.mako:17
 #: rhodecode/templates/journal/journal.mako:17
+#: rhodecode/templates/search/search.mako:76
 msgid "Example Queries"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.mako:8
+#: rhodecode/templates/admin/admin_log_base.mako:7
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18
 #: rhodecode/templates/admin/my_account/my_account_repos.mako:37
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:62
@@ -4712,38 +4814,45 @@ msgstr ""
 #: rhodecode/templates/admin/repos/repos.mako:69
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71
 #: rhodecode/templates/admin/user_groups/user_groups.mako:68
-#: rhodecode/templates/admin/users/user_edit_audit.mako:23
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18
 #: rhodecode/templates/admin/users/user_edit_groups.mako:73
-#: rhodecode/templates/admin/users/users.mako:79
+#: rhodecode/templates/admin/users/users.mako:80
 #: rhodecode/templates/files/files_detail.mako:58
 msgid "Action"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.mako:9
+#: rhodecode/templates/admin/admin_log_base.mako:8
+msgid "Action Data"
+msgstr ""
+
+#: rhodecode/templates/admin/admin_log_base.mako:9
 #: rhodecode/templates/admin/defaults/defaults.mako:31
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:13
-#: rhodecode/templates/admin/users/user_edit_audit.mako:24
 #: rhodecode/templates/search/search_commit.mako:5
 #: rhodecode/templates/search/search_path.mako:3
 msgid "Repository"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.mako:10
-#: rhodecode/templates/admin/users/user_edit_audit.mako:25
+#: rhodecode/templates/admin/admin_log_base.mako:10
 #: rhodecode/templates/bookmarks/bookmarks.mako:61
 #: rhodecode/templates/branches/branches.mako:60
 #: rhodecode/templates/tags/tags.mako:61
 msgid "Date"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.mako:11
-#: rhodecode/templates/admin/users/user_edit_audit.mako:26
-msgid "From IP"
+#: rhodecode/templates/admin/admin_log_base.mako:11
+msgid "IP"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.mako:46
-#: rhodecode/templates/admin/users/user_edit_audit.mako:61
+#: rhodecode/templates/admin/admin_log_base.mako:38
+msgid "toggle"
+msgstr ""
+
+#: rhodecode/templates/admin/admin_log_base.mako:43
+msgid "data not available for v1 entries type"
+msgstr ""
+
+#: rhodecode/templates/admin/admin_log_base.mako:64
 msgid "No actions yet"
 msgstr ""
 
@@ -4784,8 +4893,8 @@ msgstr ""
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:67
 #: rhodecode/templates/admin/repos/repo_add_base.mako:101
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:79
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:110
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:160
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:109
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:194
 #: rhodecode/templates/admin/settings/settings_hooks.mako:63
 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:15
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:60
@@ -4826,7 +4935,7 @@ msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27
 #: rhodecode/templates/admin/repos/repo_add_base.mako:97
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:112
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:143
 #: rhodecode/templates/forks/fork.mako:87
 msgid "Private repositories are only visible to people explicitly added as collaborators."
 msgstr ""
@@ -4877,7 +4986,7 @@ msgstr ""
 
 #: rhodecode/templates/admin/gists/edit.mako:56
 #: rhodecode/templates/admin/gists/new.mako:50
-#: rhodecode/templates/files/files_add.mako:74
+#: rhodecode/templates/files/files_add.mako:80
 #: rhodecode/templates/files/files_edit.mako:78
 msgid "plain"
 msgstr ""
@@ -4888,9 +4997,9 @@ msgstr ""
 
 #: rhodecode/templates/admin/gists/edit.mako:102
 #: rhodecode/templates/base/issue_tracker_settings.mako:73
-#: rhodecode/templates/changeset/changeset_file_comment.mako:385
+#: rhodecode/templates/changeset/changeset_file_comment.mako:390
 #: rhodecode/templates/codeblocks/diffs.mako:76
-#: rhodecode/templates/files/files_add.mako:102
+#: rhodecode/templates/files/files_add.mako:108
 #: rhodecode/templates/files/files_delete.mako:69
 #: rhodecode/templates/files/files_edit.mako:105
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:64
@@ -4957,14 +5066,13 @@ msgstr ""
 #: rhodecode/templates/bookmarks/bookmarks.mako:63
 #: rhodecode/templates/branches/branches.mako:62
 #: rhodecode/templates/changelog/changelog.mako:113
-#: rhodecode/templates/changelog/changelog_summary_data.mako:11
-#: rhodecode/templates/changeset/changeset.mako:180
-#: rhodecode/templates/compare/compare_commits.mako:17
+#: rhodecode/templates/changeset/changeset.mako:200
+#: rhodecode/templates/compare/compare_commits.mako:18
 #: rhodecode/templates/files/files_browser_tree.mako:9
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:309
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:457
-#: rhodecode/templates/pullrequests/pullrequests.mako:102
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:484
+#: rhodecode/templates/pullrequests/pullrequests.mako:112
 #: rhodecode/templates/search/search_commit.mako:16
+#: rhodecode/templates/summary/summary_commits.mako:11
 #: rhodecode/templates/tags/tags.mako:63
 msgid "Author"
 msgstr ""
@@ -5025,12 +5133,12 @@ msgstr ""
 #: rhodecode/templates/data_table/_dt_elements.mako:193
 #: rhodecode/templates/data_table/_dt_elements.mako:206
 #: rhodecode/templates/debug_style/buttons.html:128
-#: rhodecode/templates/files/files_add.mako:204
+#: rhodecode/templates/files/files_add.mako:208
 #: rhodecode/templates/files/files_edit.mako:165
 #: rhodecode/templates/files/files_source.mako:48
 #: rhodecode/templates/files/files_source.mako:51
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:63
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:324
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:339
 #: rhodecode/templates/users/user_profile.mako:7
 msgid "Edit"
 msgstr ""
@@ -5071,10 +5179,10 @@ msgstr ""
 #: rhodecode/templates/admin/integrations/new.mako:21
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:48
 #: rhodecode/templates/admin/repos/repo_edit.mako:15
-#: rhodecode/templates/admin/repos/repo_edit.mako:43
+#: rhodecode/templates/admin/repos/repo_edit.mako:46
 #: rhodecode/templates/admin/settings/settings.mako:14
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:33
-#: rhodecode/templates/base/base.mako:84 rhodecode/templates/base/base.mako:249
+#: rhodecode/templates/base/base.mako:84 rhodecode/templates/base/base.mako:251
 msgid "Settings"
 msgstr ""
 
@@ -5177,7 +5285,7 @@ msgid "No description available"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:5
-#: rhodecode/templates/base/base.mako:343
+#: rhodecode/templates/base/base.mako:346
 msgid "My account"
 msgstr ""
 
@@ -5201,7 +5309,7 @@ msgid "OAuth Identities"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:37
-#: rhodecode/templates/admin/users/user_edit.mako:38
+#: rhodecode/templates/admin/users/user_edit.mako:43
 msgid "Emails"
 msgstr ""
 
@@ -5218,7 +5326,7 @@ msgstr ""
 #: rhodecode/templates/admin/my_account/my_account.mako:41
 #: rhodecode/templates/admin/permissions/permissions.mako:14
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:49
-#: rhodecode/templates/admin/repos/repo_edit.mako:46
+#: rhodecode/templates/admin/repos/repo_edit.mako:49
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:34
 #: rhodecode/templates/base/base.mako:80
 msgid "Permissions"
@@ -5275,7 +5383,7 @@ msgstr ""
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:82
 #: rhodecode/templates/admin/users/user_edit_emails.mako:62
-#: rhodecode/templates/admin/users/user_edit_ips.mako:69
+#: rhodecode/templates/admin/users/user_edit_ips.mako:70
 msgid "Add"
 msgstr ""
 
@@ -5294,9 +5402,7 @@ msgid "Primary"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_emails.mako:31
-#: rhodecode/templates/admin/users/user_edit_emails.mako:30
-#, python-format
-msgid "Confirm to delete this email: %s"
+msgid "Confirm to delete this email: {}"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_emails.mako:42
@@ -5380,13 +5486,13 @@ msgstr ""
 #: rhodecode/templates/admin/settings/settings_global.mako:9
 #: rhodecode/templates/email_templates/pull_request_review.mako:39
 #: rhodecode/templates/email_templates/pull_request_review.mako:72
-#: rhodecode/templates/pullrequests/pullrequest.mako:38
-#: rhodecode/templates/pullrequests/pullrequests.mako:104
+#: rhodecode/templates/pullrequests/pullrequest.mako:45
+#: rhodecode/templates/pullrequests/pullrequests.mako:114
 msgid "Title"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:47
-#: rhodecode/templates/pullrequests/pullrequests.mako:108
+#: rhodecode/templates/pullrequests/pullrequests.mako:118
 msgid "Last Update"
 msgstr ""
 
@@ -5404,7 +5510,7 @@ msgid "My Notifications"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.mako:32
-#: rhodecode/templates/changeset/changeset.mako:140
+#: rhodecode/templates/changeset/changeset.mako:160
 msgid "Comments"
 msgstr ""
 
@@ -5425,6 +5531,10 @@ msgstr ""
 msgid "Notifications"
 msgstr ""
 
+#: rhodecode/templates/admin/notifications/show_notification.mako:40
+msgid "Subject"
+msgstr ""
+
 #: rhodecode/templates/admin/permissions/permissions.mako:5
 msgid "Permissions Administration"
 msgstr ""
@@ -5483,23 +5593,23 @@ msgid "Default IP Whitelist For All Users"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:27
-#: rhodecode/templates/admin/users/user_edit_ips.mako:35
+#: rhodecode/templates/admin/users/user_edit_ips.mako:36
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:34
-#: rhodecode/templates/admin/users/user_edit_ips.mako:43
+#: rhodecode/templates/admin/users/user_edit_ips.mako:44
 msgid "All IP addresses are allowed"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:49
-#: rhodecode/templates/admin/users/user_edit_ips.mako:59
+#: rhodecode/templates/admin/users/user_edit_ips.mako:60
 msgid "New IP Address"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:53
-#: rhodecode/templates/admin/users/user_edit_ips.mako:62
+#: rhodecode/templates/admin/users/user_edit_ips.mako:63
 msgid "Description..."
 msgstr ""
 
@@ -5583,9 +5693,9 @@ msgid "Add Child Group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:50
-#: rhodecode/templates/admin/repos/repo_edit.mako:49
+#: rhodecode/templates/admin/repos/repo_edit.mako:52
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:35
-#: rhodecode/templates/admin/users/user_edit.mako:35
+#: rhodecode/templates/admin/users/user_edit.mako:40
 msgid "Advanced"
 msgstr ""
 
@@ -5642,26 +5752,26 @@ msgid "Repository Group Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:15
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:16
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:15
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:15
 msgid "User/User Group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:31
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:31
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:30
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:31
 msgid "super admin"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:34
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:34
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:33
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:34
 msgid "owner"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:52
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:76
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:61
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:60
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:52
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:76
 msgid "permission for all other users"
@@ -5669,8 +5779,8 @@ msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:62
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:109
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:71
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:99
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:70
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:98
 msgid "Revoke"
 msgstr ""
 
@@ -5680,7 +5790,7 @@ msgid "delegated admin"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.mako:118
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:107
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:106
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:117
 #: rhodecode/templates/base/issue_tracker_settings.mako:83
 msgid "Add new"
@@ -5745,7 +5855,7 @@ msgid "Clone from"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:47
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:102
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:132
 #: rhodecode/templates/forks/fork.mako:52
 msgid "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
@@ -5755,7 +5865,6 @@ msgid "Repository Group"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:58
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:62
 #: rhodecode/templates/forks/fork.mako:64
 #, python-format
 msgid "Select my personal group (%(repo_group_name)s)"
@@ -5775,7 +5884,7 @@ msgid "Set the type of repository to create."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:84
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:70
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:98
 #: rhodecode/templates/forks/fork.mako:73
 msgid "Landing commit"
 msgstr ""
@@ -5803,36 +5912,36 @@ msgstr ""
 msgid "%s repository settings"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.mako:55
+#: rhodecode/templates/admin/repos/repo_edit.mako:58
 msgid "Extra Fields"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.mako:61
+#: rhodecode/templates/admin/repos/repo_edit.mako:64
 msgid "Caches"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.mako:65
+#: rhodecode/templates/admin/repos/repo_edit.mako:68
 msgid "Remote"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.mako:69
+#: rhodecode/templates/admin/repos/repo_edit.mako:72
 #: rhodecode/templates/summary/components.mako:135
 msgid "Statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.mako:75
+#: rhodecode/templates/admin/repos/repo_edit.mako:79
+msgid "Reviewer Rules"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.mako:83
 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:3
 msgid "Maintenance"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.mako:78
+#: rhodecode/templates/admin/repos/repo_edit.mako:86
 msgid "Strip"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.mako:93
-msgid "Reviewers"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:7
 msgid "Updated on"
 msgstr ""
@@ -5867,84 +5976,77 @@ msgstr ""
 msgid "Public Journal Visibility"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:56
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:55
 msgid "Remove from Public Journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:60
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:59
 msgid "Add to Public Journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:65
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:64
 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:74
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:73
 msgid "Locking state"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:83
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:82
 msgid "This Repository is not currently locked."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:90
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:89
 msgid "Confirm to unlock repository."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:92
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:91
 msgid "Unlock repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:97
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:96
 msgid "Confirm to lock repository."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:99
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:98
 msgid "Lock Repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:105
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:104
 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:114
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:113
 msgid "Delete repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:121
-#, python-format
-msgid "This repository has %s fork."
-msgid_plural "This repository has %s forks."
-msgstr[0] ""
-msgstr[1] ""
-
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:125
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:124
 msgid "Detach forks"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:130
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:129
 msgid "Delete forks"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:139
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:138
 #: rhodecode/templates/data_table/_dt_elements.mako:124
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:141
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:140
 msgid "Delete This Repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:146
-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."
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:145
+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:180
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:179
 msgid "Change repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:180
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:179
 msgid "Pick repository"
 msgstr ""
 
@@ -5952,44 +6054,41 @@ msgstr ""
 msgid "Invalidate Cache for Repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10
-msgid "Invalidate repository cache"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:10
-msgid "Confirm to invalidate repository cache"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:14
+#: 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:28
-#, python-format
-msgid "List of repository caches (%(count)s entry)"
-msgid_plural "List of repository caches (%(count)s entries)"
-msgstr[0] ""
-msgstr[1] ""
+#: 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:35
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:20
+msgid "Invalidate repository cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:20
+msgid "Confirm to invalidate repository cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:39
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:32
 #: rhodecode/templates/base/issue_tracker_settings.mako:13
 msgid "Prefix"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:36
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:40
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:11
 msgid "Key"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_caches.mako:37
+#: rhodecode/templates/admin/repos/repo_edit_caches.mako:41
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:52
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:51
 #: rhodecode/templates/admin/user_groups/user_groups.mako:64
 #: rhodecode/templates/admin/users/user_add.mako:97
 #: rhodecode/templates/admin/users/user_edit_groups.mako:64
 #: rhodecode/templates/admin/users/user_edit_profile.mako:90
-#: rhodecode/templates/admin/users/users.mako:73
+#: rhodecode/templates/admin/users/users.mako:74
 msgid "Active"
 msgstr ""
 
@@ -6063,19 +6162,27 @@ msgstr ""
 msgid "Test Patterns"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:9
-msgid "Perform maintenance tasks for this repo, following tasks will be performed"
+#: 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:16
+#: 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:26
+#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:34
 msgid "Run Maintenance"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:41
+#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:49
 msgid "Performing Maintenance"
 msgstr ""
 
@@ -6083,11 +6190,11 @@ msgstr ""
 msgid "Repository Permissions"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:43
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:42
 msgid "private repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:48
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:47
 msgid "only users/user groups explicitly added here will have access"
 msgstr ""
 
@@ -6095,56 +6202,87 @@ msgstr ""
 msgid "Remote url"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_remote.mako:9
+#: rhodecode/templates/admin/repos/repo_edit_remote.mako:7
+msgid "Manually pull changes from external repository."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_remote.mako:11
 msgid "Remote mirror url"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_remote.mako:12
-msgid "Pull can be automated by such api call called periodically (in crontab etc)"
+#: rhodecode/templates/admin/repos/repo_edit_remote.mako:15
+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:22
-#: rhodecode/templates/admin/repos/repo_edit_remote.mako:30
+#: rhodecode/templates/admin/repos/repo_edit_remote.mako:25
+#: rhodecode/templates/admin/repos/repo_edit_remote.mako:36
 msgid "Pull changes from remote location"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_remote.mako:22
+#: rhodecode/templates/admin/repos/repo_edit_remote.mako:25
 msgid "Confirm to pull changes from remote side"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_remote.mako:27
+#: rhodecode/templates/admin/repos/repo_edit_remote.mako:31
 msgid "This repository does not have any remote mirror url set."
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_edit_remote.mako:32
+msgid "Set remote url."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_reviewers.mako:3
+msgid "Default Reviewer Rules"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_reviewers.mako:6
+msgid "This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license."
+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:19
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:22
 msgid "Non-changeable id"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:19
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:22
 msgid "what is that ?"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:21
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:24
 msgid "URL by id"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:22
+#: 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:30
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:33
+#: rhodecode/templates/data_table/_dt_elements.mako:164
+#: rhodecode/templates/forks/fork.mako:58
+msgid "Repository group"
+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:51
 msgid "Remote uri"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:36
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:59
 #: rhodecode/templates/base/perms_summary.mako:79
 #: rhodecode/templates/base/perms_summary.mako:149
 #: rhodecode/templates/base/perms_summary.mako:151
@@ -6152,63 +6290,56 @@ msgstr ""
 msgid "edit"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:39
-msgid "new value, leave empty to remove"
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:65
+msgid "enter new value, or leave empty to remove"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:41
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:75
 msgid "cancel"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:48
-msgid "http[s] url where from repository was imported, also used for doing remote pulls."
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:87
+msgid "http[s] url where from repository was imported, this field can used for doing {pull_link}."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:56
-#: rhodecode/templates/data_table/_dt_elements.mako:164
-#: rhodecode/templates/forks/fork.mako:58
-msgid "Repository group"
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:88
+msgid "This field is stored encrypted inside Database, a format of http://user:password@server.com/repo_name can be used and will be hidden from display."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:65
-msgid "Optional select a group to put this repository into."
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:103
+msgid "Default commit for files page, downloads, full text search index and readme"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:74
-#: rhodecode/templates/forks/fork.mako:77
-msgid "Default commit for files page, downloads, whoosh and readme"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:92
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:121
 msgid "Change owner of this repository."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:108
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:138
 #: rhodecode/templates/data_table/_dt_elements.mako:58
 msgid "Private repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:117
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:148
 msgid "Enable statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:121
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:153
 msgid "Enable statistics window on summary page."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:126
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:158
 msgid "Enable downloads"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:130
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:163
 msgid "Enable download menu on summary page."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:135
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:168
 msgid "Enable automatic locking"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.mako:139
+#: rhodecode/templates/admin/repos/repo_edit_settings.mako:173
 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 ""
 
@@ -6272,32 +6403,24 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_strip.mako:112
+#: rhodecode/templates/admin/repos/repo_edit_strip.mako:114
 msgid "Checking commits"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_strip.mako:127
-msgid "author"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_strip.mako:127
-msgid "comment"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_strip.mako:128
+#: rhodecode/templates/admin/repos/repo_edit_strip.mako:142
 msgid " commit verified positive"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_strip.mako:131
+#: rhodecode/templates/admin/repos/repo_edit_strip.mako:154
 msgid " commit verified negative"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_strip.mako:153
-msgid " commit striped successful"
+#: rhodecode/templates/admin/repos/repo_edit_strip.mako:179
+msgid " commit striped successfully"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_strip.mako:156
-msgid " commit striped failed"
+#: rhodecode/templates/admin/repos/repo_edit_strip.mako:182
+msgid " commit strip failed"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:13
@@ -6835,12 +6958,12 @@ msgid "%s user group settings"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:36
-#: rhodecode/templates/admin/users/user_edit.mako:36
+#: rhodecode/templates/admin/users/user_edit.mako:41
 msgid "Global permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:37
-#: rhodecode/templates/admin/users/user_edit.mako:37
+#: rhodecode/templates/admin/users/user_edit.mako:42
 msgid "Permissions summary"
 msgstr ""
 
@@ -6877,43 +7000,35 @@ msgid "This group is set to be automatically synchronised."
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:37
-msgid "Each member will be added or removed from this groups once they interact with RhodeCode system."
-msgstr ""
-
-#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:38
 msgid "This group synchronization was set by"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:42
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:41
 msgid "This group is not set to be automatically synchronised"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:51
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:50
 msgid "Disable synchronization"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:53
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:52
 msgid "Enable synchronization"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:60
-msgid "User group will no longer synchronize membership"
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:58
+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:62
-msgid "User group will start to synchronize membership"
-msgstr ""
-
-#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:75
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:71
 msgid "Delete User Group"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:81
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:77
 #, 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:83
+#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:79
 msgid "Delete This User Group"
 msgstr ""
 
@@ -7005,24 +7120,28 @@ msgstr ""
 msgid "%s user settings"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.mako:33
+#: rhodecode/templates/admin/users/user_edit.mako:19
+msgid "This user is set as disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.mako:38
 #: rhodecode/templates/admin/users/user_edit_profile.mako:5
 msgid "User Profile"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.mako:34
+#: rhodecode/templates/admin/users/user_edit.mako:39
 msgid "Auth tokens"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.mako:39
+#: rhodecode/templates/admin/users/user_edit.mako:44
 msgid "Ip Whitelist"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.mako:40
+#: rhodecode/templates/admin/users/user_edit.mako:45
 msgid "User Groups Management"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.mako:41
+#: rhodecode/templates/admin/users/user_edit.mako:46
 msgid "User audit"
 msgstr ""
 
@@ -7036,7 +7155,7 @@ msgid "Last login"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:9
-#: rhodecode/templates/admin/users/users.mako:71
+#: rhodecode/templates/admin/users/users.mako:72
 msgid "Last activity"
 msgstr ""
 
@@ -7151,6 +7270,11 @@ msgstr ""
 msgid "Additional Email Addresses"
 msgstr ""
 
+#: rhodecode/templates/admin/users/user_edit_emails.mako:30
+#, python-format
+msgid "Confirm to delete this email: %s"
+msgstr ""
+
 #: rhodecode/templates/admin/users/user_edit_groups.mako:12
 #, python-format
 msgid "Add `%s` to user group"
@@ -7160,12 +7284,24 @@ msgstr ""
 msgid "Custom IP Whitelist"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_ips.mako:19
+#: rhodecode/templates/admin/users/user_edit_ips.mako:7
+msgid "Current IP address"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_ips.mako:10
+msgid "IP Address"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_ips.mako:11
+msgid "IP Range"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_ips.mako:20
 #, python-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_ips.mako:63
+#: rhodecode/templates/admin/users/user_edit_ips.mako:64
 msgid ""
 "Enter comma separated list of ip addresses like 127.0.0.1,\n"
 "or use a ip address with a mask 127.0.0.1/24, to create a network range.\n"
@@ -7210,7 +7346,7 @@ msgstr ""
 msgid "Users administration"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.mako:77
+#: rhodecode/templates/admin/users/users.mako:78
 msgid "Auth type"
 msgstr ""
 
@@ -7278,110 +7414,110 @@ msgstr ""
 msgid "Show Pull Requests for %s"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:246
+#: rhodecode/templates/base/base.mako:247
 msgid "Options"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:253
+#: rhodecode/templates/base/base.mako:255
 #: rhodecode/templates/forks/forks_data.mako:30
 msgid "Compare fork"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:256
-#: rhodecode/templates/base/base.mako:403
+#: rhodecode/templates/base/base.mako:258
+#: rhodecode/templates/base/base.mako:406
 #: rhodecode/templates/search/search.mako:64
 msgid "Search"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:260
+#: rhodecode/templates/base/base.mako:262
 msgid "Unlock"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:262
+#: rhodecode/templates/base/base.mako:264
 msgid "Lock"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:267
+#: rhodecode/templates/base/base.mako:269
 #: rhodecode/templates/data_table/_dt_elements.mako:27
 #: rhodecode/templates/data_table/_dt_elements.mako:28
 #: rhodecode/templates/forks/forks_data.mako:8
-#: rhodecode/templates/summary/components.mako:103
 msgid "Fork"
-msgid_plural "Forks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
-#: rhodecode/templates/base/base.mako:268
+#: rhodecode/templates/base/base.mako:270
 msgid "Create Pull Request"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:290
+#: rhodecode/templates/base/base.mako:292
 msgid "Sign in"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:298
+#: rhodecode/templates/base/base.mako:300
 #: rhodecode/templates/debug_style/login.html:28
 msgid "Sign in to your account"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:315
+#: rhodecode/templates/base/base.mako:317
 #: rhodecode/templates/debug_style/login.html:46
 msgid "(Forgot password?)"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:325
-#: rhodecode/templates/debug_style/login.html:56
-msgid "Don't have an account ?"
+#: rhodecode/templates/base/base.mako:327
+msgid "Don't have an account?"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:345
+#: rhodecode/templates/base/base.mako:329
+msgid "Using external auth? Sign In here."
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:348
 msgid "My personal group"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:349
+#: rhodecode/templates/base/base.mako:352
 msgid "Sign Out"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:385
+#: rhodecode/templates/base/base.mako:388
 msgid "Show activity journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:386
+#: rhodecode/templates/base/base.mako:389
 #: rhodecode/templates/journal/journal.mako:4
 #: rhodecode/templates/journal/journal.mako:14
 msgid "Journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:391
+#: rhodecode/templates/base/base.mako:394
 msgid "Show Public activity journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:392
+#: rhodecode/templates/base/base.mako:395
 msgid "Public journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:397
+#: rhodecode/templates/base/base.mako:400
 msgid "Show Gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:398
+#: rhodecode/templates/base/base.mako:401
 msgid "Gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:402
+#: rhodecode/templates/base/base.mako:405
 msgid "Search in repositories you have access to"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:408
+#: rhodecode/templates/base/base.mako:411
 msgid "Admin settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:415
+#: rhodecode/templates/base/base.mako:418
 msgid "Delegated Admin settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:425
-#: rhodecode/templates/base/base.mako:426
+#: rhodecode/templates/base/base.mako:428
+#: rhodecode/templates/base/base.mako:429
 #: rhodecode/templates/debug_style/alerts.html:5
 #: rhodecode/templates/debug_style/buttons.html:5
 #: rhodecode/templates/debug_style/code-block.html:6
@@ -7403,15 +7539,15 @@ msgstr ""
 msgid "Style"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:483
+#: rhodecode/templates/base/base.mako:486
 msgid "Go to"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:536
+#: rhodecode/templates/base/base.mako:539
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:544
+#: rhodecode/templates/base/base.mako:547
 msgid "Site-wide shortcuts"
 msgstr ""
 
@@ -7503,10 +7639,10 @@ msgid "Confirm to remove this pattern:"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.mako:191
-#: rhodecode/templates/changeset/changeset_file_comment.mako:269
-#: rhodecode/templates/changeset/changeset_file_comment.mako:319
-#: rhodecode/templates/files/files_add.mako:78
-#: rhodecode/templates/files/files_add.mako:224
+#: rhodecode/templates/changeset/changeset_file_comment.mako:274
+#: rhodecode/templates/changeset/changeset_file_comment.mako:324
+#: rhodecode/templates/files/files_add.mako:84
+#: rhodecode/templates/files/files_add.mako:228
 #: rhodecode/templates/files/files_edit.mako:82
 #: rhodecode/templates/files/files_edit.mako:185
 msgid "Preview"
@@ -7586,7 +7722,7 @@ msgstr ""
 msgid "No permission defined"
 msgstr ""
 
-#: rhodecode/templates/base/root.mako:150
+#: rhodecode/templates/base/root.mako:155
 msgid "Please enable JavaScript to use RhodeCode Enterprise"
 msgstr ""
 
@@ -7682,95 +7818,107 @@ msgstr ""
 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:139
+#: rhodecode/templates/base/vcs_settings.mako:136
+msgid "Enable evolve extension"
+msgstr ""
+
+#: rhodecode/templates/base/vcs_settings.mako:140
+msgid "Enable evolve extension for all repositories."
+msgstr ""
+
+#: rhodecode/templates/base/vcs_settings.mako:142
+msgid "Enable evolve extension for this repository."
+msgstr ""
+
+#: rhodecode/templates/base/vcs_settings.mako:152
 msgid "Mercurial Labs Settings"
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.mako:139
+#: rhodecode/templates/base/vcs_settings.mako:152
 msgid "These features are considered experimental and may not work as expected."
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.mako:145
+#: rhodecode/templates/base/vcs_settings.mako:158
 msgid "Use rebase as merge strategy"
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.mako:148
+#: rhodecode/templates/base/vcs_settings.mako:161
 msgid "Use rebase instead of creating a merge commit when merging via web interface."
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.mako:160
+#: rhodecode/templates/base/vcs_settings.mako:173
 msgid "Git Settings"
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.mako:165
+#: rhodecode/templates/base/vcs_settings.mako:178
 msgid "Enable lfs extension"
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.mako:169
+#: rhodecode/templates/base/vcs_settings.mako:182
 msgid "Enable lfs extensions for all repositories."
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.mako:171
+#: rhodecode/templates/base/vcs_settings.mako:184
 msgid "Enable lfs extensions for this repository."
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.mako:182
+#: rhodecode/templates/base/vcs_settings.mako:195
 msgid "Filesystem location where Git lfs objects should be stored."
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.mako:193
+#: rhodecode/templates/base/vcs_settings.mako:206
 msgid "Global Subversion Settings"
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.mako:199
+#: rhodecode/templates/base/vcs_settings.mako:212
 msgid "Proxy subversion HTTP requests"
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.mako:203
+#: rhodecode/templates/base/vcs_settings.mako:216
 msgid "Subversion HTTP Support. Enables communication with SVN over HTTP protocol."
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.mako:204
+#: rhodecode/templates/base/vcs_settings.mako:217
 msgid "SVN Protocol setup Documentation"
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.mako:210
+#: rhodecode/templates/base/vcs_settings.mako:223
 msgid "Subversion HTTP Server URL"
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.mako:216
+#: rhodecode/templates/base/vcs_settings.mako:229
 msgid "Generate Apache Config"
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.mako:228
+#: rhodecode/templates/base/vcs_settings.mako:241
 msgid "Subversion Settings"
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.mako:233
+#: rhodecode/templates/base/vcs_settings.mako:246
 msgid "Repository patterns"
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.mako:237
+#: rhodecode/templates/base/vcs_settings.mako:250
 msgid "Patterns for identifying SVN branches and tags. For recursive search, use \"*\". Eg.: \"/branches/*\""
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.mako:301
+#: rhodecode/templates/base/vcs_settings.mako:314
 msgid "Pull Request Settings"
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.mako:306
+#: rhodecode/templates/base/vcs_settings.mako:319
 msgid "Enable server-side merge for pull requests"
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.mako:309
+#: rhodecode/templates/base/vcs_settings.mako:322
 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:313
+#: rhodecode/templates/base/vcs_settings.mako:326
 msgid "Invalidate and relocate inline comments during update"
 msgstr ""
 
-#: rhodecode/templates/base/vcs_settings.mako:316
+#: rhodecode/templates/base/vcs_settings.mako:329
 msgid "During the update of a pull request, the position of inline comments will be updated and outdated inline comments will be hidden."
 msgstr ""
 
@@ -7788,10 +7936,10 @@ msgid "Compare Selected Bookmarks"
 msgstr ""
 
 #: rhodecode/templates/bookmarks/bookmarks_data.mako:13
-#: rhodecode/templates/changelog/changelog_elements.mako:91
-#: rhodecode/templates/changelog/changelog_summary_data.mako:62
-#: rhodecode/templates/changeset/changeset.mako:92
+#: rhodecode/templates/changelog/changelog_elements.mako:111
+#: rhodecode/templates/changeset/changeset.mako:112
 #: rhodecode/templates/files/base.mako:10
+#: rhodecode/templates/summary/summary_commits.mako:62
 #, python-format
 msgid "Bookmark %s"
 msgstr ""
@@ -7810,10 +7958,10 @@ msgid "Compare Selected Branches"
 msgstr ""
 
 #: rhodecode/templates/branches/branches_data.mako:12
-#: rhodecode/templates/changelog/changelog_elements.mako:83
-#: rhodecode/templates/changelog/changelog_summary_data.mako:76
-#: rhodecode/templates/changeset/changeset.mako:105
+#: rhodecode/templates/changelog/changelog_elements.mako:103
+#: rhodecode/templates/changeset/changeset.mako:125
 #: rhodecode/templates/files/base.mako:23
+#: rhodecode/templates/summary/summary_commits.mako:76
 #, python-format
 msgid "Branch %s"
 msgstr ""
@@ -7851,19 +7999,19 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/changelog/changelog.mako:110
-#: rhodecode/templates/files/files_add.mako:93
+#: rhodecode/templates/files/files_add.mako:99
 #: rhodecode/templates/files/files_delete.mako:60
 #: rhodecode/templates/files/files_edit.mako:96
 msgid "Commit Message"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.mako:112
-#: rhodecode/templates/changelog/changelog_summary_data.mako:10
+#: rhodecode/templates/summary/summary_commits.mako:10
 msgid "Age"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.mako:115
-#: rhodecode/templates/changelog/changelog_summary_data.mako:12
+#: rhodecode/templates/summary/summary_commits.mako:12
 msgid "Refs"
 msgstr ""
 
@@ -7880,7 +8028,7 @@ msgid "load previous"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_elements.mako:26
-#: rhodecode/templates/changelog/changelog_summary_data.mako:21
+#: rhodecode/templates/summary/summary_commits.mako:21
 #, python-format
 msgid ""
 "Commit status: %s\n"
@@ -7888,44 +8036,66 @@ msgid ""
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_elements.mako:30
-#: rhodecode/templates/changelog/changelog_summary_data.mako:25
+#: rhodecode/templates/summary/summary_commits.mako:25
 #, python-format
 msgid "Commit status: %s"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_elements.mako:36
-#: rhodecode/templates/changelog/changelog_summary_data.mako:31
+#: rhodecode/templates/summary/summary_commits.mako:31
 msgid "Commit status: Not Reviewed"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_elements.mako:41
-#: rhodecode/templates/changelog/changelog_summary_data.mako:36
+#: rhodecode/templates/summary/summary_commits.mako:36
 msgid "Commit has comments"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_elements.mako:53
-#: rhodecode/templates/compare/compare_commits.mako:46
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:495
+#: rhodecode/templates/changeset/changeset.mako:40
+msgid "Commit phase"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_elements.mako:60
+#: rhodecode/templates/changelog/changelog_elements.mako:67
+#: rhodecode/templates/changeset/changeset.mako:46
+#: rhodecode/templates/changeset/changeset.mako:53
+msgid "Evolve State"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_elements.mako:60
+#: rhodecode/templates/changeset/changeset.mako:46
+msgid "obsolete"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_elements.mako:67
+#: rhodecode/templates/changeset/changeset.mako:53
+msgid "hidden"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog_elements.mako:73
+#: rhodecode/templates/compare/compare_commits.mako:47
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:522
 #: rhodecode/templates/search/search_commit.mako:36
 msgid "Expand commit message"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_elements.mako:77
-#: rhodecode/templates/changeset/changeset.mako:86
+#: rhodecode/templates/changelog/changelog_elements.mako:97
+#: rhodecode/templates/changeset/changeset.mako:106
 #: rhodecode/templates/files/base.mako:4
 msgid "merge"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_elements.mako:99
-#: rhodecode/templates/changelog/changelog_summary_data.mako:69
-#: rhodecode/templates/changeset/changeset.mako:99
+#: rhodecode/templates/changelog/changelog_elements.mako:119
+#: rhodecode/templates/changeset/changeset.mako:119
 #: rhodecode/templates/files/base.mako:17
+#: rhodecode/templates/summary/summary_commits.mako:69
 #: rhodecode/templates/tags/tags_data.mako:12
 #, python-format
 msgid "Tag %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_elements.mako:113
+#: rhodecode/templates/changelog/changelog_elements.mako:133
 msgid "load next"
 msgstr ""
 
@@ -7933,100 +8103,78 @@ msgstr ""
 msgid "Show File"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_summary_data.mako:9
-#: rhodecode/templates/search/search_commit.mako:8
-msgid "Commit message"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog_summary_data.mako:100
-msgid "Add or upload files directly via RhodeCode:"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog_summary_data.mako:103
-#: rhodecode/templates/files/files_browser.mako:25
-msgid "Add New File"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog_summary_data.mako:111
-msgid "Push new repo:"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog_summary_data.mako:122
-msgid "Existing repository?"
-msgstr ""
-
 #: rhodecode/templates/changeset/changeset.mako:7
 #, python-format
 msgid "%s Commit"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:43
+#: rhodecode/templates/changeset/changeset.mako:62
 msgid "Parent Commit"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:43
+#: rhodecode/templates/changeset/changeset.mako:62
 msgid "Parent"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:47
+#: rhodecode/templates/changeset/changeset.mako:66
 msgid "Child Commit"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:47
+#: rhodecode/templates/changeset/changeset.mako:66
 msgid "Child"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:58
+#: rhodecode/templates/changeset/changeset.mako:78
 msgid "Expand"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:66
-#: rhodecode/templates/changeset/changeset.mako:72
+#: rhodecode/templates/changeset/changeset.mako:86
+#: rhodecode/templates/changeset/changeset.mako:92
 #: rhodecode/templates/changeset/changeset_file_comment.mako:81
 #: rhodecode/templates/compare/compare_diff.mako:159
 msgid "Commit status"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:79
+#: rhodecode/templates/changeset/changeset.mako:99
 #: rhodecode/templates/files/file_tree_detail.mako:21
 #: rhodecode/templates/files/files_detail.mako:20
 msgid "References"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:115
+#: rhodecode/templates/changeset/changeset.mako:135
 msgid "Diff options"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:119
+#: rhodecode/templates/changeset/changeset.mako:139
 #: rhodecode/templates/codeblocks/diffs.mako:445
 #: rhodecode/templates/codeblocks/diffs.mako:448
 msgid "Raw diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:120
+#: rhodecode/templates/changeset/changeset.mako:140
 msgid "Raw Diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:123
+#: rhodecode/templates/changeset/changeset.mako:143
 msgid "Patch diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:124
+#: rhodecode/templates/changeset/changeset.mako:144
 msgid "Patch Diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:127
+#: rhodecode/templates/changeset/changeset.mako:147
 #: rhodecode/templates/codeblocks/diffs.mako:452
 #: rhodecode/templates/codeblocks/diffs.mako:455
 msgid "Download diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:128
+#: rhodecode/templates/changeset/changeset.mako:148
 msgid "Download Diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:145
-#: rhodecode/templates/changeset/changeset.mako:147
+#: rhodecode/templates/changeset/changeset.mako:165
+#: rhodecode/templates/changeset/changeset.mako:167
 #: rhodecode/tests/functional/test_commit_comments.py:275
 #, python-format
 msgid "%d Commit comment"
@@ -8034,8 +8182,8 @@ msgid_plural "%d Commit comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.mako:150
-#: rhodecode/templates/changeset/changeset.mako:152
+#: rhodecode/templates/changeset/changeset.mako:170
+#: rhodecode/templates/changeset/changeset.mako:172
 #: rhodecode/tests/functional/test_commit_comments.py:282
 #, python-format
 msgid "%d Inline Comment"
@@ -8043,19 +8191,19 @@ msgid_plural "%d Inline Comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.mako:160
+#: rhodecode/templates/changeset/changeset.mako:180
 msgid "Unresolved TODOs"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:169
+#: rhodecode/templates/changeset/changeset.mako:189
 msgid "There are no unresolved TODOs"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:249
+#: rhodecode/templates/changeset/changeset.mako:269
 msgid "No Child Commits"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.mako:285
+#: rhodecode/templates/changeset/changeset.mako:305
 msgid "No Parent Commits"
 msgstr ""
 
@@ -8081,72 +8229,80 @@ msgstr ""
 msgid "resolves comment #{}"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:100
+#: rhodecode/templates/changeset/changeset_file_comment.mako:96
+msgid "Pull request author"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:97
+msgid "author"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:105
 msgid "Outdated comment from pull request version {0}"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:104
-#: rhodecode/templates/changeset/changeset_file_comment.mako:119
+#: rhodecode/templates/changeset/changeset_file_comment.mako:109
+#: rhodecode/templates/changeset/changeset_file_comment.mako:124
 msgid "Comment from pull request version {0}"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:116
+#: rhodecode/templates/changeset/changeset_file_comment.mako:121
 msgid "Outdated comment from pull request version {}"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:146
-#: rhodecode/templates/changeset/changeset_file_comment.mako:149
+#: rhodecode/templates/changeset/changeset_file_comment.mako:151
+#: rhodecode/templates/changeset/changeset_file_comment.mako:154
 msgid "Prev"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:147
-#: rhodecode/templates/changeset/changeset_file_comment.mako:150
+#: rhodecode/templates/changeset/changeset_file_comment.mako:152
+#: rhodecode/templates/changeset/changeset_file_comment.mako:155
 msgid "Next"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:185
+#: rhodecode/templates/changeset/changeset_file_comment.mako:190
 msgid "Leave a comment on this Pull Request."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:187
+#: rhodecode/templates/changeset/changeset_file_comment.mako:192
 msgid "Leave a comment on {} commits in this range."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:189
+#: rhodecode/templates/changeset/changeset_file_comment.mako:194
 msgid "Leave a comment on this Commit."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:277
+#: rhodecode/templates/changeset/changeset_file_comment.mako:282
 #: rhodecode/templates/codeblocks/diffs.mako:71
 msgid "You need to be logged in to leave comments."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:278
+#: rhodecode/templates/changeset/changeset_file_comment.mako:283
 #: rhodecode/templates/codeblocks/diffs.mako:71
 msgid "Login now"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:343
+#: rhodecode/templates/changeset/changeset_file_comment.mako:348
 #, python-format
 msgid "Comments parsed using %s syntax with %s, and %s actions support."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:345
+#: rhodecode/templates/changeset/changeset_file_comment.mako:350
 msgid "Use @username inside this text to send notification to this RhodeCode user"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:346
+#: rhodecode/templates/changeset/changeset_file_comment.mako:351
 msgid "Start typing with / for certain actions to be triggered via text box."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:363
+#: rhodecode/templates/changeset/changeset_file_comment.mako:368
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:15
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:153
 #: rhodecode/templates/pullrequests/pullrequests.mako:52
 msgid "Closed"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:393
+#: rhodecode/templates/changeset/changeset_file_comment.mako:398
 #: rhodecode/templates/compare/compare_diff.mako:104
 #: rhodecode/templates/compare/compare_diff.mako:112
 #: rhodecode/templates/compare/compare_diff.mako:120
@@ -8185,7 +8341,7 @@ msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.mako:99
 #: rhodecode/templates/compare/compare_diff.mako:312
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:419
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:446
 #, python-format
 msgid "Expand %s commit"
 msgid_plural "Expand %s commits"
@@ -8194,7 +8350,7 @@ msgstr[1] ""
 
 #: rhodecode/templates/changeset/changeset_range.mako:105
 #: rhodecode/templates/compare/compare_diff.mako:318
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:425
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:452
 #, python-format
 msgid "Collapse %s commit"
 msgid_plural "Collapse %s commits"
@@ -8363,26 +8519,26 @@ msgstr ""
 msgid "Compare was calculated based on this shared commit."
 msgstr ""
 
-#: rhodecode/templates/compare/compare_commits.mako:16
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:456
+#: rhodecode/templates/compare/compare_commits.mako:17
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:483
 msgid "Time"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_commits.mako:67
+#: rhodecode/templates/compare/compare_commits.mako:68
 #, python-format
 msgid "%s commit hidden"
 msgid_plural "%s commits hidden"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/compare/compare_commits.mako:68
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:573
+#: rhodecode/templates/compare/compare_commits.mako:69
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:600
 msgid "show it"
 msgid_plural "show them"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/compare/compare_commits.mako:74
+#: rhodecode/templates/compare/compare_commits.mako:75
 msgid "No commits in this compare"
 msgstr ""
 
@@ -8420,6 +8576,7 @@ msgstr ""
 #: rhodecode/templates/email_templates/pull_request_comment.mako:90
 #: rhodecode/templates/email_templates/pull_request_review.mako:73
 #: rhodecode/templates/files/files_source.mako:23
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:71
 msgid "Source"
 msgstr ""
 
@@ -8633,6 +8790,10 @@ msgstr ""
 msgid "Form vertical"
 msgstr ""
 
+#: rhodecode/templates/debug_style/login.html:56
+msgid "Don't have an account ?"
+msgstr ""
+
 #: rhodecode/templates/email_templates/base.mako:32
 #, python-format
 msgid "This is a notification from RhodeCode. %(instance_url)s"
@@ -8746,6 +8907,7 @@ msgid "%(user)s left %(comment_type)s on pull request #%(pr_id)s \"%(pr_title)s\
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:49
+#: rhodecode/templates/pullrequests/pullrequest.mako:72
 msgid "Source repository"
 msgstr ""
 
@@ -8814,8 +8976,6 @@ msgid "%(target_ref_type)s of %(target_repo_url)s"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:76
-#: rhodecode/templates/summary/components.mako:95
-#: rhodecode/templates/summary/components.mako:98
 #, python-format
 msgid "%(num)s Commit"
 msgid_plural "%(num)s Commits"
@@ -8839,7 +8999,7 @@ msgstr ""
 msgid "Full Name"
 msgstr ""
 
-#: rhodecode/templates/errors/error_document.mako:46
+#: rhodecode/templates/errors/error_document.mako:45
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr ""
@@ -8910,6 +9070,7 @@ msgid "Remove Custom Path"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.mako:50
+#: rhodecode/templates/files/files_add.mako:59
 msgid "Filename"
 msgstr ""
 
@@ -8917,34 +9078,34 @@ msgstr ""
 msgid "Upload File"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.mako:59
-msgid "Upload file"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.mako:63
+#: rhodecode/templates/files/files_add.mako:62
 msgid "No file selected"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.mako:65
+msgid "Upload file"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.mako:71
 msgid "Create New File"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.mako:75
+#: rhodecode/templates/files/files_add.mako:81
 #: rhodecode/templates/files/files_edit.mako:79
 msgid "line wraps"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.mako:76
+#: rhodecode/templates/files/files_add.mako:82
 #: rhodecode/templates/files/files_edit.mako:80
 msgid "on"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.mako:76
+#: rhodecode/templates/files/files_add.mako:82
 #: rhodecode/templates/files/files_edit.mako:80
 msgid "off"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.mako:103
+#: rhodecode/templates/files/files_add.mako:109
 #: rhodecode/templates/files/files_edit.mako:106
 msgid "Commit changes"
 msgstr ""
@@ -8965,6 +9126,11 @@ msgstr ""
 msgid "Close File List"
 msgstr ""
 
+#: rhodecode/templates/files/files_browser.mako:25
+#: rhodecode/templates/summary/summary_commits.mako:103
+msgid "Add New File"
+msgstr ""
+
 #: rhodecode/templates/files/files_browser.mako:27
 msgid "Add File"
 msgstr ""
@@ -9077,7 +9243,6 @@ msgid "LargeFile"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.mako:10
-#: rhodecode/templates/search/search_content.mako:57
 msgid "line"
 msgid_plural "lines"
 msgstr[0] ""
@@ -9141,6 +9306,10 @@ msgstr ""
 msgid "Fork name"
 msgstr ""
 
+#: rhodecode/templates/forks/fork.mako:77
+msgid "Default commit for files page, downloads, whoosh and readme"
+msgstr ""
+
 #: rhodecode/templates/forks/fork.mako:93
 msgid "Copy permissions"
 msgstr ""
@@ -9178,6 +9347,13 @@ msgstr ""
 msgid "Filter"
 msgstr ""
 
+#: rhodecode/templates/journal/journal.mako:14
+#, python-format
+msgid "%s entry"
+msgid_plural "%s entries"
+msgstr[0] ""
+msgstr[1] ""
+
 #: rhodecode/templates/journal/journal.mako:23
 msgid "ATOM journal feed"
 msgstr ""
@@ -9208,65 +9384,75 @@ msgstr ""
 msgid "New pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:51
+#: rhodecode/templates/pullrequests/pullrequest.mako:35
+msgid "Pull request summary"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.mako:58
 msgid "Write a short description on this pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:57
+#: rhodecode/templates/pullrequests/pullrequest.mako:64
 msgid "Commit flow"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:65
-msgid "Origin repository"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest.mako:83
+#: rhodecode/templates/pullrequests/pullrequest.mako:90
 msgid "Loading refs..."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:94
+#: rhodecode/templates/pullrequests/pullrequest.mako:101
 msgid "Submit Pull Request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:107
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:322
+#: rhodecode/templates/pullrequests/pullrequest.mako:115
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:309
+msgid "Author of this pull request"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.mako:129
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:323
+msgid "Reviewer rules"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest.mako:139
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:337
 msgid "Pull request reviewers"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:118
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:366
-msgid "Add reviewer"
+#: rhodecode/templates/pullrequests/pullrequest.mako:150
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:392
+msgid "Add reviewer or reviewer group"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:297
-#: rhodecode/templates/pullrequests/pullrequest.mako:570
-msgid "Please select origin and destination"
+#: rhodecode/templates/pullrequests/pullrequest.mako:302
+#: rhodecode/templates/pullrequests/pullrequest.mako:504
+msgid "Please select source and target"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:303
+#: rhodecode/templates/pullrequests/pullrequest.mako:308
 msgid "Loading compare ..."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:350
-#: rhodecode/templates/pullrequests/pullrequest.mako:352
+#: rhodecode/templates/pullrequests/pullrequest.mako:356
+#: rhodecode/templates/pullrequests/pullrequest.mako:358
 msgid "This pull request will consist of __COMMITS__ commit."
 msgid_plural "This pull request will consist of __COMMITS__ commits."
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:355
+#: rhodecode/templates/pullrequests/pullrequest.mako:361
 msgid "Show detailed compare."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:362
+#: rhodecode/templates/pullrequests/pullrequest.mako:368
 msgid "There are no commits to merge."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:462
-msgid "Destination repository"
+#: rhodecode/templates/pullrequests/pullrequest.mako:431
+msgid "Target repository"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.mako:473
+#: rhodecode/templates/pullrequests/pullrequest.mako:441
 msgid "Select commit reference"
 msgstr ""
 
@@ -9314,10 +9500,6 @@ msgstr ""
 msgid "Confirm to delete this pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:71
-msgid "Origin"
-msgstr ""
-
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:88
 msgid "Common ancestor"
 msgstr ""
@@ -9416,69 +9598,69 @@ msgid "Pull request versions not available"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:300
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:370
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:397
 msgid "Save Changes"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:387
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:414
 msgid "Missing requirements:"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:388
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:415
 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:396
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:423
 msgid "Missing commits"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:397
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:424
 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:398
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:425
 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:409
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:436
 #, python-format
 msgid "Showing changes at v%d, commenting is disabled."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:432
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:434
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:459
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:461
 msgid "Update commits"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:434
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:461
 msgid "Update is disabled for current view"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:445
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:472
 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:449
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:476
 msgid "commits added: {}, removed: {}"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:467
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:494
 msgid "Commit added in displayed changes"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:469
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:496
 msgid "Commit removed in displayed changes"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:572
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:599
 msgid "there is {num} general comment from older versions"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:575
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:602
 msgid "there are {num} general comments from older versions"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:576
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:603
 msgid "show them"
 msgstr ""
 
@@ -9568,6 +9750,11 @@ msgstr ""
 msgid "File names"
 msgstr ""
 
+#: rhodecode/templates/search/search_commit.mako:8
+#: rhodecode/templates/summary/summary_commits.mako:9
+msgid "Commit message"
+msgstr ""
+
 #: rhodecode/templates/search/search_commit.mako:11
 msgid "Age (new first)"
 msgstr ""
@@ -9599,34 +9786,6 @@ msgstr ""
 msgid "%s RSS feed"
 msgstr ""
 
-#: rhodecode/templates/summary/components.mako:5
-#, python-format
-msgid "%(num)s Branch"
-msgid_plural "%(num)s Branches"
-msgstr[0] ""
-msgstr[1] ""
-
-#: rhodecode/templates/summary/components.mako:12
-#, python-format
-msgid "%(num)s Closed Branch"
-msgid_plural "%(num)s Closed Branches"
-msgstr[0] ""
-msgstr[1] ""
-
-#: rhodecode/templates/summary/components.mako:19
-#, python-format
-msgid "%(num)s Tag"
-msgid_plural "%(num)s Tags"
-msgstr[0] ""
-msgstr[1] ""
-
-#: rhodecode/templates/summary/components.mako:26
-#, python-format
-msgid "%(num)s Bookmark"
-msgid_plural "%(num)s Bookmarks"
-msgstr[0] ""
-msgstr[1] ""
-
 #: rhodecode/templates/summary/components.mako:49
 msgid "Read-only url"
 msgstr ""
@@ -9707,6 +9866,18 @@ msgstr ""
 msgid "Readme file from commit %s:%s"
 msgstr ""
 
+#: rhodecode/templates/summary/summary_commits.mako:100
+msgid "Add or upload files directly via RhodeCode:"
+msgstr ""
+
+#: rhodecode/templates/summary/summary_commits.mako:111
+msgid "Push new repo:"
+msgstr ""
+
+#: rhodecode/templates/summary/summary_commits.mako:122
+msgid "Existing repository?"
+msgstr ""
+
 #: rhodecode/templates/tags/tags.mako:5
 #, python-format
 msgid "%s Tags"
diff --git a/rhodecode/public/js/rhodecode/i18n/be.js b/rhodecode/public/js/rhodecode/i18n/be.js
index 029e3be1..06d1d38d 100644
--- a/rhodecode/public/js/rhodecode/i18n/be.js
+++ b/rhodecode/public/js/rhodecode/i18n/be.js
@@ -7,8 +7,14 @@
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
     'Add another comment': 'Add another comment',
+    'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'All reviewers must vote.': 'All reviewers must vote.',
+    'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
+    'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
+    'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
     'Close': 'Close',
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
+    'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
     'Delete this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
     'Follow': 'Follow',
@@ -38,6 +44,7 @@ var _TM = {
     'Please delete {0} characters': 'Please delete {0} characters',
     'Please enter {0} or more character': 'Please enter {0} or more character',
     'Please enter {0} or more characters': 'Please enter {0} or more characters',
+    'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.',
     'Saving...': 'Saving...',
     'Searching...': 'Searching...',
     'Selection link': 'Selection link',
@@ -59,6 +66,7 @@ var _TM = {
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Unfollow': 'Unfollow',
     'Updating...': 'Updating...',
+    'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'added manually by "{0}"': 'added manually by "{0}"',
@@ -71,6 +79,7 @@ var _TM = {
     'in {0}, {1}': 'in {0}, {1}',
     'just now': 'just now',
     'loading...': 'loading...',
+    'member of "{0}"': 'member of "{0}"',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
diff --git a/rhodecode/public/js/rhodecode/i18n/de.js b/rhodecode/public/js/rhodecode/i18n/de.js
index 33921603..5be1858d 100644
--- a/rhodecode/public/js/rhodecode/i18n/de.js
+++ b/rhodecode/public/js/rhodecode/i18n/de.js
@@ -7,8 +7,14 @@
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
     'Add another comment': 'Add another comment',
+    'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'All reviewers must vote.': 'All reviewers must vote.',
+    'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
+    'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
+    'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
     'Close': 'Close',
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
+    'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
     'Delete this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
     'Follow': 'Follow',
@@ -38,6 +44,7 @@ var _TM = {
     'Please delete {0} characters': 'Bitte {0} Zeichen löschen',
     'Please enter {0} or more character': 'Bitte {0} oder mehr Zeichen eingeben',
     'Please enter {0} or more characters': 'Bitte {0} oder mehr Zeichen eingeben',
+    'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.',
     'Saving...': 'Saving...',
     'Searching...': 'Searching...',
     'Selection link': 'Selection link',
@@ -59,6 +66,7 @@ var _TM = {
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Unfollow': 'Unfollow',
     'Updating...': 'Updating...',
+    'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'added manually by "{0}"': 'added manually by "{0}"',
@@ -71,6 +79,7 @@ var _TM = {
     'in {0}, {1}': 'in {0}, {1}',
     'just now': 'jetzt gerade',
     'loading...': 'loading...',
+    'member of "{0}"': 'member of "{0}"',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
diff --git a/rhodecode/public/js/rhodecode/i18n/en.js b/rhodecode/public/js/rhodecode/i18n/en.js
index 029e3be1..06d1d38d 100644
--- a/rhodecode/public/js/rhodecode/i18n/en.js
+++ b/rhodecode/public/js/rhodecode/i18n/en.js
@@ -7,8 +7,14 @@
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
     'Add another comment': 'Add another comment',
+    'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'All reviewers must vote.': 'All reviewers must vote.',
+    'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
+    'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
+    'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
     'Close': 'Close',
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
+    'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
     'Delete this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
     'Follow': 'Follow',
@@ -38,6 +44,7 @@ var _TM = {
     'Please delete {0} characters': 'Please delete {0} characters',
     'Please enter {0} or more character': 'Please enter {0} or more character',
     'Please enter {0} or more characters': 'Please enter {0} or more characters',
+    'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.',
     'Saving...': 'Saving...',
     'Searching...': 'Searching...',
     'Selection link': 'Selection link',
@@ -59,6 +66,7 @@ var _TM = {
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Unfollow': 'Unfollow',
     'Updating...': 'Updating...',
+    'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'added manually by "{0}"': 'added manually by "{0}"',
@@ -71,6 +79,7 @@ var _TM = {
     'in {0}, {1}': 'in {0}, {1}',
     'just now': 'just now',
     'loading...': 'loading...',
+    'member of "{0}"': 'member of "{0}"',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
diff --git a/rhodecode/public/js/rhodecode/i18n/es.js b/rhodecode/public/js/rhodecode/i18n/es.js
index 029e3be1..06d1d38d 100644
--- a/rhodecode/public/js/rhodecode/i18n/es.js
+++ b/rhodecode/public/js/rhodecode/i18n/es.js
@@ -7,8 +7,14 @@
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
     'Add another comment': 'Add another comment',
+    'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'All reviewers must vote.': 'All reviewers must vote.',
+    'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
+    'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
+    'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
     'Close': 'Close',
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
+    'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
     'Delete this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
     'Follow': 'Follow',
@@ -38,6 +44,7 @@ var _TM = {
     'Please delete {0} characters': 'Please delete {0} characters',
     'Please enter {0} or more character': 'Please enter {0} or more character',
     'Please enter {0} or more characters': 'Please enter {0} or more characters',
+    'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.',
     'Saving...': 'Saving...',
     'Searching...': 'Searching...',
     'Selection link': 'Selection link',
@@ -59,6 +66,7 @@ var _TM = {
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Unfollow': 'Unfollow',
     'Updating...': 'Updating...',
+    'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'added manually by "{0}"': 'added manually by "{0}"',
@@ -71,6 +79,7 @@ var _TM = {
     'in {0}, {1}': 'in {0}, {1}',
     'just now': 'just now',
     'loading...': 'loading...',
+    'member of "{0}"': 'member of "{0}"',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
diff --git a/rhodecode/public/js/rhodecode/i18n/fr.js b/rhodecode/public/js/rhodecode/i18n/fr.js
index 970d30a0..3816e44a 100644
--- a/rhodecode/public/js/rhodecode/i18n/fr.js
+++ b/rhodecode/public/js/rhodecode/i18n/fr.js
@@ -7,8 +7,14 @@
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
     'Add another comment': 'Add another comment',
+    'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'All reviewers must vote.': 'All reviewers must vote.',
+    'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
+    'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
+    'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
     'Close': 'Close',
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
+    'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
     'Delete this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
     'Follow': 'Follow',
@@ -38,6 +44,7 @@ var _TM = {
     'Please delete {0} characters': 'Please delete {0} characters',
     'Please enter {0} or more character': 'Please enter {0} or more character',
     'Please enter {0} or more characters': 'Please enter {0} or more characters',
+    'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.',
     'Saving...': 'Saving...',
     'Searching...': 'Searching...',
     'Selection link': 'Lien vers la sélection',
@@ -59,6 +66,7 @@ var _TM = {
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Unfollow': 'Unfollow',
     'Updating...': 'Updating...',
+    'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'added manually by "{0}"': 'added manually by "{0}"',
@@ -71,6 +79,7 @@ var _TM = {
     'in {0}, {1}': 'in {0}, {1}',
     'just now': 'à l’instant',
     'loading...': 'Chargement…',
+    'member of "{0}"': 'member of "{0}"',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
diff --git a/rhodecode/public/js/rhodecode/i18n/it.js b/rhodecode/public/js/rhodecode/i18n/it.js
index 15560e47..e6a17943 100644
--- a/rhodecode/public/js/rhodecode/i18n/it.js
+++ b/rhodecode/public/js/rhodecode/i18n/it.js
@@ -7,8 +7,14 @@
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
     'Add another comment': 'Aggiungi un altro commento',
+    'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'All reviewers must vote.': 'All reviewers must vote.',
+    'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
+    'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
+    'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
     'Close': 'Close',
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
+    'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
     'Delete this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
     'Follow': 'Segui',
@@ -38,6 +44,7 @@ var _TM = {
     'Please delete {0} characters': 'Please delete {0} characters',
     'Please enter {0} or more character': 'Please enter {0} or more character',
     'Please enter {0} or more characters': 'Please enter {0} or more characters',
+    'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.',
     'Saving...': 'Saving...',
     'Searching...': 'Searching...',
     'Selection link': 'Collegamento selezione',
@@ -59,6 +66,7 @@ var _TM = {
     'There are currently no open pull requests requiring your participation.': 'Al momento non ci sono richieste di PULL che richiedono il tuo intervento',
     'Unfollow': 'Smetti di seguire',
     'Updating...': 'Updating...',
+    'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'added manually by "{0}"': 'added manually by "{0}"',
@@ -71,6 +79,7 @@ var _TM = {
     'in {0}, {1}': 'in {0}, {1}',
     'just now': 'proprio ora',
     'loading...': 'loading...',
+    'member of "{0}"': 'member of "{0}"',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
diff --git a/rhodecode/public/js/rhodecode/i18n/ja.js b/rhodecode/public/js/rhodecode/i18n/ja.js
index 912e0894..30101a1a 100644
--- a/rhodecode/public/js/rhodecode/i18n/ja.js
+++ b/rhodecode/public/js/rhodecode/i18n/ja.js
@@ -7,8 +7,14 @@
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
     'Add another comment': '別のコメントを追加',
+    'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'All reviewers must vote.': 'All reviewers must vote.',
+    'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
+    'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
+    'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
     'Close': 'Close',
     'Comment text will be set automatically based on currently selected status ({0}) ...': '選択したステータス ({0}) を元にコメントが自動的に設定されます...',
+    'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
     'Delete this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
     'Follow': 'フォロー',
@@ -38,6 +44,7 @@ var _TM = {
     'Please delete {0} characters': '{0} 文字削除してください',
     'Please enter {0} or more character': '{0} 文字以上入力してください',
     'Please enter {0} or more characters': '{0} 文字以上入力してください',
+    'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.',
     'Saving...': 'Saving...',
     'Searching...': '検索中...',
     'Selection link': 'セレクション・リンク',
@@ -59,6 +66,7 @@ var _TM = {
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Unfollow': 'アンフォロー',
     'Updating...': 'Updating...',
+    'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'You can only select {0} item': '{0} 件のみ選択できます',
     'You can only select {0} items': '{0} 件のみ選択できます',
     'added manually by "{0}"': 'added manually by "{0}"',
@@ -71,6 +79,7 @@ var _TM = {
     'in {0}, {1}': 'in {0}, {1}',
     'just now': 'たったいま',
     'loading...': '読み込み中...',
+    'member of "{0}"': 'member of "{0}"',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
diff --git a/rhodecode/public/js/rhodecode/i18n/js_translations.js b/rhodecode/public/js/rhodecode/i18n/js_translations.js
index 63bcaebb..ae393cb2 100644
--- a/rhodecode/public/js/rhodecode/i18n/js_translations.js
+++ b/rhodecode/public/js/rhodecode/i18n/js_translations.js
@@ -1,8 +1,14 @@
 // AUTO GENERATED FILE FOR Babel JS-GETTEXT EXTRACTORS, DO NOT CHANGE
 _gettext('(from usergroup {0})');
 _gettext('Add another comment');
+_gettext('Adding new reviewers is forbidden.');
+_gettext('All reviewers must vote.');
+_gettext('At least {0} reviewer must vote.');
+_gettext('At least {0} reviewers must vote.');
+_gettext('Author is not allowed to be a reviewer.');
 _gettext('Close');
 _gettext('Comment text will be set automatically based on currently selected status ({0}) ...');
+_gettext('Commit Authors are not allowed to be a reviewer.');
 _gettext('Delete this comment?');
 _gettext('Diff to Commit ');
 _gettext('Follow');
@@ -32,6 +38,7 @@ _gettext('Please delete {0} character');
 _gettext('Please delete {0} characters');
 _gettext('Please enter {0} or more character');
 _gettext('Please enter {0} or more characters');
+_gettext('Reviewers picked from source code changes.');
 _gettext('Saving...');
 _gettext('Searching...');
 _gettext('Selection link');
@@ -53,6 +60,7 @@ _gettext('TODO from comment {0} was fixed.');
 _gettext('There are currently no open pull requests requiring your participation.');
 _gettext('Unfollow');
 _gettext('Updating...');
+_gettext('User `{0}` not allowed to be a reviewer');
 _gettext('You can only select {0} item');
 _gettext('You can only select {0} items');
 _gettext('added manually by "{0}"');
@@ -65,6 +73,7 @@ _gettext('in {0} and {1}');
 _gettext('in {0}, {1}');
 _gettext('just now');
 _gettext('loading...');
+_gettext('member of "{0}"');
 _gettext('resolve comment');
 _gettext('showing {0} out of {1} commit');
 _gettext('showing {0} out of {1} commits');
diff --git a/rhodecode/public/js/rhodecode/i18n/pl.js b/rhodecode/public/js/rhodecode/i18n/pl.js
index 9db5b699..cc918f6c 100644
--- a/rhodecode/public/js/rhodecode/i18n/pl.js
+++ b/rhodecode/public/js/rhodecode/i18n/pl.js
@@ -7,8 +7,14 @@
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
     'Add another comment': 'Dodaj kolejny komentarz',
+    'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'All reviewers must vote.': 'All reviewers must vote.',
+    'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
+    'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
+    'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
     'Close': 'Zamknij',
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
+    'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
     'Delete this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
     'Follow': 'Obserwuj',
@@ -38,6 +44,7 @@ var _TM = {
     'Please delete {0} characters': 'Please delete {0} characters',
     'Please enter {0} or more character': 'Please enter {0} or more character',
     'Please enter {0} or more characters': 'Please enter {0} or more characters',
+    'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.',
     'Saving...': 'Saving...',
     'Searching...': 'Searching...',
     'Selection link': 'Wybór linku',
@@ -59,6 +66,7 @@ var _TM = {
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Unfollow': 'Nie obserwuj',
     'Updating...': 'Updating...',
+    'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'added manually by "{0}"': 'added manually by "{0}"',
@@ -71,6 +79,7 @@ var _TM = {
     'in {0}, {1}': 'in {0}, {1}',
     'just now': 'przed chwilą',
     'loading...': 'wczytywanie...',
+    'member of "{0}"': 'member of "{0}"',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
diff --git a/rhodecode/public/js/rhodecode/i18n/pt.js b/rhodecode/public/js/rhodecode/i18n/pt.js
index e804077d..64bfe1f3 100644
--- a/rhodecode/public/js/rhodecode/i18n/pt.js
+++ b/rhodecode/public/js/rhodecode/i18n/pt.js
@@ -7,8 +7,14 @@
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
     'Add another comment': 'Adicionar outro comentário',
+    'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'All reviewers must vote.': 'All reviewers must vote.',
+    'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
+    'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
+    'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
     'Close': 'Close',
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
+    'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
     'Delete this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
     'Follow': 'Seguir',
@@ -38,6 +44,7 @@ var _TM = {
     'Please delete {0} characters': 'Please delete {0} characters',
     'Please enter {0} or more character': 'Please enter {0} or more character',
     'Please enter {0} or more characters': 'Please enter {0} or more characters',
+    'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.',
     'Saving...': 'Saving...',
     'Searching...': 'Searching...',
     'Selection link': 'Link da seleção',
@@ -59,6 +66,7 @@ var _TM = {
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Unfollow': 'Parar de seguir',
     'Updating...': 'Updating...',
+    'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'added manually by "{0}"': 'added manually by "{0}"',
@@ -71,6 +79,7 @@ var _TM = {
     'in {0}, {1}': 'in {0}, {1}',
     'just now': 'agora há pouco',
     'loading...': 'loading...',
+    'member of "{0}"': 'member of "{0}"',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
diff --git a/rhodecode/public/js/rhodecode/i18n/ru.js b/rhodecode/public/js/rhodecode/i18n/ru.js
index 1e519205..d34c4dd4 100644
--- a/rhodecode/public/js/rhodecode/i18n/ru.js
+++ b/rhodecode/public/js/rhodecode/i18n/ru.js
@@ -7,8 +7,14 @@
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
     'Add another comment': 'Добавить другой комментарий',
+    'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'All reviewers must vote.': 'All reviewers must vote.',
+    'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
+    'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
+    'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
     'Close': 'Close',
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
+    'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
     'Delete this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
     'Follow': 'Наблюдать',
@@ -38,6 +44,7 @@ var _TM = {
     'Please delete {0} characters': 'Please delete {0} characters',
     'Please enter {0} or more character': 'Please enter {0} or more character',
     'Please enter {0} or more characters': 'Please enter {0} or more characters',
+    'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.',
     'Saving...': 'Saving...',
     'Searching...': 'Searching...',
     'Selection link': 'Ссылка выбора',
@@ -59,6 +66,7 @@ var _TM = {
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Unfollow': 'Не наблюдать',
     'Updating...': 'Updating...',
+    'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'added manually by "{0}"': 'added manually by "{0}"',
@@ -71,6 +79,7 @@ var _TM = {
     'in {0}, {1}': 'in {0}, {1}',
     'just now': 'прямо сейчас',
     'loading...': 'загрузка...',
+    'member of "{0}"': 'member of "{0}"',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
diff --git a/rhodecode/public/js/rhodecode/i18n/zh.js b/rhodecode/public/js/rhodecode/i18n/zh.js
index 5318237f..4a3d6583 100644
--- a/rhodecode/public/js/rhodecode/i18n/zh.js
+++ b/rhodecode/public/js/rhodecode/i18n/zh.js
@@ -7,8 +7,14 @@
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
     'Add another comment': 'Add another comment',
+    'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.',
+    'All reviewers must vote.': 'All reviewers must vote.',
+    'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
+    'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
+    'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
     'Close': 'Close',
     'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
+    'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
     'Delete this comment?': 'Delete this comment?',
     'Diff to Commit ': 'Diff to Commit ',
     'Follow': 'Follow',
@@ -38,6 +44,7 @@ var _TM = {
     'Please delete {0} characters': 'Please delete {0} characters',
     'Please enter {0} or more character': 'Please enter {0} or more character',
     'Please enter {0} or more characters': 'Please enter {0} or more characters',
+    'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.',
     'Saving...': 'Saving...',
     'Searching...': 'Searching...',
     'Selection link': '选择链接',
@@ -59,6 +66,7 @@ var _TM = {
     'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.',
     'Unfollow': 'Unfollow',
     'Updating...': 'Updating...',
+    'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer',
     'You can only select {0} item': 'You can only select {0} item',
     'You can only select {0} items': 'You can only select {0} items',
     'added manually by "{0}"': 'added manually by "{0}"',
@@ -71,6 +79,7 @@ var _TM = {
     'in {0}, {1}': 'in {0}, {1}',
     'just now': '刚才',
     'loading...': 'loading...',
+    'member of "{0}"': 'member of "{0}"',
     'resolve comment': 'resolve comment',
     'showing {0} out of {1} commit': 'showing {0} out of {1} commit',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',

From 44c4d628dd46173202dfc90b272c75ca071ba3cb Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 27 Jun 2017 23:45:33 +0200
Subject: [PATCH 210/211] docs: fix for contribution docs.

---
 docs/contributing/dev-setup.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/contributing/dev-setup.rst b/docs/contributing/dev-setup.rst
index ff40cde3..07b7a1a6 100644
--- a/docs/contributing/dev-setup.rst
+++ b/docs/contributing/dev-setup.rst
@@ -66,7 +66,7 @@ RhodeCode VCSServer repositories into the same directory.
 RhodeCode currently is using Mercurial Version Control System, please make sure
 you have it installed before continuing.
 
-To obtain the required sources, use the following commands:
+To obtain the required sources, use the following commands::
 
     mkdir rhodecode-develop && cd rhodecode-develop
     hg clone https://code.rhodecode.com/rhodecode-enterprise-ce
@@ -80,9 +80,9 @@ To obtain the required sources, use the following commands:
 Install some required libraries
 -------------------------------
 
-There are some required drivers that we need to install to test RhodeCode
-under different types of databases. For example in Ubuntu we need to install
-the following.
+There are some required drivers and dev libraries that we need to install to
+test RhodeCode under different types of databases. For example in Ubuntu we
+need to install the following.
 
 required libraries::
 

From 3341c88c61b354eb200e05bede2e8899c347e6a5 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 27 Jun 2017 16:52:35 +0200
Subject: [PATCH 211/211] docs: added changelog for 4.8.0 release.

---
 docs/release-notes/release-notes-4.8.0.rst | 103 +++++++++++++++++++++
 docs/release-notes/release-notes.rst       |   1 +
 2 files changed, 104 insertions(+)
 create mode 100644 docs/release-notes/release-notes-4.8.0.rst

diff --git a/docs/release-notes/release-notes-4.8.0.rst b/docs/release-notes/release-notes-4.8.0.rst
new file mode 100644
index 00000000..6b3413a8
--- /dev/null
+++ b/docs/release-notes/release-notes-4.8.0.rst
@@ -0,0 +1,103 @@
+|RCE| 4.8.0 |RNS|
+-----------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2017-06-30
+
+
+New Features
+^^^^^^^^^^^^
+
+- Code Review: added new reviewers logic. This features now is Common Criteria
+  compatible and allows to define Mandatory (non-removable) reviewers.
+  In addition new options were added to forbid adding new reviewers or forbid
+  author of commits or the pull request itself to be a reviewer of the code.
+- Audit logs: introducing new audit logs tracking most important actions in
+  the system. Admins can track important events such as deletion of resources,
+  permissions changes, user groups changes. Each event tracks users with his
+  IP and user agent.
+- Mercurial: enabled evolve extensions. Each repository can be now configured
+  to support evolve, commit phases, and evolve state are also shown in
+  commit and changelog views.
+- VCS: expose newly pushed bookmarks or branches as quick links to open a
+  pull request on client output. Allows easier pull request creation via CLI.
+
+
+General
+^^^^^^^
+
+- Core: ported many views into pure pyramid code with python3.6 compatibility.
+  Now almost 80% of the code is ported, and future ready. It's our ongoing
+  effort to allow support for modern python version.
+- Comments: show author tag in pull request comments to easily
+  discover the author of changes in discussions.
+- Files: allow specifying custom filename for uploaded files via web interface.
+- Pull requests: changed who is allowed to close a pull request. Now it's only
+  super-admin, owner or person who can merge.
+  Before it was every reviewer can close. Which really doesn't make sense.
+- Users: show that user is disabled when editing his properties.
+- Integrations: expose user_id, and username in Webhook integration
+  templates arguments.
+- Integrations: exposed extra repo variables in template arguments of
+  Webhook integration.
+- Login: add link when using external auth to make it easier to login
+  using oauth providers, such as Google or Github.
+- Maintenance: added svn verify command to tasks to be able to verify the
+  filesystem and repo formats from web interface. Allows much easier tracking
+  of incompatible filesystem storage of subversion repositories.
+- Events: expose permalink urls for pull requests, and repositories.
+  Permalink url should provide a non-changeable url that can be used in
+  external system.
+- Svn: increase possibility to specify compatibility to pre 1.9 version.
+
+
+Security
+^^^^^^^^
+
+- security(high): fixed possibility to delete other users inline comments
+  for users who were repository admins.
+- security(med): fixed XSS inside the tooltip for author string.
+- security(med): fixed stored XSS in notifications inbox.
+- security(med): use custom writer for RST rendering to prevent injection of javascript: tags.
+- security(med): escape flash messaged VCS errors to prevent reflected XSS attacks.
+- security(low): use 404 instead of 403 code on permission decorator to
+  prevent brute force resource discovery attacks.
+- security(low): fixed self XSS inside autocomplete files view.
+- security(low): fixed self Xss inside repo strip view.
+- security(low): fixed self Xss inside the email add functionality.
+- security(none): use new safe escaped user attributes across the application.
+  Will prevent all possible XSS attack vectors from user stored attributes.
+  This specially can come from external authentication systems which doesn't
+  validate the data.
+
+
+Performance
+^^^^^^^^^^^
+
+
+
+
+Fixes
+^^^^^
+
+- Pull requests: make sure we process comments in the order of IDS when
+  linking them. In some edge cases it could lead to comments not displaying
+  correctly.
+- Emails: fixed newlines in email templates that can break email sending code.
+- Markdown: fixed hr and strong tags styling.
+- Notifications: fixed problem with 500 errors on non-numeric entries in url.
+- API: use simple schema validator to be consistent how we validate between
+  API and web views for create user and create user_group calls.
+- Users: fixed problem with personal repo group wasn't shown for disabled users.
+- Oauth: improve Google extraction of first/last name from returned data.
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+
+- API: the `update_pull_request` method will no longer support a close action.
+  Users should use the existing `close_pull_request` method which allows
+  specifying a message and status while closing a pull request.
\ No newline at end of file
diff --git a/docs/release-notes/release-notes.rst b/docs/release-notes/release-notes.rst
index 78da0286..ae828d60 100644
--- a/docs/release-notes/release-notes.rst
+++ b/docs/release-notes/release-notes.rst
@@ -9,6 +9,7 @@ Release Notes
 .. toctree::
    :maxdepth: 1
 
+   release-notes-4.8.0.rst
    release-notes-4.7.2.rst
    release-notes-4.7.1.rst
    release-notes-4.7.0.rst