release: Merge default into stable for release preparation

docs/contributing/checklist-tickets.rst

@@ -0,0 +1,137 b''
+.. _checklist-tickets:
+
+=================
+Ticket Checklists
+=================
+
+
+Ticket Description
+==================
+
+In general these things really matter in the description:
+
+- Reasoning / Rationale. Explain "WHY" it makes sense and is important.
+
+- How to reproduce. Easy to follow steps, that’s important.
+
+  - Observation: The problem (short)
+
+  - Expectation: How it should be (short)
+
+- Specs: It is fine to draft them as good as it works.
+
+  If anything is unclear, please ask for a review or help on this via the
+  Community Portal or Slack channel.
+
+
+Checklists for Tickets
+======================
+
+BUG
+---
+
+Definition: An existing function that does not work as expected for the user.
+
+- Problem description
+- Steps needed to recreate (gherkin)
+- Link to the screen in question and/or description of how to find it via 
+  navigation
+- Explanation of what the expected outcome is
+- Any hints into the source of the problem
+- Information about platform/browser/db/etc. where applicable
+- Examples of other similar cases which have different behaviour
+
+DESIGN
+------
+
+Definition: Styling and user interface issues, including cosmetic improvements
+or appearance and behaviour of frontend functionality.
+
+- Screenshot/animation of existing page/behaviour
+- Sketches or wireframes if available
+- Link to the screen in question and/or description of how to find it via 
+  navigation
+- Problem description
+- Explanation of what the expected outcome is
+- Since this may be examined by a designer; it should be written in a way that a
+  non-developer can understand
+
+EPIC
+----
+
+Definition: A collection of tickets which together complete a larger overall
+project.
+
+- Benefit explanation
+- Clear objective - when is this complete?
+- Explanations of exceptions/corner cases
+- Documentation subtask
+- Comprehensive wireframes and/or design subtasks
+- Links to subtasks
+
+FEATURE
+-------
+
+Definition: A new function in the software which previously did not exist.
+
+- Benefit explanation
+- Clear objective
+- Explanations of exceptions/corner cases
+- Documentation subtask
+- Comprehensive wireframes and/or design subtasks
+
+SUPPORT
+-------
+
+Definition: An issue related to a customer report.
+
+- Link to support ticket, if available
+- Problem description
+- Steps needed to recreate (gherkin)
+- Link to the screen in question and/or description of how to find it via 
+  navigation
+- Explanation of what the expected outcome is
+- Any hints into the source of the problem
+- Information about platform/browser/db/etc. where applicable
+- Examples of other similar cases which have different behaviour
+
+TASK
+----
+
+Definition: An improvement or step towards implementing a feature or fixing
+a bug. Includes refactoring and other tech debt.
+
+- Clear objective
+- Benefit explanation
+- Links to parent/related tickets
+
+
+All details below.
+
+
+External links:
+
+- Avoid linking to external images; they disappear over time. Please attach any
+  relevant images to the ticket itself.
+
+- External links in general: They also disappear over time, consider copying the
+  relevant bit of information into a comment or write a paragraph to sum up the
+  general idea.
+
+
+Hints
+=====
+
+Change Description
+------------------
+
+It can be tricky to figure out how to change the description of a ticket. There
+is a very small pencil which has to be clicked once you see the edit form of a
+ticket.
+
+
+.. figure:: images/redmine-description.png
+   :alt: Example of pencil to change the ticket description
+
+   Shows an example of the pencil which lets you change the description.
+

docs/contributing/frontend.rst

@@ -0,0 +1,153 b''
+
+==================================================
+ Code style and structure guide for frontend work
+==================================================
+
+About: Outline of frontend development practices.
+
+
+
+
+Templates
+=========
+
+- Indent with 4 spaces in general.
+- Embedded Python code follows the same conventions as in the backend.
+
+  A common problem is missed spaces around operators.
+
+
+
+
+Grunt
+=====
+
+We use Grunt to compile our JavaScript and LESS files. This is done automatically
+when you start an instance. If you are changing these files, however, it is
+recommended to amend `--reload` to the `runserver` command, or use `grunt watch`
+- the Gruntfile is located in the base directory. For more info on Grunt, see
+http://gruntjs.com/
+
+
+
+
+LESS CSS
+========
+
+
+Style
+-----
+
+- Use 4 spaces instead of tabs.
+- Avoid ``!important``; it is very often an indicator for a problem.
+
+
+
+
+Structure
+---------
+
+It is important that we maintain consistency in the LESS files so that things
+scale properly. CSS is organized using LESS and then compiled into a CSS file
+to be used in production. Find the class you need to change and change it
+there. Do not add overriding styles at the end of the file. The LESS file will
+be minified; use plenty of spacing and comments for readability.
+
+These will be kept in auxillary LESS files to be imported (in this order) at the top:
+
+- `fonts.less` (font-face declarations)
+- `mixins` (place all LESS mixins here)
+- `helpers` (basic classes for hiding mobile elements, centering, etc)
+- `variables` (theme-specific colors, spacing, and fonts which might change later)
+
+
+Sections of the primary LESS file are as follows. Add comments describing
+layout and modules.
+
+.. code-block:: css
+
+   //--- BASE ------------------//
+           Very basic, sitewide styles.
+
+   //--- LAYOUT ------------------//
+           Essential layout, ex. containers and wrappers.
+           Do not put type styles in here.
+
+   //--- MODULES ------------------//
+           Reusable sections, such as sidebars and menus.
+
+   //--- THEME ------------------//
+           Theme styles, typography, etc.
+
+
+
+Formatting rules
+~~~~~~~~~~~~~~~~
+
+- Each rule should be indented on a separate line (this is helpful for diff
+  checking).
+
+- Use a space after each colon and a semicolon after each last rule.
+
+- Put a blank line between each class.
+
+- Nested classes should be listed after the parent class' rules, separated with a
+  blank line, and indented.
+
+- Using the below as a guide, place each rule in order of its effect on content,
+  layout, sizing, and last listing minor style changes such as font color and
+  backgrounds. Not every possible rule is listed here; when adding new ones,
+  judge where it should go in the list based on that hierarchy.
+
+  .. code-block:: scss
+
+     .class {
+             content
+             list-style-type
+             position
+             float
+             top
+             right
+             bottom
+             left
+             height
+             max-height
+             min-height
+             width
+             max-width
+             min-width
+             margin
+             padding
+             indent
+             vertical-align
+             text-align
+             border
+             border-radius
+             font-size
+             line-height
+             font
+             font-style
+             font-variant
+             font-weight
+             color
+             text-shadow
+             background
+             background-color
+             box-shadow
+             background-url
+             background-position
+             background-repeat
+             background-cover
+             transitions
+             cursor
+             pointer-events
+
+             .nested-class {
+                     position
+                     background-color
+
+                     &:hover {
+                             color
+                     }
+             }
+     }

docs/contributing/overview.rst

@@ -0,0 +1,111 b''
+
+=======================
+ Contributing Overview
+=======================
+
+
+RhodeCode Community Edition is an open source code management platform. We
+encourage contributions to our project from the community. This is a basic
+overview of the procedures for adding your contribution to RhodeCode.
+
+
+
+Check the Issue Tracker
+=======================
+
+Make an account at https://issues.rhodecode.com/account/register and browse the
+current tickets for bugs to fix and tasks to do. Have a bug or feature that you
+can't find in the tracker? Create a new issue for it. When you select a ticket,
+make sure to assign it to yourself and mark it "in progress" to avoid duplicated
+work. 
+
+
+
+Sign Up at code.rhodecode.com
+=============================
+
+Make an account at https://code.rhodecode.com/ using an email or your existing
+GitHub, Bitbucket, Google, or Twitter account. Fork the repo you'd like to
+contribute to; we suggest adding your username to the fork name. Clone your fork
+to your computer. We use Mercurial for source control management; see
+https://www.mercurial-scm.org/guide to get started quickly.
+
+
+
+Set Up A Local Instance
+=======================
+
+You will need to set up an instance of RhodeCode CE using VCSServer so that you
+can see your work locally as you make changes. We recommend using Linux for this
+but it can also be built on OSX.
+
+See :doc:`dev-setup` for instructions.
+
+
+
+Code!
+=====
+
+You can now make, see, and test your changes locally. We are always improving to
+keep our code clean and the cost of maintaining it low. This applies in the same
+way for contributions. We run automated checks on our pull requests, and expect
+understandable code. We also aim to provide test coverage for as much of our
+codebase as possible; any new features should be augmented with tests.
+
+Keep in mind that when we accept your contribution, we also take responsibility
+for it; we must understand it to take on that responsibility.
+
+See :doc:`standards` for more detailed information.
+
+
+
+Commit And Push Your Changes
+============================
+
+We highly recommend making a new bookmark for each feature, bug, or set of
+commits you make so that you can point to it when creating your pull request.
+Please also reference the ticket number in your commit messages. Don't forget to
+push the bookmark!
+
+
+
+Submit a Pull Request
+=====================
+
+Go to your fork, and choose "Create Pull Request" from the Options menu. Use
+your bookmark as the source, and choose someone to review it. Don't worry about
+chosing the right person; we'll assign the best contributor for the job. You'll
+get feedback and an assigned status.
+
+Be prepared to make updates to your pull request after some feedback.
+Collaboration is part of the process and improvements can often be made.
+
+
+
+Sign the Contributor License Agreement
+======================================
+
+If your contribution is approved, you will need to virtually sign the license
+agreement in order for it to be merged into the project's codebase. You can read
+it on our website here: https://rhodecode.com/static/pdf/RhodeCode-CLA.pdf
+
+To sign, go to code.rhodecode.com
+and clone the CLA repository. Add your name and make a pull request to add it to
+the contributor agreement; this serves as your virtual signature. Once your
+signature is merged, add a link to the relevant commit to your contribution
+pull request.
+
+
+
+That's it! We'll take it from there. Thanks for your contribution!
+------------------------------------------------------------------
+
+.. note:: If you have any questions or comments, feel free to contact us through
+          either the community portal(community.rhodecode.com), IRC
+          (irc.freenode.net), or Slack (rhodecode.com/join).
+
+
+
+
+
+

docs/contributing/standards.rst

@@ -0,0 +1,177 b''
+
+======================
+Contribution Standards
+======================
+
+Standards help to improve the quality of our product and its development. Herein
+we define our standards for processes and development to maintain consistency
+and function well as a community. It is a work in progress; modifications to this
+document should be discussed and agreed upon by the community.
+
+
+--------------------------------------------------------------------------------
+
+Code
+====
+
+This provides an outline for standards we use in our codebase to keep our code
+easy to read and easy to maintain. Much of our code guidelines are based on the
+book `Clean Code <http://www.pearsonhighered.com/educator/product/Clean-Code-A-Handbook-of-Agile-Software-Craftsmanship/9780132350884.page>`_
+by Robert Martin.
+
+We maintain a Tech Glossary to provide consistency in terms and symbolic names
+used for items and concepts within the application. This is found in the CE
+project in /docs-internal/glossary.rst
+
+
+Refactoring
+-----------
+Make it better than you found it!
+
+Our codebase can always use improvement and often benefits from refactoring.
+New code should be refactored as it is being written, and old code should be
+treated with the same care as if it was new. Before doing any refactoring,
+ensure that there is test coverage on the affected code; this will help
+minimize issues.
+
+
+Python
+------
+For Python, we use `PEP8 <https://www.python.org/dev/peps/pep-0008/>`_.
+We adjust lines of code to under 80 characters and use 4 spaces for indentation.
+
+
+JavaScript
+----------
+This currently remains undefined. Suggestions welcome!
+
+
+HTML
+----
+Unfortunately, we currently have no strict HTML standards, but there are a few
+guidelines we do follow. Templates must work in all modern browsers. HTML should
+be clean and easy to read, and additionally should be free of inline CSS or
+JavaScript. It is recommended to use data attributes for JS actions where
+possible in order to separate it from styling and prevent unintentional changes.
+
+
+LESS/CSS
+--------
+We use LESS for our CSS; see :doc:`frontend` for structure and formatting
+guidelines.
+
+
+Linters
+-------
+Currently, we have a linter for pull requests which checks code against PEP8.
+We intend to add more in the future as we clarify standards.
+
+
+--------------------------------------------------------------------------------
+
+Naming Conventions
+==================
+
+These still need to be defined for naming everything from Python variables to
+HTML classes to files and folders.
+
+
+--------------------------------------------------------------------------------
+
+Testing
+=======
+
+Testing is a very important aspect of our process, especially as we are our own
+quality control team. While it is of course unrealistic to hit every potential
+combination, our goal is to cover every line of Python code with a test. 
+
+The following is a brief introduction to our test suite. Our tests are primarily
+written using `py.test <http://pytest.org/>`_
+
+
+Acceptance Tests
+----------------
+Also known as "ac tests", these test from the user and business perspective to
+check if the requirements of a feature are met. Scenarios are created at a
+feature's inception and help to define its value.
+
+py.test is used for ac tests; they are located in a repo separate from the
+other tests which follow. Each feature has a .feature file which contains a
+brief description and the scenarios to be tested.
+
+
+Functional Tests
+----------------
+These test specific functionality in the application which checks through the
+entire stack. Typically these are user actions or permissions which go through
+the web browser. They are located in rhodecode/tests.
+
+
+Unit Tests
+----------
+These test isolated, individual modules to ensure that they function correctly.
+They are located in rhodecode/tests.
+
+
+Integration Tests
+-----------------
+These are used for testing performance of larger systems than the unit tests.
+They are located in rhodecode/tests.
+
+
+JavaScript Testing
+------------------
+Currently, we have not defined how to test our JavaScript code.
+
+
+--------------------------------------------------------------------------------
+
+Pull Requests
+=============
+
+Pull requests should generally contain only one thing: a single feature, one bug
+fix, etc.. The commit history should be concise and clean, and the pull request
+should contain the ticket number (also a good idea for the commits themselves)
+to provide context for the reviewer.
+
+See also: :doc:`checklist-pull-request`
+
+
+Reviewers
+---------
+Each pull request must be approved by at least one member of the RhodeCode
+team. Assignments may be based on expertise or familiarity with a particular
+area of code, or simply availability. Switching up or adding extra community
+members for different pull requests helps to share knowledge as well as provide
+other perspectives.
+
+
+Responsibility
+--------------
+The community is responsible for maintaining features and this must be taken
+into consideration. External contributions must be held to the same standards
+as internal contributions.
+
+
+Feature Switch
+--------------
+Experimental and work-in-progress features can be hidden behind one of two
+switches:
+
+* A setting can be added to the Labs page in the Admin section which may allow
+  customers to access and toggle additional features.
+* For work-in-progress or other features where customer access is not desired,
+  use a custom setting in the .ini file as a trigger.
+
+
+--------------------------------------------------------------------------------
+
+Tickets
+=======
+
+Redmine tickets are a crucial part of our development process. Any code added or
+changed in our codebase should have a corresponding ticket to document it. With
+this in mind, it is important that tickets be as clear and concise as possible,
+including what the expected outcome is.
+
+See also: :doc:`checklist-tickets`

docs/release-notes/release-notes-4.2.0.rst

@@ -0,0 +1,70 b''
+|RCE| 4.2.0 |RNS|
+-----------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2016-06-30
+
+
+General
+^^^^^^^
+
+- Autocomplete: add GET flag support to show/hide active users on autocomplete,
+  also display this information in autocomplete data.  ref #3374
+- Gravatar: add flag to show current gravatar + user as disabled user (non-active)
+- Repos, repo groups, user groups: allow to use disabled users in owner field.
+  This fixes #3374.
+- Repos, repo groups, user groups: visually show what user is an owner of a
+  resource, and if potentially he is disabled in the system.
+- Pull requests: reorder navigation on repo pull requests, fixes #2995
+- Dependencies: bump dulwich to 0.13.0
+
+New Features
+^^^^^^^^^^^^
+
+- My account: made pull requests aggregate view for users look like not
+  created in 1995. Now uses a consistent look with repo one.
+- emails: expose profile link on registation email that super-admins receive.
+  Implements #3999.
+- Social auth: move the buttons to the top of nav so they are easier to reach.
+
+
+Security
+^^^^^^^^
+
+- Encryption: allow to pass in alternative key for encryption values. Now
+  users can use `rhodecode.encrypted_values.secret` that is alternative key,
+  de-coupled from `beaker.session` key.
+- Encryption: Implement a slightly improved AesCipher encryption.
+  This addresses issues from #4036.
+- Encryption: encrypted values now by default uses HMAC signatures to detect
+  if data or secret key is incorrect. The strict checks can be disabled using
+  `rhodecode.encrypted_values.strict = false` .ini setting
+
+
+Performance
+^^^^^^^^^^^
+
+- Sql: use smarter JOINs when fetching repository information
+- Helpers: optimize slight calls for link_to_user to save some intense queries.
+- App settings: use computed caches for repository settings, this in some cases
+  brings almost 4x performance increase for large repos with a lot of issue
+  tracker patterns.
+
+
+Fixes
+^^^^^
+
+- Fixed events on user pre/post create actions
+- Authentication: fixed problem with saving forms with errors on auth plugins
+- Svn: Avoid chunked transfer for Subversion that caused checkout issues in some cases.
+- Users: fix generate new user password helper.
+- Celery: fixed problem with workers running action in sync mode in some cases.
+- Setup-db: fix redundant question on writable dir. The question needs to be
+  asked only when the dir is actually not writable.
+- Elasticsearch: fixed issues when searching single repo using elastic search
+- Social auth: fix issues with non-active users using social authentication
+  causing a 500 error.
+- Fixed problem with largefiles extensions on per-repo settings using local
+  .hgrc files present inside the repo directory.

rhodecode/admin/__init__.py

@@ -0,0 +1,40 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  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.admin.navigation import NavigationRegistry
+from rhodecode.config.routing import ADMIN_PREFIX
+from rhodecode.lib.utils2 import str2bool
+
+
+def includeme(config):
+    settings = config.get_settings()
+
+    # Create admin navigation registry and add it to the pyramid registry.
+    labs_active = str2bool(settings.get('labs_settings_active', False))
+    navigation_registry = NavigationRegistry(labs_active=labs_active)
+    config.registry.registerUtility(navigation_registry)
+
+    config.add_route(
+        name='admin_settings_open_source',
+        pattern=ADMIN_PREFIX + '/settings/open_source')
+
+    # Scan module for configuration decorators.
+    config.scan()

rhodecode/admin/interfaces.py

@@ -0,0 +1,29 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  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 zope.interface import Interface
+
+
+class IAdminNavigationRegistry(Interface):
+    """
+    Interface for the admin navigation registry. Currently this is only
+    used to register and retrieve it via pyramids registry.
+    """
+    pass

rhodecode/admin/navigation.py

@@ -0,0 +1,124 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+
+import logging
+import collections
+
+from pylons import url
+from zope.interface import implementer
+
+from rhodecode.admin.interfaces import IAdminNavigationRegistry
+from rhodecode.lib.utils import get_registry
+from rhodecode.translation import _
+
+
+log = logging.getLogger(__name__)
+
+NavListEntry = collections.namedtuple('NavListEntry', ['key', 'name', 'url'])
+
+
+class NavEntry(object):
+    """
+    Represents an entry in the admin navigation.
+
+    :param key: Unique identifier used to store reference in an OrderedDict.
+    :param name: Display name, usually a translation string.
+    :param view_name: Name of the view, used generate the URL.
+    :param pyramid: Indicator to use pyramid for URL generation. This should
+        be removed as soon as we are fully migrated to pyramid.
+    """
+
+    def __init__(self, key, name, view_name, pyramid=False):
+        self.key = key
+        self.name = name
+        self.view_name = view_name
+        self.pyramid = pyramid
+
+    def generate_url(self, request):
+        if self.pyramid:
+            if hasattr(request, 'route_path'):
+                return request.route_path(self.view_name)
+            else:
+                # TODO: johbo: Remove this after migrating to pyramid.
+                # We need the pyramid request here to generate URLs to pyramid
+                # views from within pylons views.
+                from pyramid.threadlocal import get_current_request
+                pyramid_request = get_current_request()
+                return pyramid_request.route_path(self.view_name)
+        else:
+            return url(self.view_name)
+
+
+@implementer(IAdminNavigationRegistry)
+class NavigationRegistry(object):
+
+    _base_entries = [
+        NavEntry('global', _('Global'), 'admin_settings_global'),
+        NavEntry('vcs', _('VCS'), 'admin_settings_vcs'),
+        NavEntry('visual', _('Visual'), 'admin_settings_visual'),
+        NavEntry('mapping', _('Remap and Rescan'), 'admin_settings_mapping'),
+        NavEntry('issuetracker', _('Issue Tracker'),
+                 'admin_settings_issuetracker'),
+        NavEntry('email', _('Email'), 'admin_settings_email'),
+        NavEntry('hooks', _('Hooks'), 'admin_settings_hooks'),
+        NavEntry('search', _('Full Text Search'), 'admin_settings_search'),
+        NavEntry('system', _('System Info'), 'admin_settings_system'),
+        NavEntry('open_source', _('Open Source Licenses'),
+                 'admin_settings_open_source', pyramid=True),
+        # TODO: marcink: we disable supervisor now until the supervisor stats
+        # page is fixed in the nix configuration
+        # NavEntry('supervisor', _('Supervisor'), 'admin_settings_supervisor'),
+    ]
+
+    _labs_entry = NavEntry('labs', _('Labs'),
+                           'admin_settings_labs')
+
+    def __init__(self, labs_active=False):
+        self._registered_entries = collections.OrderedDict([
+            (item.key, item) for item in self.__class__._base_entries
+        ])
+
+        if labs_active:
+            self.add_entry(self._labs_entry)
+
+    def add_entry(self, entry):
+        self._registered_entries[entry.key] = entry
+
+    def get_navlist(self, request):
+        navlist = [NavListEntry(i.key, i.name, i.generate_url(request))
+                   for i in self._registered_entries.values()]
+        return navlist
+
+
+def navigation_registry(request):
+    """
+    Helper that returns the admin navigation registry.
+    """
+    pyramid_registry = get_registry(request)
+    nav_registry = pyramid_registry.queryUtility(IAdminNavigationRegistry)
+    return nav_registry
+
+
+def navigation_list(request):
+    """
+    Helper that returns the admin navigation as list of NavListEntry objects.
+    """
+    return navigation_registry(request).get_navlist(request)

rhodecode/admin/views.py

@@ -0,0 +1,55 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  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 collections
+import logging
+
+from pylons import tmpl_context as c
+from pyramid.view import view_config
+
+from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
+from rhodecode.lib.utils import read_opensource_licenses
+
+from .navigation import navigation_list
+
+
+log = logging.getLogger(__name__)
+
+
+class AdminSettingsView(object):
+
+    def __init__(self, context, request):
+        self.request = request
+        self.context = context
+        self.session = request.session
+        self._rhodecode_user = request.user
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @view_config(
+        route_name='admin_settings_open_source', request_method='GET',
+        renderer='rhodecode:templates/admin/settings/settings.html')
+    def open_source_licenses(self):
+        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 {}

rhodecode/authentication/tests/conftest.py

@@ -0,0 +1,92 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  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
+
+
+class EnabledAuthPlugin():
+    """
+    Context manager that updates the 'auth_plugins' setting in DB to enable
+    a plugin. Previous setting is restored on exit. The rhodecode auth plugin
+    is also enabled because it is needed to login the test users.
+    """
+
+    def __init__(self, plugin):
+        self.new_value = set([
+            'egg:rhodecode-enterprise-ce#rhodecode',
+            plugin.get_id()
+        ])
+
+    def __enter__(self):
+        from rhodecode.model.settings import SettingsModel
+        self._old_value = SettingsModel().get_auth_plugins()
+        SettingsModel().create_or_update_setting(
+            'auth_plugins', ','.join(self.new_value))
+
+    def __exit__(self, type, value, traceback):
+        from rhodecode.model.settings import SettingsModel
+        SettingsModel().create_or_update_setting(
+            'auth_plugins', ','.join(self._old_value))
+
+
+class DisabledAuthPlugin():
+    """
+    Context manager that updates the 'auth_plugins' setting in DB to disable
+    a plugin. Previous setting is restored on exit.
+    """
+
+    def __init__(self, plugin):
+        self.plugin_id = plugin.get_id()
+
+    def __enter__(self):
+        from rhodecode.model.settings import SettingsModel
+        self._old_value = SettingsModel().get_auth_plugins()
+        new_value = [id_ for id_ in self._old_value if id_ != self.plugin_id]
+        SettingsModel().create_or_update_setting(
+            'auth_plugins', ','.join(new_value))
+
+    def __exit__(self, type, value, traceback):
+        from rhodecode.model.settings import SettingsModel
+        SettingsModel().create_or_update_setting(
+            'auth_plugins', ','.join(self._old_value))
+
+
[e-mail](params=[
+    ('rhodecode.authentication.plugins.auth_crowd', 'egg:rhodecode-enterprise-ce#crowd'),
+    ('rhodecode.authentication.plugins.auth_headers', 'egg:rhodecode-enterprise-ce#headers'),
+    ('rhodecode.authentication.plugins.auth_jasig_cas', 'egg:rhodecode-enterprise-ce#jasig_cas'),
+    ('rhodecode.authentication.plugins.auth_ldap', 'egg:rhodecode-enterprise-ce#ldap'),
+    ('rhodecode.authentication.plugins.auth_pam', 'egg:rhodecode-enterprise-ce#pam'),
+    ('rhodecode.authentication.plugins.auth_rhodecode', 'egg:rhodecode-enterprise-ce#rhodecode'),
+    ('rhodecode.authentication.plugins.auth_token', 'egg:rhodecode-enterprise-ce#token'),
+])
+def auth_plugin(request):
+    """
+    Fixture that provides instance for each authentication plugin. These
+    instances are NOT the instances which are registered to the authentication
+    registry.
+    """
+    from importlib import import_module
+
+    # Create plugin instance.
+    module, plugin_id = request.param
+    plugin_module = import_module(module)
+    return plugin_module.plugin_factory(plugin_id)

rhodecode/authentication/tests/functional/test_settings.py

@@ -0,0 +1,77 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  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.authentication.tests.conftest import (
+    EnabledAuthPlugin, DisabledAuthPlugin)
+from rhodecode.config.routing import ADMIN_PREFIX
+
+
[e-mail]('autologin_user', 'app')
+class TestAuthenticationSettings:
+
+    def test_auth_settings_global_view_get(self, app):
+        url = '{prefix}/auth/'.format(prefix=ADMIN_PREFIX)
+        response = app.get(url)
+        assert response.status_code == 200
+
+    def test_plugin_settings_view_get(self, app, auth_plugin):
+        url = '{prefix}/auth/{name}'.format(
+            prefix=ADMIN_PREFIX,
+            name=auth_plugin.name)
+        with EnabledAuthPlugin(auth_plugin):
+            response = app.get(url)
+            assert response.status_code == 200
+
+    def test_plugin_settings_view_post(self, app, auth_plugin, csrf_token):
+        url = '{prefix}/auth/{name}'.format(
+            prefix=ADMIN_PREFIX,
+            name=auth_plugin.name)
+        params = {
+            'enabled': True,
+            'cache_ttl': 0,
+            'csrf_token': csrf_token,
+        }
+        with EnabledAuthPlugin(auth_plugin):
+            response = app.post(url, params=params)
+            assert response.status_code in [200, 302]
+
+    def test_plugin_settings_view_get_404(self, app, auth_plugin):
+        url = '{prefix}/auth/{name}'.format(
+            prefix=ADMIN_PREFIX,
+            name=auth_plugin.name)
+        with DisabledAuthPlugin(auth_plugin):
+            response = app.get(url, status=404)
+            assert response.status_code == 404
+
+    def test_plugin_settings_view_post_404(self, app, auth_plugin, csrf_token):
+        url = '{prefix}/auth/{name}'.format(
+            prefix=ADMIN_PREFIX,
+            name=auth_plugin.name)
+        params = {
+            'enabled': True,
+            'cache_ttl': 0,
+            'csrf_token': csrf_token,
+        }
+        with DisabledAuthPlugin(auth_plugin):
+            response = app.post(url, params=params, status=404)
+            assert response.status_code == 404

rhodecode/authentication/tests/test_auth_plugin_base.py

@@ -0,0 +1,28 b''
+# Copyright (C) 2016  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/
+
+"""
+Checks around the API of the class RhodeCodeAuthPluginBase.
+"""
+
+from rhodecode.authentication.base import RhodeCodeAuthPluginBase
+
+
+def test_str_returns_plugin_id():
+    plugin = RhodeCodeAuthPluginBase(plugin_id='stub_plugin_id')
+    assert str(plugin) == 'stub_plugin_id'

rhodecode/templates/admin/settings/settings_system_snapshot.html

@@ -0,0 +1,75 b''
+<%
+ elems = [
+    ## general
+    (_('RhodeCode Enterprise version'), c.rhodecode_version, ''),
+    (_('Upgrade info endpoint'), c.rhodecode_update_url, ''),
+    (_('Configuration INI file'), c.rhodecode_config_ini, ''),
+    ## systems stats
+    (_('RhodeCode Enterprise Server IP'), c.server_ip, ''),
+    (_('RhodeCode Enterprise Server ID'), c.server_id, ''),
+    (_('Platform'), c.platform, ''),
+    (_('Uptime'), c.uptime_age, ''),
+    (_('Storage location'), c.storage, ''),
+    (_('Storage disk space'), "%s/%s, %s%% used%s" % (h.format_byte_size_binary(c.disk['used']), h.format_byte_size_binary(c.disk['total']),(c.disk['percent']), ' %s' % c.disk['error'] if 'error' in c.disk else ''), ''),
+
+    (_('Search index storage'), c.index_storage, ''),
+    (_('Search index size'), "%s %s" % (h.format_byte_size_binary(c.disk_index['used']), ' %s' % c.disk_index['error'] if 'error' in c.disk_index else ''), ''),
+
+    (_('Gist storage'), c.gist_storage, ''),
+    (_('Gist storage size'), "%s (%s items)%s" % (h.format_byte_size_binary(c.disk_gist['used']),c.disk_gist['items'], ' %s' % c.disk_gist['error'] if 'error' in c.disk_gist else ''), ''),
+
+    (_('Archive cache'), c.archive_storage, ''),
+    (_('Archive cache size'), "%s%s" % (h.format_byte_size_binary(c.disk_archive['used']), ' %s' % c.disk_archive['error'] if 'error' in c.disk_archive else ''), ''),
+
+    (_('System memory'), c.system_memory, ''),
+    (_('CPU'), '%s %%' %(c.cpu), ''),
+    (_('Load'), '1min: %s, 5min: %s, 15min: %s' %(c.load['1_min'],c.load['5_min'],c.load['15_min']), ''),
+
+    ## rhodecode stuff
+    (_('Python version'), c.py_version, ''),
+    (_('Python path'), c.py_path, ''),
+    (_('GIT version'), c.git_version, ''),
+    (_('HG version'), c.hg_version, ''),
+    (_('SVN version'), c.svn_version, ''),
+    (_('Database'), "%s @ version: %s" % (c.db_type, c.db_migrate_version), ''),
+    (_('Database version'), c.db_version, ''),
+
+ ]
+%>
+
+<pre>
+SYSTEM INFO
+-----------
+
+% for dt, dd, tt in elems:
+${dt}: ${dd}
+% endfor
+
+PYTHON PACKAGES
+---------------
+
+% for key, value in c.py_modules:
+${key}: ${value}
+% endfor
+
+SYSTEM SETTINGS
+---------------
+
+% for key, value in sorted(c.rhodecode_ini_safe.items()):
+  % if isinstance(value, dict):
+
+    % for key2, value2 in value.items():
+[${key}]${key2}: ${value2}
+    % endfor
+
+  % else:
+${key}: ${value}
+  % endif
+% endfor
+
+</pre>
+
+
+
+
+

.bumpversion.cfg

@@ -1,6 +1,6 b''
 [bumpversion]
-current_version = 4.1.2
+current_version = 4.2.0
 message = release: Bump version {current_version} to {new_version}
 
 [bumpversion:file:rhodecode/VERSION]
 

.release.cfg

@@ -1,34 +1,28 b''
 [DEFAULT]
 done = false
 
+[task:fixes_on_stable]
+
+[task:changelog_updated]
+
 [task:bump_version]
 done = true
 
-[task:rc_tools_pinned]
-done = true
+[task:generate_api_docs]
+
+[task:updated_translation]
 
-[task:fixes_on_stable]
-done = true
+[release]
+state = in_progress
+version = 4.2.0
+
+[task:rc_tools_pinned]
 
 [task:pip2nix_generated]
-done = true
-
-[task:changelog_updated]
-done = true
-
-[task:generate_api_docs]
-done = true
 
 [task:generate_js_routes]
-done = true
-
-[release]
-state = prepared
-version = 4.1.2
-
-[task:updated_translation]
 
 [task:updated_trial_license]
 
 [task:generate_oss_licenses]
 

README.rst

@@ -1,101 +1,114 b''
 =========
 RhodeCode
 =========
 
 About
 -----
 
 ``RhodeCode`` is a fast and powerful management tool for Mercurial_ and GIT_
 and Subversion_ with a built in push/pull server, full text search,
 pull requests and powerfull code-review system. It works on http/https and
 has a few unique features like:
  - plugable architecture
  - advanced permission system with IP restrictions
  - rich set of authentication plugins including LDAP,
    ActiveDirectory, Atlassian Crowd, Http-Headers, Pam, Token-Auth.
  - live code-review chat
  - full web based file editing
  - unified multi vcs support
  - snippets (gist) system
  - integration with all 3rd party issue trackers
 
 RhodeCode also provides rich API, and multiple event hooks so it's easy
 integrable with existing external systems.
 
 RhodeCode is similar in some respects to gitlab_, github_ or bitbucket_,
 however RhodeCode can be run as standalone hosted application on your own server.
 RhodeCode can be installed on \*nix or Windows systems.
 
 RhodeCode uses `PEP386 versioning <http://www.python.org/dev/peps/pep-0386/>`_
 
 Installation
 ------------
 Please visit https://docs.rhodecode.com/RhodeCode-Control/tasks/install-cli.html
 for more details
 
 
 Source code
 -----------
 
 The latest sources can be obtained from official RhodeCode instance
 https://code.rhodecode.com
 
 
+Contributions
+-------------
+
+RhodeCode is open-source; contributions are welcome!
+
+Please see the contribution documentation inside of the docs folder, which is
+also available at
+https://docs.rhodecode.com/RhodeCode-Enterprise/contributing/contributing.html
+
+For additional information about collaboration tools, our issue tracker,
+licensing, and contribution credit, visit https://rhodecode.com/open-source 
+
+
 RhodeCode Features
 ------------------
 
 Check out all features of RhodeCode at https://rhodecode.com/features
 
 License
 -------
 
 ``RhodeCode`` is dual-licensed with AGPLv3 and commercial license.
 Please see LICENSE.txt file for details.
 
 
 Getting help
 ------------
 
 Listed bellow are various support resources that should help.
 
 .. note::
 
    Please try to read the documentation before posting any issues, especially
    the **troubleshooting section**
 
 - Official issue tracker `RhodeCode Issue tracker <https://issues.rhodecode.com>`_
 
 - Search our community portal `Community portal <https://community.rhodecode.com>`_
 
 - Join #rhodecode on FreeNode (irc.freenode.net)
   or use http://webchat.freenode.net/?channels=rhodecode for web access to irc.
 
 - You can also follow RhodeCode on twitter **@RhodeCode** where we often post
   news and other interesting stuff about RhodeCode.
 
 
 Online documentation
 --------------------
 
 Online documentation for the current version of RhodeCode is available at
  - http://rhodecode.com/docs
 
 You may also build the documentation for yourself - go into ``docs/`` and run::
 
     nix-build default.nix -o result && make clean html
 
 (You need to have sphinx_ installed to build the documentation. If you don't
 have sphinx_ installed you can install it via the command:
 ``pip install sphinx``)
 
 .. _virtualenv: http://pypi.python.org/pypi/virtualenv
 .. _python: http://www.python.org/
 .. _sphinx: http://sphinx.pocoo.org/
 .. _mercurial: http://mercurial.selenic.com/
 .. _bitbucket: http://bitbucket.org/
 .. _github: http://github.com/
 .. _gitlab: http://gitlab.com/
 .. _subversion: http://subversion.tigris.org/
 .. _git: http://git-scm.com/
 .. _celery: http://celeryproject.org/
 .. _vcs: http://pypi.python.org/pypi/vcs

acceptance_tests/README.rst

@@ -1,47 +1,47 b''
 README - Quickstart
 ===================
 
-This folder contains functional tests and the automation of specification
+This folder contains the functional tests and automation of specification
 examples. Details about testing can be found in
 `/docs-internal/testing/index.rst`.
 
 
 Setting up your Rhodecode Enterprise instance
 ---------------------------------------------
 
 The tests will create users and repositories as needed, so you can start with a
 new and empty instance.
 
 Use the following example call for the database setup of Enterprise::
 
    paster setup-rhodecode \
      --user=admin \
      --email=[e-mail] \
      --password=secret \
      --api-key=9999999999999999999999999999999999999999 \
      your-enterprise-config.ini
 
-This way the username, password and auth token of the admin user will match the
+This way the username, password, and auth token of the admin user will match the
 defaults from the test run.
 
 
 Usage
 -----
 
 1. Make sure your Rhodecode Enterprise instance is running at
    http://localhost:5000.
 
 2. Enter `nix-shell` from the acceptance_tests folder::
 
      cd acceptance_tests
-     nix-shell -I ~/dev
+     nix-shell
 
    Make sure that `rcpkgs` and `rcnixpkgs` are available on the nix path.
 
 3. Run the tests::
 
      py.test -c example.ini -vs
 
    The parameter ``-vs`` allows you to see debugging output during the test
    run. Check ``py.test --help`` and the documentation at http://pytest.org to
    learn all details about the test runner.

configs/development.ini

@@ -1,608 +1,612 b''
 ################################################################################
 ################################################################################
 # RhodeCode Enterprise - configuration file                                    #
 # Built-in functions and variables                                             #
 # The %(here)s variable will be replaced with the parent directory of this file#
 #                                                                              #
 ################################################################################
 
 [DEFAULT]
 debug = true
-pdebug = false
 ################################################################################
 ## Uncomment and replace with the email address which should receive          ##
 ## any error reports after an application crash                               ##
 ## Additionally these settings will be used by the RhodeCode mailing system   ##
 ################################################################################
 #email_to = admin@localhost
 #error_email_from = paste_error@localhost
 #app_email_from = rhodecode-noreply@localhost
 #error_message =
 #email_prefix = [RhodeCode]
 
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =
 #smtp_port =
 #smtp_use_tls = false
 #smtp_use_ssl = true
 ## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
 #smtp_auth =
 
 [server:main]
 ## COMMON ##
 host = 127.0.0.1
 port = 5000
 
 ##################################
 ##     WAITRESS WSGI SERVER     ##
 ## Recommended for Development  ##
 ##################################
 use = egg:waitress#main
 ## number of worker threads
 threads = 5
 ## MAX BODY SIZE 100GB
 max_request_body_size = 107374182400
 ## Use poll instead of select, fixes file descriptors limits problems.
 ## May not work on old windows systems.
 asyncore_use_poll = true
 
 
 ##########################
 ## GUNICORN WSGI SERVER ##
 ##########################
 ## run with gunicorn --log-config <inifile.ini> --paste <inifile.ini>
 #use = egg:gunicorn#main
 ## Sets the number of process workers. You must set `instance_id = *`
 ## when this option is set to more than one worker, recommended
 ## value is (2 * NUMBER_OF_CPUS + 1), eg 2CPU = 5 workers
 ## The `instance_id = *` must be set in the [app:main] section below
 #workers = 2
 ## number of threads for each of the worker, must be set to 1 for gevent
 ## generally recommened to be at 1
 #threads = 1
 ## process name
 #proc_name = rhodecode
 ## 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
 
 
 ## prefix middleware for RhodeCode, disables force_https flag.
 ## allows to set RhodeCode under a prefix in server.
 ## eg https://server.com/<prefix>. Enable `filter-with =` option below as well.
 #[filter:proxy-prefix]
 #use = egg:PasteDeploy#prefix
 #prefix = /<your-prefix>
 
 [app:main]
 use = egg:rhodecode-enterprise-ce
 ## enable proxy prefix middleware, defined below
 #filter-with = proxy-prefix
 
 # During development the we want to have the debug toolbar enabled
 pyramid.includes =
     pyramid_debugtoolbar
     rhodecode.utils.debugtoolbar
     rhodecode.lib.middleware.request_wrapper
 
 pyramid.reload_templates = true
 
 debugtoolbar.hosts = 0.0.0.0/0
 debugtoolbar.exclude_prefixes =
     /css
     /fonts
     /images
     /js
 
 ## RHODECODE PLUGINS ##
 rhodecode.includes =
     rhodecode.api
 
 
 # api prefix url
 rhodecode.api.url = /_admin/api
 
 
 ## END RHODECODE PLUGINS ##
 
+## encryption key used to encrypt social plugin tokens,
+## remote_urls with credentials etc, if not set it defaults to
+## `beaker.session.secret`
+#rhodecode.encrypted_values.secret =
+
+## decryption strict mode (enabled by default). It controls if decryption raises
+## `SignatureVerificationError` in case of wrong key, or damaged encryption data.
+#rhodecode.encrypted_values.strict = false
+
 full_stack = true
 
 ## Serve static files via RhodeCode, disable to serve them via HTTP server
 static_files = true
 
+# autogenerate javascript routes file on startup
+generate_js_files = false
+
 ## Optional Languages
 ## en(default), be, de, es, fr, it, ja, pl, pt, ru, zh
 lang = en
 
 ## perform a full repository scan on each server start, this should be
 ## set to false after first startup, to allow faster server restarts.
 startup.import_repos = false
 
 ## Uncomment and set this path to use archive download cache.
 ## Once enabled, generated archives will be cached at this location
 ## and served from the cache during subsequent requests for the same archive of
 ## the repository.
 #archive_cache_dir = /tmp/tarballcache
 
 ## change this to unique ID for security
 app_instance_uuid = rc-production
 
 ## cut off limit for large diffs (size in bytes)
 cut_off_limit_diff = 1024000
 cut_off_limit_file = 256000
 
 ## use cache version of scm repo everywhere
 vcs_full_cache = true
 
 ## force https in RhodeCode, fixes https redirects, assumes it's always https
 ## Normally this is controlled by proper http flags sent from http server
 force_https = false
 
 ## use Strict-Transport-Security headers
 use_htsts = false
 
 ## number of commits stats will parse on each iteration
 commit_parse_limit = 25
 
 ## git rev filter option, --all is the default filter, if you need to
 ## hide all refs in changelog switch this to --branches --tags
 git_rev_filter = --branches --tags
 
 # Set to true if your repos are exposed using the dumb protocol
 git_update_server_info = false
 
 ## RSS/ATOM feed options
 rss_cut_off_limit = 256000
 rss_items_per_page = 10
 rss_include_diff = false
 
 ## gist URL alias, used to create nicer urls for gist. This should be an
 ## url that does rewrites to _admin/gists/<gistid>.
 ## example: http://gist.rhodecode.org/{gistid}. Empty means use the internal
 ## RhodeCode url, ie. http[s]://rhodecode.server/_admin/gists/<gistid>
 gist_alias_url =
 
 ## List of controllers (using glob pattern syntax) that AUTH TOKENS could be
 ## used for access.
 ## Adding ?auth_token = <token> to the url authenticates this request as if it
 ## came from the the logged in user who own this authentication token.
 ##
 ## Syntax is <ControllerClass>:<function_pattern>.
 ## To enable access to raw_files put `FilesController:raw`.
 ## To enable access to patches add `ChangesetController:changeset_patch`.
 ## The list should be "," separated and on a single line.
 ##
 ## Recommended controllers to enable:
 #    ChangesetController:changeset_patch,
 #    ChangesetController:changeset_raw,
 #    FilesController:raw,
 #    FilesController:archivefile,
 #    GistsController:*,
 api_access_controllers_whitelist =
 
 ## default encoding used to convert from and to unicode
 ## can be also a comma separated list of encoding in case of mixed encodings
 default_encoding = UTF-8
 
 ## instance-id prefix
 ## a prefix key for this instance used for cache invalidation when running
 ## multiple instances of rhodecode, make sure it's globally unique for
 ## all running rhodecode instances. Leave empty if you don't use it
 instance_id =
 
 ## Fallback authentication plugin. Set this to a plugin ID to force the usage
 ## of an authentication plugin also if it is disabled by it's settings.
 ## This could be useful if you are unable to log in to the system due to broken
 ## authentication settings. Then you can enable e.g. the internal rhodecode auth
 ## module to log in again and fix the settings.
 ##
 ## Available builtin plugin IDs (hash is part of the ID):
 ## egg:rhodecode-enterprise-ce#rhodecode
 ## egg:rhodecode-enterprise-ce#pam
 ## egg:rhodecode-enterprise-ce#ldap
 ## egg:rhodecode-enterprise-ce#jasig_cas
 ## egg:rhodecode-enterprise-ce#headers
 ## egg:rhodecode-enterprise-ce#crowd
 #rhodecode.auth_plugin_fallback = egg:rhodecode-enterprise-ce#rhodecode
 
 ## alternative return HTTP header for failed authentication. Default HTTP
 ## response is 401 HTTPUnauthorized. Currently HG clients have troubles with
 ## handling that causing a series of failed authentication calls.
 ## Set this variable to 403 to return HTTPForbidden, or any other HTTP code
 ## This will be served instead of default 401 on bad authnetication
 auth_ret_code =
 
 ## use special detection method when serving auth_ret_code, instead of serving
 ## ret_code directly, use 401 initially (Which triggers credentials prompt)
 ## and then serve auth_ret_code to clients
 auth_ret_code_detection = false
 
 ## locking return code. When repository is locked return this HTTP code. 2XX
 ## codes don't break the transactions while 4XX codes do
 lock_ret_code = 423
 
 ## allows to change the repository location in settings page
 allow_repo_location_change = true
 
 ## allows to setup custom hooks in settings page
 allow_custom_hooks_settings = true
 
 ## generated license token, goto license page in RhodeCode settings to obtain
 ## new token
 license_token =
 
 ## supervisor connection uri, for managing supervisor and logs.
 supervisor.uri =
 ## supervisord group name/id we only want this RC instance to handle
 supervisor.group_id = dev
 
 ## Display extended labs settings
 labs_settings_active = true
 
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
 use_celery = false
 broker.host = localhost
 broker.vhost = rabbitmqhost
 broker.port = 5672
 broker.user = rabbitmq
 broker.password = qweqwe
 
 celery.imports = rhodecode.lib.celerylib.tasks
 
 celery.result.backend = amqp
 celery.result.dburi = amqp://
 celery.result.serialier = json
 
 #celery.send.task.error.emails = true
 #celery.amqp.task.result.expires = 18000
 
 celeryd.concurrency = 2
 #celeryd.log.file = celeryd.log
 celeryd.log.level = debug
 celeryd.max.tasks.per.child = 1
 
 ## tasks will never be sent to the queue, but executed locally instead.
 celery.always.eager = false
 
 ####################################
 ###         BEAKER CACHE        ####
 ####################################
 # default cache dir for templates.  Putting this into a ramdisk
 ## can boost performance, eg. %(here)s/data_ramdisk
 cache_dir = %(here)s/data
 
 ## locking and default file storage for Beaker. Putting this into a ramdisk
 ## can boost performance, eg. %(here)s/data_ramdisk/cache/beaker_data
 beaker.cache.data_dir = %(here)s/data/cache/beaker_data
 beaker.cache.lock_dir = %(here)s/data/cache/beaker_lock
 
 beaker.cache.regions = super_short_term, short_term, long_term, sql_cache_short, auth_plugins, repo_cache_long
 
 beaker.cache.super_short_term.type = memory
 beaker.cache.super_short_term.expire = 10
 beaker.cache.super_short_term.key_length = 256
 
 beaker.cache.short_term.type = memory
 beaker.cache.short_term.expire = 60
 beaker.cache.short_term.key_length = 256
 
 beaker.cache.long_term.type = memory
 beaker.cache.long_term.expire = 36000
 beaker.cache.long_term.key_length = 256
 
 beaker.cache.sql_cache_short.type = memory
 beaker.cache.sql_cache_short.expire = 10
 beaker.cache.sql_cache_short.key_length = 256
 
 # default is memory cache, configure only if required
 # using multi-node or multi-worker setup
 #beaker.cache.auth_plugins.type = ext:database
 #beaker.cache.auth_plugins.lock_dir = %(here)s/data/cache/auth_plugin_lock
 #beaker.cache.auth_plugins.url = postgresql://postgres:secret@localhost/rhodecode
 #beaker.cache.auth_plugins.url = mysql://root:secret@127.0.0.1/rhodecode
 #beaker.cache.auth_plugins.sa.pool_recycle = 3600
 #beaker.cache.auth_plugins.sa.pool_size = 10
 #beaker.cache.auth_plugins.sa.max_overflow = 0
 
 beaker.cache.repo_cache_long.type = memorylru_base
 beaker.cache.repo_cache_long.max_items = 4096
 beaker.cache.repo_cache_long.expire = 2592000
 
 # default is memorylru_base cache, configure only if required
 # using multi-node or multi-worker setup
 #beaker.cache.repo_cache_long.type = ext:memcached
 #beaker.cache.repo_cache_long.url = localhost:11211
 #beaker.cache.repo_cache_long.expire = 1209600
 #beaker.cache.repo_cache_long.key_length = 256
 
 ####################################
 ###       BEAKER SESSION        ####
 ####################################
 
 ## .session.type is type of storage options for the session, current allowed
 ## types are file, ext:memcached, ext:database, and memory (default).
 beaker.session.type = file
 beaker.session.data_dir = %(here)s/data/sessions/data
 
 ## db based session, fast, and allows easy management over logged in users ##
 #beaker.session.type = ext:database
 #beaker.session.table_name = db_session
 #beaker.session.sa.url = postgresql://postgres:secret@localhost/rhodecode
 #beaker.session.sa.url = mysql://root:secret@127.0.0.1/rhodecode
 #beaker.session.sa.pool_recycle = 3600
 #beaker.session.sa.echo = false
 
 beaker.session.key = rhodecode
 beaker.session.secret = develop-rc-uytcxaz
 beaker.session.lock_dir = %(here)s/data/sessions/lock
 
 ## Secure encrypted cookie. Requires AES and AES python libraries
 ## you must disable beaker.session.secret to use this
 #beaker.session.encrypt_key = <key_for_encryption>
 #beaker.session.validate_key = <validation_key>
 
 ## sets session as invalid(also logging out user) if it haven not been
 ## accessed for given amount of time in seconds
 beaker.session.timeout = 2592000
 beaker.session.httponly = true
 #beaker.session.cookie_path = /<your-prefix>
 
 ## uncomment for https secure cookie
 beaker.session.secure = false
 
 ## auto save the session to not to use .save()
 beaker.session.auto = false
 
 ## default cookie expiration time in seconds, set to `true` to set expire
 ## at browser close
 #beaker.session.cookie_expires = 3600
 
 ###################################
 ## SEARCH INDEXING CONFIGURATION ##
 ###################################
 ## Full text search indexer is available in rhodecode-tools under
 ## `rhodecode-tools index` command
 
 # WHOOSH Backend, doesn't require additional services to run
 # it works good with few dozen repos
 search.module = rhodecode.lib.index.whoosh
 search.location = %(here)s/data/index
 
-
 ###################################
 ##       APPENLIGHT CONFIG       ##
 ###################################
 
 ## Appenlight is tailored to work with RhodeCode, see
 ## http://appenlight.com for details how to obtain an account
 
 ## appenlight integration enabled
 appenlight = false
 
 appenlight.server_url = https://api.appenlight.com
 appenlight.api_key = YOUR_API_KEY
 #appenlight.transport_config = https://api.appenlight.com?threaded=1&timeout=5
 
 # used for JS client
 appenlight.api_public_key = YOUR_API_PUBLIC_KEY
 
 ## TWEAK AMOUNT OF INFO SENT HERE
 
 ## enables 404 error logging (default False)
 appenlight.report_404 = false
 
 ## time in seconds after request is considered being slow (default 1)
 appenlight.slow_request_time = 1
 
 ## record slow requests in application
 ## (needs to be enabled for slow datastore recording and time tracking)
 appenlight.slow_requests = true
 
 ## enable hooking to application loggers
 appenlight.logging = true
 
 ## minimum log level for log capture
 appenlight.logging.level = WARNING
 
 ## send logs only from erroneous/slow requests
 ## (saves API quota for intensive logging)
 appenlight.logging_on_error = false
 
 ## list of additonal keywords that should be grabbed from environ object
 ## can be string with comma separated list of words in lowercase
 ## (by default client will always send following info:
 ## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that
 ## start with HTTP* this list be extended with additional keywords here
 appenlight.environ_keys_whitelist =
 
 ## list of keywords that should be blanked from request object
 ## can be string with comma separated list of words in lowercase
 ## (by default client will always blank keys that contain following words
 ## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
 ## this list be extended with additional keywords set here
 appenlight.request_keys_blacklist =
 
 ## list of namespaces that should be ignores when gathering log entries
 ## can be string with comma separated list of namespaces
 ## (by default the client ignores own entries: appenlight_client.client)
 appenlight.log_namespace_blacklist =
 
 
 ################################################################################
 ## WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT*  ##
 ## Debug mode will enable the interactive debugging tool, allowing ANYONE to  ##
 ## execute malicious code after an exception is raised.                       ##
 ################################################################################
 #set debug = false
 
 
 ##############
 ## STYLING  ##
 ##############
 debug_style = true
 
 #########################################################
 ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###
 #########################################################
 sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
 #sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode
 #sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode
 
 # see sqlalchemy docs for other advanced settings
 
 ## print the sql statements to output
 sqlalchemy.db1.echo = false
 ## recycle the connections after this ammount of seconds
 sqlalchemy.db1.pool_recycle = 3600
 sqlalchemy.db1.convert_unicode = true
 
 ## the number of connections to keep open inside the connection pool.
 ## 0 indicates no limit
 #sqlalchemy.db1.pool_size = 5
 
 ## the number of connections to allow in connection pool "overflow", that is
 ## connections that can be opened above and beyond the pool_size setting,
 ## which defaults to five.
 #sqlalchemy.db1.max_overflow = 10
 
 
 ##################
 ### VCS CONFIG ###
 ##################
 vcs.server.enable = true
 vcs.server = localhost:9900
 
 ## Web server connectivity protocol, responsible for web based VCS operatations
 ## Available protocols are:
 ## `pyro4` - using pyro4 server
 ## `http` - using http-rpc backend
 #vcs.server.protocol = http
 
 ## Push/Pull operations protocol, available options are:
 ## `pyro4` - using pyro4 server
 ## `rhodecode.lib.middleware.utils.scm_app_http` - Http based, recommended
 ## `vcsserver.scm_app` - internal app (EE only)
 #vcs.scm_app_implementation = rhodecode.lib.middleware.utils.scm_app_http
 
 ## Push/Pull operations hooks protocol, available options are:
 ## `pyro4` - using pyro4 server
 ## `http` - using http-rpc backend
 #vcs.hooks.protocol = http
 
 vcs.server.log_level = debug
 ## Start VCSServer with this instance as a subprocess, usefull for development
 vcs.start_server = true
 vcs.backends = hg, git, svn
 vcs.connection_timeout = 3600
 ## Compatibility version when creating SVN repositories. Defaults to newest version when commented out.
 ## Available options are: pre-1.4-compatible, pre-1.5-compatible, pre-1.6-compatible, pre-1.8-compatible
 #vcs.svn.compatible_version = pre-1.8-compatible
 
 ################################
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
-keys = root, routes, rhodecode, sqlalchemy, beaker, pyro4, templates, whoosh_indexer
+keys = root, routes, rhodecode, sqlalchemy, beaker, pyro4, templates
 
 [handlers]
 keys = console, console_sql
 
 [formatters]
 keys = generic, color_formatter, color_formatter_sql
 
 #############
 ## LOGGERS ##
 #############
 [logger_root]
 level = NOTSET
 handlers = console
 
 [logger_routes]
 level = DEBUG
 handlers =
 qualname = routes.middleware
 ## "level = DEBUG" logs the route matched and routing variables.
 propagate = 1
 
 [logger_beaker]
 level = DEBUG
 handlers =
 qualname = beaker.container
 propagate = 1
 
 [logger_pyro4]
 level = DEBUG
 handlers =
 qualname = Pyro4
 propagate = 1
 
 [logger_templates]
 level = INFO
 handlers =
 qualname = pylons.templating
 propagate = 1
 
 [logger_rhodecode]
 level = DEBUG
 handlers =
 qualname = rhodecode
 propagate = 1
 
 [logger_sqlalchemy]
 level = INFO
 handlers = console_sql
 qualname = sqlalchemy.engine
 propagate = 0
 
-[logger_whoosh_indexer]
-level = DEBUG
-handlers =
-qualname = whoosh_indexer
-propagate = 1
-
 ##############
 ## HANDLERS ##
 ##############
 
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
 level = DEBUG
 formatter = color_formatter
 
 [handler_console_sql]
 class = StreamHandler
 args = (sys.stderr,)
 level = DEBUG
 formatter = color_formatter_sql
 
 ################
 ## FORMATTERS ##
 ################
 
 [formatter_generic]
 class = rhodecode.lib.logging_formatter.Pyro4AwareFormatter
 format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %Y-%m-%d %H:%M:%S
 
 [formatter_color_formatter]
 class = rhodecode.lib.logging_formatter.ColorFormatter
 format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %Y-%m-%d %H:%M:%S
 
 [formatter_color_formatter_sql]
 class = rhodecode.lib.logging_formatter.ColorFormatterSql
 format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %Y-%m-%d %H:%M:%S

configs/production.ini

@@ -1,577 +1,581 b''
 ################################################################################
 ################################################################################
 # RhodeCode Enterprise - configuration file                                    #
 # Built-in functions and variables                                             #
 # The %(here)s variable will be replaced with the parent directory of this file#
 #                                                                              #
 ################################################################################
 
 [DEFAULT]
 debug = true
-pdebug = false
 ################################################################################
 ## Uncomment and replace with the email address which should receive          ##
 ## any error reports after an application crash                               ##
 ## Additionally these settings will be used by the RhodeCode mailing system   ##
 ################################################################################
 #email_to = admin@localhost
 #error_email_from = paste_error@localhost
 #app_email_from = rhodecode-noreply@localhost
 #error_message =
 #email_prefix = [RhodeCode]
 
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =
 #smtp_port =
 #smtp_use_tls = false
 #smtp_use_ssl = true
 ## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
 #smtp_auth =
 
 [server:main]
 ## COMMON ##
 host = 127.0.0.1
 port = 5000
 
 ##################################
 ##     WAITRESS WSGI SERVER     ##
 ## Recommended for Development  ##
 ##################################
 #use = egg:waitress#main
 ## number of worker threads
 #threads = 5
 ## MAX BODY SIZE 100GB
 #max_request_body_size = 107374182400
 ## Use poll instead of select, fixes file descriptors limits problems.
 ## May not work on old windows systems.
 #asyncore_use_poll = true
 
 
 ##########################
 ## GUNICORN WSGI SERVER ##
 ##########################
 ## run with gunicorn --log-config <inifile.ini> --paste <inifile.ini>
 use = egg:gunicorn#main
 ## Sets the number of process workers. You must set `instance_id = *`
 ## when this option is set to more than one worker, recommended
 ## value is (2 * NUMBER_OF_CPUS + 1), eg 2CPU = 5 workers
 ## The `instance_id = *` must be set in the [app:main] section below
 workers = 2
 ## number of threads for each of the worker, must be set to 1 for gevent
 ## generally recommened to be at 1
 #threads = 1
 ## process name
 proc_name = rhodecode
 ## 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
 
 
 ## prefix middleware for RhodeCode, disables force_https flag.
 ## allows to set RhodeCode under a prefix in server.
 ## eg https://server.com/<prefix>. Enable `filter-with =` option below as well.
 #[filter:proxy-prefix]
 #use = egg:PasteDeploy#prefix
 #prefix = /<your-prefix>
 
 [app:main]
 use = egg:rhodecode-enterprise-ce
 ## enable proxy prefix middleware, defined below
 #filter-with = proxy-prefix
 
+## encryption key used to encrypt social plugin tokens,
+## remote_urls with credentials etc, if not set it defaults to
+## `beaker.session.secret`
+#rhodecode.encrypted_values.secret =
+
+## decryption strict mode (enabled by default). It controls if decryption raises
+## `SignatureVerificationError` in case of wrong key, or damaged encryption data.
+#rhodecode.encrypted_values.strict = false
+
 full_stack = true
 
 ## Serve static files via RhodeCode, disable to serve them via HTTP server
 static_files = true
 
+# autogenerate javascript routes file on startup
+generate_js_files = false
+
 ## Optional Languages
 ## en(default), be, de, es, fr, it, ja, pl, pt, ru, zh
 lang = en
 
 ## perform a full repository scan on each server start, this should be
 ## set to false after first startup, to allow faster server restarts.
 startup.import_repos = false
 
 ## Uncomment and set this path to use archive download cache.
 ## Once enabled, generated archives will be cached at this location
 ## and served from the cache during subsequent requests for the same archive of
 ## the repository.
 #archive_cache_dir = /tmp/tarballcache
 
 ## change this to unique ID for security
 app_instance_uuid = rc-production
 
 ## cut off limit for large diffs (size in bytes)
 cut_off_limit_diff = 1024000
 cut_off_limit_file = 256000
 
 ## use cache version of scm repo everywhere
 vcs_full_cache = true
 
 ## force https in RhodeCode, fixes https redirects, assumes it's always https
 ## Normally this is controlled by proper http flags sent from http server
 force_https = false
 
 ## use Strict-Transport-Security headers
 use_htsts = false
 
 ## number of commits stats will parse on each iteration
 commit_parse_limit = 25
 
 ## git rev filter option, --all is the default filter, if you need to
 ## hide all refs in changelog switch this to --branches --tags
 git_rev_filter = --branches --tags
 
 # Set to true if your repos are exposed using the dumb protocol
 git_update_server_info = false
 
 ## RSS/ATOM feed options
 rss_cut_off_limit = 256000
 rss_items_per_page = 10
 rss_include_diff = false
 
 ## gist URL alias, used to create nicer urls for gist. This should be an
 ## url that does rewrites to _admin/gists/<gistid>.
 ## example: http://gist.rhodecode.org/{gistid}. Empty means use the internal
 ## RhodeCode url, ie. http[s]://rhodecode.server/_admin/gists/<gistid>
 gist_alias_url =
 
 ## List of controllers (using glob pattern syntax) that AUTH TOKENS could be
 ## used for access.
 ## Adding ?auth_token = <token> to the url authenticates this request as if it
 ## came from the the logged in user who own this authentication token.
 ##
 ## Syntax is <ControllerClass>:<function_pattern>.
 ## To enable access to raw_files put `FilesController:raw`.
 ## To enable access to patches add `ChangesetController:changeset_patch`.
 ## The list should be "," separated and on a single line.
 ##
 ## Recommended controllers to enable:
 #    ChangesetController:changeset_patch,
 #    ChangesetController:changeset_raw,
 #    FilesController:raw,
 #    FilesController:archivefile,
 #    GistsController:*,
 api_access_controllers_whitelist =
 
 ## default encoding used to convert from and to unicode
 ## can be also a comma separated list of encoding in case of mixed encodings
 default_encoding = UTF-8
 
 ## instance-id prefix
 ## a prefix key for this instance used for cache invalidation when running
 ## multiple instances of rhodecode, make sure it's globally unique for
 ## all running rhodecode instances. Leave empty if you don't use it
 instance_id =
 
 ## Fallback authentication plugin. Set this to a plugin ID to force the usage
 ## of an authentication plugin also if it is disabled by it's settings.
 ## This could be useful if you are unable to log in to the system due to broken
 ## authentication settings. Then you can enable e.g. the internal rhodecode auth
 ## module to log in again and fix the settings.
 ##
 ## Available builtin plugin IDs (hash is part of the ID):
 ## egg:rhodecode-enterprise-ce#rhodecode
 ## egg:rhodecode-enterprise-ce#pam
 ## egg:rhodecode-enterprise-ce#ldap
 ## egg:rhodecode-enterprise-ce#jasig_cas
 ## egg:rhodecode-enterprise-ce#headers
 ## egg:rhodecode-enterprise-ce#crowd
 #rhodecode.auth_plugin_fallback = egg:rhodecode-enterprise-ce#rhodecode
 
 ## alternative return HTTP header for failed authentication. Default HTTP
 ## response is 401 HTTPUnauthorized. Currently HG clients have troubles with
 ## handling that causing a series of failed authentication calls.
 ## Set this variable to 403 to return HTTPForbidden, or any other HTTP code
 ## This will be served instead of default 401 on bad authnetication
 auth_ret_code =
 
 ## use special detection method when serving auth_ret_code, instead of serving
 ## ret_code directly, use 401 initially (Which triggers credentials prompt)
 ## and then serve auth_ret_code to clients
 auth_ret_code_detection = false
 
 ## locking return code. When repository is locked return this HTTP code. 2XX
 ## codes don't break the transactions while 4XX codes do
 lock_ret_code = 423
 
 ## allows to change the repository location in settings page
 allow_repo_location_change = true
 
 ## allows to setup custom hooks in settings page
 allow_custom_hooks_settings = true
 
 ## generated license token, goto license page in RhodeCode settings to obtain
 ## new token
 license_token =
 
 ## supervisor connection uri, for managing supervisor and logs.
 supervisor.uri =
 ## supervisord group name/id we only want this RC instance to handle
 supervisor.group_id = prod
 
 ## Display extended labs settings
 labs_settings_active = true
 
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
 use_celery = false
 broker.host = localhost
 broker.vhost = rabbitmqhost
 broker.port = 5672
 broker.user = rabbitmq
 broker.password = qweqwe
 
 celery.imports = rhodecode.lib.celerylib.tasks
 
 celery.result.backend = amqp
 celery.result.dburi = amqp://
 celery.result.serialier = json
 
 #celery.send.task.error.emails = true
 #celery.amqp.task.result.expires = 18000
 
 celeryd.concurrency = 2
 #celeryd.log.file = celeryd.log
 celeryd.log.level = debug
 celeryd.max.tasks.per.child = 1
 
 ## tasks will never be sent to the queue, but executed locally instead.
 celery.always.eager = false
 
 ####################################
 ###         BEAKER CACHE        ####
 ####################################
 # default cache dir for templates.  Putting this into a ramdisk
 ## can boost performance, eg. %(here)s/data_ramdisk
 cache_dir = %(here)s/data
 
 ## locking and default file storage for Beaker. Putting this into a ramdisk
 ## can boost performance, eg. %(here)s/data_ramdisk/cache/beaker_data
 beaker.cache.data_dir = %(here)s/data/cache/beaker_data
 beaker.cache.lock_dir = %(here)s/data/cache/beaker_lock
 
 beaker.cache.regions = super_short_term, short_term, long_term, sql_cache_short, auth_plugins, repo_cache_long
 
 beaker.cache.super_short_term.type = memory
 beaker.cache.super_short_term.expire = 10
 beaker.cache.super_short_term.key_length = 256
 
 beaker.cache.short_term.type = memory
 beaker.cache.short_term.expire = 60
 beaker.cache.short_term.key_length = 256
 
 beaker.cache.long_term.type = memory
 beaker.cache.long_term.expire = 36000
 beaker.cache.long_term.key_length = 256
 
 beaker.cache.sql_cache_short.type = memory
 beaker.cache.sql_cache_short.expire = 10
 beaker.cache.sql_cache_short.key_length = 256
 
 # default is memory cache, configure only if required
 # using multi-node or multi-worker setup
 #beaker.cache.auth_plugins.type = ext:database
 #beaker.cache.auth_plugins.lock_dir = %(here)s/data/cache/auth_plugin_lock
 #beaker.cache.auth_plugins.url = postgresql://postgres:secret@localhost/rhodecode
 #beaker.cache.auth_plugins.url = mysql://root:secret@127.0.0.1/rhodecode
 #beaker.cache.auth_plugins.sa.pool_recycle = 3600
 #beaker.cache.auth_plugins.sa.pool_size = 10
 #beaker.cache.auth_plugins.sa.max_overflow = 0
 
 beaker.cache.repo_cache_long.type = memorylru_base
 beaker.cache.repo_cache_long.max_items = 4096
 beaker.cache.repo_cache_long.expire = 2592000
 
 # default is memorylru_base cache, configure only if required
 # using multi-node or multi-worker setup
 #beaker.cache.repo_cache_long.type = ext:memcached
 #beaker.cache.repo_cache_long.url = localhost:11211
 #beaker.cache.repo_cache_long.expire = 1209600
 #beaker.cache.repo_cache_long.key_length = 256
 
 ####################################
 ###       BEAKER SESSION        ####
 ####################################
 
 ## .session.type is type of storage options for the session, current allowed
 ## types are file, ext:memcached, ext:database, and memory (default).
 beaker.session.type = file
 beaker.session.data_dir = %(here)s/data/sessions/data
 
 ## db based session, fast, and allows easy management over logged in users ##
 #beaker.session.type = ext:database
 #beaker.session.table_name = db_session
 #beaker.session.sa.url = postgresql://postgres:secret@localhost/rhodecode
 #beaker.session.sa.url = mysql://root:secret@127.0.0.1/rhodecode
 #beaker.session.sa.pool_recycle = 3600
 #beaker.session.sa.echo = false
 
 beaker.session.key = rhodecode
 beaker.session.secret = production-rc-uytcxaz
 beaker.session.lock_dir = %(here)s/data/sessions/lock
 
 ## Secure encrypted cookie. Requires AES and AES python libraries
 ## you must disable beaker.session.secret to use this
 #beaker.session.encrypt_key = <key_for_encryption>
 #beaker.session.validate_key = <validation_key>
 
 ## sets session as invalid(also logging out user) if it haven not been
 ## accessed for given amount of time in seconds
 beaker.session.timeout = 2592000
 beaker.session.httponly = true
 #beaker.session.cookie_path = /<your-prefix>
 
 ## uncomment for https secure cookie
 beaker.session.secure = false
 
 ## auto save the session to not to use .save()
 beaker.session.auto = false
 
 ## default cookie expiration time in seconds, set to `true` to set expire
 ## at browser close
 #beaker.session.cookie_expires = 3600
 
 ###################################
 ## SEARCH INDEXING CONFIGURATION ##
 ###################################
 ## Full text search indexer is available in rhodecode-tools under
 ## `rhodecode-tools index` command
 
 # WHOOSH Backend, doesn't require additional services to run
 # it works good with few dozen repos
 search.module = rhodecode.lib.index.whoosh
 search.location = %(here)s/data/index
 
-
 ###################################
 ##       APPENLIGHT CONFIG       ##
 ###################################
 
 ## Appenlight is tailored to work with RhodeCode, see
 ## http://appenlight.com for details how to obtain an account
 
 ## appenlight integration enabled
 appenlight = false
 
 appenlight.server_url = https://api.appenlight.com
 appenlight.api_key = YOUR_API_KEY
 #appenlight.transport_config = https://api.appenlight.com?threaded=1&timeout=5
 
 # used for JS client
 appenlight.api_public_key = YOUR_API_PUBLIC_KEY
 
 ## TWEAK AMOUNT OF INFO SENT HERE
 
 ## enables 404 error logging (default False)
 appenlight.report_404 = false
 
 ## time in seconds after request is considered being slow (default 1)
 appenlight.slow_request_time = 1
 
 ## record slow requests in application
 ## (needs to be enabled for slow datastore recording and time tracking)
 appenlight.slow_requests = true
 
 ## enable hooking to application loggers
 appenlight.logging = true
 
 ## minimum log level for log capture
 appenlight.logging.level = WARNING
 
 ## send logs only from erroneous/slow requests
 ## (saves API quota for intensive logging)
 appenlight.logging_on_error = false
 
 ## list of additonal keywords that should be grabbed from environ object
 ## can be string with comma separated list of words in lowercase
 ## (by default client will always send following info:
 ## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that
 ## start with HTTP* this list be extended with additional keywords here
 appenlight.environ_keys_whitelist =
 
 ## list of keywords that should be blanked from request object
 ## can be string with comma separated list of words in lowercase
 ## (by default client will always blank keys that contain following words
 ## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
 ## this list be extended with additional keywords set here
 appenlight.request_keys_blacklist =
 
 ## list of namespaces that should be ignores when gathering log entries
 ## can be string with comma separated list of namespaces
 ## (by default the client ignores own entries: appenlight_client.client)
 appenlight.log_namespace_blacklist =
 
 
 ################################################################################
 ## WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT*  ##
 ## Debug mode will enable the interactive debugging tool, allowing ANYONE to  ##
 ## execute malicious code after an exception is raised.                       ##
 ################################################################################
 set debug = false
 
 
 #########################################################
 ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###
 #########################################################
 #sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
 sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode
 #sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode
 
 # see sqlalchemy docs for other advanced settings
 
 ## print the sql statements to output
 sqlalchemy.db1.echo = false
 ## recycle the connections after this ammount of seconds
 sqlalchemy.db1.pool_recycle = 3600
 sqlalchemy.db1.convert_unicode = true
 
 ## the number of connections to keep open inside the connection pool.
 ## 0 indicates no limit
 #sqlalchemy.db1.pool_size = 5
 
 ## the number of connections to allow in connection pool "overflow", that is
 ## connections that can be opened above and beyond the pool_size setting,
 ## which defaults to five.
 #sqlalchemy.db1.max_overflow = 10
 
 
 ##################
 ### VCS CONFIG ###
 ##################
 vcs.server.enable = true
 vcs.server = localhost:9900
 
 ## Web server connectivity protocol, responsible for web based VCS operatations
 ## Available protocols are:
 ## `pyro4` - using pyro4 server
 ## `http` - using http-rpc backend
 #vcs.server.protocol = http
 
 ## Push/Pull operations protocol, available options are:
 ## `pyro4` - using pyro4 server
 ## `rhodecode.lib.middleware.utils.scm_app_http` - Http based, recommended
 ## `vcsserver.scm_app` - internal app (EE only)
 #vcs.scm_app_implementation = rhodecode.lib.middleware.utils.scm_app_http
 
 ## Push/Pull operations hooks protocol, available options are:
 ## `pyro4` - using pyro4 server
 ## `http` - using http-rpc backend
 #vcs.hooks.protocol = http
 
 vcs.server.log_level = info
 ## Start VCSServer with this instance as a subprocess, usefull for development
 vcs.start_server = false
 vcs.backends = hg, git, svn
 vcs.connection_timeout = 3600
 ## Compatibility version when creating SVN repositories. Defaults to newest version when commented out.
 ## Available options are: pre-1.4-compatible, pre-1.5-compatible, pre-1.6-compatible, pre-1.8-compatible
 #vcs.svn.compatible_version = pre-1.8-compatible
 
 ################################
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
-keys = root, routes, rhodecode, sqlalchemy, beaker, pyro4, templates, whoosh_indexer
+keys = root, routes, rhodecode, sqlalchemy, beaker, pyro4, templates
 
 [handlers]
 keys = console, console_sql
 
 [formatters]
 keys = generic, color_formatter, color_formatter_sql
 
 #############
 ## LOGGERS ##
 #############
 [logger_root]
 level = NOTSET
 handlers = console
 
 [logger_routes]
 level = DEBUG
 handlers =
 qualname = routes.middleware
 ## "level = DEBUG" logs the route matched and routing variables.
 propagate = 1
 
 [logger_beaker]
 level = DEBUG
 handlers =
 qualname = beaker.container
 propagate = 1
 
 [logger_pyro4]
 level = DEBUG
 handlers =
 qualname = Pyro4
 propagate = 1
 
 [logger_templates]
 level = INFO
 handlers =
 qualname = pylons.templating
 propagate = 1
 
 [logger_rhodecode]
 level = DEBUG
 handlers =
 qualname = rhodecode
 propagate = 1
 
 [logger_sqlalchemy]
 level = INFO
 handlers = console_sql
 qualname = sqlalchemy.engine
 propagate = 0
 
-[logger_whoosh_indexer]
-level = DEBUG
-handlers =
-qualname = whoosh_indexer
-propagate = 1
-
 ##############
 ## HANDLERS ##
 ##############
 
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
 level = INFO
 formatter = generic
 
 [handler_console_sql]
 class = StreamHandler
 args = (sys.stderr,)
 level = WARN
 formatter = generic
 
 ################
 ## FORMATTERS ##
 ################
 
 [formatter_generic]
 class = rhodecode.lib.logging_formatter.Pyro4AwareFormatter
 format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %Y-%m-%d %H:%M:%S
 
 [formatter_color_formatter]
 class = rhodecode.lib.logging_formatter.ColorFormatter
 format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %Y-%m-%d %H:%M:%S
 
 [formatter_color_formatter_sql]
 class = rhodecode.lib.logging_formatter.ColorFormatterSql
 format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %Y-%m-%d %H:%M:%S

default.nix

@@ -1,219 +1,227 b''
 # Nix environment for the community edition
 #
 # This shall be as lean as possible, just producing the Enterprise
 # derivation. For advanced tweaks to pimp up the development environment we use
 # "shell.nix" so that it does not have to clutter this file.
 
 { pkgs ? (import <nixpkgs> {})
 , pythonPackages ? "python27Packages"
 , pythonExternalOverrides ? self: super: {}
 , doCheck ? true
 }:
 
 let pkgs_ = pkgs; in
 
 let
   pkgs = pkgs_.overridePackages (self: super: {
     # Override subversion derivation to
     #  - activate python bindings
     #  - set version to 1.8
     subversion = super.subversion18.override {
        httpSupport = true;
        pythonBindings = true;
        python = self.python27Packages.python;
     };
   });
 
   inherit (pkgs.lib) fix extends;
 
   basePythonPackages = with builtins; if isAttrs pythonPackages
     then pythonPackages
     else getAttr pythonPackages pkgs;
 
   elem = builtins.elem;
   basename = path: with pkgs.lib; last (splitString "/" path);
   startsWith = prefix: full: let
     actualPrefix = builtins.substring 0 (builtins.stringLength prefix) full;
   in actualPrefix == prefix;
 
   src-filter = path: type: with pkgs.lib;
     let
       ext = last (splitString "." path);
     in
       !elem (basename path) [
         ".git" ".hg" "__pycache__" ".eggs" "node_modules"
         "build" "data" "tmp"] &&
       !elem ext ["egg-info" "pyc"] &&
       !startsWith "result" path;
 
+  sources = pkgs.config.rc.sources or {};
   rhodecode-enterprise-ce-src = builtins.filterSource src-filter ./.;
 
   # Load the generated node packages
   nodePackages = pkgs.callPackage "${pkgs.path}/pkgs/top-level/node-packages.nix" rec {
     self = nodePackages;
     generated = pkgs.callPackage ./pkgs/node-packages.nix { inherit self; };
   };
 
   # TODO: Should be taken automatically out of the generates packages.
   # apps.nix has one solution for this, although I'd prefer to have the deps
   # from package.json mapped in here.
   nodeDependencies = with nodePackages; [
     grunt
     grunt-contrib-concat
     grunt-contrib-jshint
     grunt-contrib-less
     grunt-contrib-watch
     jshint
   ];
 
   pythonGeneratedPackages = self: basePythonPackages.override (a: {
     inherit self;
   })
   // (scopedImport {
     self = self;
     super = basePythonPackages;
     inherit pkgs;
     inherit (pkgs) fetchurl fetchgit;
   } ./pkgs/python-packages.nix);
 
   pythonOverrides = import ./pkgs/python-packages-overrides.nix {
     inherit
       basePythonPackages
       pkgs;
   };
 
   pythonLocalOverrides = self: super: {
     rhodecode-enterprise-ce =
       let
         version = builtins.readFile ./rhodecode/VERSION;
         linkNodeModules = ''
           echo "Link node packages"
           # TODO: check if this adds stuff as a dependency, closure size
           rm -fr node_modules
           mkdir -p node_modules
           ${pkgs.lib.concatMapStrings (dep: ''
             ln -sfv ${dep}/lib/node_modules/${dep.pkgName} node_modules/
           '') nodeDependencies}
           echo "DONE: Link node packages"
         '';
       in super.rhodecode-enterprise-ce.override (attrs: {
 
-      inherit doCheck;
+      inherit
+        doCheck
+        version;
       name = "rhodecode-enterprise-ce-${version}";
-      version = version;
+      releaseName = "RhodeCodeEnterpriseCE-${version}";
       src = rhodecode-enterprise-ce-src;
 
       buildInputs =
         attrs.buildInputs ++
         (with self; [
           pkgs.nodePackages.grunt-cli
           pkgs.subversion
           pytest-catchlog
-          rc_testdata
+          rhodecode-testdata
         ]);
 
       propagatedBuildInputs = attrs.propagatedBuildInputs ++ (with self; [
         rhodecode-tools
       ]);
 
       # TODO: johbo: Make a nicer way to expose the parts. Maybe
       # pkgs/default.nix?
       passthru = {
         inherit
           pythonLocalOverrides
           myPythonPackagesUnfix;
         pythonPackages = self;
       };
 
       LC_ALL = "en_US.UTF-8";
       LOCALE_ARCHIVE =
         if pkgs.stdenv ? glibc
         then "${pkgs.glibcLocales}/lib/locale/locale-archive"
         else "";
 
       # Somewhat snappier setup of the development environment
       # TODO: move into shell.nix
       # TODO: think of supporting a stable path again, so that multiple shells
       #       can share it.
       shellHook = ''
         tmp_path=$(mktemp -d)
         export PATH="$tmp_path/bin:$PATH"
         export PYTHONPATH="$tmp_path/${self.python.sitePackages}:$PYTHONPATH"
         mkdir -p $tmp_path/${self.python.sitePackages}
         python setup.py develop --prefix $tmp_path --allow-hosts ""
       '' + linkNodeModules;
 
       preCheck = ''
         export PATH="$out/bin:$PATH"
       '';
 
       postCheck = ''
         rm -rf $out/lib/${self.python.libPrefix}/site-packages/pytest_pylons
         rm -rf $out/lib/${self.python.libPrefix}/site-packages/rhodecode/tests
       '';
 
       preBuild = linkNodeModules + ''
         grunt
         rm -fr node_modules
       '';
 
       postInstall = ''
         # python based programs need to be wrapped
         ln -s ${self.supervisor}/bin/supervisor* $out/bin/
         ln -s ${self.gunicorn}/bin/gunicorn $out/bin/
         ln -s ${self.PasteScript}/bin/paster $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  #*/
           wrapProgram $file \
               --prefix PYTHONPATH : $PYTHONPATH \
               --prefix PATH : $PATH \
               --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
           echo "Missing scripts.js"
           exit 1
         fi
         if [ ! -f rhodecode/public/css/style.css ]; then
           echo "Missing style.css"
           exit 1
         fi
       '';
 
     });
 
-    rc_testdata = self.buildPythonPackage rec {
-      name = "rc_testdata-0.7.0";
-      src = pkgs.fetchhg {
-        url = "https://code.rhodecode.com/upstream/rc_testdata";
-        rev = "v0.7.0";
-        sha256 = "0w3z0zn8lagr707v67lgys23sl6pbi4xg7pfvdbw58h3q384h6rx";
-      };
+    rhodecode-testdata = import "${rhodecode-testdata-src}/default.nix" {
+    inherit
+      doCheck
+      pkgs
+      pythonPackages;
     };
 
   };
 
+  rhodecode-testdata-src = sources.rhodecode-testdata or (
+    pkgs.fetchhg {
+      url = "https://code.rhodecode.com/upstream/rc_testdata";
+      rev = "v0.8.0";
+      sha256 = "0hy1ba134rq2f9si85yx7j4qhc9ky0hjzdk553s3q026i7km809m";
+  });
+
   # Apply all overrides and fix the final package set
   myPythonPackagesUnfix =
     (extends pythonExternalOverrides
     (extends pythonLocalOverrides
     (extends pythonOverrides
              pythonGeneratedPackages)));
   myPythonPackages = (fix myPythonPackagesUnfix);
 
 in myPythonPackages.rhodecode-enterprise-ce

docs/admin/enable-debug.rst

@@ -1,136 +1,130 b''
 .. _debug-mode:
 
 Enabling Debug Mode
 -------------------
 
 To enable debug mode on a |RCE| instance you need to set the debug property
 in the :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` file. To
 do this, use the following steps
 
 1. Open the file and set the ``debug`` line to ``true``
 2. Restart you instance using the ``rccontrol restart`` command,
    see the following example:
 
 You can also set the log level, the follow are the valid options;
 ``debug``, ``info``, ``warning``, or ``fatal``.
 
 .. code-block:: ini
 
     [DEFAULT]
     debug = true
     pdebug = false
 
 .. code-block:: bash
 
     # Restart your instance
     $ rccontrol restart enterprise-1
     Instance "enterprise-1" successfully stopped.
     Instance "enterprise-1" successfully started.
 
 Debug and Logging Configuration
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Further debugging and logging settings can also be set in the
 :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` file.
 
 In the logging section, the various packages that run with |RCE| can have
 different debug levels set. If you want to increase the logging level change
 ``level = DEBUG`` line to one of the valid options.
 
 You also need to change the log level for handlers. See the example
 ``##handler`` section below. The ``handler`` level takes the same options as
 the ``debug`` level.
 
 .. code-block:: ini
 
     ################################
     ### LOGGING CONFIGURATION   ####
     ################################
     [loggers]
-    keys = root, routes, rhodecode, sqlalchemy, beaker, pyro4, templates, whoosh_indexer
+    keys = root, routes, rhodecode, sqlalchemy, beaker, pyro4, templates
 
     [handlers]
     keys = console, console_sql, file, file_rotating
 
     [formatters]
     keys = generic, color_formatter, color_formatter_sql
 
     #############
     ## LOGGERS ##
     #############
     [logger_root]
     level = NOTSET
     handlers = console
 
     [logger_routes]
     level = DEBUG
     handlers =
     qualname = routes.middleware
     ## "level = DEBUG" logs the route matched and routing variables.
     propagate = 1
 
     [logger_beaker]
     level = DEBUG
     handlers =
     qualname = beaker.container
     propagate = 1
 
     [logger_pyro4]
     level = DEBUG
     handlers =
     qualname = Pyro4
     propagate = 1
 
     [logger_templates]
     level = INFO
     handlers =
     qualname = pylons.templating
     propagate = 1
 
     [logger_rhodecode]
     level = DEBUG
     handlers =
     qualname = rhodecode
     propagate = 1
 
     [logger_sqlalchemy]
     level = INFO
     handlers = console_sql
     qualname = sqlalchemy.engine
     propagate = 0
 
-    [logger_whoosh_indexer]
-    level = DEBUG
-    handlers =
-    qualname = whoosh_indexer
-    propagate = 1
-
     ##############
     ## HANDLERS ##
     ##############
 
     [handler_console]
     class = StreamHandler
     args = (sys.stderr,)
     level = INFO
     formatter = generic
 
     [handler_console_sql]
     class = StreamHandler
     args = (sys.stderr,)
     level = WARN
     formatter = generic
 
     [handler_file]
     class = FileHandler
     args = ('rhodecode.log', 'a',)
     level = INFO
     formatter = generic
 
     [handler_file_rotating]
     class = logging.handlers.TimedRotatingFileHandler
     # 'D', 5 - rotate every 5days
     # you can set 'h', 'midnight'
     args = ('rhodecode.log', 'D', 5, 10,)
     level = INFO
     formatter = generic

docs/contributing/contributing.rst

@@ -1,19 +1,20 b''
 .. _contributing:
 
 Contributing to RhodeCode
 =========================
 
 
 
-Welcome to contribution guides and development docs of RhodeCode.
+Welcome to the contribution guides and development docs of RhodeCode.
 
 
 
 .. toctree::
    :maxdepth: 1
 
+   overview
    testing/index
    dev-setup
    db-schema
    dev-settings
    api

docs/contributing/db-schema.rst

@@ -1,52 +1,52 b''
 =======================
 DB Schema and Migration
 =======================
 
-To create or alter tables in the database it's necessary to change a couple of
+To create or alter tables in the database, it's necessary to change a couple of
 files, apart from configuring the settings pointing to the latest database
 schema.
 
 
 Database Model and ORM
 ----------------------
 
 On ``rhodecode.model.db`` you will find the database definition of all tables and 
-fields. Any fresh install database will be correctly created by the definitions 
-here. So, any change to this files will affect the tests without having to change
+fields. Any freshly installed database will be correctly created by the definitions 
+here. So, any change to this file will affect the tests without having to change
 any other file.
 
-A second layer are the businness classes that are inside ``rhodecode.model``. 
+A second layer are the business classes inside ``rhodecode.model``. 
 
 
 Database Migration
 ------------------
 
 Three files play a role when creating database migrations:
 
     * Database schema inside ``rhodecode.lib.dbmigrate``
     * Database version inside ``rhodecode.lib.dbmigrate`` 
     * Configuration ``__dbversion__`` at ``rhodecode.__init__``
 
 
 Schema is a snapshot of the database version BEFORE the migration. So, it's
 the initial state before any changes were added. The name convention is
-the latest release version where the snapshot were created, and not the 
+the latest release version where the snapshot was created, and not the 
 target version of this code.
 
 Version is the method that will define how to UPGRADE/DOWNGRADE the database.
 
 ``rhodecode.__init__`` contains only a variable that defines up to which version of 
 the database will be used to upgrade. Eg.: ``__dbversion__ = 45``
 
 
 For examples on how to create those files, please see the existing code.
 
 
 Migration Command
 ^^^^^^^^^^^^^^^^^
 
-After you changed the database ORM and migration files, you can run::
+After you've changed the database ORM and migration files, you can run::
 
    paster upgrade-db <ini-file> 
 
-And the database will be upgraded up to the version defined in the ``__init__`` file.
  No newline at end of file
+The database will be upgraded up to the version defined in the ``__init__`` file.
  No newline at end of file

docs/contributing/dev-settings.rst

@@ -1,46 +1,46 b''
 
 ==========================
  Settings for Development
 ==========================
 
 
 We have a few settings which are intended to be used only for development
 purposes. This section contains an overview of them.
 
 
 
 `debug_style`
 =============
 
 Enables the section "Style" in the application. This section provides an
-overview of all components which are found in the frontend style of the
+overview of all components which are found in the frontend of the
 application.
 
 
 
 `vcs.start_server`
 ==================
 
 Starts the server as a subprocess while the system comes up. Intended usage is
 to ease development.
 
 
 
 `[logging]`
 ===========
 
-Use this to configure loggig to your current needs. The documentation of
-Python's `logging` module explains all details. The following snippets are
-useful for day to day development work.
+Use this to configure logging to your current needs. The documentation of
+Python's `logging` module explains all of the details. The following snippets
+are useful for day to day development work.
 
 
 Mute SQL output
 ---------------
 
 They come out of the package `sqlalchemy.engine`::
 
   [logger_sqlalchemy]
   level = WARNING
   handlers = console_sql
   qualname = sqlalchemy.engine
   propagate = 0

docs/contributing/dev-setup.rst

@@ -1,141 +1,144 b''
+.. _dev-setup:
 
 ===================
  Development setup
 ===================
 
 
 RhodeCode Enterprise runs inside a Nix managed environment. This ensures build
 environment dependencies are correctly declared and installed during setup.
 It also enables atomic upgrades, rollbacks, and multiple instances of RhodeCode
-Enterprise for efficient cluster management.
+Enterprise running with isolation.
 
-To set up RhodeCode Enterprise inside the Nix environment use the following steps:
+To set up RhodeCode Enterprise inside the Nix environment, use the following steps:
 
 
 
 Setup Nix Package Manager
 -------------------------
 
-To install the Nix Package Manager please run::
+To install the Nix Package Manager, please run::
 
    $ curl https://nixos.org/nix/install | sh
 
-or go to https://nixos.org/nix/ and follow their installation instructions.
-Once this is correctly set up on your system you should be able to use the
+or go to https://nixos.org/nix/ and follow the installation instructions.
+Once this is correctly set up on your system, you should be able to use the
 following commands:
 
 * `nix-env`
 
 * `nix-shell`
 
 
 .. tip::
 
    Update your channels frequently by running ``nix-channel --upgrade``.
 
 
-Switch nix to latest STABLE channel
------------------------------------
+Switch nix to the latest STABLE channel
+---------------------------------------
 
 run::
 
    nix-channel --add https://nixos.org/channels/nixos-16.03 nixpkgs
 
 Followed by::
 
    nix-channel --update
 
 
 Clone the required repositories
 -------------------------------
 
-After Nix is set up, clone the RhodeCode Enterprise Community Edition, and
+After Nix is set up, clone the RhodeCode Enterprise Community Edition and
 RhodeCode VCSServer repositories into the same directory.
 To do this, use the following example::
 
     mkdir rhodecode-develop && cd rhodecode-develop
     hg clone https://code.rhodecode.com/rhodecode-enterprise-ce
     hg clone https://code.rhodecode.com/rhodecode-vcsserver
 
 .. note::
 
-   If you cannot clone the repository, please request read permissions.
+   If you cannot clone the repository, please request read permissions
+   via [e-mail]
 
 
 
 Enter the Development Shell
 ---------------------------
 
-The final step is to start into the development shell. To do this run the
+The final step is to start the development shell. To do this, run the
 following command from inside the cloned repository::
 
    cd ~/rhodecode-enterprise-ce
-   nix-shell --arg dev true
+   nix-shell
 
 .. note::
 
    On the first run, this will take a while to download and optionally compile
-   a few things. The next runs of it will be faster.
+   a few things. The following runs will be faster. The development shell works
+   fine on MacOS and Linux platforms.
 
 
 
 Creating a Development Configuration
 ------------------------------------
 
 To create a development environment for RhodeCode Enterprise,
 use the following steps:
 
 1. Create a copy of `~/rhodecode-enterprise-ce/configs/development.ini`
 2. Adjust the configuration settings to your needs
 
    .. note::
 
-      It is recommended to call it `dev.ini`.
+      It is recommended to use the name `dev.ini`.
 
 
 Setup the Development Database
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-To create a development database use the following example. This is a one
+To create a development database, use the following example. This is a one
 time operation::
 
     paster setup-rhodecode dev.ini \
         --user=admin --password=secret \
         --email=[e-mail] \
         --repos=~/my_dev_repos
 
 
 Start the Development Server
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 When starting the development server, you should start the vcsserver as a
-separate process. To do this use one of the following examples:
+separate process. To do this, use one of the following examples:
 
 1. Set the `start.vcs_server` flag in the ``dev.ini`` file to true. For example:
 
    .. code-block:: python
 
       ### VCS CONFIG ###
       ##################
       vcs.start_server = true
       vcs.server = localhost:9900
       vcs.server.log_level = debug
 
    Then start the server using the following command: ``rcserver dev.ini``
 
 2. Start the development server using the following example::
 
       rcserver --with-vcsserver dev.ini
 
 3. Start the development server in a different terminal using the following
    example::
 
       vcsserver
 
 
 Run the Environment Tests
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Please make sure that the test are passing to verify that your environment is
-set up correctly. More details about the tests are described in:
-:file:`/docs/dev/testing`.
+Please make sure that the tests are passing to verify that your environment is
+set up correctly. RhodeCode uses py.test to run tests.
+Please simply run ``make test`` to run the basic test suite.

docs/contributing/testing/index.rst

@@ -1,28 +1,28 b''
 
 
 ============================
  Testing and Specifications
 ============================
 
 
 .. toctree::
    :maxdepth: 2
 
    unit-and-functional
    spec-by-example
    naming-conventions
 
 
 
 Overview
 ========
 
-We have a quite big test suite inside of :file:`rhodecode/tests` which is a mix
+We have a quite large test suite inside of :file:`rhodecode/tests` which is a mix
 of unit tests and functional or integration tests. More details are in
 :ref:`test-unit-and-functional`.
 
 
-Apart from that we start to apply "Specification by Example" and maintain a
-collection of such specifications together with an implementation so that it can
-be validated in an automatic way. The files can be found in
+Apart from that, we are starting to apply "Specification by Example" and maintain
+a collection of such specifications together with an implementation so that it
+can be validated in an automatic way. The files can be found in
 :file:`acceptance_tests`. More details are in :ref:`test-spec-by-example`.

docs/contributing/testing/spec-by-example.rst

@@ -1,75 +1,75 b''
 
 .. _test-spec-by-example:
 
 ==========================
  Specification by Example
 ==========================
 
 
 .. Avoid duplicating the quickstart instructions by importing the README
    file.
 
 .. include:: ../../../acceptance_tests/README.rst
 
 
 
 Choices of technology and tools
 ===============================
 
 
 `nix` as runtime environment
 ----------------------------
 
 We settled to use the `nix` tools to provide us the needed environment for
 running the tests.
 
 
 
 `Gherkins` as specification language
 ------------------------------------
 
 To specify by example, we settled on Gherkins as the semi-formal specification
 language.
 
 
 `py.test` as a runner
 ---------------------
 
 After experimenting with `behave` and `py.test` our choice was `pytest-bdd`
 because it allows us to use our existing knowledge about `py.test` and avoids
 that we have to learn another tool.
 
 
 
 Concepts
 ========
 
 The logic is structured around the design pattern of "page objects". The
 documentation of `python-selemium` contains a few more details about this
 pattern.
 
 
 
 Page Objects
 ------------
 
 We introduce an abstraction class for every page which we have to interact with
 in order to validate the specifications.
 
 The implementation for the page objects is inside of the module
 :mod:`page_objects`. The class :class:`page_objects.base.BasePage` should be
 used as a base for all page object implementations.
 
 
 
 Locators
 --------
 
 The specific information how to locate an element inside of the DOM tree of a
-page is kept in a separate class. This class serves mainly as a data container,
+page is kept in a separate class. This class serves mainly as a data container;
 it shall not contain any logic.
 
 The reason for keeping the locators separate is that we expect a frequent need
-for change whenever we work on our templates. In such a case it is more
-efficient to have all locators together and update them there instead of having
-to find all locators inside of the logic of a page object.
+for change whenever we work on our templates. In such a case, it is more
+efficient to have all of thelocators together and update them there instead of
+having to find every locator inside of the logic of a page object.

docs/contributing/testing/unit-and-functional.rst

@@ -1,61 +1,61 b''
 
 .. _test-unit-and-functional:
 
 ===========================
  Unit and Functional Tests
 ===========================
 
 
 
 py.test based test suite
 ========================
 
 
 The test suite is in the folder :file:`rhodecode/tests/` and should be run with
 the test runner `py.test` inside of your `nix-shell` environment::
 
    # In case you need the cythonized version
    CYTHONIZE=1 python setup.py develop --prefix=$tmp_path
 
    py.test rhodecode
 
 
 
 py.test integration
 -------------------
 
 The integration with the test runner is based on the following three parts:
 
 - `pytest_pylons` is a py.test plugin which does the integration with the
-  Pylons web framework. It sets up the Pylons environment based on a given ini
+  Pylons web framework. It sets up the Pylons environment based on the given ini
   file.
 
   Tests which depend on the Pylons environment to be set up must request the
   fixture `pylonsapp`.
 
 - :file:`rhodecode/tests/plugin.py` contains the integration of py.test with
   RhodeCode Enterprise itself.
 
 - :file:`conftest.py` plugins are used to provide a special integration for
   certain groups of tests based on the directory location.
 
 
 
 VCS backend selection
 ---------------------
 
 The py.test integration provides a parameter `--backends`. It will skip all
 tests which are marked for other backends.
 
 To run only Subversion tests::
 
    py.test rhodecode --backends=svn
 
 
 
 Frontend / Styling support
 ==========================
 
 All relevant style components have an example inside of the "Style" section
 within the application. Enable the setting `debug_style` to make this section
 visible in your local instance of the application.

docs/release-notes/release-notes.rst

@@ -1,82 +1,83 b''
 .. _rhodecode-release-notes-ref:
 
 Release Notes
 =============
 
 |RCE| 4.x Versions
 ------------------
 
 .. toctree::
    :maxdepth: 1
 
+   release-notes-4.2.0.rst
    release-notes-4.1.2.rst
    release-notes-4.1.1.rst
    release-notes-4.1.0.rst
    release-notes-4.0.1.rst
    release-notes-4.0.0.rst
 
 |RCE| 3.x Versions
 ------------------
 
 .. toctree::
    :maxdepth: 1
 
    release-notes-3.8.4.rst
    release-notes-3.8.3.rst
    release-notes-3.8.2.rst
    release-notes-3.8.1.rst
    release-notes-3.8.0.rst
    release-notes-3.7.1.rst
    release-notes-3.7.0.rst
    release-notes-3.6.1.rst
    release-notes-3.6.0.rst
    release-notes-3.5.2.rst
    release-notes-3.5.1.rst
    release-notes-3.5.0.rst
    release-notes-3.4.1.rst
    release-notes-3.4.0.rst
    release-notes-3.3.4.rst
    release-notes-3.3.3.rst
    release-notes-3.3.2.rst
    release-notes-3.3.1.rst
    release-notes-3.3.0.rst
    release-notes-3.2.3.rst
    release-notes-3.2.2.rst
    release-notes-3.2.1.rst
    release-notes-3.2.0.rst
    release-notes-3.1.1.rst
    release-notes-3.1.0.rst
    release-notes-3.0.2.rst
    release-notes-3.0.1.rst
    release-notes-3.0.0.rst
 
 |RCE| 2.x Versions
 ------------------
 
 .. toctree::
    :maxdepth: 1
 
    release-notes-2.2.8.rst
    release-notes-2.2.7.rst
    release-notes-2.2.6.rst
    release-notes-2.2.5.rst
    release-notes-2.2.4.rst
    release-notes-2.2.3.rst
    release-notes-2.2.2.rst
    release-notes-2.2.1.rst
    release-notes-2.2.0.rst
    release-notes-2.1.0.rst
    release-notes-2.0.2.rst
    release-notes-2.0.1.rst
    release-notes-2.0.0.rst
 
 |RCE| 1.x Versions
 ------------------
 
 .. toctree::
    :maxdepth: 1
 
    release-notes-1.7.2.rst
    release-notes-1.7.1.rst
    release-notes-1.7.0.rst
    release-notes-1.6.0.rst

license.nix

@@ -1,163 +1,160 b''
 # Utility to generate the license information
 #
 # Usage:
 #
 #   nix-build -I ~/dev license.nix -A result
 #
 # Afterwards ./result will contain the license information as JSON files.
 #
 #
 # Overview
 #
 # Uses two steps to get the relevant license information:
 #
 # 1. Walk down the derivations based on "buildInputs" and
 #    "propagatedBuildInputs". This results in all dependencies based on the nix
 #    declartions.
 #
 # 2. Build Enterprise and query nix-store to get a list of runtime
 #    dependencies. The results from step 1 are then limited to the ones which
 #    are in this list.
 #
 # The result is then available in ./result/license.json.
 #
 
 
 let
 
   nixpkgs = import <nixpkgs> {};
 
   stdenv = nixpkgs.stdenv;
 
   # Enterprise as simple as possible, goal here is just to identify the runtime
   # dependencies. Ideally we could avoid building Enterprise at all and somehow
   # figure it out without calling into nix-store.
   enterprise = import ./default.nix {
     doCheck = false;
-    with_vcsserver = false;
-    with_pyramid = false;
-    cythonize = false;
   };
 
   # For a given derivation, return the list of all dependencies
   drvToDependencies = drv: nixpkgs.lib.flatten [
     drv.nativeBuildInputs or []
     drv.propagatedNativeBuildInputs or []
   ];
 
   # Transform the given derivation into the meta information which we need in
   # the resulting JSON files.
   drvToMeta = drv: {
     name = drv.name or "UNNAMED";
     license = if drv ? meta.license then drv.meta.license else "UNKNOWN";
   };
 
   # Walk the tree of buildInputs and propagatedBuildInputs and return it as a
   # flat list.  Duplicates are avoided.
   listDrvDependencies = drv: let
     addElement = element: seen:
       if (builtins.elem element seen)
       then seen
       else let
         newSeen = seen ++ [ element ];
         newDeps = drvToDependencies element;
       in nixpkgs.lib.fold addElement newSeen newDeps;
     initialElements = drvToDependencies drv;
   in nixpkgs.lib.fold addElement [] initialElements;
 
   # Reads in a file with store paths and returns a list of derivation names.
   #
   # Reads the file, splits the lines, then removes the prefix, so that we
   # end up with a list of derivation names in the end.
   storePathsToDrvNames = srcPath: let
     rawStorePaths = nixpkgs.lib.removeSuffix "\n" (
       builtins.readFile srcPath);
     storePaths = nixpkgs.lib.splitString "\n" rawStorePaths;
     # TODO: johbo: Would be nice to use some sort of utility here to convert
     # the path to a derivation name.
     storePathPrefix = (
       builtins.stringLength "/nix/store/zwy7aavnif9ayw30rya1k6xiacafzzl6-");
     storePathToName = path:
       builtins.substring storePathPrefix (builtins.stringLength path) path;
   in (map storePathToName storePaths);
 
 in rec {
 
   # Build Enterprise and call nix-store to retrieve the runtime
   # dependencies. The result is available in the nix store.
   runtimeDependencies = stdenv.mkDerivation {
     name = "runtime-dependencies";
     buildInputs = [
       # Needed to query the store
       nixpkgs.nix
     ];
     unpackPhase = ''
       echo "Nothing to unpack"
     '';
     buildPhase = ''
       # Get a list of runtime dependencies
       nix-store -q --references ${enterprise} > nix-store-references
     '';
     installPhase = ''
       mkdir -p $out
       cp -v nix-store-references $out/
     '';
   };
 
   # Produce the license overview files.
   result = let
 
     # Dependencies according to the nix-store
     runtimeDependencyNames = (
       storePathsToDrvNames "${runtimeDependencies}/nix-store-references");
 
     # Dependencies based on buildInputs and propagatedBuildInputs
     enterpriseAllDependencies = listDrvDependencies enterprise;
     enterpriseRuntimeDependencies = let
       elemName = element: element.name or "UNNAMED";
       isRuntime = element: builtins.elem (elemName element) runtimeDependencyNames;
     in builtins.filter isRuntime enterpriseAllDependencies;
 
     # Extract relevant meta information
     enterpriseAllLicenses = map drvToMeta enterpriseAllDependencies;
     enterpriseRuntimeLicenses = map drvToMeta enterpriseRuntimeDependencies;
 
   in stdenv.mkDerivation {
 
     name = "licenses";
 
     buildInputs = [];
 
     unpackPhase = ''
       echo "Nothing to unpack"
     '';
 
     buildPhase = ''
       mkdir build
 
       # Copy list of runtime dependencies for the Python processor
       cp "${runtimeDependencies}/nix-store-references" ./build/nix-store-references
 
       # All licenses which we found by walking buildInputs and
       # propagatedBuildInputs
       cat > build/all-licenses.json <<EOF
       ${builtins.toJSON enterpriseAllLicenses}
       EOF
 
       # License information for our runtime dependencies only. Basically all
       # licenses limited to the items which where also reported by nix-store as
       # a dependency.
       cat > build/licenses.json <<EOF
       ${builtins.toJSON enterpriseRuntimeLicenses}
       EOF
     '';
 
     installPhase = ''
       mkdir -p $out
 
       # Store it all, that helps when things go wrong
       cp -rv ./build/* $out
     '';
   };
 
 }

pkgs/python-packages-overrides.nix

@@ -1,165 +1,273 b''
 # Overrides for the generated python-packages.nix
 #
 # This function is intended to be used as an extension to the generated file
 # python-packages.nix. The main objective is to add needed dependencies of C
 # libraries and tweak the build instructions where needed.
 
 { pkgs, basePythonPackages }:
 
 let
   sed = "sed -i";
+  localLicenses = {
+    repoze = {
+      fullName = "Repoze License";
+      url =  http://www.repoze.org/LICENSE.txt;
+    };
+  };
 in
 
 self: super: {
 
+  appenlight-client = super.appenlight-client.override (attrs: {
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  });
+
+  future = super.future.override (attrs: {
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  });
+
   gnureadline = super.gnureadline.override (attrs: {
     buildInputs = attrs.buildInputs ++ [
       pkgs.ncurses
     ];
     patchPhase = ''
       substituteInPlace setup.py --replace "/bin/bash" "${pkgs.bash}/bin/bash"
     '';
   });
 
   gunicorn = super.gunicorn.override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       # johbo: futures is needed as long as we are on Python 2, otherwise
       # gunicorn explodes if used with multiple threads per worker.
       self.futures
     ];
   });
 
   ipython = super.ipython.override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       self.gnureadline
     ];
   });
 
   kombu = super.kombu.override (attrs: {
     # The current version of kombu needs some patching to work with the
     # other libs. Should be removed once we update celery and kombu.
     patches = [
       ./patch-kombu-py-2-7-11.diff
       ./patch-kombu-msgpack.diff
     ];
   });
 
   lxml = super.lxml.override (attrs: {
     buildInputs = with self; [
       pkgs.libxml2
       pkgs.libxslt
     ];
   });
 
   MySQL-python = super.MySQL-python.override (attrs: {
     buildInputs = attrs.buildInputs ++ [
       pkgs.openssl
     ];
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       pkgs.mysql.lib
       pkgs.zlib
     ];
   });
 
   psutil = super.psutil.override (attrs: {
     buildInputs = attrs.buildInputs ++
       pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.IOKit;
   });
 
   psycopg2 = super.psycopg2.override (attrs: {
     buildInputs = attrs.buildInputs ++
       pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.openssl;
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       pkgs.postgresql
     ];
+    meta = {
+      license = pkgs.lib.licenses.lgpl3Plus;
+    };
   });
 
   pycurl = super.pycurl.override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       pkgs.curl
       pkgs.openssl
     ];
     preConfigure = ''
       substituteInPlace setup.py --replace '--static-libs' '--libs'
       export PYCURL_SSL_LIBRARY=openssl
     '';
+    meta = {
+      # TODO: It is LGPL and MIT
+      license = pkgs.lib.licenses.mit;
+    };
   });
 
   Pylons = super.Pylons.override (attrs: {
     name = "Pylons-1.0.1-patch1";
     src = pkgs.fetchgit {
       url = "https://code.rhodecode.com/upstream/pylons";
       rev = "707354ee4261b9c10450404fc9852ccea4fd667d";
       sha256 = "b2763274c2780523a335f83a1df65be22ebe4ff413a7bc9e9288d23c1f62032e";
     };
   });
 
   pyramid = super.pyramid.override (attrs: {
     postFixup = ''
       wrapPythonPrograms
       # TODO: johbo: "wrapPython" adds this magic line which
       # confuses pserve.
       ${sed} '/import sys; sys.argv/d' $out/bin/.pserve-wrapped
     '';
+    meta = {
+      license = localLicenses.repoze;
+    };
+  });
+
+  pyramid-debugtoolbar = super.pyramid-debugtoolbar.override (attrs: {
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal localLicenses.repoze ];
+    };
   });
 
   Pyro4 = super.Pyro4.override (attrs: {
     # TODO: Was not able to generate this version, needs further
     # investigation.
     name = "Pyro4-4.35";
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/P/Pyro4/Pyro4-4.35.src.tar.gz";
       md5 = "cbe6cb855f086a0f092ca075005855f3";
     };
   });
 
   pysqlite = super.pysqlite.override (attrs: {
     propagatedBuildInputs = [
       pkgs.sqlite
     ];
+    meta = {
+      license = [ pkgs.lib.licenses.zlib pkgs.lib.licenses.libpng ];
+    };
   });
 
   pytest-runner = super.pytest-runner.override (attrs: {
     propagatedBuildInputs = [
       self.setuptools-scm
     ];
   });
 
   python-ldap = super.python-ldap.override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       pkgs.cyrus_sasl
       pkgs.openldap
       pkgs.openssl
     ];
     NIX_CFLAGS_COMPILE = "-I${pkgs.cyrus_sasl}/include/sasl";
   });
 
   python-pam = super.python-pam.override (attrs:
     let
       includeLibPam = pkgs.stdenv.isLinux;
     in {
       # TODO: johbo: Move the option up into the default.nix, we should
       # include python-pam only on supported platforms.
       propagatedBuildInputs = attrs.propagatedBuildInputs ++
         pkgs.lib.optional includeLibPam [
           pkgs.pam
         ];
       # TODO: johbo: Check if this can be avoided, or transform into
       # a real patch
       patchPhase = pkgs.lib.optionals includeLibPam ''
         substituteInPlace pam.py \
           --replace 'find_library("pam")' '"${pkgs.pam}/lib/libpam.so.0"'
       '';
     });
 
   rhodecode-tools = super.rhodecode-tools.override (attrs: {
     patches = [
       ./patch-rhodecode-tools-setup.diff
     ];
   });
 
+  URLObject = super.URLObject.override (attrs: {
+    meta = {
+      license = {
+        spdxId = "Unlicense";
+        fullName = "The Unlicense";
+        url = http://unlicense.org/;
+      };
+    };
+  });
+
+  amqplib = super.amqplib.override (attrs: {
+    meta = {
+      license = pkgs.lib.licenses.lgpl3;
+    };
+  });
+
+  docutils = super.docutils.override (attrs: {
+    meta = {
+      license = pkgs.lib.licenses.bsd2;
+    };
+  });
+
+  colander = super.colander.override (attrs: {
+    meta = {
+      license = localLicenses.repoze;
+    };
+  });
+
+  pyramid-beaker  = super.pyramid-beaker.override (attrs: {
+    meta = {
+      license = localLicenses.repoze;
+    };
+  });
+
+  pyramid-mako = super.pyramid-mako.override (attrs: {
+    meta = {
+      license = localLicenses.repoze;
+    };
+  });
+
+  repoze.lru = super.repoze.lru.override (attrs: {
+    meta = {
+      license = localLicenses.repoze;
+    };
+  });
+
+  recaptcha-client = super.recaptcha-client.override (attrs: {
+    meta = {
+      # TODO: It is MIT/X11
+      license = pkgs.lib.licenses.mit;
+    };
+  });
+
+  python-editor = super.python-editor.override (attrs: {
+    meta = {
+      license = pkgs.lib.licenses.asl20;
+    };
+  });
+
+  translationstring = super.translationstring.override (attrs: {
+    meta = {
+      license = localLicenses.repoze;
+    };
+  });
+
+  venusian = super.venusian.override (attrs: {
+    meta = {
+      license = localLicenses.repoze;
+    };
+  });
+
   # Avoid that setuptools is replaced, this leads to trouble
   # with buildPythonPackage.
   setuptools = basePythonPackages.setuptools;
 
 }

pkgs/python-packages.nix

@@ -1,1263 +1,1641 b''
 {
   Babel = super.buildPythonPackage {
     name = "Babel-1.3";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [pytz];
     src = fetchurl {
       url = "https://pypi.python.org/packages/33/27/e3978243a03a76398c384c83f7ca879bc6e8f1511233a621fcada135606e/Babel-1.3.tar.gz";
       md5 = "5264ceb02717843cbc9ffce8e6e06bdb";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   Beaker = super.buildPythonPackage {
     name = "Beaker-1.7.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/97/8e/409d2e7c009b8aa803dc9e6f239f1db7c3cdf578249087a404e7c27a505d/Beaker-1.7.0.tar.gz";
       md5 = "386be3f7fe427358881eee4622b428b3";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   CProfileV = super.buildPythonPackage {
     name = "CProfileV-1.0.6";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [bottle];
     src = fetchurl {
       url = "https://pypi.python.org/packages/eb/df/983a0b6cfd3ac94abf023f5011cb04f33613ace196e33f53c86cf91850d5/CProfileV-1.0.6.tar.gz";
       md5 = "08c7c242b6e64237bc53c5d13537e03d";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   Fabric = super.buildPythonPackage {
     name = "Fabric-1.10.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [paramiko];
     src = fetchurl {
       url = "https://pypi.python.org/packages/e3/5f/b6ebdb5241d5ec9eab582a5c8a01255c1107da396f849e538801d2fe64a5/Fabric-1.10.0.tar.gz";
       md5 = "2cb96473387f0e7aa035210892352f4a";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   FormEncode = super.buildPythonPackage {
     name = "FormEncode-1.2.4";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/8e/59/0174271a6f004512e0201188593e6d319db139d14cb7490e488bbb078015/FormEncode-1.2.4.tar.gz";
       md5 = "6bc17fb9aed8aea198975e888e2077f4";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.psfl ];
+    };
   };
   Jinja2 = super.buildPythonPackage {
     name = "Jinja2-2.7.3";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [MarkupSafe];
     src = fetchurl {
       url = "https://pypi.python.org/packages/b0/73/eab0bca302d6d6a0b5c402f47ad1760dc9cb2dd14bbc1873ad48db258e4d/Jinja2-2.7.3.tar.gz";
       md5 = "b9dffd2f3b43d673802fe857c8445b1a";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   Mako = super.buildPythonPackage {
     name = "Mako-1.0.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [MarkupSafe];
     src = fetchurl {
       url = "https://pypi.python.org/packages/8e/a4/aa56533ecaa5f22ca92428f74e074d0c9337282933c722391902c8f9e0f8/Mako-1.0.1.tar.gz";
       md5 = "9f0aafd177b039ef67b90ea350497a54";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   Markdown = super.buildPythonPackage {
     name = "Markdown-2.6.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/62/8b/83658b5f6c220d5fcde9f9852d46ea54765d734cfbc5a9f4c05bfc36db4d/Markdown-2.6.2.tar.gz";
       md5 = "256d19afcc564dc4ce4c229bb762f7ae";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   MarkupSafe = super.buildPythonPackage {
     name = "MarkupSafe-0.23";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/c0/41/bae1254e0396c0cc8cf1751cb7d9afc90a602353695af5952530482c963f/MarkupSafe-0.23.tar.gz";
       md5 = "f5ab3deee4c37cd6a922fb81e730da6e";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   MySQL-python = super.buildPythonPackage {
     name = "MySQL-python-1.2.5";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/a5/e9/51b544da85a36a68debe7a7091f068d802fc515a3a202652828c73453cad/MySQL-python-1.2.5.zip";
       md5 = "654f75b302db6ed8dc5a898c625e030c";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.gpl1 ];
+    };
   };
   Paste = super.buildPythonPackage {
     name = "Paste-2.0.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [six];
     src = fetchurl {
       url = "https://pypi.python.org/packages/d5/8d/0f8ac40687b97ff3e07ebd1369be20bdb3f93864d2dc3c2ff542edb4ce50/Paste-2.0.2.tar.gz";
       md5 = "4bfc8a7eaf858f6309d2ac0f40fc951c";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   PasteDeploy = super.buildPythonPackage {
     name = "PasteDeploy-1.5.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/0f/90/8e20cdae206c543ea10793cbf4136eb9a8b3f417e04e40a29d72d9922cbd/PasteDeploy-1.5.2.tar.gz";
       md5 = "352b7205c78c8de4987578d19431af3b";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   PasteScript = super.buildPythonPackage {
     name = "PasteScript-1.7.5";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [Paste PasteDeploy];
     src = fetchurl {
       url = "https://pypi.python.org/packages/a5/05/fc60efa7c2f17a1dbaeccb2a903a1e90902d92b9d00eebabe3095829d806/PasteScript-1.7.5.tar.gz";
       md5 = "4c72d78dcb6bb993f30536842c16af4d";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   Pygments = super.buildPythonPackage {
     name = "Pygments-2.0.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/f4/c6/bdbc5a8a112256b2b6136af304dbae93d8b1ef8738ff2d12a51018800e46/Pygments-2.0.2.tar.gz";
       md5 = "238587a1370d62405edabd0794b3ec4a";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   Pylons = super.buildPythonPackage {
     name = "Pylons-1.0.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [Routes WebHelpers Beaker Paste PasteDeploy PasteScript FormEncode simplejson decorator nose Mako WebError WebTest Tempita MarkupSafe WebOb];
     src = fetchurl {
       url = "https://pypi.python.org/packages/a2/69/b835a6bad00acbfeed3f33c6e44fa3f936efc998c795bfb15c61a79ecf62/Pylons-1.0.1.tar.gz";
       md5 = "6cb880d75fa81213192142b07a6e4915";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   Pyro4 = super.buildPythonPackage {
     name = "Pyro4-4.41";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [serpent];
     src = fetchurl {
       url = "https://pypi.python.org/packages/56/2b/89b566b4bf3e7f8ba790db2d1223852f8cb454c52cab7693dd41f608ca2a/Pyro4-4.41.tar.gz";
       md5 = "ed69e9bfafa9c06c049a87cb0c4c2b6c";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   Routes = super.buildPythonPackage {
     name = "Routes-1.13";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [repoze.lru];
     src = fetchurl {
       url = "https://pypi.python.org/packages/88/d3/259c3b3cde8837eb9441ab5f574a660e8a4acea8f54a078441d4d2acac1c/Routes-1.13.tar.gz";
       md5 = "d527b0ab7dd9172b1275a41f97448783";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   SQLAlchemy = super.buildPythonPackage {
     name = "SQLAlchemy-0.9.9";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/28/f7/1bbfd0d8597e8c358d5e15a166a486ad82fc5579b4e67b6ef7c05b1d182b/SQLAlchemy-0.9.9.tar.gz";
       md5 = "8a10a9bd13ed3336ef7333ac2cc679ff";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   Sphinx = super.buildPythonPackage {
     name = "Sphinx-1.2.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [Pygments docutils Jinja2];
     src = fetchurl {
       url = "https://pypi.python.org/packages/0a/50/34017e6efcd372893a416aba14b84a1a149fc7074537b0e9cb6ca7b7abe9/Sphinx-1.2.2.tar.gz";
       md5 = "3dc73ccaa8d0bfb2d62fb671b1f7e8a4";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   Tempita = super.buildPythonPackage {
     name = "Tempita-0.5.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/56/c8/8ed6eee83dbddf7b0fc64dd5d4454bc05e6ccaafff47991f73f2894d9ff4/Tempita-0.5.2.tar.gz";
       md5 = "4c2f17bb9d481821c41b6fbee904cea1";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   URLObject = super.buildPythonPackage {
     name = "URLObject-2.4.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/cb/b6/e25e58500f9caef85d664bec71ec67c116897bfebf8622c32cb75d1ca199/URLObject-2.4.0.tar.gz";
       md5 = "2ed819738a9f0a3051f31dc9924e3065";
     };
+    meta = {
+      license = [  ];
+    };
   };
   WebError = super.buildPythonPackage {
     name = "WebError-0.10.3";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [WebOb Tempita Pygments Paste];
     src = fetchurl {
       url = "https://pypi.python.org/packages/35/76/e7e5c2ce7e9c7f31b54c1ff295a495886d1279a002557d74dd8957346a79/WebError-0.10.3.tar.gz";
       md5 = "84b9990b0baae6fd440b1e60cdd06f9a";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   WebHelpers = super.buildPythonPackage {
     name = "WebHelpers-1.3";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [MarkupSafe];
     src = fetchurl {
       url = "https://pypi.python.org/packages/ee/68/4d07672821d514184357f1552f2dad923324f597e722de3b016ca4f7844f/WebHelpers-1.3.tar.gz";
       md5 = "32749ffadfc40fea51075a7def32588b";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   WebHelpers2 = super.buildPythonPackage {
     name = "WebHelpers2-2.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [MarkupSafe six];
     src = fetchurl {
       url = "https://pypi.python.org/packages/ff/30/56342c6ea522439e3662427c8d7b5e5b390dff4ff2dc92d8afcb8ab68b75/WebHelpers2-2.0.tar.gz";
       md5 = "0f6b68d70c12ee0aed48c00b24da13d3";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   WebOb = super.buildPythonPackage {
     name = "WebOb-1.3.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/16/78/adfc0380b8a0d75b2d543fa7085ba98a573b1ae486d9def88d172b81b9fa/WebOb-1.3.1.tar.gz";
       md5 = "20918251c5726956ba8fef22d1556177";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   WebTest = super.buildPythonPackage {
     name = "WebTest-1.4.3";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [WebOb];
     src = fetchurl {
       url = "https://pypi.python.org/packages/51/3d/84fd0f628df10b30c7db87895f56d0158e5411206b721ca903cb51bfd948/WebTest-1.4.3.zip";
       md5 = "631ce728bed92c681a4020a36adbc353";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   Whoosh = super.buildPythonPackage {
     name = "Whoosh-2.7.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/1c/dc/2f0231ff3875ded36df8c1ab851451e51a237dc0e5a86d3d96036158da94/Whoosh-2.7.0.zip";
       md5 = "7abfd970f16fadc7311960f3fa0bc7a9";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.bsd2 ];
+    };
   };
   alembic = super.buildPythonPackage {
     name = "alembic-0.8.4";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [SQLAlchemy Mako python-editor];
     src = fetchurl {
       url = "https://pypi.python.org/packages/ca/7e/299b4499b5c75e5a38c5845145ad24755bebfb8eec07a2e1c366b7181eeb/alembic-0.8.4.tar.gz";
       md5 = "5f95d8ee62b443f9b37eb5bee76c582d";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   amqplib = super.buildPythonPackage {
     name = "amqplib-1.0.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/75/b7/8c2429bf8d92354a0118614f9a4d15e53bc69ebedce534284111de5a0102/amqplib-1.0.2.tgz";
       md5 = "5c92f17fbedd99b2b4a836d4352d1e2f";
     };
+    meta = {
+      license = [ { fullName = "LGPL"; } { fullName = "GNU Library or Lesser General Public License (LGPL)"; } ];
+    };
   };
   anyjson = super.buildPythonPackage {
     name = "anyjson-0.3.3";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/c3/4d/d4089e1a3dd25b46bebdb55a992b0797cff657b4477bc32ce28038fdecbc/anyjson-0.3.3.tar.gz";
       md5 = "2ea28d6ec311aeeebaf993cb3008b27c";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   appenlight-client = super.buildPythonPackage {
     name = "appenlight-client-0.6.14";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [WebOb requests];
     src = fetchurl {
       url = "https://pypi.python.org/packages/4d/e0/23fee3ebada8143f707e65c06bcb82992040ee64ea8355e044ed55ebf0c1/appenlight_client-0.6.14.tar.gz";
       md5 = "578c69b09f4356d898fff1199b98a95c";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal { fullName = "DFSG approved"; } ];
+    };
   };
   authomatic = super.buildPythonPackage {
     name = "authomatic-0.1.0.post1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/08/1a/8a930461e604c2d5a7a871e1ac59fa82ccf994c32e807230c8d2fb07815a/Authomatic-0.1.0.post1.tar.gz";
       md5 = "be3f3ce08747d776aae6d6cc8dcb49a9";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   backport-ipaddress = super.buildPythonPackage {
     name = "backport-ipaddress-0.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/d3/30/54c6dab05a4dec44db25ff309f1fbb6b7a8bde3f2bade38bb9da67bbab8f/backport_ipaddress-0.1.tar.gz";
       md5 = "9c1f45f4361f71b124d7293a60006c05";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.psfl ];
+    };
   };
   bottle = super.buildPythonPackage {
     name = "bottle-0.12.8";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/52/df/e4a408f3a7af396d186d4ecd3b389dd764f0f943b4fa8d257bfe7b49d343/bottle-0.12.8.tar.gz";
       md5 = "13132c0a8f607bf860810a6ee9064c5b";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   bumpversion = super.buildPythonPackage {
     name = "bumpversion-0.5.3";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/14/41/8c9da3549f8e00c84f0432c3a8cf8ed6898374714676aab91501d48760db/bumpversion-0.5.3.tar.gz";
       md5 = "c66a3492eafcf5ad4b024be9fca29820";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   celery = super.buildPythonPackage {
     name = "celery-2.2.10";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [python-dateutil anyjson kombu pyparsing];
     src = fetchurl {
       url = "https://pypi.python.org/packages/b1/64/860fd50e45844c83442e7953effcddeff66b2851d90b2d784f7201c111b8/celery-2.2.10.tar.gz";
       md5 = "898bc87e54f278055b561316ba73e222";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   click = super.buildPythonPackage {
     name = "click-5.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/b7/34/a496632c4fb6c1ee76efedf77bb8d28b29363d839953d95095b12defe791/click-5.1.tar.gz";
       md5 = "9c5323008cccfe232a8b161fc8196d41";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   colander = super.buildPythonPackage {
     name = "colander-1.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [translationstring iso8601];
     src = fetchurl {
       url = "https://pypi.python.org/packages/14/23/c9ceba07a6a1dc0eefbb215fc0dc64aabc2b22ee756bc0f0c13278fa0887/colander-1.2.tar.gz";
       md5 = "83db21b07936a0726e588dae1914b9ed";
     };
+    meta = {
+      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+    };
   };
   configobj = super.buildPythonPackage {
     name = "configobj-5.0.6";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [six];
     src = fetchurl {
       url = "https://pypi.python.org/packages/64/61/079eb60459c44929e684fa7d9e2fdca403f67d64dd9dbac27296be2e0fab/configobj-5.0.6.tar.gz";
       md5 = "e472a3a1c2a67bb0ec9b5d54c13a47d6";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   cov-core = super.buildPythonPackage {
     name = "cov-core-1.15.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [coverage];
     src = fetchurl {
       url = "https://pypi.python.org/packages/4b/87/13e75a47b4ba1be06f29f6d807ca99638bedc6b57fa491cd3de891ca2923/cov-core-1.15.0.tar.gz";
       md5 = "f519d4cb4c4e52856afb14af52919fe6";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   coverage = super.buildPythonPackage {
     name = "coverage-3.7.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/09/4f/89b06c7fdc09687bca507dc411c342556ef9c5a3b26756137a4878ff19bf/coverage-3.7.1.tar.gz";
       md5 = "c47b36ceb17eaff3ecfab3bcd347d0df";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   cssselect = super.buildPythonPackage {
     name = "cssselect-0.9.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/aa/e5/9ee1460d485b94a6d55732eb7ad5b6c084caf73dd6f9cb0bb7d2a78fafe8/cssselect-0.9.1.tar.gz";
       md5 = "c74f45966277dc7a0f768b9b0f3522ac";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   decorator = super.buildPythonPackage {
     name = "decorator-3.4.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/35/3a/42566eb7a2cbac774399871af04e11d7ae3fc2579e7dae85213b8d1d1c57/decorator-3.4.2.tar.gz";
       md5 = "9e0536870d2b83ae27d58dbf22582f4d";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   docutils = super.buildPythonPackage {
     name = "docutils-0.12";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/37/38/ceda70135b9144d84884ae2fc5886c6baac4edea39550f28bcd144c1234d/docutils-0.12.tar.gz";
       md5 = "4622263b62c5c771c03502afa3157768";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.publicDomain pkgs.lib.licenses.gpl1 { fullName = "public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)"; } pkgs.lib.licenses.psfl ];
+    };
   };
   dogpile.cache = super.buildPythonPackage {
     name = "dogpile.cache-0.5.7";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [dogpile.core];
     src = fetchurl {
       url = "https://pypi.python.org/packages/07/74/2a83bedf758156d9c95d112691bbad870d3b77ccbcfb781b4ef836ea7d96/dogpile.cache-0.5.7.tar.gz";
       md5 = "3e58ce41af574aab41d78e9c4190f194";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   dogpile.core = super.buildPythonPackage {
     name = "dogpile.core-0.4.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/0e/77/e72abc04c22aedf874301861e5c1e761231c288b5de369c18be8f4b5c9bb/dogpile.core-0.4.1.tar.gz";
       md5 = "01cb19f52bba3e95c9b560f39341f045";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   dulwich = super.buildPythonPackage {
     name = "dulwich-0.12.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/6f/04/fbe561b6d45c0ec758330d5b7f5ba4b6cb4f1ca1ab49859d2fc16320da75/dulwich-0.12.0.tar.gz";
       md5 = "f3a8a12bd9f9dd8c233e18f3d49436fa";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.gpl2Plus ];
+    };
   };
   ecdsa = super.buildPythonPackage {
     name = "ecdsa-0.11";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/6c/3f/92fe5dcdcaa7bd117be21e5520c9a54375112b66ec000d209e9e9519fad1/ecdsa-0.11.tar.gz";
       md5 = "8ef586fe4dbb156697d756900cb41d7c";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   elasticsearch = super.buildPythonPackage {
     name = "elasticsearch-2.3.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [urllib3];
     src = fetchurl {
       url = "https://pypi.python.org/packages/10/35/5fd52c5f0b0ee405ed4b5195e8bce44c5e041787680dc7b94b8071cac600/elasticsearch-2.3.0.tar.gz";
       md5 = "2550f3b51629cf1ef9636608af92c340";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.asl20 ];
+    };
   };
   elasticsearch-dsl = super.buildPythonPackage {
     name = "elasticsearch-dsl-2.0.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [six python-dateutil elasticsearch];
     src = fetchurl {
       url = "https://pypi.python.org/packages/4e/5d/e788ae8dbe2ff4d13426db0a027533386a5c276c77a2654dc0e2007ce04a/elasticsearch-dsl-2.0.0.tar.gz";
       md5 = "4cdfec81bb35383dd3b7d02d7dc5ee68";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.asl20 ];
+    };
   };
   flake8 = super.buildPythonPackage {
     name = "flake8-2.4.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [pyflakes pep8 mccabe];
     src = fetchurl {
       url = "https://pypi.python.org/packages/8f/b5/9a73c66c7dba273bac8758398f060c008a25f3e84531063b42503b5d0a95/flake8-2.4.1.tar.gz";
       md5 = "ed45d3db81a3b7c88bd63c6e37ca1d65";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   future = super.buildPythonPackage {
     name = "future-0.14.3";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/83/80/8ef3a11a15f8eaafafa0937b20c1b3f73527e69ab6b3fa1cf94a5a96aabb/future-0.14.3.tar.gz";
       md5 = "e94079b0bd1fc054929e8769fc0f6083";
     };
+    meta = {
+      license = [ { fullName = "OSI Approved"; } pkgs.lib.licenses.mit ];
+    };
   };
   futures = super.buildPythonPackage {
     name = "futures-3.0.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/f8/e7/fc0fcbeb9193ba2d4de00b065e7fd5aecd0679e93ce95a07322b2b1434f4/futures-3.0.2.tar.gz";
       md5 = "42aaf1e4de48d6e871d77dc1f9d96d5a";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   gnureadline = super.buildPythonPackage {
     name = "gnureadline-6.3.3";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/3a/ee/2c3f568b0a74974791ac590ec742ef6133e2fbd287a074ba72a53fa5e97c/gnureadline-6.3.3.tar.gz";
       md5 = "c4af83c9a3fbeac8f2da9b5a7c60e51c";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.gpl1 ];
+    };
   };
   gprof2dot = super.buildPythonPackage {
-    name = "gprof2dot-2015.12.01";
+    name = "gprof2dot-2015.12.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/b9/34/7bf93c1952d40fa5c95ad963f4d8344b61ef58558632402eca18e6c14127/gprof2dot-2015.12.1.tar.gz";
       md5 = "e23bf4e2f94db032750c193384b4165b";
     };
+    meta = {
+      license = [ { fullName = "LGPL"; } ];
+    };
   };
   greenlet = super.buildPythonPackage {
     name = "greenlet-0.4.9";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/4e/3d/9d421539b74e33608b245092870156b2e171fb49f2b51390aa4641eecb4a/greenlet-0.4.9.zip";
       md5 = "c6659cdb2a5e591723e629d2eef22e82";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   gunicorn = super.buildPythonPackage {
     name = "gunicorn-19.6.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/84/ce/7ea5396efad1cef682bbc4068e72a0276341d9d9d0f501da609fab9fcb80/gunicorn-19.6.0.tar.gz";
       md5 = "338e5e8a83ea0f0625f768dba4597530";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   infrae.cache = super.buildPythonPackage {
     name = "infrae.cache-1.0.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [Beaker repoze.lru];
     src = fetchurl {
       url = "https://pypi.python.org/packages/bb/f0/e7d5e984cf6592fd2807dc7bc44a93f9d18e04e6a61f87fdfb2622422d74/infrae.cache-1.0.1.tar.gz";
       md5 = "b09076a766747e6ed2a755cc62088e32";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.zpt21 ];
+    };
   };
   invoke = super.buildPythonPackage {
-    name = "invoke-0.11.1";
+    name = "invoke-0.13.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/d3/bb/36a5558ea19882073def7b0edeef4a0e6282056fed96506dd10b1d532bd4/invoke-0.11.1.tar.gz";
-      md5 = "3d4ecbe26779ceef1046ecf702c9c4a8";
+      url = "https://pypi.python.org/packages/47/bf/d07ef52fa1ac645468858bbac7cb95b246a972a045e821493d17d89c81be/invoke-0.13.0.tar.gz";
+      md5 = "c0d1ed4bfb34eaab551662d8cfee6540";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
   ipdb = super.buildPythonPackage {
     name = "ipdb-0.8";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [ipython];
     src = fetchurl {
       url = "https://pypi.python.org/packages/f0/25/d7dd430ced6cd8dc242a933c8682b5dbf32eb4011d82f87e34209e5ec845/ipdb-0.8.zip";
       md5 = "96dca0712efa01aa5eaf6b22071dd3ed";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.gpl1 ];
+    };
   };
   ipython = super.buildPythonPackage {
     name = "ipython-3.1.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/06/91/120c0835254c120af89f066afaabf81289bc2726c1fc3ca0555df6882f58/ipython-3.1.0.tar.gz";
       md5 = "a749d90c16068687b0ec45a27e72ef8f";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   iso8601 = super.buildPythonPackage {
     name = "iso8601-0.1.11";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/c0/75/c9209ee4d1b5975eb8c2cba4428bde6b61bd55664a98290dd015cdb18e98/iso8601-0.1.11.tar.gz";
       md5 = "b06d11cd14a64096f907086044f0fe38";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   itsdangerous = super.buildPythonPackage {
     name = "itsdangerous-0.24";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/dc/b4/a60bcdba945c00f6d608d8975131ab3f25b22f2bcfe1dab221165194b2d4/itsdangerous-0.24.tar.gz";
       md5 = "a3d55aa79369aef5345c036a8a26307f";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   kombu = super.buildPythonPackage {
     name = "kombu-1.5.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [anyjson amqplib];
     src = fetchurl {
       url = "https://pypi.python.org/packages/19/53/74bf2a624644b45f0850a638752514fc10a8e1cbd738f10804951a6df3f5/kombu-1.5.1.tar.gz";
       md5 = "50662f3c7e9395b3d0721fb75d100b63";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   lxml = super.buildPythonPackage {
     name = "lxml-3.4.4";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/63/c7/4f2a2a4ad6c6fa99b14be6b3c1cece9142e2d915aa7c43c908677afc8fa4/lxml-3.4.4.tar.gz";
       md5 = "a9a65972afc173ec7a39c585f4eea69c";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   mccabe = super.buildPythonPackage {
     name = "mccabe-0.3";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/c9/2e/75231479e11a906b64ac43bad9d0bb534d00080b18bdca8db9da46e1faf7/mccabe-0.3.tar.gz";
       md5 = "81640948ff226f8c12b3277059489157";
     };
+    meta = {
+      license = [ { fullName = "Expat license"; } pkgs.lib.licenses.mit ];
+    };
   };
   meld3 = super.buildPythonPackage {
     name = "meld3-1.0.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/45/a0/317c6422b26c12fe0161e936fc35f36552069ba8e6f7ecbd99bbffe32a5f/meld3-1.0.2.tar.gz";
       md5 = "3ccc78cd79cffd63a751ad7684c02c91";
     };
+    meta = {
+      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+    };
   };
   mock = super.buildPythonPackage {
     name = "mock-1.0.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/15/45/30273ee91feb60dabb8fbb2da7868520525f02cf910279b3047182feed80/mock-1.0.1.zip";
       md5 = "869f08d003c289a97c1a6610faf5e913";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   msgpack-python = super.buildPythonPackage {
     name = "msgpack-python-0.4.6";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/15/ce/ff2840885789ef8035f66cd506ea05bdb228340307d5e71a7b1e3f82224c/msgpack-python-0.4.6.tar.gz";
       md5 = "8b317669314cf1bc881716cccdaccb30";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.asl20 ];
+    };
   };
   nose = super.buildPythonPackage {
     name = "nose-1.3.6";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/70/c7/469e68148d17a0d3db5ed49150242fd70a74a8147b8f3f8b87776e028d99/nose-1.3.6.tar.gz";
       md5 = "0ca546d81ca8309080fc80cb389e7a16";
     };
+    meta = {
+      license = [ { fullName = "GNU Library or Lesser General Public License (LGPL)"; } { fullName = "GNU LGPL"; } ];
+    };
   };
   objgraph = super.buildPythonPackage {
     name = "objgraph-2.0.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";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   packaging = super.buildPythonPackage {
     name = "packaging-15.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/24/c4/185da1304f07047dc9e0c46c31db75c0351bd73458ac3efad7da3dbcfbe1/packaging-15.2.tar.gz";
       md5 = "c16093476f6ced42128bf610e5db3784";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.asl20 ];
+    };
   };
   paramiko = super.buildPythonPackage {
     name = "paramiko-1.15.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [pycrypto ecdsa];
     src = fetchurl {
       url = "https://pypi.python.org/packages/04/2b/a22d2a560c1951abbbf95a0628e245945565f70dc082d9e784666887222c/paramiko-1.15.1.tar.gz";
       md5 = "48c274c3f9b1282932567b21f6acf3b5";
     };
+    meta = {
+      license = [ { fullName = "LGPL"; } { fullName = "GNU Library or Lesser General Public License (LGPL)"; } ];
+    };
   };
   pep8 = super.buildPythonPackage {
     name = "pep8-1.5.7";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/8b/de/259f5e735897ada1683489dd514b2a1c91aaa74e5e6b68f80acf128a6368/pep8-1.5.7.tar.gz";
       md5 = "f6adbdd69365ecca20513c709f9b7c93";
     };
+    meta = {
+      license = [ { fullName = "Expat license"; } pkgs.lib.licenses.mit ];
+    };
   };
   psutil = super.buildPythonPackage {
     name = "psutil-2.2.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/df/47/ee54ef14dd40f8ce831a7581001a5096494dc99fe71586260ca6b531fe86/psutil-2.2.1.tar.gz";
       md5 = "1a2b58cd9e3a53528bb6148f0c4d5244";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   psycopg2 = super.buildPythonPackage {
     name = "psycopg2-2.6";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/dd/c7/9016ff8ff69da269b1848276eebfb264af5badf6b38caad805426771f04d/psycopg2-2.6.tar.gz";
       md5 = "fbbb039a8765d561a1c04969bbae7c74";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.zpt21 { fullName = "GNU Library or Lesser General Public License (LGPL)"; } { fullName = "LGPL with exceptions or ZPL"; } ];
+    };
   };
   py = super.buildPythonPackage {
     name = "py-1.4.29";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/2a/bc/a1a4a332ac10069b8e5e25136a35e08a03f01fd6ab03d819889d79a1fd65/py-1.4.29.tar.gz";
       md5 = "c28e0accba523a29b35a48bb703fb96c";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   py-bcrypt = super.buildPythonPackage {
     name = "py-bcrypt-0.4";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/68/b1/1c3068c5c4d2e35c48b38dcc865301ebfdf45f54507086ac65ced1fd3b3d/py-bcrypt-0.4.tar.gz";
       md5 = "dd8b367d6b716a2ea2e72392525f4e36";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   pycrypto = super.buildPythonPackage {
     name = "pycrypto-2.6.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/60/db/645aa9af249f059cc3a368b118de33889219e0362141e75d4eaf6f80f163/pycrypto-2.6.1.tar.gz";
       md5 = "55a61a054aa66812daf5161a0d5d7eda";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.publicDomain ];
+    };
   };
   pycurl = super.buildPythonPackage {
     name = "pycurl-7.19.5";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/6c/48/13bad289ef6f4869b1d8fc11ae54de8cfb3cc4a2eb9f7419c506f763be46/pycurl-7.19.5.tar.gz";
       md5 = "47b4eac84118e2606658122104e62072";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit { fullName = "LGPL/MIT"; } { fullName = "GNU Library or Lesser General Public License (LGPL)"; } ];
+    };
   };
   pyflakes = super.buildPythonPackage {
     name = "pyflakes-0.8.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/75/22/a90ec0252f4f87f3ffb6336504de71fe16a49d69c4538dae2f12b9360a38/pyflakes-0.8.1.tar.gz";
       md5 = "905fe91ad14b912807e8fdc2ac2e2c23";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   pyparsing = super.buildPythonPackage {
     name = "pyparsing-1.5.7";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/2e/26/e8fb5b4256a5f5036be7ce115ef8db8d06bc537becfbdc46c6af008314ee/pyparsing-1.5.7.zip";
       md5 = "b86854857a368d6ccb4d5b6e76d0637f";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   pyramid = super.buildPythonPackage {
     name = "pyramid-1.6.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [setuptools WebOb repoze.lru zope.interface zope.deprecation venusian translationstring PasteDeploy];
     src = fetchurl {
       url = "https://pypi.python.org/packages/30/b3/fcc4a2a4800cbf21989e00454b5828cf1f7fe35c63e0810b350e56d4c475/pyramid-1.6.1.tar.gz";
       md5 = "b18688ff3cc33efdbb098a35b45dd122";
     };
+    meta = {
+      license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+    };
   };
   pyramid-beaker = super.buildPythonPackage {
     name = "pyramid-beaker-0.8";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [pyramid Beaker];
     src = fetchurl {
       url = "https://pypi.python.org/packages/d9/6e/b85426e00fd3d57f4545f74e1c3828552d8700f13ededeef9233f7bca8be/pyramid_beaker-0.8.tar.gz";
       md5 = "22f14be31b06549f80890e2c63a93834";
     };
+    meta = {
+      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+    };
   };
   pyramid-debugtoolbar = super.buildPythonPackage {
     name = "pyramid-debugtoolbar-2.4.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [pyramid pyramid-mako repoze.lru Pygments];
     src = fetchurl {
       url = "https://pypi.python.org/packages/89/00/ed5426ee41ed747ba3ffd30e8230841a6878286ea67d480b1444d24f06a2/pyramid_debugtoolbar-2.4.2.tar.gz";
       md5 = "073ea67086cc4bd5decc3a000853642d";
     };
+    meta = {
+      license = [ { fullName = "Repoze Public License"; } pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   pyramid-jinja2 = super.buildPythonPackage {
     name = "pyramid-jinja2-2.5";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [pyramid zope.deprecation Jinja2 MarkupSafe];
     src = fetchurl {
       url = "https://pypi.python.org/packages/a1/80/595e26ffab7deba7208676b6936b7e5a721875710f982e59899013cae1ed/pyramid_jinja2-2.5.tar.gz";
       md5 = "07cb6547204ac5e6f0b22a954ccee928";
     };
+    meta = {
+      license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+    };
   };
   pyramid-mako = super.buildPythonPackage {
     name = "pyramid-mako-1.0.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [pyramid Mako];
     src = fetchurl {
       url = "https://pypi.python.org/packages/f1/92/7e69bcf09676d286a71cb3bbb887b16595b96f9ba7adbdc239ffdd4b1eb9/pyramid_mako-1.0.2.tar.gz";
       md5 = "ee25343a97eb76bd90abdc2a774eb48a";
     };
+    meta = {
+      license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+    };
   };
   pysqlite = super.buildPythonPackage {
     name = "pysqlite-2.6.3";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/5c/a6/1c429cd4c8069cf4bfbd0eb4d592b3f4042155a8202df83d7e9b93aa3dc2/pysqlite-2.6.3.tar.gz";
       md5 = "7ff1cedee74646b50117acff87aa1cfa";
     };
+    meta = {
+      license = [ { fullName = "zlib/libpng License"; } { fullName = "zlib/libpng license"; } ];
+    };
   };
   pytest = super.buildPythonPackage {
     name = "pytest-2.8.5";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [py];
     src = fetchurl {
       url = "https://pypi.python.org/packages/b1/3d/d7ea9b0c51e0cacded856e49859f0a13452747491e842c236bbab3714afe/pytest-2.8.5.zip";
       md5 = "8493b06f700862f1294298d6c1b715a9";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   pytest-catchlog = super.buildPythonPackage {
     name = "pytest-catchlog-1.2.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [py pytest];
     src = fetchurl {
       url = "https://pypi.python.org/packages/f2/2b/2faccdb1a978fab9dd0bf31cca9f6847fbe9184a0bdcc3011ac41dd44191/pytest-catchlog-1.2.2.zip";
       md5 = "09d890c54c7456c818102b7ff8c182c8";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   pytest-cov = super.buildPythonPackage {
     name = "pytest-cov-1.8.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [py pytest coverage cov-core];
     src = fetchurl {
       url = "https://pypi.python.org/packages/11/4b/b04646e97f1721878eb21e9f779102d84dd044d324382263b1770a3e4838/pytest-cov-1.8.1.tar.gz";
       md5 = "76c778afa2494088270348be42d759fc";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   pytest-profiling = super.buildPythonPackage {
     name = "pytest-profiling-1.0.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [six pytest gprof2dot];
     src = fetchurl {
       url = "https://pypi.python.org/packages/d8/67/8ffab73406e22870e07fa4dc8dce1d7689b26dba8efd00161c9b6fc01ec0/pytest-profiling-1.0.1.tar.gz";
       md5 = "354404eb5b3fd4dc5eb7fffbb3d9b68b";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   pytest-runner = super.buildPythonPackage {
     name = "pytest-runner-2.7.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/99/6b/c4ff4418d3424d4475b7af60724fd4a5cdd91ed8e489dc9443281f0052bc/pytest-runner-2.7.1.tar.gz";
       md5 = "e56f0bc8d79a6bd91772b44ef4215c7e";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   pytest-timeout = super.buildPythonPackage {
     name = "pytest-timeout-0.4";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [pytest];
     src = fetchurl {
       url = "https://pypi.python.org/packages/24/48/5f6bd4b8026a26e1dd427243d560a29a0f1b24a5c7cffca4bf049a7bb65b/pytest-timeout-0.4.tar.gz";
       md5 = "03b28aff69cbbfb959ed35ade5fde262";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit { fullName = "DFSG approved"; } ];
+    };
   };
   python-dateutil = super.buildPythonPackage {
     name = "python-dateutil-1.5";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/b4/7c/df59c89a753eb33c7c44e1dd42de0e9bc2ccdd5a4d576e0bfad97cc280cb/python-dateutil-1.5.tar.gz";
       md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.psfl ];
+    };
   };
   python-editor = super.buildPythonPackage {
     name = "python-editor-1.0.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/2b/c0/df7b87d5cf016f82eab3b05cd35f53287c1178ad8c42bfb6fa61b89b22f6/python-editor-1.0.1.tar.gz";
       md5 = "e1fa63535b40e022fa4fd646fd8b511a";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.asl20 ];
+    };
   };
   python-ldap = super.buildPythonPackage {
     name = "python-ldap-2.4.19";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [setuptools];
     src = fetchurl {
       url = "https://pypi.python.org/packages/42/81/1b64838c82e64f14d4e246ff00b52e650a35c012551b891ada2b85d40737/python-ldap-2.4.19.tar.gz";
       md5 = "b941bf31d09739492aa19ef679e94ae3";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.psfl ];
+    };
   };
   python-memcached = super.buildPythonPackage {
     name = "python-memcached-1.57";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [six];
     src = fetchurl {
       url = "https://pypi.python.org/packages/52/9d/eebc0dcbc5c7c66840ad207dfc1baa376dadb74912484bff73819cce01e6/python-memcached-1.57.tar.gz";
       md5 = "de21f64b42b2d961f3d4ad7beb5468a1";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.psfl ];
+    };
   };
   python-pam = super.buildPythonPackage {
     name = "python-pam-1.8.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/de/8c/f8f5d38b4f26893af267ea0b39023d4951705ab0413a39e0cf7cf4900505/python-pam-1.8.2.tar.gz";
       md5 = "db71b6b999246fb05d78ecfbe166629d";
     };
+    meta = {
+      license = [ { fullName = "License :: OSI Approved :: MIT License"; } pkgs.lib.licenses.mit ];
+    };
   };
   pytz = super.buildPythonPackage {
     name = "pytz-2015.4";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/7e/1a/f43b5c92df7b156822030fed151327ea096bcf417e45acc23bd1df43472f/pytz-2015.4.zip";
       md5 = "233f2a2b370d03f9b5911700cc9ebf3c";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   pyzmq = super.buildPythonPackage {
     name = "pyzmq-14.6.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/8a/3b/5463d5a9d712cd8bbdac335daece0d69f6a6792da4e3dd89956c0db4e4e6/pyzmq-14.6.0.tar.gz";
       md5 = "395b5de95a931afa5b14c9349a5b8024";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal { fullName = "LGPL+BSD"; } { fullName = "GNU Library or Lesser General Public License (LGPL)"; } ];
+    };
   };
   recaptcha-client = super.buildPythonPackage {
     name = "recaptcha-client-1.0.6";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/0a/ea/5f2fbbfd894bdac1c68ef8d92019066cfcf9fbff5fe3d728d2b5c25c8db4/recaptcha-client-1.0.6.tar.gz";
       md5 = "74228180f7e1fb76c4d7089160b0d919";
     };
+    meta = {
+      license = [ { fullName = "MIT/X11"; } ];
+    };
   };
   repoze.lru = super.buildPythonPackage {
     name = "repoze.lru-0.6";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/6e/1e/aa15cc90217e086dc8769872c8778b409812ff036bf021b15795638939e4/repoze.lru-0.6.tar.gz";
       md5 = "2c3b64b17a8e18b405f55d46173e14dd";
     };
+    meta = {
+      license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+    };
   };
   requests = super.buildPythonPackage {
     name = "requests-2.9.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/f9/6d/07c44fb1ebe04d069459a189e7dab9e4abfe9432adcd4477367c25332748/requests-2.9.1.tar.gz";
       md5 = "0b7f480d19012ec52bab78292efd976d";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.asl20 ];
+    };
   };
   rhodecode-enterprise-ce = super.buildPythonPackage {
-    name = "rhodecode-enterprise-ce-4.1.2";
+    name = "rhodecode-enterprise-ce-4.2.0";
     buildInputs = with self; [WebTest configobj cssselect flake8 lxml mock pytest pytest-cov pytest-runner];
     doCheck = true;
     propagatedBuildInputs = with self; [Babel Beaker FormEncode Mako Markdown MarkupSafe MySQL-python Paste PasteDeploy PasteScript Pygments Pylons Pyro4 Routes SQLAlchemy Tempita URLObject WebError WebHelpers WebHelpers2 WebOb WebTest Whoosh alembic amqplib anyjson appenlight-client authomatic backport-ipaddress celery colander decorator docutils gunicorn infrae.cache ipython iso8601 kombu msgpack-python packaging psycopg2 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 waitress zope.cachedescriptors psutil py-bcrypt];
     src = ./.;
+    meta = {
+      license = [ { fullName = "AGPLv3, and Commercial License"; } ];
+    };
   };
   rhodecode-tools = super.buildPythonPackage {
     name = "rhodecode-tools-0.8.3";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [click future six Mako MarkupSafe requests Whoosh elasticsearch elasticsearch-dsl];
     src = fetchurl {
       url = "https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.8.3.zip";
       md5 = "9acdfd71b8ddf4056057065f37ab9ccb";
     };
+    meta = {
+      license = [ { fullName = "AGPLv3 and Proprietary"; } ];
+    };
   };
   serpent = super.buildPythonPackage {
     name = "serpent-1.12";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/3b/19/1e0e83b47c09edaef8398655088036e7e67386b5c48770218ebb339fbbd5/serpent-1.12.tar.gz";
       md5 = "05869ac7b062828b34f8f927f0457b65";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   setproctitle = super.buildPythonPackage {
     name = "setproctitle-1.1.8";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/33/c3/ad367a4f4f1ca90468863ae727ac62f6edb558fc09a003d344a02cfc6ea6/setproctitle-1.1.8.tar.gz";
       md5 = "728f4c8c6031bbe56083a48594027edd";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
   };
   setuptools = super.buildPythonPackage {
     name = "setuptools-20.8.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/c4/19/c1bdc88b53da654df43770f941079dbab4e4788c2dcb5658fb86259894c7/setuptools-20.8.1.zip";
       md5 = "fe58a5cac0df20bb83942b252a4b0543";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   setuptools-scm = super.buildPythonPackage {
     name = "setuptools-scm-1.11.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/cd/5f/e3a038292358058d83d764a47d09114aa5a8003ed4529518f9e580f1a94f/setuptools_scm-1.11.0.tar.gz";
       md5 = "4c5c896ba52e134bbc3507bac6400087";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   simplejson = super.buildPythonPackage {
     name = "simplejson-3.7.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/6d/89/7f13f099344eea9d6722779a1f165087cb559598107844b1ac5dbd831fb1/simplejson-3.7.2.tar.gz";
       md5 = "a5fc7d05d4cb38492285553def5d4b46";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit pkgs.lib.licenses.afl21 ];
+    };
   };
   six = super.buildPythonPackage {
     name = "six-1.9.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/16/64/1dc5e5976b17466fd7d712e59cbe9fb1e18bec153109e5ba3ed6c9102f1a/six-1.9.0.tar.gz";
       md5 = "476881ef4012262dfc8adc645ee786c4";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   subprocess32 = super.buildPythonPackage {
     name = "subprocess32-3.2.6";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/28/8d/33ccbff51053f59ae6c357310cac0e79246bbed1d345ecc6188b176d72c3/subprocess32-3.2.6.tar.gz";
       md5 = "754c5ab9f533e764f931136974b618f1";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.psfl ];
+    };
   };
   supervisor = super.buildPythonPackage {
     name = "supervisor-3.1.3";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [meld3];
     src = fetchurl {
       url = "https://pypi.python.org/packages/a6/41/65ad5bd66230b173eb4d0b8810230f3a9c59ef52ae066e540b6b99895db7/supervisor-3.1.3.tar.gz";
       md5 = "aad263c4fbc070de63dd354864d5e552";
     };
+    meta = {
+      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+    };
   };
   transifex-client = super.buildPythonPackage {
     name = "transifex-client-0.10";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/f3/4e/7b925192aee656fb3e04fa6381c8b3dc40198047c3b4a356f6cfd642c809/transifex-client-0.10.tar.gz";
       md5 = "5549538d84b8eede6b254cd81ae024fa";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.gpl2 ];
+    };
   };
   translationstring = super.buildPythonPackage {
     name = "translationstring-1.3";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/5e/eb/bee578cc150b44c653b63f5ebe258b5d0d812ddac12497e5f80fcad5d0b4/translationstring-1.3.tar.gz";
       md5 = "a4b62e0f3c189c783a1685b3027f7c90";
     };
+    meta = {
+      license = [ { fullName = "BSD-like (http://repoze.org/license.html)"; } ];
+    };
   };
   trollius = super.buildPythonPackage {
     name = "trollius-1.0.4";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [futures];
     src = fetchurl {
       url = "https://pypi.python.org/packages/aa/e6/4141db437f55e6ee7a3fb69663239e3fde7841a811b4bef293145ad6c836/trollius-1.0.4.tar.gz";
       md5 = "3631a464d49d0cbfd30ab2918ef2b783";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.asl20 ];
+    };
   };
   uWSGI = super.buildPythonPackage {
     name = "uWSGI-2.0.11.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/9b/78/918db0cfab0546afa580c1e565209c49aaf1476bbfe491314eadbe47c556/uwsgi-2.0.11.2.tar.gz";
       md5 = "1f02dcbee7f6f61de4b1fd68350cf16f";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.gpl2 ];
+    };
   };
   urllib3 = super.buildPythonPackage {
     name = "urllib3-1.16";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/3b/f0/e763169124e3f5db0926bc3dbfcd580a105f9ca44cf5d8e6c7a803c9f6b5/urllib3-1.16.tar.gz";
       md5 = "fcaab1c5385c57deeb7053d3d7d81d59";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
   };
   venusian = super.buildPythonPackage {
     name = "venusian-1.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/86/20/1948e0dfc4930ddde3da8c33612f6a5717c0b4bc28f591a5c5cf014dd390/venusian-1.0.tar.gz";
       md5 = "dccf2eafb7113759d60c86faf5538756";
     };
+    meta = {
+      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+    };
   };
   waitress = super.buildPythonPackage {
     name = "waitress-0.8.9";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [setuptools];
     src = fetchurl {
       url = "https://pypi.python.org/packages/ee/65/fc9dee74a909a1187ca51e4f15ad9c4d35476e4ab5813f73421505c48053/waitress-0.8.9.tar.gz";
       md5 = "da3f2e62b3676be5dd630703a68e2a04";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.zpt21 ];
+    };
   };
   wsgiref = super.buildPythonPackage {
     name = "wsgiref-0.1.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
       url = "https://pypi.python.org/packages/41/9e/309259ce8dff8c596e8c26df86dbc4e848b9249fd36797fd60be456f03fc/wsgiref-0.1.2.zip";
       md5 = "29b146e6ebd0f9fb119fe321f7bcf6cb";
     };
+    meta = {
+      license = [ { fullName = "PSF or ZPL"; } ];
+    };
   };
   zope.cachedescriptors = super.buildPythonPackage {
     name = "zope.cachedescriptors-4.0.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [setuptools];
     src = fetchurl {
       url = "https://pypi.python.org/packages/40/33/694b6644c37f28553f4b9f20b3c3a20fb709a22574dff20b5bdffb09ecd5/zope.cachedescriptors-4.0.0.tar.gz";
       md5 = "8d308de8c936792c8e758058fcb7d0f0";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.zpt21 ];
+    };
   };
   zope.deprecation = super.buildPythonPackage {
     name = "zope.deprecation-4.1.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [setuptools];
     src = fetchurl {
       url = "https://pypi.python.org/packages/c1/d3/3919492d5e57d8dd01b36f30b34fc8404a30577392b1eb817c303499ad20/zope.deprecation-4.1.2.tar.gz";
       md5 = "e9a663ded58f4f9f7881beb56cae2782";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.zpt21 ];
+    };
   };
   zope.event = super.buildPythonPackage {
     name = "zope.event-4.0.3";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [setuptools];
     src = fetchurl {
       url = "https://pypi.python.org/packages/c1/29/91ba884d7d6d96691df592e9e9c2bfa57a47040ec1ff47eff18c85137152/zope.event-4.0.3.tar.gz";
       md5 = "9a3780916332b18b8b85f522bcc3e249";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.zpt21 ];
+    };
   };
   zope.interface = super.buildPythonPackage {
     name = "zope.interface-4.1.3";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [setuptools];
     src = fetchurl {
       url = "https://pypi.python.org/packages/9d/81/2509ca3c6f59080123c1a8a97125eb48414022618cec0e64eb1313727bfe/zope.interface-4.1.3.tar.gz";
       md5 = "9ae3d24c0c7415deb249dd1a132f0f79";
     };
+    meta = {
+      license = [ pkgs.lib.licenses.zpt21 ];
+    };
   };
 
 ### Test requirements
 
   
 }

release.nix

@@ -1,231 +1,232 b''
 #
 # About
 # =====
 #
 # This file defines jobs for our CI system and the attribute "build" is used
 # as the input for packaging.
 #
 #
 # CI details
 # ==========
 #
 # This file defines an attribute set of derivations. Each of these attributes is
 # then used in our CI system as one job to run. This way we keep the
 # configuration for the CI jobs as well under version control.
 #
 # Run CI jobs locally
 # -------------------
 #
 # Since it is all based on normal Nix derivations, the jobs can be tested
 # locally with a run of "nix-build" like the following example:
 #
 #    nix-build release.nix -A test-api -I vcsserver=~/rhodecode-vcsserver
 #
 # Note: Replace "~/rhodecode-vcsserver" with a path where a clone of the
 # vcsserver resides.
 
 { pkgs ? import <nixpkgs> {}
+, doCheck ? true
 }:
 
 let
 
   inherit (pkgs)
     stdenv
     system;
 
   testing = import <nixpkgs/nixos/lib/testing.nix> {
     inherit system;
   };
 
   runInMachine = testing.runInMachine;
 
   sphinx = import ./docs/default.nix {};
 
   mkDocs = kind: stdenv.mkDerivation {
     name = kind;
     srcs = [
       (./. + (builtins.toPath "/${kind}"))
       (builtins.filterSource
         (path: type: baseNameOf path == "VERSION")
         ./rhodecode)
     ];
     sourceRoot = kind;
     buildInputs = [ sphinx ];
     configurePhase = null;
     buildPhase = ''
       make SPHINXBUILD=sphinx-build html
     '';
     installPhase = ''
       mkdir -p $out
       mv _build/html $out/
 
       mkdir -p $out/nix-support
       echo "doc manual $out/html index.html" >> \
         "$out/nix-support/hydra-build-products"
     '';
   };
 
   enterprise = import ./default.nix {
     inherit
       pkgs;
 
     # TODO: for quick local testing
     doCheck = false;
   };
 
   test-cfg = stdenv.mkDerivation {
     name = "test-cfg";
     unpackPhase = "true";
     buildInputs = [
       enterprise.src
     ];
     installPhase = ''
       mkdir -p $out/etc
       cp ${enterprise.src}/test.ini $out/etc/enterprise.ini
       # TODO: johbo: Needed, so that the login works, this causes
       # probably some side effects
       substituteInPlace $out/etc/enterprise.ini --replace "is_test = True" ""
 
       # Gevent configuration
       cp $out/etc/enterprise.ini $out/etc/enterprise-gevent.ini;
       cat >> $out/etc/enterprise-gevent.ini <<EOF
 
       [server:main]
       use = egg:gunicorn#main
       worker_class = gevent
       EOF
 
       cp ${enterprise.src}/vcsserver/test.ini $out/etc/vcsserver.ini
     '';
   };
 
   ac-test-drv = import ./acceptance_tests {
     withExternals = false;
   };
 
   # TODO: johbo: Currently abusing buildPythonPackage to make the
   # needed environment for the ac-test tools.
   mkAcTests = {
     # Path to an INI file which will be used to run Enterprise.
     #
     # Intended usage is to provide different configuration files to
     # run the tests against a different configuration.
     enterpriseCfg ? "${test-cfg}/etc/enterprise.ini"
 
     # Path to an INI file which will be used to run the VCSServer.
   , vcsserverCfg ? "${test-cfg}/etc/vcsserver.ini"
   }: pkgs.pythonPackages.buildPythonPackage {
     name = "enterprise-ac-tests";
     src = ./acceptance_tests;
 
     buildInputs = with pkgs; [
       curl
       enterprise
       ac-test-drv
     ];
 
     buildPhase = ''
       cp ${enterpriseCfg} enterprise.ini
 
       echo "Creating a fake home directory"
       mkdir fake-home
       export HOME=$PWD/fake-home
 
       echo "Creating a repository directory"
       mkdir repos
 
       echo "Preparing the database"
       paster setup-rhodecode \
         --user=admin \
         --email=[e-mail] \
         --password=secret \
         --api-key=9999999999999999999999999999999999999999 \
         --force-yes \
         --repos=$PWD/repos \
         enterprise.ini > /dev/null
 
       echo "Starting rcserver"
       vcsserver --config ${vcsserverCfg} >vcsserver.log 2>&1 &
       rcserver enterprise.ini >rcserver.log 2>&1 &
 
       while ! curl -f -s http://localhost:5000 > /dev/null
       do
           echo "Waiting for server to be ready..."
           sleep 3
       done
       echo "Webserver is ready."
 
       echo "Starting the test run"
       py.test -c example.ini -vs --maxfail=5 tests
 
       echo "Kill rcserver"
       kill %2
       kill %1
     '';
 
     # TODO: johbo: Use the install phase again once the normal mkDerivation
     # can be used again.
     postInstall = ''
       mkdir -p $out
       cp enterprise.ini $out
       cp ${vcsserverCfg} $out/vcsserver.ini
       cp rcserver.log $out
       cp vcsserver.log $out
 
       mkdir -p $out/nix-support
       echo "report config $out enterprise.ini" >> $out/nix-support/hydra-build-products
       echo "report config $out vcsserver.ini" >> $out/nix-support/hydra-build-products
       echo "report rcserver $out rcserver.log" >> $out/nix-support/hydra-build-products
       echo "report vcsserver $out vcsserver.log" >> $out/nix-support/hydra-build-products
     '';
   };
 
   vcsserver = import <vcsserver> {
     inherit pkgs;
 
     # TODO: johbo: Think of a more elegant solution to this problem
     pythonExternalOverrides = self: super: (enterprise.myPythonPackagesUnfix self);
   };
 
   runTests = optionString: (enterprise.override (attrs: {
     doCheck = true;
     name = "test-run";
     buildInputs = attrs.buildInputs ++ [
       vcsserver
     ];
     checkPhase = ''
       py.test ${optionString} -vv -ra
     '';
     buildPhase = attrs.shellHook;
     installPhase = ''
       echo "Intentionally not installing anything"
     '';
     meta.description = "Enterprise test run ${optionString}";
   }));
 
   jobs = {
 
     build = enterprise;
 
     # johbo: Currently this is simply running the tests against the sources. Nicer
     # would be to run xdist and against the installed application, so that we also
     # cover the impact of installing the application.
     test-api = runTests "rhodecode/api";
     test-functional = runTests "rhodecode/tests/functional";
     test-rest = runTests "rhodecode/tests --ignore=rhodecode/tests/functional";
     test-full = runTests "rhodecode";
 
     docs = mkDocs "docs";
 
     aggregate = pkgs.releaseTools.aggregate {
       name = "aggregated-jobs";
       constituents = [
         jobs.build
         jobs.test-api
         jobs.test-rest
         jobs.docs
       ];
     };
   };
 
 in jobs

requirements.txt

@@ -1,151 +1,150 b''
 Babel==1.3
 Beaker==1.7.0
 CProfileV==1.0.6
 Fabric==1.10.0
 FormEncode==1.2.4
 Jinja2==2.7.3
 Mako==1.0.1
 Markdown==2.6.2
 MarkupSafe==0.23
 MySQL-python==1.2.5
 Paste==2.0.2
 PasteDeploy==1.5.2
 PasteScript==1.7.5
 Pygments==2.0.2
 
 # TODO: This version is not available on PyPI
 # Pylons==1.0.2.dev20160108
 Pylons==1.0.1
 
 # TODO: This version is not available, but newer ones are
 # Pyro4==4.35
 Pyro4==4.41
 
 # TODO: This should probably not be in here
 # -e hg+https://[e-mail]/johbo/rhodecode-fork@3a454bd1f17c0b2b2a951cf2b111e0320d7942a9#egg=RhodeCodeEnterprise-dev
 
 # TODO: This is not really a dependency, we should add it only
 # into the development environment, since there it is useful.
 # RhodeCodeVCSServer==3.9.0
 
 Routes==1.13
 SQLAlchemy==0.9.9
 Sphinx==1.2.2
 Tempita==0.5.2
 URLObject==2.4.0
 WebError==0.10.3
 
 # TODO: This is modified by us, needs a better integration. For now
 # using the latest version before.
 # WebHelpers==1.3.dev20150807
 WebHelpers==1.3
 
 WebHelpers2==2.0
 WebOb==1.3.1
 WebTest==1.4.3
 Whoosh==2.7.0
 alembic==0.8.4
 amqplib==1.0.2
 anyjson==0.3.3
 appenlight-client==0.6.14
 authomatic==0.1.0.post1;
 backport-ipaddress==0.1
 bottle==0.12.8
 bumpversion==0.5.3
 celery==2.2.10
 click==5.1
 colander==1.2
 configobj==5.0.6
 cov-core==1.15.0
 coverage==3.7.1
 cssselect==0.9.1
 decorator==3.4.2
 docutils==0.12
 dogpile.cache==0.5.7
 dogpile.core==0.4.1
 dulwich==0.12.0
 ecdsa==0.11
 flake8==2.4.1
 future==0.14.3
 futures==3.0.2
 gprof2dot==2015.12.1
-greenlet==0.4.9
 gunicorn==19.6.0
 
 # TODO: Needs subvertpy and blows up without Subversion headers,
 # actually we should not need this for Enterprise at all.
 # hgsubversion==1.8.2
 
 gnureadline==6.3.3
 infrae.cache==1.0.1
-invoke==0.11.1
+invoke==0.13.0
 ipdb==0.8
 ipython==3.1.0
 iso8601==0.1.11
 itsdangerous==0.24
 kombu==1.5.1
 lxml==3.4.4
 mccabe==0.3
 meld3==1.0.2
 mock==1.0.1
 msgpack-python==0.4.6
 nose==1.3.6
 objgraph==2.0.0
 packaging==15.2
 paramiko==1.15.1
 pep8==1.5.7
 psutil==2.2.1
 psycopg2==2.6
 py==1.4.29
 py-bcrypt==0.4
 pycrypto==2.6.1
 pycurl==7.19.5
 pyflakes==0.8.1
 pyparsing==1.5.7
 pyramid==1.6.1
 pyramid-beaker==0.8
 pyramid-debugtoolbar==2.4.2
 pyramid-jinja2==2.5
 pyramid-mako==1.0.2
 pysqlite==2.6.3
 pytest==2.8.5
 pytest-runner==2.7.1
 pytest-catchlog==1.2.2
 pytest-cov==1.8.1
 pytest-profiling==1.0.1
 pytest-timeout==0.4
 python-dateutil==1.5
 python-ldap==2.4.19
 python-memcached==1.57
 python-pam==1.8.2
 pytz==2015.4
 pyzmq==14.6.0
 
 # TODO: This is not available in public
 # rc-testdata==0.2.0
 
 https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.8.3.zip#md5=9acdfd71b8ddf4056057065f37ab9ccb
 
 
 recaptcha-client==1.0.6
 repoze.lru==0.6
 requests==2.9.1
 serpent==1.12
 setproctitle==1.1.8
 setuptools==20.8.1
 setuptools-scm==1.11.0
 simplejson==3.7.2
 six==1.9.0
 subprocess32==3.2.6
 supervisor==3.1.3
 transifex-client==0.10
 translationstring==1.3
 trollius==1.0.4
 uWSGI==2.0.11.2
 venusian==1.0
 waitress==0.8.9
 wsgiref==0.1.2
 zope.cachedescriptors==4.0.0
 zope.deprecation==4.1.2
 zope.event==4.0.3
 zope.interface==4.1.3

rhodecode/VERSION

@@ -1,1 +1,1 b''
-4.1.2
  No newline at end of file
+4.2.0
  No newline at end of file

rhodecode/authentication/base.py

@@ -1,609 +1,615 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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/
 
 """
 Authentication modules
 """
 
+import colander
 import logging
 import time
 import traceback
 import warnings
 
 from pyramid.threadlocal import get_current_registry
 from sqlalchemy.ext.hybrid import hybrid_property
 
 from rhodecode.authentication.interface import IAuthnPluginRegistry
 from rhodecode.authentication.schema import AuthnPluginSettingsSchemaBase
 from rhodecode.lib import caches
 from rhodecode.lib.auth import PasswordGenerator, _RhodeCodeCryptoBCrypt
 from rhodecode.lib.utils2 import md5_safe, safe_int
 from rhodecode.lib.utils2 import safe_str
 from rhodecode.model.db import User
 from rhodecode.model.meta import Session
 from rhodecode.model.settings import SettingsModel
 from rhodecode.model.user import UserModel
 from rhodecode.model.user_group import UserGroupModel
 
 
 log = logging.getLogger(__name__)
 
 # auth types that authenticate() function can receive
 VCS_TYPE = 'vcs'
 HTTP_TYPE = 'http'
 
 
 class LazyFormencode(object):
     def __init__(self, formencode_obj, *args, **kwargs):
         self.formencode_obj = formencode_obj
         self.args = args
         self.kwargs = kwargs
 
     def __call__(self, *args, **kwargs):
         from inspect import isfunction
         formencode_obj = self.formencode_obj
         if isfunction(formencode_obj):
             # case we wrap validators into functions
             formencode_obj = self.formencode_obj(*args, **kwargs)
         return formencode_obj(*self.args, **self.kwargs)
 
 
 class RhodeCodeAuthPluginBase(object):
     # cache the authentication request for N amount of seconds. Some kind
     # of authentication methods are very heavy and it's very efficient to cache
     # the result of a call. If it's set to None (default) cache is off
     AUTH_CACHE_TTL = None
     AUTH_CACHE = {}
 
     auth_func_attrs = {
         "username": "unique username",
         "firstname": "first name",
         "lastname": "last name",
         "email": "email address",
         "groups": '["list", "of", "groups"]',
         "extern_name": "name in external source of record",
         "extern_type": "type of external source of record",
         "admin": 'True|False defines if user should be RhodeCode super admin',
         "active":
             'True|False defines active state of user internally for RhodeCode',
         "active_from_extern":
             "True|False\None, active state from the external auth, "
             "None means use definition from RhodeCode extern_type active value"
     }
     # set on authenticate() method and via set_auth_type func.
     auth_type = None
 
     # List of setting names to store encrypted. Plugins may override this list
     # to store settings encrypted.
     _settings_encrypted = []
 
     # Mapping of python to DB settings model types. Plugins may override or
     # extend this mapping.
     _settings_type_map = {
-        str: 'str',
-        int: 'int',
-        unicode: 'unicode',
-        bool: 'bool',
-        list: 'list',
+        colander.String: 'unicode',
+        colander.Integer: 'int',
+        colander.Boolean: 'bool',
+        colander.List: 'list',
     }
 
     def __init__(self, plugin_id):
         self._plugin_id = plugin_id
 
+    def __str__(self):
+        return self.get_id()
+
     def _get_setting_full_name(self, name):
         """
         Return the full setting name used for storing values in the database.
         """
         # TODO: johbo: Using the name here is problematic. It would be good to
         # introduce either new models in the database to hold Plugin and
         # PluginSetting or to use the plugin id here.
         return 'auth_{}_{}'.format(self.name, name)
 
-    def _get_setting_type(self, name, value):
+    def _get_setting_type(self, name):
+        """
+        Return the type of a setting. This type is defined by the SettingsModel
+        and determines how the setting is stored in DB. Optionally the suffix
+        `.encrypted` is appended to instruct SettingsModel to store it
+        encrypted.
         """
-        Get the type as used by the SettingsModel accordingly to type of passed
-        value. Optionally the suffix `.encrypted` is appended to instruct
-        SettingsModel to store it encrypted.
-        """
-        type_ = self._settings_type_map.get(type(value), 'unicode')
+        schema_node = self.get_settings_schema().get(name)
+        db_type = self._settings_type_map.get(
+            type(schema_node.typ), 'unicode')
         if name in self._settings_encrypted:
-            type_ = '{}.encrypted'.format(type_)
-        return type_
+            db_type = '{}.encrypted'.format(db_type)
+        return db_type
 
     def is_enabled(self):
         """
         Returns true if this plugin is enabled. An enabled plugin can be
         configured in the admin interface but it is not consulted during
         authentication.
         """
         auth_plugins = SettingsModel().get_auth_plugins()
         return self.get_id() in auth_plugins
 
     def is_active(self):
         """
         Returns true if the plugin is activated. An activated plugin is
         consulted during authentication, assumed it is also enabled.
         """
         return self.get_setting_by_name('enabled')
 
     def get_id(self):
         """
         Returns the plugin id.
         """
         return self._plugin_id
 
     def get_display_name(self):
         """
         Returns a translation string for displaying purposes.
         """
         raise NotImplementedError('Not implemented in base class')
 
     def get_settings_schema(self):
         """
         Returns a colander schema, representing the plugin settings.
         """
         return AuthnPluginSettingsSchemaBase()
 
-    def get_setting_by_name(self, name):
+    def get_setting_by_name(self, name, default=None):
         """
         Returns a plugin setting by name.
         """
         full_name = self._get_setting_full_name(name)
         db_setting = SettingsModel().get_setting_by_name(full_name)
-        return db_setting.app_settings_value if db_setting else None
+        return db_setting.app_settings_value if db_setting else default
 
     def create_or_update_setting(self, name, value):
         """
         Create or update a setting for this plugin in the persistent storage.
         """
         full_name = self._get_setting_full_name(name)
-        type_ = self._get_setting_type(name, value)
+        type_ = self._get_setting_type(name)
         db_setting = SettingsModel().create_or_update_setting(
             full_name, value, type_)
         return db_setting.app_settings_value
 
     def get_settings(self):
         """
         Returns the plugin settings as dictionary.
         """
         settings = {}
         for node in self.get_settings_schema():
             settings[node.name] = self.get_setting_by_name(node.name)
         return settings
 
     @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.
         class LazyCaller(object):
             def __init__(self, name):
                 self.validator_name = name
 
             def __call__(self, *args, **kwargs):
                 from rhodecode.model import validators as v
                 obj = getattr(v, self.validator_name)
                 # log.debug('Initializing lazy formencode object: %s', obj)
                 return LazyFormencode(obj, *args, **kwargs)
 
         class ProxyGet(object):
             def __getattribute__(self, name):
                 return LazyCaller(name)
 
         return ProxyGet()
 
     @hybrid_property
     def name(self):
         """
         Returns the name of this authentication plugin.
 
         :returns: string
         """
         raise NotImplementedError("Not implemented in base class")
 
     @property
     def is_headers_auth(self):
         """
         Returns True if this authentication plugin uses HTTP headers as
         authentication method.
         """
         return False
 
     @hybrid_property
     def is_container_auth(self):
         """
         Deprecated method that indicates if this authentication plugin uses
         HTTP headers as authentication method.
         """
         warnings.warn(
             'Use is_headers_auth instead.', category=DeprecationWarning)
         return self.is_headers_auth
 
     @hybrid_property
     def allows_creating_users(self):
         """
         Defines if Plugin allows users to be created on-the-fly when
         authentication is called. Controls how external plugins should behave
         in terms if they are allowed to create new users, or not. Base plugins
         should not be allowed to, but External ones should be !
 
         :return: bool
         """
         return False
 
     def set_auth_type(self, auth_type):
         self.auth_type = auth_type
 
     def allows_authentication_from(
             self, user, allows_non_existing_user=True,
             allowed_auth_plugins=None, allowed_auth_sources=None):
         """
         Checks if this authentication module should accept a request for
         the current user.
 
         :param user: user object fetched using plugin's get_user() method.
         :param allows_non_existing_user: if True, don't allow the
             user to be empty, meaning not existing in our database
         :param allowed_auth_plugins: if provided, users extern_type will be
             checked against a list of provided extern types, which are plugin
             auth_names in the end
         :param allowed_auth_sources: authentication type allowed,
             `http` or `vcs` default is both.
             defines if plugin will accept only http authentication vcs
             authentication(git/hg) or both
         :returns: boolean
         """
         if not user and not allows_non_existing_user:
             log.debug('User is empty but plugin does not allow empty users,'
                       'not allowed to authenticate')
             return False
 
         expected_auth_plugins = allowed_auth_plugins or [self.name]
         if user and (user.extern_type and
                      user.extern_type not in expected_auth_plugins):
             log.debug(
                 'User `%s` is bound to `%s` auth type. Plugin allows only '
                 '%s, skipping', user, user.extern_type, expected_auth_plugins)
 
             return False
 
         # by default accept both
         expected_auth_from = allowed_auth_sources or [HTTP_TYPE, VCS_TYPE]
         if self.auth_type not in expected_auth_from:
             log.debug('Current auth source is %s but plugin only allows %s',
                       self.auth_type, expected_auth_from)
             return False
 
         return True
 
     def get_user(self, username=None, **kwargs):
         """
         Helper method for user fetching in plugins, by default it's using
         simple fetch by username, but this method can be custimized in plugins
         eg. headers auth plugin to fetch user by environ params
 
         :param username: username if given to fetch from database
         :param kwargs: extra arguments needed for user fetching.
         """
         user = None
         log.debug(
             'Trying to fetch user `%s` from RhodeCode database', username)
         if username:
             user = User.get_by_username(username)
             if not user:
                 log.debug('User not found, fallback to fetch user in '
                           'case insensitive mode')
                 user = User.get_by_username(username, case_insensitive=True)
         else:
             log.debug('provided username:`%s` is empty skipping...', username)
         if not user:
             log.debug('User `%s` not found in database', username)
         return user
 
     def user_activation_state(self):
         """
         Defines user activation state when creating new users
 
         :returns: boolean
         """
         raise NotImplementedError("Not implemented in base class")
 
     def auth(self, userobj, username, passwd, settings, **kwargs):
         """
         Given a user object (which may be null), username, a plaintext
         password, and a settings object (containing all the keys needed as
         listed in settings()), authenticate this user's login attempt.
 
         Return None on failure. On success, return a dictionary of the form:
 
             see: RhodeCodeAuthPluginBase.auth_func_attrs
         This is later validated for correctness
         """
         raise NotImplementedError("not implemented in base class")
 
     def _authenticate(self, userobj, username, passwd, settings, **kwargs):
         """
         Wrapper to call self.auth() that validates call on it
 
         :param userobj: userobj
         :param username: username
         :param passwd: plaintext password
         :param settings: plugin settings
         """
         auth = self.auth(userobj, username, passwd, settings, **kwargs)
         if auth:
             # check if hash should be migrated ?
             new_hash = auth.get('_hash_migrate')
             if new_hash:
                 self._migrate_hash_to_bcrypt(username, passwd, new_hash)
             return self._validate_auth_return(auth)
         return auth
 
     def _migrate_hash_to_bcrypt(self, username, password, new_hash):
         new_hash_cypher = _RhodeCodeCryptoBCrypt()
         # extra checks, so make sure new hash is correct.
         password_encoded = safe_str(password)
         if new_hash and new_hash_cypher.hash_check(
                 password_encoded, new_hash):
             cur_user = User.get_by_username(username)
             cur_user.password = new_hash
             Session().add(cur_user)
             Session().flush()
             log.info('Migrated user %s hash to bcrypt', cur_user)
 
     def _validate_auth_return(self, ret):
         if not isinstance(ret, dict):
             raise Exception('returned value from auth must be a dict')
         for k in self.auth_func_attrs:
             if k not in ret:
                 raise Exception('Missing %s attribute from returned data' % k)
         return ret
 
 
 class RhodeCodeExternalAuthPlugin(RhodeCodeAuthPluginBase):
 
     @hybrid_property
     def allows_creating_users(self):
         return True
 
     def use_fake_password(self):
         """
         Return a boolean that indicates whether or not we should set the user's
         password to a random value when it is authenticated by this plugin.
         If your plugin provides authentication, then you will generally
         want this.
 
         :returns: boolean
         """
         raise NotImplementedError("Not implemented in base class")
 
     def _authenticate(self, userobj, username, passwd, settings, **kwargs):
         # at this point _authenticate calls plugin's `auth()` function
         auth = super(RhodeCodeExternalAuthPlugin, self)._authenticate(
             userobj, username, passwd, settings, **kwargs)
         if auth:
             # maybe plugin will clean the username ?
             # we should use the return value
             username = auth['username']
 
             # if external source tells us that user is not active, we should
             # skip rest of the process. This can prevent from creating users in
             # RhodeCode when using external authentication, but if it's
             # inactive user we shouldn't create that user anyway
             if auth['active_from_extern'] is False:
                 log.warning(
                     "User %s authenticated against %s, but is inactive",
                     username, self.__module__)
                 return None
 
             cur_user = User.get_by_username(username, case_insensitive=True)
             is_user_existing = cur_user is not None
 
             if is_user_existing:
                 log.debug('Syncing user `%s` from '
                           '`%s` plugin', username, self.name)
             else:
                 log.debug('Creating non existing user `%s` from '
                           '`%s` plugin', username, self.name)
 
             if self.allows_creating_users:
                 log.debug('Plugin `%s` allows to '
                           'create new users', self.name)
             else:
                 log.debug('Plugin `%s` does not allow to '
                           'create new users', self.name)
 
             user_parameters = {
                 'username': username,
                 'email': auth["email"],
                 'firstname': auth["firstname"],
                 'lastname': auth["lastname"],
                 'active': auth["active"],
                 'admin': auth["admin"],
                 'extern_name': auth["extern_name"],
                 'extern_type': self.name,
                 'plugin': self,
                 'allow_to_create_user': self.allows_creating_users,
             }
 
             if not is_user_existing:
                 if self.use_fake_password():
                     # Randomize the PW because we don't need it, but don't want
                     # them blank either
                     passwd = PasswordGenerator().gen_password(length=16)
                 user_parameters['password'] = passwd
             else:
                 # Since the password is required by create_or_update method of
                 # UserModel, we need to set it explicitly.
                 # The create_or_update method is smart and recognises the
                 # password hashes as well.
                 user_parameters['password'] = cur_user.password
 
             # we either create or update users, we also pass the flag
             # that controls if this method can actually do that.
             # raises NotAllowedToCreateUserError if it cannot, and we try to.
             user = UserModel().create_or_update(**user_parameters)
             Session().flush()
             # enforce user is just in given groups, all of them has to be ones
             # created from plugins. We store this info in _group_data JSON
             # field
             try:
                 groups = auth['groups'] or []
                 UserGroupModel().enforce_groups(user, groups, self.name)
             except Exception:
                 # for any reason group syncing fails, we should
                 # proceed with login
                 log.error(traceback.format_exc())
             Session().commit()
         return auth
 
 
 def loadplugin(plugin_id):
     """
     Loads and returns an instantiated authentication plugin.
     Returns the RhodeCodeAuthPluginBase subclass on success,
     or None on failure.
     """
     # TODO: Disusing pyramids thread locals to retrieve the registry.
     authn_registry = get_current_registry().getUtility(IAuthnPluginRegistry)
     plugin = authn_registry.get_plugin(plugin_id)
     if plugin is None:
         log.error('Authentication plugin not found: "%s"', plugin_id)
     return plugin
 
 
 def get_auth_cache_manager(custom_ttl=None):
     return caches.get_cache_manager(
         'auth_plugins', 'rhodecode.authentication', custom_ttl)
 
 
 def authenticate(username, password, environ=None, auth_type=None,
                  skip_missing=False):
     """
     Authentication function used for access control,
     It tries to authenticate based on enabled authentication modules.
 
     :param username: username can be empty for headers auth
     :param password: password can be empty for headers auth
     :param environ: environ headers passed for headers auth
     :param auth_type: type of authentication, either `HTTP_TYPE` or `VCS_TYPE`
     :param skip_missing: ignores plugins that are in db but not in environment
     :returns: None if auth failed, plugin_user dict if auth is correct
     """
     if not auth_type or auth_type not in [HTTP_TYPE, VCS_TYPE]:
         raise ValueError('auth type must be on of http, vcs got "%s" instead'
                          % auth_type)
     headers_only = environ and not (username and password)
 
     authn_registry = get_current_registry().getUtility(IAuthnPluginRegistry)
     for plugin in authn_registry.get_plugins_for_authentication():
         plugin.set_auth_type(auth_type)
         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 '
                       'headers plugin, skipping...', plugin.get_id())
             continue
 
         # load plugin settings from RhodeCode database
         plugin_settings = plugin.get_settings()
         log.debug('Plugin settings:%s', plugin_settings)
 
         log.debug('Trying authentication using ** %s **', plugin.get_id())
         # use plugin's method of user extraction.
         user = plugin.get_user(username, environ=environ,
                                settings=plugin_settings)
         display_user = user.username if user else username
         log.debug(
             'Plugin %s extracted user is `%s`', plugin.get_id(), display_user)
 
         if not plugin.allows_authentication_from(user):
             log.debug('Plugin %s does not accept user `%s` for authentication',
                       plugin.get_id(), display_user)
             continue
         else:
             log.debug('Plugin %s accepted user `%s` for authentication',
                       plugin.get_id(), display_user)
 
         log.info('Authenticating user `%s` using %s plugin',
                  display_user, plugin.get_id())
 
         _cache_ttl = 0
 
         if isinstance(plugin.AUTH_CACHE_TTL, (int, long)):
             # plugin cache set inside is more important than the settings value
             _cache_ttl = plugin.AUTH_CACHE_TTL
         elif plugin_settings.get('auth_cache_ttl'):
             _cache_ttl = safe_int(plugin_settings.get('auth_cache_ttl'), 0)
 
         plugin_cache_active = bool(_cache_ttl and _cache_ttl > 0)
 
         # get instance of cache manager configured for a namespace
         cache_manager = get_auth_cache_manager(custom_ttl=_cache_ttl)
 
         log.debug('Cache for plugin `%s` active: %s', plugin.get_id(),
                   plugin_cache_active)
 
         # for environ based password can be empty, but then the validation is
         # on the server that fills in the env data needed for authentication
         _password_hash = md5_safe(plugin.name + username + (password or ''))
 
         # _authenticate is a wrapper for .auth() method of plugin.
         # it checks if .auth() sends proper data.
         # For RhodeCodeExternalAuthPlugin it also maps users to
         # Database and maps the attributes returned from .auth()
         # to RhodeCode database. If this function returns data
         # then auth is correct.
         start = time.time()
         log.debug('Running plugin `%s` _authenticate method',
                   plugin.get_id())
 
         def auth_func():
             """
             This function is used internally in Cache of Beaker to calculate
             Results
             """
             return plugin._authenticate(
                 user, username, password, plugin_settings,
                 environ=environ or {})
 
         if plugin_cache_active:
             plugin_user = cache_manager.get(
                 _password_hash, createfunc=auth_func)
         else:
             plugin_user = auth_func()
 
         auth_time = time.time() - start
         log.debug('Authentication for plugin `%s` completed in %.3fs, '
                   'expiration time of fetched cache %.1fs.',
                   plugin.get_id(), auth_time, _cache_ttl)
 
         log.debug('PLUGIN USER DATA: %s', plugin_user)
 
         if plugin_user:
             log.debug('Plugin returned proper authentication data')
             return plugin_user
         # we failed to Auth because .auth() method didn't return proper user
         log.debug("User `%s` failed to authenticate against %s",
                   display_user, plugin.get_id())
     return None

rhodecode/authentication/views.py

@@ -1,188 +1,192 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2012-2016  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
 import formencode.htmlfill
 import logging
 
 from pyramid.httpexceptions import HTTPFound
 from pyramid.renderers import render
 from pyramid.response import Response
 
 from rhodecode.authentication.base import get_auth_cache_manager
 from rhodecode.authentication.interface import IAuthnPluginRegistry
 from rhodecode.lib import auth
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
 from rhodecode.model.forms import AuthSettingsForm
 from rhodecode.model.meta import Session
 from rhodecode.model.settings import SettingsModel
 from rhodecode.translation import _
 
 log = logging.getLogger(__name__)
 
 
 class AuthnPluginViewBase(object):
 
     def __init__(self, context, request):
         self.request = request
         self.context = context
         self.plugin = context.plugin
         self._rhodecode_user = request.user
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     def settings_get(self, defaults=None, errors=None):
         """
         View that displays the plugin settings as a form.
         """
         defaults = defaults or {}
         errors = errors or {}
         schema = self.plugin.get_settings_schema()
 
-        # Get default values for the form.
+        # Compute default values for the form. Priority is:
+        # 1. Passed to this method 2. DB value 3. Schema default
         for node in schema:
-            db_value = self.plugin.get_setting_by_name(node.name)
-            defaults.setdefault(node.name, db_value)
+            if node.name not in defaults:
+                defaults[node.name] = self.plugin.get_setting_by_name(
+                    node.name, node.default)
 
         template_context = {
             'defaults': defaults,
             'errors': errors,
             'plugin': self.context.plugin,
             'resource': self.context,
         }
 
         return template_context
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def settings_post(self):
         """
         View that validates and stores the plugin settings.
         """
         schema = self.plugin.get_settings_schema()
+        data = self.request.params
+
         try:
-            valid_data = schema.deserialize(self.request.params)
+            valid_data = schema.deserialize(data)
         except colander.Invalid, e:
             # Display error message and display form again.
             self.request.session.flash(
                 _('Errors exist when saving plugin settings. '
                   'Please check the form inputs.'),
                 queue='error')
-            defaults = schema.flatten(self.request.params)
+            defaults = {key: data[key] for key in data if key in schema}
             return self.settings_get(errors=e.asdict(), defaults=defaults)
 
         # Store validated data.
         for name, value in valid_data.items():
             self.plugin.create_or_update_setting(name, value)
         Session.commit()
 
         # Display success message and redirect.
         self.request.session.flash(
             _('Auth settings updated successfully.'),
             queue='success')
         redirect_to = self.request.resource_path(
             self.context, route_name='auth_home')
         return HTTPFound(redirect_to)
 
 
 # TODO: Ongoing migration in these views.
 # - Maybe we should also use a colander schema for these views.
 class AuthSettingsView(object):
     def __init__(self, context, request):
         self.context = context
         self.request = request
 
         # TODO: Move this into a utility function. It is needed in all view
         # classes during migration. Maybe a mixin?
 
         # Some of the decorators rely on this attribute to be present on the
         # class of the decorated method.
         self._rhodecode_user = request.user
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     def index(self, defaults=None, errors=None, prefix_error=False):
         defaults = defaults or {}
         authn_registry = self.request.registry.getUtility(IAuthnPluginRegistry)
         enabled_plugins = SettingsModel().get_auth_plugins()
 
         # Create template context and render it.
         template_context = {
             'resource': self.context,
             'available_plugins': authn_registry.get_plugins(),
             'enabled_plugins': enabled_plugins,
         }
         html = render('rhodecode:templates/admin/auth/auth_settings.html',
                       template_context,
                       request=self.request)
 
         # Create form default values and fill the form.
         form_defaults = {
             'auth_plugins': ','.join(enabled_plugins)
         }
         form_defaults.update(defaults)
         html = formencode.htmlfill.render(
             html,
             defaults=form_defaults,
             errors=errors,
             prefix_error=prefix_error,
             encoding="UTF-8",
             force_defaults=False)
 
         return Response(html)
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def auth_settings(self):
         try:
             form = AuthSettingsForm()()
             form_result = form.to_python(self.request.params)
             plugins = ','.join(form_result['auth_plugins'])
             setting = SettingsModel().create_or_update_setting(
                 'auth_plugins', plugins)
             Session().add(setting)
             Session().commit()
 
             cache_manager = get_auth_cache_manager()
             cache_manager.clear()
             self.request.session.flash(
                 _('Auth settings updated successfully.'),
                 queue='success')
         except formencode.Invalid as errors:
             e = errors.error_dict or {}
             self.request.session.flash(
                 _('Errors exist when saving plugin setting. '
                   'Please check the form inputs.'),
                 queue='error')
             return self.index(
                 defaults=errors.value,
                 errors=e,
                 prefix_error=False)
         except Exception:
             log.exception('Exception in auth_settings')
             self.request.session.flash(
                 _('Error occurred during update of auth settings.'),
                 queue='error')
 
         redirect_to = self.request.resource_path(
             self.context, route_name='auth_home')
         return HTTPFound(redirect_to)

rhodecode/config/environment.py

@@ -1,192 +1,192 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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/
 
 """
 Pylons environment configuration
 """
 
 import os
 import logging
 import rhodecode
 import platform
 import re
 import io
 
 from mako.lookup import TemplateLookup
 from pylons.configuration import PylonsConfig
 from pylons.error import handle_mako_error
 from pyramid.settings import asbool
 
 # don't remove this import it does magic for celery
 from rhodecode.lib import celerypylons  # noqa
 
 import rhodecode.lib.app_globals as app_globals
 
 from rhodecode.config import utils
 from rhodecode.config.routing import make_map
 from rhodecode.config.jsroutes import generate_jsroutes_content
 
 from rhodecode.lib import helpers
 from rhodecode.lib.auth import set_available_permissions
 from rhodecode.lib.utils import (
     repo2db_mapper, make_db_config, set_rhodecode_config,
     load_rcextensions)
 from rhodecode.lib.utils2 import str2bool, aslist
 from rhodecode.lib.vcs import connect_vcs, start_vcs_server
 from rhodecode.model.scm import ScmModel
 
 log = logging.getLogger(__name__)
 
 def load_environment(global_conf, app_conf, initial=False,
                      test_env=None, test_index=None):
     """
     Configure the Pylons environment via the ``pylons.config``
     object
     """
     config = PylonsConfig()
 
 
     # Pylons paths
     root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
     paths = {
         'root': root,
         'controllers': os.path.join(root, 'controllers'),
         'static_files': os.path.join(root, 'public'),
         'templates': [os.path.join(root, 'templates')],
     }
 
     # Initialize config with the basic options
     config.init_app(global_conf, app_conf, package='rhodecode', paths=paths)
 
     # store some globals into rhodecode
     rhodecode.CELERY_ENABLED = str2bool(config['app_conf'].get('use_celery'))
     rhodecode.CELERY_EAGER = str2bool(
         config['app_conf'].get('celery.always.eager'))
 
     config['routes.map'] = make_map(config)
 
-    if asbool(config['debug']):
+    if asbool(config.get('generate_js_files', 'false')):
         jsroutes = config['routes.map'].jsroutes()
         jsroutes_file_content = generate_jsroutes_content(jsroutes)
         jsroutes_file_path = os.path.join(
             paths['static_files'], 'js', 'rhodecode', 'routes.js')
 
         with io.open(jsroutes_file_path, 'w', encoding='utf-8') as f:
             f.write(jsroutes_file_content)
 
     config['pylons.app_globals'] = app_globals.Globals(config)
     config['pylons.h'] = helpers
     rhodecode.CONFIG = config
 
     load_rcextensions(root_path=config['here'])
 
     # Setup cache object as early as possible
     import pylons
     pylons.cache._push_object(config['pylons.app_globals'].cache)
 
     # Create the Mako TemplateLookup, with the default auto-escaping
     config['pylons.app_globals'].mako_lookup = TemplateLookup(
         directories=paths['templates'],
         error_handler=handle_mako_error,
         module_directory=os.path.join(app_conf['cache_dir'], 'templates'),
         input_encoding='utf-8', default_filters=['escape'],
         imports=['from webhelpers.html import escape'])
 
     # sets the c attribute access when don't existing attribute are accessed
     config['pylons.strict_tmpl_context'] = True
 
     # Limit backends to "vcs.backends" from configuration
     backends = config['vcs.backends'] = aslist(
         config.get('vcs.backends', 'hg,git'), sep=',')
     for alias in rhodecode.BACKENDS.keys():
         if alias not in backends:
             del rhodecode.BACKENDS[alias]
     log.info("Enabled backends: %s", backends)
 
     # initialize vcs client and optionally run the server if enabled
     vcs_server_uri = config.get('vcs.server', '')
     vcs_server_enabled = str2bool(config.get('vcs.server.enable', 'true'))
     start_server = (
         str2bool(config.get('vcs.start_server', 'false')) and
         not int(os.environ.get('RC_VCSSERVER_TEST_DISABLE', '0')))
     if vcs_server_enabled and start_server:
         log.info("Starting vcsserver")
         start_vcs_server(server_and_port=vcs_server_uri,
                          protocol=utils.get_vcs_server_protocol(config),
                          log_level=config['vcs.server.log_level'])
 
     set_available_permissions(config)
     db_cfg = make_db_config(clear_session=True)
 
     repos_path = list(db_cfg.items('paths'))[0][1]
     config['base_path'] = repos_path
 
     config['vcs.hooks.direct_calls'] = _use_direct_hook_calls(config)
     config['vcs.hooks.protocol'] = _get_vcs_hooks_protocol(config)
 
     # store db config also in main global CONFIG
     set_rhodecode_config(config)
 
     # configure instance id
     utils.set_instance_id(config)
 
     # CONFIGURATION OPTIONS HERE (note: all config options will override
     # any Pylons config options)
 
     # store config reference into our module to skip import magic of pylons
     rhodecode.CONFIG.update(config)
 
     utils.configure_pyro4(config)
     utils.configure_vcs(config)
     if vcs_server_enabled:
         connect_vcs(vcs_server_uri, utils.get_vcs_server_protocol(config))
 
     import_on_startup = str2bool(config.get('startup.import_repos', False))
     if vcs_server_enabled and import_on_startup:
         repo2db_mapper(ScmModel().repo_scan(repos_path), remove_obsolete=False)
     return config
 
 
 def _use_direct_hook_calls(config):
     default_direct_hook_calls = 'false'
     direct_hook_calls = str2bool(
         config.get('vcs.hooks.direct_calls', default_direct_hook_calls))
     return direct_hook_calls
 
 
 def _get_vcs_hooks_protocol(config):
     protocol = config.get('vcs.hooks.protocol', 'pyro4').lower()
     return protocol
 
 
 def load_pyramid_environment(global_config, settings):
     # Some parts of the code expect a merge of global and app settings.
     settings_merged = global_config.copy()
     settings_merged.update(settings)
 
     # If this is a test run we prepare the test environment like
     # creating a test database, test search index and test repositories.
     # This has to be done before the database connection is initialized.
     if settings['is_test']:
         rhodecode.is_test = True
         utils.initialize_test_environment(settings_merged)
 
     # Initialize the database connection.
     utils.initialize_database(settings_merged)

rhodecode/config/jsroutes.py

@@ -1,42 +1,43 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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 generate_jsroutes_content(jsroutes):
     statements = []
     for url_name, url, fields in jsroutes:
         statements.append(
             "pyroutes.register('%s', '%s', %s);" % (url_name, url, fields))
     return u'''
 /******************************************************************************
  *                                                                            *
  *                      DO NOT CHANGE THIS FILE MANUALLY                      *
  *                                                                            *
  *                                                                            *
- *        This file is automatically generated when the app starts up.        *
+ *        This file is automatically generated when the app starts up with    *
+ *                         generate_js_files = true                           *
  *                                                                            *
  *  To add a route here pass jsroute=True to the route definition in the app  *
  *                                                                            *
  ******************************************************************************/
 function registerRCRoutes() {
     // routes registration
     %s
 }
 ''' % '\n    '.join(statements)
 

rhodecode/config/licenses.json

@@ -1,217 +1,256 b''
 {
-  "cyrus-sasl-2.1.26": {
-    "cyrus": "http://cyrusimap.web.cmu.edu/mediawiki/index.php/Downloads#Licensing"
+  "nodejs-4.3.1": {
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
-  "openldap-2.4.41": {
-    "OLDAP-2.8": "http://spdx.org/licenses/OLDAP-2.8"
+  "postgresql-9.5.1": {
+    "PostgreSQL License": "http://spdx.org/licenses/PostgreSQL"
   }, 
-  "openssl-1.0.1p": {
-    "OpenSSL": "http://spdx.org/licenses/OpenSSL"
-  }, 
-  "python-2.7.10": {
-    "Python-2.0": "http://spdx.org/licenses/Python-2.0"
+  "python-2.7.11": {
+    "Python Software Foundation License version 2": "http://spdx.org/licenses/Python-2.0"
   }, 
   "python2.7-Babel-1.3": {
-    "BSD-3-Clause": "http://spdx.org/licenses/BSD-3-Clause"
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
   "python2.7-Beaker-1.7.0": {
-    "BSD-3-Clause": "http://spdx.org/licenses/BSD-3-Clause"
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
   "python2.7-FormEncode-1.2.4": {
-    "Python-2.0": "http://spdx.org/licenses/Python-2.0"
+    "Python Software Foundation License version 2": "http://spdx.org/licenses/Python-2.0"
   }, 
   "python2.7-Mako-1.0.1": {
-    "MIT": "http://spdx.org/licenses/MIT"
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
   "python2.7-Markdown-2.6.2": {
-    "BSD-3-Clause": "http://spdx.org/licenses/BSD-3-Clause"
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
   "python2.7-MarkupSafe-0.23": {
-    "BSD-3-Clause": "http://spdx.org/licenses/BSD-3-Clause"
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
   "python2.7-Paste-2.0.2": {
-    "MIT": "http://spdx.org/licenses/MIT"
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
   "python2.7-PasteDeploy-1.5.2": {
-    "MIT": "http://spdx.org/licenses/MIT"
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
   "python2.7-PasteScript-1.7.5": {
-    "MIT": "http://spdx.org/licenses/MIT"
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
   "python2.7-Pygments-2.0.2": {
-    "BSD-2-Clause": "http://spdx.org/licenses/BSD-2-Clause"
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
-  "python2.7-Pylons-1.0.2-patch1": {
-    "BSD-3-Clause": "http://spdx.org/licenses/BSD-3-Clause"
+  "python2.7-Pylons-1.0.1-patch1": {
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
   "python2.7-Pyro4-4.35": {
-    "MIT": "http://spdx.org/licenses/MIT"
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
   "python2.7-Routes-1.13": {
-    "MIT": "http://spdx.org/licenses/MIT"
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
   "python2.7-SQLAlchemy-0.9.9": {
-    "MIT": "http://spdx.org/licenses/MIT"
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
   "python2.7-Tempita-0.5.2": {
-    "MIT": "http://spdx.org/licenses/MIT"
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
   "python2.7-URLObject-2.4.0": {
-    "Unlicense": "http://spdx.org/licenses/Unlicense"
+    "The Unlicense": "http://unlicense.org/"
   }, 
   "python2.7-WebError-0.10.3": {
-    "MIT": "http://spdx.org/licenses/MIT"
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
-  "python2.7-WebHelpers-1.3-cust1": {
-    "BSD-3-Clause": "http://spdx.org/licenses/BSD-3-Clause"
+  "python2.7-WebHelpers-1.3": {
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
   "python2.7-WebHelpers2-2.0": {
-    "BSD-3-Clause": "http://spdx.org/licenses/BSD-3-Clause"
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
   "python2.7-WebOb-1.3.1": {
-    "MIT": "http://spdx.org/licenses/MIT"
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
-  "python2.7-Whoosh-2.7.0-patch1": {
-    "BSD-2-Clause": "http://spdx.org/licenses/BSD-2-Clause"
+  "python2.7-Whoosh-2.7.0": {
+    "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"
   }, 
   "python2.7-alembic-0.8.4": {
-    "MIT": "http://spdx.org/licenses/MIT"
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
   "python2.7-amqplib-1.0.2": {
-    "LGPL-3.0": "http://spdx.org/licenses/LGPL-3.0"
+    "GNU Lesser General Public License v3.0 only": "http://spdx.org/licenses/LGPL-3.0"
   }, 
   "python2.7-anyjson-0.3.3": {
-    "BSD-2-Clause": "http://spdx.org/licenses/BSD-2-Clause"
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+  }, 
+  "python2.7-appenlight-client-0.6.14": {
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
-  "python2.7-appenlight_client-0.6.14": {
-    "BSD-2-Clause": "http://spdx.org/licenses/BSD-2-Clause"
+  "python2.7-authomatic-0.1.0.post1": {
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
-  "python2.7-backport_ipaddress-0.1": {
-    "Python-2.0": "http://spdx.org/licenses/Python-2.0"
+  "python2.7-backport-ipaddress-0.1": {
+    "Python Software Foundation License version 2": "http://spdx.org/licenses/Python-2.0"
   }, 
   "python2.7-celery-2.2.10": {
-    "BSD-2-Clause": "http://spdx.org/licenses/BSD-2-Clause"
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
-  "python2.7-click-4.0": {
-    "BSD-3-Clause": "http://spdx.org/licenses/BSD-3-Clause"
+  "python2.7-click-5.1": {
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+  }, 
+  "python2.7-colander-1.2": {
+    "Repoze License": "http://www.repoze.org/LICENSE.txt"
   }, 
   "python2.7-configobj-5.0.6": {
-    "BSD-3-Clause": "http://spdx.org/licenses/BSD-3-Clause"
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
   "python2.7-cssselect-0.9.1": {
-    "BSD-2-Clause": "http://spdx.org/licenses/BSD-2-Clause"
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
   "python2.7-decorator-3.4.2": {
-    "BSD-3-Clause": "http://spdx.org/licenses/BSD-3-Clause"
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
   "python2.7-docutils-0.12": {
-    "BSD-2-Clause": "http://spdx.org/licenses/BSD-2-Clause"
+    "BSD 2-clause \"Simplified\" License": "http://spdx.org/licenses/BSD-2-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": {
+    "Apache License 2.0": "http://spdx.org/licenses/Apache-2.0"
   }, 
   "python2.7-future-0.14.3": {
-    "MIT": "http://spdx.org/licenses/MIT"
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
   "python2.7-futures-3.0.2": {
-    "BSD-3-Clause": "http://spdx.org/licenses/BSD-3-Clause"
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+  }, 
+  "python2.7-gnureadline-6.3.3": {
+    "GNU General Public License v1.0 only": "http://spdx.org/licenses/GPL-1.0"
   }, 
-  "python2.7-greenlet-0.4.7": {
-    "MIT": "http://spdx.org/licenses/MIT"
+  "python2.7-gunicorn-19.6.0": {
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
-  "python2.7-gunicorn-19.3.0": {
-    "MIT": "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": {
-    "BSD-3-Clause": "http://spdx.org/licenses/BSD-3-Clause"
-  }, 
-  "python2.7-kombu-1.5.1-patch1": {
-    "BSD-3-Clause": "http://spdx.org/licenses/BSD-3-Clause"
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
-  "python2.7-mccabe-0.3": {
-    "expat": "http://directory.fsf.org/wiki/License:Expat"
+  "python2.7-iso8601-0.1.11": {
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
-  "python2.7-meld3-1.0.2": {
-    "repoze": "http://repoze.org/license.html"
+  "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": {
-    "Apache-2.0": "http://spdx.org/licenses/Apache-2.0"
-  }, 
-  "python2.7-objgraph-2.0.0": {
-    "MIT": "http://spdx.org/licenses/MIT"
+    "Apache License 2.0": "http://spdx.org/licenses/Apache-2.0"
   }, 
   "python2.7-packaging-15.2": {
-    "Apache-2.0": "http://spdx.org/licenses/Apache-2.0"
+    "Apache License 2.0": "http://spdx.org/licenses/Apache-2.0"
   }, 
   "python2.7-psutil-2.2.1": {
-    "BSD-2-Clause": "http://spdx.org/licenses/BSD-2-Clause"
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
   "python2.7-psycopg2-2.6": {
-    "LGPL-3.0+": "http://spdx.org/licenses/LGPL-3.0+"
+    "GNU Lesser General Public License v3.0 or later": "http://spdx.org/licenses/LGPL-3.0+"
   }, 
   "python2.7-py-1.4.29": {
-    "MIT": "http://spdx.org/licenses/MIT"
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
   "python2.7-py-bcrypt-0.4": {
-    "BSD-4-Clause": "http://spdx.org/licenses/BSD-4-Clause"
+    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
   }, 
   "python2.7-pycrypto-2.6.1": {
-    "publicDomain": null
+    "Public Domain": null
+  }, 
+  "python2.7-pycurl-7.19.5": {
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
   "python2.7-pyparsing-1.5.7": {
-    "MIT": "http://spdx.org/licenses/MIT"
+    "MIT License": "http://spdx.org/licenses/MIT"
+  }, 
+  "python2.7-pyramid-1.6.1": {
+    "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": {
+    "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-mako-1.0.2": {
+    "Repoze License": "http://www.repoze.org/LICENSE.txt"
   }, 
   "python2.7-pysqlite-2.6.3": {
-    "Libpng": "http://spdx.org/licenses/Libpng", 
-    "Zlib": "http://spdx.org/licenses/Zlib"
+    "libpng License": "http://spdx.org/licenses/Libpng", 
+    "zlib License": "http://spdx.org/licenses/Zlib"
   }, 
   "python2.7-pytest-2.8.5": {
-    "MIT": "http://spdx.org/licenses/MIT"
+    "MIT License": "http://spdx.org/licenses/MIT"
+  }, 
+  "python2.7-pytest-runner-2.7.1": {
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
   "python2.7-python-dateutil-1.5": {
-    "BSD-2-Clause": "http://spdx.org/licenses/BSD-2-Clause"
+    "Python Software Foundation License version 2": "http://spdx.org/licenses/Python-2.0"
+  }, 
+  "python2.7-python-editor-1.0.1": {
+    "Apache License 2.0": "http://spdx.org/licenses/Apache-2.0"
   }, 
   "python2.7-python-ldap-2.4.19": {
-    "Python-2.0": "http://spdx.org/licenses/Python-2.0"
+    "Python Software Foundation License version 2": "http://spdx.org/licenses/Python-2.0"
+  }, 
+  "python2.7-python-memcached-1.57": {
+    "Python Software Foundation License version 2": "http://spdx.org/licenses/Python-2.0"
   }, 
   "python2.7-pytz-2015.4": {
-    "MIT": "http://spdx.org/licenses/MIT"
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
   "python2.7-recaptcha-client-1.0.6": {
-    "MIT": "http://spdx.org/licenses/MIT"
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
   "python2.7-repoze.lru-0.6": {
-    "repoze": "http://repoze.org/license.html"
+    "Repoze License": "http://www.repoze.org/LICENSE.txt"
   }, 
-  "python2.7-requests-2.5.1": {
-    "APSL-2.0": "http://spdx.org/licenses/APSL-2.0"
+  "python2.7-requests-2.9.1": {
+    "Apache License 2.0": "http://spdx.org/licenses/Apache-2.0"
   }, 
-  "python2.7-serpent-1.11": {
-    "MIT": "http://spdx.org/licenses/MIT"
+  "python2.7-serpent-1.12": {
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
-  "python2.7-setproctitle-1.1.8": {
-    "BSD-2-Clause": "http://spdx.org/licenses/BSD-2-Clause"
+  "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-18.0.1": {
-    "PSF": null, 
-    "ZPL": null
+  "python2.7-setuptools-scm-1.11.0": {
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
   "python2.7-simplejson-3.7.2": {
-    "MIT": "http://spdx.org/licenses/MIT"
+    "Academic Free License": "http://spdx.org/licenses/AFL-2.1", 
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
   "python2.7-six-1.9.0": {
-    "MIT": "http://spdx.org/licenses/MIT"
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
-  "python2.7-subprocess32-3.2.6": {
-    "Python-2.0": "http://spdx.org/licenses/Python-2.0"
+  "python2.7-translationstring-1.3": {
+    "Repoze License": "http://www.repoze.org/LICENSE.txt"
   }, 
-  "python2.7-supervisor-3.1.3": {
-    "repoze": "http://repoze.org/license.html"
+  "python2.7-urllib3-1.16": {
+    "MIT License": "http://spdx.org/licenses/MIT"
   }, 
-  "python2.7-trollius-1.0.4": {
-    "APSL-2.0": "http://spdx.org/licenses/APSL-2.0"
+  "python2.7-venusian-1.0": {
+    "Repoze License": "http://www.repoze.org/LICENSE.txt"
   }, 
   "python2.7-waitress-0.8.9": {
-    "ZPL-2.1": "http://spdx.org/licenses/ZPL-2.1"
+    "Zope Public License 2.1": "http://spdx.org/licenses/ZPL-2.1"
   }, 
   "python2.7-zope.cachedescriptors-4.0.0": {
-    "ZPL-2.1": "http://spdx.org/licenses/ZPL-2.1"
+    "Zope Public License 2.1": "http://spdx.org/licenses/ZPL-2.1"
+  }, 
+  "python2.7-zope.deprecation-4.1.2": {
+    "Zope Public License 2.1": "http://spdx.org/licenses/ZPL-2.1"
+  }, 
+  "python2.7-zope.interface-4.1.3": {
+    "Zope Public License 2.1": "http://spdx.org/licenses/ZPL-2.1"
   }
-}
+}
  No newline at end of file

rhodecode/config/middleware.py

@@ -1,316 +1,387 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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/
 
 """
 Pylons middleware initialization
 """
 import logging
 
 from paste.registry import RegistryManager
 from paste.gzipper import make_gzip_middleware
-from pylons.middleware import ErrorHandler, StatusCodeRedirect
 from pylons.wsgiapp import PylonsApp
 from pyramid.authorization import ACLAuthorizationPolicy
 from pyramid.config import Configurator
 from pyramid.static import static_view
 from pyramid.settings import asbool, aslist
 from pyramid.wsgi import wsgiapp
+from pyramid.httpexceptions import HTTPError, HTTPInternalServerError
+import pyramid.httpexceptions as httpexceptions
+from pyramid.renderers import render_to_response, render
 from routes.middleware import RoutesMiddleware
 import routes.util
 
 import rhodecode
 from rhodecode.config import patches
 from rhodecode.config.environment import (
     load_environment, load_pyramid_environment)
 from rhodecode.lib.middleware import csrf
 from rhodecode.lib.middleware.appenlight import wrap_in_appenlight_if_enabled
 from rhodecode.lib.middleware.disable_vcs import DisableVCSPagesWrapper
 from rhodecode.lib.middleware.https_fixup import HttpsFixup
 from rhodecode.lib.middleware.vcs import VCSMiddleware
 from rhodecode.lib.plugins.utils import register_rhodecode_plugin
 
 
 log = logging.getLogger(__name__)
 
 
 def make_app(global_conf, full_stack=True, static_files=True, **app_conf):
     """Create a Pylons WSGI application and return it
 
     ``global_conf``
         The inherited configuration for this application. Normally from
         the [DEFAULT] section of the Paste ini file.
 
     ``full_stack``
         Whether or not this application provides a full WSGI stack (by
         default, meaning it handles its own exceptions and errors).
         Disable full_stack when this application is "managed" by
         another WSGI middleware.
 
     ``app_conf``
         The application's local configuration. Normally specified in
         the [app:<name>] section of the Paste ini file (where <name>
         defaults to main).
 
     """
     # Apply compatibility patches
     patches.kombu_1_5_1_python_2_7_11()
     patches.inspect_getargspec()
 
     # Configure the Pylons environment
     config = load_environment(global_conf, app_conf)
 
     # The Pylons WSGI app
     app = PylonsApp(config=config)
     if rhodecode.is_test:
         app = csrf.CSRFDetector(app)
 
     expected_origin = config.get('expected_origin')
     if expected_origin:
         # The API can be accessed from other Origins.
         app = csrf.OriginChecker(app, expected_origin,
                                  skip_urls=[routes.util.url_for('api')])
 
-    # Add RoutesMiddleware. Currently we have two instances in the stack. This
-    # is the lower one to make the StatusCodeRedirect middleware happy.
-    # TODO: johbo: This is not optimal, search for a better solution.
-    app = RoutesMiddleware(app, config['routes.map'])
-
-    # CUSTOM MIDDLEWARE HERE (filtered by error handling middlewares)
-    if asbool(config['pdebug']):
-        from rhodecode.lib.profiler import ProfilingMiddleware
-        app = ProfilingMiddleware(app)
-
-    # Protect from VCS Server error related pages when server is not available
-    vcs_server_enabled = asbool(config.get('vcs.server.enable', 'true'))
-    if not vcs_server_enabled:
-        app = DisableVCSPagesWrapper(app)
 
     if asbool(full_stack):
 
         # Appenlight monitoring and error handler
         app, appenlight_client = wrap_in_appenlight_if_enabled(app, config)
 
-        # Handle Python exceptions
-        app = ErrorHandler(app, global_conf, **config['pylons.errorware'])
-
         # we want our low level middleware to get to the request ASAP. We don't
         # need any pylons stack middleware in them
         app = VCSMiddleware(app, config, appenlight_client)
-        # Display error documents for 401, 403, 404 status codes (and
-        # 500 when debug is disabled)
-        if asbool(config['debug']):
-            app = StatusCodeRedirect(app)
-        else:
-            app = StatusCodeRedirect(app, [400, 401, 403, 404, 500])
 
     # Establish the Registry for this application
     app = RegistryManager(app)
 
     app.config = config
 
     return app
 
 
 def make_pyramid_app(global_config, **settings):
     """
     Constructs the WSGI application based on Pyramid and wraps the Pylons based
     application.
 
     Specials:
 
     * We migrate from Pylons to Pyramid. While doing this, we keep both
       frameworks functional. This involves moving some WSGI middlewares around
       and providing access to some data internals, so that the old code is
       still functional.
 
     * The application can also be integrated like a plugin via the call to
       `includeme`. This is accompanied with the other utility functions which
       are called. Changing this should be done with great care to not break
       cases when these fragments are assembled from another place.
 
     """
     # The edition string should be available in pylons too, so we add it here
     # before copying the settings.
     settings.setdefault('rhodecode.edition', 'Community Edition')
 
     # As long as our Pylons application does expect "unprepared" settings, make
     # sure that we keep an unmodified copy. This avoids unintentional change of
     # behavior in the old application.
     settings_pylons = settings.copy()
 
     sanitize_settings_and_apply_defaults(settings)
     config = Configurator(settings=settings)
     add_pylons_compat_data(config.registry, global_config, settings_pylons)
 
     load_pyramid_environment(global_config, settings)
 
     includeme(config)
     includeme_last(config)
     pyramid_app = config.make_wsgi_app()
     pyramid_app = wrap_app_in_wsgi_middlewares(pyramid_app, config)
     return pyramid_app
 
 
 def add_pylons_compat_data(registry, global_config, settings):
     """
     Attach data to the registry to support the Pylons integration.
     """
     registry._pylons_compat_global_config = global_config
     registry._pylons_compat_settings = settings
 
 
+def webob_to_pyramid_http_response(webob_response):
+    ResponseClass = httpexceptions.status_map[webob_response.status_int]
+    pyramid_response = ResponseClass(webob_response.status)
+    pyramid_response.status = webob_response.status
+    pyramid_response.headers.update(webob_response.headers)
+    if pyramid_response.headers['content-type'] == 'text/html':
+        pyramid_response.headers['content-type'] = 'text/html; charset=UTF-8'
+    return pyramid_response
+
+
+def error_handler(exception, request):
+    # TODO: dan: replace the old pylons error controller with this
+    from rhodecode.model.settings import SettingsModel
+    from rhodecode.lib.utils2 import AttributeDict
+
+    try:
+        rc_config = SettingsModel().get_all_settings()
+    except Exception:
+        log.exception('failed to fetch settings')
+        rc_config = {}
+
+    base_response = HTTPInternalServerError()
+    # prefer original exception for the response since it may have headers set
+    if isinstance(exception, HTTPError):
+        base_response = exception
+
+    c = AttributeDict()
+    c.error_message = base_response.status
+    c.error_explanation = base_response.explanation or str(base_response)
+    c.visual = AttributeDict()
+
+    c.visual.rhodecode_support_url = (
+        request.registry.settings.get('rhodecode_support_url') or
+        request.route_url('rhodecode_support')
+    )
+    c.redirect_time = 0
+    c.rhodecode_name = rc_config.get('rhodecode_title', '')
+    if not c.rhodecode_name:
+        c.rhodecode_name = 'Rhodecode'
+
+    response = render_to_response(
+        '/errors/error_document.html', {'c': c}, request=request,
+        response=base_response)
+
+    return response
+
+
 def includeme(config):
     settings = config.registry.settings
 
+    if asbool(settings.get('appenlight', 'false')):
+        config.include('appenlight_client.ext.pyramid_tween')
+
     # Includes which are required. The application would fail without them.
     config.include('pyramid_mako')
     config.include('pyramid_beaker')
+    config.include('rhodecode.admin')
     config.include('rhodecode.authentication')
     config.include('rhodecode.login')
     config.include('rhodecode.tweens')
     config.include('rhodecode.api')
+    config.add_route(
+        'rhodecode_support', 'https://rhodecode.com/help/', static=True)
 
     # Set the authorization policy.
     authz_policy = ACLAuthorizationPolicy()
     config.set_authorization_policy(authz_policy)
 
     # Set the default renderer for HTML templates to mako.
     config.add_mako_renderer('.html')
 
     # plugin information
     config.registry.rhodecode_plugins = {}
 
     config.add_directive(
         'register_rhodecode_plugin', register_rhodecode_plugin)
     # include RhodeCode plugins
     includes = aslist(settings.get('rhodecode.includes', []))
     for inc in includes:
         config.include(inc)
 
+    pylons_app = make_app(
+        config.registry._pylons_compat_global_config,
+        **config.registry._pylons_compat_settings)
+    config.registry._pylons_compat_config = pylons_app.config
+
+    pylons_app_as_view = wsgiapp(pylons_app)
+
+    # Protect from VCS Server error related pages when server is not available
+    vcs_server_enabled = asbool(settings.get('vcs.server.enable', 'true'))
+    if not vcs_server_enabled:
+        pylons_app_as_view = DisableVCSPagesWrapper(pylons_app_as_view)
+
+
+    def pylons_app_with_error_handler(context, request):
+        """
+        Handle exceptions from rc pylons app:
+
+        - old webob type exceptions get converted to pyramid exceptions
+        - pyramid exceptions are passed to the error handler view
+        """
+        try:
+            response = pylons_app_as_view(context, request)
+            if 400 <= response.status_int <= 599: # webob type error responses
+                return error_handler(
+                    webob_to_pyramid_http_response(response), request)
+        except HTTPError as e: # pyramid type exceptions
+            return error_handler(e, request)
+        except Exception:
+            if settings.get('debugtoolbar.enabled', False):
+                raise
+            return error_handler(HTTPInternalServerError(), request)
+        return response
+
     # This is the glue which allows us to migrate in chunks. By registering the
     # pylons based application as the "Not Found" view in Pyramid, we will
     # fallback to the old application each time the new one does not yet know
     # how to handle a request.
-    pylons_app = make_app(
-        config.registry._pylons_compat_global_config,
-        **config.registry._pylons_compat_settings)
-    config.registry._pylons_compat_config = pylons_app.config
-    pylons_app_as_view = wsgiapp(pylons_app)
-    config.add_notfound_view(pylons_app_as_view)
+    config.add_notfound_view(pylons_app_with_error_handler)
+
+    if settings.get('debugtoolbar.enabled', False):
+        # if toolbar, then only http type exceptions get caught and rendered
+        ExcClass = HTTPError
+    else:
+        # if no toolbar, then any exception gets caught and rendered
+        ExcClass = Exception
+    config.add_view(error_handler, context=ExcClass)
 
 
 def includeme_last(config):
     """
     The static file catchall needs to be last in the view configuration.
     """
     settings = config.registry.settings
 
     # Note: johbo: I would prefer to register a prefix for static files at some
     # point, e.g. move them under '_static/'. This would fully avoid that we
     # can have name clashes with a repository name. Imaging someone calling his
     # repo "css" ;-) Also having an external web server to serve out the static
     # files seems to be easier to set up if they have a common prefix.
     #
     # Example: config.add_static_view('_static', path='rhodecode:public')
     #
     # It might be an option to register both paths for a while and then migrate
     # over to the new location.
 
     # Serving static files with a catchall.
     if settings['static_files']:
         config.add_route('catchall_static', '/*subpath')
         config.add_view(
             static_view('rhodecode:public'), route_name='catchall_static')
 
 
 def wrap_app_in_wsgi_middlewares(pyramid_app, config):
     """
     Apply outer WSGI middlewares around the application.
 
     Part of this has been moved up from the Pylons layer, so that the
     data is also available if old Pylons code is hit through an already ported
     view.
     """
     settings = config.registry.settings
 
     # enable https redirects based on HTTP_X_URL_SCHEME set by proxy
     pyramid_app = HttpsFixup(pyramid_app, settings)
 
-    # Add RoutesMiddleware. Currently we have two instances in the stack. This
-    # is the upper one to support the pylons compatibility tween during
+    # Add RoutesMiddleware to support the pylons compatibility tween during
 
     # migration to pyramid.
     pyramid_app = RoutesMiddleware(
         pyramid_app, config.registry._pylons_compat_config['routes.map'])
 
+    if asbool(settings.get('appenlight', 'false')):
+        pyramid_app, _ = wrap_in_appenlight_if_enabled(
+            pyramid_app, config.registry._pylons_compat_config)
+
     # TODO: johbo: Don't really see why we enable the gzip middleware when
     # serving static files, might be something that should have its own setting
     # as well?
     if settings['static_files']:
         pyramid_app = make_gzip_middleware(
             pyramid_app, settings, compress_level=1)
 
     return pyramid_app
 
 
 def sanitize_settings_and_apply_defaults(settings):
     """
     Applies settings defaults and does all type conversion.
 
     We would move all settings parsing and preparation into this place, so that
     we have only one place left which deals with this part. The remaining parts
     of the application would start to rely fully on well prepared settings.
 
     This piece would later be split up per topic to avoid a big fat monster
     function.
     """
 
     # Pyramid's mako renderer has to search in the templates folder so that the
     # old templates still work. Ported and new templates are expected to use
     # real asset specifications for the includes.
     mako_directories = settings.setdefault('mako.directories', [
         # Base templates of the original Pylons application
         'rhodecode:templates',
     ])
     log.debug(
         "Using the following Mako template directories: %s",
         mako_directories)
 
     # Default includes, possible to change as a user
     pyramid_includes = settings.setdefault('pyramid.includes', [
         'rhodecode.lib.middleware.request_wrapper',
     ])
     log.debug(
         "Using the following pyramid.includes: %s",
         pyramid_includes)
 
     # TODO: johbo: Re-think this, usually the call to config.include
     # should allow to pass in a prefix.
     settings.setdefault('rhodecode.api.url', '/_admin/api')
 
     _bool_setting(settings, 'vcs.server.enable', 'true')
     _bool_setting(settings, 'static_files', 'true')
     _bool_setting(settings, 'is_test', 'false')
 
     return settings
 
 
 def _bool_setting(settings, name, default):
     settings[name] = asbool(settings.get(name, default))

rhodecode/config/routing.py

@@ -1,1149 +1,1141 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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/
 
 """
 Routes configuration
 
 The more specific and detailed routes should be defined first so they
 may take precedent over the more generic routes. For more information
 refer to the routes manual at http://routes.groovie.org/docs/
 
 IMPORTANT: if you change any routing here, make sure to take a look at lib/base.py
 and _route_name variable which uses some of stored naming here to do redirects.
 """
 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'
 
 # Default requirements for URL parts
 URL_NAME_REQUIREMENTS = {
     # group name can have a slash in them, but they must not end with a slash
     'group_name': r'.*?[^/]',
     # repo names can have a slash in them, but they must not end with a slash
     'repo_name': r'.*?[^/]',
     # file path eats up everything at the end
     'f_path': r'.*',
     # reference types
     'source_ref_type': '(branch|book|tag|rev|\%\(source_ref_type\)s)',
     'target_ref_type': '(branch|book|tag|rev|\%\(target_ref_type\)s)',
 }
 
 
 class JSRoutesMapper(Mapper):
     """
     Wrapper for routes.Mapper to make pyroutes compatible url definitions
     """
     _named_route_regex = re.compile(r'^[a-z-_0-9A-Z]+$')
     _argument_prog = re.compile('\{(.*?)\}|:\((.*)\)')
     def __init__(self, *args, **kw):
         super(JSRoutesMapper, self).__init__(*args, **kw)
         self._jsroutes = []
 
     def connect(self, *args, **kw):
         """
         Wrapper for connect to take an extra argument jsroute=True
 
         :param jsroute: boolean, if True will add the route to the pyroutes list
         """
         if kw.pop('jsroute', False):
             if not self._named_route_regex.match(args[0]):
                 raise Exception('only named routes can be added to pyroutes')
             self._jsroutes.append(args[0])
 
         super(JSRoutesMapper, self).connect(*args, **kw)
 
     def _extract_route_information(self, route):
         """
         Convert a route into tuple(name, path, args), eg:
             ('user_profile', '/profile/%(username)s', ['username'])
         """
         routepath = route.routepath
         def replace(matchobj):
             if matchobj.group(1):
                 return "%%(%s)s" % matchobj.group(1).split(':')[0]
             else:
                 return "%%(%s)s" % matchobj.group(2)
 
         routepath = self._argument_prog.sub(replace, routepath)
         return (
             route.name,
             routepath,
             [(arg[0].split(':')[0] if arg[0] != '' else arg[1])
               for arg in self._argument_prog.findall(route.routepath)]
         )
 
     def jsroutes(self):
         """
         Return a list of pyroutes.js compatible routes
         """
         for route_name in self._jsroutes:
             yield self._extract_route_information(self._routenames[route_name])
 
 
 def make_map(config):
     """Create, configure and return the routes Mapper"""
     rmap = JSRoutesMapper(directory=config['pylons.paths']['controllers'],
                   always_scan=config['debug'])
     rmap.minimization = False
     rmap.explicit = False
 
     from rhodecode.lib.utils2 import str2bool
     from rhodecode.model import repo, repo_group
 
     def check_repo(environ, match_dict):
         """
         check for valid repository for proper 404 handling
 
         :param environ:
         :param match_dict:
         """
         repo_name = match_dict.get('repo_name')
 
         if match_dict.get('f_path'):
             # fix for multiple initial slashes that causes errors
             match_dict['f_path'] = match_dict['f_path'].lstrip('/')
         repo_model = repo.RepoModel()
         by_name_match = repo_model.get_by_repo_name(repo_name)
         # if we match quickly from database, short circuit the operation,
         # and validate repo based on the type.
         if by_name_match:
             return True
 
         by_id_match = repo_model.get_repo_by_id(repo_name)
         if by_id_match:
             repo_name = by_id_match.repo_name
             match_dict['repo_name'] = repo_name
             return True
 
         return False
 
     def check_group(environ, match_dict):
         """
         check for valid repository group path for proper 404 handling
 
         :param environ:
         :param match_dict:
         """
         repo_group_name = match_dict.get('group_name')
         repo_group_model = repo_group.RepoGroupModel()
         by_name_match = repo_group_model.get_by_group_name(repo_group_name)
         if by_name_match:
             return True
 
         return False
 
     def check_user_group(environ, match_dict):
         """
         check for valid user group for proper 404 handling
 
         :param environ:
         :param match_dict:
         """
         return True
 
     def check_int(environ, match_dict):
         return match_dict.get('id').isdigit()
 
-    # The ErrorController route (handles 404/500 error pages); it should
-    # likely stay at the top, ensuring it can always be resolved
-    rmap.connect('/error/{action}', controller='error')
-    rmap.connect('/error/{action}/{id}', controller='error')
 
     #==========================================================================
     # CUSTOM ROUTES HERE
     #==========================================================================
 
     # MAIN PAGE
     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')
 
     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')
 
     rmap.connect(
         'user_profile', '/_profiles/{username}', controller='users',
         action='user_profile')
 
     # 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)
 
     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')
 
     # ADMIN REPOSITORY ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/repos') as m:
         m.connect('repos', '/repos',
                   action='create', conditions={'method': ['POST']})
         m.connect('repos', '/repos',
                   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)
         m.connect('repo', '/repos/{repo_name}',
                   action='show', conditions={'method': ['GET'],
                                              'function': check_repo},
                   requirements=URL_NAME_REQUIREMENTS)
 
     # ADMIN REPOSITORY GROUPS ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/repo_groups') as m:
         m.connect('repo_groups', '/repo_groups',
                   action='create', conditions={'method': ['POST']})
         m.connect('repo_groups', '/repo_groups',
                   action='index', conditions={'method': ['GET']})
         m.connect('new_repo_group', '/repo_groups/new',
                   action='new', conditions={'method': ['GET']})
         m.connect('update_repo_group', '/repo_groups/{group_name}',
                   action='update', conditions={'method': ['PUT'],
                                                'function': check_group},
                   requirements=URL_NAME_REQUIREMENTS)
 
         # EXTRAS REPO GROUP ROUTES
         m.connect('edit_repo_group', '/repo_groups/{group_name}/edit',
                   action='edit',
                   conditions={'method': ['GET'], 'function': check_group},
                   requirements=URL_NAME_REQUIREMENTS)
         m.connect('edit_repo_group', '/repo_groups/{group_name}/edit',
                   action='edit',
                   conditions={'method': ['PUT'], 'function': check_group},
                   requirements=URL_NAME_REQUIREMENTS)
 
         m.connect('edit_repo_group_advanced', '/repo_groups/{group_name}/edit/advanced',
                   action='edit_repo_group_advanced',
                   conditions={'method': ['GET'], 'function': check_group},
                   requirements=URL_NAME_REQUIREMENTS)
         m.connect('edit_repo_group_advanced', '/repo_groups/{group_name}/edit/advanced',
                   action='edit_repo_group_advanced',
                   conditions={'method': ['PUT'], 'function': check_group},
                   requirements=URL_NAME_REQUIREMENTS)
 
         m.connect('edit_repo_group_perms', '/repo_groups/{group_name}/edit/permissions',
                   action='edit_repo_group_perms',
                   conditions={'method': ['GET'], 'function': check_group},
                   requirements=URL_NAME_REQUIREMENTS)
         m.connect('edit_repo_group_perms', '/repo_groups/{group_name}/edit/permissions',
                   action='update_perms',
                   conditions={'method': ['PUT'], 'function': check_group},
                   requirements=URL_NAME_REQUIREMENTS)
 
         m.connect('delete_repo_group', '/repo_groups/{group_name}',
                   action='delete', conditions={'method': ['DELETE'],
                                                'function': check_group},
                   requirements=URL_NAME_REQUIREMENTS)
 
     # ADMIN USER ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/users') as m:
         m.connect('users', '/users',
                   action='create', conditions={'method': ['POST']})
         m.connect('users', '/users',
                   action='index', conditions={'method': ['GET']})
         m.connect('new_user', '/users/new',
                   action='new', conditions={'method': ['GET']})
         m.connect('update_user', '/users/{user_id}',
                   action='update', conditions={'method': ['PUT']})
         m.connect('delete_user', '/users/{user_id}',
                   action='delete', conditions={'method': ['DELETE']})
         m.connect('edit_user', '/users/{user_id}/edit',
                   action='edit', conditions={'method': ['GET']})
         m.connect('user', '/users/{user_id}',
                   action='show', conditions={'method': ['GET']})
         m.connect('force_password_reset_user', '/users/{user_id}/password_reset',
                   action='reset_password', conditions={'method': ['POST']})
         m.connect('create_personal_repo_group', '/users/{user_id}/create_repo_group',
                   action='create_personal_repo_group', conditions={'method': ['POST']})
 
         # EXTRAS USER ROUTES
         m.connect('edit_user_advanced', '/users/{user_id}/edit/advanced',
                   action='edit_advanced', conditions={'method': ['GET']})
         m.connect('edit_user_advanced', '/users/{user_id}/edit/advanced',
                   action='update_advanced', conditions={'method': ['PUT']})
 
         m.connect('edit_user_auth_tokens', '/users/{user_id}/edit/auth_tokens',
                   action='edit_auth_tokens', conditions={'method': ['GET']})
         m.connect('edit_user_auth_tokens', '/users/{user_id}/edit/auth_tokens',
                   action='add_auth_token', conditions={'method': ['PUT']})
         m.connect('edit_user_auth_tokens', '/users/{user_id}/edit/auth_tokens',
                   action='delete_auth_token', conditions={'method': ['DELETE']})
 
         m.connect('edit_user_global_perms', '/users/{user_id}/edit/global_permissions',
                   action='edit_global_perms', conditions={'method': ['GET']})
         m.connect('edit_user_global_perms', '/users/{user_id}/edit/global_permissions',
                   action='update_global_perms', conditions={'method': ['PUT']})
 
         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,
                         controller='admin/user_groups') as m:
         m.connect('users_groups', '/user_groups',
                   action='create', conditions={'method': ['POST']})
         m.connect('users_groups', '/user_groups',
                   action='index', conditions={'method': ['GET']})
         m.connect('new_users_group', '/user_groups/new',
                   action='new', conditions={'method': ['GET']})
         m.connect('update_users_group', '/user_groups/{user_group_id}',
                   action='update', conditions={'method': ['PUT']})
         m.connect('delete_users_group', '/user_groups/{user_group_id}',
                   action='delete', conditions={'method': ['DELETE']})
         m.connect('edit_users_group', '/user_groups/{user_group_id}/edit',
                   action='edit', conditions={'method': ['GET']},
                   function=check_user_group)
 
         # EXTRAS USER GROUP ROUTES
         m.connect('edit_user_group_global_perms',
                   '/user_groups/{user_group_id}/edit/global_permissions',
                   action='edit_global_perms', conditions={'method': ['GET']})
         m.connect('edit_user_group_global_perms',
                   '/user_groups/{user_group_id}/edit/global_permissions',
                   action='update_global_perms', conditions={'method': ['PUT']})
         m.connect('edit_user_group_perms_summary',
                   '/user_groups/{user_group_id}/edit/permissions_summary',
                   action='edit_perms_summary', conditions={'method': ['GET']})
 
         m.connect('edit_user_group_perms',
                   '/user_groups/{user_group_id}/edit/permissions',
                   action='edit_perms', conditions={'method': ['GET']})
         m.connect('edit_user_group_perms',
                   '/user_groups/{user_group_id}/edit/permissions',
                   action='update_perms', conditions={'method': ['PUT']})
 
         m.connect('edit_user_group_advanced',
                   '/user_groups/{user_group_id}/edit/advanced',
                   action='edit_advanced', conditions={'method': ['GET']})
 
         m.connect('edit_user_group_members',
                   '/user_groups/{user_group_id}/edit/members', jsroute=True,
                   action='edit_members', conditions={'method': ['GET']})
 
     # ADMIN PERMISSIONS ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/permissions') as m:
         m.connect('admin_permissions_application', '/permissions/application',
                   action='permission_application_update', conditions={'method': ['POST']})
         m.connect('admin_permissions_application', '/permissions/application',
                   action='permission_application', conditions={'method': ['GET']})
 
         m.connect('admin_permissions_global', '/permissions/global',
                   action='permission_global_update', conditions={'method': ['POST']})
         m.connect('admin_permissions_global', '/permissions/global',
                   action='permission_global', conditions={'method': ['GET']})
 
         m.connect('admin_permissions_object', '/permissions/object',
                   action='permission_objects_update', conditions={'method': ['POST']})
         m.connect('admin_permissions_object', '/permissions/object',
                   action='permission_objects', conditions={'method': ['GET']})
 
         m.connect('admin_permissions_ips', '/permissions/ips',
                   action='permission_ips', conditions={'method': ['POST']})
         m.connect('admin_permissions_ips', '/permissions/ips',
                   action='permission_ips', conditions={'method': ['GET']})
 
         m.connect('admin_permissions_overview', '/permissions/overview',
                   action='permission_perms', conditions={'method': ['GET']})
 
     # ADMIN DEFAULTS REST ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/defaults') as m:
         m.connect('admin_defaults_repositories', '/defaults/repositories',
                   action='update_repository_defaults', conditions={'method': ['POST']})
         m.connect('admin_defaults_repositories', '/defaults/repositories',
                   action='index', conditions={'method': ['GET']})
 
     # ADMIN DEBUG STYLE ROUTES
     if str2bool(config.get('debug_style')):
         with rmap.submapper(path_prefix=ADMIN_PREFIX + '/debug_style',
                             controller='debug_style') as m:
             m.connect('debug_style_home', '',
                       action='index', conditions={'method': ['GET']})
             m.connect('debug_style_template', '/t/{t_path}',
                       action='template', conditions={'method': ['GET']})
 
     # ADMIN SETTINGS ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/settings') as m:
 
         # default
         m.connect('admin_settings', '/settings',
                   action='settings_global_update',
                   conditions={'method': ['POST']})
         m.connect('admin_settings', '/settings',
                   action='settings_global', conditions={'method': ['GET']})
 
         m.connect('admin_settings_vcs', '/settings/vcs',
                   action='settings_vcs_update',
                   conditions={'method': ['POST']})
         m.connect('admin_settings_vcs', '/settings/vcs',
                   action='settings_vcs',
                   conditions={'method': ['GET']})
         m.connect('admin_settings_vcs', '/settings/vcs',
                   action='delete_svn_pattern',
                   conditions={'method': ['DELETE']})
 
         m.connect('admin_settings_mapping', '/settings/mapping',
                   action='settings_mapping_update',
                   conditions={'method': ['POST']})
         m.connect('admin_settings_mapping', '/settings/mapping',
                   action='settings_mapping', conditions={'method': ['GET']})
 
         m.connect('admin_settings_global', '/settings/global',
                   action='settings_global_update',
                   conditions={'method': ['POST']})
         m.connect('admin_settings_global', '/settings/global',
                   action='settings_global', conditions={'method': ['GET']})
 
         m.connect('admin_settings_visual', '/settings/visual',
                   action='settings_visual_update',
                   conditions={'method': ['POST']})
         m.connect('admin_settings_visual', '/settings/visual',
                   action='settings_visual', conditions={'method': ['GET']})
 
         m.connect('admin_settings_issuetracker',
                   '/settings/issue-tracker', action='settings_issuetracker',
                   conditions={'method': ['GET']})
         m.connect('admin_settings_issuetracker_save',
                   '/settings/issue-tracker/save',
                   action='settings_issuetracker_save',
                   conditions={'method': ['POST']})
         m.connect('admin_issuetracker_test', '/settings/issue-tracker/test',
                   action='settings_issuetracker_test',
                   conditions={'method': ['POST']})
         m.connect('admin_issuetracker_delete',
                   '/settings/issue-tracker/delete',
                   action='settings_issuetracker_delete',
                   conditions={'method': ['DELETE']})
 
         m.connect('admin_settings_email', '/settings/email',
                   action='settings_email_update',
                   conditions={'method': ['POST']})
         m.connect('admin_settings_email', '/settings/email',
                   action='settings_email', conditions={'method': ['GET']})
 
         m.connect('admin_settings_hooks', '/settings/hooks',
                   action='settings_hooks_update',
                   conditions={'method': ['POST', 'DELETE']})
         m.connect('admin_settings_hooks', '/settings/hooks',
                   action='settings_hooks', conditions={'method': ['GET']})
 
         m.connect('admin_settings_search', '/settings/search',
                   action='settings_search', conditions={'method': ['GET']})
 
         m.connect('admin_settings_system', '/settings/system',
                   action='settings_system', conditions={'method': ['GET']})
 
         m.connect('admin_settings_system_update', '/settings/system/updates',
                   action='settings_system_update', conditions={'method': ['GET']})
 
         m.connect('admin_settings_supervisor', '/settings/supervisor',
                   action='settings_supervisor', conditions={'method': ['GET']})
         m.connect('admin_settings_supervisor_log', '/settings/supervisor/{procid}/log',
                   action='settings_supervisor_log', conditions={'method': ['GET']})
 
         m.connect('admin_settings_labs', '/settings/labs',
                   action='settings_labs_update',
                   conditions={'method': ['POST']})
         m.connect('admin_settings_labs', '/settings/labs',
                   action='settings_labs', conditions={'method': ['GET']})
 
-        m.connect('admin_settings_open_source', '/settings/open_source',
-                  action='settings_open_source',
-                  conditions={'method': ['GET']})
-
     # ADMIN MY ACCOUNT
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/my_account') as m:
 
         m.connect('my_account', '/my_account',
                   action='my_account', conditions={'method': ['GET']})
         m.connect('my_account_edit', '/my_account/edit',
                   action='my_account_edit', conditions={'method': ['GET']})
         m.connect('my_account', '/my_account',
                   action='my_account_update', conditions={'method': ['POST']})
 
         m.connect('my_account_password', '/my_account/password',
                   action='my_account_password', conditions={'method': ['GET']})
         m.connect('my_account_password', '/my_account/password',
                   action='my_account_password_update', conditions={'method': ['POST']})
 
         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_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_auth_tokens', '/my_account/auth_tokens',
                   action='my_account_auth_tokens', conditions={'method': ['GET']})
         m.connect('my_account_auth_tokens', '/my_account/auth_tokens',
                   action='my_account_auth_tokens_add', conditions={'method': ['POST']})
         m.connect('my_account_auth_tokens', '/my_account/auth_tokens',
                   action='my_account_auth_tokens_delete', conditions={'method': ['DELETE']})
 
     # NOTIFICATION REST ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/notifications') as m:
         m.connect('notifications', '/notifications',
                   action='index', conditions={'method': ['GET']})
         m.connect('notifications_mark_all_read', '/notifications/mark_all_read',
                   action='mark_all_read', conditions={'method': ['POST']})
 
         m.connect('/notifications/{notification_id}',
                   action='update', conditions={'method': ['PUT']})
         m.connect('/notifications/{notification_id}',
                   action='delete', conditions={'method': ['DELETE']})
         m.connect('notification', '/notifications/{notification_id}',
                   action='show', conditions={'method': ['GET']})
 
     # ADMIN GIST
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/gists') as m:
         m.connect('gists', '/gists',
                   action='create', conditions={'method': ['POST']})
         m.connect('gists', '/gists', jsroute=True,
                   action='index', conditions={'method': ['GET']})
         m.connect('new_gist', '/gists/new', jsroute=True,
                   action='new', conditions={'method': ['GET']})
 
         m.connect('/gists/{gist_id}',
                   action='delete', conditions={'method': ['DELETE']})
         m.connect('edit_gist', '/gists/{gist_id}/edit',
                   action='edit_form', conditions={'method': ['GET']})
         m.connect('edit_gist', '/gists/{gist_id}/edit',
                   action='edit', conditions={'method': ['POST']})
         m.connect(
             'edit_gist_check_revision', '/gists/{gist_id}/edit/check_revision',
             action='check_revision', conditions={'method': ['GET']})
 
         m.connect('gist', '/gists/{gist_id}',
                   action='show', conditions={'method': ['GET']})
         m.connect('gist_rev', '/gists/{gist_id}/{revision}',
                   revision='tip',
                   action='show', conditions={'method': ['GET']})
         m.connect('formatted_gist', '/gists/{gist_id}/{revision}/{format}',
                   revision='tip',
                   action='show', conditions={'method': ['GET']})
         m.connect('formatted_gist_file', '/gists/{gist_id}/{revision}/{format}/{f_path}',
                   revision='tip',
                   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', '/pull-requests/{pull_request_id:[0-9]+}',
             action='pull_requests')
 
 
     # USER JOURNAL
     rmap.connect('journal', '%s/journal' % (ADMIN_PREFIX,),
                  controller='journal', action='index')
     rmap.connect('journal_rss', '%s/journal/rss' % (ADMIN_PREFIX,),
                  controller='journal', action='journal_rss')
     rmap.connect('journal_atom', '%s/journal/atom' % (ADMIN_PREFIX,),
                  controller='journal', action='journal_atom')
 
     rmap.connect('public_journal', '%s/public_journal' % (ADMIN_PREFIX,),
                  controller='journal', action='public_journal')
 
     rmap.connect('public_journal_rss', '%s/public_journal/rss' % (ADMIN_PREFIX,),
                  controller='journal', action='public_journal_rss')
 
     rmap.connect('public_journal_rss_old', '%s/public_journal_rss' % (ADMIN_PREFIX,),
                  controller='journal', action='public_journal_rss')
 
     rmap.connect('public_journal_atom',
                  '%s/public_journal/atom' % (ADMIN_PREFIX,), controller='journal',
                  action='public_journal_atom')
 
     rmap.connect('public_journal_atom_old',
                  '%s/public_journal_atom' % (ADMIN_PREFIX,), controller='journal',
                  action='public_journal_atom')
 
     rmap.connect('toggle_following', '%s/toggle_following' % (ADMIN_PREFIX,),
                  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',
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('atom_feed_home', '/{repo_name}/feed/atom',
                  controller='feed', action='atom',
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     #==========================================================================
     # REPOSITORY ROUTES
     #==========================================================================
 
     rmap.connect('repo_creating_home', '/{repo_name}/repo_creating',
                  controller='admin/repos', action='repo_creating',
                  requirements=URL_NAME_REQUIREMENTS)
     rmap.connect('repo_check_home', '/{repo_name}/crepo_check',
                  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', jsroute=True,
                  requirements=URL_NAME_REQUIREMENTS)
     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', jsroute=True,
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
     rmap.connect('changeset_children', '/{repo_name}/changeset_children/{revision}',
                  controller='changeset', revision='tip', action='changeset_children',
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
     rmap.connect('changeset_parents', '/{repo_name}/changeset_parents/{revision}',
                  controller='changeset', revision='tip', action='changeset_parents',
                  conditions={'function': check_repo},
                  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',
                  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},
                  requirements=URL_NAME_REQUIREMENTS)
     rmap.connect('create_repo_fields', '/{repo_name}/settings/fields/new',
                  controller='admin/repos', action='create_repo_field',
                  conditions={'method': ['PUT'], 'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
     rmap.connect('delete_repo_fields', '/{repo_name}/settings/fields/{field_id}',
                  controller='admin/repos', action='delete_repo_field',
                  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_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},
                  requirements=URL_NAME_REQUIREMENTS)
     rmap.connect('edit_repo_remote', '/{repo_name}/settings/remote',
                  controller='admin/repos', action='edit_remote',
                  conditions={'method': ['PUT'], 'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('edit_repo_statistics', '/{repo_name}/settings/statistics',
                  controller='admin/repos', action='edit_statistics_form',
                  conditions={'method': ['GET'], 'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
     rmap.connect('edit_repo_statistics', '/{repo_name}/settings/statistics',
                  controller='admin/repos', action='edit_statistics',
                  conditions={'method': ['PUT'], 'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
     rmap.connect('repo_settings_issuetracker',
                  '/{repo_name}/settings/issue-tracker',
                  controller='admin/repos', action='repo_issuetracker',
                  conditions={'method': ['GET'], 'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
     rmap.connect('repo_issuetracker_test',
                  '/{repo_name}/settings/issue-tracker/test',
                  controller='admin/repos', action='repo_issuetracker_test',
                  conditions={'method': ['POST'], 'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
     rmap.connect('repo_issuetracker_delete',
                  '/{repo_name}/settings/issue-tracker/delete',
                  controller='admin/repos', action='repo_issuetracker_delete',
                  conditions={'method': ['DELETE'], 'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
     rmap.connect('repo_issuetracker_save',
                  '/{repo_name}/settings/issue-tracker/save',
                  controller='admin/repos', action='repo_issuetracker_save',
                  conditions={'method': ['POST'], 'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
     rmap.connect('repo_vcs_settings', '/{repo_name}/settings/vcs',
                  controller='admin/repos', action='repo_settings_vcs_update',
                  conditions={'method': ['POST'], 'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
     rmap.connect('repo_vcs_settings', '/{repo_name}/settings/vcs',
                  controller='admin/repos', action='repo_settings_vcs',
                  conditions={'method': ['GET'], 'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
     rmap.connect('repo_vcs_settings', '/{repo_name}/settings/vcs',
                  controller='admin/repos', action='repo_delete_svn_pattern',
                  conditions={'method': ['DELETE'], 'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     # still working url for backward compat.
     rmap.connect('raw_changeset_home_depraced',
                  '/{repo_name}/raw-changeset/{revision}',
                  controller='changeset', action='changeset_raw',
                  revision='tip', conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     # new URLs
     rmap.connect('changeset_raw_home',
                  '/{repo_name}/changeset-diff/{revision}',
                  controller='changeset', action='changeset_raw',
                  revision='tip', conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('changeset_patch_home',
                  '/{repo_name}/changeset-patch/{revision}',
                  controller='changeset', action='changeset_patch',
                  revision='tip', conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('changeset_download_home',
                  '/{repo_name}/changeset-download/{revision}',
                  controller='changeset', action='changeset_download',
                  revision='tip', conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('changeset_comment',
                  '/{repo_name}/changeset/{revision}/comment', jsroute=True,
                  controller='changeset', revision='tip', action='comment',
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('changeset_comment_preview',
                  '/{repo_name}/changeset/comment/preview', jsroute=True,
                  controller='changeset', action='preview_comment',
                  conditions={'function': check_repo, 'method': ['POST']},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('changeset_comment_delete',
                  '/{repo_name}/changeset/comment/{comment_id}/delete',
                  controller='changeset', action='delete_comment',
                  conditions={'function': check_repo, 'method': ['DELETE']},
                  requirements=URL_NAME_REQUIREMENTS, jsroute=True)
 
     rmap.connect('changeset_info', '/changeset_info/{repo_name}/{revision}',
                  controller='changeset', action='changeset_info',
                  requirements=URL_NAME_REQUIREMENTS, jsroute=True)
 
     rmap.connect('compare_home',
                  '/{repo_name}/compare',
                  controller='compare', action='index',
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('compare_url',
                  '/{repo_name}/compare/{source_ref_type}@{source_ref:.*?}...{target_ref_type}@{target_ref:.*?}',
                  controller='compare', action='compare',
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS, jsroute=True)
 
     rmap.connect('pullrequest_home',
                  '/{repo_name}/pull-request/new', controller='pullrequests',
                  action='index', conditions={'function': check_repo,
                                              'method': ['GET']},
                  requirements=URL_NAME_REQUIREMENTS, jsroute=True)
 
     rmap.connect('pullrequest',
                  '/{repo_name}/pull-request/new', controller='pullrequests',
                  action='create', conditions={'function': check_repo,
                                               'method': ['POST']},
                  requirements=URL_NAME_REQUIREMENTS, jsroute=True)
 
     rmap.connect('pullrequest_repo_refs',
                  '/{repo_name}/pull-request/refs/{target_repo_name:.*?[^/]}',
                  controller='pullrequests',
                  action='get_repo_refs',
                  conditions={'function': check_repo, 'method': ['GET']},
                  requirements=URL_NAME_REQUIREMENTS, jsroute=True)
 
     rmap.connect('pullrequest_repo_destinations',
                  '/{repo_name}/pull-request/repo-destinations',
                  controller='pullrequests',
                  action='get_repo_destinations',
                  conditions={'function': check_repo, 'method': ['GET']},
                  requirements=URL_NAME_REQUIREMENTS, jsroute=True)
 
     rmap.connect('pullrequest_show',
                  '/{repo_name}/pull-request/{pull_request_id}',
                  controller='pullrequests',
                  action='show', conditions={'function': check_repo,
                                             'method': ['GET']},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('pullrequest_update',
                  '/{repo_name}/pull-request/{pull_request_id}',
                  controller='pullrequests',
                  action='update', conditions={'function': check_repo,
                                               'method': ['PUT']},
                  requirements=URL_NAME_REQUIREMENTS, jsroute=True)
 
     rmap.connect('pullrequest_merge',
                  '/{repo_name}/pull-request/{pull_request_id}',
                  controller='pullrequests',
                  action='merge', conditions={'function': check_repo,
                                              'method': ['POST']},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('pullrequest_delete',
                  '/{repo_name}/pull-request/{pull_request_id}',
                  controller='pullrequests',
                  action='delete', conditions={'function': check_repo,
                                               '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',
                  action='comment', conditions={'function': check_repo,
                                                'method': ['POST']},
                  requirements=URL_NAME_REQUIREMENTS, jsroute=True)
 
     rmap.connect('pullrequest_comment_delete',
                  '/{repo_name}/pull-request-comment/{comment_id}/delete',
                  controller='pullrequests', action='delete_comment',
                  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('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)
 
     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,
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS, jsroute=True)
 
     rmap.connect('changelog_details', '/{repo_name}/changelog_details/{cs}',
                  controller='changelog', action='changelog_details',
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('files_home',  '/{repo_name}/files/{revision}/{f_path}',
                  controller='files', revision='tip', f_path='',
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS, jsroute=True)
 
     rmap.connect('files_home_simple_catchrev',
                  '/{repo_name}/files/{revision}',
                  controller='files', revision='tip', f_path='',
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('files_home_simple_catchall',
                  '/{repo_name}/files',
                  controller='files', revision='tip', f_path='',
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('files_history_home',
                  '/{repo_name}/history/{revision}/{f_path}',
                  controller='files', action='history', revision='tip', f_path='',
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS, jsroute=True)
 
     rmap.connect('files_authors_home',
                  '/{repo_name}/authors/{revision}/{f_path}',
                  controller='files', action='authors', revision='tip', f_path='',
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS, jsroute=True)
 
     rmap.connect('files_diff_home', '/{repo_name}/diff/{f_path}',
                  controller='files', action='diff', f_path='',
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('files_diff_2way_home',
                  '/{repo_name}/diff-2way/{f_path}',
                  controller='files', action='diff_2way', f_path='',
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('files_rawfile_home',
                  '/{repo_name}/rawfile/{revision}/{f_path}',
                  controller='files', action='rawfile', revision='tip',
                  f_path='', conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('files_raw_home',
                  '/{repo_name}/raw/{revision}/{f_path}',
                  controller='files', action='raw', revision='tip', f_path='',
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('files_render_home',
                  '/{repo_name}/render/{revision}/{f_path}',
                  controller='files', action='index', revision='tip', f_path='',
                  rendered=True, conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('files_annotate_home',
                  '/{repo_name}/annotate/{revision}/{f_path}',
                  controller='files', action='index', revision='tip',
                  f_path='', annotate=True, conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('files_edit',
                  '/{repo_name}/edit/{revision}/{f_path}',
                  controller='files', action='edit', revision='tip',
                  f_path='',
                  conditions={'function': check_repo, 'method': ['POST']},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('files_edit_home',
                  '/{repo_name}/edit/{revision}/{f_path}',
                  controller='files', action='edit_home', revision='tip',
                  f_path='', conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('files_add',
                  '/{repo_name}/add/{revision}/{f_path}',
                  controller='files', action='add', revision='tip',
                  f_path='',
                  conditions={'function': check_repo, 'method': ['POST']},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('files_add_home',
                  '/{repo_name}/add/{revision}/{f_path}',
                  controller='files', action='add_home', revision='tip',
                  f_path='', conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('files_delete',
                  '/{repo_name}/delete/{revision}/{f_path}',
                  controller='files', action='delete', revision='tip',
                  f_path='',
                  conditions={'function': check_repo, 'method': ['POST']},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('files_delete_home',
                  '/{repo_name}/delete/{revision}/{f_path}',
                  controller='files', action='delete_home', revision='tip',
                  f_path='', conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('files_archive_home', '/{repo_name}/archive/{fname}',
                  controller='files', action='archivefile',
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS, jsroute=True)
 
     rmap.connect('files_nodelist_home',
                  '/{repo_name}/nodelist/{revision}/{f_path}',
                  controller='files', action='nodelist',
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS, jsroute=True)
 
     rmap.connect('files_metadata_list_home',
                  '/{repo_name}/metadata_list/{revision}/{f_path}',
                  controller='files', action='metadata_list',
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS, jsroute=True)
 
     rmap.connect('repo_fork_create_home', '/{repo_name}/fork',
                  controller='forks', action='fork_create',
                  conditions={'function': check_repo, 'method': ['POST']},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('repo_fork_home', '/{repo_name}/fork',
                  controller='forks', action='fork',
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('repo_forks_home', '/{repo_name}/forks',
                  controller='forks', action='forks',
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
     rmap.connect('repo_followers_home', '/{repo_name}/followers',
                  controller='followers', action='followers',
                  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,
         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)

rhodecode/config/utils.py

@@ -1,99 +1,103 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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 shlex
 import Pyro4
 import platform
 
 from rhodecode.model import init_model
 
 
 def configure_pyro4(config):
     """
     Configure Pyro4 based on `config`.
 
     This will mainly set the different configuration parameters of the Pyro4
     library based on the settings in our INI files. The Pyro4 documentation
     lists more details about the specific settings and their meaning.
     """
     Pyro4.config.COMMTIMEOUT = float(config['vcs.connection_timeout'])
     Pyro4.config.SERIALIZER = 'pickle'
     Pyro4.config.SERIALIZERS_ACCEPTED.add('pickle')
 
     # Note: We need server configuration in the WSGI processes
     # because we provide a callback server in certain vcs operations.
     Pyro4.config.SERVERTYPE = "multiplex"
     Pyro4.config.POLLTIMEOUT = 0.01
 
 
 def configure_vcs(config):
     """
     Patch VCS config with some RhodeCode specific stuff
     """
     from rhodecode.lib.vcs import conf
     from rhodecode.lib.utils2 import aslist
     conf.settings.BACKENDS = {
         'hg': 'rhodecode.lib.vcs.backends.hg.MercurialRepository',
         'git': 'rhodecode.lib.vcs.backends.git.GitRepository',
         'svn': 'rhodecode.lib.vcs.backends.svn.SubversionRepository',
     }
 
     conf.settings.HG_USE_REBASE_FOR_MERGING = config.get(
         'rhodecode_hg_use_rebase_for_merging', False)
     conf.settings.GIT_REV_FILTER = shlex.split(
         config.get('git_rev_filter', '--all').strip())
     conf.settings.DEFAULT_ENCODINGS = aslist(config.get('default_encoding',
                                                         'UTF-8'), sep=',')
     conf.settings.ALIASES[:] = config.get('vcs.backends')
     conf.settings.SVN_COMPATIBLE_VERSION = config.get(
         'vcs.svn.compatible_version')
 
 
 def initialize_database(config):
-    from rhodecode.lib.utils2 import engine_from_config
+    from rhodecode.lib.utils2 import engine_from_config, get_encryption_key
     engine = engine_from_config(config, 'sqlalchemy.db1.')
-    init_model(engine, encryption_key=config['beaker.session.secret'])
+    init_model(engine, encryption_key=get_encryption_key(config))
 
 
 def initialize_test_environment(settings, test_env=None):
     if test_env is None:
         test_env = not int(os.environ.get('RC_NO_TMP_PATH', 0))
 
-    from rhodecode.lib.utils import create_test_env, create_test_index
+    from rhodecode.lib.utils import (
+        create_test_directory, create_test_database, create_test_repositories,
+        create_test_index)
     from rhodecode.tests import TESTS_TMP_PATH
     # test repos
     if test_env:
-        create_test_env(TESTS_TMP_PATH, settings)
-        create_test_index(TESTS_TMP_PATH, settings, True)
+        create_test_directory(TESTS_TMP_PATH)
+        create_test_database(TESTS_TMP_PATH, settings)
+        create_test_repositories(TESTS_TMP_PATH, settings)
+        create_test_index(TESTS_TMP_PATH, settings)
 
 
 def get_vcs_server_protocol(config):
     protocol = config.get('vcs.server.protocol', 'pyro4')
     return protocol
 
 
 def set_instance_id(config):
     """ Sets a dynamic generated config['instance_id'] if missing or '*' """
 
     config['instance_id'] = config.get('instance_id') or ''
     if config['instance_id'] == '*' or not config['instance_id']:
         _platform_id = platform.uname()[1] or 'instance'
         config['instance_id'] = '%s-%s' % (_platform_id, os.getpid())

rhodecode/controllers/admin/repo_groups.py

@@ -1,407 +1,406 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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/
 
 
 """
 Repository groups controller for RhodeCode
 """
 
 import logging
 import formencode
 
 from formencode import htmlfill
 
 from pylons import request, tmpl_context as c, url
 from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _, ungettext
 
 from rhodecode.lib import auth
 from rhodecode.lib import helpers as h
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.auth import (
     LoginRequired, NotAnonymous, HasPermissionAll,
     HasRepoGroupPermissionAll, HasRepoGroupPermissionAnyDecorator)
 from rhodecode.lib.base import BaseController, render
 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__)
 
 
 class RepoGroupsController(BaseController):
     """REST Controller styled on the Atom Publishing Protocol"""
 
     @LoginRequired()
     def __before__(self):
         super(RepoGroupsController, self).__before__()
 
     def __load_defaults(self, allow_empty_group=False, repo_group=None):
         if self._can_create_repo_group():
             # we're global admin, we're ok and we can create TOP level groups
             allow_empty_group = True
 
         # override the choices for this form, we need to filter choices
         # and display only those we have ADMIN right
         groups_with_admin_rights = RepoGroupList(
             RepoGroup.query().all(),
             perm_set=['group.admin'])
         c.repo_groups = RepoGroup.groups_choices(
             groups=groups_with_admin_rights,
             show_empty_group=allow_empty_group)
 
         if repo_group:
             # exclude filtered ids
             exclude_group_ids = [repo_group.group_id]
             c.repo_groups = filter(lambda x: x[0] not in exclude_group_ids,
                                    c.repo_groups)
             c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
             parent_group = repo_group.parent_group
 
             add_parent_group = (parent_group and (
                 unicode(parent_group.group_id) not in c.repo_groups_choices))
             if add_parent_group:
                 c.repo_groups_choices.append(unicode(parent_group.group_id))
                 c.repo_groups.append(RepoGroup._generate_choice(parent_group))
 
     def __load_data(self, group_id):
         """
         Load defaults settings for edit, and update
 
         :param group_id:
         """
         repo_group = RepoGroup.get_or_404(group_id)
         data = repo_group.get_dict()
         data['group_name'] = repo_group.name
 
         # fill owner
         if repo_group.user:
             data.update({'user': repo_group.user.username})
         else:
-            replacement_user = User.get_first_admin().username
+            replacement_user = User.get_first_super_admin().username
             data.update({'user': replacement_user})
 
         # fill repository group users
         for p in repo_group.repo_group_to_perm:
             data.update({
                 'u_perm_%s' % p.user.user_id: p.permission.permission_name})
 
         # fill repository group user groups
         for p in repo_group.users_group_to_perm:
             data.update({
                 'g_perm_%s' % p.users_group.users_group_id:
                 p.permission.permission_name})
         # html and form expects -1 as empty parent group
         data['group_parent_id'] = data['group_parent_id'] or -1
         return data
 
     def _revoke_perms_on_yourself(self, form_result):
         _updates = filter(lambda u: c.rhodecode_user.user_id == int(u[0]),
                           form_result['perm_updates'])
         _additions = filter(lambda u: c.rhodecode_user.user_id == int(u[0]),
                             form_result['perm_additions'])
         _deletions = filter(lambda u: c.rhodecode_user.user_id == int(u[0]),
                             form_result['perm_deletions'])
         admin_perm = 'group.admin'
         if _updates and _updates[0][1] != admin_perm or \
            _additions and _additions[0][1] != admin_perm or \
            _deletions and _deletions[0][1] != admin_perm:
             return True
         return False
 
     def _can_create_repo_group(self, parent_group_id=None):
         is_admin = HasPermissionAll('hg.admin')('group create controller')
         create_repo_group = HasPermissionAll(
             'hg.repogroup.create.true')('group create controller')
         if is_admin or (create_repo_group and not parent_group_id):
             # we're global admin, or we have global repo group create
             # permission
             # we're ok and we can create TOP level groups
             return True
         elif parent_group_id:
             # we check the permission if we can write to parent group
             group = RepoGroup.get(parent_group_id)
             group_name = group.group_name if group else None
             if HasRepoGroupPermissionAll('group.admin')(
                     group_name, 'check if user is an admin of group'):
                 # we're an admin of passed in group, we're ok.
                 return True
             else:
                 return False
         return False
 
     @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)
         repo_group_data = RepoGroupModel().get_repo_groups_as_dict(
             repo_group_list=repo_group_list_acl, admin=True)
         c.data = json.dumps(repo_group_data)
         return render('admin/repo_groups/repo_groups.html')
 
     # perm checks inside
     @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)
 
         self.__load_defaults()
         # permissions for can create group based on parent_id are checked
         # here in the Form
         available_groups = map(lambda k: unicode(k[0]), c.repo_groups)
         repo_group_form = RepoGroupForm(available_groups=available_groups,
                                         can_create_in_root=can_create)()
         try:
             owner = c.rhodecode_user
             form_result = repo_group_form.to_python(dict(request.POST))
             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()
             _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.flash(h.literal(_('Created repository group %s')
                     % repo_group_url), category='success')
             # TODO: in futureaction_logger(, '', '', '', self.sa)
         except formencode.Invalid as errors:
             return htmlfill.render(
                 render('admin/repo_groups/repo_group_add.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8",
                 force_defaults=False)
         except Exception:
             log.exception("Exception during creation of repository group")
             h.flash(_('Error occurred during creation of repository group %s')
                     % request.POST.get('group_name'), category='error')
 
         # TODO: maybe we should get back to the main view, not the admin one
         return redirect(url('repo_groups', parent_group=parent_group_id))
 
     # 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):
             return abort(403)
 
         self.__load_defaults()
         return render('admin/repo_groups/repo_group_add.html')
 
     @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')
         # 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()
         show_root_location = can_create_in_root
         if not c.repo_group.parent_group:
             # this group don't have a parrent so we should show empty value
             show_root_location = True
         self.__load_defaults(allow_empty_group=show_root_location,
                              repo_group=c.repo_group)
 
         repo_group_form = RepoGroupForm(
-            edit=True,
-            old_data=c.repo_group.get_dict(),
+            edit=True, old_data=c.repo_group.get_dict(),
             available_groups=c.repo_groups_choices,
-            can_create_in_root=can_create_in_root,
-        )()
+            can_create_in_root=can_create_in_root, allow_disabled=True)()
+
         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)
             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(
                 render('admin/repo_groups/repo_group_edit.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8",
                 force_defaults=False)
         except Exception:
             log.exception("Exception during update or repository group")
             h.flash(_('Error occurred during update of repository group %s')
                     % request.POST.get('group_name'), category='error')
 
         return redirect(url('edit_repo_group', group_name=group_name))
 
     @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')
         # url('repo_group_home', group_name=GROUP_NAME)
 
         gr = c.repo_group = RepoGroupModel()._get_repo_group(group_name)
         repos = gr.repositories.all()
         if repos:
             msg = ungettext(
                 'This group contains %(num)d repository and cannot be deleted',
                 'This group contains %(num)d repositories and cannot be'
                 ' deleted',
                 len(repos)) % {'num': len(repos)}
             h.flash(msg, category='warning')
             return redirect(url('repo_groups'))
 
         children = gr.children.all()
         if children:
             msg = ungettext(
                 'This group contains %(num)d subgroup and cannot be deleted',
                 'This group contains %(num)d subgroups and cannot be deleted',
                 len(children)) % {'num': len(children)}
             h.flash(msg, category='warning')
             return redirect(url('repo_groups'))
 
         try:
             RepoGroupModel().delete(group_name)
             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')
                     % group_name, category='error')
 
         return redirect(url('repo_groups'))
 
     @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)
         # we can only allow moving empty group if it's already a top-level
         # group, ie has no parents, or we're admin
         can_create_in_root = self._can_create_repo_group()
         show_root_location = can_create_in_root
         if not c.repo_group.parent_group:
             # this group don't have a parrent so we should show empty value
             show_root_location = True
         self.__load_defaults(allow_empty_group=show_root_location,
                              repo_group=c.repo_group)
         defaults = self.__load_data(c.repo_group.group_id)
 
         return htmlfill.render(
             render('admin/repo_groups/repo_group_edit.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False
         )
 
     @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)
 
         return render('admin/repo_groups/repo_group_edit.html')
 
     @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()
         defaults = self.__load_data(c.repo_group.group_id)
 
         return htmlfill.render(
             render('admin/repo_groups/repo_group_edit.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False
         )
 
     @HasRepoGroupPermissionAnyDecorator('group.admin')
     @auth.CSRFRequired()
     def update_perms(self, group_name):
         """
         Update permissions for given repository group
 
         :param group_name:
         """
 
         c.repo_group = RepoGroupModel()._get_repo_group(group_name)
         valid_recursive_choices = ['none', 'repos', 'groups', 'all']
         form = RepoGroupPermsForm(valid_recursive_choices)().to_python(
             request.POST)
 
         if not c.rhodecode_user.is_admin:
             if self._revoke_perms_on_yourself(form):
                 msg = _('Cannot change permission for yourself as admin')
                 h.flash(msg, category='warning')
                 return redirect(
                     url('edit_repo_group_perms', group_name=group_name))
 
         # iterate over all members(if in recursive mode) of this groups and
         # set the permissions !
         # this can be potentially heavy operation
         RepoGroupModel().update_permissions(
             c.repo_group,
             form['perm_additions'], form['perm_updates'],
             form['perm_deletions'], form['recursive'])
 
         # 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))

rhodecode/controllers/admin/repos.py

@@ -1,878 +1,878 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2013-2016  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/
 
 
 """
 Repositories controller for RhodeCode
 """
 
 import logging
 import traceback
 
 import formencode
 from formencode import htmlfill
 from pylons import request, tmpl_context as c, url
 from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
 from webob.exc import HTTPForbidden, HTTPNotFound, HTTPBadRequest
 
 from rhodecode.lib import auth, helpers as h
 from rhodecode.lib.auth import (
     LoginRequired, HasPermissionAllDecorator,
     HasRepoPermissionAllDecorator, NotAnonymous, HasPermissionAny,
     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.utils2 import safe_int
 from rhodecode.lib.vcs import RepositoryError
 from rhodecode.model.db import (
     User, Repository, UserFollowing, RepoGroup, RepositoryField)
 from rhodecode.model.forms import (
     RepoForm, RepoFieldForm, RepoPermsForm, RepoVcsSettingsForm,
     IssueTrackerPatternsForm)
 from rhodecode.model.meta import Session
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.scm import ScmModel, RepoGroupList, RepoList
 from rhodecode.model.settings import (
     SettingsModel, IssueTrackerSettingsModel, VcsSettingsModel,
     SettingNotFound)
 
 log = logging.getLogger(__name__)
 
 
 class ReposController(BaseRepoController):
     """
     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('repo', 'repos')
 
     @LoginRequired()
     def __before__(self):
         super(ReposController, self).__before__()
 
     def _load_repo(self, repo_name):
         repo_obj = Repository.get_by_repo_name(repo_name)
 
         if repo_obj is None:
             h.not_mapped_error(repo_name)
             return redirect(url('repos'))
 
         return repo_obj
 
     def __load_defaults(self, repo=None):
         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: unicode(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 = None
         if repo:
             repo_group = repo.group
         if repo_group and unicode(repo_group.group_id) not in c.repo_groups_choices:
             c.repo_groups_choices.append(unicode(repo_group.group_id))
             c.repo_groups.append(RepoGroup._generate_choice(repo_group))
 
         choices, c.landing_revs = ScmModel().get_repo_landing_revs()
         c.landing_revs_choices = choices
 
     def __load_data(self, repo_name=None):
         """
         Load defaults settings for edit, and update
 
         :param repo_name:
         """
         c.repo_info = self._load_repo(repo_name)
         self.__load_defaults(c.repo_info)
 
         # override defaults for exact repo info here git/hg etc
         if not c.repository_requirements_missing:
             choices, c.landing_revs = ScmModel().get_repo_landing_revs(
                 c.repo_info)
             c.landing_revs_choices = choices
         defaults = RepoModel()._get_defaults(repo_name)
 
         return defaults
 
     def _log_creation_exception(self, e, repo_name):
             reason = None
             if len(e.args) == 2:
                 reason = e.args[1]
 
             if reason == 'INVALID_CERTIFICATE':
                 log.exception(
                     'Exception creating a repository: invalid certificate')
                 msg = (_('Error creating repository %s: invalid certificate')
                        % repo_name)
             else:
                 log.exception("Exception creating a repository")
                 msg = (_('Error creating repository %s')
                        % repo_name)
 
             return msg
 
     @NotAnonymous()
     def index(self, format='html'):
         """GET /repos: All items in the collection"""
         # url('repos')
 
         repo_list = Repository.get_all_repos()
         c.repo_list = RepoList(repo_list, perm_set=['repository.admin'])
         repos_data = RepoModel().get_repos_as_dict(
             repo_list=c.repo_list, admin=True, super_user_actions=True)
         # json used to render the grid
         c.data = json.dumps(repos_data)
 
         return render('admin/repos/repos.html')
 
     # perms check inside
     @NotAnonymous()
     @auth.CSRFRequired()
     def create(self):
         """
         POST /repos: Create a new item"""
         # url('repos')
 
         self.__load_defaults()
         form_result = {}
         task_id = None
         try:
             # CanWriteToGroup validators checks permissions of this POST
             form_result = RepoForm(repo_groups=c.repo_groups_choices,
                                    landing_revs=c.landing_revs_choices)()\
                             .to_python(dict(request.POST))
 
             # create is done sometimes async on celery, db transaction
             # management is handled there.
             task = RepoModel().create(form_result, c.rhodecode_user.user_id)
             from celery.result import BaseAsyncResult
             if isinstance(task, BaseAsyncResult):
                 task_id = task.task_id
         except formencode.Invalid as errors:
             c.personal_repo_group = RepoGroup.get_by_group_name(
                 c.rhodecode_user.username)
             return htmlfill.render(
                 render('admin/repos/repo_add.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8",
                 force_defaults=False)
 
         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.url('repo_creating_home',
                               repo_name=form_result['repo_name_full'],
                               task_id=task_id))
 
     # perms check inside
     @NotAnonymous()
     def create_repository(self):
         """GET /_admin/create_repository: Form to create a new item"""
         new_repo = request.GET.get('repo', '')
         parent_group = request.GET.get('parent_group')
         if not HasPermissionAny('hg.admin', 'hg.create.repository')():
             # you're not super admin nor have global create permissions,
             # but maybe you have at least write permission to a parent group ?
             _gr = RepoGroup.get(parent_group)
             gr_name = _gr.group_name if _gr else None
             # create repositories with write permission on group is set to true
             create_on_write = HasPermissionAny('hg.create.write_on_repogroup.true')()
             group_admin = HasRepoGroupPermissionAny('group.admin')(group_name=gr_name)
             group_write = HasRepoGroupPermissionAny('group.write')(group_name=gr_name)
             if not (group_admin or (group_write and create_on_write)):
                 raise HTTPForbidden
 
         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: unicode(k[0]), c.repo_groups)
         choices, c.landing_revs = ScmModel().get_repo_landing_revs()
         c.personal_repo_group = RepoGroup.get_by_group_name(c.rhodecode_user.username)
         c.new_repo = repo_name_slug(new_repo)
 
         ## apply the defaults from defaults page
         defaults = SettingsModel().get_default_repo_settings(strip_prefix=True)
         # set checkbox to autochecked
         defaults['repo_copy_permissions'] = True
         if parent_group:
             defaults.update({'repo_group': parent_group})
 
         return htmlfill.render(
             render('admin/repos/repo_add.html'),
             defaults=defaults,
             errors={},
             prefix_error=False,
             encoding="UTF-8",
             force_defaults=False
         )
 
     @NotAnonymous()
     def repo_creating(self, repo_name):
         c.repo = repo_name
         c.task_id = request.GET.get('task_id')
         if not c.repo:
             raise HTTPNotFound()
         return render('admin/repos/repo_creating.html')
 
     @NotAnonymous()
     @jsonify
     def repo_check(self, repo_name):
         c.repo = repo_name
         task_id = request.GET.get('task_id')
 
         if task_id and task_id not in ['None']:
-            from rhodecode import CELERY_ENABLED
+            import rhodecode
             from celery.result import AsyncResult
-            if CELERY_ENABLED:
+            if rhodecode.CELERY_ENABLED:
                 task = AsyncResult(task_id)
                 if task.failed():
                     msg = self._log_creation_exception(task.result, c.repo)
                     h.flash(msg, category='error')
                     return redirect(url('home'), code=501)
 
         repo = Repository.get_by_repo_name(repo_name)
         if repo and repo.repo_state == Repository.STATE_CREATED:
             if repo.clone_uri:
                 clone_uri = repo.clone_uri_hidden
                 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))
                 fork = repo.fork
                 if fork:
                     fork_name = fork.repo_name
                     h.flash(h.literal(_('Forked repository %s as %s')
                             % (fork_name, repo_url)), category='success')
                 else:
                     h.flash(h.literal(_('Created repository %s') % repo_url),
                             category='success')
             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
 
         # override the choices with extracted revisions !
         c.personal_repo_group = RepoGroup.get_by_group_name(
             c.rhodecode_user.username)
         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)()
+        _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.html'),
                 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):
         """
         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"""
         # 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 = RepoGroup.get_by_group_name(
             c.rhodecode_user.username)
         c.active = 'settings'
         return htmlfill.render(
             render('admin/repos/repo_edit.html'),
             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)
 
         return htmlfill.render(
             render('admin/repos/repo_edit.html'),
             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"""
         # 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()
         c.active = 'fields'
         if request.POST:
 
             return redirect(url('repo_edit_fields'))
         return render('admin/repos/repo_edit.html')
 
     @HasRepoPermissionAllDecorator('repository.admin')
     @auth.CSRFRequired()
     def create_repo_field(self, repo_name):
         try:
             form_result = RepoFieldForm()().to_python(dict(request.POST))
             RepoModel().add_repo_field(
                 repo_name, form_result['new_field_key'],
                 field_type=form_result['new_field_type'],
                 field_value=form_result['new_field_value'],
                 field_label=form_result['new_field_label'],
                 field_desc=form_result['new_field_desc'])
 
             Session().commit()
         except Exception as e:
             log.exception("Exception creating field")
             msg = _('An error occurred during creation of field')
             if isinstance(e, formencode.Invalid):
                 msg += ". " + e.msg
             h.flash(msg, category='error')
         return redirect(url('edit_repo_fields', repo_name=repo_name))
 
     @HasRepoPermissionAllDecorator('repository.admin')
     @auth.CSRFRequired()
     def delete_repo_field(self, repo_name, field_id):
         field = RepositoryField.get_or_404(field_id)
         try:
             RepoModel().delete_repo_field(repo_name, field.field_key)
             Session().commit()
         except Exception as e:
             log.exception("Exception during removal of field")
             msg = _('An error occurred during removal of field')
             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"""
         # 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()\
             .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.html')
 
     @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):
         """
         Toggle locking of repository by simple GET call to url
 
         :param repo_name:
         """
 
         try:
             repo = Repository.get_by_repo_name(repo_name)
 
             if repo.enable_locking:
                 if repo.locked[0]:
                     Repository.unlock(repo)
                     action = _('Unlocked')
                 else:
                     Repository.lock(repo, c.rhodecode_user.user_id,
                                     lock_reason=Repository.LOCK_WEB)
                     action = _('Locked')
 
                 h.flash(_('Repository has been %s') % action,
                         category='success')
         except Exception:
             log.exception("Exception during unlocking")
             h.flash(_('An error occurred during unlocking'),
                     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"""
         # url('edit_repo', repo_name=ID)
         c.repo_info = self._load_repo(repo_name)
         c.active = 'caches'
 
         return render('admin/repos/repo_edit.html')
 
     @HasRepoPermissionAllDecorator('repository.admin')
     @auth.CSRFRequired()
     def edit_remote(self, repo_name):
         """PUT /{repo_name}/settings/remote: edit the repo remote."""
         try:
             ScmModel().pull_changes(repo_name, c.rhodecode_user.username)
             h.flash(_('Pulled from remote location'), category='success')
         except Exception:
             log.exception("Exception during pull from remote")
             h.flash(_('An error occurred during pull from remote location'),
                     category='error')
         return redirect(url('edit_repo_remote', repo_name=c.repo_name))
 
     @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'
 
         return render('admin/repos/repo_edit.html')
 
     @HasRepoPermissionAllDecorator('repository.admin')
     @auth.CSRFRequired()
     def edit_statistics(self, repo_name):
         """PUT /{repo_name}/settings/statistics: reset the repo statistics."""
         try:
             RepoModel().delete_stats(repo_name)
             Session().commit()
         except Exception as e:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during deletion of repository stats'),
                     category='error')
         return redirect(url('edit_repo_statistics', repo_name=c.repo_name))
 
     @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()
 
         if c.repo_info.stats:
             # this is on what revision we ended up so we add +1 for count
             last_rev = c.repo_info.stats.stat_on_revision + 1
         else:
             last_rev = 0
         c.stats_revision = last_rev
 
         c.repo_last_rev = repo.count()
 
         if last_rev == 0 or c.repo_last_rev == 0:
             c.stats_percentage = 0
         else:
             c.stats_percentage = '%.2f' % ((float((last_rev)) / c.repo_last_rev) * 100)
 
         c.active = 'statistics'
 
         return render('admin/repos/repo_edit.html')
 
     @HasRepoPermissionAllDecorator('repository.admin')
     @auth.CSRFRequired()
     def repo_issuetracker_test(self, repo_name):
         if request.is_xhr:
             return h.urlify_commit_message(
                 request.POST.get('test_text', ''),
                 repo_name)
         else:
             raise HTTPBadRequest()
 
     @HasRepoPermissionAllDecorator('repository.admin')
     @auth.CSRFRequired()
     def repo_issuetracker_delete(self, repo_name):
         uid = request.POST.get('uid')
         repo_settings = IssueTrackerSettingsModel(repo=repo_name)
         try:
             repo_settings.delete_entries(uid)
         except Exception:
             h.flash(_('Error occurred during deleting issue tracker entry'),
                     category='error')
         else:
             h.flash(_('Removed issue tracker entry'), category='success')
         return redirect(url('repo_settings_issuetracker',
                         repo_name=repo_name))
 
     def _update_patterns(self, form, repo_settings):
         for uid in form['delete_patterns']:
             repo_settings.delete_entries(uid)
 
         for pattern in form['patterns']:
             for setting, value, type_ in pattern:
                 sett = repo_settings.create_or_update_setting(
                     setting, value, type_)
                 Session().add(sett)
 
             Session().commit()
 
     @HasRepoPermissionAllDecorator('repository.admin')
     @auth.CSRFRequired()
     def repo_issuetracker_save(self, repo_name):
         # Save inheritance
         repo_settings = IssueTrackerSettingsModel(repo=repo_name)
         inherited = (request.POST.get('inherit_global_issuetracker')
                      == "inherited")
         repo_settings.inherit_global_settings = inherited
         Session().commit()
 
         form = IssueTrackerPatternsForm()().to_python(request.POST)
         if form:
             self._update_patterns(form, repo_settings)
 
         h.flash(_('Updated issue tracker entries'), category='success')
         return redirect(url('repo_settings_issuetracker',
                         repo_name=repo_name))
 
     @HasRepoPermissionAllDecorator('repository.admin')
     def repo_issuetracker(self, repo_name):
         """GET /admin/settings/issue-tracker: All items in the collection"""
         c.active = 'issuetracker'
         c.data = 'data'
         c.repo_info = self._load_repo(repo_name)
 
         repo = Repository.get_by_repo_name(repo_name)
         c.settings_model = IssueTrackerSettingsModel(repo=repo)
         c.global_patterns = c.settings_model.get_global_settings()
         c.repo_patterns = c.settings_model.get_repo_settings()
 
         return render('admin/repos/repo_edit.html')
 
     @HasRepoPermissionAllDecorator('repository.admin')
     def repo_settings_vcs(self, repo_name):
         """GET /{repo_name}/settings/vcs/: All items in the collection"""
 
         model = VcsSettingsModel(repo=repo_name)
 
         c.active = 'vcs'
         c.global_svn_branch_patterns = model.get_global_svn_branch_patterns()
         c.global_svn_tag_patterns = model.get_global_svn_tag_patterns()
         c.svn_branch_patterns = model.get_repo_svn_branch_patterns()
         c.svn_tag_patterns = model.get_repo_svn_tag_patterns()
         c.repo_info = self._load_repo(repo_name)
         defaults = self._vcs_form_defaults(repo_name)
         c.inherit_global_settings = defaults['inherit_global_settings']
 
         return htmlfill.render(
             render('admin/repos/repo_edit.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False)
 
     @HasRepoPermissionAllDecorator('repository.admin')
     @auth.CSRFRequired()
     def repo_settings_vcs_update(self, repo_name):
         """POST /{repo_name}/settings/vcs/: All items in the collection"""
         c.active = 'vcs'
 
         model = VcsSettingsModel(repo=repo_name)
         c.global_svn_branch_patterns = model.get_global_svn_branch_patterns()
         c.global_svn_tag_patterns = model.get_global_svn_tag_patterns()
         c.svn_branch_patterns = model.get_repo_svn_branch_patterns()
         c.svn_tag_patterns = model.get_repo_svn_tag_patterns()
         c.repo_info = self._load_repo(repo_name)
         defaults = self._vcs_form_defaults(repo_name)
         c.inherit_global_settings = defaults['inherit_global_settings']
 
         application_form = RepoVcsSettingsForm(repo_name)()
         try:
             form_result = application_form.to_python(dict(request.POST))
         except formencode.Invalid as errors:
             h.flash(
                 _("Some form inputs contain invalid data."),
                 category='error')
             return htmlfill.render(
                 render('admin/repos/repo_edit.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8",
                 force_defaults=False
             )
 
         try:
             inherit_global_settings = form_result['inherit_global_settings']
             model.create_or_update_repo_settings(
                 form_result, inherit_global_settings=inherit_global_settings)
         except Exception:
             log.exception("Exception while updating settings")
             h.flash(
                 _('Error occurred during updating repository VCS settings'),
                 category='error')
         else:
             Session().commit()
             h.flash(_('Updated VCS settings'), category='success')
             return redirect(url('repo_vcs_settings', repo_name=repo_name))
 
         return htmlfill.render(
             render('admin/repos/repo_edit.html'),
             defaults=self._vcs_form_defaults(repo_name),
             encoding="UTF-8",
             force_defaults=False)
 
     @HasRepoPermissionAllDecorator('repository.admin')
     @auth.CSRFRequired()
     @jsonify
     def repo_delete_svn_pattern(self, repo_name):
         if not request.is_xhr:
             return False
 
         delete_pattern_id = request.POST.get('delete_svn_pattern')
         model = VcsSettingsModel(repo=repo_name)
         try:
             model.delete_repo_svn_pattern(delete_pattern_id)
         except SettingNotFound:
             raise HTTPBadRequest()
 
         Session().commit()
         return True
 
     def _vcs_form_defaults(self, repo_name):
         model = VcsSettingsModel(repo=repo_name)
         global_defaults = model.get_global_settings()
 
         repo_defaults = {}
         repo_defaults.update(global_defaults)
         repo_defaults.update(model.get_repo_settings())
 
         global_defaults = {
             '{}_inherited'.format(k): global_defaults[k]
             for k in global_defaults}
 
         defaults = {
             'inherit_global_settings': model.inherit_global_settings
         }
         defaults.update(global_defaults)
         defaults.update(repo_defaults)
         defaults.update({
             'new_svn_branch': '',
             'new_svn_tag': '',
         })
         return defaults

rhodecode/controllers/admin/settings.py

@@ -1,866 +1,813 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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/
 
 
 """
 settings controller for rhodecode admin
 """
 
 import collections
 import logging
 import urllib2
 
 import datetime
 import formencode
 from formencode import htmlfill
 import packaging.version
 from pylons import request, tmpl_context as c, url, config
 from pylons.controllers.util import redirect
 from pylons.i18n.translation import _, lazy_ugettext
 from webob.exc import HTTPBadRequest
 
 import rhodecode
+from rhodecode.admin.navigation import navigation_list
 from rhodecode.lib import auth
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
 from rhodecode.lib.base import BaseController, render
 from rhodecode.lib.celerylib import tasks, run_task
 from rhodecode.lib.utils import repo2db_mapper
 from rhodecode.lib.utils2 import (
     str2bool, safe_unicode, AttributeDict, safe_int)
 from rhodecode.lib.compat import OrderedDict
 from rhodecode.lib.ext_json import json
-from rhodecode.lib.utils import jsonify, read_opensource_licenses
+from rhodecode.lib.utils import jsonify
 
 from rhodecode.model.db import RhodeCodeUi, Repository
 from rhodecode.model.forms import ApplicationSettingsForm, \
     ApplicationUiSettingsForm, ApplicationVisualisationForm, \
     LabsSettingsForm, IssueTrackerPatternsForm
 
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.notification import EmailNotificationModel
 from rhodecode.model.meta import Session
 from rhodecode.model.settings import (
     IssueTrackerSettingsModel, VcsSettingsModel, SettingNotFound,
     SettingsModel)
+
 from rhodecode.model.supervisor import SupervisorModel, SUPERVISOR_MASTER
-from rhodecode.model.user import UserModel
+
 
 log = logging.getLogger(__name__)
 
 
 class SettingsController(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('setting', 'settings', controller='admin/settings',
     #         path_prefix='/admin', name_prefix='admin_')
 
     @LoginRequired()
     def __before__(self):
         super(SettingsController, self).__before__()
         c.labs_active = str2bool(
             rhodecode.CONFIG.get('labs_settings_active', 'false'))
-        c.navlist = navigation.get_navlist(request)
+        c.navlist = navigation_list(request)
 
     def _get_hg_ui_settings(self):
         ret = RhodeCodeUi.query().all()
 
         if not ret:
             raise Exception('Could not get application ui settings !')
         settings = {}
         for each in ret:
             k = each.ui_key
             v = each.ui_value
             if k == '/':
                 k = 'root_path'
 
             if k in ['push_ssl', 'publish']:
                 v = str2bool(v)
 
             if k.find('.') != -1:
                 k = k.replace('.', '_')
 
             if each.ui_section in ['hooks', 'extensions']:
                 v = each.ui_active
 
             settings[each.ui_section + '_' + k] = v
         return settings
 
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     @jsonify
     def delete_svn_pattern(self):
         if not request.is_xhr:
             raise HTTPBadRequest()
 
         delete_pattern_id = request.POST.get('delete_svn_pattern')
         model = VcsSettingsModel()
         try:
             model.delete_global_svn_pattern(delete_pattern_id)
         except SettingNotFound:
             raise HTTPBadRequest()
 
         Session().commit()
         return True
 
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def settings_vcs_update(self):
         """POST /admin/settings: All items in the collection"""
         # url('admin_settings_vcs')
         c.active = 'vcs'
 
         model = VcsSettingsModel()
         c.svn_branch_patterns = model.get_global_svn_branch_patterns()
         c.svn_tag_patterns = model.get_global_svn_tag_patterns()
 
         application_form = ApplicationUiSettingsForm()()
         try:
             form_result = application_form.to_python(dict(request.POST))
         except formencode.Invalid as errors:
             h.flash(
                 _("Some form inputs contain invalid data."),
                 category='error')
             return htmlfill.render(
                 render('admin/settings/settings.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8",
                 force_defaults=False
             )
 
         try:
             model.update_global_ssl_setting(form_result['web_push_ssl'])
             if c.visual.allow_repo_location_change:
                 model.update_global_path_setting(
                     form_result['paths_root_path'])
             model.update_global_hook_settings(form_result)
             model.create_global_svn_settings(form_result)
             model.create_or_update_global_hg_settings(form_result)
             model.create_or_update_global_pr_settings(form_result)
         except Exception:
             log.exception("Exception while updating settings")
             h.flash(_('Error occurred during updating '
                       'application settings'), category='error')
         else:
             Session().commit()
             h.flash(_('Updated VCS settings'), category='success')
             return redirect(url('admin_settings_vcs'))
 
         return htmlfill.render(
             render('admin/settings/settings.html'),
             defaults=self._form_defaults(),
             encoding="UTF-8",
             force_defaults=False)
 
     @HasPermissionAllDecorator('hg.admin')
     def settings_vcs(self):
         """GET /admin/settings: All items in the collection"""
         # url('admin_settings_vcs')
         c.active = 'vcs'
         model = VcsSettingsModel()
         c.svn_branch_patterns = model.get_global_svn_branch_patterns()
         c.svn_tag_patterns = model.get_global_svn_tag_patterns()
 
         return htmlfill.render(
             render('admin/settings/settings.html'),
             defaults=self._form_defaults(),
             encoding="UTF-8",
             force_defaults=False)
 
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def settings_mapping_update(self):
         """POST /admin/settings/mapping: All items in the collection"""
         # url('admin_settings_mapping')
         c.active = 'mapping'
         rm_obsolete = request.POST.get('destroy', False)
         invalidate_cache = request.POST.get('invalidate', False)
         log.debug(
             'rescanning repo location with destroy obsolete=%s', rm_obsolete)
 
         if invalidate_cache:
             log.debug('invalidating all repositories cache')
             for repo in Repository.get_all():
                 ScmModel().mark_for_invalidation(repo.repo_name, delete=True)
 
         filesystem_repos = ScmModel().repo_scan()
         added, removed = repo2db_mapper(filesystem_repos, rm_obsolete)
         _repr = lambda l: ', '.join(map(safe_unicode, l)) or '-'
         h.flash(_('Repositories successfully '
                   'rescanned added: %s ; removed: %s') %
                 (_repr(added), _repr(removed)),
                 category='success')
         return redirect(url('admin_settings_mapping'))
 
     @HasPermissionAllDecorator('hg.admin')
     def settings_mapping(self):
         """GET /admin/settings/mapping: All items in the collection"""
         # url('admin_settings_mapping')
         c.active = 'mapping'
 
         return htmlfill.render(
             render('admin/settings/settings.html'),
             defaults=self._form_defaults(),
             encoding="UTF-8",
             force_defaults=False)
 
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def settings_global_update(self):
         """POST /admin/settings/global: All items in the collection"""
         # url('admin_settings_global')
         c.active = 'global'
         application_form = ApplicationSettingsForm()()
         try:
             form_result = application_form.to_python(dict(request.POST))
         except formencode.Invalid as errors:
             return htmlfill.render(
                 render('admin/settings/settings.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8",
                 force_defaults=False)
 
         try:
             settings = [
                 ('title', 'rhodecode_title'),
                 ('realm', 'rhodecode_realm'),
                 ('pre_code', 'rhodecode_pre_code'),
                 ('post_code', 'rhodecode_post_code'),
                 ('captcha_public_key', 'rhodecode_captcha_public_key'),
                 ('captcha_private_key', 'rhodecode_captcha_private_key'),
             ]
             for setting, form_key in settings:
                 sett = SettingsModel().create_or_update_setting(
                     setting, form_result[form_key])
                 Session().add(sett)
 
             Session().commit()
+            SettingsModel().invalidate_settings_cache()
             h.flash(_('Updated application settings'), category='success')
-
         except Exception:
             log.exception("Exception while updating application settings")
             h.flash(
                 _('Error occurred during updating application settings'),
                 category='error')
 
         return redirect(url('admin_settings_global'))
 
     @HasPermissionAllDecorator('hg.admin')
     def settings_global(self):
         """GET /admin/settings/global: All items in the collection"""
         # url('admin_settings_global')
         c.active = 'global'
 
         return htmlfill.render(
             render('admin/settings/settings.html'),
             defaults=self._form_defaults(),
             encoding="UTF-8",
             force_defaults=False)
 
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def settings_visual_update(self):
         """POST /admin/settings/visual: All items in the collection"""
         # url('admin_settings_visual')
         c.active = 'visual'
         application_form = ApplicationVisualisationForm()()
         try:
             form_result = application_form.to_python(dict(request.POST))
         except formencode.Invalid as errors:
             return htmlfill.render(
                 render('admin/settings/settings.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8",
                 force_defaults=False
             )
 
         try:
             settings = [
                 ('show_public_icon', 'rhodecode_show_public_icon', 'bool'),
                 ('show_private_icon', 'rhodecode_show_private_icon', 'bool'),
                 ('stylify_metatags', 'rhodecode_stylify_metatags', 'bool'),
                 ('repository_fields', 'rhodecode_repository_fields', 'bool'),
                 ('dashboard_items', 'rhodecode_dashboard_items', 'int'),
                 ('admin_grid_items', 'rhodecode_admin_grid_items', 'int'),
                 ('show_version', 'rhodecode_show_version', 'bool'),
                 ('use_gravatar', 'rhodecode_use_gravatar', 'bool'),
                 ('markup_renderer', 'rhodecode_markup_renderer', 'unicode'),
                 ('gravatar_url', 'rhodecode_gravatar_url', 'unicode'),
                 ('clone_uri_tmpl', 'rhodecode_clone_uri_tmpl', 'unicode'),
                 ('support_url', 'rhodecode_support_url', 'unicode'),
                 ('show_revision_number', 'rhodecode_show_revision_number', 'bool'),
                 ('show_sha_length', 'rhodecode_show_sha_length', 'int'),
             ]
             for setting, form_key, type_ in settings:
                 sett = SettingsModel().create_or_update_setting(
                     setting, form_result[form_key], type_)
                 Session().add(sett)
 
             Session().commit()
-
+            SettingsModel().invalidate_settings_cache()
             h.flash(_('Updated visualisation settings'), category='success')
         except Exception:
             log.exception("Exception updating visualization settings")
             h.flash(_('Error occurred during updating '
                       'visualisation settings'),
                     category='error')
 
         return redirect(url('admin_settings_visual'))
 
     @HasPermissionAllDecorator('hg.admin')
     def settings_visual(self):
         """GET /admin/settings/visual: All items in the collection"""
         # url('admin_settings_visual')
         c.active = 'visual'
 
         return htmlfill.render(
             render('admin/settings/settings.html'),
             defaults=self._form_defaults(),
             encoding="UTF-8",
             force_defaults=False)
 
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def settings_issuetracker_test(self):
         if request.is_xhr:
             return h.urlify_commit_message(
                 request.POST.get('test_text', ''),
                 'repo_group/test_repo1')
         else:
             raise HTTPBadRequest()
 
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def settings_issuetracker_delete(self):
         uid = request.POST.get('uid')
         IssueTrackerSettingsModel().delete_entries(uid)
         h.flash(_('Removed issue tracker entry'), category='success')
         return redirect(url('admin_settings_issuetracker'))
 
     @HasPermissionAllDecorator('hg.admin')
     def settings_issuetracker(self):
         """GET /admin/settings/issue-tracker: All items in the collection"""
         # url('admin_settings_issuetracker')
         c.active = 'issuetracker'
         defaults = SettingsModel().get_all_settings()
 
         entry_key = 'rhodecode_issuetracker_pat_'
 
         c.issuetracker_entries = {}
         for k, v in defaults.items():
             if k.startswith(entry_key):
                 uid = k[len(entry_key):]
                 c.issuetracker_entries[uid] = None
 
         for uid in c.issuetracker_entries:
             c.issuetracker_entries[uid] = AttributeDict({
                 'pat': defaults.get('rhodecode_issuetracker_pat_' + uid),
                 'url': defaults.get('rhodecode_issuetracker_url_' + uid),
                 'pref': defaults.get('rhodecode_issuetracker_pref_' + uid),
                 'desc': defaults.get('rhodecode_issuetracker_desc_' + uid),
             })
 
         return render('admin/settings/settings.html')
 
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def settings_issuetracker_save(self):
         settings_model = IssueTrackerSettingsModel()
 
         form = IssueTrackerPatternsForm()().to_python(request.POST)
         for uid in form['delete_patterns']:
             settings_model.delete_entries(uid)
 
         for pattern in form['patterns']:
             for setting, value, type_ in pattern:
                 sett = settings_model.create_or_update_setting(
                     setting, value, type_)
                 Session().add(sett)
 
             Session().commit()
 
+        SettingsModel().invalidate_settings_cache()
         h.flash(_('Updated issue tracker entries'), category='success')
         return redirect(url('admin_settings_issuetracker'))
 
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def settings_email_update(self):
         """POST /admin/settings/email: All items in the collection"""
         # url('admin_settings_email')
         c.active = 'email'
 
         test_email = request.POST.get('test_email')
 
         if not test_email:
             h.flash(_('Please enter email address'), category='error')
             return redirect(url('admin_settings_email'))
 
         email_kwargs = {
             'date': datetime.datetime.now(),
             'user': c.rhodecode_user,
             'rhodecode_version': c.rhodecode_version
         }
 
         (subject, headers, email_body,
          email_body_plaintext) = EmailNotificationModel().render_email(
             EmailNotificationModel.TYPE_EMAIL_TEST, **email_kwargs)
 
         recipients = [test_email] if test_email else None
 
         run_task(tasks.send_email, recipients, subject,
                  email_body_plaintext, email_body)
 
         h.flash(_('Send email task created'), category='success')
         return redirect(url('admin_settings_email'))
 
     @HasPermissionAllDecorator('hg.admin')
     def settings_email(self):
         """GET /admin/settings/email: All items in the collection"""
         # url('admin_settings_email')
         c.active = 'email'
         c.rhodecode_ini = rhodecode.CONFIG
 
         return htmlfill.render(
             render('admin/settings/settings.html'),
             defaults=self._form_defaults(),
             encoding="UTF-8",
             force_defaults=False)
 
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def settings_hooks_update(self):
         """POST or DELETE /admin/settings/hooks: All items in the collection"""
         # url('admin_settings_hooks')
         c.active = 'hooks'
         if c.visual.allow_custom_hooks_settings:
             ui_key = request.POST.get('new_hook_ui_key')
             ui_value = request.POST.get('new_hook_ui_value')
 
             hook_id = request.POST.get('hook_id')
             new_hook = False
 
             model = SettingsModel()
             try:
                 if ui_value and ui_key:
                     model.create_or_update_hook(ui_key, ui_value)
                     h.flash(_('Added new hook'), category='success')
                     new_hook = True
                 elif hook_id:
                     RhodeCodeUi.delete(hook_id)
                     Session().commit()
 
                 # check for edits
                 update = False
                 _d = request.POST.dict_of_lists()
                 for k, v in zip(_d.get('hook_ui_key', []),
                                 _d.get('hook_ui_value_new', [])):
                     model.create_or_update_hook(k, v)
                     update = True
 
                 if update and not new_hook:
                     h.flash(_('Updated hooks'), category='success')
                 Session().commit()
             except Exception:
                 log.exception("Exception during hook creation")
                 h.flash(_('Error occurred during hook creation'),
                         category='error')
 
         return redirect(url('admin_settings_hooks'))
 
     @HasPermissionAllDecorator('hg.admin')
     def settings_hooks(self):
         """GET /admin/settings/hooks: All items in the collection"""
         # url('admin_settings_hooks')
         c.active = 'hooks'
 
         model = SettingsModel()
         c.hooks = model.get_builtin_hooks()
         c.custom_hooks = model.get_custom_hooks()
 
         return htmlfill.render(
             render('admin/settings/settings.html'),
             defaults=self._form_defaults(),
             encoding="UTF-8",
             force_defaults=False)
 
     @HasPermissionAllDecorator('hg.admin')
     def settings_search(self):
         """GET /admin/settings/search: All items in the collection"""
         # url('admin_settings_search')
         c.active = 'search'
 
         from rhodecode.lib.index import searcher_from_config
         searcher = searcher_from_config(config)
         c.statistics = searcher.statistics()
 
         return render('admin/settings/settings.html')
 
     @HasPermissionAllDecorator('hg.admin')
     def settings_system(self):
         """GET /admin/settings/system: All items in the collection"""
         # url('admin_settings_system')
+        snapshot = str2bool(request.GET.get('snapshot'))
         c.active = 'system'
 
         defaults = self._form_defaults()
         c.rhodecode_ini = rhodecode.CONFIG
         c.rhodecode_update_url = defaults.get('rhodecode_update_url')
         server_info = ScmModel().get_server_info(request.environ)
         for key, val in server_info.iteritems():
             setattr(c, key, val)
 
         if c.disk['percent'] > 90:
             h.flash(h.literal(_(
                 'Critical: your disk space is very low <b>%s%%</b> used' %
                 c.disk['percent'])), 'error')
         elif c.disk['percent'] > 70:
             h.flash(h.literal(_(
                 'Warning: your disk space is running low <b>%s%%</b> used' %
                 c.disk['percent'])), 'warning')
 
         try:
             c.uptime_age = h._age(
                 h.time_to_datetime(c.boot_time), False, show_suffix=False)
         except TypeError:
             c.uptime_age = c.boot_time
 
         try:
             c.system_memory = '%s/%s, %s%% (%s%%) used%s' % (
                 h.format_byte_size_binary(c.memory['used']),
                 h.format_byte_size_binary(c.memory['total']),
                 c.memory['percent2'],
                 c.memory['percent'],
                 ' %s' % c.memory['error'] if 'error' in c.memory else '')
         except TypeError:
             c.system_memory = 'NOT AVAILABLE'
 
+        rhodecode_ini_safe = rhodecode.CONFIG.copy()
+        blacklist = [
+            'rhodecode_license_key',
+            'routes.map',
+            'pylons.h',
+            'pylons.app_globals',
+            'pylons.environ_config',
+            'sqlalchemy.db1.url',
+            ('app_conf', 'sqlalchemy.db1.url')
+        ]
+        for k in blacklist:
+            if isinstance(k, tuple):
+                section, key = k
+                if section in rhodecode_ini_safe:
+                    rhodecode_ini_safe[section].pop(key, None)
+            else:
+                rhodecode_ini_safe.pop(k, None)
+
+        c.rhodecode_ini_safe = rhodecode_ini_safe
+
+        # TODO: marcink, figure out how to allow only selected users to do this
+        c.allowed_to_snapshot = False
+
+        if snapshot:
+            if c.allowed_to_snapshot:
+                return render('admin/settings/settings_system_snapshot.html')
+            else:
+                h.flash('You are not allowed to do this', category='warning')
+
         return htmlfill.render(
             render('admin/settings/settings.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False)
 
     @staticmethod
     def get_update_data(update_url):
         """Return the JSON update data."""
         ver = rhodecode.__version__
         log.debug('Checking for upgrade on `%s` server', update_url)
         opener = urllib2.build_opener()
         opener.addheaders = [('User-agent', 'RhodeCode-SCM/%s' % ver)]
         response = opener.open(update_url)
         response_data = response.read()
         data = json.loads(response_data)
 
         return data
 
     @HasPermissionAllDecorator('hg.admin')
     def settings_system_update(self):
         """GET /admin/settings/system/updates: All items in the collection"""
         # url('admin_settings_system_update')
         defaults = self._form_defaults()
         update_url = defaults.get('rhodecode_update_url', '')
 
         _err = lambda s: '<div style="color:#ff8888; padding:4px 0px">%s</div>' % (s)
         try:
             data = self.get_update_data(update_url)
         except urllib2.URLError as e:
             log.exception("Exception contacting upgrade server")
             return _err('Failed to contact upgrade server: %r' % e)
         except ValueError as e:
             log.exception("Bad data sent from update server")
             return _err('Bad data sent from update server')
 
         latest = data['versions'][0]
 
         c.update_url = update_url
         c.latest_data = latest
         c.latest_ver = latest['version']
         c.cur_ver = rhodecode.__version__
         c.should_upgrade = False
 
         if (packaging.version.Version(c.latest_ver) >
                 packaging.version.Version(c.cur_ver)):
             c.should_upgrade = True
         c.important_notices = latest['general']
 
         return render('admin/settings/settings_system_update.html')
 
     @HasPermissionAllDecorator('hg.admin')
     def settings_supervisor(self):
         c.rhodecode_ini = rhodecode.CONFIG
         c.active = 'supervisor'
 
         c.supervisor_procs = OrderedDict([
             (SUPERVISOR_MASTER, {}),
         ])
 
         c.log_size = 10240
         supervisor = SupervisorModel()
 
         _connection = supervisor.get_connection(
             c.rhodecode_ini.get('supervisor.uri'))
         c.connection_error = None
         try:
             _connection.supervisor.getAllProcessInfo()
         except Exception as e:
             c.connection_error = str(e)
             log.exception("Exception reading supervisor data")
             return render('admin/settings/settings.html')
 
         groupid = c.rhodecode_ini.get('supervisor.group_id')
 
         # feed our group processes to the main
         for proc in supervisor.get_group_processes(_connection, groupid):
             c.supervisor_procs[proc['name']] = {}
 
         for k in c.supervisor_procs.keys():
             try:
                 # master process info
                 if k == SUPERVISOR_MASTER:
                     _data = supervisor.get_master_state(_connection)
                     _data['name'] = 'supervisor master'
                     _data['description'] = 'pid %s, id: %s, ver: %s' % (
                         _data['pid'], _data['id'], _data['ver'])
                     c.supervisor_procs[k] = _data
                 else:
                     procid = groupid + ":" + k
                     c.supervisor_procs[k] = supervisor.get_process_info(_connection, procid)
             except Exception as e:
                 log.exception("Exception reading supervisor data")
                 c.supervisor_procs[k] = {'_rhodecode_error': str(e)}
 
         return render('admin/settings/settings.html')
 
     @HasPermissionAllDecorator('hg.admin')
     def settings_supervisor_log(self, procid):
         import rhodecode
         c.rhodecode_ini = rhodecode.CONFIG
         c.active = 'supervisor_tail'
 
         supervisor = SupervisorModel()
         _connection = supervisor.get_connection(c.rhodecode_ini.get('supervisor.uri'))
         groupid = c.rhodecode_ini.get('supervisor.group_id')
         procid = groupid + ":" + procid if procid != SUPERVISOR_MASTER else procid
 
         c.log_size = 10240
         offset = abs(safe_int(request.GET.get('offset', c.log_size))) * -1
         c.log = supervisor.read_process_log(_connection, procid, offset, 0)
 
         return render('admin/settings/settings.html')
 
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def settings_labs_update(self):
         """POST /admin/settings/labs: All items in the collection"""
         # url('admin_settings/labs', method={'POST'})
         c.active = 'labs'
 
         application_form = LabsSettingsForm()()
         try:
             form_result = application_form.to_python(dict(request.POST))
         except formencode.Invalid as errors:
             h.flash(
                 _('Some form inputs contain invalid data.'),
                 category='error')
             return htmlfill.render(
                 render('admin/settings/settings.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding='UTF-8',
                 force_defaults=False
             )
 
         try:
             session = Session()
             for setting in _LAB_SETTINGS:
                 setting_name = setting.key[len('rhodecode_'):]
                 sett = SettingsModel().create_or_update_setting(
                     setting_name, form_result[setting.key], setting.type)
                 session.add(sett)
 
         except Exception:
             log.exception('Exception while updating lab settings')
             h.flash(_('Error occurred during updating labs settings'),
                     category='error')
         else:
             Session().commit()
+            SettingsModel().invalidate_settings_cache()
             h.flash(_('Updated Labs settings'), category='success')
             return redirect(url('admin_settings_labs'))
 
         return htmlfill.render(
             render('admin/settings/settings.html'),
             defaults=self._form_defaults(),
             encoding='UTF-8',
             force_defaults=False)
 
     @HasPermissionAllDecorator('hg.admin')
     def settings_labs(self):
         """GET /admin/settings/labs: All items in the collection"""
         # url('admin_settings_labs')
         if not c.labs_active:
             redirect(url('admin_settings'))
 
         c.active = 'labs'
         c.lab_settings = _LAB_SETTINGS
 
         return htmlfill.render(
             render('admin/settings/settings.html'),
             defaults=self._form_defaults(),
             encoding='UTF-8',
             force_defaults=False)
 
-    @HasPermissionAllDecorator('hg.admin')
-    def settings_open_source(self):
-        # url('admin_settings_open_source')
-
-        c.active = 'open_source'
-        c.opensource_licenses = collections.OrderedDict(
-            sorted(read_opensource_licenses().items(), key=lambda t: t[0]))
-
-        return htmlfill.render(
-            render('admin/settings/settings.html'),
-            defaults=self._form_defaults(),
-            encoding='UTF-8',
-            force_defaults=False)
-
     def _form_defaults(self):
         defaults = SettingsModel().get_all_settings()
         defaults.update(self._get_hg_ui_settings())
         defaults.update({
             'new_svn_branch': '',
             'new_svn_tag': '',
         })
         return defaults
 
 
 # :param key: name of the setting including the 'rhodecode_' prefix
 # :param type: the RhodeCodeSetting type to use.
 # :param group: the i18ned group in which we should dispaly this setting
 # :param label: the i18ned label we should display for this setting
 # :param help: the i18ned help we should dispaly for this setting
 LabSetting = collections.namedtuple(
     'LabSetting', ('key', 'type', 'group', 'label', 'help'))
 
 
 # This list has to be kept in sync with the form
 # rhodecode.model.forms.LabsSettingsForm.
 _LAB_SETTINGS = [
     LabSetting(
         key='rhodecode_hg_use_rebase_for_merging',
         type='bool',
         group=lazy_ugettext('Mercurial server-side merge'),
         label=lazy_ugettext('Use rebase instead of creating a merge commit when merging via web interface'),
         help=''  # Do not translate the empty string!
     ),
     LabSetting(
         key='rhodecode_proxy_subversion_http_requests',
         type='bool',
         group=lazy_ugettext('Subversion HTTP Support'),
         label=lazy_ugettext('Proxy subversion HTTP requests'),
         help=''  # Do not translate the empty string!
     ),
     LabSetting(
         key='rhodecode_subversion_http_server_url',
         type='str',
         group=lazy_ugettext('Subversion HTTP Server URL'),
         label='',  # Do not translate the empty string!
         help=lazy_ugettext('e.g. http://localhost:8080/')
     ),
 ]
-
-
-NavListEntry = collections.namedtuple('NavListEntry', ['key', 'name', 'url'])
-
-
-class NavEntry(object):
-
-    def __init__(self, key, name, view_name, pyramid=False):
-        self.key = key
-        self.name = name
-        self.view_name = view_name
-        self.pyramid = pyramid
-
-    def generate_url(self, request):
-        if self.pyramid:
-            if hasattr(request, 'route_path'):
-                return request.route_path(self.view_name)
-            else:
-                # TODO: johbo: Remove this after migrating to pyramid.
-                # We need the pyramid request here to generate URLs to pyramid
-                # views from within pylons views.
-                from pyramid.threadlocal import get_current_request
-                pyramid_request = get_current_request()
-                return pyramid_request.route_path(self.view_name)
-        else:
-            return url(self.view_name)
-
-
-class NavigationRegistry(object):
-
-    _base_entries = [
-        NavEntry('global', lazy_ugettext('Global'), 'admin_settings_global'),
-        NavEntry('vcs', lazy_ugettext('VCS'), 'admin_settings_vcs'),
-        NavEntry('visual', lazy_ugettext('Visual'), 'admin_settings_visual'),
-        NavEntry('mapping', lazy_ugettext('Remap and Rescan'),
-                 'admin_settings_mapping'),
-        NavEntry('issuetracker', lazy_ugettext('Issue Tracker'),
-                 'admin_settings_issuetracker'),
-        NavEntry('email', lazy_ugettext('Email'), 'admin_settings_email'),
-        NavEntry('hooks', lazy_ugettext('Hooks'), 'admin_settings_hooks'),
-        NavEntry('search', lazy_ugettext('Full Text Search'),
-                 'admin_settings_search'),
-        NavEntry('system', lazy_ugettext('System Info'),
-                 'admin_settings_system'),
-        NavEntry('open_source', lazy_ugettext('Open Source Licenses'),
-                 'admin_settings_open_source'),
-        # TODO: marcink: we disable supervisor now until the supervisor stats
-        # page is fixed in the nix configuration
-        # NavEntry('supervisor', lazy_ugettext('Supervisor'),
-        #          'admin_settings_supervisor'),
-    ]
-
-    def __init__(self):
-        self._registered_entries = collections.OrderedDict([
-            (item.key, item) for item in self.__class__._base_entries
-        ])
-
-        # Add the labs entry when it's activated.
-        labs_active = str2bool(
-            rhodecode.CONFIG.get('labs_settings_active', 'false'))
-        if labs_active:
-            self.add_entry(
-                NavEntry('labs', lazy_ugettext('Labs'), 'admin_settings_labs'))
-
-    def add_entry(self, entry):
-        self._registered_entries[entry.key] = entry
-
-    def get_navlist(self, request):
-        navlist = [NavListEntry(i.key, i.name, i.generate_url(request))
-                   for i in self._registered_entries.values()]
-        return navlist
-
-navigation = NavigationRegistry()

rhodecode/controllers/admin/user_groups.py

@@ -1,480 +1,480 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2011-2016  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/
 
 """
 User Groups crud controller for pylons
 """
 
 import logging
 import formencode
 
 from formencode import htmlfill
 from pylons import request, tmpl_context as c, url, config
 from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
 
 from sqlalchemy.orm import joinedload
 
 from rhodecode.lib import auth
 from rhodecode.lib import helpers as h
 from rhodecode.lib.exceptions import UserGroupAssignedException,\
     RepoGroupAssignmentError
 from rhodecode.lib.utils import jsonify, action_logger
 from rhodecode.lib.utils2 import safe_unicode, str2bool, safe_int
 from rhodecode.lib.auth import (
     LoginRequired, NotAnonymous, HasUserGroupPermissionAnyDecorator,
     HasPermissionAnyDecorator)
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.permission import PermissionModel
 from rhodecode.model.scm import UserGroupList
 from rhodecode.model.user_group import UserGroupModel
 from rhodecode.model.db import (
     User, UserGroup, UserGroupRepoToPerm, UserGroupRepoGroupToPerm)
 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__)
 
 
 class UserGroupsController(BaseController):
     """REST Controller styled on the Atom Publishing Protocol"""
 
     @LoginRequired()
     def __before__(self):
         super(UserGroupsController, self).__before__()
         c.available_permissions = config['available_permissions']
         PermissionModel().set_global_permission_choices(c, translator=_)
 
     def __load_data(self, user_group_id):
         c.group_members_obj = [x.user for x in c.user_group.members]
         c.group_members_obj.sort(key=lambda u: u.username.lower())
 
         c.group_members = [(x.user_id, x.username) for x in c.group_members_obj]
 
         c.available_members = [(x.user_id, x.username)
                                for x in User.query().all()]
         c.available_members.sort(key=lambda u: u[1].lower())
 
     def __load_defaults(self, user_group_id):
         """
         Load defaults settings for edit, and update
 
         :param user_group_id:
         """
         user_group = UserGroup.get_or_404(user_group_id)
         data = user_group.get_dict()
         # fill owner
         if user_group.user:
             data.update({'user': user_group.user.username})
         else:
-            replacement_user = User.get_first_admin().username
+            replacement_user = User.get_first_super_admin().username
             data.update({'user': replacement_user})
         return data
 
     def _revoke_perms_on_yourself(self, form_result):
         _updates = filter(lambda u: c.rhodecode_user.user_id == int(u[0]),
                           form_result['perm_updates'])
         _additions = filter(lambda u: c.rhodecode_user.user_id == int(u[0]),
                             form_result['perm_additions'])
         _deletions = filter(lambda u: c.rhodecode_user.user_id == int(u[0]),
                             form_result['perm_deletions'])
         admin_perm = 'usergroup.admin'
         if _updates   and _updates[0][1]   != admin_perm or \
            _additions and _additions[0][1] != admin_perm or \
            _deletions and _deletions[0][1] != admin_perm:
             return True
         return False
 
     # 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.html')
 
         def user_group_name(user_group_id, user_group_name):
             return _render("user_group_name", user_group_id, user_group_name)
 
         def user_group_actions(user_group_id, user_group_name):
             return _render("user_group_actions", user_group_id, user_group_name)
 
         ## json generate
         group_iter = UserGroupList(UserGroup.query().all(),
                                    perm_set=['usergroup.admin'])
 
         user_groups_data = []
         for user_gr in group_iter:
             user_groups_data.append({
                 "group_name": user_group_name(
                     user_gr.users_group_id, h.escape(user_gr.users_group_name)),
                 "group_name_raw": user_gr.users_group_name,
                 "desc": h.escape(user_gr.user_group_description),
                 "members": len(user_gr.members),
                 "active": h.bool2icon(user_gr.users_group_active),
                 "owner": h.escape(h.link_to_user(user_gr.user.username)),
                 "action": user_group_actions(
                     user_gr.users_group_id, user_gr.users_group_name)
             })
 
         c.data = json.dumps(user_groups_data)
         return render('admin/user_groups/user_groups.html')
 
     @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:
             form_result = users_group_form.to_python(dict(request.POST))
             user_group = UserGroupModel().create(
                 name=form_result['users_group_name'],
                 description=form_result['user_group_description'],
                 owner=c.rhodecode_user.user_id,
                 active=form_result['users_group_active'])
             Session().flush()
 
             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))
             h.flash(h.literal(_('Created user group %(user_group_link)s')
                               % {'user_group_link': user_group_link}),
                     category='success')
             Session().commit()
         except formencode.Invalid as errors:
             return htmlfill.render(
                 render('admin/user_groups/user_group_add.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8",
                 force_defaults=False)
         except Exception:
             log.exception("Exception creating user group")
             h.flash(_('Error occurred during creation of user group %s') \
                     % request.POST.get('users_group_name'), category='error')
 
         return redirect(
             url('edit_users_group', user_group_id=user_group.users_group_id))
 
     @HasPermissionAnyDecorator('hg.admin', 'hg.usergroup.create.true')
     def new(self):
         """GET /user_groups/new: Form to create a new item"""
         # url('new_users_group')
         return render('admin/user_groups/user_group_add.html')
 
     @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)
         c.active = 'settings'
         self.__load_data(user_group_id)
 
         available_members = [safe_unicode(x[0]) for x in c.available_members]
 
-        users_group_form = UserGroupForm(edit=True,
-                                         old_data=c.user_group.get_dict(),
-                                         available_members=available_members)()
+        users_group_form = UserGroupForm(
+            edit=True, old_data=c.user_group.get_dict(),
+            available_members=available_members, allow_disabled=True)()
 
         try:
             form_result = users_group_form.to_python(request.POST)
             UserGroupModel().update(c.user_group, form_result)
             gr = form_result['users_group_name']
             action_logger(c.rhodecode_user,
                           'admin_updated_users_group:%s' % gr,
                           None, self.ip_addr, self.sa)
             h.flash(_('Updated user group %s') % gr, category='success')
             Session().commit()
         except formencode.Invalid as errors:
             defaults = errors.value
             e = errors.error_dict or {}
 
             return htmlfill.render(
                 render('admin/user_groups/user_group_edit.html'),
                 defaults=defaults,
                 errors=e,
                 prefix_error=False,
                 encoding="UTF-8",
                 force_defaults=False)
         except Exception:
             log.exception("Exception during update of user group")
             h.flash(_('Error occurred during update of user group %s')
                     % request.POST.get('users_group_name'), category='error')
 
         return redirect(url('edit_users_group', user_group_id=user_group_id))
 
     @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'))
 
         try:
             UserGroupModel().delete(c.user_group, force=force)
             Session().commit()
             h.flash(_('Successfully deleted user group'), category='success')
         except UserGroupAssignedException as e:
             h.flash(str(e), category='error')
         except Exception:
             log.exception("Exception during deletion of user group")
             h.flash(_('An error occurred during deletion of user group'),
                     category='error')
         return redirect(url('users_groups'))
 
     @HasUserGroupPermissionAnyDecorator('usergroup.admin')
     def edit(self, user_group_id):
         """GET /user_groups/user_group_id/edit: Form to edit an existing item"""
         # url('edit_users_group', user_group_id=ID)
 
         user_group_id = safe_int(user_group_id)
         c.user_group = UserGroup.get_or_404(user_group_id)
         c.active = 'settings'
         self.__load_data(user_group_id)
 
         defaults = self.__load_defaults(user_group_id)
 
         return htmlfill.render(
             render('admin/user_groups/user_group_edit.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False
         )
 
     @HasUserGroupPermissionAnyDecorator('usergroup.admin')
     def edit_perms(self, user_group_id):
         user_group_id = safe_int(user_group_id)
         c.user_group = UserGroup.get_or_404(user_group_id)
         c.active = 'perms'
 
         defaults = {}
         # fill user group users
         for p in c.user_group.user_user_group_to_perm:
             defaults.update({'u_perm_%s' % p.user.user_id:
                              p.permission.permission_name})
 
         for p in c.user_group.user_group_user_group_to_perm:
             defaults.update({'g_perm_%s' % p.user_group.users_group_id:
                              p.permission.permission_name})
 
         return htmlfill.render(
             render('admin/user_groups/user_group_edit.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False
         )
 
     @HasUserGroupPermissionAnyDecorator('usergroup.admin')
     @auth.CSRFRequired()
     def update_perms(self, user_group_id):
         """
         grant permission for given usergroup
 
         :param user_group_id:
         """
         user_group_id = safe_int(user_group_id)
         c.user_group = UserGroup.get_or_404(user_group_id)
         form = UserGroupPermsForm()().to_python(request.POST)
 
         if not c.rhodecode_user.is_admin:
             if self._revoke_perms_on_yourself(form):
                 msg = _('Cannot change permission for yourself as admin')
                 h.flash(msg, category='warning')
                 return redirect(url('edit_user_group_perms', user_group_id=user_group_id))
 
         try:
             UserGroupModel().update_permissions(user_group_id,
                 form['perm_additions'], form['perm_updates'], form['perm_deletions'])
         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)
         Session().commit()
         h.flash(_('User Group permissions updated'), category='success')
         return redirect(url('edit_user_group_perms', user_group_id=user_group_id))
 
     @HasUserGroupPermissionAnyDecorator('usergroup.admin')
     def edit_perms_summary(self, user_group_id):
         user_group_id = safe_int(user_group_id)
         c.user_group = UserGroup.get_or_404(user_group_id)
         c.active = 'perms_summary'
         permissions = {
             'repositories': {},
             'repositories_groups': {},
         }
         ugroup_repo_perms = UserGroupRepoToPerm.query()\
             .options(joinedload(UserGroupRepoToPerm.permission))\
             .options(joinedload(UserGroupRepoToPerm.repository))\
             .filter(UserGroupRepoToPerm.users_group_id == user_group_id)\
             .all()
 
         for gr in ugroup_repo_perms:
             permissions['repositories'][gr.repository.repo_name]  \
                 = gr.permission.permission_name
 
         ugroup_group_perms = UserGroupRepoGroupToPerm.query()\
             .options(joinedload(UserGroupRepoGroupToPerm.permission))\
             .options(joinedload(UserGroupRepoGroupToPerm.group))\
             .filter(UserGroupRepoGroupToPerm.users_group_id == user_group_id)\
             .all()
 
         for gr in ugroup_group_perms:
             permissions['repositories_groups'][gr.group.group_name] \
                 = gr.permission.permission_name
         c.permissions = permissions
         return render('admin/user_groups/user_group_edit.html')
 
     @HasUserGroupPermissionAnyDecorator('usergroup.admin')
     def edit_global_perms(self, user_group_id):
         user_group_id = safe_int(user_group_id)
         c.user_group = UserGroup.get_or_404(user_group_id)
         c.active = 'global_perms'
 
         c.default_user = User.get_default_user()
         defaults = c.user_group.get_dict()
         defaults.update(c.default_user.get_default_perms(suffix='_inherited'))
         defaults.update(c.user_group.get_default_perms())
 
         return htmlfill.render(
             render('admin/user_groups/user_group_edit.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False
         )
 
     @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'
 
         try:
             # first stage that verifies the checkbox
             _form = UserIndividualPermissionsForm()
             form_result = _form.to_python(dict(request.POST))
             inherit_perms = form_result['inherit_default_permissions']
             user_group.inherit_default_permissions = inherit_perms
             Session().add(user_group)
 
             if not inherit_perms:
                 # only update the individual ones if we un check the flag
                 _form = UserPermissionsForm(
                     [x[0] for x in c.repo_create_choices],
                     [x[0] for x in c.repo_create_on_write_choices],
                     [x[0] for x in c.repo_group_create_choices],
                     [x[0] for x in c.user_group_create_choices],
                     [x[0] for x in c.fork_choices],
                     [x[0] for x in c.inherit_default_permission_choices])()
 
                 form_result = _form.to_python(dict(request.POST))
                 form_result.update({'perm_user_group_id': user_group.users_group_id})
 
                 PermissionModel().update_user_group_permissions(form_result)
 
             Session().commit()
             h.flash(_('User Group global permissions updated successfully'),
                     category='success')
 
         except formencode.Invalid as errors:
             defaults = errors.value
             c.user_group = user_group
             return htmlfill.render(
                 render('admin/user_groups/user_group_edit.html'),
                 defaults=defaults,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8",
                 force_defaults=False)
 
         except Exception:
             log.exception("Exception during permissions saving")
             h.flash(_('An error occurred during permissions saving'),
                     category='error')
 
         return redirect(url('edit_user_group_global_perms', user_group_id=user_group_id))
 
     @HasUserGroupPermissionAnyDecorator('usergroup.admin')
     def edit_advanced(self, user_group_id):
         user_group_id = safe_int(user_group_id)
         c.user_group = UserGroup.get_or_404(user_group_id)
         c.active = 'advanced'
         c.group_members_obj = sorted(
             (x.user for x in c.user_group.members),
             key=lambda u: u.username.lower())
 
         c.group_to_repos = sorted(
             (x.repository for x in c.user_group.users_group_repo_to_perm),
             key=lambda u: u.repo_name.lower())
 
         c.group_to_repo_groups = sorted(
             (x.group for x in c.user_group.users_group_repo_group_to_perm),
             key=lambda u: u.group_name.lower())
 
         return render('admin/user_groups/user_group_edit.html')
 
     @HasUserGroupPermissionAnyDecorator('usergroup.admin')
     def edit_members(self, user_group_id):
         user_group_id = safe_int(user_group_id)
         c.user_group = UserGroup.get_or_404(user_group_id)
         c.active = 'members'
         c.group_members_obj = sorted((x.user for x in c.user_group.members),
                                      key=lambda u: u.username.lower())
 
         group_members = [(x.user_id, x.username) for x in c.group_members_obj]
 
         if request.is_xhr:
             return jsonify(lambda *a, **k: {
                 'members': group_members
             })
 
         c.group_members = group_members
         return render('admin/user_groups/user_group_edit.html')

rhodecode/controllers/admin/users.py

@@ -1,717 +1,719 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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/
 
 """
 Users crud controller for pylons
 """
 
 import logging
 import formencode
 
 from formencode import htmlfill
 from pylons import request, tmpl_context as c, url, config
 from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
 
 from rhodecode.authentication.plugins import auth_rhodecode
 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.model.db import (
     PullRequestReviewers, User, UserEmailMap, UserIpMap, RepoGroup)
 from rhodecode.model.forms import (
     UserForm, UserPermissionsForm, UserIndividualPermissionsForm)
 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.ext_json import json
 from rhodecode.lib.utils2 import datetime_to_time, safe_int
 
 log = logging.getLogger(__name__)
 
 
 class UsersController(BaseController):
     """REST Controller styled on the Atom Publishing Protocol"""
 
     @LoginRequired()
     def __before__(self):
         super(UsersController, self).__before__()
         c.available_permissions = config['available_permissions']
         c.allowed_languages = [
             ('en', 'English (en)'),
             ('de', 'German (de)'),
             ('fr', 'French (fr)'),
             ('it', 'Italian (it)'),
             ('ja', 'Japanese (ja)'),
             ('pl', 'Polish (pl)'),
             ('pt', 'Portuguese (pt)'),
             ('ru', 'Russian (ru)'),
             ('zh', 'Chinese (zh)'),
         ]
         PermissionModel().set_global_permission_choices(c, translator=_)
 
     @HasPermissionAllDecorator('hg.admin')
     def index(self):
         """GET /users: All items in the collection"""
         # url('users')
 
         from rhodecode.lib.utils import PartialRenderer
         _render = PartialRenderer('data_table/_dt_elements.html')
 
         def grav_tmpl(user_email, size):
             return _render("user_gravatar", user_email, size)
 
         def username(user_id, username):
             return _render("user_name", user_id, username)
 
         def user_actions(user_id, username):
             return _render("user_actions", user_id, username)
 
         # json generate
         c.users_list = User.query()\
             .filter(User.username != User.DEFAULT_USER) \
             .all()
 
         users_data = []
         for user in c.users_list:
             users_data.append({
                 "gravatar": grav_tmpl(user.email, 20),
                 "username": h.link_to(
                     user.username, h.url('user_profile', username=user.username)),
                 "username_raw": user.username,
                 "email": user.email,
                 "first_name": h.escape(user.name),
                 "last_name": h.escape(user.lastname),
                 "last_login": h.format_date(user.last_login),
                 "last_login_raw": datetime_to_time(user.last_login),
                 "last_activity": h.format_date(
                     h.time_to_datetime(user.user_data.get('last_activity', 0))),
                 "last_activity_raw": user.user_data.get('last_activity', 0),
                 "active": h.bool2icon(user.active),
                 "active_raw": user.active,
                 "admin": h.bool2icon(user.admin),
                 "admin_raw": user.admin,
                 "extern_type": user.extern_type,
                 "extern_name": user.extern_name,
                 "action": user_actions(user.user_id, user.username),
             })
 
 
         c.data = json.dumps(users_data)
         return render('admin/users/users.html')
 
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def create(self):
         """POST /users: Create a new item"""
         # url('users')
         c.default_extern_type = auth_rhodecode.RhodeCodeAuthPlugin.name
         user_model = UserModel()
         user_form = UserForm()()
         try:
             form_result = user_form.to_python(dict(request.POST))
             user = user_model.create(form_result)
             Session().flush()
             username = form_result['username']
             action_logger(c.rhodecode_user, 'admin_created_user:%s' % username,
                           None, self.ip_addr, self.sa)
 
             user_link = h.link_to(h.escape(username),
                                   url('edit_user',
                                       user_id=user.user_id))
             h.flash(h.literal(_('Created user %(user_link)s')
                               % {'user_link': user_link}), category='success')
             Session().commit()
         except formencode.Invalid as errors:
             return htmlfill.render(
                 render('admin/users/user_add.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8",
                 force_defaults=False)
         except UserCreationError as e:
             h.flash(e, 'error')
         except Exception:
             log.exception("Exception creation of user")
             h.flash(_('Error occurred during creation of user %s')
                     % request.POST.get('username'), category='error')
         return redirect(url('users'))
 
     @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
         return render('admin/users/user_add.html')
 
     @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'
         c.extern_type = c.user.extern_type
         c.extern_name = c.user.extern_name
         c.perm_user = AuthUser(user_id=user_id, ip_addr=self.ip_addr)
         available_languages = [x[0] for x in c.allowed_languages]
         _form = UserForm(edit=True, available_languages=available_languages,
                          old_data={'user_id': user_id,
                                    'email': c.user.email})()
         form_result = {}
         try:
             form_result = _form.to_python(dict(request.POST))
             skip_attrs = ['extern_type', 'extern_name']
             # TODO: plugin should define if username can be updated
             if c.extern_type != "rhodecode":
                 # 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')
             Session().commit()
         except formencode.Invalid as errors:
             defaults = errors.value
             e = errors.error_dict or {}
 
             return htmlfill.render(
                 render('admin/users/user_edit.html'),
                 defaults=defaults,
                 errors=e,
                 prefix_error=False,
                 encoding="UTF-8",
                 force_defaults=False)
+        except UserCreationError as e:
+            h.flash(e, 'error')
         except Exception:
             log.exception("Exception updating user")
             h.flash(_('Error occurred during update of user %s')
                     % form_result.get('username'), category='error')
         return redirect(url('edit_user', user_id=user_id))
 
     @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)
 
         _repos = c.user.repositories
         _repo_groups = c.user.repository_groups
         _user_groups = c.user.user_groups
 
         handle_repos = None
         handle_repo_groups = None
         handle_user_groups = None
         # dummy call for flash of handle
         set_handle_flash_repos = lambda: None
         set_handle_flash_repo_groups = lambda: None
         set_handle_flash_user_groups = lambda: None
 
         if _repos and request.POST.get('user_repos'):
             do = request.POST['user_repos']
             if do == 'detach':
                 handle_repos = 'detach'
                 set_handle_flash_repos = lambda: h.flash(
                     _('Detached %s repositories') % len(_repos),
                     category='success')
             elif do == 'delete':
                 handle_repos = 'delete'
                 set_handle_flash_repos = lambda: h.flash(
                     _('Deleted %s repositories') % len(_repos),
                     category='success')
 
         if _repo_groups and request.POST.get('user_repo_groups'):
             do = request.POST['user_repo_groups']
             if do == 'detach':
                 handle_repo_groups = 'detach'
                 set_handle_flash_repo_groups = lambda: h.flash(
                     _('Detached %s repository groups') % len(_repo_groups),
                     category='success')
             elif do == 'delete':
                 handle_repo_groups = 'delete'
                 set_handle_flash_repo_groups = lambda: h.flash(
                     _('Deleted %s repository groups') % len(_repo_groups),
                     category='success')
 
         if _user_groups and request.POST.get('user_user_groups'):
             do = request.POST['user_user_groups']
             if do == 'detach':
                 handle_user_groups = 'detach'
                 set_handle_flash_user_groups = lambda: h.flash(
                     _('Detached %s user groups') % len(_user_groups),
                     category='success')
             elif do == 'delete':
                 handle_user_groups = 'delete'
                 set_handle_flash_user_groups = lambda: h.flash(
                     _('Deleted %s user groups') % len(_user_groups),
                     category='success')
 
         try:
             UserModel().delete(c.user, handle_repos=handle_repos,
                                handle_repo_groups=handle_repo_groups,
                                handle_user_groups=handle_user_groups)
             Session().commit()
             set_handle_flash_repos()
             set_handle_flash_repo_groups()
             set_handle_flash_user_groups()
             h.flash(_('Successfully deleted user'), category='success')
         except (UserOwnsReposException, UserOwnsRepoGroupsException,
                 UserOwnsUserGroupsException, DefaultUserException) as e:
             h.flash(e, category='warning')
         except Exception:
             log.exception("Exception during deletion of user")
             h.flash(_('An error occurred during deletion of user'),
                     category='error')
         return redirect(url('users'))
 
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     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')
             else:
                 msg = _('Force password change enabled for user')
             h.flash(msg, category='success')
         except Exception:
             log.exception("Exception during password reset for user")
             h.flash(_('An error occurred during password reset for user'),
                     category='error')
 
         return redirect(url('edit_user_advanced', user_id=user_id))
 
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     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
 
         user_id = safe_int(user_id)
         c.user = User.get_or_404(user_id)
 
         try:
             desc = RepoGroupModel.PERSONAL_GROUP_DESC % {
                 'username': c.user.username}
             if not RepoGroup.get_by_group_name(c.user.username):
                 RepoGroupModel().create(group_name=c.user.username,
                                         group_description=desc,
                                         owner=c.user.username)
 
                 msg = _('Created repository group `%s`' % (c.user.username,))
                 h.flash(msg, category='success')
         except Exception:
             log.exception("Exception during repository group creation")
             msg = _(
                 'An error occurred during repository group creation for user')
             h.flash(msg, category='error')
 
         return redirect(url('edit_user_advanced', user_id=user_id))
 
     @HasPermissionAllDecorator('hg.admin')
     def show(self, user_id):
         """GET /users/user_id: Show a specific item"""
         # url('user', user_id=ID)
         User.get_or_404(-1)
 
     @HasPermissionAllDecorator('hg.admin')
     def edit(self, user_id):
         """GET /users/user_id/edit: Form to edit an existing item"""
         # url('edit_user', user_id=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(url('users'))
 
         c.active = 'profile'
         c.extern_type = c.user.extern_type
         c.extern_name = c.user.extern_name
         c.perm_user = AuthUser(user_id=user_id, ip_addr=self.ip_addr)
 
         defaults = c.user.get_dict()
         defaults.update({'language': c.user.user_data.get('language')})
         return htmlfill.render(
             render('admin/users/user_edit.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False)
 
     @HasPermissionAllDecorator('hg.admin')
     def edit_advanced(self, user_id):
         user_id = safe_int(user_id)
         user = c.user = User.get_or_404(user_id)
         if user.username == User.DEFAULT_USER:
             h.flash(_("You can't edit this user"), category='warning')
             return redirect(url('users'))
 
         c.active = 'advanced'
         c.perm_user = AuthUser(user_id=user_id, ip_addr=self.ip_addr)
         c.personal_repo_group = RepoGroup.get_by_group_name(user.username)
-        c.first_admin = User.get_first_admin()
+        c.first_admin = User.get_first_super_admin()
         defaults = user.get_dict()
 
         # Interim workaround if the user participated on any pull requests as a
         # reviewer.
         has_review = bool(PullRequestReviewers.query().filter(
             PullRequestReviewers.user_id == user_id).first())
         c.can_delete_user = not has_review
         c.can_delete_user_message = _(
             'The user participates as reviewer in pull requests and '
             'cannot be deleted. You can set the user to '
             '"inactive" instead of deleting it.') if has_review else ''
 
         return htmlfill.render(
             render('admin/users/user_edit.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False)
 
     @HasPermissionAllDecorator('hg.admin')
     def edit_auth_tokens(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(url('users'))
 
         c.active = 'auth_tokens'
         show_expired = True
         c.lifetime_values = [
             (str(-1), _('forever')),
             (str(5), _('5 minutes')),
             (str(60), _('1 hour')),
             (str(60 * 24), _('1 day')),
             (str(60 * 24 * 30), _('1 month')),
         ]
         c.lifetime_options = [(c.lifetime_values, _("Lifetime"))]
         c.role_values = [(x, AuthTokenModel.cls._get_role_name(x))
                          for x in AuthTokenModel.cls.ROLES]
         c.role_options = [(c.role_values, _("Role"))]
         c.user_auth_tokens = AuthTokenModel().get_auth_tokens(
             c.user.user_id, show_expired=show_expired)
         defaults = c.user.get_dict()
         return htmlfill.render(
             render('admin/users/user_edit.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False)
 
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def add_auth_token(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(url('users'))
 
         lifetime = safe_int(request.POST.get('lifetime'), -1)
         description = request.POST.get('description')
         role = request.POST.get('role')
         AuthTokenModel().create(c.user.user_id, description, lifetime, role)
         Session().commit()
         h.flash(_("Auth token successfully created"), category='success')
         return redirect(url('edit_user_auth_tokens', user_id=c.user.user_id))
 
     @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def delete_auth_token(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(url('users'))
 
         auth_token = request.POST.get('del_auth_token')
         if request.POST.get('del_auth_token_builtin'):
             user = User.get(c.user.user_id)
             if user:
                 user.api_key = generate_auth_token(user.username)
                 Session().add(user)
                 Session().commit()
                 h.flash(_("Auth token successfully reset"), category='success')
         elif auth_token:
             AuthTokenModel().delete(auth_token, c.user.user_id)
             Session().commit()
             h.flash(_("Auth token successfully deleted"), category='success')
 
         return redirect(url('edit_user_auth_tokens', user_id=c.user.user_id))
 
     @HasPermissionAllDecorator('hg.admin')
     def edit_global_perms(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(url('users'))
 
         c.active = 'global_perms'
 
         c.default_user = User.get_default_user()
         defaults = c.user.get_dict()
         defaults.update(c.default_user.get_default_perms(suffix='_inherited'))
         defaults.update(c.default_user.get_default_perms())
         defaults.update(c.user.get_default_perms())
 
         return htmlfill.render(
             render('admin/users/user_edit.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False)
 
     @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'
         try:
             # first stage that verifies the checkbox
             _form = UserIndividualPermissionsForm()
             form_result = _form.to_python(dict(request.POST))
             inherit_perms = form_result['inherit_default_permissions']
             user.inherit_default_permissions = inherit_perms
             Session().add(user)
 
             if not inherit_perms:
                 # only update the individual ones if we un check the flag
                 _form = UserPermissionsForm(
                     [x[0] for x in c.repo_create_choices],
                     [x[0] for x in c.repo_create_on_write_choices],
                     [x[0] for x in c.repo_group_create_choices],
                     [x[0] for x in c.user_group_create_choices],
                     [x[0] for x in c.fork_choices],
                     [x[0] for x in c.inherit_default_permission_choices])()
 
                 form_result = _form.to_python(dict(request.POST))
                 form_result.update({'perm_user_id': user.user_id})
 
                 PermissionModel().update_user_permissions(form_result)
 
             Session().commit()
             h.flash(_('User global permissions updated successfully'),
                     category='success')
 
             Session().commit()
         except formencode.Invalid as errors:
             defaults = errors.value
             c.user = user
             return htmlfill.render(
                 render('admin/users/user_edit.html'),
                 defaults=defaults,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8",
                 force_defaults=False)
         except Exception:
             log.exception("Exception during permissions saving")
             h.flash(_('An error occurred during permissions saving'),
                     category='error')
         return redirect(url('edit_user_global_perms', user_id=user_id))
 
     @HasPermissionAllDecorator('hg.admin')
     def edit_perms_summary(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(url('users'))
 
         c.active = 'perms_summary'
         c.perm_user = AuthUser(user_id=user_id, ip_addr=self.ip_addr)
 
         return render('admin/users/user_edit.html')
 
     @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(url('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.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False)
 
     @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()
 
         try:
             user_model.add_extra_email(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 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):
         """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()
         user_model.delete_extra_email(user_id, email_id)
         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(url('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.html'),
             defaults=defaults,
             encoding="UTF-8",
             force_defaults=False)
 
     @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()
         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 = []
         for ip in ip_list:
             try:
                 user_model.add_extra_ip(user_id, ip, desc)
                 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):
         """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()
         user_model.delete_extra_ip(user_id, ip_id)
         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))

rhodecode/controllers/home.py

@@ -1,277 +1,289 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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/
 
 """
 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 rhodecode.lib.auth import (
     LoginRequired, HasPermissionAllDecorator, AuthUser,
     HasRepoGroupPermissionAnyDecorator, XHRRequired)
 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
+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
 from rhodecode.model.scm import RepoList, RepoGroupList
 
 
 log = logging.getLogger(__name__)
 
 
 class HomeController(BaseController):
     def __before__(self):
         super(HomeController, self).__before__()
 
     def ping(self):
         """
         Ping, doesn't require login, good for checking out the platform
         """
         instance_id = getattr(c, 'rhodecode_instanceid', '')
         return 'pong[%s] => %s' % (instance_id, self.ip_addr,)
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     def error_test(self):
         """
         Test exception handling and emails on errors
         """
         class TestException(Exception):
             pass
 
         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.html')
 
     @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.html')
 
     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)
 
         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
 
     @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
 
     @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)
+        _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)
+            _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):
-        return {'suggestions': []}
+        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}
+

rhodecode/events.py

@@ -1,31 +1,53 b''
 # Copyright (C) 2016-2016  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 zope.interface import implementer
-from rhodecode.interfaces import IUserRegistered
+from rhodecode.interfaces import (
+    IUserRegistered, IUserPreCreate, IUserPreUpdate)
 
 
 @implementer(IUserRegistered)
 class UserRegistered(object):
     """
     An instance of this class is emitted as an :term:`event` whenever a user
     account is registered.
     """
     def __init__(self, user, session):
         self.user = user
         self.session = session
+
+
+@implementer(IUserPreCreate)
+class UserPreCreate(object):
+    """
+    An instance of this class is emitted as an :term:`event` before a new user
+    object is created.
+    """
+    def __init__(self, user_data):
+        self.user_data = user_data
+
+
+@implementer(IUserPreUpdate)
+class UserPreUpdate(object):
+    """
+    An instance of this class is emitted as an :term:`event` before a user
+    object is updated.
+    """
+    def __init__(self, user, user_data):
+        self.user = user
+        self.user_data = user_data

rhodecode/i18n/rhodecode.pot

@@ -1,7772 +1,7786 b''
 # Translations template for rhodecode-enterprise-ce.
 # Copyright (C) 2016 RhodeCode GmbH
 # This file is distributed under the same license as the rhodecode-enterprise-ce project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rhodecode-enterprise-ce 4.0.0\n"
+"Project-Id-Version: rhodecode-enterprise-ce 4.2.0\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2016-05-22 18:01+0000\n"
+"POT-Creation-Date: 2016-06-28 10:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: rhodecode/authentication/routes.py:61
-#: rhodecode/controllers/admin/settings.py:825
+#: rhodecode/authentication/routes.py:60
+#: rhodecode/controllers/admin/settings.py:844
 #: rhodecode/templates/admin/permissions/permissions.html:36
 msgid "Global"
 msgstr ""
 
+#: rhodecode/authentication/schema.py:35
+msgid "Enable or disable this authentication plugin."
+msgstr ""
+
 #: rhodecode/authentication/schema.py:37
-msgid "Enable or disable this authentication plugin."
-msgstr ""
-
-#: rhodecode/authentication/schema.py:39
 msgid "Enabled"
 msgstr ""
 
-#: rhodecode/authentication/schema.py:45
+#: rhodecode/authentication/schema.py:43
 msgid "Amount of seconds to cache the authentication call for this plugin. Useful for long calls like LDAP to improve the responsiveness of the authentication system (0 means disabled)."
 msgstr ""
 
-#: rhodecode/authentication/schema.py:50
+#: rhodecode/authentication/schema.py:48
 msgid "Auth Cache TTL"
 msgstr ""
 
-#: rhodecode/authentication/views.py:108
+#: rhodecode/authentication/views.py:88
 msgid "Errors exist when saving plugin settings. Please check the form inputs."
 msgstr ""
 
-#: rhodecode/authentication/views.py:131 rhodecode/authentication/views.py:200
+#: rhodecode/authentication/views.py:101 rhodecode/authentication/views.py:170
 msgid "Auth settings updated successfully."
 msgstr ""
 
-#: rhodecode/authentication/views.py:205
+#: rhodecode/authentication/views.py:175
 msgid "Errors exist when saving plugin setting. Please check the form inputs."
 msgstr ""
 
-#: rhodecode/authentication/views.py:215
+#: rhodecode/authentication/views.py:185
 msgid "Error occurred during update of auth settings."
 msgstr ""
 
+#: rhodecode/authentication/plugins/auth_crowd.py:61
+msgid "The FQDN or IP of the Atlassian CROWD Server"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_crowd.py:63
+msgid "Host"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_crowd.py:68
+msgid "The Port in use by the Atlassian CROWD Server"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_crowd.py:70
+#: rhodecode/authentication/plugins/auth_ldap.py:84
+msgid "Port"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_crowd.py:76
+msgid "The Application Name to authenticate to CROWD"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_crowd.py:78
+msgid "Application Name"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_crowd.py:83
+msgid "The password to authenticate to CROWD"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_crowd.py:85
+msgid "Application Password"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_crowd.py:90
+msgid "A comma separated list of group names that identify users as RhodeCode Administrators"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_crowd.py:94
+msgid "Admin Groups"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_crowd.py:216
+msgid "CROWD"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_headers.py:55
+msgid "Header to extract the user from"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_headers.py:57
+msgid "Header"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_headers.py:62
+msgid "Header to extract the user from when main one fails"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_headers.py:64
+msgid "Fallback header"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_headers.py:69
+msgid "Perform cleaning of user, if passed user has @ in username then first part before @ is taken. If there's \\ in the username only the part after  \\ is taken"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_headers.py:74
+msgid "Clean username"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_headers.py:99
+msgid "Headers"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_jasig_cas.py:63
+msgid "The url of the Jasig CAS REST service"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_jasig_cas.py:65
+#: rhodecode/templates/admin/gists/show.html:21
+msgid "URL"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_jasig_cas.py:93
+msgid "Jasig-CAS"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:75
+msgid "Host of the LDAP Server"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:77
+msgid "LDAP Host"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:82
+msgid "Port that the LDAP server is listening on"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:90
+msgid "User to connect to LDAP"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:93
+msgid "Account"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:98
+msgid "Password to connect to LDAP"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:101
+#: rhodecode/templates/login.html:50 rhodecode/templates/register.html:48
+#: rhodecode/templates/admin/my_account/my_account.html:30
+#: rhodecode/templates/admin/users/user_add.html:44
+#: rhodecode/templates/base/base.html:314
+#: rhodecode/templates/debug_style/login.html:45
+msgid "Password"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:106
+msgid "TLS Type"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:107
+msgid "Connection Security"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:113
+msgid "Require Cert over TLS?"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:114
+msgid "Certificate Checks"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:120
+msgid "Base DN to search (e.g., dc=mydomain,dc=com)"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:123
+msgid "Base DN"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:128
+msgid "Filter to narrow results (e.g., ou=Users, etc)"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:131
+msgid "LDAP Search Filter"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:136
+msgid "How deep to search LDAP"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:137
+msgid "LDAP Search Scope"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:143
+msgid "LDAP Attribute to map to user name"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:144
+msgid "The LDAP Login attribute of the CN must be specified"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:146
+msgid "Login Attribute"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:151
+msgid "LDAP Attribute to map to first name"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:154
+msgid "First Name Attribute"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:159
+msgid "LDAP Attribute to map to last name"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:162
+msgid "Last Name Attribute"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:167
+msgid "LDAP Attribute to map to email address"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:170
+msgid "Email Attribute"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_ldap.py:348
+msgid "LDAP"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_pam.py:60
+msgid "PAM service name to use for authentication."
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_pam.py:62
+msgid "PAM service name"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_pam.py:67
+msgid "Regular expression for extracting user name/email etc. from Unix userinfo."
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_pam.py:70
+msgid "Gecos Regex"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_pam.py:98
+msgid "PAM"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_rhodecode.py:68
+msgid "Rhodecode"
+msgstr ""
+
+#: rhodecode/authentication/plugins/auth_token.py:71
+msgid "Rhodecode Token Auth"
+msgstr ""
+
 #: rhodecode/controllers/changelog.py:90 rhodecode/controllers/compare.py:63
 #: rhodecode/controllers/pullrequests.py:279
 msgid "There are no commits yet"
 msgstr ""
 
 #: rhodecode/controllers/changeset.py:77
 #: rhodecode/templates/files/diff_2way.html:75
 msgid "Show whitespace"
 msgstr ""
 
 #: rhodecode/controllers/changeset.py:78
 msgid "Show whitespace for all diffs"
 msgstr ""
 
 #: rhodecode/controllers/changeset.py:84
 #: rhodecode/templates/files/diff_2way.html:74
 msgid "Ignore whitespace"
 msgstr ""
 
 #: rhodecode/controllers/changeset.py:85
 msgid "Ignore whitespace for all diffs"
 msgstr ""
 
 #: rhodecode/controllers/changeset.py:141
 msgid "Increase context"
 msgstr ""
 
 #: rhodecode/controllers/changeset.py:142
 msgid "Increase context for all diffs"
 msgstr ""
 
 #: rhodecode/controllers/changeset.py:181 rhodecode/controllers/files.py:104
 #: rhodecode/controllers/files.py:125
 msgid "No such commit exists for this repository"
 msgstr ""
 
 #: rhodecode/controllers/changeset.py:335
-#: rhodecode/controllers/pullrequests.py:744
-#: rhodecode/model/pull_request.py:828
+#: rhodecode/controllers/pullrequests.py:746
+#: rhodecode/model/pull_request.py:836
 #, python-format
 msgid "Status change %(transition_icon)s %(status)s"
 msgstr ""
 
 #: rhodecode/controllers/changeset.py:372
 msgid "Changing the status of a commit associated with a closed pull request is not allowed"
 msgstr ""
 
 #: rhodecode/controllers/compare.py:87
 msgid "Select commit"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:142
+#: rhodecode/controllers/compare.py:139
 #, python-format
 msgid "Could not find the original repo: %(repo)s"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:150
+#: rhodecode/controllers/compare.py:147
 #, python-format
 msgid "Could not find the other repo: %(repo)s"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:159
+#: rhodecode/controllers/compare.py:156
 msgid "The comparison of two different kinds of remote repos is not available"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:186
+#: rhodecode/controllers/compare.py:190
 msgid "Could not compare repos with different large file settings"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:223
+#: rhodecode/controllers/compare.py:226
 #, python-format
 msgid "Repositories unrelated. Cannot compare commit %(commit1)s from repository %(repo1)s with commit %(commit2)s from repository %(repo2)s."
 msgstr ""
 
-#: rhodecode/controllers/error.py:85 rhodecode/controllers/error.py:136
-msgid "Home page"
-msgstr ""
-
-#: rhodecode/controllers/error.py:114
-msgid "The request could not be understood by the server due to malformed syntax."
-msgstr ""
-
-#: rhodecode/controllers/error.py:117
-msgid "Unauthorized access to resource"
-msgstr ""
-
-#: rhodecode/controllers/error.py:119
-msgid "You don't have permission to view this page"
-msgstr ""
-
-#: rhodecode/controllers/error.py:121
-msgid "The resource could not be found"
-msgstr ""
-
-#: rhodecode/controllers/error.py:123
-msgid "The server encountered an unexpected condition which prevented it from fulfilling the request."
-msgstr ""
-
-#: rhodecode/controllers/error.py:128
-msgid "VCS Server Required"
-msgstr ""
-
-#: rhodecode/controllers/error.py:129
-msgid "A VCS Server is required for this action. There is currently no VCS Server configured."
-msgstr ""
-
 #: rhodecode/controllers/feed.py:70
 #, python-format
 msgid "Changes on %s repository"
 msgstr ""
 
 #: rhodecode/controllers/feed.py:71
 #, python-format
 msgid "%s %s feed"
 msgstr ""
 
 #: rhodecode/controllers/files.py:96
 msgid "Click here to add a new file."
 msgstr ""
 
 #: rhodecode/controllers/files.py:101
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 
 #: rhodecode/controllers/files.py:390 rhodecode/controllers/files.py:443
 #: rhodecode/controllers/files.py:474 rhodecode/controllers/files.py:549
 #: rhodecode/controllers/files.py:594 rhodecode/controllers/files.py:685
 #, python-format
 msgid "This repository has been locked by %s on %s"
 msgstr ""
 
 #: rhodecode/controllers/files.py:398 rhodecode/controllers/files.py:451
 msgid "You can only delete files with revision being a valid branch "
 msgstr ""
 
 #: rhodecode/controllers/files.py:407 rhodecode/controllers/files.py:460
 #, python-format
 msgid "Deleted file %s via RhodeCode Enterprise"
 msgstr ""
 
 #: rhodecode/controllers/files.py:427
 #, python-format
 msgid "Successfully deleted file %s"
 msgstr ""
 
 #: rhodecode/controllers/files.py:430 rhodecode/controllers/files.py:536
 #: rhodecode/controllers/files.py:673
 msgid "Error occurred during commit"
 msgstr ""
 
 #: rhodecode/controllers/files.py:482 rhodecode/controllers/files.py:557
 msgid "You can only edit files with revision being a valid branch "
 msgstr ""
 
 #: rhodecode/controllers/files.py:494 rhodecode/controllers/files.py:569
 #, python-format
 msgid "Edited file %s via RhodeCode Enterprise"
 msgstr ""
 
 #: rhodecode/controllers/files.py:511
 msgid "No changes"
 msgstr ""
 
 #: rhodecode/controllers/files.py:533 rhodecode/controllers/files.py:662
 #, python-format
 msgid "Successfully committed to %s"
 msgstr ""
 
 #: rhodecode/controllers/files.py:607 rhodecode/controllers/files.py:696
 msgid "Added file via RhodeCode Enterprise"
 msgstr ""
 
 #: rhodecode/controllers/files.py:632
 msgid "No filename"
 msgstr ""
 
 #: rhodecode/controllers/files.py:665
 msgid "The location specified must be a relative path and must not contain .. in the path"
 msgstr ""
 
 #: rhodecode/controllers/files.py:719
 msgid "Downloads disabled"
 msgstr ""
 
 #: rhodecode/controllers/files.py:725
 #, python-format
 msgid "Unknown revision %s"
 msgstr ""
 
 #: rhodecode/controllers/files.py:727
 msgid "Empty repository"
 msgstr ""
 
 #: rhodecode/controllers/files.py:729 rhodecode/controllers/files.py:763
 msgid "Unknown archive type"
 msgstr ""
 
 #: rhodecode/controllers/files.py:930
 #, python-format
 msgid "Commit %(commit)s does not exist."
 msgstr ""
 
 #: rhodecode/controllers/files.py:947
 #, python-format
 msgid "%(file_path)s has not changed between %(commit_1)s and %(commit_2)s."
 msgstr ""
 
 #: rhodecode/controllers/files.py:1014
 msgid "Changesets"
 msgstr ""
 
 #: rhodecode/controllers/files.py:1035 rhodecode/controllers/summary.py:256
-#: rhodecode/model/pull_request.py:1037 rhodecode/model/scm.py:783
+#: rhodecode/model/pull_request.py:1051 rhodecode/model/scm.py:783
 #: rhodecode/templates/base/vcs_settings.html:138
 msgid "Branches"
 msgstr ""
 
 #: rhodecode/controllers/files.py:1039 rhodecode/model/scm.py:798
 #: rhodecode/templates/base/vcs_settings.html:163
 msgid "Tags"
 msgstr ""
 
 #: rhodecode/controllers/forks.py:191
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr ""
 
-#: rhodecode/controllers/home.py:174
+#: rhodecode/controllers/home.py:205
 msgid "Groups"
 msgstr ""
 
-#: rhodecode/controllers/home.py:181 rhodecode/controllers/home.py:203
+#: rhodecode/controllers/home.py:212 rhodecode/controllers/home.py:247
 #: rhodecode/controllers/pullrequests.py:382
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:128
 #: rhodecode/templates/admin/repos/repo_add.html:15
 #: rhodecode/templates/admin/repos/repo_add.html:19
 #: rhodecode/templates/admin/users/user_edit_advanced.html:11
-#: rhodecode/templates/base/base.html:79 rhodecode/templates/base/base.html:147
-#: rhodecode/templates/base/base.html:621
+#: rhodecode/templates/base/base.html:79 rhodecode/templates/base/base.html:149
+#: rhodecode/templates/base/base.html:626
 msgid "Repositories"
 msgstr ""
 
+#: rhodecode/controllers/home.py:225
+#, python-format
+msgid "Commits in %(repo)s"
+msgstr ""
+
 #: rhodecode/controllers/journal.py:107 rhodecode/controllers/journal.py:150
 msgid "public journal"
 msgstr ""
 
 #: rhodecode/controllers/journal.py:111 rhodecode/controllers/journal.py:154
 msgid "journal"
 msgstr ""
 
-#: rhodecode/controllers/login.py:227 rhodecode/controllers/login.py:281
-msgid "bad captcha"
-msgstr ""
-
-#: rhodecode/controllers/login.py:241
-msgid "You have successfully registered with RhodeCode"
-msgstr ""
-
-#: rhodecode/controllers/login.py:286
-msgid "Your password reset link was sent"
-msgstr ""
-
-#: rhodecode/controllers/login.py:307
-msgid "Your password reset was successful, a new password has been sent to your email"
-msgstr ""
-
-#: rhodecode/controllers/login.py:340
-msgid "There was an error during OAuth processing."
-msgstr ""
-
-#: rhodecode/controllers/login.py:406
-msgid "You need to finish registration process to bind your external identity to your account or sign in to existing account"
-msgstr ""
-
 #: rhodecode/controllers/pullrequests.py:293
 msgid "Commit does not exist"
 msgstr ""
 
 #: rhodecode/controllers/pullrequests.py:405
 msgid "Pull request requires a title with min. 3 chars"
 msgstr ""
 
 #: rhodecode/controllers/pullrequests.py:407
 msgid "Error creating pull request: {}"
 msgstr ""
 
 #: rhodecode/controllers/pullrequests.py:454
 msgid "Successfully opened new pull request"
 msgstr ""
 
 #: rhodecode/controllers/pullrequests.py:457
 msgid "Error occurred during sending pull request"
 msgstr ""
 
 #: rhodecode/controllers/pullrequests.py:497
 msgid "Cannot update closed pull requests."
 msgstr ""
 
 #: rhodecode/controllers/pullrequests.py:503
 msgid "Pull request title & description updated."
 msgstr ""
 
 #: rhodecode/controllers/pullrequests.py:513
 msgid "Pull request updated to \"{source_commit_id}\" with {count_added} added, {count_removed} removed commits."
 msgstr ""
 
 #: rhodecode/controllers/pullrequests.py:523
 msgid "Nothing changed in pull request."
 msgstr ""
 
 #: rhodecode/controllers/pullrequests.py:526
 msgid "Skipping update of pull request due to reference type: {reference_type}"
 msgstr ""
 
 #: rhodecode/controllers/pullrequests.py:533
 msgid "Update failed due to missing commits."
 msgstr ""
 
 #: rhodecode/controllers/pullrequests.py:579
 msgid "Pull request reviewer approval is pending."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:629
+#: rhodecode/controllers/pullrequests.py:593
+msgid "Pull request was successfully merged and closed."
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:631
 msgid "Successfully deleted pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:662
+#: rhodecode/controllers/pullrequests.py:664
 msgid "Reviewer approval is pending."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:704
+#: rhodecode/controllers/pullrequests.py:706
 msgid "Close Pull Request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:748
-#: rhodecode/model/pull_request.py:832
+#: rhodecode/controllers/pullrequests.py:750
+#: rhodecode/model/pull_request.py:840
 msgid "Closing with"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:793
+#: rhodecode/controllers/pullrequests.py:795
 #, 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:240
 msgid "Branch"
 msgstr ""
 
 #: rhodecode/controllers/summary.py:241
 msgid "Tag"
 msgstr ""
 
 #: rhodecode/controllers/summary.py:242
 msgid "Bookmark"
 msgstr ""
 
 #: rhodecode/controllers/summary.py:257
 msgid "Closed branches"
 msgstr ""
 
 #: rhodecode/controllers/admin/defaults.py:84
 msgid "Default settings updated successfully"
 msgstr ""
 
 #: rhodecode/controllers/admin/defaults.py:99
 msgid "Error occurred during update of default values"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:59
-#: rhodecode/controllers/admin/my_account.py:308
-#: rhodecode/controllers/admin/users.py:434
+#: rhodecode/controllers/admin/my_account.py:307
+#: rhodecode/controllers/admin/users.py:436
 msgid "forever"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:60
-#: rhodecode/controllers/admin/my_account.py:309
-#: rhodecode/controllers/admin/users.py:435
+#: rhodecode/controllers/admin/my_account.py:308
+#: rhodecode/controllers/admin/users.py:437
 msgid "5 minutes"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:61
-#: rhodecode/controllers/admin/my_account.py:310
-#: rhodecode/controllers/admin/users.py:436
+#: rhodecode/controllers/admin/my_account.py:309
+#: rhodecode/controllers/admin/users.py:438
 msgid "1 hour"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:62
-#: rhodecode/controllers/admin/my_account.py:311
-#: rhodecode/controllers/admin/users.py:437
+#: rhodecode/controllers/admin/my_account.py:310
+#: rhodecode/controllers/admin/users.py:439
 msgid "1 day"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:63
-#: rhodecode/controllers/admin/my_account.py:312
-#: rhodecode/controllers/admin/users.py:438
+#: rhodecode/controllers/admin/my_account.py:311
+#: rhodecode/controllers/admin/users.py:440
 msgid "1 month"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:67
-#: rhodecode/controllers/admin/my_account.py:314
-#: rhodecode/controllers/admin/users.py:440
+#: rhodecode/controllers/admin/my_account.py:313
+#: rhodecode/controllers/admin/users.py:442
 msgid "Lifetime"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:69
 msgid "Requires registered account"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:70
 msgid "Can be accessed by anonymous users"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:180
 msgid "Error occurred during gist creation"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:211
 #, python-format
 msgid "Deleted gist %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:284
 msgid "Successfully updated gist content"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:289
 msgid "Successfully updated gist data"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:292
 #, python-format
 msgid "Error occurred during update of gist %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:315
 #: rhodecode/templates/admin/gists/show.html:67
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:19
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:42
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:16
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:38
 #: rhodecode/templates/data_table/_dt_elements.html:253
 msgid "never"
 msgstr ""
 
 #: rhodecode/controllers/admin/gists.py:320
 #, python-format
 msgid "%(expiry)s - current value"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:71
+#: 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:129
+#: rhodecode/controllers/admin/my_account.py:128
 msgid "Your account was updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:144
-#: rhodecode/controllers/admin/users.py:221
+#: rhodecode/controllers/admin/my_account.py:143
+#: rhodecode/controllers/admin/users.py:223
 #, python-format
 msgid "Error occurred during update of user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:203
+#: rhodecode/controllers/admin/my_account.py:202
 msgid "Successfully updated password"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:214
+#: rhodecode/controllers/admin/my_account.py:213
 msgid "Error occurred during update of user password"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:262
-#: rhodecode/controllers/admin/users.py:614
+#: rhodecode/controllers/admin/my_account.py:261
+#: rhodecode/controllers/admin/users.py:616
 #, python-format
 msgid "Added new email address `%s` for user account"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:269
-#: rhodecode/controllers/admin/users.py:621
+#: rhodecode/controllers/admin/my_account.py:268
+#: rhodecode/controllers/admin/users.py:623
 msgid "An error occurred during email saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:279
-#: rhodecode/controllers/admin/users.py:636
+#: rhodecode/controllers/admin/my_account.py:278
+#: rhodecode/controllers/admin/users.py:638
 msgid "Removed email address from user account"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:317
-#: rhodecode/controllers/admin/users.py:443
+#: rhodecode/controllers/admin/my_account.py:316
+#: rhodecode/controllers/admin/users.py:445
 msgid "Role"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:330
-#: rhodecode/controllers/admin/users.py:467
+#: rhodecode/controllers/admin/my_account.py:329
+#: rhodecode/controllers/admin/users.py:469
 msgid "Auth token successfully created"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:343
-#: rhodecode/controllers/admin/users.py:486
+#: rhodecode/controllers/admin/my_account.py:342
+#: rhodecode/controllers/admin/users.py:488
 msgid "Auth token successfully reset"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:347
-#: rhodecode/controllers/admin/users.py:490
+#: rhodecode/controllers/admin/my_account.py:346
+#: rhodecode/controllers/admin/users.py:492
 msgid "Auth token successfully deleted"
 msgstr ""
 
-#: rhodecode/controllers/admin/my_account.py:371
-msgid "OAuth token successfully deleted"
-msgstr ""
-
 #: rhodecode/controllers/admin/permissions.py:111
 msgid "Application permissions updated successfully"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:126
 #: rhodecode/controllers/admin/permissions.py:175
 #: rhodecode/controllers/admin/permissions.py:229
 msgid "Error occurred during update of permissions"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:160
 msgid "Object permissions updated successfully"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:214
 msgid "Global permissions updated successfully"
 msgstr ""
 
 #: rhodecode/controllers/admin/repo_groups.py:197
 #, python-format
 msgid "Created repository group %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/repo_groups.py:210
 #, python-format
 msgid "Error occurred during creation of repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repo_groups.py:259
+#: rhodecode/controllers/admin/repo_groups.py:258
 #, python-format
 msgid "Updated repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repo_groups.py:275
+#: rhodecode/controllers/admin/repo_groups.py:274
 #, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repo_groups.py:297
+#: rhodecode/controllers/admin/repo_groups.py:296
 #, 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:306
+#: rhodecode/controllers/admin/repo_groups.py:305
 #, 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:313
+#: rhodecode/controllers/admin/repo_groups.py:312
 #, python-format
 msgid "Removed repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repo_groups.py:318
+#: rhodecode/controllers/admin/repo_groups.py:317
 #, python-format
 msgid "Error occurred during deletion of repository group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repo_groups.py:389
-#: rhodecode/controllers/admin/user_groups.py:323
+#: rhodecode/controllers/admin/repo_groups.py:388
+#: rhodecode/controllers/admin/user_groups.py:325
 msgid "Cannot change permission for yourself as admin"
 msgstr ""
 
-#: rhodecode/controllers/admin/repo_groups.py:406
+#: rhodecode/controllers/admin/repo_groups.py:405
 msgid "Repository Group permissions updated"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:128
 #, python-format
 msgid "Error creating repository %s: invalid certificate"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:132
 #, python-format
 msgid "Error creating repository %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:264
 #, python-format
 msgid "Created repository %s from %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:273
 #, python-format
 msgid "Forked repository %s as %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:276
 #, python-format
 msgid "Created repository %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:318
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:337
 #, python-format
 msgid "Error occurred during update of repository %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:365
 #, python-format
 msgid "Detached %s forks"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:368
 #, python-format
 msgid "Deleted %s forks"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:373
 #, python-format
 msgid "Deleted repository %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:376
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:381
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:435
 msgid "Repository permissions updated"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:466
 msgid "An error occurred during creation of field"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:481
 msgid "An error occurred during removal of field"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:520
 msgid "Updated repository visibility in public journal"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:524
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:548
 msgid "Nothing"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:550
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:557
 msgid "An error occurred during this operation"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:575
 msgid "Locked repository"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:578
 msgid "Unlocked repository"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:581
 #: rhodecode/controllers/admin/repos.py:610
 msgid "An error occurred during unlocking"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:600
 msgid "Unlocked"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:604
 msgid "Locked"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:606
 #, python-format
 msgid "Repository has been %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:621
 msgid "Cache invalidation successful"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:625
 msgid "An error occurred during cache invalidation"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:645
 msgid "Pulled from remote location"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:648
 msgid "An error occurred during pull from remote location"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:670
 msgid "An error occurred during deletion of repository stats"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:717
 msgid "Error occurred during deleting issue tracker entry"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:720
-#: rhodecode/controllers/admin/settings.py:361
+#: rhodecode/controllers/admin/settings.py:362
 msgid "Removed issue tracker entry"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:750
-#: rhodecode/controllers/admin/settings.py:406
+#: rhodecode/controllers/admin/settings.py:408
 msgid "Updated issue tracker entries"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:809
-#: rhodecode/controllers/admin/settings.py:140
-#: rhodecode/controllers/admin/settings.py:686
+#: rhodecode/controllers/admin/settings.py:141
+#: rhodecode/controllers/admin/settings.py:718
 msgid "Some form inputs contain invalid data."
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:827
 msgid "Error occurred during updating repository VCS settings"
 msgstr ""
 
 #: rhodecode/controllers/admin/repos.py:831
-#: rhodecode/controllers/admin/settings.py:166
+#: rhodecode/controllers/admin/settings.py:167
 msgid "Updated VCS settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:162
-#: rhodecode/controllers/admin/settings.py:265
+#: rhodecode/controllers/admin/settings.py:163
+#: rhodecode/controllers/admin/settings.py:266
 msgid "Error occurred during updating application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:209
+#: rhodecode/controllers/admin/settings.py:210
 #, python-format
 msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:260
+#: rhodecode/controllers/admin/settings.py:262
 msgid "Updated application settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:325
+#: rhodecode/controllers/admin/settings.py:326
 msgid "Updated visualisation settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:328
+#: rhodecode/controllers/admin/settings.py:329
 msgid "Error occurred during updating visualisation settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:419
+#: rhodecode/controllers/admin/settings.py:421
 msgid "Please enter email address"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:437
+#: rhodecode/controllers/admin/settings.py:439
 msgid "Send email task created"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:470
+#: rhodecode/controllers/admin/settings.py:472
 msgid "Added new hook"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:485
+#: rhodecode/controllers/admin/settings.py:487
 msgid "Updated hooks"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:489
+#: rhodecode/controllers/admin/settings.py:491
 msgid "Error occurred during hook creation"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:536
+#: rhodecode/controllers/admin/settings.py:539
 #, python-format
 msgid "Critical: your disk space is very low <b>%s%%</b> usedpercent"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:540
+#: rhodecode/controllers/admin/settings.py:543
 #, python-format
 msgid "Warning: your disk space is running low <b>%s%%</b> usedpercent"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:707
+#: rhodecode/controllers/admin/settings.py:739
 msgid "Error occurred during updating labs settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:711
+#: rhodecode/controllers/admin/settings.py:744
 msgid "Updated Labs settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:775
+#: rhodecode/controllers/admin/settings.py:794
 msgid "Mercurial server-side merge"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:776
+#: rhodecode/controllers/admin/settings.py:795
 msgid "Use rebase instead of creating a merge commit when merging via web interface"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:782
+#: rhodecode/controllers/admin/settings.py:801
 msgid "Subversion HTTP Support"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:783
+#: rhodecode/controllers/admin/settings.py:802
 msgid "Proxy subversion HTTP requests"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:789
+#: rhodecode/controllers/admin/settings.py:808
 msgid "Subversion HTTP Server URL"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:791
+#: rhodecode/controllers/admin/settings.py:810
 msgid "e.g. http://localhost:8080/"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:826
+#: rhodecode/controllers/admin/settings.py:845
 #: rhodecode/templates/admin/repos/repo_edit.html:48
 msgid "VCS"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:827
+#: rhodecode/controllers/admin/settings.py:846
 msgid "Visual"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:828
+#: rhodecode/controllers/admin/settings.py:847
 msgid "Remap and Rescan"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:830
+#: rhodecode/controllers/admin/settings.py:849
 #: rhodecode/templates/admin/repos/repo_edit.html:54
 msgid "Issue Tracker"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:832
-#: rhodecode/templates/register.html:51
+#: rhodecode/controllers/admin/settings.py:851
+#: rhodecode/templates/register.html:76
 #: rhodecode/templates/admin/my_account/my_account_profile.html:48
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:94
 #: rhodecode/templates/admin/users/user_add.html:86
 #: rhodecode/templates/admin/users/user_edit_profile.html:65
 #: rhodecode/templates/admin/users/users.html:91
 #: rhodecode/templates/users/user_profile.html:51
 msgid "Email"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:833
+#: rhodecode/controllers/admin/settings.py:852
 msgid "Hooks"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:834
+#: rhodecode/controllers/admin/settings.py:853
 msgid "Full Text Search"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:836
+#: rhodecode/controllers/admin/settings.py:855
 #: rhodecode/templates/admin/settings/settings_system.html:47
 msgid "System Info"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:838
+#: rhodecode/controllers/admin/settings.py:857
 msgid "Open Source Licenses"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:856
+#: rhodecode/controllers/admin/settings.py:875
 msgid "Labs"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:167
+#: rhodecode/controllers/admin/user_groups.py:168
 #, python-format
 msgid "Created user group %(user_group_link)s"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:181
+#: rhodecode/controllers/admin/user_groups.py:182
 #, python-format
 msgid "Error occurred during creation of user group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:221
+#: rhodecode/controllers/admin/user_groups.py:223
 #, python-format
 msgid "Updated user group %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:236
+#: rhodecode/controllers/admin/user_groups.py:238
 #, 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:260
 msgid "Successfully deleted user group"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:263
+#: rhodecode/controllers/admin/user_groups.py:265
 msgid "An error occurred during deletion of user group"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:331
+#: rhodecode/controllers/admin/user_groups.py:333
 msgid "Target group cannot be the same"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:337
+#: rhodecode/controllers/admin/user_groups.py:339
 msgid "User Group permissions updated"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:422
+#: rhodecode/controllers/admin/user_groups.py:424
 msgid "User Group global permissions updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/user_groups.py:438
-#: rhodecode/controllers/admin/users.py:564
+#: rhodecode/controllers/admin/user_groups.py:440
+#: rhodecode/controllers/admin/users.py:566
 msgid "An error occurred during permissions saving"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:147
 #, python-format
 msgid "Created user %(user_link)s"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:162
 #, python-format
 msgid "Error occurred during creation of user %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:206
 msgid "User updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:255
+#: rhodecode/controllers/admin/users.py:257
 #, python-format
 msgid "Detached %s repositories"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:260
+#: rhodecode/controllers/admin/users.py:262
 #, python-format
 msgid "Deleted %s repositories"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:268
+#: rhodecode/controllers/admin/users.py:270
 #, python-format
 msgid "Detached %s repository groups"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:273
+#: rhodecode/controllers/admin/users.py:275
 #, python-format
 msgid "Deleted %s repository groups"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:281
+#: rhodecode/controllers/admin/users.py:283
 #, python-format
 msgid "Detached %s user groups"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:286
+#: rhodecode/controllers/admin/users.py:288
 #, python-format
 msgid "Deleted %s user groups"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:297
+#: rhodecode/controllers/admin/users.py:299
 msgid "Successfully deleted user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:303
+#: rhodecode/controllers/admin/users.py:305
 msgid "An error occurred during deletion of user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:322
-msgid "Force password change disabled for user"
-msgstr ""
-
 #: rhodecode/controllers/admin/users.py:324
+msgid "Force password change disabled for user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:326
 msgid "Force password change enabled for user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:328
+#: rhodecode/controllers/admin/users.py:330
 msgid "An error occurred during password reset for user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:354
+#: rhodecode/controllers/admin/users.py:356
 #, python-format
 msgid "Created repository group `%s`"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:358
+#: rhodecode/controllers/admin/users.py:360
 msgid "An error occurred during repository group creation for user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:377
-#: rhodecode/controllers/admin/users.py:398
-#: rhodecode/controllers/admin/users.py:428
-#: rhodecode/controllers/admin/users.py:459
-#: rhodecode/controllers/admin/users.py:476
-#: rhodecode/controllers/admin/users.py:499
-#: rhodecode/controllers/admin/users.py:573
-#: rhodecode/controllers/admin/users.py:586
-#: rhodecode/controllers/admin/users.py:644
+#: rhodecode/controllers/admin/users.py:379
+#: rhodecode/controllers/admin/users.py:400
+#: rhodecode/controllers/admin/users.py:430
+#: rhodecode/controllers/admin/users.py:461
+#: rhodecode/controllers/admin/users.py:478
+#: rhodecode/controllers/admin/users.py:501
+#: rhodecode/controllers/admin/users.py:575
+#: rhodecode/controllers/admin/users.py:588
+#: rhodecode/controllers/admin/users.py:646
 msgid "You can't edit this user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:412
+#: rhodecode/controllers/admin/users.py:414
 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:548
+#: rhodecode/controllers/admin/users.py:550
 msgid "User global permissions updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:676
+#: rhodecode/controllers/admin/users.py:678
 #, python-format
 msgid "An error occurred during ip saving:%s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:691
+#: rhodecode/controllers/admin/users.py:693
 msgid "An error occurred during ip saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:695
+#: rhodecode/controllers/admin/users.py:697
 #, python-format
 msgid "Added ips %s to user whitelist"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:713
+#: rhodecode/controllers/admin/users.py:715
 msgid "Removed ip address from user whitelist"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:89
 msgid "[deleted] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:92 rhodecode/lib/action_parser.py:110
 msgid "[created] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:95
 msgid "[created] repository as fork"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:98 rhodecode/lib/action_parser.py:113
 msgid "[forked] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:101 rhodecode/lib/action_parser.py:116
 msgid "[updated] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:104
 msgid "[downloaded] archive from repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:107
 msgid "[delete] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:119
 msgid "[created] user"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:122
 msgid "[updated] user"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:125
 msgid "[created] user group"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:128
 msgid "[updated] user group"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:131
 msgid "[commented] on commit in repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:134
 msgid "[commented] on pull request for"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:137
 msgid "[closed] pull request for"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:140
 msgid "[merged] pull request for"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:143
 msgid "[pushed] into"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:146
 msgid "[committed via RhodeCode] into repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:149
 msgid "[pulled from remote] into repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:152
 msgid "[pulled] from"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:155
 msgid "[started following] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:158
 msgid "[stopped following] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:166
 #, python-format
 msgid "fork name %s"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:183
 #: rhodecode/templates/pullrequests/pullrequest_show.html:48
 #, python-format
 msgid "Pull request #%s"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:216
 #, python-format
 msgid "Show all combined commits %s->%s"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:220
 msgid "compare view"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:227
 #, python-format
 msgid " and %(num)s more commits"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:279
 #, python-format
 msgid "Deleted branch: %s"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:282
 #, python-format
 msgid "Created tag: %s"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:295
 msgid "Commit not found"
 msgstr ""
 
-#: rhodecode/lib/auth.py:1106
+#: rhodecode/lib/auth.py:1180
 #, python-format
 msgid "IP %s not allowed"
 msgstr ""
 
-#: rhodecode/lib/auth.py:1180
+#: rhodecode/lib/auth.py:1254
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 
-#: rhodecode/lib/auth.py:1227
+#: rhodecode/lib/auth.py:1302
 #, python-format
 msgid "Action not supported for %s."
 msgstr ""
 
-#: rhodecode/lib/auth.py:1264
+#: rhodecode/lib/auth.py:1339
 msgid "You need to be signed in to view this page"
 msgstr ""
 
-#: rhodecode/lib/base.py:513
+#: rhodecode/lib/base.py:511
 #, python-format
 msgid "The repository at %(repo_name)s cannot be located."
 msgstr ""
 
 #: rhodecode/lib/diffs.py:71
 msgid "Binary file"
 msgstr ""
 
 #: rhodecode/lib/diffs.py:91
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 
 #: rhodecode/lib/diffs.py:102
 msgid "No changes detected"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1246
+#: rhodecode/lib/helpers.py:1434
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1250
+#: rhodecode/lib/helpers.py:1438
 msgid "No Files"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1323
+#: rhodecode/lib/helpers.py:1511
 msgid "new file"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1326
+#: rhodecode/lib/helpers.py:1514
 msgid "mod"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1329
+#: rhodecode/lib/helpers.py:1517
 msgid "del"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1332
+#: rhodecode/lib/helpers.py:1520
 msgid "rename"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1337
+#: rhodecode/lib/helpers.py:1525
 msgid "chmod"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1579
+#: rhodecode/lib/helpers.py:1767
 msgid ""
 "Example filter terms:\n"
 "     repository:vcs\n"
 "     username:marcin\n"
 "     action:*push*\n"
 "     ip:127.0.0.1\n"
 "     date:20120101\n"
 "     date:[20120101100000 TO 20120102]\n"
 "\n"
 "Generate wildcards using '*' character:\n"
 "     \"repository:vcs*\" - search everything starting with 'vcs'\n"
 "     \"repository:*vcs*\" - search for repository containing 'vcs'\n"
 "\n"
 "Optional AND / OR operators in queries\n"
 "     \"repository:vcs OR repository:test\"\n"
 "     \"username:test AND repository:test*\"\n"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1599
+#: rhodecode/lib/helpers.py:1787
 #, python-format
 msgid "%s repository is not mapped to db perhaps it was created or renamed from the filesystem please run the application again in order to rescan repositories"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:446
+#: rhodecode/lib/utils2.py:453
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:447
+#: rhodecode/lib/utils2.py:454
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:448
+#: rhodecode/lib/utils2.py:455
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:449
+#: rhodecode/lib/utils2.py:456
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:450
+#: rhodecode/lib/utils2.py:457
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:451
+#: rhodecode/lib/utils2.py:458
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:469
+#: rhodecode/lib/utils2.py:476
 #, python-format
 msgid "in %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:475
+#: rhodecode/lib/utils2.py:482
 #, python-format
 msgid "%s ago"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:485
+#: rhodecode/lib/utils2.py:492
 #, python-format
 msgid "%s, %s ago"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:487
+#: rhodecode/lib/utils2.py:494
 #, python-format
 msgid "in %s, %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:489
+#: rhodecode/lib/utils2.py:496
 #, python-format
 msgid "%s and %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:491
+#: rhodecode/lib/utils2.py:498
 #, python-format
 msgid "%s and %s ago"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:493
+#: rhodecode/lib/utils2.py:500
 #, python-format
 msgid "in %s and %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:497
+#: rhodecode/lib/utils2.py:504
 msgid "just now"
 msgstr ""
 
-#: rhodecode/lib/auth_modules/__init__.py:690
-msgid "This provider is currently disabled"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/__init__.py:708
-msgid "Your external identity is now connected with your account"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/__init__.py:712
-msgid "No external user id found? Perhaps permissionsfor authentication are set incorrectly"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_crowd.py:60
-msgid "The FQDN or IP of the Atlassian CROWD Server"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_crowd.py:61
-msgid "Host"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_crowd.py:66
-msgid "The Port in use by the Atlassian CROWD Server"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_crowd.py:67
-#: rhodecode/lib/auth_modules/auth_ldap.py:81
-msgid "Port"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_crowd.py:73
-msgid "The Application Name to authenticate to CROWD"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_crowd.py:74
-msgid "Application Name"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_crowd.py:79
-msgid "The password to authenticate to CROWD"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_crowd.py:80
-msgid "Application Password"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_crowd.py:85
-msgid "A comma separated list of group names that identify users as RhodeCode Administrators"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_crowd.py:88
-msgid "Admin Groups"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_crowd.py:208
-msgid "CROWD"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_jasig_cas.py:63
-msgid "The url of the Jasig CAS REST service"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_jasig_cas.py:64
-#: rhodecode/templates/admin/gists/show.html:21
-msgid "URL"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_jasig_cas.py:90
-msgid "Jasig-CAS"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:74
-msgid "Host of the LDAP Server"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:75
-msgid "LDAP Host"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:80
-msgid "Port that the LDAP server is listening on"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:87
-msgid "User to connect to LDAP"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:89
-msgid "Account"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:94
-msgid "Password to connect to LDAP"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:96 rhodecode/templates/login.html:45
-#: rhodecode/templates/register.html:43
-#: rhodecode/templates/admin/my_account/my_account.html:30
-#: rhodecode/templates/admin/users/user_add.html:44
-#: rhodecode/templates/base/base.html:312
-#: rhodecode/templates/debug_style/login.html:45
-msgid "Password"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:101
-msgid "TLS Type"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:102
-msgid "Connection Security"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:108
-msgid "Require Cert over TLS?"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:109
-msgid "Certificate Checks"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:115
-msgid "Base DN to search (e.g., dc=mydomain,dc=com)"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:117
-msgid "Base DN"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:122
-msgid "Filter to narrow results (e.g., ou=Users, etc)"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:124
-msgid "LDAP Search Filter"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:129
-msgid "How deep to search LDAP"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:130
-msgid "LDAP Search Scope"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:136
-msgid "LDAP Attribute to map to user name"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:137
-msgid "Login Attribute"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:138
-msgid "The LDAP Login attribute of the CN must be specified"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:143
-msgid "LDAP Attribute to map to first name"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:145
-msgid "First Name Attribute"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:150
-msgid "LDAP Attribute to map to last name"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:152
-msgid "Last Name Attribute"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:157
-msgid "LDAP Attribute to map to email address"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:159
-msgid "Email Attribute"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_ldap.py:335
-msgid "LDAP"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_pam.py:60
-msgid "PAM service name to use for authentication."
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_pam.py:61
-msgid "PAM service name"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_pam.py:66
-msgid "Regular expression for extracting user name/email etc. from Unix userinfo."
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_pam.py:68
-msgid "Gecos Regex"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_pam.py:94
-msgid "PAM"
-msgstr ""
-
-#: rhodecode/lib/auth_modules/auth_rhodecode.py:66
-msgid "Rhodecode"
-msgstr ""
-
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:582
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:599
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:684
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:657
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:659
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:682
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:683
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:700
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:717
-#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:735
-#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:738
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:740
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:740
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:767
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:777
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:820
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:819
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:820
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 rhodecode/model/db.py:2243
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:733
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:736
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:738
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:738
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:765
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:775
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:818
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 rhodecode/model/db.py:2291
 msgid "Repository no access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:583
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:600
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:685
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:658
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:660
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:683
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:684
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:701
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:718
-#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:736
-#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:739
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:741
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:741
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:768
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:778
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:821
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:820
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:821
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:821
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:827
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:949
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974 rhodecode/model/db.py:2244
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:734
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:737
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:739
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:739
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:766
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:776
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:819
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 rhodecode/model/db.py:2292
 msgid "Repository read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:572
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:584
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:601
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:686
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:659
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:661
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:684
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:685
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:702
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:719
-#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:737
-#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:740
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:742
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:742
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:769
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:779
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:822
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:821
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:822
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:822
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:828
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:950
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:975 rhodecode/model/db.py:2245
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:735
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:738
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:740
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:740
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:767
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:777
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:820
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:819
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:820
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 rhodecode/model/db.py:2293
 msgid "Repository write access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:573
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:585
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:602
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:687
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:660
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:662
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:685
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:686
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:703
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:720
-#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:738
-#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:741
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:743
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:743
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:770
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:780
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:823
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 rhodecode/model/db.py:2246
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:736
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:739
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:741
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:741
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:768
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:778
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:821
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:820
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:821
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:821
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:827
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:949
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974 rhodecode/model/db.py:2294
 msgid "Repository admin access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:587
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:604
 msgid "Repositories Group no access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:588
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:605
 msgid "Repositories Group read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:577
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:589
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:606
 msgid "Repositories Group write access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:578
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:590
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:607
 msgid "Repositories Group admin access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:592
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:609
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:694
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:655
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:657
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:680
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:681
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:698
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:715
-#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:733
-#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:736
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:738
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:731
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:734
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:736
 msgid "RhodeCode Administrator"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:593
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:610
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:695
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:678
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:680
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:703
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:704
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:721
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:738
-#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:756
-#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:759
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:761
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:761
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:788
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:798
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:841
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:840
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:841
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 rhodecode/model/db.py:2264
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:754
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:757
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:759
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:759
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:786
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:796
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:839
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 rhodecode/model/db.py:2312
 msgid "Repository creation disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:594
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:611
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:696
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:679
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:681
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:704
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:705
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:722
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:739
-#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:757
-#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:760
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:762
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:762
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:789
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:799
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:842
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:841
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:842
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:842
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:848
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:970
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995 rhodecode/model/db.py:2265
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:755
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:758
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:760
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:760
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:787
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:797
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:840
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 rhodecode/model/db.py:2313
 msgid "Repository creation enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:595
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:612
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:697
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:681
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:683
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:706
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:707
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:724
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:741
-#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:761
-#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:764
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:766
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:766
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:793
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:803
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:846
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:845
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:846
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:846
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:852
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:974
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:999 rhodecode/model/db.py:2269
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:759
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:762
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:764
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:764
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:791
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:801
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:844
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:843
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:844
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 rhodecode/model/db.py:2317
 msgid "Repository forking disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:596
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:613
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:698
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:682
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:684
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:707
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:708
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:725
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:742
-#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:762
-#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:765
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:767
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:767
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:794
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:804
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:847
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 rhodecode/model/db.py:2270
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:760
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:763
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:765
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:765
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:792
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:802
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:845
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:844
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:845
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:845
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:851
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:973
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998 rhodecode/model/db.py:2318
 msgid "Repository forking enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:585
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:597
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:614
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:699
 msgid "Register disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:586
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:598
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:615
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:700
 msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:589
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:601
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:618
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:703
 msgid "Register new user with RhodeCode with auto activation"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:865
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:874
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:959
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:995
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:997
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1020
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1021
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1038
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1055
-#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1076
-#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1079
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:1090
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1093
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1123
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1137
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1180
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1179
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1188
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1188
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 rhodecode/model/db.py:2900
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1074
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1077
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:1088
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1091
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1121
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1135
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1178
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 rhodecode/model/db.py:2950
 msgid "Not Reviewed"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:866
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:875
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:960
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:996
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:998
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1021
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1022
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1039
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1056
-#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1077
-#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1080
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:1091
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1094
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1124
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1138
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1181
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1180
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1189
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1189
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1199
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1321
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1346 rhodecode/model/db.py:2901
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1075
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1078
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:1089
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1092
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1122
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1136
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1179
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 rhodecode/model/db.py:2951
 msgid "Approved"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:847
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:867
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:876
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:961
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:997
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:999
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1022
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1023
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1040
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1057
-#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1078
-#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1081
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:1092
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1095
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1125
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1139
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1182
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1181
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1190
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1190
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1200
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1322
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1347 rhodecode/model/db.py:2902
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1076
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1079
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:1090
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1093
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1123
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1137
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1180
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1179
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1188
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1188
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 rhodecode/model/db.py:2952
 msgid "Rejected"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:848
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:868
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:877
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:962
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:998
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:1000
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1023
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1024
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1041
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1058
-#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1079
-#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1082
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:1093
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1096
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1126
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1140
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1183
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1182
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1191
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1191
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1201
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1323
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1348 rhodecode/model/db.py:2903
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1077
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1080
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:1091
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1094
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1124
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1138
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1181
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1180
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1189
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1189
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1199
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1321
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1346 rhodecode/model/db.py:2953
 msgid "Under Review"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:689
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:662
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:664
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:687
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:688
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:705
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:722
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:738
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:741
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:743
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:743
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:770
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:780
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:823
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 rhodecode/model/db.py:2296
+msgid "Repository group no access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:690
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:663
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:665
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:688
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:689
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:706
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:723
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:739
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:742
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:744
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:744
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:771
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:781
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:824
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 rhodecode/model/db.py:2297
+msgid "Repository group read access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:691
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:664
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:666
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:689
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:690
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:707
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:724
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:740
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:743
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:745
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:745
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:772
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:782
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:824
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 rhodecode/model/db.py:2248
-msgid "Repository group no access"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:690
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:663
-#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:665
-#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:688
-#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:689
-#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:706
-#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:723
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 rhodecode/model/db.py:2298
+msgid "Repository group write access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:692
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:665
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:667
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:690
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:691
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:708
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:725
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:741
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:744
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:746
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:746
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:773
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:783
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:832
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:954
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979 rhodecode/model/db.py:2249
-msgid "Repository group read access"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:691
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:664
-#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:666
-#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:689
-#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:690
-#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:707
-#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:724
-#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:742
-#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:745
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:747
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:747
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:774
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:784
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:827
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:826
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:827
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:827
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:833
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:955
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:980 rhodecode/model/db.py:2250
-msgid "Repository group write access"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:692
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:665
-#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:667
-#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:690
-#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:691
-#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:708
-#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:725
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979 rhodecode/model/db.py:2299
+msgid "Repository group admin access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:667
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:669
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:692
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:693
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:710
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:727
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:743
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:746
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:748
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:748
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:775
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:785
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 rhodecode/model/db.py:2251
-msgid "Repository group admin access"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:667
-#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:669
-#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:692
-#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:693
-#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:710
-#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:727
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 rhodecode/model/db.py:2301
+msgid "User group no access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:668
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:670
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:693
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:694
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:711
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:728
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:744
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:747
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:749
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:749
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:776
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:786
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:829
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 rhodecode/model/db.py:2302
+msgid "User group read access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:669
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:671
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:694
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:695
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:712
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:729
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:745
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:748
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:750
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:750
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:777
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:787
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:829
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 rhodecode/model/db.py:2253
-msgid "User group no access"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:668
-#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:670
-#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:693
-#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:694
-#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:711
-#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:728
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 rhodecode/model/db.py:2303
+msgid "User group write access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:670
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:672
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:695
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:696
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:713
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:730
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:746
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:749
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:751
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:751
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:778
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:788
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:959
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984 rhodecode/model/db.py:2254
-msgid "User group read access"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:669
-#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:671
-#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:694
-#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:695
-#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:712
-#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:729
-#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:747
-#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:750
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:752
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:752
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:779
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:789
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:832
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:831
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:832
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:832
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:838
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:960
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:985 rhodecode/model/db.py:2255
-msgid "User group write access"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:670
-#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:672
-#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:695
-#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:696
-#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:713
-#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:730
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984 rhodecode/model/db.py:2304
+msgid "User group admin access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:672
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:674
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:697
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:698
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:715
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:732
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:748
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:751
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:753
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:753
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:780
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:790
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:833
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:832
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:833
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 rhodecode/model/db.py:2256
-msgid "User group admin access"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:672
-#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:674
-#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:697
-#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:698
-#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:715
-#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:732
-#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:750
-#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:753
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:755
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:755
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:782
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:792
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:835
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:834
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:835
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:835
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:841
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:963
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:988 rhodecode/model/db.py:2258
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 rhodecode/model/db.py:2306
 msgid "Repository Group creation disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:673
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:675
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:698
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:699
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:716
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:733
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:749
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:752
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:754
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:754
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:781
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:791
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:834
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:833
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:834
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:834
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:840
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:962
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987 rhodecode/model/db.py:2307
+msgid "Repository Group creation enabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:675
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:677
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:700
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:701
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:718
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:735
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:751
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:754
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:756
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:756
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:783
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:793
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:836
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:835
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:836
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 rhodecode/model/db.py:2259
-msgid "Repository Group creation enabled"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:675
-#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:677
-#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:700
-#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:701
-#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:718
-#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:735
-#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:753
-#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:756
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:758
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:758
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:785
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:795
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:838
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:837
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:838
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:838
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:844
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:966
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:991 rhodecode/model/db.py:2261
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 rhodecode/model/db.py:2309
 msgid "User Group creation disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:676
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:678
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:701
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:702
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:719
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:736
-#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:754
-#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:757
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:759
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:759
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:786
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:796
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:839
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 rhodecode/model/db.py:2262
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:752
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:755
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:757
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:757
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:784
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:794
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:837
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:836
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:837
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:837
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:843
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:965
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990 rhodecode/model/db.py:2310
 msgid "User Group creation enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:684
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:686
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:709
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:710
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:727
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:744
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:762
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:765
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:767
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:767
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:794
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:804
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:847
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 rhodecode/model/db.py:2320
+msgid "Registration disabled"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:685
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:687
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:710
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:711
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:728
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:745
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:763
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:766
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:768
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:768
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:795
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:805
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:848
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:847
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:848
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:848
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 rhodecode/model/db.py:2321
+msgid "User Registration with manual account activation"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:686
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:688
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:711
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:712
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:729
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:746
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:764
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:767
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:769
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:769
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:796
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:806
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:849
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:848
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:849
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:849
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:855
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:977
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1002 rhodecode/model/db.py:2272
-msgid "Registration disabled"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:685
-#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:687
-#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:710
-#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:711
-#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:728
-#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:745
-#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:765
-#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:768
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:770
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:770
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:797
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:807
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:850
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:849
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:850
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:850
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:856
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:978
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1003 rhodecode/model/db.py:2273
-msgid "User Registration with manual account activation"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:686
-#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:688
-#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:711
-#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:712
-#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:729
-#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:746
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1002 rhodecode/model/db.py:2322
+msgid "User Registration with automatic account activation"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:688
+#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:690
+#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:713
+#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:714
+#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:731
+#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:748
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:766
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:769
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:771
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:771
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:798
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:808
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:851
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:850
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:851
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:851
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 rhodecode/model/db.py:2274
-msgid "User Registration with automatic account activation"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:688
-#: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:690
-#: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:713
-#: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:714
-#: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:731
-#: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:748
-#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:768
-#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:771
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:773
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:773
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:800
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:810
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:853
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:852
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:853
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:853
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:859
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:981
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1006 rhodecode/model/db.py:2276
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 rhodecode/model/db.py:2324
 msgid "Manual activation of external account"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:689
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:691
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:714
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:715
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:732
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:749
-#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:769
-#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:772
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:774
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:774
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:801
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:767
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:770
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:772
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:772
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:799
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:809
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:852
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:851
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:852
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:852
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:858
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:980
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1005 rhodecode/model/db.py:2325
+msgid "Automatic activation of external account"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:756
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:759
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:761
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:761
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:788
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:798
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:841
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:840
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:841
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 rhodecode/model/db.py:2314
+msgid "Repository creation enabled with write permission to a repository group"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:757
+#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:760
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:762
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:762
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:789
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:799
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:842
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:841
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:842
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:842
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:848
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:970
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995 rhodecode/model/db.py:2315
+msgid "Repository creation disabled with write permission to a repository group"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:736
+#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:763
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:773
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:816
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:815
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:816
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:816
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:822
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:944
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969 rhodecode/model/db.py:2289
+msgid "RhodeCode Super Administrator"
+msgstr ""
+
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:811
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:854
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:853
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:854
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:854
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:860
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:982
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1007 rhodecode/model/db.py:2277
-msgid "Automatic activation of external account"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:758
-#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:761
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:763
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:763
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:790
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:800
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:843
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:842
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:843
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:843
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:849
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:971
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:996 rhodecode/model/db.py:2266
-msgid "Repository creation enabled with write permission to a repository group"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:759
-#: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:762
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:764
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:764
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:791
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:801
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:844
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:843
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:844
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 rhodecode/model/db.py:2267
-msgid "Repository creation disabled with write permission to a repository group"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:738
-#: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:765
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:775
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:818
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 rhodecode/model/db.py:2241
-msgid "RhodeCode Super Administrator"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:813
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:856
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:855
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:856
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:856
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:862
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:984
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1009 rhodecode/model/db.py:2279
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1007 rhodecode/model/db.py:2327
 msgid "Inherit object permissions from default user disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:814
-#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:857
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:856
-#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:857
-#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:857
-#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:863
-#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:985
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1010 rhodecode/model/db.py:2280
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:812
+#: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:855
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:854
+#: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:855
+#: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:855
+#: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:861
+#: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:983
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1008 rhodecode/model/db.py:2328
 msgid "Inherit object permissions from default user enabled"
 msgstr ""
 
-#: rhodecode/lib/index/whoosh.py:129
+#: rhodecode/lib/index/whoosh.py:148
 msgid "Invalid search query. Try quoting it."
 msgstr ""
 
-#: rhodecode/lib/index/whoosh.py:131
-msgid "There is no index to search in. Please run whoosh indexer"
-msgstr ""
-
-#: rhodecode/lib/index/whoosh.py:136
-msgid "An error occurred during this search operation"
-msgstr ""
-
-#: rhodecode/lib/index/whoosh.py:144
-msgid "Index Type"
-msgstr ""
-
-#: rhodecode/lib/index/whoosh.py:145
-msgid "File Index"
-msgstr ""
-
-#: rhodecode/lib/index/whoosh.py:146 rhodecode/lib/index/whoosh.py:151
-msgid "Indexed documents"
-msgstr ""
-
-#: rhodecode/lib/index/whoosh.py:148 rhodecode/lib/index/whoosh.py:153
-msgid "Last update"
-msgstr ""
-
 #: rhodecode/lib/index/whoosh.py:150
+msgid "There is no index to search in. Please run whoosh indexer"
+msgstr ""
+
+#: rhodecode/lib/index/whoosh.py:155
+msgid "An error occurred during this search operation"
+msgstr ""
+
+#: rhodecode/lib/index/whoosh.py:163
+msgid "Index Type"
+msgstr ""
+
+#: rhodecode/lib/index/whoosh.py:164
+msgid "File Index"
+msgstr ""
+
+#: rhodecode/lib/index/whoosh.py:165 rhodecode/lib/index/whoosh.py:170
+msgid "Indexed documents"
+msgstr ""
+
+#: rhodecode/lib/index/whoosh.py:167 rhodecode/lib/index/whoosh.py:172
+msgid "Last update"
+msgstr ""
+
+#: rhodecode/lib/index/whoosh.py:169
 msgid "Commit index"
 msgstr ""
 
-#: rhodecode/model/db.py:871
+#: rhodecode/login/views.py:237 rhodecode/login/views.py:296
+msgid "bad captcha"
+msgstr ""
+
+#: rhodecode/login/views.py:246
+msgid "You have successfully registered with RhodeCode"
+msgstr ""
+
+#: rhodecode/login/views.py:312
+msgid "Your password reset link was sent"
+msgstr ""
+
+#: rhodecode/login/views.py:333
+msgid "Your password reset was successful, a new password has been sent to your email"
+msgstr ""
+
+#: rhodecode/model/db.py:909
 msgid "all"
 msgstr ""
 
-#: rhodecode/model/db.py:872
+#: rhodecode/model/db.py:910
 msgid "http/web interface"
 msgstr ""
 
-#: rhodecode/model/db.py:873
+#: rhodecode/model/db.py:911
 msgid "vcs (git/hg protocol)"
 msgstr ""
 
-#: rhodecode/model/db.py:874
+#: rhodecode/model/db.py:912
 msgid "api calls"
 msgstr ""
 
-#: rhodecode/model/db.py:875
+#: rhodecode/model/db.py:913
 msgid "feed access"
 msgstr ""
 
-#: rhodecode/model/db.py:2020
+#: rhodecode/model/db.py:2067
 msgid "No parent"
 msgstr ""
 
 #: rhodecode/model/forms.py:66
 msgid "Please enter a login"
 msgstr ""
 
 #: rhodecode/model/forms.py:67
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr ""
 
 #: rhodecode/model/forms.py:76
 msgid "Please enter a password"
 msgstr ""
 
 #: rhodecode/model/forms.py:77
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr ""
 
 #: rhodecode/model/notification.py:247
 #, python-format
 msgid "%(user)s commented on commit %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:248
 #, python-format
 msgid "%(user)s commented on commit at %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:251
 #, python-format
 msgid "%(user)s sent message %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:252
 #, python-format
 msgid "%(user)s sent message at %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:255
 #, python-format
 msgid "%(user)s mentioned you %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:256
 #, python-format
 msgid "%(user)s mentioned you at %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:259
 #, python-format
 msgid "%(user)s registered in RhodeCode %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:260
 #, python-format
 msgid "%(user)s registered in RhodeCode at %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:263
 #, python-format
 msgid "%(user)s opened new pull request %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:264
 #, python-format
 msgid "%(user)s opened new pull request at %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:267
 #, python-format
 msgid "%(user)s commented on pull request %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:268
 #, python-format
 msgid "%(user)s commented on pull request at %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/pull_request.py:69
 msgid "This pull request can be automatically merged."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:71
 msgid "This pull request cannot be merged because of an unhandled exception."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:74
 msgid "This pull request cannot be merged because of conflicts."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:76
 msgid "This pull request could not be merged because push to target failed."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:79
 msgid "This pull request cannot be merged because the target is not a head."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:82
 msgid "This pull request cannot be merged because the source contains more branches than the target."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:85
 msgid "This pull request cannot be merged because the target has multiple heads."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:88
 msgid "This pull request cannot be merged because the target repository is locked."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:91
 msgid "This pull request cannot be merged because the target or the source reference is missing."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:411
+#: rhodecode/model/pull_request.py:416
 #, python-format
 msgid ""
 "Merge pull request #%(pr_id)s from %(source_repo)s %(source_ref_name)s\n"
 "\n"
 " %(pr_title)s"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:443
+#: rhodecode/model/pull_request.py:448
 msgid "Pull request merged and closed"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:859
+#: rhodecode/model/pull_request.py:867
 msgid "Server-side pull request merging is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:861
+#: rhodecode/model/pull_request.py:869
 msgid "This pull request is closed."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:872
+#: rhodecode/model/pull_request.py:880
 msgid "Pull request merging is not supported."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:890
+#: rhodecode/model/pull_request.py:898
 msgid "Target repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:893
+#: rhodecode/model/pull_request.py:901
 msgid "Source repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1036 rhodecode/model/scm.py:791
+#: rhodecode/model/pull_request.py:1050 rhodecode/model/scm.py:791
 msgid "Bookmarks"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1041
+#: rhodecode/model/pull_request.py:1055
 msgid "Commit IDs"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1044
+#: rhodecode/model/pull_request.py:1058
 msgid "Closed Branches"
 msgstr ""
 
 #: rhodecode/model/scm.py:773
 msgid "latest tip"
 msgstr ""
 
 #: rhodecode/model/user.py:124
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:283
+#: rhodecode/model/user.py:285
 #, python-format
 msgid "You can't edit this user (`%(username)s`) since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:456
+#: rhodecode/model/user.py:458
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:464
+#: rhodecode/model/user.py:466
 #, 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:473
+#: rhodecode/model/user.py:475
 #, 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:482
+#: rhodecode/model/user.py:484
 #, python-format
 msgid "user \"%s\" still owns %s user groups and cannot be removed. Switch owners or remove those user groups:%s"
 msgstr ""
 
-#: rhodecode/model/validators.py:96 rhodecode/model/validators.py:97
+#: rhodecode/model/validators.py:98 rhodecode/model/validators.py:99
 msgid "Value cannot be an empty list"
 msgstr ""
 
-#: rhodecode/model/validators.py:140
+#: rhodecode/model/validators.py:142
 msgid "Pattern already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:158
-#, python-format
-msgid "Username \"%(username)s\" already exists"
-msgstr ""
-
 #: rhodecode/model/validators.py:160
 #, python-format
-msgid "Username \"%(username)s\" is forbidden"
+msgid "Username \"%(username)s\" already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:162
+#, python-format
+msgid "Username \"%(username)s\" is forbidden"
+msgstr ""
+
+#: rhodecode/model/validators.py:164
 msgid "Username may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character or underscore"
 msgstr ""
 
-#: rhodecode/model/validators.py:190
+#: rhodecode/model/validators.py:192
 msgid "The input is not valid"
 msgstr ""
 
-#: rhodecode/model/validators.py:197
+#: rhodecode/model/validators.py:199
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr ""
 
-#: rhodecode/model/validators.py:216
+#: rhodecode/model/validators.py:200
+#, python-format
+msgid "Username %(username)s is disabled"
+msgstr ""
+
+#: rhodecode/model/validators.py:223
 msgid "Invalid user group name"
 msgstr ""
 
-#: rhodecode/model/validators.py:217
+#: rhodecode/model/validators.py:224
 #, python-format
 msgid "User group \"%(usergroup)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:219
+#: rhodecode/model/validators.py:226
 msgid "user group name may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character"
 msgstr ""
 
-#: rhodecode/model/validators.py:257
+#: rhodecode/model/validators.py:264
 msgid "Cannot assign this group as parent"
 msgstr ""
 
-#: rhodecode/model/validators.py:258
+#: rhodecode/model/validators.py:265
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:259
+#: rhodecode/model/validators.py:266
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:261
+#: rhodecode/model/validators.py:268
 msgid "no permission to store repository groupin this location"
 msgstr ""
 
-#: rhodecode/model/validators.py:263
+#: rhodecode/model/validators.py:270
 msgid "no permission to store repository group in root location"
 msgstr ""
 
-#: rhodecode/model/validators.py:379
+#: rhodecode/model/validators.py:386
 msgid "Invalid characters (non-ascii) in password"
 msgstr ""
 
-#: rhodecode/model/validators.py:394
+#: rhodecode/model/validators.py:401
 msgid "Invalid old password"
 msgstr ""
 
-#: rhodecode/model/validators.py:412
+#: rhodecode/model/validators.py:418
 msgid "Passwords do not match"
 msgstr ""
 
-#: rhodecode/model/validators.py:430
+#: rhodecode/model/validators.py:436
 msgid "invalid password"
 msgstr ""
 
-#: rhodecode/model/validators.py:431
+#: rhodecode/model/validators.py:437
 msgid "invalid user name"
 msgstr ""
 
-#: rhodecode/model/validators.py:432
+#: rhodecode/model/validators.py:438
 msgid "Your account is disabled"
 msgstr ""
 
-#: rhodecode/model/validators.py:465
+#: rhodecode/model/validators.py:470
 msgid "Token mismatch"
 msgstr ""
 
-#: rhodecode/model/validators.py:479
+#: rhodecode/model/validators.py:484
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr ""
 
-#: rhodecode/model/validators.py:481
-#, python-format
-msgid "Repository with name %(repo)s already exists"
-msgstr ""
-
-#: rhodecode/model/validators.py:483
-#, python-format
-msgid "Repository group with name \"%(repo)s\" already exists"
-msgstr ""
-
 #: rhodecode/model/validators.py:486
 #, python-format
-msgid "Repository with name %(repo)s exists in group \"%(group)s\""
+msgid "Repository with name %(repo)s already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:488
 #, python-format
+msgid "Repository group with name \"%(repo)s\" already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:491
+#, python-format
+msgid "Repository with name %(repo)s exists in group \"%(group)s\""
+msgstr ""
+
+#: rhodecode/model/validators.py:493
+#, python-format
 msgid "Repository group with name \"%(repo)s\" exists in group \"%(group)s\""
 msgstr ""
 
-#: rhodecode/model/validators.py:615
+#: rhodecode/model/validators.py:620
 #, python-format
 msgid "invalid clone url for %(rtype)s repository"
 msgstr ""
 
-#: rhodecode/model/validators.py:616
+#: rhodecode/model/validators.py:621
 #, python-format
 msgid "Invalid clone url, provide a valid clone url starting with one of %(allowed_prefixes)s"
 msgstr ""
 
-#: rhodecode/model/validators.py:645
+#: rhodecode/model/validators.py:650
 msgid "Fork have to be the same type as parent"
 msgstr ""
 
-#: rhodecode/model/validators.py:660
+#: rhodecode/model/validators.py:665
 msgid "You do not have the permission to create repositories in this group."
 msgstr ""
 
-#: rhodecode/model/validators.py:663
+#: rhodecode/model/validators.py:668
 msgid "You do not have the permission to store repositories in the root location."
 msgstr ""
 
-#: rhodecode/model/validators.py:723
+#: rhodecode/model/validators.py:728
 msgid "This username or user group name is not valid"
 msgstr ""
 
-#: rhodecode/model/validators.py:841
+#: rhodecode/model/validators.py:846
 msgid "This is not a valid path"
 msgstr ""
 
-#: rhodecode/model/validators.py:856
+#: rhodecode/model/validators.py:861
 msgid "This e-mail address is already taken"
 msgstr ""
 
-#: rhodecode/model/validators.py:876
+#: rhodecode/model/validators.py:881
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr ""
 
-#: rhodecode/model/validators.py:912
-msgid "The LDAP Login attribute of the CN must be specified - this is the name of the attribute that is equivalent to \"username\""
-msgstr ""
-
-#: rhodecode/model/validators.py:926
+#: rhodecode/model/validators.py:902
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 
-#: rhodecode/model/validators.py:957
+#: rhodecode/model/validators.py:933
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr ""
 
-#: rhodecode/model/validators.py:958
+#: rhodecode/model/validators.py:934
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
 
-#: rhodecode/model/validators.py:985
+#: rhodecode/model/validators.py:961
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
 
+#: rhodecode/model/validators.py:976
+msgid "Filename cannot be inside a directory"
+msgstr ""
+
+#: rhodecode/model/validators.py:992
+#, python-format
+msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name"
+msgstr ""
+
+#: rhodecode/model/validators.py:995
+#, python-format
+msgid "The plugin \"%(plugin_id)s\" is missing an includeme function."
+msgstr ""
+
+#: rhodecode/model/validators.py:998
+#, python-format
+msgid "Can not load plugin \"%(plugin_id)s\""
+msgstr ""
+
 #: rhodecode/model/validators.py:1000
-msgid "Filename cannot be inside a directory"
-msgstr ""
-
-#: rhodecode/model/validators.py:1016
-#, python-format
-msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name"
-msgstr ""
-
-#: rhodecode/model/validators.py:1048
+#, python-format
+msgid "No plugin available with ID \"%(plugin_id)s\""
+msgstr ""
+
+#: rhodecode/model/validators.py:1067
 msgid "This gistid is already in use"
 msgstr ""
 
 #: rhodecode/templates/index.html:5
 msgid "Dashboard"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:8
 #: rhodecode/templates/admin/gists/index.html:18
 #: rhodecode/templates/admin/my_account/my_account_repos.html:7
 #: rhodecode/templates/admin/my_account/my_account_watched.html:7
 #: rhodecode/templates/admin/repo_groups/repo_groups.html:12
 #: rhodecode/templates/admin/repos/repos.html:12
 #: rhodecode/templates/admin/user_groups/user_groups.html:12
 #: rhodecode/templates/admin/users/users.html:12
 #: rhodecode/templates/bookmarks/bookmarks.html:12
 #: rhodecode/templates/branches/branches.html:12
 #: rhodecode/templates/journal/journal.html:12
 #: rhodecode/templates/tags/tags.html:12
 msgid "quick filter..."
 msgstr ""
 
 #: rhodecode/templates/index_base.html:10
 msgid "matches"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:30
 #: rhodecode/templates/index_base.html:39
 #: rhodecode/templates/admin/repos/repo_add.html:22
 #: rhodecode/templates/admin/repos/repos.html:27
 msgid "Add Repository"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:34
 #: rhodecode/templates/index_base.html:42
 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:16
 #: rhodecode/templates/admin/repo_groups/repo_groups.html:27
 msgid "Add Repository Group"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:45
 msgid "You have admin right to this group, and can edit it"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:45
 msgid "Edit Repository Group"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:97
 #: rhodecode/templates/index_base.html:122
 #: rhodecode/templates/admin/gists/index.html:112
 #: rhodecode/templates/admin/my_account/my_account_repos.html:31
 #: rhodecode/templates/admin/my_account/my_account_watched.html:31
 #: rhodecode/templates/admin/repo_groups/repo_groups.html:53
 #: rhodecode/templates/admin/repos/repo_add_base.html:9
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:12
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:15
 #: rhodecode/templates/admin/repos/repos.html:54
 #: rhodecode/templates/admin/user_groups/user_groups.html:55
-#: rhodecode/templates/base/perms_summary.html:103
+#: rhodecode/templates/base/perms_summary.html:102
 #: rhodecode/templates/bookmarks/bookmarks.html:59
 #: rhodecode/templates/branches/branches.html:58
 #: rhodecode/templates/files/files_browser.html:49
 #: rhodecode/templates/pullrequests/pullrequests.html:100
 #: rhodecode/templates/tags/tags.html:59
 msgid "Name"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:100
 #: rhodecode/templates/index_base.html:125
 #: rhodecode/templates/admin/gists/index.html:114
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:77
 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:45
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:30
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:42
 #: rhodecode/templates/admin/repo_groups/repo_groups.html:56
 #: rhodecode/templates/admin/repos/repo_add_base.html:32
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:29
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:83
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:96
 #: rhodecode/templates/admin/repos/repos.html:57
 #: rhodecode/templates/admin/user_groups/user_group_add.html:43
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:29
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:42
 #: rhodecode/templates/admin/user_groups/user_groups.html:57
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:74
 #: rhodecode/templates/base/issue_tracker_settings.html:10
 #: rhodecode/templates/changeset/changeset.html:53
-#: rhodecode/templates/compare/compare_cs.html:24
+#: rhodecode/templates/compare/compare_commits.html:24
 #: rhodecode/templates/email_templates/pull_request_review.mako:30
 #: rhodecode/templates/email_templates/pull_request_review.mako:67
 #: rhodecode/templates/files/file_tree_detail.html:5
 #: rhodecode/templates/files/file_tree_detail.html:12
 #: rhodecode/templates/forks/fork.html:48
-#: rhodecode/templates/forks/forks_data.html:8
+#: rhodecode/templates/forks/forks_data.html:9
 #: rhodecode/templates/pullrequests/pullrequest.html:47
 #: rhodecode/templates/pullrequests/pullrequest_show.html:122
 #: rhodecode/templates/summary/components.html:73
 msgid "Description"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:102
 #: rhodecode/templates/index_base.html:133
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:5
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:21
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:24
 #: rhodecode/templates/admin/repo_groups/repo_groups.html:60
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:5
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:74
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:78
 #: rhodecode/templates/admin/repos/repos.html:65
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:5
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:20
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:24
 #: rhodecode/templates/admin/user_groups/user_groups.html:64
+#: rhodecode/templates/forks/forks_data.html:7
 #: rhodecode/templates/summary/components.html:195
 msgid "Owner"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:128
 #: rhodecode/templates/admin/repos/repos.html:60
 msgid "Last Change"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:131
 #: rhodecode/templates/admin/my_account/my_account_repos.html:35
 #: rhodecode/templates/admin/my_account/my_account_watched.html:35
 #: rhodecode/templates/admin/repos/repos.html:63
 #: rhodecode/templates/bookmarks/bookmarks.html:66
 #: rhodecode/templates/branches/branches.html:65
 #: rhodecode/templates/changelog/changelog.html:106
 #: rhodecode/templates/changelog/changelog_summary_data.html:6
 #: rhodecode/templates/changeset/changeset.html:36
-#: rhodecode/templates/compare/compare_cs.html:22
+#: rhodecode/templates/compare/compare_commits.html:22
 #: rhodecode/templates/email_templates/commit_comment.mako:16
 #: rhodecode/templates/email_templates/commit_comment.mako:45
 #: rhodecode/templates/search/search_commit.html:6
 #: rhodecode/templates/tags/tags.html:66
 msgid "Commit"
 msgstr ""
 
 #: rhodecode/templates/index_repo_group.html:5
 #, python-format
 msgid "%s Repository group dashboard"
 msgstr ""
 
 #: rhodecode/templates/index_repo_group.html:13
 msgid "Home"
 msgstr ""
 
-#: rhodecode/templates/login.html:6 rhodecode/templates/login.html:36
-#: rhodecode/templates/login.html:52 rhodecode/templates/base/base.html:326
+#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:35
+#: rhodecode/templates/login.html:64 rhodecode/templates/base/base.html:328
 #: rhodecode/templates/debug_style/login.html:60
 msgid "Sign In"
 msgstr ""
 
-#: rhodecode/templates/login.html:38
+#: rhodecode/templates/login.html:37
 msgid "Go to the registration page to create a new account."
 msgstr ""
 
 #: rhodecode/templates/login.html:43 rhodecode/templates/register.html:41
 #: rhodecode/templates/admin/admin_log.html:5
 #: rhodecode/templates/admin/my_account/my_account_profile.html:24
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:21
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:66
 #: rhodecode/templates/admin/users/user_add.html:35
 #: rhodecode/templates/admin/users/user_edit_profile.html:39
 #: rhodecode/templates/admin/users/users.html:89
-#: rhodecode/templates/base/base.html:303
+#: rhodecode/templates/base/base.html:305
 #: rhodecode/templates/debug_style/login.html:36
 #: rhodecode/templates/users/user_profile.html:27
 msgid "Username"
 msgstr ""
 
-#: rhodecode/templates/login.html:48
+#: rhodecode/templates/login.html:58
 msgid "Remember me"
 msgstr ""
 
-#: rhodecode/templates/login.html:50
+#: rhodecode/templates/login.html:61
 msgid "Forgot your password?"
 msgstr ""
 
-#: rhodecode/templates/login.html:62
-msgid "Sign In using one of external services"
-msgstr ""
-
 #: rhodecode/templates/password_reset.html:5
-#: rhodecode/templates/register.html:6
+#: rhodecode/templates/register.html:5
 msgid "Create an Account"
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:35
 msgid "Reset your Password"
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:36
 msgid "Go to the login page to sign in."
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:40
 msgid "Email Address"
 msgstr ""
 
-#: rhodecode/templates/password_reset.html:45
-#: rhodecode/templates/register.html:56
+#: rhodecode/templates/password_reset.html:49
+#: rhodecode/templates/register.html:85
 msgid "Captcha"
 msgstr ""
 
-#: rhodecode/templates/password_reset.html:51
+#: rhodecode/templates/password_reset.html:59
 msgid "Send password reset email"
 msgstr ""
 
-#: rhodecode/templates/password_reset.html:52
+#: rhodecode/templates/password_reset.html:60
 msgid "Password reset link will be send to matching email address"
 msgstr ""
 
+#: rhodecode/templates/register.html:35
+msgid "Create an account"
+msgstr ""
+
 #: rhodecode/templates/register.html:36
-msgid "Create an account"
-msgstr ""
-
-#: rhodecode/templates/register.html:37
 msgid "Go to the login page to sign in with an existing account."
 msgstr ""
 
-#: rhodecode/templates/register.html:45
+#: rhodecode/templates/register.html:55
 msgid "Re-enter password"
 msgstr ""
 
-#: rhodecode/templates/register.html:47
+#: rhodecode/templates/register.html:62
 #: rhodecode/templates/admin/my_account/my_account_profile.html:32
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:30
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:76
 #: rhodecode/templates/admin/users/user_add.html:68
 #: rhodecode/templates/admin/users/user_edit_profile.html:47
 #: rhodecode/templates/admin/users/users.html:93
 msgid "First Name"
 msgstr ""
 
-#: rhodecode/templates/register.html:49
+#: rhodecode/templates/register.html:69
 #: rhodecode/templates/admin/my_account/my_account_profile.html:40
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:39
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:85
 #: rhodecode/templates/admin/users/user_add.html:77
 #: rhodecode/templates/admin/users/user_edit_profile.html:56
 #: rhodecode/templates/admin/users/users.html:95
 msgid "Last Name"
 msgstr ""
 
-#: rhodecode/templates/register.html:64
+#: rhodecode/templates/register.html:97
 msgid "Account activation requires admin approval."
 msgstr ""
 
-#: rhodecode/templates/register.html:71
+#: rhodecode/templates/register.html:104
 msgid "Create Account"
 msgstr ""
 
-#: rhodecode/templates/register.html:77
-msgid "Register using one of external services"
-msgstr ""
-
 #: rhodecode/templates/admin/admin.html:5
 #: rhodecode/templates/admin/admin.html:15
 #: rhodecode/templates/base/base.html:78
 msgid "Admin journal"
 msgstr ""
 
 #: rhodecode/templates/admin/admin.html:13
 msgid "journal filter..."
 msgstr ""
 
 #: rhodecode/templates/admin/admin.html:14
 msgid "filter"
 msgstr ""
 
 #: rhodecode/templates/admin/admin.html:15
 #: rhodecode/templates/journal/journal.html:14
 #, python-format
 msgid "%s entry"
 msgid_plural "%s entries"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/admin/admin.html:17
 #: rhodecode/templates/journal/journal.html:17
 msgid "Example Queries"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log.html:6
 #: rhodecode/templates/admin/my_account/my_account_repos.html:37
 #: rhodecode/templates/admin/repo_groups/repo_groups.html:62
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:13
 #: rhodecode/templates/admin/repos/repos.html:69
 #: rhodecode/templates/admin/user_groups/user_groups.html:66
 #: rhodecode/templates/admin/users/users.html:106
 msgid "Action"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log.html:7
 #: rhodecode/templates/admin/defaults/defaults.html:31
 #: rhodecode/templates/admin/permissions/permissions_objects.html:13
 #: rhodecode/templates/search/search_commit.html:5
 #: rhodecode/templates/search/search_path.html:3
 msgid "Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log.html:8
 #: rhodecode/templates/bookmarks/bookmarks.html:61
 #: rhodecode/templates/branches/branches.html:60
 #: rhodecode/templates/tags/tags.html:61
 msgid "Date"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log.html:9
 msgid "From IP"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log.html:44
 msgid "No actions yet"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.html:5
 #: rhodecode/templates/admin/auth/plugin_settings.html:5
 msgid "Authentication Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.html:12
 #: rhodecode/templates/admin/auth/plugin_settings.html:12
 #: rhodecode/templates/admin/defaults/defaults.html:12
 #: rhodecode/templates/admin/permissions/permissions.html:12
 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:12
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.html:12
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:14
 #: rhodecode/templates/admin/repo_groups/repo_groups.html:13
 #: rhodecode/templates/admin/repos/repo_add.html:13
 #: rhodecode/templates/admin/repos/repo_add.html:17
 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:15
 #: rhodecode/templates/admin/repos/repos.html:13
 #: rhodecode/templates/admin/settings/settings.html:12
 #: rhodecode/templates/admin/user_groups/user_group_add.html:11
 #: rhodecode/templates/admin/user_groups/user_group_edit.html:12
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:14
 #: rhodecode/templates/admin/user_groups/user_groups.html:13
 #: rhodecode/templates/admin/users/user_add.html:11
 #: rhodecode/templates/admin/users/user_edit.html:12
 #: rhodecode/templates/admin/users/users.html:13
 #: rhodecode/templates/admin/users/users.html:102
-#: rhodecode/templates/base/base.html:403
-#: rhodecode/templates/base/base.html:410
+#: rhodecode/templates/base/base.html:405
+#: rhodecode/templates/base/base.html:412
 msgid "Admin"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.html:14
 #: rhodecode/templates/admin/auth/plugin_settings.html:14
 msgid "Authentication Plugins"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.html:47
 msgid "Enabled and Available Plugins"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.html:53
 msgid "Enabled Plugins"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.html:58
 msgid "Add a list of plugins, separated by commas. The order of the plugins is also the order in which RhodeCode Enterprise will try to authenticate a user."
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.html:65
 msgid "Available Built-in Plugins"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.html:71
 msgid "enabled"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.html:71
 msgid "disabled"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.html:81
-#: rhodecode/templates/admin/auth/plugin_settings.html:90
+#: rhodecode/templates/admin/auth/plugin_settings.html:87
 #: rhodecode/templates/admin/defaults/defaults_repositories.html:63
 #: rhodecode/templates/admin/my_account/my_account_password.html:36
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:103
 #: rhodecode/templates/admin/permissions/permissions_application.html:50
 #: rhodecode/templates/admin/permissions/permissions_objects.html:56
 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:72
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:135
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:55
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:67
 #: rhodecode/templates/admin/repos/repo_add_base.html:88
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:79
 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:110
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:145
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:158
 #: rhodecode/templates/admin/settings/settings_hooks.html:63
 #: rhodecode/templates/admin/settings/settings_issuetracker.html:15
 #: rhodecode/templates/admin/user_groups/user_group_add.html:60
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:120
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:72
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:89
 #: rhodecode/templates/admin/users/user_add.html:125
 #: rhodecode/templates/admin/users/user_edit_profile.html:134
 #: rhodecode/templates/base/default_perms_box.html:88
 msgid "Save"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/plugin_settings.html:45
 msgid "Plugin"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:5
 #: rhodecode/templates/admin/defaults/defaults.html:14
 msgid "Repositories defaults"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.html:3
 msgid "Default Settings For New Repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.html:14
 #: rhodecode/templates/admin/gists/index.html:110
 #: rhodecode/templates/admin/repos/repo_add_base.html:62
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:12
 msgid "Type"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.html:23
 #: rhodecode/templates/admin/repos/repo_add_base.html:80
 msgid "Private Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.html:27
 #: rhodecode/templates/admin/repos/repo_add_base.html:84
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:97
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:110
 #: rhodecode/templates/forks/fork.html:85
 msgid "Private repositories are only visible to people explicitly added as collaborators."
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.html:34
 msgid "Enable Statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.html:38
 msgid "Enable a statistics window on the repository summary page."
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.html:44
 msgid "Enable Downloads"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.html:48
 msgid "Enable the download option on the repository summary page."
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.html:54
 msgid "Enable Locking"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.html:58
 msgid "Enable automatic repository locking. Pulling from a repository will lock it, and it is unlocked by pushing back by the same user."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/edit.html:5
 #: rhodecode/templates/admin/gists/edit.html:12
 msgid "Edit Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/edit.html:29
 #, python-format
 msgid "Gist was updated since you started editing. Copy your changes and click %(here)s to reload the new version."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/edit.html:39
 #: rhodecode/templates/admin/gists/new.html:30
 msgid "Gist description ..."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/edit.html:44
 #: rhodecode/templates/admin/gists/new.html:38
 msgid "Gist lifetime"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/edit.html:47
 #: rhodecode/templates/admin/gists/new.html:41
 msgid "Gist access level"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/edit.html:59
 #: rhodecode/templates/admin/gists/new.html:50
 #: rhodecode/templates/files/files_add.html:74
 #: rhodecode/templates/files/files_edit.html:78
 msgid "plain"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/edit.html:103
 msgid "Update Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/edit.html:104
 #: rhodecode/templates/base/issue_tracker_settings.html:74
 #: rhodecode/templates/changeset/changeset_file_comment.html:139
 #: rhodecode/templates/files/files_add.html:102
 #: rhodecode/templates/files/files_delete.html:69
 #: rhodecode/templates/files/files_edit.html:105
 msgid "Cancel"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/index.html:6
 #: rhodecode/templates/admin/gists/index.html:20
 #, python-format
 msgid "Private Gists for user %s"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/index.html:8
 #: rhodecode/templates/admin/gists/index.html:22
 #, python-format
 msgid "Public Gists for user %s"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/index.html:10
 msgid "Public Gists"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/index.html:24
 #, python-format
 msgid "All Gists for user %s"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/index.html:26
 msgid "All Public Gists"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/index.html:44
 #: rhodecode/templates/admin/gists/show.html:36
 msgid "Create New Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/index.html:56
 msgid "All gists"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/index.html:58
 msgid "All public"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/index.html:60
 msgid "My gists"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/index.html:61
 msgid "My private"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/index.html:62
 msgid "My public"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/index.html:108
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:24
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:87
 #: rhodecode/templates/bookmarks/bookmarks.html:63
 #: rhodecode/templates/branches/branches.html:62
 #: rhodecode/templates/changelog/changelog.html:102
 #: rhodecode/templates/changelog/changelog_summary_data.html:10
 #: rhodecode/templates/changeset/changeset.html:164
-#: rhodecode/templates/compare/compare_cs.html:21
+#: rhodecode/templates/compare/compare_commits.html:21
 #: rhodecode/templates/files/files_browser.html:53
 #: rhodecode/templates/pullrequests/pullrequest_show.html:169
 #: rhodecode/templates/pullrequests/pullrequests.html:102
-#: rhodecode/templates/search/search_commit.html:10
+#: rhodecode/templates/search/search_commit.html:16
 #: rhodecode/templates/tags/tags.html:63
 msgid "Author"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/index.html:116
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:6
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:6
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:6
 #: rhodecode/templates/admin/users/user_edit_advanced.html:5
 msgid "Created on"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/index.html:118
 #: rhodecode/templates/admin/gists/show.html:65
 msgid "Expires"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/new.html:5
 #: rhodecode/templates/admin/gists/new.html:12
 msgid "New Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/new.html:35
 msgid "Gist id"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/new.html:36
 msgid "Auto generated"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/new.html:49
 msgid "name this file..."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/new.html:60
 msgid "Create Private Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/new.html:61
 msgid "Create Public Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/new.html:62
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:27
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:84
 #: rhodecode/templates/admin/my_account/my_account_emails.html:65
 #: rhodecode/templates/admin/my_account/my_account_password.html:37
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:104
 #: rhodecode/templates/admin/permissions/permissions_application.html:51
 #: rhodecode/templates/admin/permissions/permissions_ips.html:61
 #: rhodecode/templates/admin/permissions/permissions_objects.html:57
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:136
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:56
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:68
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:66
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:80
 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:111
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:146
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:159
 #: rhodecode/templates/admin/repos/repo_edit_vcs.html:46
 #: rhodecode/templates/admin/settings/settings_global.html:110
 #: rhodecode/templates/admin/settings/settings_issuetracker.html:16
 #: rhodecode/templates/admin/settings/settings_labs.html:46
 #: rhodecode/templates/admin/settings/settings_vcs.html:14
 #: rhodecode/templates/admin/settings/settings_visual.html:220
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:121
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:23
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:81
 #: rhodecode/templates/admin/users/user_edit_emails.html:63
 #: rhodecode/templates/admin/users/user_edit_ips.html:70
 #: rhodecode/templates/admin/users/user_edit_profile.html:135
 #: rhodecode/templates/base/default_perms_box.html:89
 msgid "Reset"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/show.html:13
 #: rhodecode/templates/admin/gists/show.html:20
 msgid "Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/show.html:49
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:56
 #: rhodecode/templates/admin/my_account/my_account_emails.html:32
-#: rhodecode/templates/admin/my_account/my_account_oauth.html:50
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:34
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:61
 #: rhodecode/templates/admin/permissions/permissions_ips.html:26
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:25
 #: rhodecode/templates/admin/settings/settings_hooks.html:46
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:52
 #: rhodecode/templates/admin/users/user_edit_emails.html:31
 #: rhodecode/templates/admin/users/user_edit_ips.html:34
 #: rhodecode/templates/base/issue_tracker_settings.html:70
 #: rhodecode/templates/base/vcs_settings.html:147
 #: rhodecode/templates/base/vcs_settings.html:172
 #: rhodecode/templates/changeset/changeset_file_comment.html:49
 #: rhodecode/templates/changeset/changeset_file_comment.html:99
 #: rhodecode/templates/data_table/_dt_elements.html:117
 #: rhodecode/templates/data_table/_dt_elements.html:174
 #: rhodecode/templates/data_table/_dt_elements.html:188
 #: rhodecode/templates/data_table/_dt_elements.html:200
 #: rhodecode/templates/debug_style/buttons.html:132
 #: rhodecode/templates/files/files_source.html:33
 #: rhodecode/templates/files/files_source.html:37
 #: rhodecode/templates/files/files_source.html:40
 msgid "Delete"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/show.html:49
 msgid "Confirm to delete this Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/show.html:56
 #: rhodecode/templates/admin/my_account/my_account_profile.html:5
 #: rhodecode/templates/base/issue_tracker_settings.html:61
 #: rhodecode/templates/changeset/changeset_file_comment.html:145
 #: rhodecode/templates/changeset/changeset_file_comment.html:292
 #: rhodecode/templates/data_table/_dt_elements.html:112
 #: rhodecode/templates/data_table/_dt_elements.html:170
 #: rhodecode/templates/data_table/_dt_elements.html:183
 #: rhodecode/templates/data_table/_dt_elements.html:196
 #: rhodecode/templates/debug_style/buttons.html:128
 #: rhodecode/templates/files/files_add.html:204
 #: rhodecode/templates/files/files_edit.html:165
 #: rhodecode/templates/files/files_source.html:36
 #: rhodecode/templates/files/files_source.html:39
 #: rhodecode/templates/pullrequests/pullrequest_show.html:50
 #: rhodecode/templates/pullrequests/pullrequest_show.html:184
 #: rhodecode/templates/users/user_profile.html:7
 msgid "Edit"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/show.html:58
 msgid "Show as Raw"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/show.html:62
 msgid "Private Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/show.html:77
 msgid "created"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/show.html:91
 #: rhodecode/templates/files/files_delete.html:50
 #: rhodecode/templates/files/files_source.html:61
 msgid "Show as raw"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.html:5
-#: rhodecode/templates/base/base.html:340
+#: rhodecode/templates/base/base.html:342
 msgid "My account"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.html:12
 msgid "My Account"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.html:29
 #: rhodecode/templates/admin/my_account/my_account_profile.html:4
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:4
 msgid "My Profile"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.html:31
 msgid "Auth Tokens"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account.html:32
+#: rhodecode/templates/admin/my_account/my_account.html:34
 msgid "OAuth Identities"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account.html:33
-msgid "My Emails"
-msgstr ""
-
-#: rhodecode/templates/admin/my_account/my_account.html:34
-msgid "My Repositories"
-msgstr ""
-
-#: rhodecode/templates/admin/my_account/my_account.html:35
-msgid "Watched"
-msgstr ""
-
-#: rhodecode/templates/admin/my_account/my_account.html:36
-#: rhodecode/templates/admin/notifications/notifications.html:33
-#: rhodecode/templates/base/base.html:240
-msgid "Pull Requests"
-msgstr ""
-
 #: rhodecode/templates/admin/my_account/my_account.html:37
+msgid "My Emails"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:38
+msgid "My Repositories"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:39
+msgid "Watched"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:40
+#: rhodecode/templates/admin/notifications/notifications.html:33
+#: rhodecode/templates/base/base.html:242
+msgid "Pull Requests"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account.html:41
 msgid "My Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:3
 msgid "Authentication Tokens"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:7
 msgid "Built-in tokens can be used to authenticate with all possible options."
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:8
 msgid "Each token can have a role. VCS tokens can be used together with the authtoken auth plugin for git/hg operations."
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:14
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:11
 msgid "Built-in"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:19
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:42
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:47
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:16
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:38
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:43
 msgid "expires"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:25
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:22
 #, python-format
 msgid "Confirm to reset this auth token: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:45
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:41
 msgid "expired"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:55
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:51
 #, python-format
 msgid "Confirm to remove this auth token: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:63
 msgid "No additional auth token specified"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:74
 msgid "New authentication token"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:83
 #: rhodecode/templates/admin/my_account/my_account_emails.html:64
 #: rhodecode/templates/admin/permissions/permissions_ips.html:60
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:65
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:80
 #: rhodecode/templates/admin/users/user_edit_emails.html:62
 #: rhodecode/templates/admin/users/user_edit_ips.html:69
 msgid "Add"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_emails.html:5
 msgid "Account Emails"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_emails.html:17
 #: rhodecode/templates/admin/users/user_edit_emails.html:16
 msgid "Primary"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_emails.html:31
 #: rhodecode/templates/admin/users/user_edit_emails.html:30
 #, python-format
 msgid "Confirm to delete this email: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_emails.html:42
 #: rhodecode/templates/admin/users/user_edit_emails.html:41
 msgid "No additional emails specified"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_emails.html:57
 #: rhodecode/templates/admin/users/user_edit_emails.html:55
 msgid "New email address"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_oauth.html:5
-msgid "Oauth Identities"
-msgstr ""
-
-#: rhodecode/templates/admin/my_account/my_account_oauth.html:9
-msgid "External services currently connected with your Rhodecode user"
-msgstr ""
-
-#: rhodecode/templates/admin/my_account/my_account_oauth.html:15
-msgid "No social authentication plugins are enabled by administrator"
-msgstr ""
-
-#: rhodecode/templates/admin/my_account/my_account_oauth.html:49
-msgid "Confirm to remove this provider from your account"
-msgstr ""
-
-#: rhodecode/templates/admin/my_account/my_account_oauth.html:59
-msgid "You have no accounts linked yet"
-msgstr ""
-
 #: rhodecode/templates/admin/my_account/my_account_password.html:3
 msgid "Change Your Account Password"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_password.html:10
 msgid "Current Password"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_password.html:19
 #: rhodecode/templates/admin/users/user_edit_profile.html:74
 msgid "New Password"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_password.html:28
 msgid "Confirm New Password"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_profile.html:11
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:52
 #: rhodecode/templates/admin/users/user_edit_profile.html:25
 #: rhodecode/templates/users/user_profile.html:14
 msgid "Photo"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_profile.html:18
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:60
 #: rhodecode/templates/admin/users/user_edit_profile.html:33
 #: rhodecode/templates/users/user_profile.html:21
 msgid "Avatars are disabled"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_profile.html:51
 #: rhodecode/templates/users/user_profile.html:54
 msgid "Missing email, please update your user email address."
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:18
 msgid "Your user account details are managed by an external source, i.e. LDAP. Details cannot be managed here."
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:57
 msgid "Change your avatar at"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:6
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:8
 msgid "Show Closed Pull Requests"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:16
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:15
 msgid "Pull Requests You Opened"
 msgstr ""
 
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:23
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:86
+msgid "Target Repo"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:26
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:89
+#: rhodecode/templates/admin/settings/settings_global.html:9
+#: rhodecode/templates/email_templates/pull_request_review.mako:28
+#: rhodecode/templates/email_templates/pull_request_review.mako:65
+#: rhodecode/templates/pullrequests/pullrequest.html:38
+#: rhodecode/templates/pullrequests/pullrequests.html:104
+msgid "Title"
+msgstr ""
+
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:27
-#, python-format
-msgid "Pull request #%s opened on %s"
-msgstr ""
-
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:29
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:64
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:90
+msgid "Opened On"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:41
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:103
+#: rhodecode/templates/changelog/changelog.html:141
+#: rhodecode/templates/compare/compare_commits.html:49
+#: rhodecode/templates/search/search_commit.html:36
+msgid "Expand commit message"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:50
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:112
 #: rhodecode/templates/changeset/changeset_file_comment.html:284
 #: rhodecode/templates/pullrequests/pullrequest_show.html:14
 #: rhodecode/templates/pullrequests/pullrequest_show.html:112
-#: rhodecode/templates/pullrequests/pullrequests.html:51
+#: rhodecode/templates/pullrequests/pullrequests.html:52
 msgid "Closed"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:35
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:62
 msgid "Confirm to delete this pull request"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:42
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:69
 msgid "You currently have no open pull requests."
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:50
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:77
 msgid "Pull Requests You Participate In"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:61
-#, python-format
-msgid "Pull request #%s opened by %s on %s"
-msgstr ""
-
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:70
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:125
 msgid "There are currently no open pull requests requiring your participation."
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_repos.html:3
 msgid "Repositories You Own"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_watched.html:3
 msgid "Your Watched Repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:5
 #: rhodecode/templates/admin/notifications/notifications.html:12
 msgid "My Notifications"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:31
 msgid "All"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:32
 #: rhodecode/templates/changeset/changeset.html:140
 #: rhodecode/templates/pullrequests/pullrequest_show.html:133
 msgid "Comments"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:37
 msgid "Mark all as read"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_data.html:39
 msgid "No notifications here yet"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/show_notification.html:5
 #: rhodecode/templates/admin/notifications/show_notification.html:14
 msgid "Show notification"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/show_notification.html:12
 msgid "Notifications"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:5
 msgid "Permissions Administration"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:14
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.html:45
 #: rhodecode/templates/admin/repos/repo_edit.html:42
 #: rhodecode/templates/admin/user_groups/user_group_edit.html:34
 #: rhodecode/templates/base/base.html:83
 msgid "Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:33
 msgid "Application"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:39
 msgid "Object"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:42
 msgid "IP Whitelist"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:45
 msgid "Overview"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.html:3
 msgid "System Wide Application Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.html:12
 msgid "Anonymous Access"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.html:18
 #, python-format
 msgid "Allow access to RhodeCode Enterprise without requiring users to login. Anonymous users get the %s permission settings."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.html:24
 msgid "Registration"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.html:33
 msgid "Registration Page Message"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.html:37
 msgid "Custom message to be displayed on the registration page. HTML syntax is supported."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.html:43
 msgid "External Authentication Account Activation"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.html:5
 msgid "Default IP Whitelist For All Users"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.html:27
 #: rhodecode/templates/admin/users/user_edit_ips.html:35
 #, python-format
 msgid "Confirm to delete this ip: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.html:34
 #: rhodecode/templates/admin/users/user_edit_ips.html:43
 msgid "All IP addresses are allowed"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.html:49
 #: rhodecode/templates/admin/users/user_edit_ips.html:59
 msgid "New IP Address"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.html:53
 #: rhodecode/templates/admin/users/user_edit_ips.html:62
 msgid "Description..."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.html:54
 msgid ""
 "Enter a comma separated list of IP Addresses like 127.0.0.1,\n"
 "or use an IP Address with a mask 127.0.0.1/24, to create a network range.\n"
 "To specify multiple addresses in a range, use the 127.0.0.1-127.0.0.10 syntax"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.html:3
 msgid "Default Permissions for Repositories, User Groups and Repository Groups."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.html:6
 msgid "Default system permissions. Each permissions management entity will be created with the following default settings. Check the overwrite checkbox to force any permission changes on already existing settings."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.html:20
 msgid "All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.html:21
 #: rhodecode/templates/admin/permissions/permissions_objects.html:35
 #: rhodecode/templates/admin/permissions/permissions_objects.html:49
 msgid "Overwrite Existing Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.html:28
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.html:14
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:127
 msgid "Repository Groups"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.html:34
 msgid "All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.html:42
 #: rhodecode/templates/admin/user_groups/user_group_edit.html:14
 msgid "User Groups"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.html:48
 msgid "All default permissions on each user group will be reset to chosen permission, note that all custom default permission on repository groups will be lost"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_perms.html:1
 msgid "Default User Permissions Overview"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:5
 #: rhodecode/templates/admin/users/user_add.html:116
 msgid "Add repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:14
 #: rhodecode/templates/admin/users/user_edit_advanced.html:12
-#: rhodecode/templates/base/base.html:80 rhodecode/templates/base/base.html:150
+#: rhodecode/templates/base/base.html:80 rhodecode/templates/base/base.html:152
 msgid "Repository groups"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:36
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:13
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:15
 msgid "Group Name"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:54
 msgid "Group Parent"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:63
 #: rhodecode/templates/admin/repos/repo_add_base.html:53
 msgid "Copy Parent Group Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:67
 msgid "Copy permission settings from parent repository group."
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.html:5
 #, python-format
 msgid "%s repository group settings"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.html:24
 msgid "Add Child Group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.html:44
 #: rhodecode/templates/admin/repos/repo_edit.html:15
 #: rhodecode/templates/admin/repos/repo_edit.html:39
 #: rhodecode/templates/admin/settings/settings.html:14
 #: rhodecode/templates/admin/user_groups/user_group_edit.html:33
-#: rhodecode/templates/base/base.html:86 rhodecode/templates/base/base.html:248
+#: rhodecode/templates/base/base.html:86 rhodecode/templates/base/base.html:250
 msgid "Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.html:46
 #: rhodecode/templates/admin/repos/repo_edit.html:45
 #: rhodecode/templates/admin/user_groups/user_group_edit.html:35
 #: rhodecode/templates/admin/users/user_edit.html:35
 msgid "Advanced"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:8
 msgid "Total repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:9
 msgid "Top level repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:11
 msgid "Children groups"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:17
 #, python-format
 msgid "Repository Group: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:27
 msgid "Delete repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:35
 #, python-format
 msgid "This repository group includes %s children repository group."
 msgid_plural "This repository group includes %s children repository groups."
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:44
 #, python-format
 msgid "This repository group includes %s repository."
 msgid_plural "This repository group includes %s repositories."
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:56
 #, python-format
 msgid "Confirm to delete this group: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:57
 msgid "Delete this repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:5
 msgid "Repository Group Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:11
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:126
 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:12
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:11
 msgid "None"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:12
 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:13
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:12
 msgid "Read"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:13
 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:14
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:13
 msgid "Write"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:15
 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:16
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:15
 msgid "User/User Group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:31
 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:31
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:31
 msgid "super admin"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:34
 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:34
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:34
-#: rhodecode/templates/pullrequests/pullrequest_show.html:200
+#: rhodecode/templates/pullrequests/pullrequest_show.html:199
 msgid "owner"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:52
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:76
 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:61
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:52
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:76
 msgid "permission for all other users"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:62
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:109
 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:71
 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:99
 msgid "Revoke"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:80
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:80
 msgid "delegated admin"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:118
 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:107
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:117
 #: rhodecode/templates/base/issue_tracker_settings.html:84
 msgid "Add new"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:123
 msgid "Apply to children"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:129
 msgid "Both"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:130
 msgid "Set or revoke permissions to selected types of children of this group, including non-private repositories and other groups if chosen."
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:4
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:6
 #, python-format
 msgid "Settings for Repository Group: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:25
-msgid "Change Repository Group Owner."
-msgstr ""
-
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:39
-msgid "Group parent"
-msgstr ""
-
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:47
-msgid "Enable Repository Locking"
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:36
+msgid "Change owner of this repository group."
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:51
+msgid "Group parent"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:59
+msgid "Enable Repository Locking"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:63
 msgid "Repository locking will be enabled on all subgroups and repositories inside this repository group. Pulling from a repository locks it, and it is unlocked by pushing back by the same user."
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_groups.html:5
 msgid "Repository groups administration"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_groups.html:13
 msgid "repository groups"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_groups.html:58
 msgid "Number of top level repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add.html:5
 msgid "Add repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:14
 msgid "Import Existing Repository ?"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:23
-#: rhodecode/templates/base/base.html:195
+#: rhodecode/templates/base/base.html:197
 msgid "Clone from"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:27
 msgid "Optional http[s] URL from which to clone a repository."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:36
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:87
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:100
 #: rhodecode/templates/forks/fork.html:52
 msgid "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:41
 msgid "Repository Group"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:46
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:58
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:61
 #: rhodecode/templates/forks/fork.html:63
 #, python-format
 msgid "Select my personal group (%(repo_group_name)s)"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:48
 #: rhodecode/templates/forks/fork.html:65
 msgid "Optionally select a group to put this repository into."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:57
 msgid "Copy permission set from the parent repository group."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:66
 msgid "Set the type of repository to create."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:71
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:65
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:68
 #: rhodecode/templates/forks/fork.html:71
 msgid "Landing commit"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:75
 msgid "The default commit for file pages, downloads, full text search index, and README generation."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_creating.html:9
 #, python-format
 msgid "%s Creating repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_creating.html:16
 msgid "Creating repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_creating.html:30
 #, python-format
 msgid "Repository \"%(repo_name)s\" is being created, you will be redirected when this process is finished.repo_name"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:8
 #, python-format
 msgid "%s repository settings"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:51
 msgid "Extra Fields"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:57
 msgid "Caches"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:61
 msgid "Remote"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:65
 #: rhodecode/templates/summary/components.html:135
 msgid "Statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:7
 #: rhodecode/templates/pullrequests/pullrequests.html:108
 msgid "Updated on"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:8
 msgid "Cached Commit id"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:14
 #, python-format
 msgid "Repository: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:24
 msgid "Fork Reference"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:30
 #, python-format
 msgid "This repository is a fork of %(repo_link)s"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:36
 #: rhodecode/templates/admin/repos/repo_edit_fork.html:5
 msgid "Set"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:39
 #: rhodecode/templates/admin/repos/repo_edit_fork.html:9
 msgid "Manually set this repository as a fork of another from the list"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:48
 msgid "Public Journal Visibility"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:56
 msgid "Remove from Public Journal"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:60
 msgid "Add to Public Journal"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:65
 msgid "All actions made on this repository will be visible to everyone following the public journal."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:74
 msgid "Locking state"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:83
 msgid "This Repository is not currently locked."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:90
 msgid "Confirm to unlock repository."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:92
 msgid "Unlock repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:97
 msgid "Confirm to lock repository."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:99
 msgid "Lock Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:105
 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.html:114
 msgid "Delete repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html: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.html:125
 msgid "Detach forks"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:130
 msgid "Delete forks"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:139
 #: rhodecode/templates/data_table/_dt_elements.html:118
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:141
 msgid "Delete This Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html: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."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:180
 msgid "Change repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:180
 msgid "Pick repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.html:3
 msgid "Invalidate Cache for Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.html:10
 msgid "Invalidate repository cache"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.html:10
 msgid "Confirm to invalidate repository cache"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.html:14
 msgid "Manually invalidate the repository cache. On the next access a repository cache will be recreated."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.html: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.html:35
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:32
 #: rhodecode/templates/base/issue_tracker_settings.html:13
 msgid "Prefix"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.html:36
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:11
 msgid "Key"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.html:37
 #: rhodecode/templates/admin/user_groups/user_group_add.html:52
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:38
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:51
 #: rhodecode/templates/admin/user_groups/user_groups.html:62
 #: rhodecode/templates/admin/users/user_add.html:97
 #: rhodecode/templates/admin/users/user_edit_profile.html:90
 #: rhodecode/templates/admin/users/users.html:100
 msgid "Active"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:3
 msgid "Custom extra fields for this repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:10
 msgid "Label"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:24
 #, python-format
 msgid "Confirm to delete this field: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:40
 msgid "New Field Key"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:48
 msgid "New Field Label"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:51
 msgid "Enter short label"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:57
 msgid "New Field Description"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:60
 msgid "Enter a full description for the field"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:73
 msgid "Extra fields are disabled. You can enable them from the Admin/Settings/Visual page."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:9
 #: rhodecode/templates/admin/repos/repo_edit_vcs.html:9
 msgid "Inherit from global settings"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:14
 msgid "Select to inherit global patterns for issue tracker."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:24
 msgid "Inherited Issue Tracker Patterns"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:30
 #: rhodecode/templates/base/issue_tracker_settings.html:11
 msgid "Pattern"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:31
 #: rhodecode/templates/base/issue_tracker_settings.html:12
 msgid "Url"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:70
 #: rhodecode/templates/admin/settings/settings_issuetracker.html:5
 msgid "Issue Tracker / Wiki Patterns"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:91
 #: rhodecode/templates/admin/settings/settings_issuetracker.html:24
 msgid "Test Patterns"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:5
 msgid "Repository Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:43
 msgid "private repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:48
 msgid "only users/user groups explicitly added here will have access"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.html:3
 msgid "Remote url"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.html:9
 msgid "Remote mirror url"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.html:14
 #: rhodecode/templates/admin/repos/repo_edit_remote.html:22
 msgid "Pull changes from remote location"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.html:14
 msgid "Confirm to pull changes from remote side"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.html:19
 msgid "This repository does not have any remote mirror url set."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:3
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:6
 #, python-format
 msgid "Settings for Repository: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:16
-msgid "Non-changeable id"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:16
-msgid "what is that ?"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:18
-msgid "URL by id"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_settings.html:19
+msgid "Non-changeable id"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:19
+msgid "what is that ?"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:21
+msgid "URL by id"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:22
 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.html:27
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:30
 msgid "Remote uri"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:33
-#: rhodecode/templates/base/perms_summary.html:80
-#: rhodecode/templates/base/perms_summary.html:142
-#: rhodecode/templates/base/perms_summary.html:144
-#: rhodecode/templates/debug_style/form-elements.html:45
-msgid "edit"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_settings.html:36
+#: rhodecode/templates/base/perms_summary.html:79
+#: rhodecode/templates/base/perms_summary.html:149
+#: rhodecode/templates/base/perms_summary.html:151
+#: rhodecode/templates/debug_style/form-elements.html:45
+msgid "edit"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:39
 msgid "new value, leave empty to remove"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:38
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:41
 msgid "cancel"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:45
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:48
 msgid "http[s] url where from repository was imported, also used for doing remote pulls."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:53
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:56
 #: rhodecode/templates/data_table/_dt_elements.html:158
 #: rhodecode/templates/forks/fork.html:58
 msgid "Repository group"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:60
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:63
 msgid "Optional select a group to put this repository into."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:69
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:72
 #: rhodecode/templates/forks/fork.html:75
 msgid "Default commit for files page, downloads, whoosh and readme"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:78
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:90
 msgid "Change owner of this repository."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:93
-#: rhodecode/templates/data_table/_dt_elements.html:58
-msgid "Private repository"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:102
-msgid "Enable statistics"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_settings.html:106
-msgid "Enable statistics window on summary page."
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:111
-msgid "Enable downloads"
+#: rhodecode/templates/data_table/_dt_elements.html:58
+msgid "Private repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.html:115
-msgid "Enable download menu on summary page."
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit_settings.html:120
-msgid "Enable automatic locking"
+msgid "Enable statistics"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:119
+msgid "Enable statistics window on summary page."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.html:124
+msgid "Enable downloads"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:128
+msgid "Enable download menu on summary page."
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:133
+msgid "Enable automatic locking"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_settings.html:137
 msgid "Enable automatic locking on repository. Pulling from this repository creates a lock that can be released by pushing back by the same user"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_statistics.html:3
 msgid "Repository statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_statistics.html:11
 msgid "Processed commits"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_statistics.html:12
 msgid "Processed progress"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_statistics.html:15
 msgid "Reset statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_statistics.html:15
 msgid "Confirm to remove current statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_vcs.html:14
 msgid "Select to inherit global vcs settings."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_vcs.html:45
 #: rhodecode/templates/admin/settings/settings_global.html:109
 #: rhodecode/templates/admin/settings/settings_labs.html:45
 #: rhodecode/templates/admin/settings/settings_vcs.html:13
 #: rhodecode/templates/admin/settings/settings_visual.html:219
 msgid "Save settings"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.html:5
 msgid "Repositories administration"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.html:13
 msgid "repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.html:67
 msgid "State"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:5
 msgid "Settings administration"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.html:3
 msgid "Email Configuration"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.html:8
 msgid "Email prefix"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.html:9
 msgid "RhodeCode email from"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.html:10
 msgid "Error email from"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.html:11
 msgid "Error email recipients"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.html:13
 msgid "SMTP server"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.html:14
 msgid "SMTP username"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.html:15
 msgid "SMTP password"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.html:16
 msgid "SMTP port"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.html:18
 msgid "SMTP use TLS"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.html:19
 msgid "SMTP use SSL"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.html:20
 msgid "SMTP auth"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.html:34
 msgid "Test Email"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.html:40
 msgid "enter valid email"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.html:44
 msgid "Send an auto-generated email from this server to above email..."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.html:48
 msgid "Send"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:5
 msgid "Branding"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_global.html:9
-#: rhodecode/templates/email_templates/pull_request_review.mako:28
-#: rhodecode/templates/email_templates/pull_request_review.mako:65
-#: rhodecode/templates/pullrequests/pullrequest.html:38
-#: rhodecode/templates/pullrequests/pullrequests.html:104
-msgid "Title"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings_global.html:16
 msgid "Set a custom title for your RhodeCode instance (limited to 40 characters)."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:20
 msgid "HTTP[S] authentication realm"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:27
 msgid "Set a custom text that is shown as authentication message to clients trying to connect."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:35
 msgid "Registration Captcha"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:39
 msgid "Google ReCaptcha public key"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:46
 msgid "Public key for reCaptcha system."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:51
 msgid "Google ReCaptcha private key"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:58
 msgid "Private key for reCaptcha system. Setting this value will enable captcha on registration"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:66
 msgid "Custom Header Code"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:71
 #: rhodecode/templates/admin/settings/settings_global.html:93
 #: rhodecode/templates/debug_style/form-elements-small.html:59
 #: rhodecode/templates/debug_style/form-elements.html:57
 #: rhodecode/templates/debug_style/form-elements.html:82
 #: rhodecode/templates/debug_style/form-elements.html:225
 #: rhodecode/templates/debug_style/form-elements.html:381
 #: rhodecode/templates/debug_style/form-elements.html:407
 #: rhodecode/templates/debug_style/form-elements.html:515
 #: rhodecode/templates/debug_style/form-elements.html:519
 #: rhodecode/templates/debug_style/form-elements.html:537
 #: rhodecode/templates/debug_style/form-elements.html:587
 #: rhodecode/templates/debug_style/form-inline.html:38
 #: rhodecode/templates/debug_style/form-inline.html:139
 #: rhodecode/templates/debug_style/form-inline.html:147
 #: rhodecode/templates/debug_style/form-vertical.html:60
 #: rhodecode/templates/debug_style/forms.html:37
 #: rhodecode/templates/debug_style/forms.html:60
 #: rhodecode/templates/debug_style/forms.html:78
 #: rhodecode/templates/debug_style/forms.html:96
 #: rhodecode/templates/debug_style/layout-form-sidebar.html:44
 msgid "Templates..."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:74
 #: rhodecode/templates/admin/settings/settings_global.html:96
 #: rhodecode/templates/debug_style/form-elements-small.html:62
 #: rhodecode/templates/debug_style/form-elements.html:60
 #: rhodecode/templates/debug_style/form-elements.html:85
 #: rhodecode/templates/debug_style/form-elements.html:228
 #: rhodecode/templates/debug_style/form-elements.html:384
 #: rhodecode/templates/debug_style/form-elements.html:410
 #: rhodecode/templates/debug_style/form-elements.html:518
 #: rhodecode/templates/debug_style/form-elements.html:522
 #: rhodecode/templates/debug_style/form-elements.html:540
 #: rhodecode/templates/debug_style/form-elements.html:590
 #: rhodecode/templates/debug_style/form-inline.html:41
 #: rhodecode/templates/debug_style/form-inline.html:142
 #: rhodecode/templates/debug_style/form-inline.html:150
 #: rhodecode/templates/debug_style/form-vertical.html:63
 #: rhodecode/templates/debug_style/forms.html:40
 #: rhodecode/templates/debug_style/forms.html:63
 #: rhodecode/templates/debug_style/forms.html:81
 #: rhodecode/templates/debug_style/forms.html:99
 #: rhodecode/templates/debug_style/layout-form-sidebar.html:47
 msgid "Server Announcement"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:80
 msgid "Custom js/css code added at the end of the <header> tag."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:81
 #: rhodecode/templates/admin/settings/settings_global.html:103
 msgid "Use <script> or <css> tags to define custom styling or scripting"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:88
 msgid "Custom Footer Code"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:102
 msgid "Custom js/css code added at the end of the <body> tag."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_hooks.html:3
 msgid "Built in Mercurial hooks - read only"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_hooks.html:19
 msgid "Hooks can be used to trigger actions on certain events such as push / pull. They can trigger Python functions or external applications."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_hooks.html:27
 msgid "Custom hooks"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_labs.html:3
 msgid "Labs Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.html:5
 msgid "Import New Groups or Repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.html:10
 msgid "Destroy old data"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.html:12
 msgid "In case a repository or a group was deleted from the filesystem and it still exists in the database, check this option to remove obsolete data from the database."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.html:16
 msgid "Invalidate cache for all repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.html:18
 msgid "Each cache data for repositories will be cleaned with this option selected. Use this to reload data and clear cache keys."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.html:21
 msgid "Rescan Filesystem"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_open_source.html:3
 msgid "Licenses of Third Party Packages"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_search.html:3
 msgid "RhodeCode Full Text Search"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_supervisor_tail.html:1
 #, python-format
 msgid "Last %(size)s bytes of process logs, use ?offset=[num] GET param to set custom size"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:4
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:4
 msgid "RhodeCode Enterprise version"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:4
 msgid "check for updates"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:5
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:5
 msgid "Upgrade info endpoint"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:5
 msgid "Note: please make sure this server can access this url"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:6
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:6
 msgid "Configuration INI file"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:8
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:8
 msgid "RhodeCode Enterprise Server IP"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:9
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:9
 msgid "RhodeCode Enterprise Server ID"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:10
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:10
 msgid "Platform"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:11
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:11
 msgid "Uptime"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:12
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:12
 msgid "Storage location"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:13
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:13
 msgid "Storage disk space"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:15
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:15
 msgid "Search index storage"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:16
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:16
 msgid "Search index size"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:18
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:18
 msgid "Gist storage"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:19
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:19
 msgid "Gist storage size"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:21
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:21
 msgid "Archive cache"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:21
 msgid "Enable this by setting archive_cache_dir=/path/to/cache option in the .ini file"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:22
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:22
 msgid "Archive cache size"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:24
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:24
 msgid "System memory"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:25
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:25
 msgid "CPU"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:26
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:26
 msgid "Load"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:29
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:29
 msgid "Python version"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:30
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:30
 msgid "Python path"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:31
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:31
 msgid "GIT version"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:32
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:32
 msgid "HG version"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:33
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:33
 msgid "SVN version"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:34
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:34
 msgid "Database"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:35
+#: rhodecode/templates/admin/settings/settings_system_snapshot.html:35
 msgid "Database version"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.html:41
 msgid "Checking for updates..."
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings_system.html:61
+#: rhodecode/templates/admin/settings/settings_system.html:49
+msgid "create snapshot"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings_system.html:64
 msgid "Python Packages"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:5
 #: rhodecode/templates/base/vcs_settings.html:10
 msgid "General"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:10
 msgid "Use repository extra fields"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:12
 msgid "Allows storing additional customized fields per repository."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:17
 msgid "Show RhodeCode version"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:19
 msgid "Shows or hides a version number of RhodeCode displayed in the footer."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:26
 msgid "Gravatars"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:31
 msgid "Use Gravatars based avatars"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:33
 msgid "Use gravatar.com as avatar system for RhodeCode accounts. If this is disabled avatars are generated based on initials and email."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:36
 msgid "Gravatar URL"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:44
 msgid ""
 "Gravatar url allows you to use other avatar server application.\n"
 "                                            Following variables of the URL will be replaced accordingly.\n"
 "                                            {scheme}    'http' or 'https' sent from running RhodeCode server,\n"
 "                                            {email}     user email,\n"
 "                                            {md5email}  md5 hash of the user email (like at gravatar.com),\n"
 "                                            {size}      size of the image that is expected from the server application,\n"
 "                                            {netloc}    network location/server host of running RhodeCode server"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:59
 msgid "Meta-Tagging"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:64
 msgid "Stylify recognised meta tags"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:66
 msgid "Parses meta tags from repository description field and turns them into colored tags."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:86
 msgid "Dashboard Items"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:90
 msgid "Main page dashboard items"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:96
 msgid "Number of items displayed in the main page dashboard before pagination is shown."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:100
 msgid "Admin pages items"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:106
 msgid "Number of items displayed in the admin pages grids before pagination is shown."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:115
 msgid "Commit ID Style"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:119
 msgid "Commit sha length"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:126
 msgid ""
 "Number of chars to show in commit sha displayed in web interface.\n"
 "                                                By default it's shown as r123:9043a6a4c226 this value defines the\n"
 "                                                length of the sha after the `r123:` part."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:134
 msgid "Show commit ID numeric reference"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:134
 msgid "Commit show revision number"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:136
 msgid ""
 "Show revision number in commit sha displayed in web interface.\n"
 "                                        By default it's shown as r123:9043a6a4c226 this value defines the\n"
 "                                        if the `r123:` part is shown."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:145
 #: rhodecode/templates/debug_style/index.html:62
 msgid "Icons"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:150
 msgid "Show public repo icon on repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:156
 msgid "Show private repo icon on repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:158
 msgid "Show public/private icons next to repositories names."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:165
 msgid "Markup Renderer"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:172
 msgid "Default renderer used to render comments, pull request descriptions and other description elements. After change old entries will still work correctly."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:179
 msgid "Clone URL"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:188
 msgid ""
 "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
 "                       {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
 "                       {user}   current user username,\n"
 "                       {netloc} network location/server host of running RhodeCode server,\n"
 "                       {repo}   full repository name,\n"
 "                       {repoid} ID of repository, can be used to contruct clone-by-id"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:201
 msgid "Custom Support Link"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.html:209
 #, python-format
 msgid ""
 "Custom url for the support link located at the bottom.\n"
 "                    The default is set to %(default_url)s. In case there's a need\n"
 "                    to change the support link to internal issue tracker, it should be done here.\n"
 "                    "
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_add.html:5
 msgid "Add user group"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_add.html:13
 #: rhodecode/templates/admin/users/user_edit_advanced.html:13
-#: rhodecode/templates/base/base.html:82 rhodecode/templates/base/base.html:153
+#: rhodecode/templates/base/base.html:82 rhodecode/templates/base/base.html:155
 msgid "User groups"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_add.html:15
 #: rhodecode/templates/admin/user_groups/user_groups.html:28
 msgid "Add User Group"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_add.html:35
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:12
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:15
 msgid "Group name"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_add.html:47
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:33
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:46
 msgid "Short, optional description for this user group."
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit.html:5
 #, python-format
 msgid "%s user group settings"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit.html:36
 #: rhodecode/templates/admin/users/user_edit.html:36
 msgid "Global permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit.html:37
 #: rhodecode/templates/admin/users/user_edit.html:37
 msgid "Permissions summary"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit.html:38
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:8
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:46
 #: rhodecode/templates/admin/user_groups/user_groups.html:60
 #: rhodecode/templates/debug_style/form-elements.html:509
 msgid "Members"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:9
 msgid "Assigned to repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:10
 msgid "Assigned to repo groups"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:17
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:3
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:6
 #, python-format
 msgid "User Group: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:26
 msgid "Delete User Group"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:32
 #, python-format
 msgid "Confirm to delete user group `%(ugroup)s` with all permission assignments"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:34
 msgid "Delete This User Group"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_members.html:5
 #, python-format
 msgid "Members of User Group: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_members.html:27
 msgid "No members yet"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:5
 msgid "User Group Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:62
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:109
 msgid "revoke"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:24
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:36
 msgid "Change owner of this user group."
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:50
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:59
+#: rhodecode/templates/base/base.html:257
+#: rhodecode/templates/base/base.html:399
+#: rhodecode/templates/search/search.html:64
+msgid "Search"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:66
 #: rhodecode/templates/debug_style/form-elements.html:513
 #: rhodecode/templates/debug_style/form-elements.html:571
 #: rhodecode/templates/debug_style/forms.html:236
 msgid "Chosen group members"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:53
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:69
 #: rhodecode/templates/debug_style/form-elements.html:525
 #: rhodecode/templates/debug_style/form-elements.html:575
 #: rhodecode/templates/debug_style/forms.html:240
 msgid "Remove all elements"
 msgstr ""
 
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:63
-#: rhodecode/templates/debug_style/form-elements.html:535
-#: rhodecode/templates/debug_style/form-elements.html:585
-#: rhodecode/templates/debug_style/forms.html:250
-msgid "Available members"
-msgstr ""
-
-#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:66
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:79
+msgid "Available users"
+msgstr ""
+
+#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:83
 #: rhodecode/templates/debug_style/form-elements.html:543
 #: rhodecode/templates/debug_style/form-elements.html:593
 #: rhodecode/templates/debug_style/forms.html:258
 msgid "Add all elements"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_groups.html:5
 msgid "User groups administration"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_groups.html:13
 msgid "user groups"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:5
 msgid "Add user"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:13
 #: rhodecode/templates/admin/users/user_edit.html:14
 #: rhodecode/templates/base/base.html:81
 msgid "Users"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:15
 #: rhodecode/templates/admin/users/users.html:27
 msgid "Add User"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:53
 msgid "Password confirmation"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:59
 msgid "Generate password"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:106
 msgid "Password change"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:110
 msgid "Force user to change his password on the next login"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:120
 msgid ""
 "Add repository group with the same name as username. \n"
 "User will be automatically set as this group owner."
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_add.html:137
+#: rhodecode/templates/admin/users/user_add.html:136
 msgid "generated password:"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:5
 #, python-format
 msgid "%s user settings"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:33
 #: rhodecode/templates/admin/users/user_edit_profile.html:5
 msgid "User Profile"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:34
 msgid "Auth tokens"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:38
 msgid "Emails"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.html:39
 msgid "Ip Whitelist"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:6
 #: rhodecode/templates/admin/users/user_edit_profile.html:106
 msgid "Source of Record"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:8
 #: rhodecode/templates/admin/users/users.html:98
 msgid "Last login"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:9
 msgid "Last activity"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:15
 msgid "Member of User groups"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:16
 msgid "Force password change"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:22
 #, python-format
 msgid "User: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:31
 msgid "Force Password Reset"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:39
 msgid "Disable forced password reset"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:41
 msgid "Enable forced password reset"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:47
 msgid "When this is enabled user will have to change they password when they next use RhodeCode system. This will also forbid vcs operations until someone makes a password change in the web interface"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:56
 msgid "Personal Repository Group"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:62
 msgid "Users personal repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:64
 msgid "This user currently does not have a personal repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:68
 msgid "Create personal repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:77
 msgid "Delete User"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:85
 #, python-format
 msgid "This user owns %s repository."
 msgid_plural "This user owns %s repositories."
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:89
 msgid "Detach repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:94
 #: rhodecode/templates/admin/users/user_edit_advanced.html:110
 #: rhodecode/templates/admin/users/user_edit_advanced.html:126
 msgid "Delete repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:101
 #, python-format
 msgid "This user owns %s repository group."
 msgid_plural "This user owns %s repository groups."
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:105
 msgid "Detach repository groups"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:117
 #, python-format
 msgid "This user owns %s user group."
 msgid_plural "This user owns %s user groups."
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:121
 msgid "Detach user groups"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:135
 #: rhodecode/templates/data_table/_dt_elements.html:189
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:137
 msgid "Delete this user"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:147
 #, python-format
 msgid "When selecting the detach option, the depending objects owned by this user will be assigned to the `%s` super admin in the system. The delete option will delete the user's repositories!"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:3
 msgid "Authentication Access Tokens"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:59
 msgid "No additional auth tokens specified"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:71
 msgid "New auth token"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_emails.html:5
 msgid "Additional Email Addresses"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ips.html:3
 msgid "Custom IP Whitelist"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ips.html:19
 #, python-format
 msgid "Inherited from %s"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ips.html:63
 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"
 "To specify multiple address range use 127.0.0.1-127.0.0.10 syntax"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_profile.html:17
 #, python-format
 msgid "This user was created from external source (%s). Editing some of the settings is limited."
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_profile.html:30
 msgid "Change the avatar at"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_profile.html:82
 msgid "New Password Confirmation"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_profile.html:98
 msgid "Super Admin"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_profile.html:115
 msgid "Name in Source of Record"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_profile.html:124
 msgid "Language"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_profile.html:130
 #, python-format
 msgid "Help translate %(rc_link)s into your language."
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:104
 msgid "Authentication type"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:45
 #: rhodecode/templates/errors/error_document.html:51
 msgid "Support"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:52
 #, python-format
 msgid "RhodeCode instance id: %s"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:84
 msgid "Authentication"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:85
 msgid "Defaults"
 msgstr ""
 
 #: rhodecode/templates/base/base.html:103
 #: rhodecode/templates/files/files_pjax.html:24
 #: rhodecode/templates/summary/components.html:42
 msgid "Show More"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:187
+#: rhodecode/templates/base/base.html:189
 msgid "Fork of"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:204
+#: rhodecode/templates/base/base.html:206
 #, python-format
 msgid "Repository locked by %(user)s"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:209
+#: rhodecode/templates/base/base.html:211
 msgid "Repository not locked. Pull repository to lock it."
 msgstr ""
 
-#: rhodecode/templates/base/base.html:227
+#: rhodecode/templates/base/base.html:229
 #: rhodecode/templates/data_table/_dt_elements.html:12
 #: rhodecode/templates/data_table/_dt_elements.html:13
 #: rhodecode/templates/data_table/_dt_elements.html:147
 msgid "Summary"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:228
+#: rhodecode/templates/base/base.html:230
 #: rhodecode/templates/data_table/_dt_elements.html:17
 #: rhodecode/templates/data_table/_dt_elements.html:18
 msgid "Changelog"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:229
+#: rhodecode/templates/base/base.html:231
 #: rhodecode/templates/data_table/_dt_elements.html:22
 #: rhodecode/templates/data_table/_dt_elements.html:23
 #: rhodecode/templates/files/files.html:15
 msgid "Files"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:231
+#: rhodecode/templates/base/base.html:233
 #: rhodecode/templates/bookmarks/bookmarks.html:68
 #: rhodecode/templates/branches/branches.html:67
 #: rhodecode/templates/files/file_diff.html:11
 #: rhodecode/templates/files/file_diff.html:29
 #: rhodecode/templates/tags/tags.html:68
 msgid "Compare"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:236
+#: rhodecode/templates/base/base.html:238
 #, python-format
 msgid "Show Pull Requests for %s"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:245
+#: rhodecode/templates/base/base.html:247
 msgid "Options"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:252
-#: rhodecode/templates/forks/forks_data.html:28
+#: rhodecode/templates/base/base.html:254
+#: rhodecode/templates/forks/forks_data.html:30
 msgid "Compare fork"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:255
-#: rhodecode/templates/base/base.html:397
-#: rhodecode/templates/search/search.html:64
-msgid "Search"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:259
-msgid "Unlock"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:261
+msgid "Unlock"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:263
 msgid "Lock"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:266
+#: rhodecode/templates/base/base.html:268
 #: rhodecode/templates/data_table/_dt_elements.html:27
 #: rhodecode/templates/data_table/_dt_elements.html:28
-#: rhodecode/templates/forks/forks_data.html:7
+#: rhodecode/templates/forks/forks_data.html:8
 #: rhodecode/templates/summary/components.html:103
 msgid "Fork"
 msgid_plural "Forks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/base/base.html:267
+#: rhodecode/templates/base/base.html:269
 msgid "Create Pull Request"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:289
+#: rhodecode/templates/base/base.html:291
 msgid "Sign in"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:297
+#: rhodecode/templates/base/base.html:299
 #: rhodecode/templates/debug_style/login.html:28
 msgid "Sign in to your account"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:313
+#: rhodecode/templates/base/base.html:315
 #: rhodecode/templates/debug_style/login.html:46
 msgid "(Forgot password?)"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:322
+#: rhodecode/templates/base/base.html:324
 #: rhodecode/templates/debug_style/login.html:56
 msgid "Don't have an account ?"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:343
+#: rhodecode/templates/base/base.html:345
 msgid "Sign Out"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:379
+#: rhodecode/templates/base/base.html:381
 msgid "Show activity journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:380
+#: rhodecode/templates/base/base.html:382
 #: rhodecode/templates/journal/journal.html:4
 #: rhodecode/templates/journal/journal.html:14
 msgid "Journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:385
+#: rhodecode/templates/base/base.html:387
 msgid "Show Public activity journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:386
+#: rhodecode/templates/base/base.html:388
 msgid "Public journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:391
+#: rhodecode/templates/base/base.html:393
 msgid "Show Gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:392
+#: rhodecode/templates/base/base.html:394
 msgid "Gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:396
+#: rhodecode/templates/base/base.html:398
 msgid "Search in repositories you have access to"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:402
+#: rhodecode/templates/base/base.html:404
 msgid "Admin settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:409
+#: rhodecode/templates/base/base.html:411
 msgid "Delegated Admin settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:419
-#: rhodecode/templates/base/base.html:420
+#: rhodecode/templates/base/base.html:421
+#: rhodecode/templates/base/base.html:422
 #: rhodecode/templates/debug_style/buttons.html:5
 #: rhodecode/templates/debug_style/code-block.html:6
 #: rhodecode/templates/debug_style/collapsable-content.html:5
 #: rhodecode/templates/debug_style/form-elements-small.html:5
 #: rhodecode/templates/debug_style/form-elements.html:5
 #: rhodecode/templates/debug_style/form-inline.html:5
 #: rhodecode/templates/debug_style/form-vertical.html:5
 #: rhodecode/templates/debug_style/forms.html:5
 #: rhodecode/templates/debug_style/icons.html:5
 #: rhodecode/templates/debug_style/index.html:12
 #: rhodecode/templates/debug_style/labels.html:5
 #: rhodecode/templates/debug_style/layout-form-sidebar.html:5
 #: rhodecode/templates/debug_style/login.html:6
 #: rhodecode/templates/debug_style/panels.html:5
 #: rhodecode/templates/debug_style/tables-wide.html:5
 #: rhodecode/templates/debug_style/tables.html:5
 #: rhodecode/templates/debug_style/typography.html:5
 msgid "Style"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:474
+#: rhodecode/templates/base/base.html:479
 msgid "Go to"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:585
+#: rhodecode/templates/base/base.html:590
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:593
+#: rhodecode/templates/base/base.html:598
 msgid "Site-wide shortcuts"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.html:14
 msgid "Inherited Permissions"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.html:15
 msgid "Custom Permissions"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.html:17
 msgid "Default Global Permissions"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.html:23
 msgid "The following options configure the default permissions each user or group will inherit. You can override these permissions for each individual user or user group using individual permissions settings."
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.html:27
 msgid "Repository Creation"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.html:32
 msgid "Permission to create root level repositories. When disabled, users can still create repositories inside their own repository groups."
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.html:37
 msgid "Repository Creation With Group Write Access"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.html:42
 msgid "Write permission given on a repository group will allow creating repositories inside that group."
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.html:47
 msgid "Repository Forking"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.html:52
 msgid "Permission to create root level repository forks. When disabled, users can still fork repositories inside their own repository groups."
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.html:57
 msgid "Repository Group Creation"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.html:62
 msgid "Permission to create root level repository groups. When disabled, repository group admins can still create repository subgroups within their repository groups."
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.html:67
 msgid "User Group Creation"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.html:72
 msgid "Permission to allow user group creation. When disabled, user group admins can still create subgroups within their user groups."
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.html:78
 msgid "Inherit Permissions From The Default User"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.html:83
 msgid "Inherit default permissions from the default user. Turn off this option to force explicit permissions for users, even if they are more restrictive than the default user permissions."
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.html:102
 msgid "Inherit from default settings"
 msgstr ""
 
 #: rhodecode/templates/base/default_perms_box.html:107
 #, python-format
 msgid ""
 "Select to inherit permissions from %s permissions settings, including default IP address whitelist and inheritance of \n"
 "permission by members of user groups."
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.html:22
 msgid "Read more"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.html:92
 msgid "New Entry"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.html:96
 msgid "Confirm to remove this pattern:"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.html:192
 #: rhodecode/templates/changeset/changeset_file_comment.html:144
 #: rhodecode/templates/changeset/changeset_file_comment.html:291
 #: rhodecode/templates/files/files_add.html:78
 #: rhodecode/templates/files/files_add.html:224
 #: rhodecode/templates/files/files_edit.html:82
 #: rhodecode/templates/files/files_edit.html:185
 msgid "Preview"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.html:193
 msgid "Test Pattern Preview"
 msgstr ""
 
+#: rhodecode/templates/base/perms_summary.html:18
+msgid "show"
+msgstr ""
+
 #: rhodecode/templates/base/perms_summary.html:19
-msgid "show"
+msgid "none"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.html:20
-msgid "none"
+msgid "read"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.html:21
-msgid "read"
+msgid "write"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.html:22
-msgid "write"
-msgstr ""
-
-#: rhodecode/templates/base/perms_summary.html:23
 msgid "admin"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.html:30
+#: rhodecode/templates/base/perms_summary.html:29
 msgid "No permissions defined"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.html:38
-#: rhodecode/templates/base/perms_summary.html:104
+#: rhodecode/templates/base/perms_summary.html:37
+#: rhodecode/templates/base/perms_summary.html:103
 msgid "Permission"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.html:40
-#: rhodecode/templates/base/perms_summary.html:106
+#: rhodecode/templates/base/perms_summary.html:39
+#: rhodecode/templates/base/perms_summary.html:105
 msgid "Edit Permission"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.html:86
+#: rhodecode/templates/base/perms_summary.html:85
 msgid "Super admin"
 msgstr ""
 
+#: rhodecode/templates/base/perms_summary.html:87
+msgid "Repository default permission"
+msgstr ""
+
 #: rhodecode/templates/base/perms_summary.html:88
-msgid "Repository default permission"
+msgid "Repository group default permission"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.html:89
-msgid "Repository group default permission"
-msgstr ""
-
-#: rhodecode/templates/base/perms_summary.html:90
 msgid "User group default permission"
 msgstr ""
 
+#: rhodecode/templates/base/perms_summary.html:91
+msgid "Create repositories"
+msgstr ""
+
 #: rhodecode/templates/base/perms_summary.html:92
-msgid "Create repositories"
+msgid "Fork repositories"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.html:93
-msgid "Fork repositories"
+msgid "Create repository groups"
 msgstr ""
 
 #: rhodecode/templates/base/perms_summary.html:94
-msgid "Create repository groups"
-msgstr ""
-
-#: rhodecode/templates/base/perms_summary.html:95
 msgid "Create user groups"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.html:155
+#: rhodecode/templates/base/perms_summary.html:162
 msgid "No permission defined"
 msgstr ""
 
-#: rhodecode/templates/base/root.html:150
+#: rhodecode/templates/base/root.html:151
 msgid "Please enable JavaScript to use RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/templates/base/social_buttons.html:6
-msgid "Sign in with"
-msgstr ""
-
-#: rhodecode/templates/base/social_buttons.html:8
-msgid "Connect with"
-msgstr ""
-
 #: rhodecode/templates/base/vcs_settings.html:16
 msgid "Require SSL for vcs operations"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:19
 msgid "Activate to set RhodeCode to require SSL for pushing or pulling. If SSL certificate is missing it will return a HTTP Error 406: Not Acceptable."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:29
 msgid "Main Storage Location"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:37
 msgid "Click to unlock. You must restart RhodeCode in order to make this setting take effect."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:41
 msgid "Repository location change is disabled. You can enable this by changing the `allow_repo_location_change` inside .ini file."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:48
 msgid "Filesystem location where repositories should be stored. After changing this value a restart and rescan of the repository folder are required."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:57
 msgid "Internal Hooks"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:63
 msgid "Show repository size after push"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:67
 msgid "Trigger a hook that calculates repository size after each push."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:71
 msgid "Execute pre/post push hooks"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:74
 msgid "Execute Built in pre/post push hooks. This also executes rcextensions hooks."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:78
 msgid "Execute pre/post pull hooks"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:81
 msgid "Execute Built in pre/post pull hooks. This also executes rcextensions hooks."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:91
 msgid "Mercurial Settings"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:96
 msgid "Enable largefiles extension"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:99
 msgid "Enable Largefiles extensions for all repositories."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:103
 msgid "Set repositories as publishing"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:103
 msgid "Set repository as publishing"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:106
 msgid "When this is enabled all commits in the repository are seen as public commits by clients."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:111
 msgid "Enable hgsubversion extension"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:114
 msgid "Requires hgsubversion library to be installed. Allows cloning remote SVN repositories and migrates them to Mercurial type."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:124
 msgid "Subversion Settings"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:129
 msgid "Repository patterns"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:133
 msgid "Patterns for identifying SVN branches and tags. For recursive search, use \"*\". Eg.: \"/branches/*\""
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:196
 msgid "Pull Request Settings"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:201
 msgid "Enable server-side merge for pull requests"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:204
 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.html:208
 msgid "Invalidate and relocate inline comments during update"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.html:211
 msgid "During the update of a pull request, the position of inline comments will be updated and outdated inline comments will be hidden."
 msgstr ""
 
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
 msgstr ""
 
 #: rhodecode/templates/bookmarks/bookmarks.html:13
 msgid "bookmarks"
 msgstr ""
 
 #: rhodecode/templates/bookmarks/bookmarks.html:31
 msgid "Compare Selected Bookmarks"
 msgstr ""
 
 #: rhodecode/templates/bookmarks/bookmarks_data.html:13
 #: rhodecode/templates/changelog/changelog.html:180
 #: rhodecode/templates/changelog/changelog_summary_data.html:53
 #: rhodecode/templates/changeset/changeset.html:92
 #: rhodecode/templates/files/base.html:10
 #, python-format
 msgid "Bookmark %s"
 msgstr ""
 
 #: rhodecode/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
 msgstr ""
 
 #: rhodecode/templates/branches/branches.html:13
 msgid "branches"
 msgstr ""
 
 #: rhodecode/templates/branches/branches.html:31
 msgid "Compare Selected Branches"
 msgstr ""
 
 #: rhodecode/templates/branches/branches_data.html:12
 #: rhodecode/templates/changelog/changelog.html:172
 #: rhodecode/templates/changelog/changelog_summary_data.html:67
 #: rhodecode/templates/changeset/changeset.html:105
 #: rhodecode/templates/files/base.html:23
 #, python-format
 msgid "Branch %s"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:6
 #, python-format
 msgid "%s Changelog"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:19
 #, python-format
 msgid "showing %d out of %d commit"
 msgid_plural "showing %d out of %d commits"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/changelog/changelog.html:41
-#: rhodecode/templates/forks/forks_data.html:26
+#: rhodecode/templates/forks/forks_data.html:28
 #, python-format
 msgid "Compare fork with %s"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:53
 #, python-format
 msgid "Compare fork with Parent (%s)"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:62
 msgid "Open new pull request"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:68
 #: rhodecode/templates/changelog/changelog.html:69
 msgid "Clear selection"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:83
 msgid "Clear filter"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:103
 #: rhodecode/templates/changelog/changelog_summary_data.html:9
-#: rhodecode/templates/search/search_commit.html:9
 msgid "Age"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:105
 #: rhodecode/templates/files/files_add.html:93
 #: rhodecode/templates/files/files_delete.html:60
 #: rhodecode/templates/files/files_edit.html:96
 msgid "Commit Message"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:108
 #: rhodecode/templates/changelog/changelog_summary_data.html:11
 msgid "Refs"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:122
 #: rhodecode/templates/changelog/changelog_summary_data.html:22
 #, python-format
 msgid ""
 "Commit status: %s\n"
 "Click to open associated pull request #%s"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:126
 #, python-format
 msgid "Commit status: %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:141
-#: rhodecode/templates/compare/compare_cs.html:47
-#: rhodecode/templates/search/search_commit.html:30
-msgid "Expand commit message"
-msgstr ""
-
 #: rhodecode/templates/changelog/changelog.html:162
 #: rhodecode/templates/changelog/changelog_summary_data.html:33
 msgid "Commit has comments"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:188
 #: rhodecode/templates/changelog/changelog_summary_data.html:60
 #: rhodecode/templates/changeset/changeset.html:99
 #: rhodecode/templates/files/base.html:17
 #: rhodecode/templates/tags/tags_data.html:12
 #, python-format
 msgid "Tag %s"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:338
 msgid "Filter changelog"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog.html:411
 msgid "There are no changes yet"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:4
 #: rhodecode/templates/pullrequests/pullrequest_show.html:358
 msgid "Removed"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:5
 msgid "Changed"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:6
 msgid "Added"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:8
 #: rhodecode/templates/changelog/changelog_details.html:9
 #: rhodecode/templates/changelog/changelog_details.html:10
 #, python-format
 msgid "Affected %s files"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_file_history.html:20
 #: rhodecode/templates/changeset/changeset.html:86
 #: rhodecode/templates/files/base.html:4
 msgid "merge"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_file_history.html:39
 #: rhodecode/templates/changeset/diff_block.html:65
 #: rhodecode/templates/changeset/diff_block.html:70
 msgid "Show File"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:8
 #: rhodecode/templates/search/search_commit.html:8
 msgid "Commit message"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:91
 msgid "Add or upload files directly via RhodeCode:"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:94
 #: rhodecode/templates/files/files_browser.html:25
 msgid "Add New File"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:102
 msgid "Push new repo:"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_summary_data.html:113
 msgid "Existing repository?"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:7
 #, python-format
 msgid "%s Commit"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:43
 msgid "Parent Commit"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:43
 msgid "Parent"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:47
 msgid "Child Commit"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:47
 msgid "Child"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:58
 msgid "Expand"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:66
 #: rhodecode/templates/changeset/changeset.html:72
 #: rhodecode/templates/changeset/changeset_file_comment.html:36
 #: rhodecode/templates/changeset/changeset_file_comment.html:90
 msgid "Commit status"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:79
 #: rhodecode/templates/files/file_tree_detail.html:21
 #: rhodecode/templates/files/files_detail.html:20
 msgid "References"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:115
 msgid "Diffs"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:119
 #: rhodecode/templates/changeset/diff_block.html:85
 msgid "Raw diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:120
 #: rhodecode/templates/changeset/diff_block.html:86
 msgid "Raw Diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:123
 msgid "Patch diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:124
 msgid "Patch Diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:127
 #: rhodecode/templates/changeset/diff_block.html:90
 msgid "Download diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:128
 #: rhodecode/templates/changeset/diff_block.html:91
 msgid "Download Diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:145
 #: rhodecode/templates/changeset/changeset.html:147
 #: rhodecode/tests/functional/test_changeset_comments.py:217
 #, python-format
 msgid "%d Commit comment"
 msgid_plural "%d Commit comments"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/changeset/changeset.html:151
 #: rhodecode/templates/changeset/changeset.html:153
 #: rhodecode/templates/pullrequests/pullrequest_show.html:145
 #: rhodecode/templates/pullrequests/pullrequest_show.html:147
 #: rhodecode/tests/functional/test_changeset_comments.py:224
 #, python-format
 msgid "%d Inline Comment"
 msgid_plural "%d Inline Comments"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/changeset/changeset.html:177
 msgid "Browse files at current commit"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:177
 msgid "Browse files"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:179
 #: rhodecode/templates/changeset/changeset_range.html:59
 #: rhodecode/templates/compare/compare_diff.html:255
 #: rhodecode/templates/files/file_diff.html:77
 #: rhodecode/templates/pullrequests/pullrequest_show.html:265
 msgid "Expand All"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:179
 #: rhodecode/templates/changeset/changeset_range.html:59
 #: rhodecode/templates/compare/compare_diff.html:255
 #: rhodecode/templates/files/file_diff.html:77
 #: rhodecode/templates/pullrequests/pullrequest_show.html:265
 msgid "Collapse All"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:190
 #: rhodecode/templates/compare/compare_diff.html:263
 #: rhodecode/templates/pullrequests/pullrequest_show.html:274
 msgid "No files"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:227
 #: rhodecode/templates/files/file_diff.html:128
 msgid "Show comments"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:228
 #: rhodecode/templates/files/file_diff.html:129
 msgid "Hide comments"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:245
 #: rhodecode/templates/changeset/diff_block.html:25
 #: rhodecode/templates/changeset/diff_block.html:46
 #: rhodecode/templates/files/file_diff.html:146
 msgid "Diff was truncated. File content available only in full diff."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:245
 #: rhodecode/templates/changeset/diff_block.html:7
 #: rhodecode/templates/changeset/diff_block.html:10
 #: rhodecode/templates/changeset/diff_block.html:25
 #: rhodecode/templates/changeset/diff_block.html:46
 #: rhodecode/templates/changeset/diff_block.html:59
 #: rhodecode/templates/files/file_diff.html:146
 msgid "Showing a big diff might take some time and resources, continue?"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:245
 #: rhodecode/templates/changeset/diff_block.html:7
 #: rhodecode/templates/changeset/diff_block.html:10
 #: rhodecode/templates/changeset/diff_block.html:25
 #: rhodecode/templates/changeset/diff_block.html:46
 #: rhodecode/templates/files/file_diff.html:146
 #: rhodecode/templates/pullrequests/pullrequest_show.html:386
 #: rhodecode/templates/pullrequests/pullrequest_show.html:392
 msgid "Show full diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:314
 msgid "No Child Commits"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:350
 msgid "No Parent Commits"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:21
 #, python-format
 msgid "Vote on pull request #%s"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:23
 #, python-format
 msgid "Comment on pull request #%s"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:28
 msgid "Status change on commit"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:30
 msgid "Comment on commit"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:58
 msgid "Previous comment"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:62
 msgid "Next comment"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:118
 msgid "Create a comment on line {1}."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:121
 #: rhodecode/templates/changeset/changeset_file_comment.html:251
 #, python-format
 msgid "Comments parsed using %s syntax with %s support."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:123
 #: rhodecode/templates/changeset/changeset_file_comment.html:253
 msgid "Use @username inside this text to send notification to this RhodeCode user"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:133
 #: rhodecode/templates/changeset/changeset_file_comment.html:264
 msgid "Comment preview"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:146
 #: rhodecode/templates/changeset/changeset_file_comment.html:293
 #: rhodecode/templates/compare/compare_diff.html:57
 msgid "Comment"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:154
 msgid "You need to be logged in to comment."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:154
 msgid "Login now"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:158
 msgid "Hide"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:171
 #, python-format
 msgid "%d Pull Request Comment"
 msgid_plural "%d Pull Request Comments"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:173
 #, python-format
 msgid "%d Commit Comment"
 msgid_plural "%d Commit Comments"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:223
 msgid "Merge Pull Request"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:243
 msgid "Create a comment on this Pull Request."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:245
 msgid "Create comments on this Commit range."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:247
 msgid "Create a comment on this Commit."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.html:5
 #, python-format
 msgid "%s Commits"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.html:9
 #: rhodecode/templates/changeset/changeset_range.html:20
 #, python-format
 msgid "(%s commit)"
 msgid_plural "(%s commits)"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/changeset/changeset_range.html:16
 msgid "Commits"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.html:41
 msgid "Show combined compare"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.html:7
 msgid "The requested commit is too big and content was truncated."
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.html:10
 msgid "The requested file is too big and its content is not shown."
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.html:64
 #, python-format
 msgid "Show file at commit: %(commit_id)s"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.html:69
 #, python-format
 msgid "File no longer present at commit: %(commit_id)s"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.html:75
 msgid "Show full diff for this file"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.html:76
 msgid "Unified Diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.html:80
 msgid "Show full side-by-side diff for this file"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.html:81
 #: rhodecode/templates/files/diff_2way.html:40
 msgid "Side-by-side Diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.html:97
 #, python-format
 msgid "%(num)s file changed"
 msgid_plural "%(num)s files changed"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/changeset/diff_block.html:99
 #, python-format
 msgid "%(num)s file changed: %(linesadd)s inserted, %(linesdel)s deleted"
 msgid_plural "%(num)s files changed: %(linesadd)s inserted, %(linesdel)s deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/compare/compare_cs.html:5
+#: rhodecode/templates/compare/compare_commits.html:5
 msgid "No Commits"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_cs.html:9
+#: rhodecode/templates/compare/compare_commits.html:9
 msgid "Common Ancestor Commit"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_cs.html:20
+#: rhodecode/templates/compare/compare_commits.html:20
 msgid "Time"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.html:6
 #: rhodecode/templates/compare/compare_diff.html:8
 #, python-format
 msgid "%s Compare"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.html:16
 #, python-format
 msgid "%s commit"
 msgid_plural "%s commits"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/compare/compare_diff.html:37
 #: rhodecode/templates/compare/compare_diff.html:55
 msgid "Compare Commits"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.html:46
 #: rhodecode/templates/files/file_diff.html:56
 #: rhodecode/templates/pullrequests/pullrequest_show.html:85
 msgid "Target"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.html:47
 #: rhodecode/templates/files/file_diff.html:62
 #: rhodecode/templates/files/files_source.html:18
 msgid "Source"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.html:53
 msgid "Swap"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.html:245
 msgid "Compare commits, branches, bookmarks or tags."
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:49
 msgid "Mercurial repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:51
 msgid "Git repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:53
 msgid "Subversion repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:60
 msgid "Public repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:70
 msgid "Repository creating in progress..."
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:84
 msgid "No commits yet"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:91
 #: rhodecode/templates/data_table/_dt_elements.html:93
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:99
 #: rhodecode/templates/data_table/_dt_elements.html:101
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:127
 msgid "Creating"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:129
 msgid "Created"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:175
 #, python-format
 msgid "Confirm to delete this group: %s with %s repository"
 msgid_plural "Confirm to delete this group: %s with %s repositories"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:201
 #, python-format
 msgid "Confirm to delete this user group: %s"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:218
 msgid "User group"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:262
 #: rhodecode/templates/forks/fork.html:81
 msgid "Private"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:287
 #, python-format
 msgid "Pull request #%(pr_number)s"
 msgstr ""
 
 #: rhodecode/templates/debug_style/buttons.html:131
 msgid "Confirm to remove this field: Field"
 msgstr ""
 
 #: rhodecode/templates/debug_style/form-elements.html:107
 msgid "Default"
 msgstr ""
 
+#: rhodecode/templates/debug_style/form-elements.html:535
+#: rhodecode/templates/debug_style/form-elements.html:585
+#: rhodecode/templates/debug_style/forms.html:250
+msgid "Available members"
+msgstr ""
+
 #: rhodecode/templates/debug_style/forms.html:119
 msgid "Some text..."
 msgstr ""
 
 #: rhodecode/templates/debug_style/forms.html:122
 #: rhodecode/templates/debug_style/forms.html:255
 msgid "Variable Item"
 msgstr ""
 
 #: rhodecode/templates/debug_style/forms.html:252
 msgid "Some example text..."
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:5
 msgid "Debug Style"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:54
 msgid "Index"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:55
 msgid "Typography"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:56
 msgid "Forms"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:57
 msgid "Buttons"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:58
 msgid "Labels"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:59
 msgid "Tables"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:60
 msgid "Tables wide"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:61
 msgid "Collapsable Content"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:63
 msgid "Layout form with sidebar"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:64
 msgid "Login"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:65
 msgid "Login 2"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:66
 msgid "Code blocks"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:69
 msgid "Panels"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:72
 msgid "Form elements"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:73
 msgid "Form elements small"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:74
 msgid "Form inline elements"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:75
 msgid "Form vertical"
 msgstr ""
 
 #: rhodecode/templates/email_templates/base.mako:16
 #, python-format
 msgid "This is a notification from RhodeCode. %(instance_url)s"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:5
 #: rhodecode/templates/email_templates/pull_request_comment.mako:5
 msgid "[mention]"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:5
 #, python-format
 msgid "%(user)s commented on commit of %(repo_name)s"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:14
 #: rhodecode/templates/email_templates/commit_comment.mako:41
 #: rhodecode/templates/email_templates/pull_request_comment.mako:15
 #: rhodecode/templates/email_templates/pull_request_comment.mako:51
 msgid "Comment link"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:19
 #: rhodecode/templates/email_templates/commit_comment.mako:43
 #: rhodecode/templates/email_templates/pull_request_comment.mako:20
 #: rhodecode/templates/email_templates/pull_request_comment.mako:54
 #, python-format
 msgid "File: %(comment_file)s on line %(comment_line)s"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:28
 #: rhodecode/templates/email_templates/commit_comment.mako:56
 msgid "Commit status was changed to"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:35
 #, python-format
 msgid "%(user)s commented on a file in commit of %(repo_url)s."
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:37
 #, python-format
 msgid "%(user)s commented on a commit of %(repo_url)s."
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:47
 #: rhodecode/templates/files/files_detail.html:5
 #: rhodecode/templates/files/files_detail.html:12
 msgid "Commit Description"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:5
 #, python-format
 msgid "%(user)s commented on pull request #%(pr_id)s: \"%(pr_title)s\""
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:17
 #: rhodecode/templates/email_templates/pull_request_comment.mako:52
 msgid "Source repository"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:29
 #: rhodecode/templates/email_templates/pull_request_comment.mako:63
 msgid "Pull request status was changed to"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:31
 #: rhodecode/templates/email_templates/pull_request_comment.mako:65
 msgid "Pull request was closed with status"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:37
 #, python-format
 msgid "%(user)s commented on a file on pull request #%(pr_id)s: \"%(pr_title)s\"."
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:43
 #, python-format
 msgid "%(user)s commented on a pull request #%(pr_id)s \"%(pr_title)s\"."
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:5
 #, python-format
 msgid "%(user)s wants you to review pull request #%(pr_url)s: \"%(pr_title)s\""
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:17
 #: rhodecode/templates/email_templates/pull_request_review.mako:54
 #, python-format
 msgid "Pull request from %(source_ref_type)s:%(source_ref_name)s of %(repo_url)s into %(target_ref_type)s:%(target_ref_name)s"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:26
 #: rhodecode/templates/email_templates/pull_request_review.mako:63
 msgid "Link"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:35
 #: rhodecode/templates/email_templates/pull_request_review.mako:72
 #, python-format
 msgid "Commit (%(num)s)"
 msgid_plural "Commits (%(num)s)"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:47
 #, python-format
 msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"."
 msgstr ""
 
 #: rhodecode/templates/email_templates/test.mako:5
 msgid "hello \"world\""
 msgstr ""
 
 #: rhodecode/templates/email_templates/test.mako:21
 msgid "Translation"
 msgstr ""
 
 #: rhodecode/templates/errors/error_document.html:39
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr ""
 
 #: rhodecode/templates/feed/atom_feed_entry.mako:3
 #, python-format
 msgid "%(user)s commited on %(date)s UTC"
 msgstr ""
 
 #: rhodecode/templates/feed/atom_feed_entry.mako:26
 #: rhodecode/templates/pullrequests/pullrequest_show.html:386
 #: rhodecode/templates/pullrequests/pullrequest_show.html:392
 msgid "Commit was too big and was cut off..."
 msgstr ""
 
 #: rhodecode/templates/files/diff_2way.html:15
 #, python-format
 msgid "%s File side-by-side diff"
 msgstr ""
 
 #: rhodecode/templates/files/diff_2way.html:79
 msgid "Enable editor mode"
 msgstr ""
 
 #: rhodecode/templates/files/diff_2way.html:80
 msgid "Disable editor mode"
 msgstr ""
 
 #: rhodecode/templates/files/diff_2way.html:84
 msgid "Previous change"
 msgstr ""
 
 #: rhodecode/templates/files/diff_2way.html:85
 msgid "Next change"
 msgstr ""
 
 #: rhodecode/templates/files/diff_2way.html:100
 msgid "mode"
 msgstr ""
 
 #: rhodecode/templates/files/file_authors_box.html:6
 msgid "Last Author"
 msgstr ""
 
 #: rhodecode/templates/files/file_authors_box.html:8
 #, python-format
 msgid "File Author (%s)"
 msgid_plural "File Authors (%s)"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/files/file_authors_box.html:11
 msgid "Show All"
 msgstr ""
 
 #: rhodecode/templates/files/file_authors_box.html:26
 msgid "last author"
 msgstr ""
 
 #: rhodecode/templates/files/file_diff.html:4
 #, python-format
 msgid "%s File Diff"
 msgstr ""
 
 #: rhodecode/templates/files/file_diff.html:37
 msgid "for"
 msgstr ""
 
 #: rhodecode/templates/files/file_diff.html:53
 msgid "No commits"
 msgstr ""
 
 #: rhodecode/templates/files/file_diff.html:81
 msgid "Cannot diff binary files"
 msgstr ""
 
 #: rhodecode/templates/files/file_diff.html:83
 msgid "File was not changed in this commit range"
 msgstr ""
 
 #: rhodecode/templates/files/file_tree_author_box.html:5
 msgid "Commit Author"
 msgstr ""
 
 #: rhodecode/templates/files/files.html:4
 #: rhodecode/templates/files/files_pjax.html:2
 #, python-format
 msgid "%s Files"
 msgstr ""
 
 #: rhodecode/templates/files/files.html:143
 msgid "Switch To Commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:4
 #, python-format
 msgid "%s Files Add"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:15
 msgid "Add new file"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:34
 #: rhodecode/templates/files/files_delete.html:34
 #: rhodecode/templates/files/files_edit.html:34
 msgid "Path"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:39
 msgid "Specify Custom Path"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:44
 msgid "Remove Custom Path"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:50
 msgid "Filename"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:54
 #: rhodecode/templates/files/files_add.html:65
 msgid "or"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:54
 msgid "Upload File"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:59
 msgid "Upload file"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:63
 msgid "No file selected"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:65
 msgid "Create New File"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:75
 #: rhodecode/templates/files/files_edit.html:79
 msgid "line wraps"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:76
 #: rhodecode/templates/files/files_edit.html:80
 msgid "on"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:76
 #: rhodecode/templates/files/files_edit.html:80
 msgid "off"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:103
 #: rhodecode/templates/files/files_edit.html:106
 msgid "Commit changes"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:9
 msgid "Previous commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:13
 msgid "Next commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:19
 msgid "Search File List"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:22
 msgid "Close File List"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:27
 msgid "Add File"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:34
 msgid "Loading file list..."
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:50
 msgid "Size"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:51
 msgid "Modified"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:52
 msgid "Last Commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:89
 msgid "Loading..."
 msgstr ""
 
 #: rhodecode/templates/files/files_delete.html:4
 #, python-format
 msgid "%s Files Delete"
 msgstr ""
 
 #: rhodecode/templates/files/files_delete.html:15
 msgid "Delete file"
 msgstr ""
 
 #: rhodecode/templates/files/files_delete.html:45
 #: rhodecode/templates/files/files_source.html:49
 #, python-format
 msgid "Binary file (%s)"
 msgstr ""
 
 #: rhodecode/templates/files/files_delete.html:50
 #: rhodecode/templates/files/files_source.html:61
 msgid "File is too big to display"
 msgstr ""
 
 #: rhodecode/templates/files/files_delete.html:70
 msgid "Delete File"
 msgstr ""
 
 #: rhodecode/templates/files/files_detail.html:35
 msgid "File last commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_detail.html:54
 msgid "Diff to Commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_detail.html:55
 msgid "Show at Commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:4
 #, python-format
 msgid "%s File Edit"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:15
 msgid "Edit file"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:55
 msgid "history"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:61
 msgid "source"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:63
 #: rhodecode/templates/files/files_pjax.html:19
 msgid "annotation"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:65
 msgid "raw"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:67
 msgid "download"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:74
 msgid "Editing file"
 msgstr ""
 
 #: rhodecode/templates/files/files_pjax.html:17
 msgid "Location"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.html:6
-#: rhodecode/templates/search/search_content.html:20
+#: rhodecode/templates/search/search_content.html:57
 msgid "line"
 msgid_plural "lines"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/files/files_source.html:12
 msgid "History"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.html:15
-#: rhodecode/templates/search/search_content.html:31
+#: rhodecode/templates/search/search_content.html:68
 msgid "Show Full History"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.html:20
-#: rhodecode/templates/search/search_content.html:33
+#: rhodecode/templates/search/search_content.html:70
 msgid "Annotation"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.html:22
-#: rhodecode/templates/search/search_content.html:34
+#: rhodecode/templates/search/search_content.html:71
 msgid "Raw"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.html:24
-#: rhodecode/templates/search/search_content.html:36
+#: rhodecode/templates/search/search_content.html:73
 msgid "Download"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.html:31
 #, python-format
 msgid "Edit on Branch:%s"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.html:36
 msgid "Editing binary files not allowed"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.html:39
 msgid "Editing files allowed only when on branch head commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_source.html:40
 msgid "Deleting files allowed only when on branch head commit"
 msgstr ""
 
 #: rhodecode/templates/followers/followers.html:5
 #: rhodecode/templates/followers/followers.html:27
 #, python-format
 msgid "%s Followers"
 msgstr ""
 
 #: rhodecode/templates/followers/followers.html:12
 msgid "Followers"
 msgstr ""
 
 #: rhodecode/templates/followers/followers_data.html:5
 msgid "Follower Name"
 msgstr ""
 
 #: rhodecode/templates/followers/followers_data.html:6
 msgid "Following Since"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.html:5
 #, python-format
 msgid "Fork repository %s"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.html:12
 msgid "New Fork"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.html:37
 msgid "Fork name"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.html:91
 msgid "Copy permissions"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.html:95
 msgid "Copy permissions from forked repository"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.html:100
 msgid "Fork this Repository"
 msgstr ""
 
 #: rhodecode/templates/forks/forks.html:5
 #, python-format
 msgid "%s Forks"
 msgstr ""
 
 #: rhodecode/templates/forks/forks.html:12
 msgid "Forks"
 msgstr ""
 
 #: rhodecode/templates/forks/forks.html:32
 msgid "Create new fork"
 msgstr ""
 
-#: rhodecode/templates/forks/forks_data.html:9
+#: rhodecode/templates/forks/forks_data.html:10
 msgid "Forked"
 msgstr ""
 
-#: rhodecode/templates/forks/forks_data.html:46
+#: rhodecode/templates/forks/forks_data.html:48
 msgid "There are no forks yet"
 msgstr ""
 
 #: rhodecode/templates/journal/journal.html:13
 msgid "Filter"
 msgstr ""
 
 #: rhodecode/templates/journal/journal.html:23
 msgid "ATOM journal feed"
 msgstr ""
 
 #: rhodecode/templates/journal/journal.html:24
 msgid "RSS journal feed"
 msgstr ""
 
 #: rhodecode/templates/journal/journal_data.html:53
 msgid "No entries yet"
 msgstr ""
 
 #: rhodecode/templates/journal/public_journal.html:4
 #: rhodecode/templates/journal/public_journal.html:24
 msgid "Public Journal"
 msgstr ""
 
 #: rhodecode/templates/journal/public_journal.html:16
 msgid "ATOM public journal feed"
 msgstr ""
 
 #: rhodecode/templates/journal/public_journal.html:17
 msgid "RSS public journal feed"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:4
 #: rhodecode/templates/pullrequests/pullrequest.html:8
 msgid "New pull request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:52
 msgid "Write a short description on this pull request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:59
 msgid "Commit flow"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:67
 msgid "Origin repository"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:85
 msgid "Loading refs..."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:96
 msgid "Submit Pull Request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:109
 #: rhodecode/templates/pullrequests/pullrequest_show.html:182
 msgid "Pull request reviewers"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.html:117
 #: rhodecode/templates/pullrequests/pullrequest_show.html:215
 msgid "Add reviewer"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:278
-#: rhodecode/templates/pullrequests/pullrequest.html:520
+#: rhodecode/templates/pullrequests/pullrequest.html:279
+#: rhodecode/templates/pullrequests/pullrequest.html:521
 msgid "Please select origin and destination"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:284
+#: rhodecode/templates/pullrequests/pullrequest.html:285
 msgid "Loading compare ..."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:331
-#: rhodecode/templates/pullrequests/pullrequest.html:333
+#: rhodecode/templates/pullrequests/pullrequest.html:332
+#: rhodecode/templates/pullrequests/pullrequest.html:334
 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.html:336
+#: rhodecode/templates/pullrequests/pullrequest.html:337
 msgid "Show detailed compare."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:343
+#: rhodecode/templates/pullrequests/pullrequest.html:344
 msgid "There are no commits to merge."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:450
+#: rhodecode/templates/pullrequests/pullrequest.html:451
 msgid "Destination repository"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:461
+#: rhodecode/templates/pullrequests/pullrequest.html:462
 msgid "Select commit reference"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:4
 #, python-format
 msgid "%s Pull Request #%s"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:48
 msgid "From"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:51
 #: rhodecode/templates/pullrequests/pullrequest_show.html:185
 msgid "Close"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:58
 msgid "Origin"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:105
 msgid "Review"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:116
 #, python-format
 msgid "calculated based on %s reviewer vote"
 msgid_plural "calculated based on %s reviewers votes"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:139
 #: rhodecode/templates/pullrequests/pullrequest_show.html:141
 #, python-format
 msgid "%d Pull request comment"
 msgid_plural "%d Pull request comments"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:151
 #, python-format
 msgid "%d Outdated Comment"
 msgid_plural "%d Outdated Comments"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:151
 msgid "(Show)"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:160
 #: rhodecode/templates/pullrequests/pullrequest_show.html:219
 msgid "Save Changes"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:200
+#: rhodecode/templates/pullrequests/pullrequest_show.html:199
 msgid "reviewer"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:236
 msgid "Missing requirements:"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:237
 msgid "These commits cannot be displayed, because this repository uses the Mercurial largefiles extension, which was not enabled."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:245
 msgid "Missing commits"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:246
 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.html:247
 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.html:254
 msgid "Update commits"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:257
 #, python-format
 msgid "Compare View: %s commit"
 msgid_plural "Compare View: %s commits"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:330
 #: rhodecode/templates/pullrequests/pullrequest_show.html:365
 msgid "Outdated Inline Comments"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:386
 #: rhodecode/templates/pullrequests/pullrequest_show.html:392
 msgid "Showing a huge diff might take some time and resources"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.html:4
 #, python-format
 msgid "%s Pull Requests"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.html:34
 msgid "Open new Pull Request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.html:48
 msgid "Opened"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.html:49
 msgid "Opened by me"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.html:50
+msgid "Awaiting review"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequests.html:51
 msgid "Awaiting my review"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequests.html:52
-msgid "Awaiting review"
-msgstr ""
-
 #: rhodecode/templates/pullrequests/pullrequests.html:53
 msgid "From this repo"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.html:62
 #, python-format
 msgid "Pull Requests from %(repo_name)s repository"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.html:64
 #, python-format
 msgid "Closed Pull Requests to repository %(repo_name)s"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.html:66
 #, python-format
 msgid "Pull Requests to %(repo_name)s repository opened by me"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.html:68
 #, python-format
 msgid "Pull Requests to %(repo_name)s repository awaiting review"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.html:70
 #, python-format
 msgid "Pull Requests to %(repo_name)s repository awaiting my review"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.html:72
 #, python-format
 msgid "Pull Requests to %(repo_name)s repository"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:6
 #: rhodecode/templates/search/search.html:17
 #, python-format
 msgid "Search inside repository %(repo_name)s"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:8
 #: rhodecode/templates/search/search.html:19
 msgid "Search inside all accessible repositories"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:60
 msgid "Search item"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:63
 msgid "File contents"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:63
 msgid "Commit messages"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:63
 msgid "File names"
 msgstr ""
 
+#: rhodecode/templates/search/search_commit.html:11
+msgid "Age (new first)"
+msgstr ""
+
+#: rhodecode/templates/search/search_commit.html:13
+msgid "Age (old first)"
+msgstr ""
+
+#: rhodecode/templates/search/search_content.html:33
+msgid "more matches in this file"
+msgstr ""
+
 #: rhodecode/templates/search/search_path.html:4
 msgid "File"
 msgstr ""
 
 #: rhodecode/templates/summary/base.html:5
 #, python-format
 msgid "%s Summary"
 msgstr ""
 
 #: rhodecode/templates/summary/base.html:13
 #, python-format
 msgid "%s ATOM feed"
 msgstr ""
 
 #: rhodecode/templates/summary/base.html:14
 #, python-format
 msgid "%s RSS feed"
 msgstr ""
 
 #: rhodecode/templates/summary/components.html:5
 #, python-format
 msgid "%(num)s Branch"
 msgid_plural "%(num)s Branches"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/summary/components.html:12
 #, python-format
 msgid "%(num)s Closed Branch"
 msgid_plural "%(num)s Closed Branches"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/summary/components.html:19
 #, python-format
 msgid "%(num)s Tag"
 msgid_plural "%(num)s Tags"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/summary/components.html:26
 #, python-format
 msgid "%(num)s Bookmark"
 msgid_plural "%(num)s Bookmarks"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/summary/components.html:49
 msgid "Read-only url"
 msgstr ""
 
 #: rhodecode/templates/summary/components.html:54
 #: rhodecode/templates/summary/components.html:65
 msgid "Show by Name"
 msgstr ""
 
 #: rhodecode/templates/summary/components.html:55
 #: rhodecode/templates/summary/components.html:66
 msgid "Show by ID"
 msgstr ""
 
 #: rhodecode/templates/summary/components.html:56
 msgid "SVN Protocol is disabled. To enable it, see the"
 msgstr ""
 
 #: rhodecode/templates/summary/components.html:56
 msgid "documentation here"
 msgstr ""
 
 #: rhodecode/templates/summary/components.html:60
 msgid "Clone url"
 msgstr ""
 
 #: rhodecode/templates/summary/components.html:86
 msgid "Information"
 msgstr ""
 
 #: rhodecode/templates/summary/components.html:95
 #: rhodecode/templates/summary/components.html:98
 #, python-format
 msgid "%(num)s Commit"
 msgid_plural "%(num)s Commits"
 msgstr[0] ""
 msgstr[1] ""
 
 #: rhodecode/templates/summary/components.html:102
 msgid "Number of Repository Forks"
 msgstr ""
 
 #: rhodecode/templates/summary/components.html:110
 msgid "Calculating Repository Size..."
 msgstr ""
 
 #: rhodecode/templates/summary/components.html:141
 msgid "Calculating Code Statistics..."
 msgstr ""
 
 #: rhodecode/templates/summary/components.html:145
 msgid "Statistics are disabled for this repository"
 msgstr ""
 
 #: rhodecode/templates/summary/components.html:148
 msgid "enable statistics"
 msgstr ""
 
 #: rhodecode/templates/summary/components.html:159
 msgid "Downloads"
 msgstr ""
 
 #: rhodecode/templates/summary/components.html:165
 msgid "There are no downloads yet"
 msgstr ""
 
 #: rhodecode/templates/summary/components.html:169
 msgid "Downloads are disabled for this repository"
 msgstr ""
 
 #: rhodecode/templates/summary/components.html:172
 msgid "enable downloads"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:17
 #: rhodecode/templates/summary/summary.html:19
 msgid "RSS Feed"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:35
 msgid "Quick start"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:48
 #, python-format
 msgid "Readme file from commit %s:%s"
 msgstr ""
 
 #: rhodecode/templates/tags/tags.html:5
 #, python-format
 msgid "%s Tags"
 msgstr ""
 
 #: rhodecode/templates/tags/tags.html:13
 msgid "tags"
 msgstr ""
 
 #: rhodecode/templates/tags/tags.html:31
 msgid "Compare Selected Tags"
 msgstr ""
 
 #: rhodecode/templates/users/user.html:29
 #: rhodecode/templates/users/user_profile.html:5
 msgid "Profile"
 msgstr ""
 
 #: rhodecode/templates/users/user_profile.html:35
 msgid "First name"
 msgstr ""
 
 #: rhodecode/templates/users/user_profile.html:43
 msgid "Last name"
 msgstr ""
 
 #: rhodecode/tests/lib/test_ext_json.py:162
 msgid "hello"
 msgstr ""
 
 #: rhodecode/tests/lib/test_ext_json.py:163
 msgid "singular"
 msgid_plural "plural"
 msgstr[0] ""
 msgstr[1] ""
 

rhodecode/interfaces.py

@@ -1,28 +1,43 b''
 # Copyright (C) 2016-2016  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 zope.interface import Attribute, Interface
 
 
 class IUserRegistered(Interface):
     """
     An event type that is emitted whenever a new user registers a user
     account.
     """
     user = Attribute('The user object.')
     session = Attribute('The session while processing the register form post.')
+
+
+class IUserPreCreate(Interface):
+    """
+    An event type that is emitted before a new user object is created.
+    """
+    user_data = Attribute('Data used to create the new user')
+
+
+class IUserPreUpdate(Interface):
+    """
+    An event type that is emitted before a user object is updated.
+    """
+    user = Attribute('The not yet updated user object')
+    user_data = Attribute('Data used to update the user')

rhodecode/lib/base.py

@@ -1,551 +1,551 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 """
 The base Controller API
 Provides the BaseController class for subclassing. And usage in different
 controllers
 """
 
 import logging
 import socket
 
 import ipaddress
 
 from paste.auth.basic import AuthBasicAuthenticator
 from paste.httpexceptions import HTTPUnauthorized, HTTPForbidden, get_exception
 from paste.httpheaders import WWW_AUTHENTICATE, AUTHORIZATION
 from pylons import config, tmpl_context as c, request, session, url
 from pylons.controllers import WSGIController
 from pylons.controllers.util import redirect
 from pylons.i18n import translation
 # marcink: don't remove this import
 from pylons.templating import render_mako as render  # noqa
 from pylons.i18n.translation import _
 from webob.exc import HTTPFound
 
 
 import rhodecode
 from rhodecode.authentication.base import VCS_TYPE
 from rhodecode.lib import auth, utils2
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import AuthUser, CookieStoreWrapper
 from rhodecode.lib.exceptions import UserCreationError
 from rhodecode.lib.utils import (
     get_repo_slug, set_rhodecode_config, password_changed,
     get_enabled_hook_classes)
 from rhodecode.lib.utils2 import (
     str2bool, safe_unicode, AttributeDict, safe_int, md5, aslist)
 from rhodecode.lib.vcs.exceptions import RepositoryRequirementError
 from rhodecode.model import meta
 from rhodecode.model.db import Repository, User
 from rhodecode.model.notification import NotificationModel
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.settings import VcsSettingsModel, SettingsModel
 
 
 log = logging.getLogger(__name__)
 
 
 def _filter_proxy(ip):
     """
     Passed in IP addresses in HEADERS can be in a special format of multiple
     ips. Those comma separated IPs are passed from various proxies in the
     chain of request processing. The left-most being the original client.
     We only care about the first IP which came from the org. client.
 
     :param ip: ip string from headers
     """
     if ',' in ip:
         _ips = ip.split(',')
         _first_ip = _ips[0].strip()
         log.debug('Got multiple IPs %s, using %s', ','.join(_ips), _first_ip)
         return _first_ip
     return ip
 
 
 def _filter_port(ip):
     """
     Removes a port from ip, there are 4 main cases to handle here.
     - ipv4 eg. 127.0.0.1
     - ipv6 eg. ::1
     - ipv4+port eg. 127.0.0.1:8080
     - ipv6+port eg. [::1]:8080
 
     :param ip:
     """
     def is_ipv6(ip_addr):
         if hasattr(socket, 'inet_pton'):
             try:
                 socket.inet_pton(socket.AF_INET6, ip_addr)
             except socket.error:
                 return False
         else:
             # fallback to ipaddress
             try:
                 ipaddress.IPv6Address(ip_addr)
             except Exception:
                 return False
         return True
 
     if ':' not in ip:  # must be ipv4 pure ip
         return ip
 
     if '[' in ip and ']' in ip:  # ipv6 with port
         return ip.split(']')[0][1:].lower()
 
     # must be ipv6 or ipv4 with port
     if is_ipv6(ip):
         return ip
     else:
         ip, _port = ip.split(':')[:2]  # means ipv4+port
         return ip
 
 
 def get_ip_addr(environ):
     proxy_key = 'HTTP_X_REAL_IP'
     proxy_key2 = 'HTTP_X_FORWARDED_FOR'
     def_key = 'REMOTE_ADDR'
     _filters = lambda x: _filter_port(_filter_proxy(x))
 
     ip = environ.get(proxy_key)
     if ip:
         return _filters(ip)
 
     ip = environ.get(proxy_key2)
     if ip:
         return _filters(ip)
 
     ip = environ.get(def_key, '0.0.0.0')
     return _filters(ip)
 
 
 def get_server_ip_addr(environ, log_errors=True):
     hostname = environ.get('SERVER_NAME')
     try:
         return socket.gethostbyname(hostname)
     except Exception as e:
         if log_errors:
             # in some cases this lookup is not possible, and we don't want to
             # make it an exception in logs
             log.exception('Could not retrieve server ip address: %s', e)
         return hostname
 
 
 def get_server_port(environ):
     return environ.get('SERVER_PORT')
 
 
 def get_access_path(environ):
     path = environ.get('PATH_INFO')
     org_req = environ.get('pylons.original_request')
     if org_req:
         path = org_req.environ.get('PATH_INFO')
     return path
 
 
 def vcs_operation_context(
         environ, repo_name, username, action, scm, check_locking=True):
     """
     Generate the context for a vcs operation, e.g. push or pull.
 
     This context is passed over the layers so that hooks triggered by the
     vcs operation know details like the user, the user's IP address etc.
 
     :param check_locking: Allows to switch of the computation of the locking
         data. This serves mainly the need of the simplevcs middleware to be
         able to disable this for certain operations.
 
     """
     # Tri-state value: False: unlock, None: nothing, True: lock
     make_lock = None
     locked_by = [None, None, None]
     is_anonymous = username == User.DEFAULT_USER
     if not is_anonymous and check_locking:
         log.debug('Checking locking on repository "%s"', repo_name)
         user = User.get_by_username(username)
         repo = Repository.get_by_repo_name(repo_name)
         make_lock, __, locked_by = repo.get_locking_state(
             action, user.user_id)
 
     settings_model = VcsSettingsModel(repo=repo_name)
     ui_settings = settings_model.get_ui_settings()
 
     extras = {
         'ip': get_ip_addr(environ),
         'username': username,
         'action': action,
         'repository': repo_name,
         'scm': scm,
         'config': rhodecode.CONFIG['__file__'],
         'make_lock': make_lock,
         'locked_by': locked_by,
         'server_url': utils2.get_server_url(environ),
         'hooks': get_enabled_hook_classes(ui_settings),
     }
     return extras
 
 
 class BasicAuth(AuthBasicAuthenticator):
 
     def __init__(self, realm, authfunc, auth_http_code=None,
                  initial_call_detection=False):
         self.realm = realm
         self.initial_call = initial_call_detection
         self.authfunc = authfunc
         self._rc_auth_http_code = auth_http_code
 
     def _get_response_from_code(self, http_code):
         try:
             return get_exception(safe_int(http_code))
         except Exception:
             log.exception('Failed to fetch response for code %s' % http_code)
             return HTTPForbidden
 
     def build_authentication(self):
         head = WWW_AUTHENTICATE.tuples('Basic realm="%s"' % self.realm)
         if self._rc_auth_http_code and not self.initial_call:
             # return alternative HTTP code if alternative http return code
             # is specified in RhodeCode config, but ONLY if it's not the
             # FIRST call
             custom_response_klass = self._get_response_from_code(
                 self._rc_auth_http_code)
             return custom_response_klass(headers=head)
         return HTTPUnauthorized(headers=head)
 
     def authenticate(self, environ):
         authorization = AUTHORIZATION(environ)
         if not authorization:
             return self.build_authentication()
         (authmeth, auth) = authorization.split(' ', 1)
         if 'basic' != authmeth.lower():
             return self.build_authentication()
         auth = auth.strip().decode('base64')
         _parts = auth.split(':', 1)
         if len(_parts) == 2:
             username, password = _parts
             if self.authfunc(
                     username, password, environ, VCS_TYPE):
                 return username
             if username and password:
                 # we mark that we actually executed authentication once, at
                 # that point we can use the alternative auth code
                 self.initial_call = False
 
         return self.build_authentication()
 
     __call__ = authenticate
 
 
 def attach_context_attributes(context):
-    rc_config = SettingsModel().get_all_settings()
+    rc_config = SettingsModel().get_all_settings(cache=True)
 
     context.rhodecode_version = rhodecode.__version__
     context.rhodecode_edition = config.get('rhodecode.edition')
     # unique secret + version does not leak the version but keep consistency
     context.rhodecode_version_hash = md5(
         config.get('beaker.session.secret', '') +
         rhodecode.__version__)[:8]
 
     # Default language set for the incoming request
     context.language = translation.get_lang()[0]
 
     # Visual options
     context.visual = AttributeDict({})
 
     # DB store
     context.visual.show_public_icon = str2bool(
         rc_config.get('rhodecode_show_public_icon'))
     context.visual.show_private_icon = str2bool(
         rc_config.get('rhodecode_show_private_icon'))
     context.visual.stylify_metatags = str2bool(
         rc_config.get('rhodecode_stylify_metatags'))
     context.visual.dashboard_items = safe_int(
         rc_config.get('rhodecode_dashboard_items', 100))
     context.visual.admin_grid_items = safe_int(
         rc_config.get('rhodecode_admin_grid_items', 100))
     context.visual.repository_fields = str2bool(
         rc_config.get('rhodecode_repository_fields'))
     context.visual.show_version = str2bool(
         rc_config.get('rhodecode_show_version'))
     context.visual.use_gravatar = str2bool(
         rc_config.get('rhodecode_use_gravatar'))
     context.visual.gravatar_url = rc_config.get('rhodecode_gravatar_url')
     context.visual.default_renderer = rc_config.get(
         'rhodecode_markup_renderer', 'rst')
     context.visual.rhodecode_support_url = \
         rc_config.get('rhodecode_support_url') or url('rhodecode_support')
 
     context.pre_code = rc_config.get('rhodecode_pre_code')
     context.post_code = rc_config.get('rhodecode_post_code')
     context.rhodecode_name = rc_config.get('rhodecode_title')
     context.default_encodings = aslist(config.get('default_encoding'), sep=',')
     # if we have specified default_encoding in the request, it has more
     # priority
     if request.GET.get('default_encoding'):
         context.default_encodings.insert(0, request.GET.get('default_encoding'))
     context.clone_uri_tmpl = rc_config.get('rhodecode_clone_uri_tmpl')
 
     # INI stored
     context.labs_active = str2bool(
         config.get('labs_settings_active', 'false'))
     context.visual.allow_repo_location_change = str2bool(
         config.get('allow_repo_location_change', True))
     context.visual.allow_custom_hooks_settings = str2bool(
         config.get('allow_custom_hooks_settings', True))
     context.debug_style = str2bool(config.get('debug_style', False))
 
     context.rhodecode_instanceid = config.get('instance_id')
 
     # AppEnlight
     context.appenlight_enabled = str2bool(config.get('appenlight', 'false'))
     context.appenlight_api_public_key = config.get(
         'appenlight.api_public_key', '')
     context.appenlight_server_url = config.get('appenlight.server_url', '')
 
     # END CONFIG VARS
 
     # TODO: This dosn't work when called from pylons compatibility tween.
     # Fix this and remove it from base controller.
     # context.repo_name = get_repo_slug(request)  # can be empty
 
     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)
 
 
 def get_auth_user(environ):
     ip_addr = get_ip_addr(environ)
     # make sure that we update permissions each time we call controller
     _auth_token = (request.GET.get('auth_token', '') or
                    request.GET.get('api_key', ''))
 
     if _auth_token:
         # when using API_KEY we are sure user exists.
         auth_user = AuthUser(api_key=_auth_token, ip_addr=ip_addr)
         authenticated = False
     else:
         cookie_store = CookieStoreWrapper(session.get('rhodecode_user'))
         try:
             auth_user = AuthUser(user_id=cookie_store.get('user_id', None),
                                  ip_addr=ip_addr)
         except UserCreationError as e:
             h.flash(e, 'error')
             # container auth or other auth functions that create users
             # on the fly can throw this exception signaling that there's
             # issue with user creation, explanation should be provided
             # in Exception itself. We then create a simple blank
             # AuthUser
             auth_user = AuthUser(ip_addr=ip_addr)
 
         if password_changed(auth_user, session):
             session.invalidate()
             cookie_store = CookieStoreWrapper(
                 session.get('rhodecode_user'))
             auth_user = AuthUser(ip_addr=ip_addr)
 
         authenticated = cookie_store.get('is_authenticated')
 
     if not auth_user.is_authenticated and auth_user.is_user_object:
         # user is not authenticated and not empty
         auth_user.set_authenticated(authenticated)
 
     return auth_user
 
 
 class BaseController(WSGIController):
 
     def __before__(self):
         """
         __before__ is called before controller methods and after __call__
         """
         # on each call propagate settings calls into global settings.
         set_rhodecode_config(config)
         attach_context_attributes(c)
 
         # TODO: Remove this when fixed in attach_context_attributes()
         c.repo_name = get_repo_slug(request)  # can be empty
 
         self.cut_off_limit_diff = safe_int(config.get('cut_off_limit_diff'))
         self.cut_off_limit_file = safe_int(config.get('cut_off_limit_file'))
         self.sa = meta.Session
         self.scm_model = ScmModel(self.sa)
 
         default_lang = c.language
         user_lang = c.language
         try:
             user_obj = self._rhodecode_user.get_instance()
             if user_obj:
                 user_lang = user_obj.user_data.get('language')
         except Exception:
             log.exception('Failed to fetch user language for user %s',
                           self._rhodecode_user)
 
         if user_lang and user_lang != default_lang:
             log.debug('set language to %s for user %s', user_lang,
                       self._rhodecode_user)
             translation.set_lang(user_lang)
 
     def _dispatch_redirect(self, with_url, environ, start_response):
         resp = HTTPFound(with_url)
         environ['SCRIPT_NAME'] = ''  # handle prefix middleware
         environ['PATH_INFO'] = with_url
         return resp(environ, start_response)
 
     def __call__(self, environ, start_response):
         """Invoke the Controller"""
         # WSGIController.__call__ dispatches to the Controller method
         # the request is routed to. This routing information is
         # available in environ['pylons.routes_dict']
         from rhodecode.lib import helpers as h
 
         # Provide the Pylons context to Pyramid's debugtoolbar if it asks
         if environ.get('debugtoolbar.wants_pylons_context', False):
             environ['debugtoolbar.pylons_context'] = c._current_obj()
 
         _route_name = '.'.join([environ['pylons.routes_dict']['controller'],
                                 environ['pylons.routes_dict']['action']])
 
-        self.rc_config = SettingsModel().get_all_settings()
+        self.rc_config = SettingsModel().get_all_settings(cache=True)
         self.ip_addr = get_ip_addr(environ)
 
         # The rhodecode auth user is looked up and passed through the
         # environ by the pylons compatibility tween in pyramid.
         # So we can just grab it from there.
         auth_user = environ['rc_auth_user']
 
         # set globals for auth user
         request.user = auth_user
         c.rhodecode_user = self._rhodecode_user = auth_user
 
         log.info('IP: %s User: %s accessed %s [%s]' % (
             self.ip_addr, auth_user, safe_unicode(get_access_path(environ)),
             _route_name)
         )
 
         # TODO: Maybe this should be move to pyramid to cover all views.
         # check user attributes for password change flag
         user_obj = auth_user.get_instance()
         if user_obj and user_obj.user_data.get('force_password_change'):
             h.flash('You are required to change your password', 'warning',
                     ignore_duplicate=True)
 
             skip_user_check_urls = [
                 'error.document', 'login.logout', 'login.index',
                 'admin/my_account.my_account_password',
                 'admin/my_account.my_account_password_update'
             ]
             if _route_name not in skip_user_check_urls:
                 return self._dispatch_redirect(
                     url('my_account_password'), environ, start_response)
 
         return WSGIController.__call__(self, environ, start_response)
 
 
 class BaseRepoController(BaseController):
     """
     Base class for controllers responsible for loading all needed data for
     repository loaded items are
 
     c.rhodecode_repo: instance of scm repository
     c.rhodecode_db_repo: instance of db
     c.repository_requirements_missing: shows that repository specific data
         could not be displayed due to the missing requirements
     c.repository_pull_requests: show number of open pull requests
     """
 
     def __before__(self):
         super(BaseRepoController, self).__before__()
         if c.repo_name:  # extracted from routes
             db_repo = Repository.get_by_repo_name(c.repo_name)
             if not db_repo:
                 return
 
             log.debug(
                 'Found repository in database %s with state `%s`',
                 safe_unicode(db_repo), safe_unicode(db_repo.repo_state))
             route = getattr(request.environ.get('routes.route'), 'name', '')
 
             # allow to delete repos that are somehow damages in filesystem
             if route in ['delete_repo']:
                 return
 
             if db_repo.repo_state in [Repository.STATE_PENDING]:
                 if route in ['repo_creating_home']:
                     return
                 check_url = url('repo_creating_home', repo_name=c.repo_name)
                 return redirect(check_url)
 
             self.rhodecode_db_repo = db_repo
 
             missing_requirements = False
             try:
                 self.rhodecode_repo = self.rhodecode_db_repo.scm_instance()
             except RepositoryRequirementError as e:
                 missing_requirements = True
                 self._handle_missing_requirements(e)
 
             if self.rhodecode_repo is None and not missing_requirements:
                 log.error('%s this repository is present in database but it '
                           'cannot be created as an scm instance', c.repo_name)
 
                 h.flash(_(
                     "The repository at %(repo_name)s cannot be located.") %
                     {'repo_name': c.repo_name},
                     category='error', ignore_duplicate=True)
                 redirect(url('home'))
 
             # update last change according to VCS data
             if not missing_requirements:
                 commit = db_repo.get_commit(
                     pre_load=["author", "date", "message", "parents"])
                 db_repo.update_commit_cache(commit)
 
             # Prepare context
             c.rhodecode_db_repo = db_repo
             c.rhodecode_repo = self.rhodecode_repo
             c.repository_requirements_missing = missing_requirements
 
             self._update_global_counters(self.scm_model, db_repo)
 
     def _update_global_counters(self, scm_model, db_repo):
         """
         Base variables that are exposed to every page of repository
         """
         c.repository_pull_requests = scm_model.get_pull_requests(db_repo)
 
     def _handle_missing_requirements(self, error):
         self.rhodecode_repo = None
         log.error(
             'Requirements are missing for repository %s: %s',
             c.repo_name, error.message)
 
         summary_url = url('summary_home', 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
         should_redirect = (
             path not in (summary_url, settings_update_url)
             and '/settings' not in path or path == statistics_url
         )
         if should_redirect:
             redirect(summary_url)

rhodecode/lib/caches.py

@@ -1,220 +1,226 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2015-2016  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 beaker
 import logging
 
 from beaker.cache import _cache_decorate, cache_regions, region_invalidate
 
 from rhodecode.lib.utils import safe_str, md5
 from rhodecode.model.db import Session, CacheKey, IntegrityError
 
 log = logging.getLogger(__name__)
 
 FILE_TREE = 'cache_file_tree'
 FILE_TREE_META = 'cache_file_tree_metadata'
 FILE_SEARCH_TREE_META = 'cache_file_search_metadata'
 SUMMARY_STATS = 'cache_summary_stats'
 
 # This list of caches gets purged when invalidation happens
 USED_REPO_CACHES = (FILE_TREE, FILE_TREE_META, FILE_TREE_META)
 
 DEFAULT_CACHE_MANAGER_CONFIG = {
     'type': 'memorylru_base',
     'max_items': 10240,
     'key_length': 256,
     'enabled': True
 }
 
 
 def configure_cache_region(
         region_name, region_kw, default_cache_kw, default_expire=60):
     default_type = default_cache_kw.get('type', 'memory')
     default_lock_dir = default_cache_kw.get('lock_dir')
     default_data_dir = default_cache_kw.get('data_dir')
 
     region_kw['lock_dir'] = region_kw.get('lock_dir', default_lock_dir)
     region_kw['data_dir'] = region_kw.get('data_dir', default_data_dir)
     region_kw['type'] = region_kw.get('type', default_type)
     region_kw['expire'] = int(region_kw.get('expire', default_expire))
 
     beaker.cache.cache_regions[region_name] = region_kw
 
 
 def get_cache_manager(region_name, cache_name, custom_ttl=None):
     """
     Creates a Beaker cache manager. Such instance can be used like that::
 
     _namespace = caches.get_repo_namespace_key(caches.XXX, repo_name)
     cache_manager = caches.get_cache_manager('repo_cache_long', _namespace)
     _cache_key = caches.compute_key_from_params(repo_name, commit.raw_id)
     def heavy_compute():
         ...
     result = cache_manager.get(_cache_key, createfunc=heavy_compute)
 
     :param region_name: region from ini file
     :param cache_name: custom cache name, usually prefix+repo_name. eg
         file_switcher_repo1
     :param custom_ttl: override .ini file timeout on this cache
     :return: instance of cache manager
     """
 
     cache_config = cache_regions.get(region_name, DEFAULT_CACHE_MANAGER_CONFIG)
     if custom_ttl:
         log.debug('Updating region %s with custom ttl: %s',
                   region_name, custom_ttl)
         cache_config.update({'expire': custom_ttl})
 
     return beaker.cache.Cache._get_cache(cache_name, cache_config)
 
 
 def clear_cache_manager(cache_manager):
+    """
+    namespace = 'foobar'
+    cache_manager = get_cache_manager('repo_cache_long', namespace)
+    clear_cache_manager(cache_manager)
+    """
+
     log.debug('Clearing all values for cache manager %s', cache_manager)
     cache_manager.clear()
 
 
 def clear_repo_caches(repo_name):
     # invalidate cache manager for this repo
     for prefix in USED_REPO_CACHES:
         namespace = get_repo_namespace_key(prefix, repo_name)
         cache_manager = get_cache_manager('repo_cache_long', namespace)
         clear_cache_manager(cache_manager)
 
 
 def compute_key_from_params(*args):
     """
     Helper to compute key from given params to be used in cache manager
     """
     return md5("_".join(map(safe_str, args)))
 
 
 def get_repo_namespace_key(prefix, repo_name):
     return '{0}_{1}'.format(prefix, compute_key_from_params(repo_name))
 
 
 def conditional_cache(region, prefix, condition, func):
     """
     Conditional caching function use like::
         def _c(arg):
             # heavy computation function
             return data
 
         # depending on the condition the compute is wrapped in cache or not
         compute = conditional_cache('short_term', 'cache_desc',
                                     condition=True, func=func)
         return compute(arg)
 
     :param region: name of cache region
     :param prefix: cache region prefix
     :param condition: condition for cache to be triggered, and
         return data cached
     :param func: wrapped heavy function to compute
 
     """
     wrapped = func
     if condition:
         log.debug('conditional_cache: True, wrapping call of '
                   'func: %s into %s region cache', region, func)
         cached_region = _cache_decorate((prefix,), None, None, region)
         wrapped = cached_region(func)
     return wrapped
 
 
 class ActiveRegionCache(object):
     def __init__(self, context):
         self.context = context
 
     def invalidate(self, *args, **kwargs):
         return False
 
     def compute(self):
         log.debug('Context cache: getting obj %s from cache', self.context)
         return self.context.compute_func(self.context.cache_key)
 
 
 class FreshRegionCache(ActiveRegionCache):
     def invalidate(self):
         log.debug('Context cache: invalidating cache for %s', self.context)
         region_invalidate(
             self.context.compute_func, None, self.context.cache_key)
         return True
 
 
 class InvalidationContext(object):
     def __repr__(self):
         return '<InvalidationContext:{}[{}]>'.format(
-            self.repo_name, self.cache_type)
+            safe_str(self.repo_name), safe_str(self.cache_type))
 
     def __init__(self, compute_func, repo_name, cache_type,
                  raise_exception=False):
         self.compute_func = compute_func
         self.repo_name = repo_name
         self.cache_type = cache_type
         self.cache_key = compute_key_from_params(
             repo_name, cache_type)
         self.raise_exception = raise_exception
 
     def get_cache_obj(self):
         cache_key = CacheKey.get_cache_key(
             self.repo_name, self.cache_type)
         cache_obj = CacheKey.get_active_cache(cache_key)
         if not cache_obj:
             cache_obj = CacheKey(cache_key, self.repo_name)
         return cache_obj
 
     def __enter__(self):
         """
         Test if current object is valid, and return CacheRegion function
         that does invalidation and calculation
         """
 
         self.cache_obj = self.get_cache_obj()
         if self.cache_obj.cache_active:
             # means our cache obj is existing and marked as it's
             # cache is not outdated, we return BaseInvalidator
             self.skip_cache_active_change = True
             return ActiveRegionCache(self)
 
         # the key is either not existing or set to False, we return
         # the real invalidator which re-computes value. We additionally set
         # the flag to actually update the Database objects
         self.skip_cache_active_change = False
         return FreshRegionCache(self)
 
     def __exit__(self, exc_type, exc_val, exc_tb):
 
         if self.skip_cache_active_change:
             return
 
         try:
             self.cache_obj.cache_active = True
             Session().add(self.cache_obj)
             Session().commit()
         except IntegrityError:
             # if we catch integrity error, it means we inserted this object
             # assumption is that's really an edge race-condition case and
             # it's safe is to skip it
             Session().rollback()
         except Exception:
             log.exception('Failed to commit on cache key update')
             Session().rollback()
             if self.raise_exception:
                 raise

rhodecode/lib/celerylib/__init__.py

@@ -1,143 +1,141 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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/
 """
 celery libs for RhodeCode
 """
 
 
 import socket
 import logging
 
 import rhodecode
 
 from os.path import join as jn
 from pylons import config
 
 from decorator import decorator
 
 from zope.cachedescriptors.property import Lazy as LazyProperty
 
-from rhodecode import CELERY_ENABLED, CELERY_EAGER
 from rhodecode.config import utils
 from rhodecode.lib.utils2 import safe_str, md5_safe, aslist
 from rhodecode.lib.pidlock import DaemonLock, LockHeld
 from rhodecode.lib.vcs import connect_vcs
 from rhodecode.model import meta
 
 log = logging.getLogger(__name__)
 
 
 class ResultWrapper(object):
     def __init__(self, task):
         self.task = task
 
     @LazyProperty
     def result(self):
         return self.task
 
 
 def run_task(task, *args, **kwargs):
-    global CELERY_ENABLED
-    if CELERY_ENABLED:
+    if rhodecode.CELERY_ENABLED:
         try:
             t = task.apply_async(args=args, kwargs=kwargs)
             log.info('running task %s:%s', t.task_id, task)
             return t
 
         except socket.error as e:
             if isinstance(e, IOError) and e.errno == 111:
-                log.debug('Unable to connect to celeryd. Sync execution')
-                CELERY_ENABLED = False
+                log.error('Unable to connect to celeryd. Sync execution')
+                rhodecode.CELERY_ENABLED = False
             else:
                 log.exception("Exception while connecting to celeryd.")
         except KeyError as e:
-                log.debug('Unable to connect to celeryd. Sync execution')
+            log.error('Unable to connect to celeryd. Sync execution')
         except Exception as e:
             log.exception(
                 "Exception while trying to run task asynchronous. "
                 "Fallback to sync execution.")
-
-    log.debug('executing task %s in sync mode', task)
+    else:
+        log.debug('executing task %s in sync mode', task)
     return ResultWrapper(task(*args, **kwargs))
 
 
 def __get_lockkey(func, *fargs, **fkwargs):
     params = list(fargs)
     params.extend(['%s-%s' % ar for ar in fkwargs.items()])
 
     func_name = str(func.__name__) if hasattr(func, '__name__') else str(func)
     _lock_key = func_name + '-' + '-'.join(map(safe_str, params))
     return 'task_%s.lock' % (md5_safe(_lock_key),)
 
 
 def locked_task(func):
     def __wrapper(func, *fargs, **fkwargs):
         lockkey = __get_lockkey(func, *fargs, **fkwargs)
         lockkey_path = config['app_conf']['cache_dir']
 
         log.info('running task with lockkey %s' % lockkey)
         try:
             l = DaemonLock(file_=jn(lockkey_path, lockkey))
             ret = func(*fargs, **fkwargs)
             l.release()
             return ret
         except LockHeld:
             log.info('LockHeld')
             return 'Task with key %s already running' % lockkey
 
     return decorator(__wrapper, func)
 
 
 def get_session():
-    if CELERY_ENABLED:
+    if rhodecode.CELERY_ENABLED:
         utils.initialize_database(config)
     sa = meta.Session()
     return sa
 
 
 def dbsession(func):
     def __wrapper(func, *fargs, **fkwargs):
         try:
             ret = func(*fargs, **fkwargs)
             return ret
         finally:
-            if CELERY_ENABLED and not CELERY_EAGER:
+            if rhodecode.CELERY_ENABLED and not rhodecode.CELERY_EAGER:
                 meta.Session.remove()
 
     return decorator(__wrapper, func)
 
 
 def vcsconnection(func):
     def __wrapper(func, *fargs, **fkwargs):
-        if CELERY_ENABLED and not CELERY_EAGER:
+        if rhodecode.CELERY_ENABLED and not rhodecode.CELERY_EAGER:
             backends = config['vcs.backends'] = aslist(
                 config.get('vcs.backends', 'hg,git'), sep=',')
             for alias in rhodecode.BACKENDS.keys():
                 if alias not in backends:
                     del rhodecode.BACKENDS[alias]
             utils.configure_pyro4(config)
             utils.configure_vcs(config)
             connect_vcs(
                 config['vcs.server'],
                 utils.get_vcs_server_protocol(config))
         ret = func(*fargs, **fkwargs)
         return ret
 
     return decorator(__wrapper, func)

rhodecode/lib/celerylib/tasks.py

@@ -1,284 +1,284 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2012-2016  RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 """
 RhodeCode task modules, containing all task that suppose to be run
 by celery daemon
 """
 
 
 import os
 import logging
 
 from celery.task import task
 from pylons import config
 
-from rhodecode import CELERY_ENABLED
+import rhodecode
 from rhodecode.lib.celerylib import (
     run_task, dbsession, __get_lockkey, LockHeld, DaemonLock,
     get_session, vcsconnection)
 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.utils2 import safe_int, str2bool
 from rhodecode.model.db import Repository, User
 
 
 add_cache(config)  # pragma: no cover
 
 
 def get_logger(cls):
-    if CELERY_ENABLED:
+    if rhodecode.CELERY_ENABLED:
         try:
             log = cls.get_logger()
         except Exception:
             log = logging.getLogger(__name__)
     else:
         log = logging.getLogger(__name__)
 
     return log
 
 
 @task(ignore_result=True)
 @dbsession
 def send_email(recipients, subject, body='', html_body='', email_config=None):
     """
     Sends an email with defined parameters from the .ini files.
 
     :param recipients: list of recipients, it this is empty the defined email
         address from field 'email_to' is used instead
     :param subject: subject of the mail
     :param body: body of the mail
     :param html_body: html version of body
     """
     log = get_logger(send_email)
 
     email_config = email_config or config
     subject = "%s %s" % (email_config.get('email_prefix', ''), subject)
     if not recipients:
         # if recipients are not defined we send to email_config + all admins
         admins = [
             u.email for u in User.query().filter(User.admin == True).all()]
         recipients = [email_config.get('email_to')] + admins
 
     mail_server = email_config.get('smtp_server') or None
     if mail_server is None:
         log.error("SMTP server information missing. Sending email failed. "
                   "Make sure that `smtp_server` variable is configured "
                   "inside the .ini file")
         return False
 
     mail_from = email_config.get('app_email_from', 'RhodeCode')
     user = email_config.get('smtp_username')
     passwd = email_config.get('smtp_password')
     mail_port = email_config.get('smtp_port')
     tls = str2bool(email_config.get('smtp_use_tls'))
     ssl = str2bool(email_config.get('smtp_use_ssl'))
     debug = str2bool(email_config.get('debug'))
     smtp_auth = email_config.get('smtp_auth')
 
     try:
         m = SmtpMailer(mail_from, user, passwd, mail_server, smtp_auth,
                        mail_port, ssl, tls, debug=debug)
         m.send(recipients, subject, body, html_body)
     except Exception:
         log.exception('Mail sending failed')
         return False
     return True
 
 
 @task(ignore_result=False)
 @dbsession
 @vcsconnection
 def create_repo(form_data, cur_user):
     from rhodecode.model.repo import RepoModel
     from rhodecode.model.user import UserModel
     from rhodecode.model.settings import SettingsModel
 
     log = get_logger(create_repo)
     DBS = get_session()
 
     cur_user = UserModel(DBS)._get_user(cur_user)
     owner = cur_user
 
     repo_name = form_data['repo_name']
     repo_name_full = form_data['repo_name_full']
     repo_type = form_data['repo_type']
     description = form_data['repo_description']
     private = form_data['repo_private']
     clone_uri = form_data.get('clone_uri')
     repo_group = safe_int(form_data['repo_group'])
     landing_rev = form_data['repo_landing_rev']
     copy_fork_permissions = form_data.get('copy_permissions')
     copy_group_permissions = form_data.get('repo_copy_permissions')
     fork_of = form_data.get('fork_parent_id')
     state = form_data.get('repo_state', Repository.STATE_PENDING)
 
     # repo creation defaults, private and repo_type are filled in form
     defs = SettingsModel().get_default_repo_settings(strip_prefix=True)
     enable_statistics = form_data.get(
         'enable_statistics', defs.get('repo_enable_statistics'))
     enable_locking = form_data.get(
         'enable_locking', defs.get('repo_enable_locking'))
     enable_downloads = form_data.get(
         'enable_downloads', defs.get('repo_enable_downloads'))
 
     try:
         RepoModel(DBS)._create_repo(
             repo_name=repo_name_full,
             repo_type=repo_type,
             description=description,
             owner=owner,
             private=private,
             clone_uri=clone_uri,
             repo_group=repo_group,
             landing_rev=landing_rev,
             fork_of=fork_of,
             copy_fork_permissions=copy_fork_permissions,
             copy_group_permissions=copy_group_permissions,
             enable_statistics=enable_statistics,
             enable_locking=enable_locking,
             enable_downloads=enable_downloads,
             state=state
         )
 
         action_logger(cur_user, 'user_created_repo',
                       repo_name_full, '', DBS)
         DBS.commit()
 
         # now create this repo on Filesystem
         RepoModel(DBS)._create_filesystem_repo(
             repo_name=repo_name,
             repo_type=repo_type,
             repo_group=RepoModel(DBS)._get_repo_group(repo_group),
             clone_uri=clone_uri,
         )
         repo = Repository.get_by_repo_name(repo_name_full)
         log_create_repository(created_by=owner.username, **repo.get_dict())
 
         # update repo commit caches initially
         repo.update_commit_cache()
 
         # set new created state
         repo.set_state(Repository.STATE_CREATED)
         DBS.commit()
     except Exception as e:
         log.warning('Exception %s occurred when creating repository, '
                     'doing cleanup...', e)
         # rollback things manually !
         repo = Repository.get_by_repo_name(repo_name_full)
         if repo:
             Repository.delete(repo.repo_id)
             DBS.commit()
             RepoModel(DBS)._delete_filesystem_repo(repo)
         raise
 
     # it's an odd fix to make celery fail task when exception occurs
     def on_failure(self, *args, **kwargs):
         pass
 
     return True
 
 
 @task(ignore_result=False)
 @dbsession
 @vcsconnection
 def create_repo_fork(form_data, cur_user):
     """
     Creates a fork of repository using internal VCS methods
 
     :param form_data:
     :param cur_user:
     """
     from rhodecode.model.repo import RepoModel
     from rhodecode.model.user import UserModel
 
     log = get_logger(create_repo_fork)
     DBS = get_session()
 
     cur_user = UserModel(DBS)._get_user(cur_user)
     owner = cur_user
 
     repo_name = form_data['repo_name']  # fork in this case
     repo_name_full = form_data['repo_name_full']
     repo_type = form_data['repo_type']
     description = form_data['description']
     private = form_data['private']
     clone_uri = form_data.get('clone_uri')
     repo_group = safe_int(form_data['repo_group'])
     landing_rev = form_data['landing_rev']
     copy_fork_permissions = form_data.get('copy_permissions')
     fork_id = safe_int(form_data.get('fork_parent_id'))
 
     try:
         fork_of = RepoModel(DBS)._get_repo(fork_id)
         RepoModel(DBS)._create_repo(
             repo_name=repo_name_full,
             repo_type=repo_type,
             description=description,
             owner=owner,
             private=private,
             clone_uri=clone_uri,
             repo_group=repo_group,
             landing_rev=landing_rev,
             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()
         source_repo_path = os.path.join(base_path, fork_of.repo_name)
 
         # now create this repo on Filesystem
         RepoModel(DBS)._create_filesystem_repo(
             repo_name=repo_name,
             repo_type=repo_type,
             repo_group=RepoModel(DBS)._get_repo_group(repo_group),
             clone_uri=source_repo_path,
         )
         repo = Repository.get_by_repo_name(repo_name_full)
         log_create_repository(created_by=owner.username, **repo.get_dict())
 
         # update repo commit caches initially
         config = repo._config
         config.set('extensions', 'largefiles', '')
         repo.update_commit_cache(config=config)
 
         # set new created state
         repo.set_state(Repository.STATE_CREATED)
         DBS.commit()
     except Exception as e:
         log.warning('Exception %s occurred when forking repository, '
                     'doing cleanup...', e)
         # rollback things manually !
         repo = Repository.get_by_repo_name(repo_name_full)
         if repo:
             Repository.delete(repo.repo_id)
             DBS.commit()
             RepoModel(DBS)._delete_filesystem_repo(repo)
         raise
 
     # it's an odd fix to make celery fail task when exception occurs
     def on_failure(self, *args, **kwargs):
         pass
 
     return True

rhodecode/lib/db_manage.py

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

rhodecode/lib/encrypt.py

@@ -1,61 +1,114 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2014-2016  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/
 
 
 """
 Generic encryption library for RhodeCode
 """
 
-import hashlib
 import base64
 
 from Crypto.Cipher import AES
 from Crypto import Random
+from Crypto.Hash import HMAC, SHA256
 
 from rhodecode.lib.utils2 import safe_str
 
 
+class SignatureVerificationError(Exception):
+    pass
+
+
+class InvalidDecryptedValue(str):
+
+    def __new__(cls, content):
+        """
+        This will generate something like this::
+            <InvalidDecryptedValue(QkWusFgLJXR6m42v...)>
+        And represent a safe indicator that encryption key is broken
+        """
+        content = '<{}({}...)>'.format(cls.__name__, content[:16])
+        return str.__new__(cls, content)
+
+
 class AESCipher(object):
-    def __init__(self, key):
-        # create padding, trim to long enc key
+    def __init__(self, key, hmac=False, strict_verification=True):
         if not key:
             raise ValueError('passed key variable is empty')
+        self.strict_verification = strict_verification
         self.block_size = 32
-        self.key = hashlib.sha256(safe_str(key)).digest()
+        self.hmac_size = 32
+        self.hmac = hmac
+
+        self.key = SHA256.new(safe_str(key)).digest()
+        self.hmac_key = SHA256.new(self.key).digest()
+
+    def verify_hmac_signature(self, raw_data):
+        org_hmac_signature = raw_data[-self.hmac_size:]
+        data_without_sig = raw_data[:-self.hmac_size]
+        recomputed_hmac = HMAC.new(
+            self.hmac_key, data_without_sig, digestmod=SHA256).digest()
+        return org_hmac_signature == recomputed_hmac
 
     def encrypt(self, raw):
         raw = self._pad(raw)
         iv = Random.new().read(AES.block_size)
         cipher = AES.new(self.key, AES.MODE_CBC, iv)
-        return base64.b64encode(iv + cipher.encrypt(raw))
+        enc_value = cipher.encrypt(raw)
+
+        hmac_signature = ''
+        if self.hmac:
+            # compute hmac+sha256 on iv + enc text, we use
+            # encrypt then mac method to create the signature
+            hmac_signature = HMAC.new(
+                self.hmac_key, iv + enc_value, digestmod=SHA256).digest()
+
+        return base64.b64encode(iv + enc_value + hmac_signature)
 
     def decrypt(self, enc):
+        enc_org = enc
         enc = base64.b64decode(enc)
+
+        if self.hmac and len(enc) > self.hmac_size:
+            if self.verify_hmac_signature(enc):
+                # cut off the HMAC verification digest
+                enc = enc[:-self.hmac_size]
+            else:
+                if self.strict_verification:
+                    raise SignatureVerificationError(
+                        "Encryption signature verification failed. "
+                        "Please check your secret key, and/or encrypted value. "
+                        "Secret key is stored as "
+                        "`rhodecode.encrypted_values.secret` or "
+                        "`beaker.session.secret` inside .ini file")
+
+                return InvalidDecryptedValue(enc_org)
+
         iv = enc[:AES.block_size]
         cipher = AES.new(self.key, AES.MODE_CBC, iv)
         return self._unpad(cipher.decrypt(enc[AES.block_size:]))
 
     def _pad(self, s):
         return (s + (self.block_size - len(s) % self.block_size)
                 * chr(self.block_size - len(s) % self.block_size))
 
     @staticmethod
     def _unpad(s):
         return s[:-ord(s[len(s)-1:])]
  No newline at end of file

rhodecode/lib/helpers.py

@@ -1,1892 +1,1897 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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/
 
 """
 Helper functions
 
 Consists of functions to typically be used within templates, but also
 available to Controllers. This module is available to both as 'h'.
 """
 
 import random
 import hashlib
 import StringIO
 import urllib
 import math
 import logging
 import re
 import urlparse
 import time
 import string
 import hashlib
 import pygments
 
 from datetime import datetime
 from functools import partial
 from pygments.formatters.html import HtmlFormatter
 from pygments import highlight as code_highlight
 from pygments.lexers import (
     get_lexer_by_name, get_lexer_for_filename, get_lexer_for_mimetype)
 from pylons import url
 from pylons.i18n.translation import _, ungettext
 from pyramid.threadlocal import get_current_request
 
 from webhelpers.html import literal, HTML, escape
 from webhelpers.html.tools import *
 from webhelpers.html.builder import make_tag
 from webhelpers.html.tags import auto_discovery_link, checkbox, css_classes, \
     end_form, file, form as wh_form, hidden, image, javascript_link, link_to, \
     link_to_if, link_to_unless, ol, required_legend, select, stylesheet_link, \
     submit, text, password, textarea, title, ul, xml_declaration, radio
 from webhelpers.html.tools import auto_link, button_to, highlight, \
     js_obfuscate, mail_to, strip_links, strip_tags, tag_re
 from webhelpers.pylonslib import Flash as _Flash
 from webhelpers.text import chop_at, collapse, convert_accented_entities, \
     convert_misc_entities, lchop, plural, rchop, remove_formatting, \
     replace_whitespace, urlify, truncate, wrap_paragraphs
 from webhelpers.date import time_ago_in_words
 from webhelpers.paginate import Page as _Page
 from webhelpers.html.tags import _set_input_attrs, _set_id_attr, \
     convert_boolean_attrs, NotGiven, _make_safe_id_component
 from webhelpers2.number import format_byte_size
 
 from rhodecode.lib.annotate import annotate_highlight
 from rhodecode.lib.action_parser import action_parser
 from rhodecode.lib.utils import repo_name_slug, get_custom_lexer
 from rhodecode.lib.utils2 import str2bool, safe_unicode, safe_str, \
     get_commit_safe, datetime_to_time, time_to_datetime, time_to_utcdatetime, \
     AttributeDict, safe_int, md5, md5_safe
 from rhodecode.lib.markup_renderer import MarkupRenderer
 from rhodecode.lib.vcs.exceptions import CommitDoesNotExistError
 from rhodecode.lib.vcs.backends.base import BaseChangeset, EmptyCommit
 from rhodecode.config.conf import DATE_FORMAT, DATETIME_FORMAT
 from rhodecode.model.changeset_status import ChangesetStatusModel
 from rhodecode.model.db import Permission, User, Repository
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.settings import IssueTrackerSettingsModel
 
 log = logging.getLogger(__name__)
 
 DEFAULT_USER = User.DEFAULT_USER
 DEFAULT_USER_EMAIL = User.DEFAULT_USER_EMAIL
 
 
 def html_escape(text, html_escape_table=None):
     """Produce entities within text."""
     if not html_escape_table:
         html_escape_table = {
             "&": "&amp;",
             '"': "&quot;",
             "'": "&apos;",
             ">": "&gt;",
             "<": "&lt;",
         }
     return "".join(html_escape_table.get(c, c) for c in text)
 
 
 def chop_at_smart(s, sub, inclusive=False, suffix_if_chopped=None):
     """
     Truncate string ``s`` at the first occurrence of ``sub``.
 
     If ``inclusive`` is true, truncate just after ``sub`` rather than at it.
     """
     suffix_if_chopped = suffix_if_chopped or ''
     pos = s.find(sub)
     if pos == -1:
         return s
 
     if inclusive:
         pos += len(sub)
 
     chopped = s[:pos]
     left = s[pos:].strip()
 
     if left and suffix_if_chopped:
         chopped += suffix_if_chopped
 
     return chopped
 
 
 def shorter(text, size=20):
     postfix = '...'
     if len(text) > size:
         return text[:size - len(postfix)] + postfix
     return text
 
 
 def _reset(name, value=None, id=NotGiven, type="reset", **attrs):
     """
     Reset button
     """
     _set_input_attrs(attrs, type, name, value)
     _set_id_attr(attrs, id, name)
     convert_boolean_attrs(attrs, ["disabled"])
     return HTML.input(**attrs)
 
 reset = _reset
 safeid = _make_safe_id_component
 
 
 def branding(name, length=40):
     return truncate(name, length, indicator="")
 
 
 def FID(raw_id, path):
     """
     Creates a unique ID for filenode based on it's hash of path and commit
     it's safe to use in urls
 
     :param raw_id:
     :param path:
     """
 
     return 'c-%s-%s' % (short_id(raw_id), md5_safe(path)[:12])
 
 
 class _GetError(object):
     """Get error from form_errors, and represent it as span wrapped error
     message
 
     :param field_name: field to fetch errors for
     :param form_errors: form errors dict
     """
 
     def __call__(self, field_name, form_errors):
         tmpl = """<span class="error_msg">%s</span>"""
         if form_errors and field_name in form_errors:
             return literal(tmpl % form_errors.get(field_name))
 
 get_error = _GetError()
 
 
 class _ToolTip(object):
 
     def __call__(self, tooltip_title, trim_at=50):
         """
         Special function just to wrap our text into nice formatted
         autowrapped text
 
         :param tooltip_title:
         """
         tooltip_title = escape(tooltip_title)
         tooltip_title = tooltip_title.replace('<', '&lt;').replace('>', '&gt;')
         return tooltip_title
 tooltip = _ToolTip()
 
 
 def files_breadcrumbs(repo_name, commit_id, file_path):
     if isinstance(file_path, str):
         file_path = safe_unicode(file_path)
 
     # TODO: johbo: Is this always a url like path, or is this operating
     # system dependent?
     path_segments = file_path.split('/')
 
     repo_name_html = escape(repo_name)
     if len(path_segments) == 1 and path_segments[0] == '':
         url_segments = [repo_name_html]
     else:
         url_segments = [
             link_to(
                 repo_name_html,
                 url('files_home',
                     repo_name=repo_name,
                     revision=commit_id,
                     f_path=''),
                 class_='pjax-link')]
 
     last_cnt = len(path_segments) - 1
     for cnt, segment in enumerate(path_segments):
         if not segment:
             continue
         segment_html = escape(segment)
 
         if cnt != last_cnt:
             url_segments.append(
                 link_to(
                     segment_html,
                     url('files_home',
                         repo_name=repo_name,
                         revision=commit_id,
                         f_path='/'.join(path_segments[:cnt + 1])),
                     class_='pjax-link'))
         else:
             url_segments.append(segment_html)
 
     return literal('/'.join(url_segments))
 
 
 class CodeHtmlFormatter(HtmlFormatter):
     """
     My code Html Formatter for source codes
     """
 
     def wrap(self, source, outfile):
         return self._wrap_div(self._wrap_pre(self._wrap_code(source)))
 
     def _wrap_code(self, source):
         for cnt, it in enumerate(source):
             i, t = it
             t = '<div id="L%s">%s</div>' % (cnt + 1, t)
             yield i, t
 
     def _wrap_tablelinenos(self, inner):
         dummyoutfile = StringIO.StringIO()
         lncount = 0
         for t, line in inner:
             if t:
                 lncount += 1
             dummyoutfile.write(line)
 
         fl = self.linenostart
         mw = len(str(lncount + fl - 1))
         sp = self.linenospecial
         st = self.linenostep
         la = self.lineanchors
         aln = self.anchorlinenos
         nocls = self.noclasses
         if sp:
             lines = []
 
             for i in range(fl, fl + lncount):
                 if i % st == 0:
                     if i % sp == 0:
                         if aln:
                             lines.append('<a href="#%s%d" class="special">%*d</a>' %
                                          (la, i, mw, i))
                         else:
                             lines.append('<span class="special">%*d</span>' % (mw, i))
                     else:
                         if aln:
                             lines.append('<a href="#%s%d">%*d</a>' % (la, i, mw, i))
                         else:
                             lines.append('%*d' % (mw, i))
                 else:
                     lines.append('')
             ls = '\n'.join(lines)
         else:
             lines = []
             for i in range(fl, fl + lncount):
                 if i % st == 0:
                     if aln:
                         lines.append('<a href="#%s%d">%*d</a>' % (la, i, mw, i))
                     else:
                         lines.append('%*d' % (mw, i))
                 else:
                     lines.append('')
             ls = '\n'.join(lines)
 
         # in case you wonder about the seemingly redundant <div> here: since the
         # content in the other cell also is wrapped in a div, some browsers in
         # some configurations seem to mess up the formatting...
         if nocls:
             yield 0, ('<table class="%stable">' % self.cssclass +
                       '<tr><td><div class="linenodiv" '
                       'style="background-color: #f0f0f0; padding-right: 10px">'
                       '<pre style="line-height: 125%">' +
                       ls + '</pre></div></td><td id="hlcode" class="code">')
         else:
             yield 0, ('<table class="%stable">' % self.cssclass +
                       '<tr><td class="linenos"><div class="linenodiv"><pre>' +
                       ls + '</pre></div></td><td id="hlcode" class="code">')
         yield 0, dummyoutfile.getvalue()
         yield 0, '</td></tr></table>'
 
 
 class SearchContentCodeHtmlFormatter(CodeHtmlFormatter):
     def __init__(self, **kw):
         # only show these line numbers if set
         self.only_lines = kw.pop('only_line_numbers', [])
         self.query_terms = kw.pop('query_terms', [])
         self.max_lines = kw.pop('max_lines', 5)
         self.line_context = kw.pop('line_context', 3)
         self.url = kw.pop('url', None)
 
         super(CodeHtmlFormatter, self).__init__(**kw)
 
     def _wrap_code(self, source):
         for cnt, it in enumerate(source):
             i, t = it
             t = '<pre>%s</pre>' % t
             yield i, t
 
     def _wrap_tablelinenos(self, inner):
         yield 0, '<table class="code-highlight %stable">' % self.cssclass
 
         last_shown_line_number = 0
         current_line_number = 1
 
         for t, line in inner:
             if not t:
                 yield t, line
                 continue
 
             if current_line_number in self.only_lines:
                 if last_shown_line_number + 1 != current_line_number:
                     yield 0, '<tr>'
                     yield 0, '<td class="line">...</td>'
                     yield 0, '<td id="hlcode" class="code"></td>'
                     yield 0, '</tr>'
 
                 yield 0, '<tr>'
                 if self.url:
                     yield 0, '<td class="line"><a href="%s#L%i">%i</a></td>' % (
                         self.url, current_line_number, current_line_number)
                 else:
                     yield 0, '<td class="line"><a href="">%i</a></td>' % (
                         current_line_number)
                 yield 0, '<td id="hlcode" class="code">' + line + '</td>'
                 yield 0, '</tr>'
 
                 last_shown_line_number = current_line_number
 
             current_line_number += 1
 
 
         yield 0, '</table>'
 
 
 def extract_phrases(text_query):
     """
     Extracts phrases from search term string making sure phrases
     contained in double quotes are kept together - and discarding empty values
     or fully whitespace values eg.
 
     'some   text "a phrase" more' => ['some', 'text', 'a phrase', 'more']
 
     """
 
     in_phrase = False
     buf = ''
     phrases = []
     for char in text_query:
         if in_phrase:
             if char == '"': # end phrase
                 phrases.append(buf)
                 buf = ''
                 in_phrase = False
                 continue
             else:
                 buf += char
                 continue
         else:
             if char == '"': # start phrase
                 in_phrase = True
                 phrases.append(buf)
                 buf = ''
                 continue
             elif char == ' ':
                 phrases.append(buf)
                 buf = ''
                 continue
             else:
                 buf += char
 
     phrases.append(buf)
     phrases = [phrase.strip() for phrase in phrases if phrase.strip()]
     return phrases
 
 
 def get_matching_offsets(text, phrases):
     """
     Returns a list of string offsets in `text` that the list of `terms` match
 
     >>> get_matching_offsets('some text here', ['some', 'here'])
     [(0, 4), (10, 14)]
 
     """
     offsets = []
     for phrase in phrases:
         for match in re.finditer(phrase, text):
             offsets.append((match.start(), match.end()))
 
     return offsets
 
 
 def normalize_text_for_matching(x):
     """
     Replaces all non alnum characters to spaces and lower cases the string,
     useful for comparing two text strings without punctuation
     """
     return re.sub(r'[^\w]', ' ', x.lower())
 
 
 def get_matching_line_offsets(lines, terms):
     """ Return a set of `lines` indices (starting from 1) matching a
     text search query, along with `context` lines above/below matching lines
 
     :param lines: list of strings representing lines
     :param terms: search term string to match in lines eg. 'some text'
     :param context: number of lines above/below a matching line to add to result
     :param max_lines: cut off for lines of interest
      eg.
 
-    >>> get_matching_line_offsets('''
-words words words
-words words words
-some text some
-words words words
-words words words
-text here what
-''', 'text', context=1)
+    text = '''
+    words words words
+    words words words
+    some text some
+    words words words
+    words words words
+    text here what
+    '''
+    get_matching_line_offsets(text, 'text', context=1)
     {3: [(5, 9)], 6: [(0, 4)]]
+
     """
     matching_lines = {}
     phrases = [normalize_text_for_matching(phrase)
                for phrase in extract_phrases(terms)]
 
     for line_index, line in enumerate(lines, start=1):
         match_offsets = get_matching_offsets(
             normalize_text_for_matching(line), phrases)
         if match_offsets:
             matching_lines[line_index] = match_offsets
 
     return matching_lines
 
+
 def get_lexer_safe(mimetype=None, filepath=None):
     """
     Tries to return a relevant pygments lexer using mimetype/filepath name,
     defaulting to plain text if none could be found
     """
     lexer = None
     try:
         if mimetype:
             lexer = get_lexer_for_mimetype(mimetype)
         if not lexer:
-            lexer = get_lexer_for_filename(path)
+            lexer = get_lexer_for_filename(filepath)
     except pygments.util.ClassNotFound:
         pass
 
     if not lexer:
         lexer = get_lexer_by_name('text')
 
     return lexer
 
 
 def pygmentize(filenode, **kwargs):
     """
     pygmentize function using pygments
 
     :param filenode:
     """
     lexer = get_custom_lexer(filenode.extension) or filenode.lexer
     return literal(code_highlight(filenode.content, lexer,
                                   CodeHtmlFormatter(**kwargs)))
 
 
 def pygmentize_annotation(repo_name, filenode, **kwargs):
     """
     pygmentize function for annotation
 
     :param filenode:
     """
 
     color_dict = {}
 
     def gen_color(n=10000):
         """generator for getting n of evenly distributed colors using
         hsv color and golden ratio. It always return same order of colors
 
         :returns: RGB tuple
         """
 
         def hsv_to_rgb(h, s, v):
             if s == 0.0:
                 return v, v, v
             i = int(h * 6.0)  # XXX assume int() truncates!
             f = (h * 6.0) - i
             p = v * (1.0 - s)
             q = v * (1.0 - s * f)
             t = v * (1.0 - s * (1.0 - f))
             i = i % 6
             if i == 0:
                 return v, t, p
             if i == 1:
                 return q, v, p
             if i == 2:
                 return p, v, t
             if i == 3:
                 return p, q, v
             if i == 4:
                 return t, p, v
             if i == 5:
                 return v, p, q
 
         golden_ratio = 0.618033988749895
         h = 0.22717784590367374
 
         for _ in xrange(n):
             h += golden_ratio
             h %= 1
             HSV_tuple = [h, 0.95, 0.95]
             RGB_tuple = hsv_to_rgb(*HSV_tuple)
             yield map(lambda x: str(int(x * 256)), RGB_tuple)
 
     cgenerator = gen_color()
 
     def get_color_string(commit_id):
         if commit_id in color_dict:
             col = color_dict[commit_id]
         else:
             col = color_dict[commit_id] = cgenerator.next()
         return "color: rgb(%s)! important;" % (', '.join(col))
 
     def url_func(repo_name):
 
         def _url_func(commit):
             author = commit.author
             date = commit.date
             message = tooltip(commit.message)
 
             tooltip_html = ("<div style='font-size:0.8em'><b>Author:</b>"
                             " %s<br/><b>Date:</b> %s</b><br/><b>Message:"
                             "</b> %s<br/></div>")
 
             tooltip_html = tooltip_html % (author, date, message)
             lnk_format = '%5s:%s' % ('r%s' % commit.idx, commit.short_id)
             uri = link_to(
                 lnk_format,
                 url('changeset_home', repo_name=repo_name,
                     revision=commit.raw_id),
                 style=get_color_string(commit.raw_id),
                 class_='tooltip',
                 title=tooltip_html
             )
 
             uri += '\n'
             return uri
         return _url_func
 
     return literal(annotate_highlight(filenode, url_func(repo_name), **kwargs))
 
 
 def is_following_repo(repo_name, user_id):
     from rhodecode.model.scm import ScmModel
     return ScmModel().is_following_repo(repo_name, user_id)
 
 
 class _Message(object):
     """A message returned by ``Flash.pop_messages()``.
 
     Converting the message to a string returns the message text. Instances
     also have the following attributes:
 
     * ``message``: the message text.
     * ``category``: the category specified when the message was created.
     """
 
     def __init__(self, category, message):
         self.category = category
         self.message = message
 
     def __str__(self):
         return self.message
 
     __unicode__ = __str__
 
     def __html__(self):
         return escape(safe_unicode(self.message))
 
 
 class Flash(_Flash):
 
     def pop_messages(self):
         """Return all accumulated messages and delete them from the session.
 
         The return value is a list of ``Message`` objects.
         """
         from pylons import session
 
         messages = []
 
         # Pop the 'old' pylons flash messages. They are tuples of the form
         # (category, message)
         for cat, msg in session.pop(self.session_key, []):
             messages.append(_Message(cat, msg))
 
         # Pop the 'new' pyramid flash messages for each category as list
         # of strings.
         for cat in self.categories:
             for msg in session.pop_flash(queue=cat):
                 messages.append(_Message(cat, msg))
         # Map messages from the default queue to the 'notice' category.
         for msg in session.pop_flash():
             messages.append(_Message('notice', msg))
 
         session.save()
         return messages
 
 flash = Flash()
 
 #==============================================================================
 # SCM FILTERS available via h.
 #==============================================================================
 from rhodecode.lib.vcs.utils import author_name, author_email
 from rhodecode.lib.utils2 import credentials_filter, age as _age
 from rhodecode.model.db import User, ChangesetStatus
 
 age = _age
 capitalize = lambda x: x.capitalize()
 email = author_email
 short_id = lambda x: x[:12]
 hide_credentials = lambda x: ''.join(credentials_filter(x))
 
 
 def age_component(datetime_iso, value=None, time_is_local=False):
     title = value or format_date(datetime_iso)
 
     # detect if we have a timezone info, otherwise, add it
     if isinstance(datetime_iso, datetime) and not datetime_iso.tzinfo:
         tzinfo = '+00:00'
 
         if time_is_local:
             tzinfo = time.strftime("+%H:%M",
                 time.gmtime(
                     (datetime.now() - datetime.utcnow()).seconds + 1
                 )
             )
 
     return literal(
         '<time class="timeago tooltip" '
         'title="{1}" datetime="{0}{2}">{1}</time>'.format(
             datetime_iso, title, tzinfo))
 
 
 def _shorten_commit_id(commit_id):
     from rhodecode import CONFIG
     def_len = safe_int(CONFIG.get('rhodecode_show_sha_length', 12))
     return commit_id[:def_len]
 
 
-def get_repo_id_from_name(repo_name):
-    repo = get_by_repo_name(repo_name)
-    return repo.repo_id
-
-
 def show_id(commit):
     """
     Configurable function that shows ID
     by default it's r123:fffeeefffeee
 
     :param commit: commit instance
     """
     from rhodecode import CONFIG
     show_idx = str2bool(CONFIG.get('rhodecode_show_revision_number', True))
 
     raw_id = _shorten_commit_id(commit.raw_id)
     if show_idx:
         return 'r%s:%s' % (commit.idx, raw_id)
     else:
         return '%s' % (raw_id, )
 
 
 def format_date(date):
     """
     use a standardized formatting for dates used in RhodeCode
 
     :param date: date/datetime object
     :return: formatted date
     """
 
     if date:
         _fmt = "%a, %d %b %Y %H:%M:%S"
         return safe_unicode(date.strftime(_fmt))
 
     return u""
 
 
 class _RepoChecker(object):
 
     def __init__(self, backend_alias):
         self._backend_alias = backend_alias
 
     def __call__(self, repository):
         if hasattr(repository, 'alias'):
             _type = repository.alias
         elif hasattr(repository, 'repo_type'):
             _type = repository.repo_type
         else:
             _type = repository
         return _type == self._backend_alias
 
 is_git = _RepoChecker('git')
 is_hg = _RepoChecker('hg')
 is_svn = _RepoChecker('svn')
 
 
 def get_repo_type_by_name(repo_name):
     repo = Repository.get_by_repo_name(repo_name)
     return repo.repo_type
 
 
 def is_svn_without_proxy(repository):
     from rhodecode import CONFIG
     if is_svn(repository):
         if not CONFIG.get('rhodecode_proxy_subversion_http_requests', False):
             return True
     return False
 
 
+def discover_user(author):
+    """
+    Tries to discover RhodeCode User based on the autho string. Author string
+    is typically `FirstName LastName <[e-mail]>`
+    """
+
+    # if author is already an instance use it for extraction
+    if isinstance(author, User):
+        return author
+
+    # Valid email in the attribute passed, see if they're in the system
+    _email = author_email(author)
+    if _email != '':
+        user = User.get_by_email(_email, case_insensitive=True, cache=True)
+        if user is not None:
+            return user
+
+    # Maybe it's a username, we try to extract it and fetch by username ?
+    _author = author_name(author)
+    user = User.get_by_username(_author, case_insensitive=True, cache=True)
+    if user is not None:
+        return user
+
+    return None
+
+
 def email_or_none(author):
     # extract email from the commit string
     _email = author_email(author)
     if _email != '':
         # check it against RhodeCode database, and use the MAIN email for this
         # user
         user = User.get_by_email(_email, case_insensitive=True, cache=True)
         if user is not None:
             return user.email
         return _email
 
     # See if it contains a username we can get an email from
     user = User.get_by_username(author_name(author), case_insensitive=True,
                                 cache=True)
     if user is not None:
         return user.email
 
     # No valid email, not a valid user in the system, none!
     return None
 
 
-def discover_user(author):
-    # if author is already an instance use it for extraction
-    if isinstance(author, User):
-        return author
-
-    # Valid email in the attribute passed, see if they're in the system
-    _email = email(author)
-    if _email != '':
-        user = User.get_by_email(_email, case_insensitive=True, cache=True)
-        if user is not None:
-            return user
-
-    # Maybe it's a username?
-    _author = author_name(author)
-    user = User.get_by_username(_author, case_insensitive=True,
-                                cache=True)
-    if user is not None:
-        return user
-
-    return None
-
-
 def link_to_user(author, length=0, **kwargs):
     user = discover_user(author)
+    # user can be None, but if we have it already it means we can re-use it
+    # in the person() function, so we save 1 intensive-query
+    if user:
+        author = user
+
     display_person = person(author, 'username_or_name_or_email')
     if length:
         display_person = shorter(display_person, length)
 
     if user:
         return link_to(
             escape(display_person),
             url('user_profile', username=user.username),
             **kwargs)
     else:
         return escape(display_person)
 
 
 def person(author, show_attr="username_and_name"):
-    # attr to return from fetched user
-    person_getter = lambda usr: getattr(usr, show_attr)
     user = discover_user(author)
     if user:
-        return person_getter(user)
+        return getattr(user, show_attr)
     else:
         _author = author_name(author)
         _email = email(author)
         return _author or _email
 
 
 def person_by_id(id_, show_attr="username_and_name"):
     # attr to return from fetched user
     person_getter = lambda usr: getattr(usr, show_attr)
 
     #maybe it's an ID ?
     if str(id_).isdigit() or isinstance(id_, int):
         id_ = int(id_)
         user = User.get(id_)
         if user is not None:
             return person_getter(user)
     return id_
 
 
-def gravatar_with_user(author):
+def gravatar_with_user(author, show_disabled=False):
     from rhodecode.lib.utils import PartialRenderer
     _render = PartialRenderer('base/base.html')
-    return _render('gravatar_with_user', author)
+    return _render('gravatar_with_user', author, show_disabled=show_disabled)
 
 
 def desc_stylize(value):
     """
     converts tags from value into html equivalent
 
     :param value:
     """
     if not value:
         return ''
 
     value = re.sub(r'\[see\ \=\>\ *([a-zA-Z0-9\/\=\?\&\ \:\/\.\-]*)\]',
                    '<div class="metatag" tag="see">see =&gt; \\1 </div>', value)
     value = re.sub(r'\[license\ \=\>\ *([a-zA-Z0-9\/\=\?\&\ \:\/\.\-]*)\]',
                    '<div class="metatag" tag="license"><a href="http:\/\/www.opensource.org/licenses/\\1">\\1</a></div>', value)
     value = re.sub(r'\[(requires|recommends|conflicts|base)\ \=\>\ *([a-zA-Z0-9\-\/]*)\]',
                    '<div class="metatag" tag="\\1">\\1 =&gt; <a href="/\\2">\\2</a></div>', value)
     value = re.sub(r'\[(lang|language)\ \=\>\ *([a-zA-Z\-\/\#\+]*)\]',
                    '<div class="metatag" tag="lang">\\2</div>', value)
     value = re.sub(r'\[([a-z]+)\]',
-                  '<div class="metatag" tag="\\1">\\1</div>', value)
+                   '<div class="metatag" tag="\\1">\\1</div>', value)
 
     return value
 
 
 def escaped_stylize(value):
     """
     converts tags from value into html equivalent, but escaping its value first
     """
     if not value:
         return ''
 
     # Using default webhelper escape method, but has to force it as a
     # plain unicode instead of a markup tag to be used in regex expressions
     value = unicode(escape(safe_unicode(value)))
 
     value = re.sub(r'\[see\ \=\&gt;\ *([a-zA-Z0-9\/\=\?\&amp;\ \:\/\.\-]*)\]',
                    '<div class="metatag" tag="see">see =&gt; \\1 </div>', value)
     value = re.sub(r'\[license\ \=\&gt;\ *([a-zA-Z0-9\/\=\?\&amp;\ \:\/\.\-]*)\]',
                    '<div class="metatag" tag="license"><a href="http:\/\/www.opensource.org/licenses/\\1">\\1</a></div>', value)
     value = re.sub(r'\[(requires|recommends|conflicts|base)\ \=\&gt;\ *([a-zA-Z0-9\-\/]*)\]',
                    '<div class="metatag" tag="\\1">\\1 =&gt; <a href="/\\2">\\2</a></div>', value)
     value = re.sub(r'\[(lang|language)\ \=\&gt;\ *([a-zA-Z\-\/\#\+]*)\]',
                    '<div class="metatag" tag="lang">\\2</div>', value)
     value = re.sub(r'\[([a-z]+)\]',
-                  '<div class="metatag" tag="\\1">\\1</div>', value)
+                   '<div class="metatag" tag="\\1">\\1</div>', value)
 
     return value
 
 
 def bool2icon(value):
     """
     Returns boolean value of a given value, represented as html element with
     classes that will represent icons
 
     :param value: given value to convert to html node
     """
 
     if value:  # does bool conversion
         return HTML.tag('i', class_="icon-true")
     else:  # not true as bool
         return HTML.tag('i', class_="icon-false")
 
 
 #==============================================================================
 # PERMS
 #==============================================================================
 from rhodecode.lib.auth import HasPermissionAny, HasPermissionAll, \
 HasRepoPermissionAny, HasRepoPermissionAll, HasRepoGroupPermissionAll, \
 HasRepoGroupPermissionAny, HasRepoPermissionAnyApi, get_csrf_token
 
 
 #==============================================================================
 # GRAVATAR URL
 #==============================================================================
 class InitialsGravatar(object):
     def __init__(self, email_address, first_name, last_name, size=30,
                  background=None, text_color='#fff'):
         self.size = size
         self.first_name = first_name
         self.last_name = last_name
         self.email_address = email_address
         self.background = background or self.str2color(email_address)
         self.text_color = text_color
 
     def get_color_bank(self):
         """
         returns a predefined list of colors that gravatars can use.
         Those are randomized distinct colors that guarantee readability and
         uniqueness.
 
         generated with: http://phrogz.net/css/distinct-colors.html
         """
         return [
             '#bf3030', '#a67f53', '#00ff00', '#5989b3', '#392040', '#d90000',
             '#402910', '#204020', '#79baf2', '#a700b3', '#bf6060', '#7f5320',
             '#008000', '#003059', '#ee00ff', '#ff0000', '#8c4b00', '#007300',
             '#005fb3', '#de73e6', '#ff4040', '#ffaa00', '#3df255', '#203140',
             '#47004d', '#591616', '#664400', '#59b365', '#0d2133', '#83008c',
             '#592d2d', '#bf9f60', '#73e682', '#1d3f73', '#73006b', '#402020',
             '#b2862d', '#397341', '#597db3', '#e600d6', '#a60000', '#736039',
             '#00b318', '#79aaf2', '#330d30', '#ff8080', '#403010', '#16591f',
             '#002459', '#8c4688', '#e50000', '#ffbf40', '#00732e', '#102340',
             '#bf60ac', '#8c4646', '#cc8800', '#00a642', '#1d3473', '#b32d98',
             '#660e00', '#ffd580', '#80ffb2', '#7391e6', '#733967', '#d97b6c',
             '#8c5e00', '#59b389', '#3967e6', '#590047', '#73281d', '#665200',
             '#00e67a', '#2d50b3', '#8c2377', '#734139', '#b2982d', '#16593a',
             '#001859', '#ff00aa', '#a65e53', '#ffcc00', '#0d3321', '#2d3959',
             '#731d56', '#401610', '#4c3d00', '#468c6c', '#002ca6', '#d936a3',
             '#d94c36', '#403920', '#36d9a3', '#0d1733', '#592d4a', '#993626',
             '#cca300', '#00734d', '#46598c', '#8c005e', '#7f1100', '#8c7000',
             '#00a66f', '#7382e6', '#b32d74', '#d9896c', '#ffe680', '#1d7362',
             '#364cd9', '#73003d', '#d93a00', '#998a4d', '#59b3a1', '#5965b3',
             '#e5007a', '#73341d', '#665f00', '#00b38f', '#0018b3', '#59163a',
             '#b2502d', '#bfb960', '#00ffcc', '#23318c', '#a6537f', '#734939',
             '#b2a700', '#104036', '#3d3df2', '#402031', '#e56739', '#736f39',
             '#79f2ea', '#000059', '#401029', '#4c1400', '#ffee00', '#005953',
             '#101040', '#990052', '#402820', '#403d10', '#00ffee', '#0000d9',
             '#ff80c4', '#a66953', '#eeff00', '#00ccbe', '#8080ff', '#e673a1',
             '#a62c00', '#474d00', '#1a3331', '#46468c', '#733950', '#662900',
             '#858c23', '#238c85', '#0f0073', '#b20047', '#d9986c', '#becc00',
             '#396f73', '#281d73', '#ff0066', '#ff6600', '#dee673', '#59adb3',
             '#6559b3', '#590024', '#b2622d', '#98b32d', '#36ced9', '#332d59',
             '#40001a', '#733f1d', '#526600', '#005359', '#242040', '#bf6079',
             '#735039', '#cef23d', '#007780', '#5630bf', '#66001b', '#b24700',
             '#acbf60', '#1d6273', '#25008c', '#731d34', '#a67453', '#50592d',
             '#00ccff', '#6600ff', '#ff0044', '#4c1f00', '#8a994d', '#79daf2',
             '#a173e6', '#d93662', '#402310', '#aaff00', '#2d98b3', '#8c40ff',
             '#592d39', '#ff8c40', '#354020', '#103640', '#1a0040', '#331a20',
             '#331400', '#334d00', '#1d5673', '#583973', '#7f0022', '#4c3626',
             '#88cc00', '#36a3d9', '#3d0073', '#d9364c', '#33241a', '#698c23',
             '#5995b3', '#300059', '#e57382', '#7f3300', '#366600', '#00aaff',
             '#3a1659', '#733941', '#663600', '#74b32d', '#003c59', '#7f53a6',
             '#73000f', '#ff8800', '#baf279', '#79caf2', '#291040', '#a6293a',
             '#b2742d', '#587339', '#0077b3', '#632699', '#400009', '#d9a66c',
             '#294010', '#2d4a59', '#aa00ff', '#4c131b', '#b25f00', '#5ce600',
             '#267399', '#a336d9', '#990014', '#664e33', '#86bf60', '#0088ff',
             '#7700b3', '#593a16', '#073300', '#1d4b73', '#ac60bf', '#e59539',
             '#4f8c46', '#368dd9', '#5c0073'
         ]
 
     def rgb_to_hex_color(self, rgb_tuple):
         """
         Converts an rgb_tuple passed to an hex color.
 
         :param rgb_tuple: tuple with 3 ints represents rgb color space
         """
         return '#' + ("".join(map(chr, rgb_tuple)).encode('hex'))
 
     def email_to_int_list(self, email_str):
         """
         Get every byte of the hex digest value of email and turn it to integer.
         It's going to be always between 0-255
         """
         digest = md5_safe(email_str.lower())
         return [int(digest[i * 2:i * 2 + 2], 16) for i in range(16)]
 
     def pick_color_bank_index(self, email_str, color_bank):
         return self.email_to_int_list(email_str)[0] % len(color_bank)
 
     def str2color(self, email_str):
         """
         Tries to map in a stable algorithm an email to color
 
         :param email_str:
         """
         color_bank = self.get_color_bank()
         # pick position (module it's length so we always find it in the
         # bank even if it's smaller than 256 values
         pos = self.pick_color_bank_index(email_str, color_bank)
         return color_bank[pos]
 
     def normalize_email(self, email_address):
         import unicodedata
         # default host used to fill in the fake/missing email
         default_host = u'localhost'
 
         if not email_address:
             email_address = u'%s@%s' % (User.DEFAULT_USER, default_host)
 
         email_address = safe_unicode(email_address)
 
         if u'@' not in email_address:
             email_address = u'%s@%s' % (email_address, default_host)
 
         if email_address.endswith(u'@'):
             email_address = u'%s%s' % (email_address, default_host)
 
         email_address = unicodedata.normalize('NFKD', email_address)\
             .encode('ascii', 'ignore')
         return email_address
 
     def get_initials(self):
         """
         Returns 2 letter initials calculated based on the input.
         The algorithm picks first given email address, and takes first letter
         of part before @, and then the first letter of server name. In case
         the part before @ is in a format of `somestring.somestring2` it replaces
         the server letter with first letter of somestring2
 
         In case function was initialized with both first and lastname, this
         overrides the extraction from email by first letter of the first and
         last name. We add special logic to that functionality, In case Full name
         is compound, like Guido Von Rossum, we use last part of the last name
         (Von Rossum) picking `R`.
 
         Function also normalizes the non-ascii characters to they ascii
         representation, eg Ą => A
         """
         import unicodedata
         # replace non-ascii to ascii
         first_name = unicodedata.normalize(
             'NFKD', safe_unicode(self.first_name)).encode('ascii', 'ignore')
         last_name = unicodedata.normalize(
             'NFKD', safe_unicode(self.last_name)).encode('ascii', 'ignore')
 
         # do NFKD encoding, and also make sure email has proper format
         email_address = self.normalize_email(self.email_address)
 
         # first push the email initials
         prefix, server = email_address.split('@', 1)
 
         # check if prefix is maybe a 'firstname.lastname' 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
         fn_letter = (first_name or " ")[0].strip()
         ln_letter = (last_name.split(' ', 1)[-1] or " ")[0].strip()
 
         if fn_letter:
             initials[0] = fn_letter
 
         if ln_letter:
             initials[1] = ln_letter
 
         return ''.join(initials).upper()
 
     def get_img_data_by_type(self, font_family, img_type):
         default_user = """
         <svg xmlns="http://www.w3.org/2000/svg"
         version="1.1" x="0px" y="0px" width="{size}" height="{size}"
         viewBox="-15 -10 439.165 429.164"
 
         xml:space="preserve"
         style="background:{background};" >
 
         <path d="M204.583,216.671c50.664,0,91.74-48.075,
                  91.74-107.378c0-82.237-41.074-107.377-91.74-107.377
                  c-50.668,0-91.74,25.14-91.74,107.377C112.844,
                  168.596,153.916,216.671,
                  204.583,216.671z" fill="{text_color}"/>
         <path d="M407.164,374.717L360.88,
                  270.454c-2.117-4.771-5.836-8.728-10.465-11.138l-71.83-37.392
                  c-1.584-0.823-3.502-0.663-4.926,0.415c-20.316,
                  15.366-44.203,23.488-69.076,23.488c-24.877,
                  0-48.762-8.122-69.078-23.488
                  c-1.428-1.078-3.346-1.238-4.93-0.415L58.75,
                  259.316c-4.631,2.41-8.346,6.365-10.465,11.138L2.001,374.717
                  c-3.191,7.188-2.537,15.412,1.75,22.005c4.285,
                  6.592,11.537,10.526,19.4,10.526h362.861c7.863,0,15.117-3.936,
                  19.402-10.527 C409.699,390.129,
                  410.355,381.902,407.164,374.717z" fill="{text_color}"/>
         </svg>""".format(
             size=self.size,
             background='#979797',  # @grey4
             text_color=self.text_color,
             font_family=font_family)
 
         return {
             "default_user": default_user
         }[img_type]
 
     def get_img_data(self, svg_type=None):
         """
         generates the svg metadata for image
         """
 
         font_family = ','.join([
             'proximanovaregular',
             'Proxima Nova Regular',
             'Proxima Nova',
             'Arial',
             'Lucida Grande',
             'sans-serif'
             ])
         if svg_type:
             return self.get_img_data_by_type(font_family, svg_type)
 
         initials = self.get_initials()
         img_data = """
         <svg xmlns="http://www.w3.org/2000/svg" pointer-events="none"
              width="{size}" height="{size}"
              style="width: 100%; height: 100%; background-color: {background}"
              viewBox="0 0 {size} {size}">
             <text text-anchor="middle" y="50%" x="50%" dy="0.35em"
                   pointer-events="auto" fill="{text_color}"
                   font-family="{font_family}"
                   style="font-weight: 400; font-size: {f_size}px;">{text}
             </text>
         </svg>""".format(
             size=self.size,
             f_size=self.size/1.85,  # scale the text inside the box nicely
             background=self.background,
             text_color=self.text_color,
             text=initials.upper(),
             font_family=font_family)
 
         return img_data
 
     def generate_svg(self, svg_type=None):
         img_data = self.get_img_data(svg_type)
         return "data:image/svg+xml;base64,%s" % img_data.encode('base64')
 
 
 def initials_gravatar(email_address, first_name, last_name, size=30):
     svg_type = None
     if email_address == User.DEFAULT_USER_EMAIL:
         svg_type = 'default_user'
     klass = InitialsGravatar(email_address, first_name, last_name, size)
     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
 
     _use_gravatar = c.visual.use_gravatar
     _gravatar_url = c.visual.gravatar_url or User.DEFAULT_GRAVATAR_URL
 
     email_address = email_address or User.DEFAULT_USER_EMAIL
     if isinstance(email_address, unicode):
         # hashlib crashes on unicode items
         email_address = safe_str(email_address)
 
     # empty email or default user
     if not email_address or email_address == User.DEFAULT_USER_EMAIL:
         return initials_gravatar(User.DEFAULT_USER_EMAIL, '', '', size=size)
 
     if _use_gravatar:
         # TODO: Disuse pyramid thread locals. Think about another solution to
         # get the host and schema here.
         request = get_current_request()
         tmpl = safe_str(_gravatar_url)
         tmpl = tmpl.replace('{email}', email_address)\
                    .replace('{md5email}', md5_safe(email_address.lower())) \
                    .replace('{netloc}', request.host)\
                    .replace('{scheme}', request.scheme)\
                    .replace('{size}', safe_str(size))
         return tmpl
     else:
         return initials_gravatar(email_address, '', '', size=size)
 
 
 class Page(_Page):
     """
     Custom pager to match rendering style with paginator
     """
 
     def _get_pos(self, cur_page, max_page, items):
         edge = (items / 2) + 1
         if (cur_page <= edge):
             radius = max(items / 2, items - cur_page)
         elif (max_page - cur_page) < edge:
             radius = (items - 1) - (max_page - cur_page)
         else:
             radius = items / 2
 
         left = max(1, (cur_page - (radius)))
         right = min(max_page, cur_page + (radius))
         return left, cur_page, right
 
     def _range(self, regexp_match):
         """
         Return range of linked pages (e.g. '1 2 [3] 4 5 6 7 8').
 
         Arguments:
 
         regexp_match
             A "re" (regular expressions) match object containing the
             radius of linked pages around the current page in
             regexp_match.group(1) as a string
 
         This function is supposed to be called as a callable in
         re.sub.
 
         """
         radius = int(regexp_match.group(1))
 
         # Compute the first and last page number within the radius
         # e.g. '1 .. 5 6 [7] 8 9 .. 12'
         # -> leftmost_page  = 5
         # -> rightmost_page = 9
         leftmost_page, _cur, rightmost_page = self._get_pos(self.page,
                                                             self.last_page,
                                                             (radius * 2) + 1)
         nav_items = []
 
         # Create a link to the first page (unless we are on the first page
         # or there would be no need to insert '..' spacers)
         if self.page != self.first_page and self.first_page < leftmost_page:
             nav_items.append(self._pagerlink(self.first_page, self.first_page))
 
         # Insert dots if there are pages between the first page
         # and the currently displayed page range
         if leftmost_page - self.first_page > 1:
             # Wrap in a SPAN tag if nolink_attr is set
             text = '..'
             if self.dotdot_attr:
                 text = HTML.span(c=text, **self.dotdot_attr)
             nav_items.append(text)
 
         for thispage in xrange(leftmost_page, rightmost_page + 1):
             # Hilight the current page number and do not use a link
             if thispage == self.page:
                 text = '%s' % (thispage,)
                 # Wrap in a SPAN tag if nolink_attr is set
                 if self.curpage_attr:
                     text = HTML.span(c=text, **self.curpage_attr)
                 nav_items.append(text)
             # Otherwise create just a link to that page
             else:
                 text = '%s' % (thispage,)
                 nav_items.append(self._pagerlink(thispage, text))
 
         # Insert dots if there are pages between the displayed
         # page numbers and the end of the page range
         if self.last_page - rightmost_page > 1:
             text = '..'
             # Wrap in a SPAN tag if nolink_attr is set
             if self.dotdot_attr:
                 text = HTML.span(c=text, **self.dotdot_attr)
             nav_items.append(text)
 
         # Create a link to the very last page (unless we are on the last
         # page or there would be no need to insert '..' spacers)
         if self.page != self.last_page and rightmost_page < self.last_page:
             nav_items.append(self._pagerlink(self.last_page, self.last_page))
 
         ## prerender links
         #_page_link = url.current()
         #nav_items.append(literal('<link rel="prerender" href="%s?page=%s">' % (_page_link, str(int(self.page)+1))))
         #nav_items.append(literal('<link rel="prefetch" href="%s?page=%s">' % (_page_link, str(int(self.page)+1))))
         return self.separator.join(nav_items)
 
     def pager(self, format='~2~', page_param='page', partial_param='partial',
         show_if_single_page=False, separator=' ', onclick=None,
         symbol_first='<<', symbol_last='>>',
         symbol_previous='<', symbol_next='>',
         link_attr={'class': 'pager_link', 'rel': 'prerender'},
         curpage_attr={'class': 'pager_curpage'},
         dotdot_attr={'class': 'pager_dotdot'}, **kwargs):
 
         self.curpage_attr = curpage_attr
         self.separator = separator
         self.pager_kwargs = kwargs
         self.page_param = page_param
         self.partial_param = partial_param
         self.onclick = onclick
         self.link_attr = link_attr
         self.dotdot_attr = dotdot_attr
 
         # Don't show navigator if there is no more than one page
         if self.page_count == 0 or (self.page_count == 1 and not show_if_single_page):
             return ''
 
         from string import Template
         # Replace ~...~ in token format by range of pages
         result = re.sub(r'~(\d+)~', self._range, format)
 
         # Interpolate '%' variables
         result = Template(result).safe_substitute({
             'first_page': self.first_page,
             'last_page': self.last_page,
             'page': self.page,
             'page_count': self.page_count,
             'items_per_page': self.items_per_page,
             'first_item': self.first_item,
             'last_item': self.last_item,
             'item_count': self.item_count,
             'link_first': self.page > self.first_page and \
                     self._pagerlink(self.first_page, symbol_first) or '',
             'link_last': self.page < self.last_page and \
                     self._pagerlink(self.last_page, symbol_last) or '',
             'link_previous': self.previous_page and \
                     self._pagerlink(self.previous_page, symbol_previous) \
                     or HTML.span(symbol_previous, class_="pg-previous disabled"),
             'link_next': self.next_page and \
                     self._pagerlink(self.next_page, symbol_next) \
                     or HTML.span(symbol_next, class_="pg-next disabled")
         })
 
         return literal(result)
 
 
 #==============================================================================
 # REPO PAGER, PAGER FOR REPOSITORY
 #==============================================================================
 class RepoPage(Page):
 
     def __init__(self, collection, page=1, items_per_page=20,
                  item_count=None, url=None, **kwargs):
 
         """Create a "RepoPage" instance. special pager for paging
         repository
         """
         self._url_generator = url
 
         # Safe the kwargs class-wide so they can be used in the pager() method
         self.kwargs = kwargs
 
         # Save a reference to the collection
         self.original_collection = collection
 
         self.collection = collection
 
         # The self.page is the number of the current page.
         # The first page has the number 1!
         try:
             self.page = int(page)  # make it int() if we get it as a string
         except (ValueError, TypeError):
             self.page = 1
 
         self.items_per_page = items_per_page
 
         # Unless the user tells us how many items the collections has
         # we calculate that ourselves.
         if item_count is not None:
             self.item_count = item_count
         else:
             self.item_count = len(self.collection)
 
         # Compute the number of the first and last available page
         if self.item_count > 0:
             self.first_page = 1
             self.page_count = int(math.ceil(float(self.item_count) /
                                             self.items_per_page))
             self.last_page = self.first_page + self.page_count - 1
 
             # Make sure that the requested page number is the range of
             # valid pages
             if self.page > self.last_page:
                 self.page = self.last_page
             elif self.page < self.first_page:
                 self.page = self.first_page
 
             # Note: the number of items on this page can be less than
             #       items_per_page if the last page is not full
             self.first_item = max(0, (self.item_count) - (self.page *
                                                           items_per_page))
             self.last_item = ((self.item_count - 1) - items_per_page *
                               (self.page - 1))
 
             self.items = list(self.collection[self.first_item:self.last_item + 1])
 
             # Links to previous and next page
             if self.page > self.first_page:
                 self.previous_page = self.page - 1
             else:
                 self.previous_page = None
 
             if self.page < self.last_page:
                 self.next_page = self.page + 1
             else:
                 self.next_page = None
 
         # No items available
         else:
             self.first_page = None
             self.page_count = 0
             self.last_page = None
             self.first_item = None
             self.last_item = None
             self.previous_page = None
             self.next_page = None
             self.items = []
 
         # This is a subclass of the 'list' type. Initialise the list now.
         list.__init__(self, reversed(self.items))
 
 
 def changed_tooltip(nodes):
     """
     Generates a html string for changed nodes in commit page.
     It limits the output to 30 entries
 
     :param nodes: LazyNodesGenerator
     """
     if nodes:
         pref = ': <br/> '
         suf = ''
         if len(nodes) > 30:
             suf = '<br/>' + _(' and %s more') % (len(nodes) - 30)
         return literal(pref + '<br/> '.join([safe_unicode(x.path)
                                              for x in nodes[:30]]) + suf)
     else:
         return ': ' + _('No Files')
 
 
 def breadcrumb_repo_link(repo):
     """
     Makes a breadcrumbs path link to repo
 
     ex::
         group >> subgroup >> repo
 
     :param repo: a Repository instance
     """
 
     path = [
         link_to(group.name, url('repo_group_home', 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))
     ]
 
     return literal(' &raquo; '.join(path))
 
 
 def format_byte_size_binary(file_size):
     """
     Formats file/folder sizes to standard.
     """
     formatted_size = format_byte_size(file_size, binary=True)
     return formatted_size
 
 
 def fancy_file_stats(stats):
     """
     Displays a fancy two colored bar for number of added/deleted
     lines of code on file
 
     :param stats: two element list of added/deleted lines of code
     """
     from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
         MOD_FILENODE, RENAMED_FILENODE, CHMOD_FILENODE, BIN_FILENODE
 
     def cgen(l_type, a_v, d_v):
         mapping = {'tr': 'top-right-rounded-corner-mid',
                    'tl': 'top-left-rounded-corner-mid',
                    'br': 'bottom-right-rounded-corner-mid',
                    'bl': 'bottom-left-rounded-corner-mid'}
         map_getter = lambda x: mapping[x]
 
         if l_type == 'a' and d_v:
             #case when added and deleted are present
             return ' '.join(map(map_getter, ['tl', 'bl']))
 
         if l_type == 'a' and not d_v:
             return ' '.join(map(map_getter, ['tr', 'br', 'tl', 'bl']))
 
         if l_type == 'd' and a_v:
             return ' '.join(map(map_getter, ['tr', 'br']))
 
         if l_type == 'd' and not a_v:
             return ' '.join(map(map_getter, ['tr', 'br', 'tl', 'bl']))
 
     a, d = stats['added'], stats['deleted']
     width = 100
 
     if stats['binary']:  # binary operations like chmod/rename etc
         lbl = []
         bin_op = 0  # undefined
 
         # prefix with bin for binary files
         if BIN_FILENODE in stats['ops']:
             lbl += ['bin']
 
         if NEW_FILENODE in stats['ops']:
             lbl += [_('new file')]
             bin_op = NEW_FILENODE
         elif MOD_FILENODE in stats['ops']:
             lbl += [_('mod')]
             bin_op = MOD_FILENODE
         elif DEL_FILENODE in stats['ops']:
             lbl += [_('del')]
             bin_op = DEL_FILENODE
         elif RENAMED_FILENODE in stats['ops']:
             lbl += [_('rename')]
             bin_op = RENAMED_FILENODE
 
         # chmod can go with other operations, so we add a + to lbl if needed
         if CHMOD_FILENODE in stats['ops']:
             lbl += [_('chmod')]
             if bin_op == 0:
                 bin_op = CHMOD_FILENODE
 
         lbl = '+'.join(lbl)
         b_a = '<div class="bin bin%s %s" style="width:100%%">%s</div>' \
               % (bin_op, cgen('a', a_v='', d_v=0), lbl)
         b_d = '<div class="bin bin1" style="width:0%%"></div>'
         return literal('<div style="width:%spx">%s%s</div>' % (width, b_a, b_d))
 
     t = stats['added'] + stats['deleted']
     unit = float(width) / (t or 1)
 
     # needs > 9% of width to be visible or 0 to be hidden
     a_p = max(9, unit * a) if a > 0 else 0
     d_p = max(9, unit * d) if d > 0 else 0
     p_sum = a_p + d_p
 
     if p_sum > width:
         #adjust the percentage to be == 100% since we adjusted to 9
         if a_p > d_p:
             a_p = a_p - (p_sum - width)
         else:
             d_p = d_p - (p_sum - width)
 
     a_v = a if a > 0 else ''
     d_v = d if d > 0 else ''
 
     d_a = '<div class="added %s" style="width:%s%%">%s</div>' % (
         cgen('a', a_v, d_v), a_p, a_v
     )
     d_d = '<div class="deleted %s" style="width:%s%%">%s</div>' % (
         cgen('d', a_v, d_v), d_p, d_v
     )
     return literal('<div style="width:%spx">%s%s</div>' % (width, d_a, d_d))
 
 
 def urlify_text(text_, safe=True):
     """
     Extrac urls from text and make html links out of them
 
     :param text_:
     """
 
     url_pat = re.compile(r'''(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@#.&+]'''
                          '''|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+)''')
 
     def url_func(match_obj):
         url_full = match_obj.groups()[0]
         return '<a href="%(url)s">%(url)s</a>' % ({'url': url_full})
     _newtext = url_pat.sub(url_func, text_)
     if safe:
         return literal(_newtext)
     return _newtext
 
 
 def urlify_commits(text_, repository):
     """
     Extract commit ids from text and make link from them
 
     :param text_:
     :param repository: repo name to build the URL with
     """
     from pylons import url  # doh, we need to re-import url to mock it later
     URL_PAT = re.compile(r'(^|\s)([0-9a-fA-F]{12,40})($|\s)')
 
     def url_func(match_obj):
         commit_id = match_obj.groups()[1]
         pref = match_obj.groups()[0]
         suf = match_obj.groups()[2]
 
         tmpl = (
             '%(pref)s<a class="%(cls)s" href="%(url)s">'
             '%(commit_id)s</a>%(suf)s'
         )
         return tmpl % {
             'pref': pref,
             'cls': 'revision-link',
             'url': url('changeset_home', repo_name=repository,
                        revision=commit_id),
             'commit_id': commit_id,
             'suf': suf
         }
 
     newtext = URL_PAT.sub(url_func, text_)
 
     return newtext
 
 
 def _process_url_func(match_obj, repo_name, uid, entry):
     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>')
 
     (repo_name_cleaned,
      parent_group_name) = RepoGroupModel().\
         _get_group_name_and_parent(repo_name)
 
     # variables replacement
     named_vars = {
         'id': issue_id,
         'repo': repo_name,
         'repo_name': repo_name_cleaned,
         'group_name': parent_group_name
     }
     # named regex variables
     named_vars.update(match_obj.groupdict())
     _url = string.Template(entry['url']).safe_substitute(**named_vars)
 
     return tmpl % {
         'pref': pref,
         'cls': 'issue-tracker-link',
         'url': _url,
         'id-repr': issue_id,
         'issue-prefix': entry['pref'],
         'serv': entry['url'],
     }
 
 
 def process_patterns(text_string, repo_name, config):
     repo = None
     if repo_name:
         # Retrieving repo_name to avoid invalid repo_name to explode on
         # IssueTrackerSettingsModel but still passing invalid name further down
-        repo = Repository.get_by_repo_name(repo_name)
+        repo = Repository.get_by_repo_name(repo_name, cache=True)
 
     settings_model = IssueTrackerSettingsModel(repo=repo)
-    active_entries = settings_model.get_settings()
+    active_entries = settings_model.get_settings(cache=True)
 
     newtext = text_string
     for uid, entry in active_entries.items():
         url_func = partial(
             _process_url_func, repo_name=repo_name, entry=entry, uid=uid)
 
         log.debug('found issue tracker entry with uid %s' % (uid,))
 
         if not (entry['pat'] and entry['url']):
             log.debug('skipping due to missing data')
             continue
 
         log.debug('issue tracker entry: uid: `%s` PAT:%s URL:%s PREFIX:%s'
                   % (uid, entry['pat'], entry['url'], entry['pref']))
 
         try:
             pattern = re.compile(r'%s' % entry['pat'])
         except re.error:
             log.exception(
                 'issue tracker pattern: `%s` failed to compile',
                 entry['pat'])
             continue
 
         newtext = pattern.sub(url_func, newtext)
         log.debug('processed prefix:uid `%s`' % (uid,))
 
     return newtext
 
 
 def urlify_commit_message(commit_text, repository=None):
     """
     Parses given text message and makes proper links.
     issues are linked to given issue-server, and rest is a commit link
 
     :param commit_text:
     :param repository:
     """
     from pylons import url  # doh, we need to re-import url to mock it later
     from rhodecode import CONFIG
 
     def escaper(string):
         return string.replace('<', '&lt;').replace('>', '&gt;')
 
     newtext = escaper(commit_text)
     # urlify commits - extract commit ids and make link out of them, if we have
     # the scope of repository present.
     if repository:
         newtext = urlify_commits(newtext, repository)
 
     # extract http/https links and make them real urls
     newtext = urlify_text(newtext, safe=False)
 
     # process issue tracker patterns
     newtext = process_patterns(newtext, repository or '', CONFIG)
 
     return literal(newtext)
 
 
 def rst(source, mentions=False):
     return literal('<div class="rst-block">%s</div>' %
                    MarkupRenderer.rst(source, mentions=mentions))
 
 
 def markdown(source, mentions=False):
     return literal('<div class="markdown-block">%s</div>' %
                    MarkupRenderer.markdown(source, flavored=False,
                                            mentions=mentions))
 
 def renderer_from_filename(filename, exclude=None):
     from rhodecode.config.conf import MARKDOWN_EXTS, RST_EXTS
 
     def _filter(elements):
         if isinstance(exclude, (list, tuple)):
             return [x for x in elements if x not in exclude]
         return elements
 
     if filename.endswith(tuple(_filter([x[0] for x in MARKDOWN_EXTS if x[0]]))):
         return 'markdown'
     if filename.endswith(tuple(_filter([x[0] for x in RST_EXTS if x[0]]))):
         return 'rst'
 
 
 def render(source, renderer='rst', mentions=False):
     if renderer == 'rst':
         return rst(source, mentions=mentions)
     if renderer == 'markdown':
         return markdown(source, mentions=mentions)
 
 
 def commit_status(repo, commit_id):
     return ChangesetStatusModel().get_status(repo, commit_id)
 
 
 def commit_status_lbl(commit_status):
     return dict(ChangesetStatus.STATUSES).get(commit_status)
 
 
 def commit_time(repo_name, commit_id):
     repo = Repository.get_by_repo_name(repo_name)
     commit = repo.get_commit(commit_id=commit_id)
     return commit.date
 
 
 def get_permission_name(key):
     return dict(Permission.PERMS).get(key)
 
 
 def journal_filter_help():
     return _(
         'Example filter terms:\n' +
         '     repository:vcs\n' +
         '     username:marcin\n' +
         '     action:*push*\n' +
         '     ip:127.0.0.1\n' +
         '     date:20120101\n' +
         '     date:[20120101100000 TO 20120102]\n' +
         '\n' +
         'Generate wildcards using \'*\' character:\n' +
         '     "repository:vcs*" - search everything starting with \'vcs\'\n' +
         '     "repository:*vcs*" - search for repository containing \'vcs\'\n' +
         '\n' +
         'Optional AND / OR operators in queries\n' +
         '     "repository:vcs OR repository:test"\n' +
         '     "username:test AND repository:test*"\n'
     )
 
 
 def not_mapped_error(repo_name):
     flash(_('%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') % repo_name, category='error')
 
 
 def ip_range(ip_addr):
     from rhodecode.model.db import UserIpMap
     s, e = UserIpMap._get_ip_range(ip_addr)
     return '%s - %s' % (s, e)
 
 
 def form(url, method='post', needs_csrf_token=True, **attrs):
     """Wrapper around webhelpers.tags.form to prevent CSRF attacks."""
     if method.lower() != 'get' and needs_csrf_token:
         raise Exception(
             'Forms to POST/PUT/DELETE endpoints should have (in general) a ' +
             'CSRF token. If the endpoint does not require such token you can ' +
             'explicitly set the parameter needs_csrf_token to false.')
 
     return wh_form(url, method=method, **attrs)
 
 
 def secure_form(url, method="POST", multipart=False, **attrs):
     """Start a form tag that points the action to an url. This
     form tag will also include the hidden field containing
     the auth token.
 
     The url options should be given either as a string, or as a
     ``url()`` function. The method for the form defaults to POST.
 
     Options:
 
     ``multipart``
         If set to True, the enctype is set to "multipart/form-data".
     ``method``
         The method to use when submitting the form, usually either
         "GET" or "POST". If "PUT", "DELETE", or another verb is used, a
         hidden input with name _method is added to simulate the verb
         over POST.
 
     """
     from webhelpers.pylonslib.secure_form import insecure_form
     from rhodecode.lib.auth import get_csrf_token, csrf_token_key
     form = insecure_form(url, method, multipart, **attrs)
     token = HTML.div(hidden(csrf_token_key, get_csrf_token()), style="display: none;")
     return literal("%s\n%s" % (form, token))
 
 def dropdownmenu(name, selected, options, enable_filter=False, **attrs):
     select_html = select(name, selected, options, **attrs)
     select2 = """
         <script>
             $(document).ready(function() {
                   $('#%s').select2({
                       containerCssClass: 'drop-menu',
                       dropdownCssClass: 'drop-menu-dropdown',
                       dropdownAutoWidth: true%s
                   });
             });
         </script>
     """
     filter_option = """,
                         minimumResultsForSearch: -1
     """
     input_id = attrs.get('id') or name
     filter_enabled = "" if enable_filter else filter_option
     select_script = literal(select2 % (input_id, filter_enabled))
 
     return literal(select_html+select_script)
 
 
 def get_visual_attr(tmpl_context_var, attr_name):
     """
     A safe way to get a variable from visual variable of template context
 
     :param tmpl_context_var: instance of tmpl_context, usually present as `c`
     :param attr_name: name of the attribute we fetch from the c.visual
     """
     visual = getattr(tmpl_context_var, 'visual', None)
     if not visual:
         return
     else:
         return getattr(visual, attr_name, None)
 
 
 def get_last_path_part(file_node):
     if not file_node.path:
         return u''
 
     path = safe_unicode(file_node.path.split('/')[-1])
     return u'../' + path
 
 
 def route_path(*args, **kwds):
     """
     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)
 
 
 def resource_path(*args, **kwds):
     """
     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.resource_path(*args, **kwds)

rhodecode/lib/middleware/disable_vcs.py

@@ -1,70 +1,76 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2015-2016  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/
 
 """
 Disable VCS pages when VCS Server is not available
 """
 
 import logging
 import re
-
+from pyramid.httpexceptions import HTTPBadGateway
 
 log = logging.getLogger(__name__)
 
 
+class VCSServerUnavailable(HTTPBadGateway):
+    """ HTTP Exception class for when VCS Server is unavailable """
+    code = 502
+    title = 'VCS Server Required'
+    explanation = 'A VCS Server is required for this action. There is currently no VCS Server configured.'
+
 class DisableVCSPagesWrapper(object):
     """
-    Wrapper to disable all pages that require VCS Server to be running,
-    avoiding that errors explode to the user.
+    Pyramid view wrapper to disable all pages that require VCS Server to be
+    running, avoiding that errors explode to the user.
 
     This Wrapper should be enabled only in case VCS Server is not available
     for the instance.
     """
 
     VCS_NOT_REQUIRED = [
         '^/$',
         ('/_admin(?!/settings/mapping)(?!/my_account/repos)'
          '(?!/create_repository)(?!/gists)(?!/notifications/)'
          ),
     ]
     _REGEX_VCS_NOT_REQUIRED = [re.compile(path) for path in VCS_NOT_REQUIRED]
 
     def _check_vcs_requirement(self, path_info):
         """
         Tries to match the current path to one of the safe URLs to be rendered.
         Displays an error message in case
         """
         for regex in self._REGEX_VCS_NOT_REQUIRED:
             safe_url = regex.match(path_info)
             if safe_url:
                 return True
 
         # Url is not safe to be rendered without VCS Server
         log.debug('accessing: `%s` with VCS Server disabled', path_info)
         return False
 
-    def __init__(self, app):
-        self.application = app
+    def __init__(self, handler):
+        self.handler = handler
 
-    def __call__(self, environ, start_response):
-        if not self._check_vcs_requirement(environ['PATH_INFO']):
-            environ['PATH_INFO'] = '/error/vcs_unavailable'
+    def __call__(self, context, request):
+        if not self._check_vcs_requirement(request.path):
+            raise VCSServerUnavailable('VCS Server is not available')
 
-        return self.application(environ, start_response)
+        return self.handler(context, request)

rhodecode/lib/utils.py

@@ -1,982 +1,990 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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/
 
 """
 Utilities library for RhodeCode
 """
 
 import datetime
 import decorator
 import json
 import logging
 import os
 import re
 import shutil
 import tempfile
 import traceback
 import tarfile
 import warnings
-from os.path import abspath
-from os.path import dirname as dn, join as jn
+from os.path import join as jn
 
 import paste
 import pkg_resources
 from paste.script.command import Command, BadCommand
 from webhelpers.text import collapse, remove_formatting, strip_tags
 from mako import exceptions
+from pyramid.threadlocal import get_current_registry
 
 from rhodecode.lib.fakemod import create_module
 from rhodecode.lib.vcs.backends.base import Config
 from rhodecode.lib.vcs.exceptions import VCSError
 from rhodecode.lib.vcs.utils.helpers import get_scm, get_scm_backend
 from rhodecode.lib.utils2 import (
     safe_str, safe_unicode, get_current_rhodecode_user, md5)
 from rhodecode.model import meta
 from rhodecode.model.db import (
     Repository, User, RhodeCodeUi, UserLog, RepoGroup, UserGroup)
 from rhodecode.model.meta import Session
-from rhodecode.model.repo_group import RepoGroupModel
-from rhodecode.model.settings import VcsSettingsModel, SettingsModel
+
 
 log = logging.getLogger(__name__)
 
 REMOVED_REPO_PAT = re.compile(r'rm__\d{8}_\d{6}_\d{6}__.*')
 
 _license_cache = None
 
 
 def recursive_replace(str_, replace=' '):
     """
     Recursive replace of given sign to just one instance
 
     :param str_: given string
     :param replace: char to find and replace multiple instances
 
     Examples::
     >>> recursive_replace("Mighty---Mighty-Bo--sstones",'-')
     'Mighty-Mighty-Bo-sstones'
     """
 
     if str_.find(replace * 2) == -1:
         return str_
     else:
         str_ = str_.replace(replace * 2, replace)
         return recursive_replace(str_, replace)
 
 
 def repo_name_slug(value):
     """
     Return slug of name of repository
     This function is called on each creation/modification
     of repository to prevent bad names in repo
     """
 
     slug = remove_formatting(value)
     slug = strip_tags(slug)
 
     for c in """`?=[]\;'"<>,/~!@#$%^&*()+{}|: """:
         slug = slug.replace(c, '-')
     slug = recursive_replace(slug, '-')
     slug = collapse(slug, '-')
     return slug
 
 
 #==============================================================================
 # PERM DECORATOR HELPERS FOR EXTRACTING NAMES FOR PERM CHECKS
 #==============================================================================
 def get_repo_slug(request):
     _repo = request.environ['pylons.routes_dict'].get('repo_name')
     if _repo:
         _repo = _repo.rstrip('/')
     return _repo
 
 
 def get_repo_group_slug(request):
     _group = request.environ['pylons.routes_dict'].get('group_name')
     if _group:
         _group = _group.rstrip('/')
     return _group
 
 
 def get_user_group_slug(request):
     _group = request.environ['pylons.routes_dict'].get('user_group_id')
     try:
         _group = UserGroup.get(_group)
         if _group:
             _group = _group.users_group_name
     except Exception:
         log.debug(traceback.format_exc())
         #catch all failures here
         pass
 
     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
 
     :param path: path to scan for repositories
     :param recursive: recursive search and return names with subdirs in front
     """
 
     # remove ending slash for better results
     path = path.rstrip(os.sep)
     log.debug('now scanning in %s location recursive:%s...', path, recursive)
 
     def _get_repos(p):
         dirpaths = _get_dirpaths(p)
         if not _is_dir_writable(p):
             log.warning('repo path without write access: %s', p)
 
         for dirpath in dirpaths:
             if os.path.isfile(os.path.join(p, dirpath)):
                 continue
             cur_path = os.path.join(p, dirpath)
 
             # skip removed repos
             if skip_removed_repos and REMOVED_REPO_PAT.match(dirpath):
                 continue
 
             #skip .<somethin> dirs
             if dirpath.startswith('.'):
                 continue
 
             try:
                 scm_info = get_scm(cur_path)
                 yield scm_info[1].split(path, 1)[-1].lstrip(os.sep), scm_info
             except VCSError:
                 if not recursive:
                     continue
                 #check if this dir containts other repos for recursive scan
                 rec_path = os.path.join(p, dirpath)
                 if os.path.isdir(rec_path):
                     for inner_scm in _get_repos(rec_path):
                         yield inner_scm
 
     return _get_repos(path)
 
 
 def _get_dirpaths(p):
     try:
         # OS-independable way of checking if we have at least read-only
         # access or not.
         dirpaths = os.listdir(p)
     except OSError:
         log.warning('ignoring repo path without read access: %s', p)
         return []
 
     # os.listpath has a tweak: If a unicode is passed into it, then it tries to
     # decode paths and suddenly returns unicode objects itself. The items it
     # cannot decode are returned as strings and cause issues.
     #
     # Those paths are ignored here until a solid solution for path handling has
     # been built.
     expected_type = type(p)
 
     def _has_correct_type(item):
         if type(item) is not expected_type:
             log.error(
                 u"Ignoring path %s since it cannot be decoded into unicode.",
                 # Using "repr" to make sure that we see the byte value in case
                 # of support.
                 repr(item))
             return False
         return True
 
     dirpaths = [item for item in dirpaths if _has_correct_type(item)]
 
     return dirpaths
 
 
 def _is_dir_writable(path):
     """
     Probe if `path` is writable.
 
     Due to trouble on Cygwin / Windows, this is actually probing if it is
     possible to create a file inside of `path`, stat does not produce reliable
     results in this case.
     """
     try:
         with tempfile.TemporaryFile(dir=path):
             pass
     except OSError:
         return False
     return True
 
 
 def is_valid_repo(repo_name, base_path, expect_scm=None, explicit_scm=None):
     """
     Returns True if given path is a valid repository False otherwise.
     If expect_scm param is given also, compare if given scm is the same
     as expected from scm parameter. If explicit_scm is given don't try to
     detect the scm, just use the given one to check if repo is valid
 
     :param repo_name:
     :param base_path:
     :param expect_scm:
     :param explicit_scm:
 
     :return True: if given path is a valid repository
     """
     full_path = os.path.join(safe_str(base_path), safe_str(repo_name))
     log.debug('Checking if `%s` is a valid path for repository', repo_name)
 
     try:
         if explicit_scm:
             detected_scms = [get_scm_backend(explicit_scm)]
         else:
             detected_scms = get_scm(full_path)
 
         if expect_scm:
             return detected_scms[0] == expect_scm
         log.debug('path: %s is an vcs object:%s', full_path, detected_scms)
         return True
     except VCSError:
         log.debug('path: %s is not a valid repo !', full_path)
         return False
 
 
 def is_valid_repo_group(repo_group_name, base_path, skip_path_check=False):
     """
     Returns True if given path is a repository group, False otherwise
 
     :param repo_name:
     :param base_path:
     """
     full_path = os.path.join(safe_str(base_path), safe_str(repo_group_name))
     log.debug('Checking if `%s` is a valid path for repository group',
               repo_group_name)
 
     # check if it's not a repo
     if is_valid_repo(repo_group_name, base_path):
         log.debug('Repo called %s exist, it is not a valid '
                   'repo group' % repo_group_name)
         return False
 
     try:
         # we need to check bare git repos at higher level
         # since we might match branches/hooks/info/objects or possible
         # other things inside bare git repo
         scm_ = get_scm(os.path.dirname(full_path))
         log.debug('path: %s is a vcs object:%s, not valid '
                   'repo group' % (full_path, scm_))
         return False
     except VCSError:
         pass
 
     # check if it's a valid path
     if skip_path_check or os.path.isdir(full_path):
         log.debug('path: %s is a valid repo group !', full_path)
         return True
 
     log.debug('path: %s is not a valid repo group !', full_path)
     return False
 
 
 def ask_ok(prompt, retries=4, complaint='Yes or no please!'):
     while True:
         ok = raw_input(prompt)
         if ok in ('y', 'ye', 'yes'):
             return True
         if ok in ('n', 'no', 'nop', 'nope'):
             return False
         retries = retries - 1
         if retries < 0:
             raise IOError
         print complaint
 
 # propagated from mercurial documentation
 ui_sections = [
     'alias', 'auth',
     'decode/encode', 'defaults',
     'diff', 'email',
     'extensions', 'format',
     'merge-patterns', 'merge-tools',
     'hooks', 'http_proxy',
     'smtp', 'patch',
     'paths', 'profiling',
     'server', 'trusted',
     'ui', 'web', ]
 
 
 def config_data_from_db(clear_session=True, repo=None):
     """
     Read the configuration data from the database and return configuration
     tuples.
     """
+    from rhodecode.model.settings import VcsSettingsModel
+
     config = []
 
     sa = meta.Session()
     settings_model = VcsSettingsModel(repo=repo, sa=sa)
 
     ui_settings = settings_model.get_ui_settings()
 
     for setting in ui_settings:
         if setting.active:
             log.debug(
                 'settings ui from db: [%s] %s=%s',
                 setting.section, setting.key, setting.value)
             config.append((
                 safe_str(setting.section), safe_str(setting.key),
                 safe_str(setting.value)))
         if setting.key == 'push_ssl':
             # force set push_ssl requirement to False, rhodecode
             # handles that
             config.append((
                 safe_str(setting.section), safe_str(setting.key), False))
     if clear_session:
         meta.Session.remove()
 
     # TODO: mikhail: probably it makes no sense to re-read hooks information.
     # It's already there and activated/deactivated
     skip_entries = []
     enabled_hook_classes = get_enabled_hook_classes(ui_settings)
     if 'pull' not in enabled_hook_classes:
         skip_entries.append(('hooks', RhodeCodeUi.HOOK_PRE_PULL))
     if 'push' not in enabled_hook_classes:
         skip_entries.append(('hooks', RhodeCodeUi.HOOK_PRE_PUSH))
 
     config = [entry for entry in config if entry[:2] not in skip_entries]
 
     return config
 
 
 def make_db_config(clear_session=True, repo=None):
     """
     Create a :class:`Config` instance based on the values in the database.
     """
     config = Config()
     config_data = config_data_from_db(clear_session=clear_session, repo=repo)
     for section, option, value in config_data:
         config.set(section, option, value)
     return config
 
 
 def get_enabled_hook_classes(ui_settings):
     """
     Return the enabled hook classes.
 
     :param ui_settings: List of ui_settings as returned
         by :meth:`VcsSettingsModel.get_ui_settings`
 
     :return: a list with the enabled hook classes. The order is not guaranteed.
     :rtype: list
     """
     enabled_hooks = []
     active_hook_keys = [
         key for section, key, value, active in ui_settings
         if section == 'hooks' and active]
 
     hook_names = {
         RhodeCodeUi.HOOK_PUSH: 'push',
         RhodeCodeUi.HOOK_PULL: 'pull',
         RhodeCodeUi.HOOK_REPO_SIZE: 'repo_size'
     }
 
     for key in active_hook_keys:
         hook = hook_names.get(key)
         if hook:
             enabled_hooks.append(hook)
 
     return enabled_hooks
 
 
 def set_rhodecode_config(config):
     """
     Updates pylons config with new settings from database
 
     :param config:
     """
+    from rhodecode.model.settings import SettingsModel
     app_settings = SettingsModel().get_all_settings()
 
     for k, v in app_settings.items():
         config[k] = v
 
 
 def map_groups(path):
     """
     Given a full path to a repository, create all nested groups that this
     repo is inside. This function creates parent-child relationships between
     groups and creates default perms for all new groups.
 
     :param paths: full path to repository
     """
+    from rhodecode.model.repo_group import RepoGroupModel
     sa = meta.Session()
     groups = path.split(Repository.NAME_SEP)
     parent = None
     group = None
 
     # last element is repo in nested groups structure
     groups = groups[:-1]
     rgm = RepoGroupModel(sa)
-    owner = User.get_first_admin()
+    owner = User.get_first_super_admin()
     for lvl, group_name in enumerate(groups):
         group_name = '/'.join(groups[:lvl] + [group_name])
         group = RepoGroup.get_by_group_name(group_name)
         desc = '%s group' % group_name
 
         # skip folders that are now removed repos
         if REMOVED_REPO_PAT.match(group_name):
             break
 
         if group is None:
             log.debug('creating group level: %s group_name: %s',
                        lvl, group_name)
             group = RepoGroup(group_name, parent)
             group.group_description = desc
             group.user = owner
             sa.add(group)
             perm_obj = rgm._create_default_perms(group)
             sa.add(perm_obj)
             sa.flush()
 
         parent = group
     return group
 
 
 def repo2db_mapper(initial_repo_list, remove_obsolete=False):
     """
     maps all repos given in initial_repo_list, non existing repositories
     are created, if remove_obsolete is True it also checks for db entries
     that are not in initial_repo_list and removes them.
 
     :param initial_repo_list: list of repositories found by scanning methods
     :param remove_obsolete: check for obsolete entries in database
     """
     from rhodecode.model.repo import RepoModel
     from rhodecode.model.scm import ScmModel
+    from rhodecode.model.repo_group import RepoGroupModel
+    from rhodecode.model.settings import SettingsModel
+
     sa = meta.Session()
     repo_model = RepoModel()
-    user = User.get_first_admin()
+    user = User.get_first_super_admin()
     added = []
 
     # creation defaults
     defs = SettingsModel().get_default_repo_settings(strip_prefix=True)
     enable_statistics = defs.get('repo_enable_statistics')
     enable_locking = defs.get('repo_enable_locking')
     enable_downloads = defs.get('repo_enable_downloads')
     private = defs.get('repo_private')
 
     for name, repo in initial_repo_list.items():
         group = map_groups(name)
         unicode_name = safe_unicode(name)
         db_repo = repo_model.get_by_repo_name(unicode_name)
         # found repo that is on filesystem not in RhodeCode database
         if not db_repo:
             log.info('repository %s not found, creating now', name)
             added.append(name)
             desc = (repo.description
                     if repo.description != 'unknown'
                     else '%s repository' % name)
 
             db_repo = repo_model._create_repo(
                 repo_name=name,
                 repo_type=repo.alias,
                 description=desc,
                 repo_group=getattr(group, 'group_id', None),
                 owner=user,
                 enable_locking=enable_locking,
                 enable_downloads=enable_downloads,
                 enable_statistics=enable_statistics,
                 private=private,
                 state=Repository.STATE_CREATED
             )
             sa.commit()
             # we added that repo just now, and make sure we updated server info
             if db_repo.repo_type == 'git':
                 git_repo = db_repo.scm_instance()
                 # update repository server-info
                 log.debug('Running update server info')
                 git_repo._update_server_info()
 
             db_repo.update_commit_cache()
 
         config = db_repo._config
         config.set('extensions', 'largefiles', '')
         ScmModel().install_hooks(
             db_repo.scm_instance(config=config),
             repo_type=db_repo.repo_type)
 
     removed = []
     if remove_obsolete:
         # remove from database those repositories that are not in the filesystem
         for repo in sa.query(Repository).all():
             if repo.repo_name not in initial_repo_list.keys():
                 log.debug("Removing non-existing repository found in db `%s`",
                           repo.repo_name)
                 try:
                     RepoModel(sa).delete(repo, forks='detach', fs_remove=False)
                     sa.commit()
                     removed.append(repo.repo_name)
                 except Exception:
                     # don't hold further removals on error
                     log.error(traceback.format_exc())
                     sa.rollback()
 
         def splitter(full_repo_name):
             _parts = full_repo_name.rsplit(RepoGroup.url_sep(), 1)
             gr_name = None
             if len(_parts) == 2:
                 gr_name = _parts[0]
             return gr_name
 
         initial_repo_group_list = [splitter(x) for x in
                                    initial_repo_list.keys() if splitter(x)]
 
         # remove from database those repository groups that are not in the
         # filesystem due to parent child relationships we need to delete them
         # in a specific order of most nested first
         all_groups = [x.group_name for x in sa.query(RepoGroup).all()]
         nested_sort = lambda gr: len(gr.split('/'))
         for group_name in sorted(all_groups, key=nested_sort, reverse=True):
             if group_name not in initial_repo_group_list:
                 repo_group = RepoGroup.get_by_group_name(group_name)
                 if (repo_group.children.all() or
                     not RepoGroupModel().check_exist_filesystem(
                         group_name=group_name, exc_on_failure=False)):
                     continue
 
                 log.info(
                     'Removing non-existing repository group found in db `%s`',
                     group_name)
                 try:
                     RepoGroupModel(sa).delete(group_name, fs_remove=False)
                     sa.commit()
                     removed.append(group_name)
                 except Exception:
                     # don't hold further removals on error
                     log.exception(
                         'Unable to remove repository group `%s`',
                         group_name)
                     sa.rollback()
                     raise
 
     return added, removed
 
 
 def get_default_cache_settings(settings):
     cache_settings = {}
     for key in settings.keys():
         for prefix in ['beaker.cache.', 'cache.']:
             if key.startswith(prefix):
                 name = key.split(prefix)[1].strip()
                 cache_settings[name] = settings[key].strip()
     return cache_settings
 
 
 # set cache regions for beaker so celery can utilise it
 def add_cache(settings):
     from rhodecode.lib import caches
     cache_settings = {'regions': None}
     # main cache settings used as default ...
     cache_settings.update(get_default_cache_settings(settings))
 
     if cache_settings['regions']:
         for region in cache_settings['regions'].split(','):
             region = region.strip()
             region_settings = {}
             for key, value in cache_settings.items():
                 if key.startswith(region):
                     region_settings[key.split('.')[1]] = value
 
             caches.configure_cache_region(
                 region, region_settings, cache_settings)
 
 
 def load_rcextensions(root_path):
     import rhodecode
     from rhodecode.config import conf
 
     path = os.path.join(root_path, 'rcextensions', '__init__.py')
     if os.path.isfile(path):
         rcext = create_module('rc', path)
         EXT = rhodecode.EXTENSIONS = rcext
         log.debug('Found rcextensions now loading %s...', rcext)
 
         # Additional mappings that are not present in the pygments lexers
         conf.LANGUAGES_EXTENSIONS_MAP.update(getattr(EXT, 'EXTRA_MAPPINGS', {}))
 
         # auto check if the module is not missing any data, set to default if is
         # this will help autoupdate new feature of rcext module
         #from rhodecode.config import rcextensions
         #for k in dir(rcextensions):
         #    if not k.startswith('_') and not hasattr(EXT, k):
         #        setattr(EXT, k, getattr(rcextensions, k))
 
 
 def get_custom_lexer(extension):
     """
     returns a custom lexer if it is defined in rcextensions module, or None
     if there's no custom lexer defined
     """
     import rhodecode
     from pygments import lexers
     # check if we didn't define this extension as other lexer
     extensions = rhodecode.EXTENSIONS and getattr(rhodecode.EXTENSIONS, 'EXTRA_LEXERS', None)
     if extensions and extension in rhodecode.EXTENSIONS.EXTRA_LEXERS:
         _lexer_name = rhodecode.EXTENSIONS.EXTRA_LEXERS[extension]
         return lexers.get_lexer_by_name(_lexer_name)
 
 
 #==============================================================================
 # TEST FUNCTIONS AND CREATORS
 #==============================================================================
-def create_test_index(repo_location, config, full_index):
+def create_test_index(repo_location, config):
     """
-    Makes default test index
-
-    :param config: test config
-    :param full_index:
-    # start test server:
-    rcserver --with-vcsserver test.ini
+    Makes default test index.
+    """
+    import rc_testdata
 
-    # build index and store it in /tmp/rc/index:
-    rhodecode-index --force --api-host=http://vps1.dev:5000 --api-key=xxx --engine-location=/tmp/rc/index
-
-    # package and move new packages
-    tar -zcvf vcs_search_index.tar.gz -C /tmp/rc index
-    mv vcs_search_index.tar.gz rhodecode/tests/fixtures/
-
-    """
-    cur_dir = dn(dn(abspath(__file__)))
-    with tarfile.open(jn(cur_dir, 'tests', 'fixtures',
-                         'vcs_search_index.tar.gz')) as tar:
-        tar.extractall(os.path.dirname(config['search.location']))
+    rc_testdata.extract_search_index(
+        'vcs_search_index', os.path.dirname(config['search.location']))
 
 
-def create_test_env(repos_test_path, config):
+def create_test_directory(test_path):
+    """
+    Create test directory if it doesn't exist.
     """
-    Makes a fresh database and
-    installs test repository into tmp dir
+    if not os.path.isdir(test_path):
+        log.debug('Creating testdir %s', test_path)
+        os.makedirs(test_path)
+
+
+def create_test_database(test_path, config):
+    """
+    Makes a fresh database.
     """
     from rhodecode.lib.db_manage import DbManage
-    from rhodecode.tests import HG_REPO, GIT_REPO, SVN_REPO, TESTS_TMP_PATH
 
     # PART ONE create db
     dbconf = config['sqlalchemy.db1.url']
     log.debug('making test db %s', dbconf)
 
-    # create test dir if it doesn't exist
-    if not os.path.isdir(repos_test_path):
-        log.debug('Creating testdir %s', repos_test_path)
-        os.makedirs(repos_test_path)
-
     dbmanage = DbManage(log_sql=False, dbconf=dbconf, root=config['here'],
                         tests=True, cli_args={'force_ask': True})
     dbmanage.create_tables(override=True)
     dbmanage.set_db_version()
     # for tests dynamically set new root paths based on generated content
-    dbmanage.create_settings(dbmanage.config_prompt(repos_test_path))
+    dbmanage.create_settings(dbmanage.config_prompt(test_path))
     dbmanage.create_default_user()
     dbmanage.create_test_admin_and_users()
     dbmanage.create_permissions()
     dbmanage.populate_default_permissions()
     Session().commit()
-    # PART TWO make test repo
+
+
+def create_test_repositories(test_path, config):
+    """
+    Creates test repositories in the temporary directory. Repositories are
+    extracted from archives within the rc_testdata package.
+    """
+    import rc_testdata
+    from rhodecode.tests import HG_REPO, GIT_REPO, SVN_REPO
+
     log.debug('making test vcs repositories')
 
     idx_path = config['search.location']
     data_path = config['cache_dir']
 
     # clean index and data
     if idx_path and os.path.exists(idx_path):
         log.debug('remove %s', idx_path)
         shutil.rmtree(idx_path)
 
     if data_path and os.path.exists(data_path):
         log.debug('remove %s', data_path)
         shutil.rmtree(data_path)
 
-    # CREATE DEFAULT TEST REPOS
-    cur_dir = dn(dn(abspath(__file__)))
-    with tarfile.open(jn(cur_dir, 'tests', 'fixtures',
-                         'vcs_test_hg.tar.gz')) as tar:
-        tar.extractall(jn(TESTS_TMP_PATH, HG_REPO))
-
-    cur_dir = dn(dn(abspath(__file__)))
-    with tarfile.open(jn(cur_dir, 'tests', 'fixtures',
-                         'vcs_test_git.tar.gz')) as tar:
-        tar.extractall(jn(TESTS_TMP_PATH, GIT_REPO))
+    rc_testdata.extract_hg_dump('vcs_test_hg', jn(test_path, HG_REPO))
+    rc_testdata.extract_git_dump('vcs_test_git', jn(test_path, GIT_REPO))
 
     # Note: Subversion is in the process of being integrated with the system,
     # until we have a properly packed version of the test svn repository, this
     # tries to copy over the repo from a package "rc_testdata"
-    import rc_testdata
     svn_repo_path = rc_testdata.get_svn_repo_archive()
     with tarfile.open(svn_repo_path) as tar:
-        tar.extractall(jn(TESTS_TMP_PATH, SVN_REPO))
+        tar.extractall(jn(test_path, SVN_REPO))
 
 
 #==============================================================================
 # PASTER COMMANDS
 #==============================================================================
 class BasePasterCommand(Command):
     """
     Abstract Base Class for paster commands.
 
     The celery commands are somewhat aggressive about loading
     celery.conf, and since our module sets the `CELERY_LOADER`
     environment variable to our loader, we have to bootstrap a bit and
     make sure we've had a chance to load the pylons config off of the
     command line, otherwise everything fails.
     """
     min_args = 1
     min_args_error = "Please provide a paster config file as an argument."
     takes_config_file = 1
     requires_config_file = True
 
     def notify_msg(self, msg, log=False):
         """Make a notification to user, additionally if logger is passed
         it logs this action using given logger
 
         :param msg: message that will be printed to user
         :param log: logging instance, to use to additionally log this message
 
         """
         if log and isinstance(log, logging):
             log(msg)
 
     def run(self, args):
         """
         Overrides Command.run
 
         Checks for a config file argument and loads it.
         """
         if len(args) < self.min_args:
             raise BadCommand(
                 self.min_args_error % {'min_args': self.min_args,
                                        'actual_args': len(args)})
 
         # Decrement because we're going to lob off the first argument.
         # @@ This is hacky
         self.min_args -= 1
         self.bootstrap_config(args[0])
         self.update_parser()
         return super(BasePasterCommand, self).run(args[1:])
 
     def update_parser(self):
         """
         Abstract method.  Allows for the class' parser to be updated
         before the superclass' `run` method is called.  Necessary to
         allow options/arguments to be passed through to the underlying
         celery command.
         """
         raise NotImplementedError("Abstract Method.")
 
     def bootstrap_config(self, conf):
         """
         Loads the pylons configuration.
         """
         from pylons import config as pylonsconfig
 
         self.path_to_ini_file = os.path.realpath(conf)
         conf = paste.deploy.appconfig('config:' + self.path_to_ini_file)
         pylonsconfig.init_app(conf.global_conf, conf.local_conf)
 
     def _init_session(self):
         """
         Inits SqlAlchemy Session
         """
         logging.config.fileConfig(self.path_to_ini_file)
         from pylons import config
         from rhodecode.config.utils import initialize_database
 
         # get to remove repos !!
         add_cache(config)
         initialize_database(config)
 
 
 @decorator.decorator
 def jsonify(func, *args, **kwargs):
     """Action decorator that formats output for JSON
 
     Given a function that will return content, this decorator will turn
     the result into JSON, with a content-type of 'application/json' and
     output it.
 
     """
     from pylons.decorators.util import get_pylons
     from rhodecode.lib.ext_json import json
     pylons = get_pylons(args)
     pylons.response.headers['Content-Type'] = 'application/json; charset=utf-8'
     data = func(*args, **kwargs)
     if isinstance(data, (list, tuple)):
         msg = "JSON responses with Array envelopes are susceptible to " \
               "cross-site data leak attacks, see " \
               "http://wiki.pylonshq.com/display/pylonsfaq/Warnings"
         warnings.warn(msg, Warning, 2)
         log.warning(msg)
     log.debug("Returning JSON wrapped action output")
     return json.dumps(data, encoding='utf-8')
 
 
 class PartialRenderer(object):
     """
     Partial renderer used to render chunks of html used in datagrids
     use like::
 
         _render = PartialRenderer('data_table/_dt_elements.html')
         _render('quick_menu', args, kwargs)
         PartialRenderer.h,
                         c,
                         _,
                         ungettext
         are the template stuff initialized inside and can be re-used later
 
     :param tmpl_name: template path relate to /templates/ dir
     """
 
     def __init__(self, tmpl_name):
         import rhodecode
         from pylons import request, tmpl_context as c
         from pylons.i18n.translation import _, ungettext
         from rhodecode.lib import helpers as h
 
         self.tmpl_name = tmpl_name
         self.rhodecode = rhodecode
         self.c = c
         self._ = _
         self.ungettext = ungettext
         self.h = h
         self.request = request
 
     def _mako_lookup(self):
         _tmpl_lookup = self.rhodecode.CONFIG['pylons.app_globals'].mako_lookup
         return _tmpl_lookup.get_template(self.tmpl_name)
 
     def _update_kwargs_for_render(self, kwargs):
         """
         Inject params required for Mako rendering
         """
         _kwargs = {
             '_': self._,
             'h': self.h,
             'c': self.c,
             'request': self.request,
             'ungettext': self.ungettext,
         }
         _kwargs.update(kwargs)
         return _kwargs
 
     def _render_with_exc(self, render_func, args, kwargs):
         try:
             return render_func.render(*args, **kwargs)
         except:
             log.error(exceptions.text_error_template().render())
             raise
 
     def _get_template(self, template_obj, def_name):
         if def_name:
             tmpl = template_obj.get_def(def_name)
         else:
             tmpl = template_obj
         return tmpl
 
     def render(self, def_name, *args, **kwargs):
         lookup_obj = self._mako_lookup()
         tmpl = self._get_template(lookup_obj, def_name=def_name)
         kwargs = self._update_kwargs_for_render(kwargs)
         return self._render_with_exc(tmpl, args, kwargs)
 
     def __call__(self, tmpl, *args, **kwargs):
         return self.render(tmpl, *args, **kwargs)
 
 
 def password_changed(auth_user, session):
     if auth_user.username == User.DEFAULT_USER:
         return False
     password_hash = md5(auth_user.password) if auth_user.password else None
     rhodecode_user = session.get('rhodecode_user', {})
     session_password_hash = rhodecode_user.get('password', '')
     return password_hash != session_password_hash
 
 
 def read_opensource_licenses():
     global _license_cache
 
     if not _license_cache:
         licenses = pkg_resources.resource_string(
-            'rhodecode.config', 'licenses.json')
+            'rhodecode', 'config/licenses.json')
         _license_cache = json.loads(licenses)
 
     return _license_cache
+
+
+def get_registry(request):
+    """
+    Utility to get the pyramid registry from a request. During migration to
+    pyramid we sometimes want to use the pyramid registry from pylons context.
+    Therefore this utility returns `request.registry` for pyramid requests and
+    uses `get_current_registry()` for pylons requests.
+    """
+    try:
+        return request.registry
+    except AttributeError:
+        return get_current_registry()

rhodecode/lib/utils2.py

@@ -1,853 +1,860 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2011-2016  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/
 
 
 """
 Some simple helper functions
 """
 
 
 import collections
 import datetime
 import dateutil.relativedelta
 import hashlib
 import logging
 import re
 import sys
 import time
 import threading
 import urllib
 import urlobject
 import uuid
 
 import pygments.lexers
 import sqlalchemy
 import sqlalchemy.engine.url
 import webob
 
 import rhodecode
 
 
 def md5(s):
     return hashlib.md5(s).hexdigest()
 
 
 def md5_safe(s):
     return md5(safe_str(s))
 
 
 def __get_lem():
     """
     Get language extension map based on what's inside pygments lexers
     """
     d = collections.defaultdict(lambda: [])
 
     def __clean(s):
         s = s.lstrip('*')
         s = s.lstrip('.')
 
         if s.find('[') != -1:
             exts = []
             start, stop = s.find('['), s.find(']')
 
             for suffix in s[start + 1:stop]:
                 exts.append(s[:s.find('[')] + suffix)
             return [e.lower() for e in exts]
         else:
             return [s.lower()]
 
     for lx, t in sorted(pygments.lexers.LEXERS.items()):
         m = map(__clean, t[-2])
         if m:
             m = reduce(lambda x, y: x + y, m)
             for ext in m:
                 desc = lx.replace('Lexer', '')
                 d[ext].append(desc)
 
     return dict(d)
 
 
 def str2bool(_str):
     """
     returs True/False value from given string, it tries to translate the
     string into boolean
 
     :param _str: string value to translate into boolean
     :rtype: boolean
     :returns: boolean from given string
     """
     if _str is None:
         return False
     if _str in (True, False):
         return _str
     _str = str(_str).strip().lower()
     return _str in ('t', 'true', 'y', 'yes', 'on', '1')
 
 
 def aslist(obj, sep=None, strip=True):
     """
     Returns given string separated by sep as list
 
     :param obj:
     :param sep:
     :param strip:
     """
     if isinstance(obj, (basestring)):
         lst = obj.split(sep)
         if strip:
             lst = [v.strip() for v in lst]
         return lst
     elif isinstance(obj, (list, tuple)):
         return obj
     elif obj is None:
         return []
     else:
         return [obj]
 
 
 def convert_line_endings(line, mode):
     """
     Converts a given line  "line end" accordingly to given mode
 
     Available modes are::
         0 - Unix
         1 - Mac
         2 - DOS
 
     :param line: given line to convert
     :param mode: mode to convert to
     :rtype: str
     :return: converted line according to mode
     """
     if mode == 0:
         line = line.replace('\r\n', '\n')
         line = line.replace('\r', '\n')
     elif mode == 1:
         line = line.replace('\r\n', '\r')
         line = line.replace('\n', '\r')
     elif mode == 2:
         line = re.sub('\r(?!\n)|(?<!\r)\n', '\r\n', line)
     return line
 
 
 def detect_mode(line, default):
     """
     Detects line break for given line, if line break couldn't be found
     given default value is returned
 
     :param line: str line
     :param default: default
     :rtype: int
     :return: value of line end on of 0 - Unix, 1 - Mac, 2 - DOS
     """
     if line.endswith('\r\n'):
         return 2
     elif line.endswith('\n'):
         return 0
     elif line.endswith('\r'):
         return 1
     else:
         return default
 
 
 def safe_int(val, default=None):
     """
     Returns int() of val if val is not convertable to int use default
     instead
 
     :param val:
     :param default:
     """
 
     try:
         val = int(val)
     except (ValueError, TypeError):
         val = default
 
     return val
 
 
 def safe_unicode(str_, from_encoding=None):
     """
     safe unicode function. Does few trick to turn str_ into unicode
 
     In case of UnicodeDecode error, we try to return it with encoding detected
     by chardet library if it fails fallback to unicode with errors replaced
 
     :param str_: string to decode
     :rtype: unicode
     :returns: unicode object
     """
     if isinstance(str_, unicode):
         return str_
 
     if not from_encoding:
         DEFAULT_ENCODINGS = aslist(rhodecode.CONFIG.get('default_encoding',
                                                         'utf8'), sep=',')
         from_encoding = DEFAULT_ENCODINGS
 
     if not isinstance(from_encoding, (list, tuple)):
         from_encoding = [from_encoding]
 
     try:
         return unicode(str_)
     except UnicodeDecodeError:
         pass
 
     for enc in from_encoding:
         try:
             return unicode(str_, enc)
         except UnicodeDecodeError:
             pass
 
     try:
         import chardet
         encoding = chardet.detect(str_)['encoding']
         if encoding is None:
             raise Exception()
         return str_.decode(encoding)
     except (ImportError, UnicodeDecodeError, Exception):
         return unicode(str_, from_encoding[0], 'replace')
 
 
 def safe_str(unicode_, to_encoding=None):
     """
     safe str function. Does few trick to turn unicode_ into string
 
     In case of UnicodeEncodeError, we try to return it with encoding detected
     by chardet library if it fails fallback to string with errors replaced
 
     :param unicode_: unicode to encode
     :rtype: str
     :returns: str object
     """
 
     # if it's not basestr cast to str
     if not isinstance(unicode_, basestring):
         return str(unicode_)
 
     if isinstance(unicode_, str):
         return unicode_
 
     if not to_encoding:
         DEFAULT_ENCODINGS = aslist(rhodecode.CONFIG.get('default_encoding',
                                                         'utf8'), sep=',')
         to_encoding = DEFAULT_ENCODINGS
 
     if not isinstance(to_encoding, (list, tuple)):
         to_encoding = [to_encoding]
 
     for enc in to_encoding:
         try:
             return unicode_.encode(enc)
         except UnicodeEncodeError:
             pass
 
     try:
         import chardet
         encoding = chardet.detect(unicode_)['encoding']
         if encoding is None:
             raise UnicodeEncodeError()
 
         return unicode_.encode(encoding)
     except (ImportError, UnicodeEncodeError):
         return unicode_.encode(to_encoding[0], 'replace')
 
 
 def remove_suffix(s, suffix):
     if s.endswith(suffix):
         s = s[:-1 * len(suffix)]
     return s
 
 
 def remove_prefix(s, prefix):
     if s.startswith(prefix):
         s = s[len(prefix):]
     return s
 
 
 def find_calling_context(ignore_modules=None):
     """
     Look through the calling stack and return the frame which called
     this function and is part of core module ( ie. rhodecode.* )
 
     :param ignore_modules: list of modules to ignore eg. ['rhodecode.lib']
     """
 
     ignore_modules = ignore_modules or []
 
     f = sys._getframe(2)
     while f.f_back is not None:
         name = f.f_globals.get('__name__')
         if name and name.startswith(__name__.split('.')[0]):
             if name not in ignore_modules:
                 return f
         f = f.f_back
     return None
 
 
 def engine_from_config(configuration, prefix='sqlalchemy.', **kwargs):
     """Custom engine_from_config functions."""
     log = logging.getLogger('sqlalchemy.engine')
     engine = sqlalchemy.engine_from_config(configuration, prefix, **kwargs)
 
     def color_sql(sql):
         color_seq = '\033[1;33m'  # This is yellow: code 33
         normal = '\x1b[0m'
         return ''.join([color_seq, sql, normal])
 
     if configuration['debug']:
         # attach events only for debug configuration
 
         def before_cursor_execute(conn, cursor, statement,
                                   parameters, context, executemany):
             setattr(conn, 'query_start_time', time.time())
             log.info(color_sql(">>>>> STARTING QUERY >>>>>"))
             calling_context = find_calling_context(ignore_modules=[
-                'rhodecode.lib.caching_query'
+                'rhodecode.lib.caching_query',
+                'rhodecode.model.settings',
             ])
             if calling_context:
                 log.info(color_sql('call context %s:%s' % (
                     calling_context.f_code.co_filename,
                     calling_context.f_lineno,
                 )))
 
         def after_cursor_execute(conn, cursor, statement,
                                  parameters, context, executemany):
             delattr(conn, 'query_start_time')
 
         sqlalchemy.event.listen(engine, "before_cursor_execute",
                                 before_cursor_execute)
         sqlalchemy.event.listen(engine, "after_cursor_execute",
                                 after_cursor_execute)
 
     return engine
 
 
+def get_encryption_key(config):
+    secret = config.get('rhodecode.encrypted_values.secret')
+    default = config['beaker.session.secret']
+    return secret or default
+
+
 def age(prevdate, now=None, show_short_version=False, show_suffix=True,
         short_format=False):
     """
     Turns a datetime into an age string.
     If show_short_version is True, this generates a shorter string with
     an approximate age; ex. '1 day ago', rather than '1 day and 23 hours ago'.
 
     * IMPORTANT*
     Code of this function is written in special way so it's easier to
     backport it to javascript. If you mean to update it, please also update
     `jquery.timeago-extension.js` file
 
     :param prevdate: datetime object
     :param now: get current time, if not define we use
         `datetime.datetime.now()`
     :param show_short_version: if it should approximate the date and
         return a shorter string
     :param show_suffix:
     :param short_format: show short format, eg 2D instead of 2 days
     :rtype: unicode
     :returns: unicode words describing age
     """
     from pylons.i18n.translation import _, ungettext
 
     def _get_relative_delta(now, prevdate):
         base = dateutil.relativedelta.relativedelta(now, prevdate)
         return {
             'year': base.years,
             'month': base.months,
             'day': base.days,
             'hour': base.hours,
             'minute': base.minutes,
             'second': base.seconds,
         }
 
     def _is_leap_year(year):
         return year % 4 == 0 and (year % 100 != 0 or year % 400 == 0)
 
     def get_month(prevdate):
         return prevdate.month
 
     def get_year(prevdate):
         return prevdate.year
 
     now = now or datetime.datetime.now()
     order = ['year', 'month', 'day', 'hour', 'minute', 'second']
     deltas = {}
     future = False
 
     if prevdate > now:
         now_old = now
         now = prevdate
         prevdate = now_old
         future = True
     if future:
         prevdate = prevdate.replace(microsecond=0)
     # Get date parts deltas
     for part in order:
         rel_delta = _get_relative_delta(now, prevdate)
         deltas[part] = rel_delta[part]
 
     # Fix negative offsets (there is 1 second between 10:59:59 and 11:00:00,
     # not 1 hour, -59 minutes and -59 seconds)
     offsets = [[5, 60], [4, 60], [3, 24]]
     for element in offsets:  # seconds, minutes, hours
         num = element[0]
         length = element[1]
 
         part = order[num]
         carry_part = order[num - 1]
 
         if deltas[part] < 0:
             deltas[part] += length
             deltas[carry_part] -= 1
 
     # Same thing for days except that the increment depends on the (variable)
     # number of days in the month
     month_lengths = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
     if deltas['day'] < 0:
         if get_month(prevdate) == 2 and _is_leap_year(get_year(prevdate)):
             deltas['day'] += 29
         else:
             deltas['day'] += month_lengths[get_month(prevdate) - 1]
 
         deltas['month'] -= 1
 
     if deltas['month'] < 0:
         deltas['month'] += 12
         deltas['year'] -= 1
 
     # Format the result
     if short_format:
         fmt_funcs = {
             'year': lambda d: u'%dy' % d,
             'month': lambda d: u'%dm' % d,
             'day': lambda d: u'%dd' % d,
             'hour': lambda d: u'%dh' % d,
             'minute': lambda d: u'%dmin' % d,
             'second': lambda d: u'%dsec' % d,
         }
     else:
         fmt_funcs = {
             'year': lambda d: ungettext(u'%d year', '%d years', d) % d,
             'month': lambda d: ungettext(u'%d month', '%d months', d) % d,
             'day': lambda d: ungettext(u'%d day', '%d days', d) % d,
             'hour': lambda d: ungettext(u'%d hour', '%d hours', d) % d,
             'minute': lambda d: ungettext(u'%d minute', '%d minutes', d) % d,
             'second': lambda d: ungettext(u'%d second', '%d seconds', d) % d,
         }
 
     i = 0
     for part in order:
         value = deltas[part]
         if value != 0:
 
             if i < 5:
                 sub_part = order[i + 1]
                 sub_value = deltas[sub_part]
             else:
                 sub_value = 0
 
             if sub_value == 0 or show_short_version:
                 _val = fmt_funcs[part](value)
                 if future:
                     if show_suffix:
                         return _(u'in %s') % _val
                     else:
                         return _val
 
                 else:
                     if show_suffix:
                         return _(u'%s ago') % _val
                     else:
                         return _val
 
             val = fmt_funcs[part](value)
             val_detail = fmt_funcs[sub_part](sub_value)
 
             if short_format:
                 datetime_tmpl = u'%s, %s'
                 if show_suffix:
                     datetime_tmpl = _(u'%s, %s ago')
                     if future:
                         datetime_tmpl = _(u'in %s, %s')
             else:
                 datetime_tmpl = _(u'%s and %s')
                 if show_suffix:
                     datetime_tmpl = _(u'%s and %s ago')
                     if future:
                         datetime_tmpl = _(u'in %s and %s')
 
             return datetime_tmpl % (val, val_detail)
         i += 1
     return _(u'just now')
 
 
 def uri_filter(uri):
     """
     Removes user:password from given url string
 
     :param uri:
     :rtype: unicode
     :returns: filtered list of strings
     """
     if not uri:
         return ''
 
     proto = ''
 
     for pat in ('https://', 'http://'):
         if uri.startswith(pat):
             uri = uri[len(pat):]
             proto = pat
             break
 
     # remove passwords and username
     uri = uri[uri.find('@') + 1:]
 
     # get the port
     cred_pos = uri.find(':')
     if cred_pos == -1:
         host, port = uri, None
     else:
         host, port = uri[:cred_pos], uri[cred_pos + 1:]
 
     return filter(None, [proto, host, port])
 
 
 def credentials_filter(uri):
     """
     Returns a url with removed credentials
 
     :param uri:
     """
 
     uri = uri_filter(uri)
     # check if we have port
     if len(uri) > 2 and uri[2]:
         uri[2] = ':' + uri[2]
 
     return ''.join(uri)
 
 
 def get_clone_url(uri_tmpl, qualifed_home_url, repo_name, repo_id, **override):
     parsed_url = urlobject.URLObject(qualifed_home_url)
     decoded_path = safe_unicode(urllib.unquote(parsed_url.path.rstrip('/')))
     args = {
         'scheme': parsed_url.scheme,
         'user': '',
         # path if we use proxy-prefix
         'netloc': parsed_url.netloc+decoded_path,
         'prefix': decoded_path,
         'repo': repo_name,
         'repoid': str(repo_id)
     }
     args.update(override)
     args['user'] = urllib.quote(safe_str(args['user']))
 
     for k, v in args.items():
         uri_tmpl = uri_tmpl.replace('{%s}' % k, v)
 
     # remove leading @ sign if it's present. Case of empty user
     url_obj = urlobject.URLObject(uri_tmpl)
     url = url_obj.with_netloc(url_obj.netloc.lstrip('@'))
 
     return safe_unicode(url)
 
 
 def get_commit_safe(repo, commit_id=None, commit_idx=None, pre_load=None):
     """
     Safe version of get_commit if this commit doesn't exists for a
     repository it returns a Dummy one instead
 
     :param repo: repository instance
     :param commit_id: commit id as str
     :param pre_load: optional list of commit attributes to load
     """
     # TODO(skreft): remove these circular imports
     from rhodecode.lib.vcs.backends.base import BaseRepository, EmptyCommit
     from rhodecode.lib.vcs.exceptions import RepositoryError
     if not isinstance(repo, BaseRepository):
         raise Exception('You must pass an Repository '
                         'object as first argument got %s', type(repo))
 
     try:
         commit = repo.get_commit(
             commit_id=commit_id, commit_idx=commit_idx, pre_load=pre_load)
     except (RepositoryError, LookupError):
         commit = EmptyCommit()
     return commit
 
 
 def datetime_to_time(dt):
     if dt:
         return time.mktime(dt.timetuple())
 
 
 def time_to_datetime(tm):
     if tm:
         if isinstance(tm, basestring):
             try:
                 tm = float(tm)
             except ValueError:
                 return
         return datetime.datetime.fromtimestamp(tm)
 
 
 def time_to_utcdatetime(tm):
     if tm:
         if isinstance(tm, basestring):
             try:
                 tm = float(tm)
             except ValueError:
                 return
         return datetime.datetime.utcfromtimestamp(tm)
 
 
 MENTIONS_REGEX = re.compile(
     # ^@ or @ without any special chars in front
     r'(?:^@|[^a-zA-Z0-9\-\_\.]@)'
     # main body starts with letter, then can be . - _
     r'([a-zA-Z0-9]{1}[a-zA-Z0-9\-\_\.]+)',
     re.VERBOSE | re.MULTILINE)
 
 
 def extract_mentioned_users(s):
     """
     Returns unique usernames from given string s that have @mention
 
     :param s: string to get mentions
     """
     usrs = set()
     for username in MENTIONS_REGEX.findall(s):
         usrs.add(username)
 
     return sorted(list(usrs), key=lambda k: k.lower())
 
 
 class AttributeDict(dict):
     def __getattr__(self, attr):
         return self.get(attr, None)
     __setattr__ = dict.__setitem__
     __delattr__ = dict.__delitem__
 
 
 def fix_PATH(os_=None):
     """
     Get current active python path, and append it to PATH variable to fix
     issues of subprocess calls and different python versions
     """
     if os_ is None:
         import os
     else:
         os = os_
 
     cur_path = os.path.split(sys.executable)[0]
     if not os.environ['PATH'].startswith(cur_path):
         os.environ['PATH'] = '%s:%s' % (cur_path, os.environ['PATH'])
 
 
 def obfuscate_url_pw(engine):
     _url = engine or ''
     try:
         _url = sqlalchemy.engine.url.make_url(engine)
         if _url.password:
             _url.password = 'XXXXX'
     except Exception:
         pass
     return unicode(_url)
 
 
 def get_server_url(environ):
     req = webob.Request(environ)
     return req.host_url + req.script_name
 
 
 def unique_id(hexlen=32):
     alphabet = "23456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghjklmnpqrstuvwxyz"
     return suuid(truncate_to=hexlen, alphabet=alphabet)
 
 
 def suuid(url=None, truncate_to=22, alphabet=None):
     """
     Generate and return a short URL safe UUID.
 
     If the url parameter is provided, set the namespace to the provided
     URL and generate a UUID.
 
     :param url to get the uuid for
     :truncate_to: truncate the basic 22 UUID to shorter version
 
     The IDs won't be universally unique any longer, but the probability of
     a collision will still be very low.
     """
     # Define our alphabet.
     _ALPHABET = alphabet or "23456789ABCDEFGHJKLMNPQRSTUVWXYZ"
 
     # If no URL is given, generate a random UUID.
     if url is None:
         unique_id = uuid.uuid4().int
     else:
         unique_id = uuid.uuid3(uuid.NAMESPACE_URL, url).int
 
     alphabet_length = len(_ALPHABET)
     output = []
     while unique_id > 0:
         digit = unique_id % alphabet_length
         output.append(_ALPHABET[digit])
         unique_id = int(unique_id / alphabet_length)
     return "".join(output)[:truncate_to]
 
 
 def get_current_rhodecode_user():
     """
     Gets rhodecode user from threadlocal tmpl_context variable if it's
     defined, else returns None.
     """
     from pylons import tmpl_context as c
     if hasattr(c, 'rhodecode_user'):
         return c.rhodecode_user
 
     return None
 
 
 def action_logger_generic(action, namespace=''):
     """
     A generic logger for actions useful to the system overview, tries to find
     an acting user for the context of the call otherwise reports unknown user
 
     :param action: logging message eg 'comment 5 deleted'
     :param type: string
 
     :param namespace: namespace of the logging message eg. 'repo.comments'
     :param type: string
 
     """
 
     logger_name = 'rhodecode.actions'
 
     if namespace:
         logger_name += '.' + namespace
 
     log = logging.getLogger(logger_name)
 
     # get a user if we can
     user = get_current_rhodecode_user()
 
     logfunc = log.info
 
     if not user:
         user = '<unknown user>'
         logfunc = log.warning
 
     logfunc('Logging action by {}: {}'.format(user, action))
 
 
 def escape_split(text, sep=',', maxsplit=-1):
     r"""
     Allows for escaping of the separator: e.g. arg='foo\, bar'
 
     It should be noted that the way bash et. al. do command line parsing, those
     single quotes are required.
     """
     escaped_sep = r'\%s' % sep
 
     if escaped_sep not in text:
         return text.split(sep, maxsplit)
 
     before, _mid, after = text.partition(escaped_sep)
     startlist = before.split(sep, maxsplit)  # a regular split is fine here
     unfinished = startlist[-1]
     startlist = startlist[:-1]
 
     # recurse because there may be more escaped separators
     endlist = escape_split(after, sep, maxsplit)
 
     # finish building the escaped value. we use endlist[0] becaue the first
     # part of the string sent in recursion is the rest of the escaped value.
     unfinished += sep + endlist[0]
 
     return startlist + [unfinished] + endlist[1:]  # put together all the parts
 
 
 class OptionalAttr(object):
     """
     Special Optional Option that defines other attribute. Example::
 
         def test(apiuser, userid=Optional(OAttr('apiuser')):
             user = Optional.extract(userid)
             # calls
 
     """
 
     def __init__(self, attr_name):
         self.attr_name = attr_name
 
     def __repr__(self):
         return '<OptionalAttr:%s>' % self.attr_name
 
     def __call__(self):
         return self
 
 
 # alias
 OAttr = OptionalAttr
 
 
 class Optional(object):
     """
     Defines an optional parameter::
 
         param = param.getval() if isinstance(param, Optional) else param
         param = param() if isinstance(param, Optional) else param
 
     is equivalent of::
 
         param = Optional.extract(param)
 
     """
 
     def __init__(self, type_):
         self.type_ = type_
 
     def __repr__(self):
         return '<Optional:%s>' % self.type_.__repr__()
 
     def __call__(self):
         return self.getval()
 
     def getval(self):
         """
         returns value from this Optional instance
         """
         if isinstance(self.type_, OAttr):
             # use params name
             return self.type_.attr_name
         return self.type_
 
     @classmethod
     def extract(cls, val):
         """
         Extracts value from Optional() instance
 
         :param val:
         :return: original value if it's not Optional instance else
             value of instance
         """
         if isinstance(val, cls):
             return val.getval()
         return val

rhodecode/lib/vcs/__init__.py

@@ -1,275 +1,278 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2014-2016  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/
 
 """
 Various version Control System version lib (vcs) management abstraction layer
 for Python. Build with server client architecture.
 """
 
 
 VERSION = (0, 5, 0, 'dev')
 
 __version__ = '.'.join((str(each) for each in VERSION[:4]))
 
 __all__ = [
     'get_version', 'get_repo', 'get_backend',
     'VCSError', 'RepositoryError', 'CommitError'
     ]
 
 import atexit
 import logging
 import subprocess
 import time
 import urlparse
 from cStringIO import StringIO
 
 import pycurl
 import Pyro4
 from Pyro4.errors import CommunicationError
 
 from rhodecode.lib.vcs.conf import settings
 from rhodecode.lib.vcs.backends import get_repo, get_backend
 from rhodecode.lib.vcs.exceptions import (
     VCSError, RepositoryError, CommitError)
 
 
 log = logging.getLogger(__name__)
 
 
 def get_version():
     """
     Returns shorter version (digit parts only) as string.
     """
     return '.'.join((str(each) for each in VERSION[:3]))
 
 
 def connect_pyro4(server_and_port):
     from rhodecode.lib.vcs import connection, client
     from rhodecode.lib.middleware.utils import scm_app
 
     git_remote = client.ThreadlocalProxyFactory(
         settings.pyro_remote(settings.PYRO_GIT, server_and_port))
     hg_remote = client.ThreadlocalProxyFactory(
         settings.pyro_remote(settings.PYRO_HG, server_and_port))
     svn_remote = client.ThreadlocalProxyFactory(
         settings.pyro_remote(settings.PYRO_SVN, server_and_port))
 
     connection.Git = client.RepoMaker(proxy_factory=git_remote)
     connection.Hg = client.RepoMaker(proxy_factory=hg_remote)
     connection.Svn = client.RepoMaker(proxy_factory=svn_remote)
 
     scm_app.GIT_REMOTE_WSGI = Pyro4.Proxy(
         settings.pyro_remote(
             settings.PYRO_GIT_REMOTE_WSGI, server_and_port))
     scm_app.HG_REMOTE_WSGI = Pyro4.Proxy(
         settings.pyro_remote(
             settings.PYRO_HG_REMOTE_WSGI, server_and_port))
 
     @atexit.register
     def free_connection_resources():
         connection.Git = None
         connection.Hg = None
         connection.Svn = None
 
 
 def connect_http(server_and_port):
     from rhodecode.lib.vcs import connection, client_http
     from rhodecode.lib.middleware.utils import scm_app
 
-    session = _create_http_rpc_session()
+    session_factory = client_http.ThreadlocalSessionFactory()
 
-    connection.Git = client_http.RepoMaker(server_and_port, '/git', session)
-    connection.Hg = client_http.RepoMaker(server_and_port, '/hg', session)
-    connection.Svn = client_http.RepoMaker(server_and_port, '/svn', session)
+    connection.Git = client_http.RepoMaker(
+        server_and_port, '/git', session_factory)
+    connection.Hg = client_http.RepoMaker(
+        server_and_port, '/hg', session_factory)
+    connection.Svn = client_http.RepoMaker(
+        server_and_port, '/svn', session_factory)
 
     scm_app.HG_REMOTE_WSGI = client_http.VcsHttpProxy(
         server_and_port, '/proxy/hg')
     scm_app.GIT_REMOTE_WSGI = client_http.VcsHttpProxy(
         server_and_port, '/proxy/git')
 
     @atexit.register
     def free_connection_resources():
         connection.Git = None
         connection.Hg = None
         connection.Svn = None
 
 
 def connect_vcs(server_and_port, protocol='pyro4'):
     """
     Initializes the connection to the vcs server.
 
     :param server_and_port: str, e.g. "localhost:9900"
     :param protocol: str, "pyro4" or "http"
     """
     if protocol == 'pyro4':
         connect_pyro4(server_and_port)
     elif protocol == 'http':
         connect_http(server_and_port)
 
 
 # TODO: johbo: This function should be moved into our test suite, there is
 # no reason to support starting the vcsserver in Enterprise itself.
 def start_vcs_server(server_and_port, protocol='pyro4', log_level=None):
     """
     Starts the vcs server in a subprocess.
     """
     log.info('Starting VCSServer as a sub process with %s protocol', protocol)
     if protocol == 'http':
         return _start_http_vcs_server(server_and_port, log_level)
     elif protocol == 'pyro4':
         return _start_pyro4_vcs_server(server_and_port, log_level)
 
 
 def _start_pyro4_vcs_server(server_and_port, log_level=None):
     _try_to_shutdown_running_server(server_and_port)
     host, port = server_and_port.rsplit(":", 1)
     host = host.strip('[]')
     args = [
         'vcsserver', '--port', port, '--host', host, '--locale', 'en_US.UTF-8',
         '--threadpool', '32']
     if log_level:
         args += ['--log-level', log_level]
     proc = subprocess.Popen(args)
 
     def cleanup_server_process():
         proc.kill()
     atexit.register(cleanup_server_process)
 
     server = create_vcsserver_proxy(server_and_port, protocol='pyro4')
     _wait_until_vcs_server_is_reachable(server)
 
 
 def _start_http_vcs_server(server_and_port, log_level=None):
     # TODO: mikhail: shutdown if an http server already runs
 
     host, port = server_and_port.rsplit(":", 1)
     args = [
         'pserve', 'vcsserver/development_pyramid.ini',
         'http_port=%s' % (port, ), 'http_host=%s' % (host, )]
     proc = subprocess.Popen(args)
 
     def cleanup_server_process():
         proc.kill()
     atexit.register(cleanup_server_process)
 
     server = create_vcsserver_proxy(server_and_port, protocol='http')
     _wait_until_vcs_server_is_reachable(server)
 
 
 def _wait_until_vcs_server_is_reachable(server):
     while xrange(80):  # max 40s of sleep
         try:
             server.ping()
             break
         except (CommunicationError, pycurl.error):
             pass
         time.sleep(0.5)
 
 
 def _try_to_shutdown_running_server(server_and_port):
     server = create_vcsserver_proxy(server_and_port)
     try:
         server.shutdown()
     except (CommunicationError, pycurl.error):
         return
 
     # TODO: Not sure why this is important, but without it the following start
     # of the server fails.
     server = create_vcsserver_proxy(server_and_port)
     server.ping()
 
 
 def create_vcsserver_proxy(server_and_port, protocol='pyro4'):
     if protocol == 'pyro4':
         return _create_vcsserver_proxy_pyro4(server_and_port)
     elif protocol == 'http':
         return _create_vcsserver_proxy_http(server_and_port)
 
 
 def _create_vcsserver_proxy_pyro4(server_and_port):
     server = Pyro4.Proxy(
         settings.pyro_remote(settings.PYRO_VCSSERVER, server_and_port))
     return server
 
 
 def _create_vcsserver_proxy_http(server_and_port):
     from rhodecode.lib.vcs import client_http
 
     session = _create_http_rpc_session()
     url = urlparse.urljoin('http://%s' % server_and_port, '/server')
     return client_http.RemoteObject(url, session)
 
 
 class CurlSession(object):
     """
     Modeled so that it provides a subset of the requests interface.
 
     This has been created so that it does only provide a minimal API for our
     needs. The parts which it provides are based on the API of the library
     `requests` which allows us to easily benchmark against it.
 
     Please have a look at the class :class:`requests.Session` when you extend
     it.
     """
 
     def __init__(self):
         curl = pycurl.Curl()
         # TODO: johbo: I did test with 7.19 of libcurl. This version has
         # trouble with 100 - continue being set in the expect header. This
         # can lead to massive performance drops, switching it off here.
         curl.setopt(curl.HTTPHEADER, ["Expect:"])
         curl.setopt(curl.TCP_NODELAY, True)
         curl.setopt(curl.PROTOCOLS, curl.PROTO_HTTP)
         self._curl = curl
 
     def post(self, url, data, allow_redirects=False):
         response_buffer = StringIO()
 
         curl = self._curl
         curl.setopt(curl.URL, url)
         curl.setopt(curl.POST, True)
         curl.setopt(curl.POSTFIELDS, data)
         curl.setopt(curl.FOLLOWLOCATION, allow_redirects)
         curl.setopt(curl.WRITEDATA, response_buffer)
         curl.perform()
 
         return CurlResponse(response_buffer)
 
 
 class CurlResponse(object):
     """
     The response of a request, modeled after the requests API.
 
     This class provides a subset of the response interface known from the
     library `requests`. It is intentionally kept similar, so that we can use
     `requests` as a drop in replacement for benchmarking purposes.
     """
 
     def __init__(self, response_buffer):
         self._response_buffer = response_buffer
 
     @property
     def content(self):
         return self._response_buffer.getvalue()
 
 
 def _create_http_rpc_session():
     session = CurlSession()
     return session

rhodecode/lib/vcs/client_http.py

@@ -1,218 +1,235 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2016-2016  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/
 
 """
 Client for the VCSServer implemented based on HTTP.
 
 
 Status
 ------
 
 This client implementation shall eventually replace the Pyro4 based
 implementation.
 """
 
 import copy
 import logging
+import threading
 import urllib2
 import urlparse
 import uuid
 
 import msgpack
 import requests
 
-from . import exceptions
+from . import exceptions, CurlSession
 
 
 log = logging.getLogger(__name__)
 
 
 # TODO: mikhail: Keep it in sync with vcsserver's
 # HTTPApplication.ALLOWED_EXCEPTIONS
 EXCEPTIONS_MAP = {
     'KeyError': KeyError,
     'URLError': urllib2.URLError,
 }
 
 
 class RepoMaker(object):
 
-    def __init__(self, server_and_port, backend_endpoint, session):
+    def __init__(self, server_and_port, backend_endpoint, session_factory):
         self.url = urlparse.urljoin(
             'http://%s' % server_and_port, backend_endpoint)
-        self._session = session
+        self._session_factory = session_factory
 
     def __call__(self, path, config, with_wire=None):
         log.debug('RepoMaker call on %s', path)
         return RemoteRepo(
-            path, config, self.url, self._session, with_wire=with_wire)
+            path, config, self.url, self._session_factory(),
+            with_wire=with_wire)
 
     def __getattr__(self, name):
         def f(*args, **kwargs):
             return self._call(name, *args, **kwargs)
         return f
 
     @exceptions.map_vcs_exceptions
     def _call(self, name, *args, **kwargs):
         payload = {
             'id': str(uuid.uuid4()),
             'method': name,
             'params': {'args': args, 'kwargs': kwargs}
         }
-        return _remote_call(self.url, payload, EXCEPTIONS_MAP, self._session)
+        return _remote_call(
+            self.url, payload, EXCEPTIONS_MAP, self._session_factory())
 
 
 class RemoteRepo(object):
 
     def __init__(self, path, config, url, session, with_wire=None):
         self.url = url
         self._session = session
         self._wire = {
             "path": path,
             "config": config,
             "context": str(uuid.uuid4()),
         }
         if with_wire:
             self._wire.update(with_wire)
 
         # johbo: Trading complexity for performance. Avoiding the call to
         # log.debug brings a few percent gain even if is is not active.
         if log.isEnabledFor(logging.DEBUG):
             self._call = self._call_with_logging
 
     def __getattr__(self, name):
         def f(*args, **kwargs):
             return self._call(name, *args, **kwargs)
         return f
 
     @exceptions.map_vcs_exceptions
     def _call(self, name, *args, **kwargs):
         # TODO: oliver: This is currently necessary pre-call since the
         # config object is being changed for hooking scenarios
         wire = copy.deepcopy(self._wire)
         wire["config"] = wire["config"].serialize()
         payload = {
             'id': str(uuid.uuid4()),
             'method': name,
             'params': {'wire': wire, 'args': args, 'kwargs': kwargs}
         }
         return _remote_call(self.url, payload, EXCEPTIONS_MAP, self._session)
 
     def _call_with_logging(self, name, *args, **kwargs):
         log.debug('Calling %s@%s', self.url, name)
         return RemoteRepo._call(self, name, *args, **kwargs)
 
     def __getitem__(self, key):
         return self.revision(key)
 
 
 class RemoteObject(object):
 
     def __init__(self, url, session):
         self._url = url
         self._session = session
 
         # johbo: Trading complexity for performance. Avoiding the call to
         # log.debug brings a few percent gain even if is is not active.
         if log.isEnabledFor(logging.DEBUG):
             self._call = self._call_with_logging
 
     def __getattr__(self, name):
         def f(*args, **kwargs):
             return self._call(name, *args, **kwargs)
         return f
 
     @exceptions.map_vcs_exceptions
     def _call(self, name, *args, **kwargs):
         payload = {
             'id': str(uuid.uuid4()),
             'method': name,
             'params': {'args': args, 'kwargs': kwargs}
         }
         return _remote_call(self._url, payload, EXCEPTIONS_MAP, self._session)
 
     def _call_with_logging(self, name, *args, **kwargs):
         log.debug('Calling %s@%s', self._url, name)
         return RemoteObject._call(self, name, *args, **kwargs)
 
 
 def _remote_call(url, payload, exceptions_map, session):
     response = session.post(url, data=msgpack.packb(payload))
     response = msgpack.unpackb(response.content)
     error = response.get('error')
     if error:
         type_ = error.get('type', 'Exception')
         exc = exceptions_map.get(type_, Exception)
         exc = exc(error.get('message'))
         try:
             exc._vcs_kind = error['_vcs_kind']
         except KeyError:
             pass
         raise exc
     return response.get('result')
 
 
 class VcsHttpProxy(object):
 
     CHUNK_SIZE = 16384
 
     def __init__(self, server_and_port, backend_endpoint):
         adapter = requests.adapters.HTTPAdapter(max_retries=5)
         self.base_url = urlparse.urljoin(
             'http://%s' % server_and_port, backend_endpoint)
         self.session = requests.Session()
         self.session.mount('http://', adapter)
 
     def handle(self, environment, input_data, *args, **kwargs):
         data = {
             'environment': environment,
             'input_data': input_data,
             'args': args,
             'kwargs': kwargs
         }
         result = self.session.post(
             self.base_url, msgpack.packb(data), stream=True)
         return self._get_result(result)
 
     def _deserialize_and_raise(self, error):
         exception = Exception(error['message'])
         try:
             exception._vcs_kind = error['_vcs_kind']
         except KeyError:
             pass
         raise exception
 
     def _iterate(self, result):
         unpacker = msgpack.Unpacker()
         for line in result.iter_content(chunk_size=self.CHUNK_SIZE):
             unpacker.feed(line)
             for chunk in unpacker:
                 yield chunk
 
     def _get_result(self, result):
         iterator = self._iterate(result)
         error = iterator.next()
         if error:
             self._deserialize_and_raise(error)
 
         status = iterator.next()
         headers = iterator.next()
 
         return iterator, status, headers
+
+
+class ThreadlocalSessionFactory(object):
+    """
+    Creates one CurlSession per thread on demand.
+    """
+
+    def __init__(self):
+        self._thread_local = threading.local()
+
+    def __call__(self):
+        if not hasattr(self._thread_local, 'curl_session'):
+            self._thread_local.curl_session = CurlSession()
+        return self._thread_local.curl_session

rhodecode/model/__init__.py

@@ -1,152 +1,164 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 """
 The application's model objects
 
 :example:
 
     .. code-block:: python
 
        from paste.deploy import appconfig
        from pylons import config
        from sqlalchemy import engine_from_config
        from rhodecode.config.environment import load_environment
 
        conf = appconfig('config:development.ini', relative_to = './../../')
        load_environment(conf.global_conf, conf.local_conf)
 
        engine = engine_from_config(config, 'sqlalchemy.')
        init_model(engine)
        # RUN YOUR CODE HERE
 
 """
 
 
 import logging
 
 from pylons import config
+from pyramid.threadlocal import get_current_registry
 
 from rhodecode.model import meta, db
-from rhodecode.lib.utils2 import obfuscate_url_pw
+from rhodecode.lib.utils2 import obfuscate_url_pw, get_encryption_key
 
 log = logging.getLogger(__name__)
 
 
 def init_model(engine, encryption_key=None):
     """
     Initializes db session, bind the engine with the metadata,
     Call this before using any of the tables or classes in the model,
     preferably once in application start
 
     :param engine: engine to bind to
     """
     engine_str = obfuscate_url_pw(str(engine.url))
     log.info("initializing db for %s", engine_str)
     meta.Base.metadata.bind = engine
     db.ENCRYPTION_KEY = encryption_key
 
 
 def init_model_encryption(migration_models):
-    migration_models.ENCRYPTION_KEY = config['beaker.session.secret']
-    db.ENCRYPTION_KEY = config['beaker.session.secret']
+    migration_models.ENCRYPTION_KEY = get_encryption_key(config)
+    db.ENCRYPTION_KEY = get_encryption_key(config)
 
 
 class BaseModel(object):
     """
     Base Model for all RhodeCode models, it adds sql alchemy session
     into instance of model
 
     :param sa: If passed it reuses this session instead of creating a new one
     """
 
     cls = None  # override in child class
 
     def __init__(self, sa=None):
         if sa is not None:
             self.sa = sa
         else:
             self.sa = meta.Session()
 
     def _get_instance(self, cls, instance, callback=None):
         """
         Gets instance of given cls using some simple lookup mechanism.
 
         :param cls: class to fetch
         :param instance: int or Instance
         :param callback: callback to call if all lookups failed
         """
 
         if isinstance(instance, cls):
             return instance
         elif isinstance(instance, (int, long)):
             return cls.get(instance)
         else:
             if instance:
                 if callback is None:
                     raise Exception(
                         'given object must be int, long or Instance of %s '
                         'got %s, no callback provided' % (cls, type(instance))
                     )
                 else:
                     return callback(instance)
 
     def _get_user(self, user):
         """
         Helper method to get user by ID, or username fallback
 
         :param user: UserID, username, or User instance
         """
         return self._get_instance(
             db.User, user, callback=db.User.get_by_username)
 
     def _get_user_group(self, user_group):
         """
         Helper method to get user by ID, or username fallback
 
         :param user_group: UserGroupID, user_group_name, or UserGroup instance
         """
         return self._get_instance(
             db.UserGroup, user_group, callback=db.UserGroup.get_by_group_name)
 
     def _get_repo(self, repository):
         """
         Helper method to get repository by ID, or repository name
 
         :param repository: RepoID, repository name or Repository Instance
         """
         return self._get_instance(
             db.Repository, repository, callback=db.Repository.get_by_repo_name)
 
     def _get_perm(self, permission):
         """
         Helper method to get permission by ID, or permission name
 
         :param permission: PermissionID, permission_name or Permission instance
         """
         return self._get_instance(
             db.Permission, permission, callback=db.Permission.get_by_key)
 
+    def send_event(self, event):
+        """
+        Helper method to send an event. This wraps the pyramid logic to send an
+        event.
+        """
+        # For the first step we are using pyramids thread locals here. If the
+        # event mechanism works out as a good solution we should think about
+        # passing the registry into the constructor to get rid of it.
+        registry = get_current_registry()
+        registry.notify(event)
+
     @classmethod
     def get_all(cls):
         """
         Returns all instances of what is defined in `cls` class variable
         """
         return cls.cls.getAll()

rhodecode/model/db.py

@@ -1,3429 +1,3476 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 """
 Database Models for RhodeCode Enterprise
 """
 
 import os
 import sys
 import time
 import hashlib
 import logging
 import datetime
 import warnings
 import ipaddress
 import functools
 import traceback
 import collections
 
 
 from sqlalchemy import *
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import (
     relationship, joinedload, class_mapper, validates, aliased)
 from sqlalchemy.sql.expression import true
 from beaker.cache import cache_region, region_invalidate
 from webob.exc import HTTPNotFound
 from zope.cachedescriptors.property import Lazy as LazyProperty
 
 from pylons import url
 from pylons.i18n.translation import lazy_ugettext as _
 
 from rhodecode.lib.vcs import get_backend
 from rhodecode.lib.vcs.utils.helpers import get_scm
 from rhodecode.lib.vcs.exceptions import VCSError
 from rhodecode.lib.vcs.backends.base import (
     EmptyCommit, Reference, MergeFailureReason)
 from rhodecode.lib.utils2 import (
     str2bool, safe_str, get_commit_safe, safe_unicode, remove_prefix, md5_safe,
     time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict)
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.lib.encrypt import AESCipher
 
 from rhodecode.model.meta import Base, Session
 
 URL_SEP = '/'
 log = logging.getLogger(__name__)
 
 # =============================================================================
 # BASE CLASSES
 # =============================================================================
 
-# this is propagated from .ini file beaker.session.secret
+# this is propagated from .ini file rhodecode.encrypted_values.secret or
+# beaker.session.secret if first is not set.
 # and initialized at environment.py
 ENCRYPTION_KEY = None
 
 # used to sort permissions by types, '#' used here is not allowed to be in
 # usernames, and it's very early in sorted string.printable table.
 PERMISSION_TYPE_SORT = {
     'admin': '####',
     'write': '###',
     'read':  '##',
     'none':  '#',
 }
 
 
 def display_sort(obj):
     """
     Sort function used to sort permissions in .permissions() function of
     Repository, RepoGroup, UserGroup. Also it put the default user in front
     of all other resources
     """
 
     if obj.username == User.DEFAULT_USER:
         return '#####'
     prefix = PERMISSION_TYPE_SORT.get(obj.permission.split('.')[-1], '')
     return prefix + obj.username
 
 
 def _hash_key(k):
     return md5_safe(k)
 
 
 class EncryptedTextValue(TypeDecorator):
     """
     Special column for encrypted long text data, use like::
 
         value = Column("encrypted_value", EncryptedValue(), nullable=False)
 
     This column is intelligent so if value is in unencrypted form it return
     unencrypted form, but on save it always encrypts
     """
     impl = Text
 
     def process_bind_param(self, value, dialect):
         if not value:
             return value
-        if value.startswith('enc$aes$'):
+        if value.startswith('enc$aes$') or value.startswith('enc$aes_hmac$'):
             # protect against double encrypting if someone manually starts
             # doing
             raise ValueError('value needs to be in unencrypted format, ie. '
-                             'not starting with enc$aes$')
-        return 'enc$aes$%s' % AESCipher(ENCRYPTION_KEY).encrypt(value)
+                             'not starting with enc$aes')
+        return 'enc$aes_hmac$%s' % AESCipher(
+            ENCRYPTION_KEY, hmac=True).encrypt(value)
 
     def process_result_value(self, value, dialect):
+        import rhodecode
+
         if not value:
             return value
 
         parts = value.split('$', 3)
         if not len(parts) == 3:
             # probably not encrypted values
             return value
         else:
             if parts[0] != 'enc':
                 # parts ok but without our header ?
                 return value
-
+            enc_strict_mode = str2bool(rhodecode.CONFIG.get(
+                'rhodecode.encrypted_values.strict') or True)
             # at that stage we know it's our encryption
-            decrypted_data = AESCipher(ENCRYPTION_KEY).decrypt(parts[2])
+            if parts[1] == 'aes':
+                decrypted_data = AESCipher(ENCRYPTION_KEY).decrypt(parts[2])
+            elif parts[1] == 'aes_hmac':
+                decrypted_data = AESCipher(
+                    ENCRYPTION_KEY, hmac=True,
+                    strict_verification=enc_strict_mode).decrypt(parts[2])
+            else:
+                raise ValueError(
+                    'Encryption type part is wrong, must be `aes` '
+                    'or `aes_hmac`, got `%s` instead' % (parts[1]))
             return decrypted_data
 
 
 class BaseModel(object):
     """
     Base Model for all classes
     """
 
     @classmethod
     def _get_keys(cls):
         """return column names for this model """
         return class_mapper(cls).c.keys()
 
     def get_dict(self):
         """
         return dict with keys and values corresponding
         to this model data """
 
         d = {}
         for k in self._get_keys():
             d[k] = getattr(self, k)
 
         # also use __json__() if present to get additional fields
         _json_attr = getattr(self, '__json__', None)
         if _json_attr:
             # update with attributes from __json__
             if callable(_json_attr):
                 _json_attr = _json_attr()
             for k, val in _json_attr.iteritems():
                 d[k] = val
         return d
 
     def get_appstruct(self):
         """return list with keys and values tuples corresponding
         to this model data """
 
         l = []
         for k in self._get_keys():
             l.append((k, getattr(self, k),))
         return l
 
     def populate_obj(self, populate_dict):
         """populate model with data from given populate_dict"""
 
         for k in self._get_keys():
             if k in populate_dict:
                 setattr(self, k, populate_dict[k])
 
     @classmethod
     def query(cls):
         return Session().query(cls)
 
     @classmethod
     def get(cls, id_):
         if id_:
             return cls.query().get(id_)
 
     @classmethod
     def get_or_404(cls, id_):
         try:
             id_ = int(id_)
         except (TypeError, ValueError):
             raise HTTPNotFound
 
         res = cls.query().get(id_)
         if not res:
             raise HTTPNotFound
         return res
 
     @classmethod
     def getAll(cls):
         # deprecated and left for backward compatibility
         return cls.get_all()
 
     @classmethod
     def get_all(cls):
         return cls.query().all()
 
     @classmethod
     def delete(cls, id_):
         obj = cls.query().get(id_)
         Session().delete(obj)
 
+    @classmethod
+    def identity_cache(cls, session, attr_name, value):
+        exist_in_session = []
+        for (item_cls, pkey), instance in session.identity_map.items():
+            if cls == item_cls and getattr(instance, attr_name) == value:
+                exist_in_session.append(instance)
+        if exist_in_session:
+            if len(exist_in_session) == 1:
+                return exist_in_session[0]
+            log.exception(
+                'multiple objects with attr %s and '
+                'value %s found with same name: %r',
+                attr_name, value, exist_in_session)
+
     def __repr__(self):
         if hasattr(self, '__unicode__'):
             # python repr needs to return str
             try:
                 return safe_str(self.__unicode__())
             except UnicodeDecodeError:
                 pass
         return '<DB:%s>' % (self.__class__.__name__)
 
 
 class RhodeCodeSetting(Base, BaseModel):
     __tablename__ = 'rhodecode_settings'
     __table_args__ = (
         UniqueConstraint('app_settings_name'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
 
     SETTINGS_TYPES = {
         'str': safe_str,
         'int': safe_int,
         'unicode': safe_unicode,
         'bool': str2bool,
         'list': functools.partial(aslist, sep=',')
     }
     DEFAULT_UPDATE_URL = 'https://rhodecode.com/api/v1/info/versions'
     GLOBAL_CONF_KEY = 'app_settings'
 
     app_settings_id = Column("app_settings_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     app_settings_name = Column("app_settings_name", String(255), nullable=True, unique=None, default=None)
     _app_settings_value = Column("app_settings_value", String(4096), nullable=True, unique=None, default=None)
     _app_settings_type = Column("app_settings_type", String(255), nullable=True, unique=None, default=None)
 
     def __init__(self, key='', val='', type='unicode'):
         self.app_settings_name = key
         self.app_settings_type = type
         self.app_settings_value = val
 
     @validates('_app_settings_value')
     def validate_settings_value(self, key, val):
         assert type(val) == unicode
         return val
 
     @hybrid_property
     def app_settings_value(self):
         v = self._app_settings_value
         _type = self.app_settings_type
         if _type:
             _type = self.app_settings_type.split('.')[0]
             # decode the encrypted value
             if 'encrypted' in self.app_settings_type:
                 cipher = EncryptedTextValue()
                 v = safe_unicode(cipher.process_result_value(v, None))
 
         converter = self.SETTINGS_TYPES.get(_type) or \
             self.SETTINGS_TYPES['unicode']
         return converter(v)
 
     @app_settings_value.setter
     def app_settings_value(self, val):
         """
         Setter that will always make sure we use unicode in app_settings_value
 
         :param val:
         """
         val = safe_unicode(val)
         # encode the encrypted value
         if 'encrypted' in self.app_settings_type:
             cipher = EncryptedTextValue()
             val = safe_unicode(cipher.process_bind_param(val, None))
         self._app_settings_value = val
 
     @hybrid_property
     def app_settings_type(self):
         return self._app_settings_type
 
     @app_settings_type.setter
     def app_settings_type(self, val):
         if val.split('.')[0] not in self.SETTINGS_TYPES:
             raise Exception('type must be one of %s got %s'
                             % (self.SETTINGS_TYPES.keys(), val))
         self._app_settings_type = val
 
     def __unicode__(self):
         return u"<%s('%s:%s[%s]')>" % (
             self.__class__.__name__,
             self.app_settings_name, self.app_settings_value,
             self.app_settings_type
         )
 
 
 class RhodeCodeUi(Base, BaseModel):
     __tablename__ = 'rhodecode_ui'
     __table_args__ = (
         UniqueConstraint('ui_key'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
 
     HOOK_REPO_SIZE = 'changegroup.repo_size'
     # HG
     HOOK_PRE_PULL = 'preoutgoing.pre_pull'
     HOOK_PULL = 'outgoing.pull_logger'
     HOOK_PRE_PUSH = 'prechangegroup.pre_push'
     HOOK_PUSH = 'changegroup.push_logger'
 
     # TODO: johbo: Unify way how hooks are configured for git and hg,
     # git part is currently hardcoded.
 
     # SVN PATTERNS
     SVN_BRANCH_ID = 'vcs_svn_branch'
     SVN_TAG_ID = 'vcs_svn_tag'
 
     ui_id = Column(
         "ui_id", Integer(), nullable=False, unique=True, default=None,
         primary_key=True)
     ui_section = Column(
         "ui_section", String(255), nullable=True, unique=None, default=None)
     ui_key = Column(
         "ui_key", String(255), nullable=True, unique=None, default=None)
     ui_value = Column(
         "ui_value", String(255), nullable=True, unique=None, default=None)
     ui_active = Column(
         "ui_active", Boolean(), nullable=True, unique=None, default=True)
 
     def __repr__(self):
         return '<%s[%s]%s=>%s]>' % (self.__class__.__name__, self.ui_section,
                                     self.ui_key, self.ui_value)
 
 
 class RepoRhodeCodeSetting(Base, BaseModel):
     __tablename__ = 'repo_rhodecode_settings'
     __table_args__ = (
         UniqueConstraint(
             'app_settings_name', 'repository_id',
             name='uq_repo_rhodecode_setting_name_repo_id'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
 
     repository_id = Column(
         "repository_id", Integer(), ForeignKey('repositories.repo_id'),
         nullable=False)
     app_settings_id = Column(
         "app_settings_id", Integer(), nullable=False, unique=True,
         default=None, primary_key=True)
     app_settings_name = Column(
         "app_settings_name", String(255), nullable=True, unique=None,
         default=None)
     _app_settings_value = Column(
         "app_settings_value", String(4096), nullable=True, unique=None,
         default=None)
     _app_settings_type = Column(
         "app_settings_type", String(255), nullable=True, unique=None,
         default=None)
 
     repository = relationship('Repository')
 
     def __init__(self, repository_id, key='', val='', type='unicode'):
         self.repository_id = repository_id
         self.app_settings_name = key
         self.app_settings_type = type
         self.app_settings_value = val
 
     @validates('_app_settings_value')
     def validate_settings_value(self, key, val):
         assert type(val) == unicode
         return val
 
     @hybrid_property
     def app_settings_value(self):
         v = self._app_settings_value
         type_ = self.app_settings_type
         SETTINGS_TYPES = RhodeCodeSetting.SETTINGS_TYPES
         converter = SETTINGS_TYPES.get(type_) or SETTINGS_TYPES['unicode']
         return converter(v)
 
     @app_settings_value.setter
     def app_settings_value(self, val):
         """
         Setter that will always make sure we use unicode in app_settings_value
 
         :param val:
         """
         self._app_settings_value = safe_unicode(val)
 
     @hybrid_property
     def app_settings_type(self):
         return self._app_settings_type
 
     @app_settings_type.setter
     def app_settings_type(self, val):
         SETTINGS_TYPES = RhodeCodeSetting.SETTINGS_TYPES
         if val not in SETTINGS_TYPES:
             raise Exception('type must be one of %s got %s'
                             % (SETTINGS_TYPES.keys(), val))
         self._app_settings_type = val
 
     def __unicode__(self):
         return u"<%s('%s:%s:%s[%s]')>" % (
             self.__class__.__name__, self.repository.repo_name,
             self.app_settings_name, self.app_settings_value,
             self.app_settings_type
         )
 
 
 class RepoRhodeCodeUi(Base, BaseModel):
     __tablename__ = 'repo_rhodecode_ui'
     __table_args__ = (
         UniqueConstraint(
             'repository_id', 'ui_section', 'ui_key',
             name='uq_repo_rhodecode_ui_repository_id_section_key'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
 
     repository_id = Column(
         "repository_id", Integer(), ForeignKey('repositories.repo_id'),
         nullable=False)
     ui_id = Column(
         "ui_id", Integer(), nullable=False, unique=True, default=None,
         primary_key=True)
     ui_section = Column(
         "ui_section", String(255), nullable=True, unique=None, default=None)
     ui_key = Column(
         "ui_key", String(255), nullable=True, unique=None, default=None)
     ui_value = Column(
         "ui_value", String(255), nullable=True, unique=None, default=None)
     ui_active = Column(
         "ui_active", Boolean(), nullable=True, unique=None, default=True)
 
     repository = relationship('Repository')
 
     def __repr__(self):
         return '<%s[%s:%s]%s=>%s]>' % (
             self.__class__.__name__, self.repository.repo_name,
             self.ui_section, self.ui_key, self.ui_value)
 
 
 class User(Base, BaseModel):
     __tablename__ = 'users'
     __table_args__ = (
         UniqueConstraint('username'), UniqueConstraint('email'),
         Index('u_username_idx', 'username'),
         Index('u_email_idx', 'email'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
     DEFAULT_USER = 'default'
     DEFAULT_USER_EMAIL = '[e-mail]'
     DEFAULT_GRAVATAR_URL = 'https://secure.gravatar.com/avatar/{md5email}?d=identicon&s={size}'
 
     user_id = Column("user_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     username = Column("username", String(255), nullable=True, unique=None, default=None)
     password = Column("password", String(255), nullable=True, unique=None, default=None)
     active = Column("active", Boolean(), nullable=True, unique=None, default=True)
     admin = Column("admin", Boolean(), nullable=True, unique=None, default=False)
     name = Column("firstname", String(255), nullable=True, unique=None, default=None)
     lastname = Column("lastname", String(255), nullable=True, unique=None, default=None)
     _email = Column("email", String(255), nullable=True, unique=None, default=None)
     last_login = Column("last_login", DateTime(timezone=False), nullable=True, unique=None, default=None)
     extern_type = Column("extern_type", String(255), nullable=True, unique=None, default=None)
     extern_name = Column("extern_name", String(255), nullable=True, unique=None, default=None)
     api_key = Column("api_key", String(255), nullable=True, unique=None, default=None)
     inherit_default_permissions = Column("inherit_default_permissions", Boolean(), nullable=False, unique=None, default=True)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     _user_data = Column("user_data", LargeBinary(), nullable=True)  # JSON data
 
     user_log = relationship('UserLog')
     user_perms = relationship('UserToPerm', primaryjoin="User.user_id==UserToPerm.user_id", cascade='all')
 
     repositories = relationship('Repository')
     repository_groups = relationship('RepoGroup')
     user_groups = relationship('UserGroup')
 
     user_followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_user_id==User.user_id', cascade='all')
     followings = relationship('UserFollowing', primaryjoin='UserFollowing.user_id==User.user_id', cascade='all')
 
     repo_to_perm = relationship('UserRepoToPerm', primaryjoin='UserRepoToPerm.user_id==User.user_id', cascade='all')
     repo_group_to_perm = relationship('UserRepoGroupToPerm', primaryjoin='UserRepoGroupToPerm.user_id==User.user_id', cascade='all')
     user_group_to_perm = relationship('UserUserGroupToPerm', primaryjoin='UserUserGroupToPerm.user_id==User.user_id', cascade='all')
 
     group_member = relationship('UserGroupMember', cascade='all')
 
     notifications = relationship('UserNotification', cascade='all')
     # notifications assigned to this user
     user_created_notifications = relationship('Notification', cascade='all')
     # comments created by this user
     user_comments = relationship('ChangesetComment', cascade='all')
     # user profile extra info
     user_emails = relationship('UserEmailMap', cascade='all')
     user_ip_map = relationship('UserIpMap', cascade='all')
     user_auth_tokens = relationship('UserApiKeys', cascade='all')
     # gists
     user_gists = relationship('Gist', cascade='all')
     # user pull requests
     user_pull_requests = relationship('PullRequest', cascade='all')
     # external identities
     extenal_identities = relationship(
         'ExternalIdentity',
         primaryjoin="User.user_id==ExternalIdentity.local_user_id",
         cascade='all')
 
     def __unicode__(self):
         return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
                                       self.user_id, self.username)
 
     @hybrid_property
     def email(self):
         return self._email
 
     @email.setter
     def email(self, val):
         self._email = val.lower() if val else None
 
     @property
     def firstname(self):
         # alias for future
         return self.name
 
     @property
     def emails(self):
         other = UserEmailMap.query().filter(UserEmailMap.user==self).all()
         return [self.email] + [x.email for x in other]
 
     @property
     def auth_tokens(self):
         return [self.api_key] + [x.api_key for x in self.extra_auth_tokens]
 
     @property
     def extra_auth_tokens(self):
         return UserApiKeys.query().filter(UserApiKeys.user == self).all()
 
     @property
     def feed_token(self):
         feed_tokens = UserApiKeys.query()\
             .filter(UserApiKeys.user == self)\
             .filter(UserApiKeys.role == UserApiKeys.ROLE_FEED)\
             .all()
         if feed_tokens:
             return feed_tokens[0].api_key
         else:
             # use the main token so we don't end up with nothing...
             return self.api_key
 
     @classmethod
     def extra_valid_auth_tokens(cls, user, role=None):
         tokens = UserApiKeys.query().filter(UserApiKeys.user == user)\
                 .filter(or_(UserApiKeys.expires == -1,
                             UserApiKeys.expires >= time.time()))
         if role:
             tokens = tokens.filter(or_(UserApiKeys.role == role,
                                        UserApiKeys.role == UserApiKeys.ROLE_ALL))
         return tokens.all()
 
     @property
     def ip_addresses(self):
         ret = UserIpMap.query().filter(UserIpMap.user == self).all()
         return [x.ip_addr for x in ret]
 
     @property
     def username_and_name(self):
         return '%s (%s %s)' % (self.username, self.firstname, self.lastname)
 
     @property
     def username_or_name_or_email(self):
         full_name = self.full_name if self.full_name is not ' ' else None
         return self.username or full_name or self.email
 
     @property
     def full_name(self):
         return '%s %s' % (self.firstname, self.lastname)
 
     @property
     def full_name_or_username(self):
         return ('%s %s' % (self.firstname, self.lastname)
                 if (self.firstname and self.lastname) else self.username)
 
     @property
     def full_contact(self):
         return '%s %s <%s>' % (self.firstname, self.lastname, self.email)
 
     @property
     def short_contact(self):
         return '%s %s' % (self.firstname, self.lastname)
 
     @property
     def is_admin(self):
         return self.admin
 
     @property
     def AuthUser(self):
         """
         Returns instance of AuthUser for this user
         """
         from rhodecode.lib.auth import AuthUser
         return AuthUser(user_id=self.user_id, api_key=self.api_key,
                         username=self.username)
 
     @hybrid_property
     def user_data(self):
         if not self._user_data:
             return {}
 
         try:
             return json.loads(self._user_data)
         except TypeError:
             return {}
 
     @user_data.setter
     def user_data(self, val):
         if not isinstance(val, dict):
             raise Exception('user_data must be dict, got %s' % type(val))
         try:
             self._user_data = json.dumps(val)
         except Exception:
             log.error(traceback.format_exc())
 
     @classmethod
-    def get_by_username(cls, username, case_insensitive=False, cache=False):
+    def get_by_username(cls, username, case_insensitive=False,
+                        cache=False, identity_cache=False):
+        session = Session()
+
         if case_insensitive:
-            q = cls.query().filter(func.lower(cls.username) == func.lower(username))
+            q = cls.query().filter(
+                func.lower(cls.username) == func.lower(username))
         else:
             q = cls.query().filter(cls.username == username)
 
         if cache:
-            q = q.options(FromCache(
-                            "sql_cache_short",
-                            "get_user_%s" % _hash_key(username)))
+            if identity_cache:
+                val = cls.identity_cache(session, 'username', username)
+                if val:
+                    return val
+            else:
+                q = q.options(
+                    FromCache("sql_cache_short",
+                              "get_user_by_name_%s" % _hash_key(username)))
+
         return q.scalar()
 
     @classmethod
     def get_by_auth_token(cls, auth_token, cache=False, fallback=True):
         q = cls.query().filter(cls.api_key == auth_token)
 
         if cache:
             q = q.options(FromCache("sql_cache_short",
                                     "get_auth_token_%s" % auth_token))
         res = q.scalar()
 
         if fallback and not res:
             #fallback to additional keys
             _res = UserApiKeys.query()\
                 .filter(UserApiKeys.api_key == auth_token)\
                 .filter(or_(UserApiKeys.expires == -1,
                             UserApiKeys.expires >= time.time()))\
                 .first()
             if _res:
                 res = _res.user
         return res
 
     @classmethod
     def get_by_email(cls, email, case_insensitive=False, cache=False):
 
         if case_insensitive:
             q = cls.query().filter(func.lower(cls.email) == func.lower(email))
 
         else:
             q = cls.query().filter(cls.email == email)
 
         if cache:
             q = q.options(FromCache("sql_cache_short",
                                     "get_email_key_%s" % email))
 
         ret = q.scalar()
         if ret is None:
             q = UserEmailMap.query()
             # try fetching in alternate email map
             if case_insensitive:
                 q = q.filter(func.lower(UserEmailMap.email) == func.lower(email))
             else:
                 q = q.filter(UserEmailMap.email == email)
             q = q.options(joinedload(UserEmailMap.user))
             if cache:
                 q = q.options(FromCache("sql_cache_short",
                                         "get_email_map_key_%s" % email))
             ret = getattr(q.scalar(), 'user', None)
 
         return ret
 
     @classmethod
     def get_from_cs_author(cls, author):
         """
         Tries to get User objects out of commit author string
 
         :param author:
         """
         from rhodecode.lib.helpers import email, author_name
         # Valid email in the attribute passed, see if they're in the system
         _email = email(author)
         if _email:
             user = cls.get_by_email(_email, case_insensitive=True)
             if user:
                 return user
         # Maybe we can match by username?
         _author = author_name(author)
         user = cls.get_by_username(_author, case_insensitive=True)
         if user:
             return user
 
     def update_userdata(self, **kwargs):
         usr = self
         old = usr.user_data
         old.update(**kwargs)
         usr.user_data = old
         Session().add(usr)
         log.debug('updated userdata with ', kwargs)
 
     def update_lastlogin(self):
         """Update user lastlogin"""
         self.last_login = datetime.datetime.now()
         Session().add(self)
         log.debug('updated user %s lastlogin', self.username)
 
     def update_lastactivity(self):
         """Update user lastactivity"""
         usr = self
         old = usr.user_data
         old.update({'last_activity': time.time()})
         usr.user_data = old
         Session().add(usr)
         log.debug('updated user %s lastactivity', usr.username)
 
     def update_password(self, new_password, change_api_key=False):
         from rhodecode.lib.auth import get_crypt_password,generate_auth_token
 
         self.password = get_crypt_password(new_password)
         if change_api_key:
             self.api_key = generate_auth_token(self.username)
         Session().add(self)
 
     @classmethod
-    def get_first_admin(cls):
-        user = User.query().filter(User.admin == True).first()
+    def get_first_super_admin(cls):
+        user = User.query().filter(User.admin == true()).first()
         if user is None:
-            raise Exception('Missing administrative account!')
+            raise Exception('FATAL: Missing administrative account!')
         return user
 
     @classmethod
     def get_all_super_admins(cls):
         """
         Returns all admin accounts sorted by username
         """
         return User.query().filter(User.admin == true())\
             .order_by(User.username.asc()).all()
 
     @classmethod
     def get_default_user(cls, cache=False):
         user = User.get_by_username(User.DEFAULT_USER, cache=cache)
         if user is None:
-            raise Exception('Missing default account!')
+            raise Exception('FATAL: Missing default account!')
         return user
 
     def _get_default_perms(self, user, suffix=''):
         from rhodecode.model.permission import PermissionModel
         return PermissionModel().get_default_perms(user.user_perms, suffix)
 
     def get_default_perms(self, suffix=''):
         return self._get_default_perms(self, suffix)
 
     def get_api_data(self, include_secrets=False, details='full'):
         """
         Common function for generating user related data for API
 
         :param include_secrets: By default secrets in the API data will be replaced
            by a placeholder value to prevent exposing this data by accident. In case
            this data shall be exposed, set this flag to ``True``.
 
         :param details: details can be 'basic|full' basic gives only a subset of
            the available user information that includes user_id, name and emails.
         """
         user = self
         user_data = self.user_data
         data = {
             'user_id': user.user_id,
             'username': user.username,
             'firstname': user.name,
             'lastname': user.lastname,
             'email': user.email,
             'emails': user.emails,
         }
         if details == 'basic':
             return data
 
         api_key_length = 40
         api_key_replacement = '*' * api_key_length
 
         extras = {
             'api_key': api_key_replacement,
             'api_keys': [api_key_replacement],
             'active': user.active,
             'admin': user.admin,
             'extern_type': user.extern_type,
             'extern_name': user.extern_name,
             'last_login': user.last_login,
             'ip_addresses': user.ip_addresses,
             'language': user_data.get('language')
         }
         data.update(extras)
 
         if include_secrets:
             data['api_key'] = user.api_key
             data['api_keys'] = user.auth_tokens
         return data
 
     def __json__(self):
         data = {
             'full_name': self.full_name,
             'full_name_or_username': self.full_name_or_username,
             'short_contact': self.short_contact,
             'full_contact': self.full_contact,
         }
         data.update(self.get_api_data())
         return data
 
 
 class UserApiKeys(Base, BaseModel):
     __tablename__ = 'user_api_keys'
     __table_args__ = (
         Index('uak_api_key_idx', 'api_key'),
         Index('uak_api_key_expires_idx', 'api_key', 'expires'),
         UniqueConstraint('api_key'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
     __mapper_args__ = {}
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
     ROLE_HTTP = 'token_role_http'
     ROLE_VCS = 'token_role_vcs'
     ROLE_API = 'token_role_api'
     ROLE_FEED = 'token_role_feed'
     ROLES = [ROLE_ALL, ROLE_HTTP, ROLE_VCS, ROLE_API, ROLE_FEED]
 
     user_api_key_id = Column("user_api_key_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
     api_key = Column("api_key", String(255), nullable=False, unique=True)
     description = Column('description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))
     expires = Column('expires', Float(53), nullable=False)
     role = Column('role', String(255), nullable=True)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
 
     user = relationship('User', lazy='joined')
 
     @classmethod
     def _get_role_name(cls, role):
         return {
             cls.ROLE_ALL: _('all'),
             cls.ROLE_HTTP: _('http/web interface'),
             cls.ROLE_VCS: _('vcs (git/hg protocol)'),
             cls.ROLE_API: _('api calls'),
             cls.ROLE_FEED: _('feed access'),
         }.get(role, role)
 
     @property
     def expired(self):
         if self.expires == -1:
             return False
         return time.time() > self.expires
 
     @property
     def role_humanized(self):
         return self._get_role_name(self.role)
 
 
 class UserEmailMap(Base, BaseModel):
     __tablename__ = 'user_email_map'
     __table_args__ = (
         Index('uem_email_idx', 'email'),
         UniqueConstraint('email'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
     __mapper_args__ = {}
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
     _email = Column("email", String(255), nullable=True, unique=False, default=None)
     user = relationship('User', lazy='joined')
 
     @validates('_email')
     def validate_email(self, key, email):
         # check if this email is not main one
         main_email = Session().query(User).filter(User.email == email).scalar()
         if main_email is not None:
             raise AttributeError('email %s is present is user table' % email)
         return email
 
     @hybrid_property
     def email(self):
         return self._email
 
     @email.setter
     def email(self, val):
         self._email = val.lower() if val else None
 
 
 class UserIpMap(Base, BaseModel):
     __tablename__ = 'user_ip_map'
     __table_args__ = (
         UniqueConstraint('user_id', 'ip_addr'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
     __mapper_args__ = {}
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
     ip_addr = Column("ip_addr", String(255), nullable=True, unique=False, default=None)
     active = Column("active", Boolean(), nullable=True, unique=None, default=True)
     description = Column("description", String(10000), nullable=True, unique=None, default=None)
     user = relationship('User', lazy='joined')
 
     @classmethod
     def _get_ip_range(cls, ip_addr):
         net = ipaddress.ip_network(ip_addr, strict=False)
         return [str(net.network_address), str(net.broadcast_address)]
 
     def __json__(self):
         return {
           'ip_addr': self.ip_addr,
           'ip_range': self._get_ip_range(self.ip_addr),
         }
 
     def __unicode__(self):
         return u"<%s('user_id:%s=>%s')>" % (self.__class__.__name__,
                                             self.user_id, self.ip_addr)
 
 class UserLog(Base, BaseModel):
     __tablename__ = 'user_logs'
     __table_args__ = (
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
     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)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True)
     repository_name = Column("repository_name", String(255), nullable=True, unique=None, default=None)
     user_ip = Column("user_ip", String(255), nullable=True, unique=None, default=None)
     action = Column("action", Text().with_variant(Text(1200000), 'mysql'), nullable=True, unique=None, default=None)
     action_date = Column("action_date", DateTime(timezone=False), nullable=True, unique=None, default=None)
 
     def __unicode__(self):
         return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
                                       self.repository_name,
                                       self.action)
 
     @property
     def action_as_day(self):
         return datetime.date(*self.action_date.timetuple()[:3])
 
     user = relationship('User')
     repository = relationship('Repository', cascade='')
 
 
 class UserGroup(Base, BaseModel):
     __tablename__ = 'users_groups'
     __table_args__ = (
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
 
     users_group_id = Column("users_group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_name = Column("users_group_name", String(255), nullable=False, unique=True, default=None)
     user_group_description = Column("user_group_description", String(10000), nullable=True, unique=None, default=None)
     users_group_active = Column("users_group_active", Boolean(), nullable=True, unique=None, default=None)
     inherit_default_permissions = Column("users_group_inherit_default_permissions", Boolean(), nullable=False, unique=None, default=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     _group_data = Column("group_data", LargeBinary(), nullable=True)  # JSON data
 
     members = relationship('UserGroupMember', cascade="all, delete, delete-orphan", lazy="joined")
     users_group_to_perm = relationship('UserGroupToPerm', cascade='all')
     users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
     users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
     user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
     user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
 
     user = relationship('User')
 
     @hybrid_property
     def group_data(self):
         if not self._group_data:
             return {}
 
         try:
             return json.loads(self._group_data)
         except TypeError:
             return {}
 
     @group_data.setter
     def group_data(self, val):
         try:
             self._group_data = json.dumps(val)
         except Exception:
             log.error(traceback.format_exc())
 
     def __unicode__(self):
         return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
                                       self.users_group_id,
                                       self.users_group_name)
 
     @classmethod
     def get_by_group_name(cls, group_name, cache=False,
                           case_insensitive=False):
         if case_insensitive:
             q = cls.query().filter(func.lower(cls.users_group_name) ==
                                    func.lower(group_name))
 
         else:
             q = cls.query().filter(cls.users_group_name == group_name)
         if cache:
             q = q.options(FromCache(
                             "sql_cache_short",
                             "get_group_%s" % _hash_key(group_name)))
         return q.scalar()
 
     @classmethod
     def get(cls, user_group_id, cache=False):
         user_group = cls.query()
         if cache:
             user_group = user_group.options(FromCache("sql_cache_short",
                                     "get_users_group_%s" % user_group_id))
         return user_group.get(user_group_id)
 
     def permissions(self, with_admins=True, with_owner=True):
         q = UserUserGroupToPerm.query().filter(UserUserGroupToPerm.user_group == self)
         q = q.options(joinedload(UserUserGroupToPerm.user_group),
                       joinedload(UserUserGroupToPerm.user),
                       joinedload(UserUserGroupToPerm.permission),)
 
         # get owners and admins and permissions. We do a trick of re-writing
         # objects from sqlalchemy to named-tuples due to sqlalchemy session
         # has a global reference and changing one object propagates to all
         # others. This means if admin is also an owner admin_row that change
         # would propagate to both objects
         perm_rows = []
         for _usr in q.all():
             usr = AttributeDict(_usr.user.get_dict())
             usr.permission = _usr.permission.permission_name
             perm_rows.append(usr)
 
         # filter the perm rows by 'default' first and then sort them by
         # admin,write,read,none permissions sorted again alphabetically in
         # each group
         perm_rows = sorted(perm_rows, key=display_sort)
 
         _admin_perm = 'usergroup.admin'
         owner_row = []
         if with_owner:
             usr = AttributeDict(self.user.get_dict())
             usr.owner_row = True
             usr.permission = _admin_perm
             owner_row.append(usr)
 
         super_admin_rows = []
         if with_admins:
             for usr in User.get_all_super_admins():
                 # if this admin is also owner, don't double the record
                 if usr.user_id == owner_row[0].user_id:
                     owner_row[0].admin_row = True
                 else:
                     usr = AttributeDict(usr.get_dict())
                     usr.admin_row = True
                     usr.permission = _admin_perm
                     super_admin_rows.append(usr)
 
         return super_admin_rows + owner_row + perm_rows
 
     def permission_user_groups(self):
         q = UserGroupUserGroupToPerm.query().filter(UserGroupUserGroupToPerm.target_user_group == self)
         q = q.options(joinedload(UserGroupUserGroupToPerm.user_group),
                       joinedload(UserGroupUserGroupToPerm.target_user_group),
                       joinedload(UserGroupUserGroupToPerm.permission),)
 
         perm_rows = []
         for _user_group in q.all():
             usr = AttributeDict(_user_group.user_group.get_dict())
             usr.permission = _user_group.permission.permission_name
             perm_rows.append(usr)
 
         return perm_rows
 
     def _get_default_perms(self, user_group, suffix=''):
         from rhodecode.model.permission import PermissionModel
         return PermissionModel().get_default_perms(user_group.users_group_to_perm, suffix)
 
     def get_default_perms(self, suffix=''):
         return self._get_default_perms(self, suffix)
 
     def get_api_data(self, with_group_members=True, include_secrets=False):
         """
         :param include_secrets: See :meth:`User.get_api_data`, this parameter is
            basically forwarded.
 
         """
         user_group = self
 
         data = {
             'users_group_id': user_group.users_group_id,
             'group_name': user_group.users_group_name,
             'group_description': user_group.user_group_description,
             'active': user_group.users_group_active,
             'owner': user_group.user.username,
         }
         if with_group_members:
             users = []
             for user in user_group.members:
                 user = user.user
                 users.append(user.get_api_data(include_secrets=include_secrets))
             data['users'] = users
 
         return data
 
 
 class UserGroupMember(Base, BaseModel):
     __tablename__ = 'users_groups_members'
     __table_args__ = (
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
 
     users_group_member_id = Column("users_group_member_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
 
     user = relationship('User', lazy='joined')
     users_group = relationship('UserGroup')
 
     def __init__(self, gr_id='', u_id=''):
         self.users_group_id = gr_id
         self.user_id = u_id
 
 
 class RepositoryField(Base, BaseModel):
     __tablename__ = 'repositories_fields'
     __table_args__ = (
         UniqueConstraint('repository_id', 'field_key'),  # no-multi field
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
     PREFIX = 'ex_'  # prefix used in form to not conflict with already existing fields
 
     repo_field_id = Column("repo_field_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
     field_key = Column("field_key", String(250))
     field_label = Column("field_label", String(1024), nullable=False)
     field_value = Column("field_value", String(10000), nullable=False)
     field_desc = Column("field_desc", String(1024), nullable=False)
     field_type = Column("field_type", String(255), nullable=False, unique=None)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
 
     repository = relationship('Repository')
 
     @property
     def field_key_prefixed(self):
         return 'ex_%s' % self.field_key
 
     @classmethod
     def un_prefix_key(cls, key):
         if key.startswith(cls.PREFIX):
             return key[len(cls.PREFIX):]
         return key
 
     @classmethod
     def get_by_key_name(cls, key, repo):
         row = cls.query()\
                 .filter(cls.repository == repo)\
                 .filter(cls.field_key == key).scalar()
         return row
 
 
 class Repository(Base, BaseModel):
     __tablename__ = 'repositories'
     __table_args__ = (
         Index('r_repo_name_idx', 'repo_name', mysql_length=255),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
     DEFAULT_CLONE_URI = '{scheme}://{user}@{netloc}/{repo}'
     DEFAULT_CLONE_URI_ID = '{scheme}://{user}@{netloc}/_{repoid}'
 
     STATE_CREATED = 'repo_state_created'
     STATE_PENDING = 'repo_state_pending'
     STATE_ERROR = 'repo_state_error'
 
     LOCK_AUTOMATIC = 'lock_auto'
     LOCK_API = 'lock_api'
     LOCK_WEB = 'lock_web'
     LOCK_PULL = 'lock_pull'
 
     NAME_SEP = URL_SEP
 
     repo_id = Column(
         "repo_id", Integer(), nullable=False, unique=True, default=None,
         primary_key=True)
     _repo_name = Column(
         "repo_name", Text(), nullable=False, default=None)
     _repo_name_hash = Column(
         "repo_name_hash", String(255), nullable=False, unique=True)
     repo_state = Column("repo_state", String(255), nullable=True)
 
     clone_uri = Column(
         "clone_uri", EncryptedTextValue(), nullable=True, unique=False,
         default=None)
     repo_type = Column(
         "repo_type", String(255), nullable=False, unique=False, default=None)
     user_id = Column(
         "user_id", Integer(), ForeignKey('users.user_id'), nullable=False,
         unique=False, default=None)
     private = Column(
         "private", Boolean(), nullable=True, unique=None, default=None)
     enable_statistics = Column(
         "statistics", Boolean(), nullable=True, unique=None, default=True)
     enable_downloads = Column(
         "downloads", Boolean(), nullable=True, unique=None, default=True)
     description = Column(
         "description", String(10000), nullable=True, unique=None, default=None)
     created_on = Column(
         'created_on', DateTime(timezone=False), nullable=True, unique=None,
         default=datetime.datetime.now)
     updated_on = Column(
         'updated_on', DateTime(timezone=False), nullable=True, unique=None,
         default=datetime.datetime.now)
     _landing_revision = Column(
         "landing_revision", String(255), nullable=False, unique=False,
         default=None)
     enable_locking = Column(
         "enable_locking", Boolean(), nullable=False, unique=None,
         default=False)
     _locked = Column(
         "locked", String(255), nullable=True, unique=False, default=None)
     _changeset_cache = Column(
         "changeset_cache", LargeBinary(), nullable=True)  # JSON data
 
     fork_id = Column(
         "fork_id", Integer(), ForeignKey('repositories.repo_id'),
         nullable=True, unique=False, default=None)
     group_id = Column(
         "group_id", Integer(), ForeignKey('groups.group_id'), nullable=True,
         unique=False, default=None)
 
-    user = relationship('User')
-    fork = relationship('Repository', remote_side=repo_id)
-    group = relationship('RepoGroup')
+    user = relationship('User', lazy='joined')
+    fork = relationship('Repository', remote_side=repo_id, lazy='joined')
+    group = relationship('RepoGroup', lazy='joined')
     repo_to_perm = relationship(
         'UserRepoToPerm', cascade='all',
         order_by='UserRepoToPerm.repo_to_perm_id')
     users_group_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
     stats = relationship('Statistics', cascade='all', uselist=False)
 
     followers = relationship(
         'UserFollowing',
         primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id',
         cascade='all')
     extra_fields = relationship(
         'RepositoryField', cascade="all, delete, delete-orphan")
     logs = relationship('UserLog')
     comments = relationship(
         'ChangesetComment', cascade="all, delete, delete-orphan")
     pull_requests_source = relationship(
         'PullRequest',
         primaryjoin='PullRequest.source_repo_id==Repository.repo_id',
         cascade="all, delete, delete-orphan")
     pull_requests_target = relationship(
         'PullRequest',
         primaryjoin='PullRequest.target_repo_id==Repository.repo_id',
         cascade="all, delete, delete-orphan")
     ui = relationship('RepoRhodeCodeUi', cascade="all")
     settings = relationship('RepoRhodeCodeSetting', cascade="all")
 
     def __unicode__(self):
         return u"<%s('%s:%s')>" % (self.__class__.__name__, self.repo_id,
                                    safe_unicode(self.repo_name))
 
     @hybrid_property
     def landing_rev(self):
         # always should return [rev_type, rev]
         if self._landing_revision:
             _rev_info = self._landing_revision.split(':')
             if len(_rev_info) < 2:
                 _rev_info.insert(0, 'rev')
             return [_rev_info[0], _rev_info[1]]
         return [None, None]
 
     @landing_rev.setter
     def landing_rev(self, val):
         if ':' not in val:
             raise ValueError('value must be delimited with `:` and consist '
                              'of <rev_type>:<rev>, got %s instead' % val)
         self._landing_revision = val
 
     @hybrid_property
     def locked(self):
         if self._locked:
             user_id, timelocked, reason = self._locked.split(':')
             lock_values = int(user_id), timelocked, reason
         else:
             lock_values = [None, None, None]
         return lock_values
 
     @locked.setter
     def locked(self, val):
         if val and isinstance(val, (list, tuple)):
             self._locked = ':'.join(map(str, val))
         else:
             self._locked = None
 
     @hybrid_property
     def changeset_cache(self):
         from rhodecode.lib.vcs.backends.base import EmptyCommit
         dummy = EmptyCommit().__json__()
         if not self._changeset_cache:
             return dummy
         try:
             return json.loads(self._changeset_cache)
         except TypeError:
             return dummy
         except Exception:
             log.error(traceback.format_exc())
             return dummy
 
     @changeset_cache.setter
     def changeset_cache(self, val):
         try:
             self._changeset_cache = json.dumps(val)
         except Exception:
             log.error(traceback.format_exc())
 
     @hybrid_property
     def repo_name(self):
         return self._repo_name
 
     @repo_name.setter
     def repo_name(self, value):
         self._repo_name = value
         self._repo_name_hash = hashlib.sha1(safe_str(value)).hexdigest()
 
     @classmethod
     def normalize_repo_name(cls, repo_name):
         """
         Normalizes os specific repo_name to the format internally stored inside
-        dabatabase using URL_SEP
+        database using URL_SEP
 
         :param cls:
         :param repo_name:
         """
         return cls.NAME_SEP.join(repo_name.split(os.sep))
 
     @classmethod
-    def get_by_repo_name(cls, repo_name):
-        q = Session().query(cls).filter(cls.repo_name == repo_name)
-        q = q.options(joinedload(Repository.fork))\
-            .options(joinedload(Repository.user))\
-            .options(joinedload(Repository.group))
+    def get_by_repo_name(cls, repo_name, cache=False, identity_cache=False):
+        session = Session()
+        q = session.query(cls).filter(cls.repo_name == repo_name)
+
+        if cache:
+            if identity_cache:
+                val = cls.identity_cache(session, 'repo_name', repo_name)
+                if val:
+                    return val
+            else:
+                q = q.options(
+                    FromCache("sql_cache_short",
+                              "get_repo_by_name_%s" % _hash_key(repo_name)))
+
         return q.scalar()
 
     @classmethod
     def get_by_full_path(cls, repo_full_path):
         repo_name = repo_full_path.split(cls.base_path(), 1)[-1]
         repo_name = cls.normalize_repo_name(repo_name)
         return cls.get_by_repo_name(repo_name.strip(URL_SEP))
 
     @classmethod
     def get_repo_forks(cls, repo_id):
         return cls.query().filter(Repository.fork_id == repo_id)
 
     @classmethod
     def base_path(cls):
         """
         Returns base path when all repos are stored
 
         :param cls:
         """
         q = Session().query(RhodeCodeUi)\
             .filter(RhodeCodeUi.ui_key == cls.NAME_SEP)
         q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
         return q.one().ui_value
 
     @classmethod
     def is_valid(cls, repo_name):
         """
         returns True if given repo name is a valid filesystem repository
 
         :param cls:
         :param repo_name:
         """
         from rhodecode.lib.utils import is_valid_repo
 
         return is_valid_repo(repo_name, cls.base_path())
 
     @classmethod
     def get_all_repos(cls, user_id=Optional(None), group_id=Optional(None),
                       case_insensitive=True):
         q = Repository.query()
 
         if not isinstance(user_id, Optional):
             q = q.filter(Repository.user_id == user_id)
 
         if not isinstance(group_id, Optional):
             q = q.filter(Repository.group_id == group_id)
 
         if case_insensitive:
             q = q.order_by(func.lower(Repository.repo_name))
         else:
             q = q.order_by(Repository.repo_name)
         return q.all()
 
     @property
     def forks(self):
         """
         Return forks of this repo
         """
         return Repository.get_repo_forks(self.repo_id)
 
     @property
     def parent(self):
         """
         Returns fork parent
         """
         return self.fork
 
     @property
     def just_name(self):
         return self.repo_name.split(self.NAME_SEP)[-1]
 
     @property
     def groups_with_parents(self):
         groups = []
         if self.group is None:
             return groups
 
         cur_gr = self.group
         groups.insert(0, cur_gr)
         while 1:
             gr = getattr(cur_gr, 'parent_group', None)
             cur_gr = cur_gr.parent_group
             if gr is None:
                 break
             groups.insert(0, gr)
 
         return groups
 
     @property
     def groups_and_repo(self):
         return self.groups_with_parents, self
 
     @LazyProperty
     def repo_path(self):
         """
         Returns base full path for that repository means where it actually
         exists on a filesystem
         """
         q = Session().query(RhodeCodeUi).filter(
             RhodeCodeUi.ui_key == self.NAME_SEP)
         q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
         return q.one().ui_value
 
     @property
     def repo_full_path(self):
         p = [self.repo_path]
         # we need to split the name by / since this is how we store the
         # names in the database, but that eventually needs to be converted
         # into a valid system path
         p += self.repo_name.split(self.NAME_SEP)
         return os.path.join(*map(safe_unicode, p))
 
     @property
     def cache_keys(self):
         """
         Returns associated cache keys for that repo
         """
         return CacheKey.query()\
             .filter(CacheKey.cache_args == self.repo_name)\
             .order_by(CacheKey.cache_key)\
             .all()
 
     def get_new_name(self, repo_name):
         """
         returns new full repository name based on assigned group and new new
 
         :param group_name:
         """
         path_prefix = self.group.full_path_splitted if self.group else []
         return self.NAME_SEP.join(path_prefix + [repo_name])
 
     @property
     def _config(self):
         """
         Returns db based config object.
         """
         from rhodecode.lib.utils import make_db_config
         return make_db_config(clear_session=False, repo=self)
 
     def permissions(self, with_admins=True, with_owner=True):
         q = UserRepoToPerm.query().filter(UserRepoToPerm.repository == self)
         q = q.options(joinedload(UserRepoToPerm.repository),
                       joinedload(UserRepoToPerm.user),
                       joinedload(UserRepoToPerm.permission),)
 
         # get owners and admins and permissions. We do a trick of re-writing
         # objects from sqlalchemy to named-tuples due to sqlalchemy session
         # has a global reference and changing one object propagates to all
         # others. This means if admin is also an owner admin_row that change
         # would propagate to both objects
         perm_rows = []
         for _usr in q.all():
             usr = AttributeDict(_usr.user.get_dict())
             usr.permission = _usr.permission.permission_name
             perm_rows.append(usr)
 
         # filter the perm rows by 'default' first and then sort them by
         # admin,write,read,none permissions sorted again alphabetically in
         # each group
         perm_rows = sorted(perm_rows, key=display_sort)
 
         _admin_perm = 'repository.admin'
         owner_row = []
         if with_owner:
             usr = AttributeDict(self.user.get_dict())
             usr.owner_row = True
             usr.permission = _admin_perm
             owner_row.append(usr)
 
         super_admin_rows = []
         if with_admins:
             for usr in User.get_all_super_admins():
                 # if this admin is also owner, don't double the record
                 if usr.user_id == owner_row[0].user_id:
                     owner_row[0].admin_row = True
                 else:
                     usr = AttributeDict(usr.get_dict())
                     usr.admin_row = True
                     usr.permission = _admin_perm
                     super_admin_rows.append(usr)
 
         return super_admin_rows + owner_row + perm_rows
 
     def permission_user_groups(self):
         q = UserGroupRepoToPerm.query().filter(
             UserGroupRepoToPerm.repository == self)
         q = q.options(joinedload(UserGroupRepoToPerm.repository),
                       joinedload(UserGroupRepoToPerm.users_group),
                       joinedload(UserGroupRepoToPerm.permission),)
 
         perm_rows = []
         for _user_group in q.all():
             usr = AttributeDict(_user_group.users_group.get_dict())
             usr.permission = _user_group.permission.permission_name
             perm_rows.append(usr)
 
         return perm_rows
 
     def get_api_data(self, include_secrets=False):
         """
         Common function for generating repo api data
 
         :param include_secrets: See :meth:`User.get_api_data`.
 
         """
         # TODO: mikhail: Here there is an anti-pattern, we probably need to
         # move this methods on models level.
         from rhodecode.model.settings import SettingsModel
 
         repo = self
         _user_id, _time, _reason = self.locked
 
         data = {
             'repo_id': repo.repo_id,
             'repo_name': repo.repo_name,
             'repo_type': repo.repo_type,
             'clone_uri': repo.clone_uri or '',
             'private': repo.private,
             'created_on': repo.created_on,
             'description': repo.description,
             'landing_rev': repo.landing_rev,
             'owner': repo.user.username,
             'fork_of': repo.fork.repo_name if repo.fork else None,
             'enable_statistics': repo.enable_statistics,
             'enable_locking': repo.enable_locking,
             'enable_downloads': repo.enable_downloads,
             'last_changeset': repo.changeset_cache,
             'locked_by': User.get(_user_id).get_api_data(
                 include_secrets=include_secrets) if _user_id else None,
             'locked_date': time_to_datetime(_time) if _time else None,
             'lock_reason': _reason if _reason else None,
         }
 
         # TODO: mikhail: should be per-repo settings here
         rc_config = SettingsModel().get_all_settings()
         repository_fields = str2bool(
             rc_config.get('rhodecode_repository_fields'))
         if repository_fields:
             for f in self.extra_fields:
                 data[f.field_key_prefixed] = f.field_value
 
         return data
 
     @classmethod
     def lock(cls, repo, user_id, lock_time=None, lock_reason=None):
         if not lock_time:
             lock_time = time.time()
         if not lock_reason:
             lock_reason = cls.LOCK_AUTOMATIC
         repo.locked = [user_id, lock_time, lock_reason]
         Session().add(repo)
         Session().commit()
 
     @classmethod
     def unlock(cls, repo):
         repo.locked = None
         Session().add(repo)
         Session().commit()
 
     @classmethod
     def getlock(cls, repo):
         return repo.locked
 
     def is_user_lock(self, user_id):
         if self.lock[0]:
             lock_user_id = safe_int(self.lock[0])
             user_id = safe_int(user_id)
             # both are ints, and they are equal
             return all([lock_user_id, user_id]) and lock_user_id == user_id
 
         return False
 
     def get_locking_state(self, action, user_id, only_when_enabled=True):
         """
         Checks locking on this repository, if locking is enabled and lock is
         present returns a tuple of make_lock, locked, locked_by.
         make_lock can have 3 states None (do nothing) True, make lock
         False release lock, This value is later propagated to hooks, which
         do the locking. Think about this as signals passed to hooks what to do.
 
         """
         # TODO: johbo: This is part of the business logic and should be moved
         # into the RepositoryModel.
 
         if action not in ('push', 'pull'):
             raise ValueError("Invalid action value: %s" % repr(action))
 
         # defines if locked error should be thrown to user
         currently_locked = False
         # defines if new lock should be made, tri-state
         make_lock = None
         repo = self
         user = User.get(user_id)
 
         lock_info = repo.locked
 
         if repo and (repo.enable_locking or not only_when_enabled):
             if action == 'push':
                 # check if it's already locked !, if it is compare users
                 locked_by_user_id = lock_info[0]
                 if user.user_id == locked_by_user_id:
                     log.debug(
                         'Got `push` action from user %s, now unlocking', user)
                     # unlock if we have push from user who locked
                     make_lock = False
                 else:
                     # we're not the same user who locked, ban with
                     # code defined in settings (default is 423 HTTP Locked) !
                     log.debug('Repo %s is currently locked by %s', repo, user)
                     currently_locked = True
             elif action == 'pull':
                 # [0] user [1] date
                 if lock_info[0] and lock_info[1]:
                     log.debug('Repo %s is currently locked by %s', repo, user)
                     currently_locked = True
                 else:
                     log.debug('Setting lock on repo %s by %s', repo, user)
                     make_lock = True
 
         else:
             log.debug('Repository %s do not have locking enabled', repo)
 
         log.debug('FINAL locking values make_lock:%s,locked:%s,locked_by:%s',
                   make_lock, currently_locked, lock_info)
 
         from rhodecode.lib.auth import HasRepoPermissionAny
         perm_check = HasRepoPermissionAny('repository.write', 'repository.admin')
         if make_lock and not perm_check(repo_name=repo.repo_name, user=user):
             # if we don't have at least write permission we cannot make a lock
             log.debug('lock state reset back to FALSE due to lack '
                       'of at least read permission')
             make_lock = False
 
         return make_lock, currently_locked, lock_info
 
     @property
     def last_db_change(self):
         return self.updated_on
 
     @property
     def clone_uri_hidden(self):
         clone_uri = self.clone_uri
         if clone_uri:
             import urlobject
-            url_obj = urlobject.URLObject(self.clone_uri)
+            url_obj = urlobject.URLObject(clone_uri)
             if url_obj.password:
                 clone_uri = url_obj.with_password('*****')
         return clone_uri
 
     def clone_url(self, **override):
         qualified_home_url = url('home', qualified=True)
 
         uri_tmpl = None
         if 'with_id' in override:
             uri_tmpl = self.DEFAULT_CLONE_URI_ID
             del override['with_id']
 
         if 'uri_tmpl' in override:
             uri_tmpl = override['uri_tmpl']
             del override['uri_tmpl']
 
         # we didn't override our tmpl from **overrides
         if not uri_tmpl:
             uri_tmpl = self.DEFAULT_CLONE_URI
             try:
                 from pylons import tmpl_context as c
                 uri_tmpl = c.clone_uri_tmpl
             except Exception:
                 # in any case if we call this outside of request context,
                 # ie, not having tmpl_context set up
                 pass
 
         return get_clone_url(uri_tmpl=uri_tmpl,
                              qualifed_home_url=qualified_home_url,
                              repo_name=self.repo_name,
                              repo_id=self.repo_id, **override)
 
     def set_state(self, state):
         self.repo_state = state
         Session().add(self)
     #==========================================================================
     # SCM PROPERTIES
     #==========================================================================
 
     def get_commit(self, commit_id=None, commit_idx=None, pre_load=None):
         return get_commit_safe(
             self.scm_instance(), commit_id, commit_idx, pre_load=pre_load)
 
     def get_changeset(self, rev=None, pre_load=None):
         warnings.warn("Use get_commit", DeprecationWarning)
         commit_id = None
         commit_idx = None
         if isinstance(rev, basestring):
             commit_id = rev
         else:
             commit_idx = rev
         return self.get_commit(commit_id=commit_id, commit_idx=commit_idx,
                                pre_load=pre_load)
 
     def get_landing_commit(self):
         """
         Returns landing commit, or if that doesn't exist returns the tip
         """
         _rev_type, _rev = self.landing_rev
         commit = self.get_commit(_rev)
         if isinstance(commit, EmptyCommit):
             return self.get_commit()
         return commit
 
     def update_commit_cache(self, cs_cache=None, config=None):
         """
         Update cache of last changeset for repository, keys should be::
 
             short_id
             raw_id
             revision
             parents
             message
             date
             author
 
         :param cs_cache:
         """
         from rhodecode.lib.vcs.backends.base import BaseChangeset
         if cs_cache is None:
             # use no-cache version here
             scm_repo = self.scm_instance(cache=False, config=config)
             if scm_repo:
                 cs_cache = scm_repo.get_commit(
                     pre_load=["author", "date", "message", "parents"])
             else:
                 cs_cache = EmptyCommit()
 
         if isinstance(cs_cache, BaseChangeset):
             cs_cache = cs_cache.__json__()
 
         def is_outdated(new_cs_cache):
             if new_cs_cache['raw_id'] != self.changeset_cache['raw_id']:
                 return True
             return False
 
         # check if we have maybe already latest cached revision
         if is_outdated(cs_cache) or not self.changeset_cache:
             _default = datetime.datetime.fromtimestamp(0)
             last_change = cs_cache.get('date') or _default
             log.debug('updated repo %s with new cs cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache
             Session().add(self)
             Session().commit()
         else:
             log.debug('Skipping update_commit_cache for repo:`%s` '
                       'commit already with latest changes', self.repo_name)
 
     @property
     def tip(self):
         return self.get_commit('tip')
 
     @property
     def author(self):
         return self.tip.author
 
     @property
     def last_change(self):
         return self.scm_instance().last_change
 
     def get_comments(self, revisions=None):
         """
         Returns comments for this repository grouped by revisions
 
         :param revisions: filter query by revisions only
         """
         cmts = ChangesetComment.query()\
             .filter(ChangesetComment.repo == self)
         if revisions:
             cmts = cmts.filter(ChangesetComment.revision.in_(revisions))
         grouped = collections.defaultdict(list)
         for cmt in cmts.all():
             grouped[cmt.revision].append(cmt)
         return grouped
 
     def statuses(self, revisions=None):
         """
         Returns statuses for this repository
 
         :param revisions: list of revisions to get statuses for
         """
         statuses = ChangesetStatus.query()\
             .filter(ChangesetStatus.repo == self)\
             .filter(ChangesetStatus.version == 0)
 
         if revisions:
             # Try doing the filtering in chunks to avoid hitting limits
             size = 500
             status_results = []
             for chunk in xrange(0, len(revisions), size):
                 status_results += statuses.filter(
                     ChangesetStatus.revision.in_(
                         revisions[chunk: chunk+size])
                 ).all()
         else:
             status_results = statuses.all()
 
         grouped = {}
 
         # maybe we have open new pullrequest without a status?
         stat = ChangesetStatus.STATUS_UNDER_REVIEW
         status_lbl = ChangesetStatus.get_status_lbl(stat)
         for pr in PullRequest.query().filter(PullRequest.source_repo == self).all():
             for rev in pr.revisions:
                 pr_id = pr.pull_request_id
                 pr_repo = pr.target_repo.repo_name
                 grouped[rev] = [stat, status_lbl, pr_id, pr_repo]
 
         for stat in status_results:
             pr_id = pr_repo = None
             if stat.pull_request:
                 pr_id = stat.pull_request.pull_request_id
                 pr_repo = stat.pull_request.target_repo.repo_name
             grouped[stat.revision] = [str(stat.status), stat.status_lbl,
                                       pr_id, pr_repo]
         return grouped
 
     # ==========================================================================
     # SCM CACHE INSTANCE
     # ==========================================================================
 
     def scm_instance(self, **kwargs):
         import rhodecode
 
         # Passing a config will not hit the cache currently only used
         # for repo2dbmapper
         config = kwargs.pop('config', None)
         cache = kwargs.pop('cache', None)
         full_cache = str2bool(rhodecode.CONFIG.get('vcs_full_cache'))
         # if cache is NOT defined use default global, else we have a full
         # control over cache behaviour
         if cache is None and full_cache and not config:
             return self._get_instance_cached()
         return self._get_instance(cache=bool(cache), config=config)
 
     def _get_instance_cached(self):
         @cache_region('long_term')
         def _get_repo(cache_key):
             return self._get_instance()
 
         invalidator_context = CacheKey.repo_context_cache(
             _get_repo, self.repo_name, None)
 
         with invalidator_context as context:
             context.invalidate()
             repo = context.compute()
 
         return repo
 
     def _get_instance(self, cache=True, config=None):
         repo_full_path = self.repo_full_path
         try:
             vcs_alias = get_scm(repo_full_path)[0]
             log.debug(
                 'Creating instance of %s repository from %s',
                 vcs_alias, repo_full_path)
             backend = get_backend(vcs_alias)
         except VCSError:
             log.exception(
                 'Perhaps this repository is in db and not in '
                 'filesystem run rescan repositories with '
                 '"destroy old data" option from admin panel')
             return
 
         config = config or self._config
         custom_wire = {
             'cache': cache  # controls the vcs.remote cache
         }
         repo = backend(
             safe_str(repo_full_path), config=config, create=False,
             with_wire=custom_wire)
 
         return repo
 
     def __json__(self):
         return {'landing_rev': self.landing_rev}
 
     def get_dict(self):
 
         # Since we transformed `repo_name` to a hybrid property, we need to
         # keep compatibility with the code which uses `repo_name` field.
 
         result = super(Repository, self).get_dict()
         result['repo_name'] = result.pop('_repo_name', None)
         return result
 
 
 class RepoGroup(Base, BaseModel):
     __tablename__ = 'groups'
     __table_args__ = (
         UniqueConstraint('group_name', 'group_parent_id'),
         CheckConstraint('group_id != group_parent_id'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
     __mapper_args__ = {'order_by': 'group_name'}
 
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
     group_parent_id = Column("group_parent_id", Integer(), ForeignKey('groups.group_id'), nullable=True, unique=None, default=None)
     group_description = Column("group_description", String(10000), nullable=True, unique=None, default=None)
     enable_locking = Column("enable_locking", Boolean(), nullable=False, unique=None, default=False)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
 
     repo_group_to_perm = relationship('UserRepoGroupToPerm', cascade='all', order_by='UserRepoGroupToPerm.group_to_perm_id')
     users_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
     parent_group = relationship('RepoGroup', remote_side=group_id)
     user = relationship('User')
 
     def __init__(self, group_name='', parent_group=None):
         self.group_name = group_name
         self.parent_group = parent_group
 
     def __unicode__(self):
         return u"<%s('id:%s:%s')>" % (self.__class__.__name__, self.group_id,
                                       self.group_name)
 
     @classmethod
     def _generate_choice(cls, repo_group):
         from webhelpers.html import literal as _literal
         _name = lambda k: _literal(cls.CHOICES_SEPARATOR.join(k))
         return repo_group.group_id, _name(repo_group.full_path_splitted)
 
     @classmethod
     def groups_choices(cls, groups=None, show_empty_group=True):
         if not groups:
             groups = cls.query().all()
 
         repo_groups = []
         if show_empty_group:
             repo_groups = [('-1', u'-- %s --' % _('No parent'))]
 
         repo_groups.extend([cls._generate_choice(x) for x in groups])
 
         repo_groups = sorted(
             repo_groups, key=lambda t: t[1].split(cls.CHOICES_SEPARATOR)[0])
         return repo_groups
 
     @classmethod
     def url_sep(cls):
         return URL_SEP
 
     @classmethod
     def get_by_group_name(cls, group_name, cache=False, case_insensitive=False):
         if case_insensitive:
             gr = cls.query().filter(func.lower(cls.group_name)
                                     == func.lower(group_name))
         else:
             gr = cls.query().filter(cls.group_name == group_name)
         if cache:
             gr = gr.options(FromCache(
                             "sql_cache_short",
                             "get_group_%s" % _hash_key(group_name)))
         return gr.scalar()
 
     @classmethod
     def get_all_repo_groups(cls, user_id=Optional(None), group_id=Optional(None),
                             case_insensitive=True):
         q = RepoGroup.query()
 
         if not isinstance(user_id, Optional):
             q = q.filter(RepoGroup.user_id == user_id)
 
         if not isinstance(group_id, Optional):
             q = q.filter(RepoGroup.group_parent_id == group_id)
 
         if case_insensitive:
             q = q.order_by(func.lower(RepoGroup.group_name))
         else:
             q = q.order_by(RepoGroup.group_name)
         return q.all()
 
     @property
     def parents(self):
         parents_recursion_limit = 10
         groups = []
         if self.parent_group is None:
             return groups
         cur_gr = self.parent_group
         groups.insert(0, cur_gr)
         cnt = 0
         while 1:
             cnt += 1
             gr = getattr(cur_gr, 'parent_group', None)
             cur_gr = cur_gr.parent_group
             if gr is None:
                 break
             if cnt == parents_recursion_limit:
                 # this will prevent accidental infinit loops
                 log.error(('more than %s parents found for group %s, stopping '
                            'recursive parent fetching' % (parents_recursion_limit, self)))
                 break
 
             groups.insert(0, gr)
         return groups
 
     @property
     def children(self):
         return RepoGroup.query().filter(RepoGroup.parent_group == self)
 
     @property
     def name(self):
         return self.group_name.split(RepoGroup.url_sep())[-1]
 
     @property
     def full_path(self):
         return self.group_name
 
     @property
     def full_path_splitted(self):
         return self.group_name.split(RepoGroup.url_sep())
 
     @property
     def repositories(self):
         return Repository.query()\
                 .filter(Repository.group == self)\
                 .order_by(Repository.repo_name)
 
     @property
     def repositories_recursive_count(self):
         cnt = self.repositories.count()
 
         def children_count(group):
             cnt = 0
             for child in group.children:
                 cnt += child.repositories.count()
                 cnt += children_count(child)
             return cnt
 
         return cnt + children_count(self)
 
     def _recursive_objects(self, include_repos=True):
         all_ = []
 
         def _get_members(root_gr):
             if include_repos:
                 for r in root_gr.repositories:
                     all_.append(r)
             childs = root_gr.children.all()
             if childs:
                 for gr in childs:
                     all_.append(gr)
                     _get_members(gr)
 
         _get_members(self)
         return [self] + all_
 
     def recursive_groups_and_repos(self):
         """
         Recursive return all groups, with repositories in those groups
         """
         return self._recursive_objects()
 
     def recursive_groups(self):
         """
         Returns all children groups for this group including children of children
         """
         return self._recursive_objects(include_repos=False)
 
     def get_new_name(self, group_name):
         """
         returns new full group name based on parent and new name
 
         :param group_name:
         """
         path_prefix = (self.parent_group.full_path_splitted if
                        self.parent_group else [])
         return RepoGroup.url_sep().join(path_prefix + [group_name])
 
     def permissions(self, with_admins=True, with_owner=True):
         q = UserRepoGroupToPerm.query().filter(UserRepoGroupToPerm.group == self)
         q = q.options(joinedload(UserRepoGroupToPerm.group),
                       joinedload(UserRepoGroupToPerm.user),
                       joinedload(UserRepoGroupToPerm.permission),)
 
         # get owners and admins and permissions. We do a trick of re-writing
         # objects from sqlalchemy to named-tuples due to sqlalchemy session
         # has a global reference and changing one object propagates to all
         # others. This means if admin is also an owner admin_row that change
         # would propagate to both objects
         perm_rows = []
         for _usr in q.all():
             usr = AttributeDict(_usr.user.get_dict())
             usr.permission = _usr.permission.permission_name
             perm_rows.append(usr)
 
         # filter the perm rows by 'default' first and then sort them by
         # admin,write,read,none permissions sorted again alphabetically in
         # each group
         perm_rows = sorted(perm_rows, key=display_sort)
 
         _admin_perm = 'group.admin'
         owner_row = []
         if with_owner:
             usr = AttributeDict(self.user.get_dict())
             usr.owner_row = True
             usr.permission = _admin_perm
             owner_row.append(usr)
 
         super_admin_rows = []
         if with_admins:
             for usr in User.get_all_super_admins():
                 # if this admin is also owner, don't double the record
                 if usr.user_id == owner_row[0].user_id:
                     owner_row[0].admin_row = True
                 else:
                     usr = AttributeDict(usr.get_dict())
                     usr.admin_row = True
                     usr.permission = _admin_perm
                     super_admin_rows.append(usr)
 
         return super_admin_rows + owner_row + perm_rows
 
     def permission_user_groups(self):
         q = UserGroupRepoGroupToPerm.query().filter(UserGroupRepoGroupToPerm.group == self)
         q = q.options(joinedload(UserGroupRepoGroupToPerm.group),
                       joinedload(UserGroupRepoGroupToPerm.users_group),
                       joinedload(UserGroupRepoGroupToPerm.permission),)
 
         perm_rows = []
         for _user_group in q.all():
             usr = AttributeDict(_user_group.users_group.get_dict())
             usr.permission = _user_group.permission.permission_name
             perm_rows.append(usr)
 
         return perm_rows
 
     def get_api_data(self):
         """
         Common function for generating api data
 
         """
         group = self
         data = {
             'group_id': group.group_id,
             'group_name': group.group_name,
             'group_description': group.group_description,
             'parent_group': group.parent_group.group_name if group.parent_group else None,
             'repositories': [x.repo_name for x in group.repositories],
             'owner': group.user.username,
         }
         return data
 
 
 class Permission(Base, BaseModel):
     __tablename__ = 'permissions'
     __table_args__ = (
         Index('p_perm_name_idx', 'permission_name'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
     PERMS = [
         ('hg.admin', _('RhodeCode Super Administrator')),
 
         ('repository.none', _('Repository no access')),
         ('repository.read', _('Repository read access')),
         ('repository.write', _('Repository write access')),
         ('repository.admin', _('Repository admin access')),
 
         ('group.none', _('Repository group no access')),
         ('group.read', _('Repository group read access')),
         ('group.write', _('Repository group write access')),
         ('group.admin', _('Repository group admin access')),
 
         ('usergroup.none', _('User group no access')),
         ('usergroup.read', _('User group read access')),
         ('usergroup.write', _('User group write access')),
         ('usergroup.admin', _('User group admin access')),
 
         ('hg.repogroup.create.false', _('Repository Group creation disabled')),
         ('hg.repogroup.create.true', _('Repository Group creation enabled')),
 
         ('hg.usergroup.create.false', _('User Group creation disabled')),
         ('hg.usergroup.create.true', _('User Group creation enabled')),
 
         ('hg.create.none', _('Repository creation disabled')),
         ('hg.create.repository', _('Repository creation enabled')),
         ('hg.create.write_on_repogroup.true', _('Repository creation enabled with write permission to a repository group')),
         ('hg.create.write_on_repogroup.false', _('Repository creation disabled with write permission to a repository group')),
 
         ('hg.fork.none', _('Repository forking disabled')),
         ('hg.fork.repository', _('Repository forking enabled')),
 
         ('hg.register.none', _('Registration disabled')),
         ('hg.register.manual_activate', _('User Registration with manual account activation')),
         ('hg.register.auto_activate', _('User Registration with automatic account activation')),
 
         ('hg.extern_activate.manual', _('Manual activation of external account')),
         ('hg.extern_activate.auto', _('Automatic activation of external account')),
 
         ('hg.inherit_default_perms.false', _('Inherit object permissions from default user disabled')),
         ('hg.inherit_default_perms.true', _('Inherit object permissions from default user enabled')),
     ]
 
     # definition of system default permissions for DEFAULT user
     DEFAULT_USER_PERMISSIONS = [
         'repository.read',
         'group.read',
         'usergroup.read',
         'hg.create.repository',
         'hg.repogroup.create.false',
         'hg.usergroup.create.false',
         'hg.create.write_on_repogroup.true',
         'hg.fork.repository',
         'hg.register.manual_activate',
         'hg.extern_activate.auto',
         'hg.inherit_default_perms.true',
     ]
 
     # defines which permissions are more important higher the more important
     # Weight defines which permissions are more important.
     # The higher number the more important.
     PERM_WEIGHTS = {
         'repository.none': 0,
         'repository.read': 1,
         'repository.write': 3,
         'repository.admin': 4,
 
         'group.none': 0,
         'group.read': 1,
         'group.write': 3,
         'group.admin': 4,
 
         'usergroup.none': 0,
         'usergroup.read': 1,
         'usergroup.write': 3,
         'usergroup.admin': 4,
 
         'hg.repogroup.create.false': 0,
         'hg.repogroup.create.true': 1,
 
         'hg.usergroup.create.false': 0,
         'hg.usergroup.create.true': 1,
 
         'hg.fork.none': 0,
         'hg.fork.repository': 1,
         'hg.create.none': 0,
         'hg.create.repository': 1
     }
 
     permission_id = Column("permission_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     permission_name = Column("permission_name", String(255), nullable=True, unique=None, default=None)
     permission_longname = Column("permission_longname", String(255), nullable=True, unique=None, default=None)
 
     def __unicode__(self):
         return u"<%s('%s:%s')>" % (
             self.__class__.__name__, self.permission_id, self.permission_name
         )
 
     @classmethod
     def get_by_key(cls, key):
         return cls.query().filter(cls.permission_name == key).scalar()
 
     @classmethod
     def get_default_repo_perms(cls, user_id, repo_id=None):
         q = Session().query(UserRepoToPerm, Repository, Permission)\
             .join((Permission, UserRepoToPerm.permission_id == Permission.permission_id))\
             .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\
             .filter(UserRepoToPerm.user_id == user_id)
         if repo_id:
             q = q.filter(UserRepoToPerm.repository_id == repo_id)
         return q.all()
 
     @classmethod
     def get_default_repo_perms_from_user_group(cls, user_id, repo_id=None):
         q = Session().query(UserGroupRepoToPerm, Repository, Permission)\
             .join(
                 Permission,
                 UserGroupRepoToPerm.permission_id == Permission.permission_id)\
             .join(
                 Repository,
                 UserGroupRepoToPerm.repository_id == Repository.repo_id)\
             .join(
                 UserGroup,
                 UserGroupRepoToPerm.users_group_id ==
                 UserGroup.users_group_id)\
             .join(
                 UserGroupMember,
                 UserGroupRepoToPerm.users_group_id ==
                 UserGroupMember.users_group_id)\
             .filter(
                 UserGroupMember.user_id == user_id,
                 UserGroup.users_group_active == true())
         if repo_id:
             q = q.filter(UserGroupRepoToPerm.repository_id == repo_id)
         return q.all()
 
     @classmethod
     def get_default_group_perms(cls, user_id, repo_group_id=None):
         q = Session().query(UserRepoGroupToPerm, RepoGroup, Permission)\
             .join((Permission, UserRepoGroupToPerm.permission_id == Permission.permission_id))\
             .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\
             .filter(UserRepoGroupToPerm.user_id == user_id)
         if repo_group_id:
             q = q.filter(UserRepoGroupToPerm.group_id == repo_group_id)
         return q.all()
 
     @classmethod
     def get_default_group_perms_from_user_group(
             cls, user_id, repo_group_id=None):
         q = Session().query(UserGroupRepoGroupToPerm, RepoGroup, Permission)\
             .join(
                 Permission,
                 UserGroupRepoGroupToPerm.permission_id ==
                 Permission.permission_id)\
             .join(
                 RepoGroup,
                 UserGroupRepoGroupToPerm.group_id == RepoGroup.group_id)\
             .join(
                 UserGroup,
                 UserGroupRepoGroupToPerm.users_group_id ==
                 UserGroup.users_group_id)\
             .join(
                 UserGroupMember,
                 UserGroupRepoGroupToPerm.users_group_id ==
                 UserGroupMember.users_group_id)\
             .filter(
                 UserGroupMember.user_id == user_id,
                 UserGroup.users_group_active == true())
         if repo_group_id:
             q = q.filter(UserGroupRepoGroupToPerm.group_id == repo_group_id)
         return q.all()
 
     @classmethod
     def get_default_user_group_perms(cls, user_id, user_group_id=None):
         q = Session().query(UserUserGroupToPerm, UserGroup, Permission)\
             .join((Permission, UserUserGroupToPerm.permission_id == Permission.permission_id))\
             .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id))\
             .filter(UserUserGroupToPerm.user_id == user_id)
         if user_group_id:
             q = q.filter(UserUserGroupToPerm.user_group_id == user_group_id)
         return q.all()
 
     @classmethod
     def get_default_user_group_perms_from_user_group(
             cls, user_id, user_group_id=None):
         TargetUserGroup = aliased(UserGroup, name='target_user_group')
         q = Session().query(UserGroupUserGroupToPerm, UserGroup, Permission)\
             .join(
                 Permission,
                 UserGroupUserGroupToPerm.permission_id ==
                 Permission.permission_id)\
             .join(
                 TargetUserGroup,
                 UserGroupUserGroupToPerm.target_user_group_id ==
                 TargetUserGroup.users_group_id)\
             .join(
                 UserGroup,
                 UserGroupUserGroupToPerm.user_group_id ==
                 UserGroup.users_group_id)\
             .join(
                 UserGroupMember,
                 UserGroupUserGroupToPerm.user_group_id ==
                 UserGroupMember.users_group_id)\
             .filter(
                 UserGroupMember.user_id == user_id,
                 UserGroup.users_group_active == true())
         if user_group_id:
             q = q.filter(
                 UserGroupUserGroupToPerm.user_group_id == user_group_id)
 
         return q.all()
 
 
 class UserRepoToPerm(Base, BaseModel):
     __tablename__ = 'repo_to_perm'
     __table_args__ = (
         UniqueConstraint('user_id', 'repository_id', 'permission_id'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
     repo_to_perm_id = Column("repo_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
 
     user = relationship('User')
     repository = relationship('Repository')
     permission = relationship('Permission')
 
     @classmethod
     def create(cls, user, repository, permission):
         n = cls()
         n.user = user
         n.repository = repository
         n.permission = permission
         Session().add(n)
         return n
 
     def __unicode__(self):
         return u'<%s => %s >' % (self.user, self.repository)
 
 
 class UserUserGroupToPerm(Base, BaseModel):
     __tablename__ = 'user_user_group_to_perm'
     __table_args__ = (
         UniqueConstraint('user_id', 'user_group_id', 'permission_id'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
     user_user_group_to_perm_id = Column("user_user_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     user_group_id = Column("user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
 
     user = relationship('User')
     user_group = relationship('UserGroup')
     permission = relationship('Permission')
 
     @classmethod
     def create(cls, user, user_group, permission):
         n = cls()
         n.user = user
         n.user_group = user_group
         n.permission = permission
         Session().add(n)
         return n
 
     def __unicode__(self):
         return u'<%s => %s >' % (self.user, self.user_group)
 
 
 class UserToPerm(Base, BaseModel):
     __tablename__ = 'user_to_perm'
     __table_args__ = (
         UniqueConstraint('user_id', 'permission_id'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
     user_to_perm_id = Column("user_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
 
     user = relationship('User')
     permission = relationship('Permission', lazy='joined')
 
     def __unicode__(self):
         return u'<%s => %s >' % (self.user, self.permission)
 
 
 class UserGroupRepoToPerm(Base, BaseModel):
     __tablename__ = 'users_group_repo_to_perm'
     __table_args__ = (
         UniqueConstraint('repository_id', 'users_group_id', 'permission_id'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
     users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
 
     users_group = relationship('UserGroup')
     permission = relationship('Permission')
     repository = relationship('Repository')
 
     @classmethod
     def create(cls, users_group, repository, permission):
         n = cls()
         n.users_group = users_group
         n.repository = repository
         n.permission = permission
         Session().add(n)
         return n
 
     def __unicode__(self):
         return u'<UserGroupRepoToPerm:%s => %s >' % (self.users_group, self.repository)
 
 
 class UserGroupUserGroupToPerm(Base, BaseModel):
     __tablename__ = 'user_group_user_group_to_perm'
     __table_args__ = (
         UniqueConstraint('target_user_group_id', 'user_group_id', 'permission_id'),
         CheckConstraint('target_user_group_id != user_group_id'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
     user_group_user_group_to_perm_id = Column("user_group_user_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     target_user_group_id = Column("target_user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
     user_group_id = Column("user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
 
     target_user_group = relationship('UserGroup', primaryjoin='UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id')
     user_group = relationship('UserGroup', primaryjoin='UserGroupUserGroupToPerm.user_group_id==UserGroup.users_group_id')
     permission = relationship('Permission')
 
     @classmethod
     def create(cls, target_user_group, user_group, permission):
         n = cls()
         n.target_user_group = target_user_group
         n.user_group = user_group
         n.permission = permission
         Session().add(n)
         return n
 
     def __unicode__(self):
         return u'<UserGroupUserGroup:%s => %s >' % (self.target_user_group, self.user_group)
 
 
 class UserGroupToPerm(Base, BaseModel):
     __tablename__ = 'users_group_to_perm'
     __table_args__ = (
         UniqueConstraint('users_group_id', 'permission_id',),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
     users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
 
     users_group = relationship('UserGroup')
     permission = relationship('Permission')
 
 
 class UserRepoGroupToPerm(Base, BaseModel):
     __tablename__ = 'user_repo_group_to_perm'
     __table_args__ = (
         UniqueConstraint('user_id', 'group_id', 'permission_id'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
 
     group_to_perm_id = Column("group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
 
     user = relationship('User')
     group = relationship('RepoGroup')
     permission = relationship('Permission')
 
     @classmethod
     def create(cls, user, repository_group, permission):
         n = cls()
         n.user = user
         n.group = repository_group
         n.permission = permission
         Session().add(n)
         return n
 
 
 class UserGroupRepoGroupToPerm(Base, BaseModel):
     __tablename__ = 'users_group_repo_group_to_perm'
     __table_args__ = (
         UniqueConstraint('users_group_id', 'group_id'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
 
     users_group_repo_group_to_perm_id = Column("users_group_repo_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
 
     users_group = relationship('UserGroup')
     permission = relationship('Permission')
     group = relationship('RepoGroup')
 
     @classmethod
     def create(cls, user_group, repository_group, permission):
         n = cls()
         n.users_group = user_group
         n.group = repository_group
         n.permission = permission
         Session().add(n)
         return n
 
     def __unicode__(self):
         return u'<UserGroupRepoGroupToPerm:%s => %s >' % (self.users_group, self.group)
 
 
 class Statistics(Base, BaseModel):
     __tablename__ = 'statistics'
     __table_args__ = (
          UniqueConstraint('repository_id'),
          {'extend_existing': True, 'mysql_engine': 'InnoDB',
           'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
     stat_id = Column("stat_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=True, default=None)
     stat_on_revision = Column("stat_on_revision", Integer(), nullable=False)
     commit_activity = Column("commit_activity", LargeBinary(1000000), nullable=False)#JSON data
     commit_activity_combined = Column("commit_activity_combined", LargeBinary(), nullable=False)#JSON data
     languages = Column("languages", LargeBinary(1000000), nullable=False)#JSON data
 
     repository = relationship('Repository', single_parent=True)
 
 
 class UserFollowing(Base, BaseModel):
     __tablename__ = 'user_followings'
     __table_args__ = (
         UniqueConstraint('user_id', 'follows_repository_id'),
         UniqueConstraint('user_id', 'follows_user_id'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
 
     user_following_id = Column("user_following_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     follows_repo_id = Column("follows_repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True, unique=None, default=None)
     follows_user_id = Column("follows_user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
     follows_from = Column('follows_from', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)
 
     user = relationship('User', primaryjoin='User.user_id==UserFollowing.user_id')
 
     follows_user = relationship('User', primaryjoin='User.user_id==UserFollowing.follows_user_id')
     follows_repository = relationship('Repository', order_by='Repository.repo_name')
 
     @classmethod
     def get_repo_followers(cls, repo_id):
         return cls.query().filter(cls.follows_repo_id == repo_id)
 
 
 class CacheKey(Base, BaseModel):
     __tablename__ = 'cache_invalidation'
     __table_args__ = (
         UniqueConstraint('cache_key'),
         Index('key_idx', 'cache_key'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
     CACHE_TYPE_ATOM = 'ATOM'
     CACHE_TYPE_RSS = 'RSS'
     CACHE_TYPE_README = 'README'
 
     cache_id = Column("cache_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     cache_key = Column("cache_key", String(255), nullable=True, unique=None, default=None)
     cache_args = Column("cache_args", String(255), nullable=True, unique=None, default=None)
     cache_active = Column("cache_active", Boolean(), nullable=True, unique=None, default=False)
 
     def __init__(self, cache_key, cache_args=''):
         self.cache_key = cache_key
         self.cache_args = cache_args
         self.cache_active = False
 
     def __unicode__(self):
         return u"<%s('%s:%s[%s]')>" % (
             self.__class__.__name__,
             self.cache_id, self.cache_key, self.cache_active)
 
     def _cache_key_partition(self):
         prefix, repo_name, suffix = self.cache_key.partition(self.cache_args)
         return prefix, repo_name, suffix
 
     def get_prefix(self):
         """
         Try to extract prefix from existing cache key. The key could consist
         of prefix, repo_name, suffix
         """
         # this returns prefix, repo_name, suffix
         return self._cache_key_partition()[0]
 
     def get_suffix(self):
         """
         get suffix that might have been used in _get_cache_key to
         generate self.cache_key. Only used for informational purposes
         in repo_edit.html.
         """
         # prefix, repo_name, suffix
         return self._cache_key_partition()[2]
 
     @classmethod
     def delete_all_cache(cls):
         """
         Delete all cache keys from database.
         Should only be run when all instances are down and all entries
         thus stale.
         """
         cls.query().delete()
         Session().commit()
 
     @classmethod
     def get_cache_key(cls, repo_name, cache_type):
         """
 
         Generate a cache key for this process of RhodeCode instance.
         Prefix most likely will be process id or maybe explicitly set
         instance_id from .ini file.
         """
         import rhodecode
         prefix = safe_unicode(rhodecode.CONFIG.get('instance_id') or '')
 
         repo_as_unicode = safe_unicode(repo_name)
         key = u'{}_{}'.format(repo_as_unicode, cache_type) \
             if cache_type else repo_as_unicode
 
         return u'{}{}'.format(prefix, key)
 
     @classmethod
     def set_invalidate(cls, repo_name, delete=False):
         """
         Mark all caches of a repo as invalid in the database.
         """
 
         try:
             qry = Session().query(cls).filter(cls.cache_args == repo_name)
             if delete:
                 log.debug('cache objects deleted for repo %s',
                           safe_str(repo_name))
                 qry.delete()
             else:
                 log.debug('cache objects marked as invalid for repo %s',
                           safe_str(repo_name))
                 qry.update({"cache_active": False})
 
             Session().commit()
         except Exception:
             log.exception(
                 'Cache key invalidation failed for repository %s',
                 safe_str(repo_name))
             Session().rollback()
 
     @classmethod
     def get_active_cache(cls, cache_key):
         inv_obj = cls.query().filter(cls.cache_key == cache_key).scalar()
         if inv_obj:
             return inv_obj
         return None
 
     @classmethod
     def repo_context_cache(cls, compute_func, repo_name, cache_type):
         """
         @cache_region('long_term')
         def _heavy_calculation(cache_key):
             return 'result'
 
         cache_context = CacheKey.repo_context_cache(
             _heavy_calculation, repo_name, cache_type)
 
         with cache_context as context:
             context.invalidate()
             computed = context.compute()
 
         assert computed == 'result'
         """
         from rhodecode.lib import caches
         return caches.InvalidationContext(compute_func, repo_name, cache_type)
 
 
 class ChangesetComment(Base, BaseModel):
     __tablename__ = 'changeset_comments'
     __table_args__ = (
         Index('cc_revision_idx', 'revision'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
 
     COMMENT_OUTDATED = u'comment_outdated'
 
     comment_id = Column('comment_id', Integer(), nullable=False, primary_key=True)
     repo_id = Column('repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
     revision = Column('revision', String(40), nullable=True)
     pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True)
     pull_request_version_id = Column("pull_request_version_id", Integer(), ForeignKey('pull_request_versions.pull_request_version_id'), nullable=True)
     line_no = Column('line_no', Unicode(10), nullable=True)
     hl_lines = Column('hl_lines', Unicode(512), nullable=True)
     f_path = Column('f_path', Unicode(1000), nullable=True)
     user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False)
     text = Column('text', UnicodeText().with_variant(UnicodeText(25000), 'mysql'), nullable=False)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     modified_at = Column('modified_at', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     renderer = Column('renderer', Unicode(64), nullable=True)
     display_state = Column('display_state',  Unicode(128), nullable=True)
 
     author = relationship('User', lazy='joined')
     repo = relationship('Repository')
     status_change = relationship('ChangesetStatus', cascade="all, delete, delete-orphan")
     pull_request = relationship('PullRequest', lazy='joined')
     pull_request_version = relationship('PullRequestVersion')
 
     @classmethod
     def get_users(cls, revision=None, pull_request_id=None):
         """
         Returns user associated with this ChangesetComment. ie those
         who actually commented
 
         :param cls:
         :param revision:
         """
         q = Session().query(User)\
                 .join(ChangesetComment.author)
         if revision:
             q = q.filter(cls.revision == revision)
         elif pull_request_id:
             q = q.filter(cls.pull_request_id == pull_request_id)
         return q.all()
 
     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:ChangesetComment #%s>' % self.comment_id
         else:
             return '<DB:ChangesetComment at %#x>' % id(self)
 
 
 class ChangesetStatus(Base, BaseModel):
     __tablename__ = 'changeset_statuses'
     __table_args__ = (
         Index('cs_revision_idx', 'revision'),
         Index('cs_version_idx', 'version'),
         UniqueConstraint('repo_id', 'revision', 'version'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
     STATUS_NOT_REVIEWED = DEFAULT = 'not_reviewed'
     STATUS_APPROVED = 'approved'
     STATUS_REJECTED = 'rejected'
     STATUS_UNDER_REVIEW = 'under_review'
 
     STATUSES = [
         (STATUS_NOT_REVIEWED, _("Not Reviewed")),  # (no icon) and default
         (STATUS_APPROVED, _("Approved")),
         (STATUS_REJECTED, _("Rejected")),
         (STATUS_UNDER_REVIEW, _("Under Review")),
     ]
 
     changeset_status_id = Column('changeset_status_id', Integer(), nullable=False, primary_key=True)
     repo_id = Column('repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None)
     revision = Column('revision', String(40), nullable=False)
     status = Column('status', String(128), nullable=False, default=DEFAULT)
     changeset_comment_id = Column('changeset_comment_id', Integer(), ForeignKey('changeset_comments.comment_id'))
     modified_at = Column('modified_at', DateTime(), nullable=False, default=datetime.datetime.now)
     version = Column('version', Integer(), nullable=False, default=0)
     pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True)
 
     author = relationship('User', lazy='joined')
     repo = relationship('Repository')
     comment = relationship('ChangesetComment', lazy='joined')
     pull_request = relationship('PullRequest', lazy='joined')
 
     def __unicode__(self):
         return u"<%s('%s[%s]:%s')>" % (
             self.__class__.__name__,
             self.status, self.version, self.author
         )
 
     @classmethod
     def get_status_lbl(cls, value):
         return dict(cls.STATUSES).get(value)
 
     @property
     def status_lbl(self):
         return ChangesetStatus.get_status_lbl(self.status)
 
 
 class _PullRequestBase(BaseModel):
     """
     Common attributes of pull request and version entries.
     """
 
     # .status values
     STATUS_NEW = u'new'
     STATUS_OPEN = u'open'
     STATUS_CLOSED = u'closed'
 
     title = Column('title', Unicode(255), nullable=True)
     description = Column(
         'description', UnicodeText().with_variant(UnicodeText(10240), 'mysql'),
         nullable=True)
     # new/open/closed status of pull request (not approve/reject/etc)
     status = Column('status', Unicode(255), nullable=False, default=STATUS_NEW)
     created_on = Column(
         'created_on', DateTime(timezone=False), nullable=False,
         default=datetime.datetime.now)
     updated_on = Column(
         'updated_on', DateTime(timezone=False), nullable=False,
         default=datetime.datetime.now)
 
     @declared_attr
     def user_id(cls):
         return Column(
             "user_id", Integer(), ForeignKey('users.user_id'), nullable=False,
             unique=None)
 
     # 500 revisions max
     _revisions = Column(
         'revisions', UnicodeText().with_variant(UnicodeText(20500), 'mysql'))
 
     @declared_attr
     def source_repo_id(cls):
         # TODO: dan: rename column to source_repo_id
         return Column(
             'org_repo_id', Integer(), ForeignKey('repositories.repo_id'),
             nullable=False)
 
     source_ref = Column('org_ref', Unicode(255), nullable=False)
 
     @declared_attr
     def target_repo_id(cls):
         # TODO: dan: rename column to target_repo_id
         return Column(
             'other_repo_id', Integer(), ForeignKey('repositories.repo_id'),
             nullable=False)
 
     target_ref = Column('other_ref', Unicode(255), nullable=False)
 
     # TODO: dan: rename column to last_merge_source_rev
     _last_merge_source_rev = Column(
         'last_merge_org_rev', String(40), nullable=True)
     # TODO: dan: rename column to last_merge_target_rev
     _last_merge_target_rev = Column(
         'last_merge_other_rev', String(40), nullable=True)
     _last_merge_status = Column('merge_status', Integer(), nullable=True)
     merge_rev = Column('merge_rev', String(40), nullable=True)
 
     @hybrid_property
     def revisions(self):
         return self._revisions.split(':') if self._revisions else []
 
     @revisions.setter
     def revisions(self, val):
         self._revisions = ':'.join(val)
 
     @declared_attr
     def author(cls):
         return relationship('User', lazy='joined')
 
     @declared_attr
     def source_repo(cls):
         return relationship(
             'Repository',
             primaryjoin='%s.source_repo_id==Repository.repo_id' % cls.__name__)
 
     @property
     def source_ref_parts(self):
         refs = self.source_ref.split(':')
         return Reference(refs[0], refs[1], refs[2])
 
     @declared_attr
     def target_repo(cls):
         return relationship(
             'Repository',
             primaryjoin='%s.target_repo_id==Repository.repo_id' % cls.__name__)
 
     @property
     def target_ref_parts(self):
         refs = self.target_ref.split(':')
         return Reference(refs[0], refs[1], refs[2])
 
 
 class PullRequest(Base, _PullRequestBase):
     __tablename__ = 'pull_requests'
     __table_args__ = (
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
 
     pull_request_id = Column(
         'pull_request_id', Integer(), nullable=False, primary_key=True)
 
     def __repr__(self):
         if self.pull_request_id:
             return '<DB:PullRequest #%s>' % self.pull_request_id
         else:
             return '<DB:PullRequest at %#x>' % id(self)
 
     reviewers = relationship('PullRequestReviewers',
                              cascade="all, delete, delete-orphan")
     statuses = relationship('ChangesetStatus')
     comments = relationship('ChangesetComment',
                             cascade="all, delete, delete-orphan")
     versions = relationship('PullRequestVersion',
                             cascade="all, delete, delete-orphan")
 
     def is_closed(self):
         return self.status == self.STATUS_CLOSED
 
     def get_api_data(self):
         from rhodecode.model.pull_request import PullRequestModel
         pull_request = self
         merge_status = PullRequestModel().merge_status(pull_request)
         data = {
             'pull_request_id': pull_request.pull_request_id,
             'url': url('pullrequest_show',
                        repo_name=pull_request.target_repo.repo_name,
                        pull_request_id=pull_request.pull_request_id,
                        qualified=True),
             'title': pull_request.title,
             'description': pull_request.description,
             'status': pull_request.status,
             'created_on': pull_request.created_on,
             'updated_on': pull_request.updated_on,
             'commit_ids': pull_request.revisions,
             'review_status': pull_request.calculated_review_status(),
             'mergeable': {
                 'status': merge_status[0],
                 'message': unicode(merge_status[1]),
             },
             'source': {
                 'clone_url': pull_request.source_repo.clone_url(),
                 'repository': pull_request.source_repo.repo_name,
                 'reference': {
                     'name': pull_request.source_ref_parts.name,
                     'type': pull_request.source_ref_parts.type,
                     'commit_id': pull_request.source_ref_parts.commit_id,
                 },
             },
             'target': {
                 'clone_url': pull_request.target_repo.clone_url(),
                 'repository': pull_request.target_repo.repo_name,
                 'reference': {
                     'name': pull_request.target_ref_parts.name,
                     'type': pull_request.target_ref_parts.type,
                     'commit_id': pull_request.target_ref_parts.commit_id,
                 },
             },
             'author': pull_request.author.get_api_data(include_secrets=False,
                                                        details='basic'),
             'reviewers': [
                 {
                     'user': reviewer.get_api_data(include_secrets=False,
                                                   details='basic'),
                     'review_status': st[0][1].status if st else 'not_reviewed',
                 }
                 for reviewer, st in pull_request.reviewers_statuses()
             ]
         }
 
         return data
 
     def __json__(self):
         return {
             'revisions': self.revisions,
         }
 
     def calculated_review_status(self):
         # TODO: anderson: 13.05.15 Used only on templates/my_account_pullrequests.html
         # because it's tricky on how to use ChangesetStatusModel from there
         warnings.warn("Use calculated_review_status from ChangesetStatusModel", DeprecationWarning)
         from rhodecode.model.changeset_status import ChangesetStatusModel
         return ChangesetStatusModel().calculated_review_status(self)
 
     def reviewers_statuses(self):
         warnings.warn("Use reviewers_statuses from ChangesetStatusModel", DeprecationWarning)
         from rhodecode.model.changeset_status import ChangesetStatusModel
         return ChangesetStatusModel().reviewers_statuses(self)
 
 
 class PullRequestVersion(Base, _PullRequestBase):
     __tablename__ = 'pull_request_versions'
     __table_args__ = (
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
 
     pull_request_version_id = Column(
         'pull_request_version_id', Integer(), nullable=False, primary_key=True)
     pull_request_id = Column(
         'pull_request_id', Integer(),
         ForeignKey('pull_requests.pull_request_id'), nullable=False)
     pull_request = relationship('PullRequest')
 
     def __repr__(self):
         if self.pull_request_version_id:
             return '<DB:PullRequestVersion #%s>' % self.pull_request_version_id
         else:
             return '<DB:PullRequestVersion at %#x>' % id(self)
 
 
 class PullRequestReviewers(Base, BaseModel):
     __tablename__ = 'pull_request_reviewers'
     __table_args__ = (
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
 
     def __init__(self, user=None, pull_request=None):
         self.user = user
         self.pull_request = pull_request
 
     pull_requests_reviewers_id = Column(
         'pull_requests_reviewers_id', Integer(), nullable=False,
         primary_key=True)
     pull_request_id = Column(
         "pull_request_id", Integer(),
         ForeignKey('pull_requests.pull_request_id'), nullable=False)
     user_id = Column(
         "user_id", Integer(), ForeignKey('users.user_id'), nullable=True)
 
     user = relationship('User')
     pull_request = relationship('PullRequest')
 
 
 class Notification(Base, BaseModel):
     __tablename__ = 'notifications'
     __table_args__ = (
         Index('notification_type_idx', 'type'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
 
     TYPE_CHANGESET_COMMENT = u'cs_comment'
     TYPE_MESSAGE = u'message'
     TYPE_MENTION = u'mention'
     TYPE_REGISTRATION = u'registration'
     TYPE_PULL_REQUEST = u'pull_request'
     TYPE_PULL_REQUEST_COMMENT = u'pull_request_comment'
 
     notification_id = Column('notification_id', Integer(), nullable=False, primary_key=True)
     subject = Column('subject', Unicode(512), nullable=True)
     body = Column('body', UnicodeText().with_variant(UnicodeText(50000), 'mysql'), nullable=True)
     created_by = Column("created_by", Integer(), ForeignKey('users.user_id'), nullable=True)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     type_ = Column('type', Unicode(255))
 
     created_by_user = relationship('User')
     notifications_to_users = relationship('UserNotification', lazy='joined',
                                           cascade="all, delete, delete-orphan")
 
     @property
     def recipients(self):
         return [x.user for x in UserNotification.query()\
                 .filter(UserNotification.notification == self)\
                 .order_by(UserNotification.user_id.asc()).all()]
 
     @classmethod
     def create(cls, created_by, subject, body, recipients, type_=None):
         if type_ is None:
             type_ = Notification.TYPE_MESSAGE
 
         notification = cls()
         notification.created_by_user = created_by
         notification.subject = subject
         notification.body = body
         notification.type_ = type_
         notification.created_on = datetime.datetime.now()
 
         for u in recipients:
             assoc = UserNotification()
             assoc.notification = notification
 
             # if created_by is inside recipients mark his notification
             # as read
             if u.user_id == created_by.user_id:
                 assoc.read = True
 
             u.notifications.append(assoc)
         Session().add(notification)
 
         return notification
 
     @property
     def description(self):
         from rhodecode.model.notification import NotificationModel
         return NotificationModel().make_description(self)
 
 
 class UserNotification(Base, BaseModel):
     __tablename__ = 'user_to_notification'
     __table_args__ = (
         UniqueConstraint('user_id', 'notification_id'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
     user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), primary_key=True)
     notification_id = Column("notification_id", Integer(), ForeignKey('notifications.notification_id'), primary_key=True)
     read = Column('read', Boolean, default=False)
     sent_on = Column('sent_on', DateTime(timezone=False), nullable=True, unique=None)
 
     user = relationship('User', lazy="joined")
     notification = relationship('Notification', lazy="joined",
                                 order_by=lambda: Notification.created_on.desc(),)
 
     def mark_as_read(self):
         self.read = True
         Session().add(self)
 
 
 class Gist(Base, BaseModel):
     __tablename__ = 'gists'
     __table_args__ = (
         Index('g_gist_access_id_idx', 'gist_access_id'),
         Index('g_created_on_idx', 'created_on'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
     GIST_PUBLIC = u'public'
     GIST_PRIVATE = u'private'
     DEFAULT_FILENAME = u'gistfile1.txt'
 
     ACL_LEVEL_PUBLIC = u'acl_public'
     ACL_LEVEL_PRIVATE = u'acl_private'
 
     gist_id = Column('gist_id', Integer(), primary_key=True)
     gist_access_id = Column('gist_access_id', Unicode(250))
     gist_description = Column('gist_description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))
     gist_owner = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=True)
     gist_expires = Column('gist_expires', Float(53), nullable=False)
     gist_type = Column('gist_type', Unicode(128), nullable=False)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     modified_at = Column('modified_at', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     acl_level = Column('acl_level', Unicode(128), nullable=True)
 
     owner = relationship('User')
 
     def __repr__(self):
         return '<Gist:[%s]%s>' % (self.gist_type, self.gist_access_id)
 
     @classmethod
     def get_or_404(cls, id_):
         res = cls.query().filter(cls.gist_access_id == id_).scalar()
         if not res:
             raise HTTPNotFound
         return res
 
     @classmethod
     def get_by_access_id(cls, gist_access_id):
         return cls.query().filter(cls.gist_access_id == gist_access_id).scalar()
 
     def gist_url(self):
         import rhodecode
         alias_url = rhodecode.CONFIG.get('gist_alias_url')
         if alias_url:
             return alias_url.replace('{gistid}', self.gist_access_id)
 
         return url('gist', gist_id=self.gist_access_id, qualified=True)
 
     @classmethod
     def base_path(cls):
         """
         Returns base path when all gists are stored
 
         :param cls:
         """
         from rhodecode.model.gist import GIST_STORE_LOC
         q = Session().query(RhodeCodeUi)\
             .filter(RhodeCodeUi.ui_key == URL_SEP)
         q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
         return os.path.join(q.one().ui_value, GIST_STORE_LOC)
 
     def get_api_data(self):
         """
         Common function for generating gist related data for API
         """
         gist = self
         data = {
             'gist_id': gist.gist_id,
             'type': gist.gist_type,
             'access_id': gist.gist_access_id,
             'description': gist.gist_description,
             'url': gist.gist_url(),
             'expires': gist.gist_expires,
             'created_on': gist.created_on,
             'modified_at': gist.modified_at,
             'content': None,
             'acl_level': gist.acl_level,
         }
         return data
 
     def __json__(self):
         data = dict(
         )
         data.update(self.get_api_data())
         return data
     # SCM functions
 
     def scm_instance(self, **kwargs):
         from rhodecode.lib.vcs import get_repo
         base_path = self.base_path()
         return get_repo(os.path.join(*map(safe_str,
                                           [base_path, self.gist_access_id])))
 
 
 class DbMigrateVersion(Base, BaseModel):
     __tablename__ = 'db_migrate_version'
     __table_args__ = (
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
     repository_id = Column('repository_id', String(250), primary_key=True)
     repository_path = Column('repository_path', Text)
     version = Column('version', Integer)
 
 
 class ExternalIdentity(Base, BaseModel):
     __tablename__ = 'external_identities'
     __table_args__ = (
         Index('local_user_id_idx', 'local_user_id'),
         Index('external_id_idx', 'external_id'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'})
 
     external_id = Column('external_id', Unicode(255), default=u'',
                          primary_key=True)
     external_username = Column('external_username', Unicode(1024), default=u'')
     local_user_id = Column('local_user_id', Integer(),
                            ForeignKey('users.user_id'), primary_key=True)
     provider_name = Column('provider_name', Unicode(255), default=u'',
                            primary_key=True)
     access_token = Column('access_token', String(1024), default=u'')
     alt_token = Column('alt_token', String(1024), default=u'')
     token_secret = Column('token_secret', String(1024), default=u'')
 
     @classmethod
     def by_external_id_and_provider(cls, external_id, provider_name,
                                     local_user_id=None):
         """
         Returns ExternalIdentity instance based on search params
 
         :param external_id:
         :param provider_name:
         :return: ExternalIdentity
         """
         query = cls.query()
         query = query.filter(cls.external_id == external_id)
         query = query.filter(cls.provider_name == provider_name)
         if local_user_id:
             query = query.filter(cls.local_user_id == local_user_id)
         return query.first()
 
     @classmethod
     def user_by_external_id_and_provider(cls, external_id, provider_name):
         """
         Returns User instance based on search params
 
         :param external_id:
         :param provider_name:
         :return: User
         """
         query = User.query()
         query = query.filter(cls.external_id == external_id)
         query = query.filter(cls.provider_name == provider_name)
         query = query.filter(User.user_id == cls.local_user_id)
         return query.first()
 
     @classmethod
     def by_local_user_id(cls, local_user_id):
         """
         Returns all tokens for user
 
         :param local_user_id:
         :return: ExternalIdentity
         """
         query = cls.query()
         query = query.filter(cls.local_user_id == local_user_id)
         return query

rhodecode/model/forms.py

@@ -1,547 +1,561 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 """
 this is forms validation classes
 http://formencode.org/module-formencode.validators.html
 for list off all availible validators
 
 we can create our own validators
 
 The table below outlines the options which can be used in a schema in addition to the validators themselves
 pre_validators          []     These validators will be applied before the schema
 chained_validators      []     These validators will be applied after the schema
 allow_extra_fields      False     If True, then it is not an error when keys that aren't associated with a validator are present
 filter_extra_fields     False     If True, then keys that aren't associated with a validator are removed
 if_key_missing          NoDefault If this is given, then any keys that aren't available but are expected will be replaced with this value (and then validated). This does not override a present .if_missing attribute on validators. NoDefault is a special FormEncode class to mean that no default values has been specified and therefore missing keys shouldn't take a default value.
 ignore_key_missing      False     If True, then missing keys will be missing in the result, if the validator doesn't have .if_missing on it already
 
 
 <name> = formencode.validators.<name of validator>
 <name> must equal form name
 list=[1,2,3,4,5]
 for SELECT use formencode.All(OneOf(list), Int())
 
 """
 
 import logging
 
 import formencode
 from formencode import All, Pipe
 
 from pylons.i18n.translation import _
 
 from rhodecode import BACKENDS
 from rhodecode.model import validators as v
 
 log = logging.getLogger(__name__)
 
 
 def LoginForm():
     class _LoginForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
         username = v.UnicodeString(
             strip=True,
             min=1,
             not_empty=True,
             messages={
                 'empty': _(u'Please enter a login'),
                 'tooShort': _(u'Enter a value %(min)i characters long or more')
             }
         )
 
         password = v.UnicodeString(
             strip=False,
             min=3,
             not_empty=True,
             messages={
                 'empty': _(u'Please enter a password'),
                 'tooShort': _(u'Enter %(min)i characters or more')}
         )
 
         remember = v.StringBoolean(if_missing=False)
 
         chained_validators = [v.ValidAuth()]
     return _LoginForm
 
 
 def PasswordChangeForm(username):
     class _PasswordChangeForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
 
         current_password = v.ValidOldPassword(username)(not_empty=True)
         new_password = All(v.ValidPassword(), v.UnicodeString(strip=False, min=6))
         new_password_confirmation = All(v.ValidPassword(), v.UnicodeString(strip=False, min=6))
 
         chained_validators = [v.ValidPasswordsMatch('new_password',
                                                     'new_password_confirmation')]
     return _PasswordChangeForm
 
 
 def UserForm(edit=False, available_languages=[], old_data={}):
     class _UserForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
         username = All(v.UnicodeString(strip=True, min=1, not_empty=True),
                        v.ValidUsername(edit, old_data))
         if edit:
             new_password = All(
                 v.ValidPassword(),
                 v.UnicodeString(strip=False, min=6, not_empty=False)
             )
             password_confirmation = All(
                 v.ValidPassword(),
                 v.UnicodeString(strip=False, min=6, not_empty=False),
             )
             admin = v.StringBoolean(if_missing=False)
         else:
             password = All(
                 v.ValidPassword(),
                 v.UnicodeString(strip=False, min=6, not_empty=True)
             )
             password_confirmation = All(
                 v.ValidPassword(),
                 v.UnicodeString(strip=False, min=6, not_empty=False)
             )
 
         password_change = v.StringBoolean(if_missing=False)
         create_repo_group = v.StringBoolean(if_missing=False)
 
         active = v.StringBoolean(if_missing=False)
         firstname = v.UnicodeString(strip=True, min=1, not_empty=False)
         lastname = v.UnicodeString(strip=True, min=1, not_empty=False)
         email = All(v.Email(not_empty=True), v.UniqSystemEmail(old_data))
         extern_name = v.UnicodeString(strip=True)
         extern_type = v.UnicodeString(strip=True)
         language = v.OneOf(available_languages, hideList=False,
                            testValueList=True, if_missing=None)
         chained_validators = [v.ValidPasswordsMatch()]
     return _UserForm
 
 
-def UserGroupForm(edit=False, old_data={}, available_members=[]):
+def UserGroupForm(edit=False, old_data=None, available_members=None,
+                  allow_disabled=False):
+    old_data = old_data or {}
+    available_members = available_members or []
+
     class _UserGroupForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
 
         users_group_name = All(
             v.UnicodeString(strip=True, min=1, not_empty=True),
             v.ValidUserGroup(edit, old_data)
         )
         user_group_description = v.UnicodeString(strip=True, min=1,
                                                  not_empty=False)
 
         users_group_active = v.StringBoolean(if_missing=False)
 
         if edit:
             users_group_members = v.OneOf(
                 available_members, hideList=False, testValueList=True,
                 if_missing=None, not_empty=False
             )
-            #this is user group owner
-            user = All(v.UnicodeString(not_empty=True), v.ValidRepoUser())
-
+            # this is user group owner
+            user = All(
+                v.UnicodeString(not_empty=True),
+                v.ValidRepoUser(allow_disabled))
     return _UserGroupForm
 
 
-def RepoGroupForm(edit=False, old_data={}, available_groups=[],
-                   can_create_in_root=False):
+def RepoGroupForm(edit=False, old_data=None, available_groups=None,
+                   can_create_in_root=False, allow_disabled=False):
+    old_data = old_data or {}
+    available_groups = available_groups or []
+
     class _RepoGroupForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
 
         group_name = All(v.UnicodeString(strip=True, min=1, not_empty=True),
                          v.SlugifyName(),)
         group_description = v.UnicodeString(strip=True, min=1,
                                             not_empty=False)
         group_copy_permissions = v.StringBoolean(if_missing=False)
 
         group_parent_id = v.OneOf(available_groups, hideList=False,
                                   testValueList=True, not_empty=True)
         enable_locking = v.StringBoolean(if_missing=False)
-        chained_validators = [v.ValidRepoGroup(edit, old_data, can_create_in_root)]
+        chained_validators = [
+            v.ValidRepoGroup(edit, old_data, can_create_in_root)]
 
         if edit:
-            #this is repo group owner
-            user = All(v.UnicodeString(not_empty=True), v.ValidRepoUser())
+            # this is repo group owner
+            user = All(
+                v.UnicodeString(not_empty=True),
+                v.ValidRepoUser(allow_disabled))
 
     return _RepoGroupForm
 
 
 def RegisterForm(edit=False, old_data={}):
     class _RegisterForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
         username = All(
             v.ValidUsername(edit, old_data),
             v.UnicodeString(strip=True, min=1, not_empty=True)
         )
         password = All(
             v.ValidPassword(),
             v.UnicodeString(strip=False, min=6, not_empty=True)
         )
         password_confirmation = All(
             v.ValidPassword(),
             v.UnicodeString(strip=False, min=6, not_empty=True)
         )
         active = v.StringBoolean(if_missing=False)
         firstname = v.UnicodeString(strip=True, min=1, not_empty=False)
         lastname = v.UnicodeString(strip=True, min=1, not_empty=False)
         email = All(v.Email(not_empty=True), v.UniqSystemEmail(old_data))
 
         chained_validators = [v.ValidPasswordsMatch()]
 
     return _RegisterForm
 
 
 def PasswordResetForm():
     class _PasswordResetForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
         email = All(v.ValidSystemEmail(), v.Email(not_empty=True))
     return _PasswordResetForm
 
 
-def RepoForm(edit=False, old_data=None, repo_groups=None, landing_revs=None):
+def RepoForm(edit=False, old_data=None, repo_groups=None, landing_revs=None,
+             allow_disabled=False):
     old_data = old_data or {}
     repo_groups = repo_groups or []
     landing_revs = landing_revs or []
     supported_backends = BACKENDS.keys()
 
     class _RepoForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         repo_name = All(v.UnicodeString(strip=True, min=1, not_empty=True),
                         v.SlugifyName())
         repo_group = All(v.CanWriteGroup(old_data),
                          v.OneOf(repo_groups, hideList=True))
         repo_type = v.OneOf(supported_backends, required=False,
                             if_missing=old_data.get('repo_type'))
         repo_description = v.UnicodeString(strip=True, min=1, not_empty=False)
         repo_private = v.StringBoolean(if_missing=False)
         repo_landing_rev = v.OneOf(landing_revs, hideList=True)
         repo_copy_permissions = v.StringBoolean(if_missing=False)
         clone_uri = All(v.UnicodeString(strip=True, min=1, not_empty=False))
 
         repo_enable_statistics = v.StringBoolean(if_missing=False)
         repo_enable_downloads = v.StringBoolean(if_missing=False)
         repo_enable_locking = v.StringBoolean(if_missing=False)
 
         if edit:
             # this is repo owner
-            user = All(v.UnicodeString(not_empty=True), v.ValidRepoUser())
+            user = All(
+                v.UnicodeString(not_empty=True),
+                v.ValidRepoUser(allow_disabled))
             clone_uri_change = v.UnicodeString(
                 not_empty=False, if_missing=v.Missing)
 
         chained_validators = [v.ValidCloneUri(),
                               v.ValidRepoName(edit, old_data)]
     return _RepoForm
 
 
 def RepoPermsForm():
     class _RepoPermsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         chained_validators = [v.ValidPerms(type_='repo')]
     return _RepoPermsForm
 
 
 def RepoGroupPermsForm(valid_recursive_choices):
     class _RepoGroupPermsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         recursive = v.OneOf(valid_recursive_choices)
         chained_validators = [v.ValidPerms(type_='repo_group')]
     return _RepoGroupPermsForm
 
 
 def UserGroupPermsForm():
     class _UserPermsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         chained_validators = [v.ValidPerms(type_='user_group')]
     return _UserPermsForm
 
 
 def RepoFieldForm():
     class _RepoFieldForm(formencode.Schema):
         filter_extra_fields = True
         allow_extra_fields = True
 
         new_field_key = All(v.FieldKey(),
                             v.UnicodeString(strip=True, min=3, not_empty=True))
         new_field_value = v.UnicodeString(not_empty=False, if_missing=u'')
         new_field_type = v.OneOf(['str', 'unicode', 'list', 'tuple'],
                                  if_missing='str')
         new_field_label = v.UnicodeString(not_empty=False)
         new_field_desc = v.UnicodeString(not_empty=False)
 
     return _RepoFieldForm
 
 
 def RepoForkForm(edit=False, old_data={}, supported_backends=BACKENDS.keys(),
                  repo_groups=[], landing_revs=[]):
     class _RepoForkForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         repo_name = All(v.UnicodeString(strip=True, min=1, not_empty=True),
                         v.SlugifyName())
         repo_group = All(v.CanWriteGroup(),
                          v.OneOf(repo_groups, hideList=True))
         repo_type = All(v.ValidForkType(old_data), v.OneOf(supported_backends))
         description = v.UnicodeString(strip=True, min=1, not_empty=True)
         private = v.StringBoolean(if_missing=False)
         copy_permissions = v.StringBoolean(if_missing=False)
         fork_parent_id = v.UnicodeString()
         chained_validators = [v.ValidForkName(edit, old_data)]
         landing_rev = v.OneOf(landing_revs, hideList=True)
 
     return _RepoForkForm
 
 
 def ApplicationSettingsForm():
     class _ApplicationSettingsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         rhodecode_title = v.UnicodeString(strip=True, max=40, not_empty=False)
         rhodecode_realm = v.UnicodeString(strip=True, min=1, not_empty=True)
         rhodecode_pre_code = v.UnicodeString(strip=True, min=1, not_empty=False)
         rhodecode_post_code = v.UnicodeString(strip=True, min=1, not_empty=False)
         rhodecode_captcha_public_key = v.UnicodeString(strip=True, min=1, not_empty=False)
         rhodecode_captcha_private_key = v.UnicodeString(strip=True, min=1, not_empty=False)
 
     return _ApplicationSettingsForm
 
 
 def ApplicationVisualisationForm():
     class _ApplicationVisualisationForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         rhodecode_show_public_icon = v.StringBoolean(if_missing=False)
         rhodecode_show_private_icon = v.StringBoolean(if_missing=False)
         rhodecode_stylify_metatags = v.StringBoolean(if_missing=False)
 
         rhodecode_repository_fields = v.StringBoolean(if_missing=False)
         rhodecode_lightweight_journal = v.StringBoolean(if_missing=False)
         rhodecode_dashboard_items = v.Int(min=5, not_empty=True)
         rhodecode_admin_grid_items = v.Int(min=5, not_empty=True)
         rhodecode_show_version = v.StringBoolean(if_missing=False)
         rhodecode_use_gravatar = v.StringBoolean(if_missing=False)
         rhodecode_markup_renderer = v.OneOf(['markdown', 'rst'])
         rhodecode_gravatar_url = v.UnicodeString(min=3)
         rhodecode_clone_uri_tmpl = v.UnicodeString(min=3)
         rhodecode_support_url = v.UnicodeString()
         rhodecode_show_revision_number = v.StringBoolean(if_missing=False)
         rhodecode_show_sha_length = v.Int(min=4, not_empty=True)
 
     return _ApplicationVisualisationForm
 
 
 class _BaseVcsSettingsForm(formencode.Schema):
     allow_extra_fields = True
     filter_extra_fields = False
     hooks_changegroup_repo_size = v.StringBoolean(if_missing=False)
     hooks_changegroup_push_logger = v.StringBoolean(if_missing=False)
     hooks_outgoing_pull_logger = v.StringBoolean(if_missing=False)
 
     extensions_largefiles = v.StringBoolean(if_missing=False)
     phases_publish = v.StringBoolean(if_missing=False)
 
     rhodecode_pr_merge_enabled = v.StringBoolean(if_missing=False)
     rhodecode_use_outdated_comments = v.StringBoolean(if_missing=False)
 
 
 def ApplicationUiSettingsForm():
     class _ApplicationUiSettingsForm(_BaseVcsSettingsForm):
         web_push_ssl = v.StringBoolean(if_missing=False)
         paths_root_path = All(
             v.ValidPath(),
             v.UnicodeString(strip=True, min=1, not_empty=True)
         )
         extensions_hgsubversion = v.StringBoolean(if_missing=False)
         extensions_hggit = v.StringBoolean(if_missing=False)
         new_svn_branch = v.ValidSvnPattern(section='vcs_svn_branch')
         new_svn_tag = v.ValidSvnPattern(section='vcs_svn_tag')
 
     return _ApplicationUiSettingsForm
 
 
 def RepoVcsSettingsForm(repo_name):
     class _RepoVcsSettingsForm(_BaseVcsSettingsForm):
         inherit_global_settings = v.StringBoolean(if_missing=False)
         new_svn_branch = v.ValidSvnPattern(
             section='vcs_svn_branch', repo_name=repo_name)
         new_svn_tag = v.ValidSvnPattern(
             section='vcs_svn_tag', repo_name=repo_name)
 
     return _RepoVcsSettingsForm
 
 
 def LabsSettingsForm():
     class _LabSettingsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
 
         rhodecode_hg_use_rebase_for_merging = v.StringBoolean(if_missing=False)
         rhodecode_proxy_subversion_http_requests = v.StringBoolean(
             if_missing=False)
         rhodecode_subversion_http_server_url = v.UnicodeString(
             strip=True, if_missing=None)
 
     return _LabSettingsForm
 
 
 def ApplicationPermissionsForm(register_choices, extern_activate_choices):
     class _DefaultPermissionsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
 
         anonymous = v.StringBoolean(if_missing=False)
         default_register = v.OneOf(register_choices)
         default_register_message = v.UnicodeString()
         default_extern_activate = v.OneOf(extern_activate_choices)
 
     return _DefaultPermissionsForm
 
 
 def ObjectPermissionsForm(repo_perms_choices, group_perms_choices,
                           user_group_perms_choices):
     class _ObjectPermissionsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
         overwrite_default_repo = v.StringBoolean(if_missing=False)
         overwrite_default_group = v.StringBoolean(if_missing=False)
         overwrite_default_user_group = v.StringBoolean(if_missing=False)
         default_repo_perm = v.OneOf(repo_perms_choices)
         default_group_perm = v.OneOf(group_perms_choices)
         default_user_group_perm = v.OneOf(user_group_perms_choices)
 
     return _ObjectPermissionsForm
 
 
 def UserPermissionsForm(create_choices, create_on_write_choices,
                         repo_group_create_choices, user_group_create_choices,
                         fork_choices, inherit_default_permissions_choices):
     class _DefaultPermissionsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
 
         anonymous = v.StringBoolean(if_missing=False)
 
         default_repo_create = v.OneOf(create_choices)
         default_repo_create_on_write = v.OneOf(create_on_write_choices)
         default_user_group_create = v.OneOf(user_group_create_choices)
         default_repo_group_create = v.OneOf(repo_group_create_choices)
         default_fork_create = v.OneOf(fork_choices)
         default_inherit_default_permissions = v.OneOf(inherit_default_permissions_choices)
 
     return _DefaultPermissionsForm
 
 
 def UserIndividualPermissionsForm():
     class _DefaultPermissionsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
 
         inherit_default_permissions = v.StringBoolean(if_missing=False)
 
     return _DefaultPermissionsForm
 
 
 def DefaultsForm(edit=False, old_data={}, supported_backends=BACKENDS.keys()):
     class _DefaultsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
         default_repo_type = v.OneOf(supported_backends)
         default_repo_private = v.StringBoolean(if_missing=False)
         default_repo_enable_statistics = v.StringBoolean(if_missing=False)
         default_repo_enable_downloads = v.StringBoolean(if_missing=False)
         default_repo_enable_locking = v.StringBoolean(if_missing=False)
 
     return _DefaultsForm
 
 
 def AuthSettingsForm():
     class _AuthSettingsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
         auth_plugins = All(v.ValidAuthPlugins(),
                            v.UniqueListFromString()(not_empty=True))
 
     return _AuthSettingsForm
 
 
 def UserExtraEmailForm():
     class _UserExtraEmailForm(formencode.Schema):
         email = All(v.UniqSystemEmail(), v.Email(not_empty=True))
     return _UserExtraEmailForm
 
 
 def UserExtraIpForm():
     class _UserExtraIpForm(formencode.Schema):
         ip = v.ValidIp()(not_empty=True)
     return _UserExtraIpForm
 
 
 def PullRequestForm(repo_id):
     class _PullRequestForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True
 
         user = v.UnicodeString(strip=True, required=True)
         source_repo = v.UnicodeString(strip=True, required=True)
         source_ref = v.UnicodeString(strip=True, required=True)
         target_repo = v.UnicodeString(strip=True, required=True)
         target_ref = v.UnicodeString(strip=True, required=True)
         revisions = All(#v.NotReviewedRevisions(repo_id)(),
                         v.UniqueList()(not_empty=True))
         review_members = v.UniqueList(convert=int)(not_empty=True)
 
         pullrequest_title = v.UnicodeString(strip=True, required=True)
         pullrequest_desc = v.UnicodeString(strip=True, required=False)
 
     return _PullRequestForm
 
 
 def GistForm(lifetime_options, acl_level_options):
     class _GistForm(formencode.Schema):
 
         gistid = All(v.UniqGistId(), v.UnicodeString(strip=True, min=3, not_empty=False, if_missing=None))
         filename = All(v.BasePath()(),
                        v.UnicodeString(strip=True, required=False))
         description = v.UnicodeString(required=False, if_missing=u'')
         lifetime = v.OneOf(lifetime_options)
         mimetype = v.UnicodeString(required=False, if_missing=None)
         content = v.UnicodeString(required=True, not_empty=True)
         public = v.UnicodeString(required=False, if_missing=u'')
         private = v.UnicodeString(required=False, if_missing=u'')
         acl_level = v.OneOf(acl_level_options)
 
     return _GistForm
 
 
 def IssueTrackerPatternsForm():
     class _IssueTrackerPatternsForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         chained_validators = [v.ValidPattern()]
     return _IssueTrackerPatternsForm

rhodecode/model/repo.py

@@ -1,918 +1,924 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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/
 
 """
 Repository model for rhodecode
 """
 
 import logging
 import os
 import re
 import shutil
 import time
 import traceback
 from datetime import datetime
 
 from sqlalchemy.sql import func
 from sqlalchemy.sql.expression import true, or_
 from zope.cachedescriptors.property import Lazy as LazyProperty
 
 from rhodecode.lib import helpers as h
 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.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.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
 
 
 log = logging.getLogger(__name__)
 
 
 class RepoModel(BaseModel):
 
     cls = Repository
 
     def _get_user_group(self, users_group):
         return self._get_instance(UserGroup, users_group,
                                   callback=UserGroup.get_by_group_name)
 
     def _get_repo_group(self, repo_group):
         return self._get_instance(RepoGroup, repo_group,
                                   callback=RepoGroup.get_by_group_name)
 
     def _create_default_perms(self, repository, private):
         # create default permission
         default = 'repository.read'
         def_user = User.get_default_user()
         for p in def_user.user_perms:
             if p.permission.permission_name.startswith('repository.'):
                 default = p.permission.permission_name
                 break
 
         default_perm = 'repository.none' if private else default
 
         repo_to_perm = UserRepoToPerm()
         repo_to_perm.permission = Permission.get_by_key(default_perm)
 
         repo_to_perm.repository = repository
         repo_to_perm.user_id = def_user.user_id
 
         return repo_to_perm
 
     @LazyProperty
     def repos_path(self):
         """
         Gets the repositories root path from database
         """
         settings_model = VcsSettingsModel(sa=self.sa)
         return settings_model.get_repos_location()
 
     def get(self, repo_id, cache=False):
         repo = self.sa.query(Repository) \
             .filter(Repository.repo_id == repo_id)
 
         if cache:
             repo = repo.options(FromCache("sql_cache_short",
                                           "get_repo_%s" % repo_id))
         return repo.scalar()
 
     def get_repo(self, repository):
         return self._get_repo(repository)
 
     def get_by_repo_name(self, repo_name, cache=False):
         repo = self.sa.query(Repository) \
             .filter(Repository.repo_name == repo_name)
 
         if cache:
             repo = repo.options(FromCache("sql_cache_short",
                                           "get_repo_%s" % repo_name))
         return repo.scalar()
 
     def _extract_id_from_repo_name(self, repo_name):
         if repo_name.startswith('/'):
             repo_name = repo_name.lstrip('/')
         by_id_match = re.match(r'^_(\d{1,})', repo_name)
         if by_id_match:
             return by_id_match.groups()[0]
 
     def get_repo_by_id(self, repo_name):
         """
         Extracts repo_name by id from special urls.
         Example url is _11/repo_name
 
         :param repo_name:
         :return: repo object if matched else None
         """
         try:
             _repo_id = self._extract_id_from_repo_name(repo_name)
             if _repo_id:
                 return self.get(_repo_id)
         except Exception:
             log.exception('Failed to extract repo_name from URL')
 
         return None
 
-    def get_users(self, name_contains=None, limit=20):
+    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)
-        query = query.filter(User.active == true())
+        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,
                 'icon_link': h.gravatar_url(user.email, 14),
                 'value_display': h.person(user.email),
                 'value': user.username,
-                'value_type': 'user'
+                'value_type': 'user',
+                'active': user.active,
             }
             for user in users
         ]
         return _users
 
-    def get_user_groups(self, name_contains=None, limit=20):
+    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)
-        query = query.filter(UserGroup.users_group_active == true())
+        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,
-                'value_type': 'user_group'
+                '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:
             repositories = Repository.getAll()
         for repo in repositories:
             repo.update_commit_cache()
 
     def get_repos_as_dict(self, repo_list=None, admin=False,
                           super_user_actions=False):
 
         from rhodecode.lib.utils import PartialRenderer
         _render = PartialRenderer('data_table/_dt_elements.html')
         c = _render.c
 
         def quick_menu(repo_name):
             return _render('quick_menu', repo_name)
 
         def repo_lnk(name, rtype, rstate, private, fork_of):
             return _render('repo_name', name, rtype, rstate, private, fork_of,
                            short_name=not admin, admin=False)
 
         def last_change(last_change):
             return _render("last_change", last_change)
 
         def rss_lnk(repo_name):
             return _render("rss", repo_name)
 
         def atom_lnk(repo_name):
             return _render("atom", repo_name)
 
         def last_rev(repo_name, cs_cache):
             return _render('revision', repo_name, cs_cache.get('revision'),
                            cs_cache.get('raw_id'), cs_cache.get('author'),
                            cs_cache.get('message'))
 
         def desc(desc):
             if c.visual.stylify_metatags:
                 return h.urlify_text(h.escaped_stylize(h.truncate(desc, 60)))
             else:
                 return h.urlify_text(h.html_escape(h.truncate(desc, 60)))
 
         def state(repo_state):
             return _render("repo_state", repo_state)
 
         def repo_actions(repo_name):
             return _render('repo_actions', repo_name, super_user_actions)
 
         def user_profile(username):
             return _render('user_profile', username)
 
         repos_data = []
         for repo in repo_list:
             cs_cache = repo.changeset_cache
             row = {
                 "menu": quick_menu(repo.repo_name),
 
                 "name": repo_lnk(repo.repo_name, repo.repo_type,
                                  repo.repo_state, repo.private, repo.fork),
                 "name_raw": repo.repo_name.lower(),
 
                 "last_change": last_change(repo.last_db_change),
                 "last_change_raw": datetime_to_time(repo.last_db_change),
 
                 "last_changeset": last_rev(repo.repo_name, cs_cache),
                 "last_changeset_raw": cs_cache.get('revision'),
 
                 "desc": desc(repo.description),
                 "owner": user_profile(repo.user.username),
 
                 "state": state(repo.repo_state),
                 "rss": rss_lnk(repo.repo_name),
 
                 "atom": atom_lnk(repo.repo_name),
             }
             if admin:
                 row.update({
                     "action": repo_actions(repo.repo_name),
                 })
             repos_data.append(row)
 
         return repos_data
 
     def _get_defaults(self, repo_name):
         """
         Gets information about repository, and returns a dict for
         usage in forms
 
         :param repo_name:
         """
 
         repo_info = Repository.get_by_repo_name(repo_name)
 
         if repo_info is None:
             return None
 
         defaults = repo_info.get_dict()
         defaults['repo_name'] = repo_info.just_name
 
         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
         defaults['repo_group'] = getattr(parent_group, 'group_id', -1)
 
         keys_to_process = (
             {'k': 'repo_type', 'strip': False},
             {'k': 'repo_enable_downloads', 'strip': True},
             {'k': 'repo_description', 'strip': True},
             {'k': 'repo_enable_locking', 'strip': True},
             {'k': 'repo_landing_rev', 'strip': True},
             {'k': 'clone_uri', 'strip': False},
             {'k': 'repo_private', 'strip': True},
             {'k': 'repo_enable_statistics', 'strip': True}
         )
 
         for item in keys_to_process:
             attr = item['k']
             if item['strip']:
                 attr = remove_prefix(item['k'], 'repo_')
 
             val = defaults[attr]
             if item['k'] == 'repo_landing_rev':
                 val = ':'.join(defaults[attr])
             defaults[item['k']] = val
             if item['k'] == 'clone_uri':
                 defaults['clone_uri_hidden'] = repo_info.clone_uri_hidden
 
         # fill owner
         if repo_info.user:
             defaults.update({'user': repo_info.user.username})
         else:
-            replacement_user = User.get_first_admin().username
+            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):
         try:
             cur_repo = self._get_repo(repo)
             source_repo_name = cur_repo.repo_name
             if 'user' in kwargs:
                 cur_repo.user = User.get_by_username(kwargs['user'])
 
             if 'repo_group' in kwargs:
                 cur_repo.group = RepoGroup.get(kwargs['repo_group'])
             log.debug('Updating repo %s with params:%s', cur_repo, kwargs)
 
             update_keys = [
                 (1, 'repo_enable_downloads'),
                 (1, 'repo_description'),
                 (1, 'repo_enable_locking'),
                 (1, 'repo_landing_rev'),
                 (1, 'repo_private'),
                 (1, 'repo_enable_statistics'),
                 (0, 'clone_uri'),
                 (0, 'fork_id')
             ]
             for strip, k in update_keys:
                 if k in kwargs:
                     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)
 
             new_name = cur_repo.get_new_name(kwargs['repo_name'])
             cur_repo.repo_name = new_name
 
             # if private flag is set, reset default permission to NONE
             if kwargs.get('repo_private'):
                 EMPTY_PERM = 'repository.none'
                 RepoModel().grant_user_permission(
                     repo=cur_repo, user=User.DEFAULT_USER, perm=EMPTY_PERM
                 )
 
             # handle extra fields
             for field in filter(lambda k: k.startswith(RepositoryField.PREFIX),
                                 kwargs):
                 k = RepositoryField.un_prefix_key(field)
                 ex_field = RepositoryField.get_by_key_name(
                     key=k, repo=cur_repo)
                 if ex_field:
                     ex_field.field_value = kwargs[field]
                     self.sa.add(ex_field)
             self.sa.add(cur_repo)
 
             if source_repo_name != new_name:
                 # rename repository
                 self._rename_filesystem_repo(
                     old=source_repo_name, new=new_name)
 
             return cur_repo
         except Exception:
             log.error(traceback.format_exc())
             raise
 
     def _create_repo(self, repo_name, repo_type, description, owner,
                      private=False, clone_uri=None, repo_group=None,
                      landing_rev='rev:tip', fork_of=None,
                      copy_fork_permissions=False, enable_statistics=False,
                      enable_locking=False, enable_downloads=False,
                      copy_group_permissions=False,
                      state=Repository.STATE_PENDING):
         """
         Create repository inside database with PENDING state, this should be
         only executed by create() repo. With exception of importing existing
         repos
         """
         from rhodecode.model.scm import ScmModel
 
         owner = self._get_user(owner)
         fork_of = self._get_repo(fork_of)
         repo_group = self._get_repo_group(safe_int(repo_group))
 
         try:
             repo_name = safe_unicode(repo_name)
             description = safe_unicode(description)
             # repo name is just a name of repository
             # while repo_name_full is a full qualified name that is combined
             # with name and path of group
             repo_name_full = repo_name
             repo_name = repo_name.split(Repository.NAME_SEP)[-1]
 
             new_repo = Repository()
             new_repo.repo_state = state
             new_repo.enable_statistics = False
             new_repo.repo_name = repo_name_full
             new_repo.repo_type = repo_type
             new_repo.user = owner
             new_repo.group = repo_group
             new_repo.description = description or repo_name
             new_repo.private = private
             new_repo.clone_uri = clone_uri
             new_repo.landing_rev = landing_rev
 
             new_repo.enable_statistics = enable_statistics
             new_repo.enable_locking = enable_locking
             new_repo.enable_downloads = enable_downloads
 
             if repo_group:
                 new_repo.enable_locking = repo_group.enable_locking
 
             if fork_of:
                 parent_repo = fork_of
                 new_repo.fork = parent_repo
 
             self.sa.add(new_repo)
 
             EMPTY_PERM = 'repository.none'
             if fork_of and copy_fork_permissions:
                 repo = fork_of
                 user_perms = UserRepoToPerm.query() \
                     .filter(UserRepoToPerm.repository == repo).all()
                 group_perms = UserGroupRepoToPerm.query() \
                     .filter(UserGroupRepoToPerm.repository == repo).all()
 
                 for perm in user_perms:
                     UserRepoToPerm.create(
                         perm.user, new_repo, perm.permission)
 
                 for perm in group_perms:
                     UserGroupRepoToPerm.create(
                         perm.users_group, new_repo, perm.permission)
                 # in case we copy permissions and also set this repo to private
                 # override the default user permission to make it a private
                 # repo
                 if private:
                     RepoModel(self.sa).grant_user_permission(
                         repo=new_repo, user=User.DEFAULT_USER, perm=EMPTY_PERM)
 
             elif repo_group and copy_group_permissions:
                 user_perms = UserRepoGroupToPerm.query() \
                     .filter(UserRepoGroupToPerm.group == repo_group).all()
 
                 group_perms = UserGroupRepoGroupToPerm.query() \
                     .filter(UserGroupRepoGroupToPerm.group == repo_group).all()
 
                 for perm in user_perms:
                     perm_name = perm.permission.permission_name.replace(
                         'group.', 'repository.')
                     perm_obj = Permission.get_by_key(perm_name)
                     UserRepoToPerm.create(perm.user, new_repo, perm_obj)
 
                 for perm in group_perms:
                     perm_name = perm.permission.permission_name.replace(
                         'group.', 'repository.')
                     perm_obj = Permission.get_by_key(perm_name)
                     UserGroupRepoToPerm.create(
                         perm.users_group, new_repo, perm_obj)
 
                 if private:
                     RepoModel(self.sa).grant_user_permission(
                         repo=new_repo, user=User.DEFAULT_USER, perm=EMPTY_PERM)
 
             else:
                 perm_obj = self._create_default_perms(new_repo, private)
                 self.sa.add(perm_obj)
 
             # now automatically start following this repository as owner
             ScmModel(self.sa).toggle_following_repo(new_repo.repo_id,
                                                     owner.user_id)
             # we need to flush here, in order to check if database won't
             # throw any exceptions, create filesystem dirs at the very end
             self.sa.flush()
 
             return new_repo
         except Exception:
             log.error(traceback.format_exc())
             raise
 
     def create(self, form_data, cur_user):
         """
         Create repository using celery tasks
 
         :param form_data:
         :param cur_user:
         """
         from rhodecode.lib.celerylib import tasks, run_task
         return run_task(tasks.create_repo, form_data, cur_user)
 
     def update_permissions(self, repo, perm_additions=None, perm_updates=None,
                            perm_deletions=None, check_perms=True,
                            cur_user=None):
         if not perm_additions:
             perm_additions = []
         if not perm_updates:
             perm_updates = []
         if not perm_deletions:
             perm_deletions = []
 
         req_perms = ('usergroup.read', 'usergroup.write', 'usergroup.admin')
 
         # update permissions
         for member_id, perm, member_type in perm_updates:
             member_id = int(member_id)
             if member_type == 'user':
                 # this updates also current one if found
                 self.grant_user_permission(
                     repo=repo, user=member_id, perm=perm)
             else:  # set for user group
                 # 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.grant_user_group_permission(
                         repo=repo, group_name=member_id, perm=perm)
 
         # set new permissions
         for member_id, perm, member_type in perm_additions:
             member_id = int(member_id)
             if member_type == 'user':
                 self.grant_user_permission(
                     repo=repo, user=member_id, perm=perm)
             else:  # set for user group
                 # 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.grant_user_group_permission(
                         repo=repo, group_name=member_id, perm=perm)
 
         # delete permissions
         for member_id, perm, member_type in perm_deletions:
             member_id = int(member_id)
             if member_type == 'user':
                 self.revoke_user_permission(repo=repo, user=member_id)
             else:  # set for user group
                 # 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(
                         repo=repo, group_name=member_id)
 
     def create_fork(self, form_data, cur_user):
         """
         Simple wrapper into executing celery task for fork creation
 
         :param form_data:
         :param cur_user:
         """
         from rhodecode.lib.celerylib import tasks, run_task
         return run_task(tasks.create_repo_fork, form_data, cur_user)
 
     def delete(self, repo, forks=None, fs_remove=True, cur_user=None):
         """
         Delete given repository, forks parameter defines what do do with
         attached forks. Throws AttachedForksError if deleted repo has attached
         forks
 
         :param repo:
         :param forks: str 'delete' or 'detach'
         :param fs_remove: remove(archive) repo from filesystem
         """
         if not cur_user:
             cur_user = getattr(get_current_rhodecode_user(), 'username', None)
         repo = self._get_repo(repo)
         if repo:
             if forks == 'detach':
                 for r in repo.forks:
                     r.fork = None
                     self.sa.add(r)
             elif forks == 'delete':
                 for r in repo.forks:
                     self.delete(r, forks='delete')
             elif [f for f in repo.forks]:
                 raise AttachedForksError()
 
             old_repo_dict = repo.get_dict()
             try:
                 self.sa.delete(repo)
                 if fs_remove:
                     self._delete_filesystem_repo(repo)
                 else:
                     log.debug('skipping removal from filesystem')
                 old_repo_dict.update({
                     'deleted_by': cur_user,
                     'deleted_on': time.time(),
                 })
                 log_delete_repository(**old_repo_dict)
             except Exception:
                 log.error(traceback.format_exc())
                 raise
 
     def grant_user_permission(self, repo, user, perm):
         """
         Grant permission for user on given repository, or update existing one
         if found
 
         :param repo: Instance of Repository, repository_id, or repository name
         :param user: Instance of User, user_id or username
         :param perm: Instance of Permission, or permission_name
         """
         user = self._get_user(user)
         repo = self._get_repo(repo)
         permission = self._get_perm(perm)
 
         # check if we have that permission already
         obj = self.sa.query(UserRepoToPerm) \
             .filter(UserRepoToPerm.user == user) \
             .filter(UserRepoToPerm.repository == repo) \
             .scalar()
         if obj is None:
             # create new !
             obj = UserRepoToPerm()
         obj.repository = repo
         obj.user = user
         obj.permission = permission
         self.sa.add(obj)
         log.debug('Granted perm %s to %s on %s', perm, user, repo)
         action_logger_generic(
             'granted permission: {} to user: {} on repo: {}'.format(
                 perm, user, repo), namespace='security.repo')
         return obj
 
     def revoke_user_permission(self, repo, user):
         """
         Revoke permission for user on given repository
 
         :param repo: Instance of Repository, repository_id, or repository name
         :param user: Instance of User, user_id or username
         """
 
         user = self._get_user(user)
         repo = self._get_repo(repo)
 
         obj = self.sa.query(UserRepoToPerm) \
             .filter(UserRepoToPerm.repository == repo) \
             .filter(UserRepoToPerm.user == user) \
             .scalar()
         if obj:
             self.sa.delete(obj)
             log.debug('Revoked perm on %s on %s', repo, user)
             action_logger_generic(
                 'revoked permission from user: {} on repo: {}'.format(
                     user, repo), namespace='security.repo')
 
     def grant_user_group_permission(self, repo, group_name, perm):
         """
         Grant permission for user group on given repository, or update
         existing one if found
 
         :param repo: Instance of Repository, repository_id, or repository name
         :param group_name: Instance of UserGroup, users_group_id,
             or user group name
         :param perm: Instance of Permission, or permission_name
         """
         repo = self._get_repo(repo)
         group_name = self._get_user_group(group_name)
         permission = self._get_perm(perm)
 
         # check if we have that permission already
         obj = self.sa.query(UserGroupRepoToPerm) \
             .filter(UserGroupRepoToPerm.users_group == group_name) \
             .filter(UserGroupRepoToPerm.repository == repo) \
             .scalar()
 
         if obj is None:
             # create new
             obj = UserGroupRepoToPerm()
 
         obj.repository = repo
         obj.users_group = group_name
         obj.permission = permission
         self.sa.add(obj)
         log.debug('Granted perm %s to %s on %s', perm, group_name, repo)
         action_logger_generic(
             'granted permission: {} to usergroup: {} on repo: {}'.format(
                 perm, group_name, repo), namespace='security.repo')
 
         return obj
 
     def revoke_user_group_permission(self, repo, group_name):
         """
         Revoke permission for user group on given repository
 
         :param repo: Instance of Repository, repository_id, or repository name
         :param group_name: Instance of UserGroup, users_group_id,
             or user group name
         """
         repo = self._get_repo(repo)
         group_name = self._get_user_group(group_name)
 
         obj = self.sa.query(UserGroupRepoToPerm) \
             .filter(UserGroupRepoToPerm.repository == repo) \
             .filter(UserGroupRepoToPerm.users_group == group_name) \
             .scalar()
         if obj:
             self.sa.delete(obj)
             log.debug('Revoked perm to %s on %s', repo, group_name)
             action_logger_generic(
                 'revoked permission from usergroup: {} on repo: {}'.format(
                     group_name, repo), namespace='security.repo')
 
     def delete_stats(self, repo_name):
         """
         removes stats for given repo
 
         :param repo_name:
         """
         repo = self._get_repo(repo_name)
         try:
             obj = self.sa.query(Statistics) \
                 .filter(Statistics.repository == repo).scalar()
             if obj:
                 self.sa.delete(obj)
         except Exception:
             log.error(traceback.format_exc())
             raise
 
     def add_repo_field(self, repo_name, field_key, field_label, field_value='',
                        field_type='str', field_desc=''):
 
         repo = self._get_repo(repo_name)
 
         new_field = RepositoryField()
         new_field.repository = repo
         new_field.field_key = field_key
         new_field.field_type = field_type  # python type
         new_field.field_value = field_value
         new_field.field_desc = field_desc
         new_field.field_label = field_label
         self.sa.add(new_field)
         return new_field
 
     def delete_repo_field(self, repo_name, field_key):
         repo = self._get_repo(repo_name)
         field = RepositoryField.get_by_key_name(field_key, repo)
         if field:
             self.sa.delete(field)
 
     def _create_filesystem_repo(self, repo_name, repo_type, repo_group,
                                 clone_uri=None, repo_store_location=None,
                                 use_global_config=False):
         """
         makes repository on filesystem. It's group aware means it'll create
         a repository within a group, and alter the paths accordingly of
         group location
 
         :param repo_name:
         :param alias:
         :param parent:
         :param clone_uri:
         :param repo_store_location:
         """
         from rhodecode.lib.utils import is_valid_repo, is_valid_repo_group
         from rhodecode.model.scm import ScmModel
 
         if Repository.NAME_SEP in repo_name:
             raise ValueError(
                 'repo_name must not contain groups got `%s`' % repo_name)
 
         if isinstance(repo_group, RepoGroup):
             new_parent_path = os.sep.join(repo_group.full_path_splitted)
         else:
             new_parent_path = repo_group or ''
 
         if repo_store_location:
             _paths = [repo_store_location]
         else:
             _paths = [self.repos_path, new_parent_path, repo_name]
             # we need to make it str for mercurial
         repo_path = os.path.join(*map(lambda x: safe_str(x), _paths))
 
         # check if this path is not a repository
         if is_valid_repo(repo_path, self.repos_path):
             raise Exception('This path %s is a valid repository' % repo_path)
 
         # check if this path is a group
         if is_valid_repo_group(repo_path, self.repos_path):
             raise Exception('This path %s is a valid group' % repo_path)
 
         log.info('creating repo %s in %s from url: `%s`',
                  repo_name, safe_unicode(repo_path),
                  obfuscate_url_pw(clone_uri))
 
         backend = get_backend(repo_type)
 
         config_repo = None if use_global_config else repo_name
         if config_repo and new_parent_path:
             config_repo = Repository.NAME_SEP.join(
                 (new_parent_path, config_repo))
         config = make_db_config(clear_session=False, repo=config_repo)
         config.set('extensions', 'largefiles', '')
 
         # patch and reset hooks section of UI config to not run any
         # hooks on creating remote repo
         config.clear_section('hooks')
 
         # TODO: johbo: Unify this, hardcoded "bare=True" does not look nice
         if repo_type == 'git':
             repo = backend(
                 repo_path, config=config, create=True, src_url=clone_uri,
                 bare=True)
         else:
             repo = backend(
                 repo_path, config=config, create=True, src_url=clone_uri)
 
         ScmModel().install_hooks(repo, repo_type=repo_type)
 
         log.debug('Created repo %s with %s backend',
                   safe_unicode(repo_name), safe_unicode(repo_type))
         return repo
 
     def _rename_filesystem_repo(self, old, new):
         """
         renames repository on filesystem
 
         :param old: old name
         :param new: new name
         """
         log.info('renaming repo from %s to %s', old, new)
 
         old_path = os.path.join(self.repos_path, old)
         new_path = os.path.join(self.repos_path, new)
         if os.path.isdir(new_path):
             raise Exception(
                 'Was trying to rename to already existing dir %s' % new_path
             )
         shutil.move(old_path, new_path)
 
     def _delete_filesystem_repo(self, repo):
         """
         removes repo from filesystem, the removal is acctually made by
         added rm__ prefix into dir, and rename internat .hg/.git dirs so this
         repository is no longer valid for rhodecode, can be undeleted later on
         by reverting the renames on this repository
 
         :param repo: repo object
         """
         rm_path = os.path.join(self.repos_path, repo.repo_name)
         repo_group = repo.group
         log.info("Removing repository %s", rm_path)
         # disable hg/git internal that it doesn't get detected as repo
         alias = repo.repo_type
 
         config = make_db_config(clear_session=False)
         config.set('extensions', 'largefiles', '')
         bare = getattr(repo.scm_instance(config=config), 'bare', False)
 
         # skip this for bare git repos
         if not bare:
             # disable VCS repo
             vcs_path = os.path.join(rm_path, '.%s' % alias)
             if os.path.exists(vcs_path):
                 shutil.move(vcs_path, os.path.join(rm_path, 'rm__.%s' % alias))
 
         _now = datetime.now()
         _ms = str(_now.microsecond).rjust(6, '0')
         _d = 'rm__%s__%s' % (_now.strftime('%Y%m%d_%H%M%S_' + _ms),
                              repo.just_name)
         if repo_group:
             # if repository is in group, prefix the removal path with the group
             args = repo_group.full_path_splitted + [_d]
             _d = os.path.join(*args)
 
         if os.path.isdir(rm_path):
             shutil.move(rm_path, os.path.join(self.repos_path, _d))

rhodecode/model/settings.py

@@ -1,681 +1,696 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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 hashlib
 import logging
 from collections import namedtuple
 from functools import wraps
 
+from rhodecode.lib import caches
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.lib.utils2 import (
     Optional, AttributeDict, safe_str, remove_prefix, str2bool)
 from rhodecode.model import BaseModel
 from rhodecode.model.db import (
     RepoRhodeCodeUi, RepoRhodeCodeSetting, RhodeCodeUi, RhodeCodeSetting)
 from rhodecode.model.meta import Session
 
 
 log = logging.getLogger(__name__)
 
 
 UiSetting = namedtuple(
     'UiSetting', ['section', 'key', 'value', 'active'])
 
 SOCIAL_PLUGINS_LIST = ['github', 'bitbucket', 'twitter', 'google']
 
 
 class SettingNotFound(Exception):
     def __init__(self):
         super(SettingNotFound, self).__init__('Setting is not found')
 
 
 class SettingsModel(BaseModel):
     BUILTIN_HOOKS = (
         RhodeCodeUi.HOOK_REPO_SIZE, RhodeCodeUi.HOOK_PUSH,
         RhodeCodeUi.HOOK_PRE_PUSH, RhodeCodeUi.HOOK_PULL,
         RhodeCodeUi.HOOK_PRE_PULL)
     HOOKS_SECTION = 'hooks'
 
     def __init__(self, sa=None, repo=None):
         self.repo = repo
         self.UiDbModel = RepoRhodeCodeUi if repo else RhodeCodeUi
         self.SettingsDbModel = (
             RepoRhodeCodeSetting if repo else RhodeCodeSetting)
         super(SettingsModel, self).__init__(sa)
 
     def get_ui_by_key(self, key):
         q = self.UiDbModel.query()
         q = q.filter(self.UiDbModel.ui_key == key)
         q = self._filter_by_repo(RepoRhodeCodeUi, q)
         return q.scalar()
 
     def get_ui_by_section(self, section):
         q = self.UiDbModel.query()
         q = q.filter(self.UiDbModel.ui_section == section)
         q = self._filter_by_repo(RepoRhodeCodeUi, q)
         return q.all()
 
     def get_ui_by_section_and_key(self, section, key):
         q = self.UiDbModel.query()
         q = q.filter(self.UiDbModel.ui_section == section)
         q = q.filter(self.UiDbModel.ui_key == key)
         q = self._filter_by_repo(RepoRhodeCodeUi, q)
         return q.scalar()
 
     def get_ui(self, section=None, key=None):
         q = self.UiDbModel.query()
         q = self._filter_by_repo(RepoRhodeCodeUi, q)
 
         if section:
             q = q.filter(self.UiDbModel.ui_section == section)
         if key:
             q = q.filter(self.UiDbModel.ui_key == key)
 
         # TODO: mikhail: add caching
         result = [
             UiSetting(
                 section=safe_str(r.ui_section), key=safe_str(r.ui_key),
                 value=safe_str(r.ui_value), active=r.ui_active
             )
             for r in q.all()
         ]
         return result
 
     def get_builtin_hooks(self):
         q = self.UiDbModel.query()
         q = q.filter(self.UiDbModel.ui_key.in_(self.BUILTIN_HOOKS))
         return self._get_hooks(q)
 
     def get_custom_hooks(self):
         q = self.UiDbModel.query()
         q = q.filter(~self.UiDbModel.ui_key.in_(self.BUILTIN_HOOKS))
         return self._get_hooks(q)
 
     def create_ui_section_value(self, section, val, key=None, active=True):
         new_ui = self.UiDbModel()
         new_ui.ui_section = section
         new_ui.ui_value = val
         new_ui.ui_active = active
 
         if self.repo:
             repo = self._get_repo(self.repo)
             repository_id = repo.repo_id
             new_ui.repository_id = repository_id
 
         if not key:
             # keys are unique so they need appended info
             if self.repo:
                 key = hashlib.sha1(
                     '{}{}{}'.format(section, val, repository_id)).hexdigest()
             else:
                 key = hashlib.sha1('{}{}'.format(section, val)).hexdigest()
 
         new_ui.ui_key = key
 
         Session().add(new_ui)
         return new_ui
 
     def create_or_update_hook(self, key, value):
         ui = (
             self.get_ui_by_section_and_key(self.HOOKS_SECTION, key) or
             self.UiDbModel())
         ui.ui_section = self.HOOKS_SECTION
         ui.ui_active = True
         ui.ui_key = key
         ui.ui_value = value
 
         if self.repo:
             repo = self._get_repo(self.repo)
             repository_id = repo.repo_id
             ui.repository_id = repository_id
 
         Session().add(ui)
         return ui
 
     def delete_ui(self, id_):
         ui = self.UiDbModel.get(id_)
         if not ui:
             raise SettingNotFound()
         Session().delete(ui)
 
     def get_setting_by_name(self, name):
         q = self._get_settings_query()
         q = q.filter(self.SettingsDbModel.app_settings_name == name)
         return q.scalar()
 
     def create_or_update_setting(
             self, name, val=Optional(''), type_=Optional('unicode')):
         """
         Creates or updates RhodeCode setting. If updates is triggered it will
         only update parameters that are explicityl set Optional instance will
         be skipped
 
         :param name:
         :param val:
         :param type_:
         :return:
         """
 
         res = self.get_setting_by_name(name)
         repo = self._get_repo(self.repo) if self.repo else None
 
         if not res:
             val = Optional.extract(val)
             type_ = Optional.extract(type_)
 
             args = (
                 (repo.repo_id, name, val, type_)
                 if repo else (name, val, type_))
             res = self.SettingsDbModel(*args)
 
         else:
             if self.repo:
                 res.repository_id = repo.repo_id
 
             res.app_settings_name = name
             if not isinstance(type_, Optional):
                 # update if set
                 res.app_settings_type = type_
             if not isinstance(val, Optional):
                 # update if set
                 res.app_settings_value = val
 
         Session.add(res)
         return res
 
+    def invalidate_settings_cache(self):
+        namespace = 'rhodecode_settings'
+        cache_manager = caches.get_cache_manager('sql_cache_short', namespace)
+        caches.clear_cache_manager(cache_manager)
+
     def get_all_settings(self, cache=False):
-        q = self._get_settings_query()
-        if cache:
-            repo = self._get_repo(self.repo) if self.repo else None
-            cache_key = (
-                "get_repo_{}_settings".format(repo.repo_id)
-                if repo else "get_hg_settings")
-            q = q.options(FromCache("sql_cache_short", cache_key))
+        def _compute():
+            q = self._get_settings_query()
+            if not q:
+                raise Exception('Could not get application settings !')
 
-        if not q:
-            raise Exception('Could not get application settings !')
+            settings = {
+                'rhodecode_' + result.app_settings_name: result.app_settings_value
+                for result in q
+            }
+            return settings
 
-        settings = {
-            'rhodecode_' + result.app_settings_name: result.app_settings_value
-            for result in q
-        }
-        return settings
+        if cache:
+            log.debug('Fetching app settings using cache')
+            repo = self._get_repo(self.repo) if self.repo else None
+            namespace = 'rhodecode_settings'
+            cache_manager = caches.get_cache_manager(
+                'sql_cache_short', namespace)
+            _cache_key = (
+                "get_repo_{}_settings".format(repo.repo_id)
+                if repo else "get_app_settings")
+
+            return cache_manager.get(_cache_key, createfunc=_compute)
+
+        else:
+            return _compute()
 
     def get_auth_settings(self):
         q = self._get_settings_query()
         q = q.filter(
             self.SettingsDbModel.app_settings_name.startswith('auth_'))
         rows = q.all()
         auth_settings = {
             row.app_settings_name: row.app_settings_value for row in rows}
         return auth_settings
 
     def get_auth_plugins(self):
         auth_plugins = self.get_setting_by_name("auth_plugins")
         return auth_plugins.app_settings_value
 
     def get_default_repo_settings(self, strip_prefix=False):
         q = self._get_settings_query()
         q = q.filter(
             self.SettingsDbModel.app_settings_name.startswith('default_'))
         rows = q.all()
 
         result = {}
         for row in rows:
             key = row.app_settings_name
             if strip_prefix:
                 key = remove_prefix(key, prefix='default_')
             result.update({key: row.app_settings_value})
         return result
 
     def get_repo(self):
         repo = self._get_repo(self.repo)
         if not repo:
             raise Exception(
                 'Repository {} cannot be found'.format(self.repo))
         return repo
 
     def _filter_by_repo(self, model, query):
         if self.repo:
             repo = self.get_repo()
             query = query.filter(model.repository_id == repo.repo_id)
         return query
 
     def _get_hooks(self, query):
         query = query.filter(self.UiDbModel.ui_section == self.HOOKS_SECTION)
         query = self._filter_by_repo(RepoRhodeCodeUi, query)
         return query.all()
 
     def _get_settings_query(self):
         q = self.SettingsDbModel.query()
         return self._filter_by_repo(RepoRhodeCodeSetting, q)
 
     def list_enabled_social_plugins(self, settings):
         enabled = []
         for plug in SOCIAL_PLUGINS_LIST:
             if str2bool(settings.get('rhodecode_auth_{}_enabled'.format(plug)
                                      )):
                 enabled.append(plug)
         return enabled
 
 
 def assert_repo_settings(func):
     @wraps(func)
     def _wrapper(self, *args, **kwargs):
         if not self.repo_settings:
             raise Exception('Repository is not specified')
         return func(self, *args, **kwargs)
     return _wrapper
 
 
 class IssueTrackerSettingsModel(object):
     INHERIT_SETTINGS = 'inherit_issue_tracker_settings'
     SETTINGS_PREFIX = 'issuetracker_'
 
     def __init__(self, sa=None, repo=None):
         self.global_settings = SettingsModel(sa=sa)
         self.repo_settings = SettingsModel(sa=sa, repo=repo) if repo else None
 
     @property
     def inherit_global_settings(self):
         if not self.repo_settings:
             return True
         setting = self.repo_settings.get_setting_by_name(self.INHERIT_SETTINGS)
         return setting.app_settings_value if setting else True
 
     @inherit_global_settings.setter
     def inherit_global_settings(self, value):
         if self.repo_settings:
             settings = self.repo_settings.create_or_update_setting(
                 self.INHERIT_SETTINGS, value, type_='bool')
             Session().add(settings)
 
     def _get_keyname(self, key, uid, prefix=''):
         return '{0}{1}{2}_{3}'.format(
             prefix, self.SETTINGS_PREFIX, key, uid)
 
     def _make_dict_for_settings(self, qs):
         prefix_match = self._get_keyname('pat', '', 'rhodecode_')
 
         issuetracker_entries = {}
         # create keys
         for k, v in qs.items():
             if k.startswith(prefix_match):
                 uid = k[len(prefix_match):]
                 issuetracker_entries[uid] = None
 
         # populate
         for uid in issuetracker_entries:
             issuetracker_entries[uid] = AttributeDict({
                 'pat': qs.get(self._get_keyname('pat', uid, 'rhodecode_')),
                 'url': qs.get(self._get_keyname('url', uid, 'rhodecode_')),
                 'pref': qs.get(self._get_keyname('pref', uid, 'rhodecode_')),
                 'desc': qs.get(self._get_keyname('desc', uid, 'rhodecode_')),
             })
         return issuetracker_entries
 
     def get_global_settings(self, cache=False):
         """
         Returns list of global issue tracker settings
         """
         defaults = self.global_settings.get_all_settings(cache=cache)
         settings = self._make_dict_for_settings(defaults)
         return settings
 
     def get_repo_settings(self, cache=False):
         """
         Returns list of issue tracker settings per repository
         """
         if not self.repo_settings:
             raise Exception('Repository is not specified')
         all_settings = self.repo_settings.get_all_settings(cache=cache)
         settings = self._make_dict_for_settings(all_settings)
         return settings
 
     def get_settings(self, cache=False):
         if self.inherit_global_settings:
             return self.get_global_settings(cache=cache)
         else:
             return self.get_repo_settings(cache=cache)
 
     def delete_entries(self, uid):
         if self.repo_settings:
             all_patterns = self.get_repo_settings()
             settings_model = self.repo_settings
         else:
             all_patterns = self.get_global_settings()
             settings_model = self.global_settings
         entries = all_patterns.get(uid)
 
         for del_key in entries:
             setting_name = self._get_keyname(del_key, uid)
             entry = settings_model.get_setting_by_name(setting_name)
             if entry:
                 Session().delete(entry)
 
         Session().commit()
 
     def create_or_update_setting(
             self, name, val=Optional(''), type_=Optional('unicode')):
         if self.repo_settings:
             setting = self.repo_settings.create_or_update_setting(
                 name, val, type_)
         else:
             setting = self.global_settings.create_or_update_setting(
                 name, val, type_)
         return setting
 
 
 class VcsSettingsModel(object):
 
     INHERIT_SETTINGS = 'inherit_vcs_settings'
     GENERAL_SETTINGS = ('use_outdated_comments', 'pr_merge_enabled')
     HOOKS_SETTINGS = (
         ('hooks', 'changegroup.repo_size'),
         ('hooks', 'changegroup.push_logger'),
         ('hooks', 'outgoing.pull_logger'))
     HG_SETTINGS = (
         ('extensions', 'largefiles'), ('phases', 'publish'))
     GLOBAL_HG_SETTINGS = HG_SETTINGS + (('extensions', 'hgsubversion'), )
     SVN_BRANCH_SECTION = 'vcs_svn_branch'
     SVN_TAG_SECTION = 'vcs_svn_tag'
     SSL_SETTING = ('web', 'push_ssl')
     PATH_SETTING = ('paths', '/')
 
     def __init__(self, sa=None, repo=None):
         self.global_settings = SettingsModel(sa=sa)
         self.repo_settings = SettingsModel(sa=sa, repo=repo) if repo else None
         self._ui_settings = self.HG_SETTINGS + self.HOOKS_SETTINGS
         self._svn_sections = (self.SVN_BRANCH_SECTION, self.SVN_TAG_SECTION)
 
     @property
     @assert_repo_settings
     def inherit_global_settings(self):
         setting = self.repo_settings.get_setting_by_name(self.INHERIT_SETTINGS)
         return setting.app_settings_value if setting else True
 
     @inherit_global_settings.setter
     @assert_repo_settings
     def inherit_global_settings(self, value):
         self.repo_settings.create_or_update_setting(
             self.INHERIT_SETTINGS, value, type_='bool')
 
     def get_global_svn_branch_patterns(self):
         return self.global_settings.get_ui_by_section(self.SVN_BRANCH_SECTION)
 
     @assert_repo_settings
     def get_repo_svn_branch_patterns(self):
         return self.repo_settings.get_ui_by_section(self.SVN_BRANCH_SECTION)
 
     def get_global_svn_tag_patterns(self):
         return self.global_settings.get_ui_by_section(self.SVN_TAG_SECTION)
 
     @assert_repo_settings
     def get_repo_svn_tag_patterns(self):
         return self.repo_settings.get_ui_by_section(self.SVN_TAG_SECTION)
 
     def get_global_settings(self):
         return self._collect_all_settings(global_=True)
 
     @assert_repo_settings
     def get_repo_settings(self):
         return self._collect_all_settings(global_=False)
 
     @assert_repo_settings
     def create_or_update_repo_settings(
             self, data, inherit_global_settings=False):
         from rhodecode.model.scm import ScmModel
 
         self.inherit_global_settings = inherit_global_settings
 
         repo = self.repo_settings.get_repo()
         if not inherit_global_settings:
             if repo.repo_type == 'svn':
                 self.create_repo_svn_settings(data)
             else:
                 self.create_or_update_repo_hook_settings(data)
                 self.create_or_update_repo_pr_settings(data)
 
             if repo.repo_type == 'hg':
                 self.create_or_update_repo_hg_settings(data)
 
         ScmModel().mark_for_invalidation(repo.repo_name, delete=True)
 
     @assert_repo_settings
     def create_or_update_repo_hook_settings(self, data):
         for section, key in self.HOOKS_SETTINGS:
             data_key = self._get_form_ui_key(section, key)
             if data_key not in data:
                 raise ValueError(
                     'The given data does not contain {} key'.format(data_key))
 
             active = data.get(data_key)
             repo_setting = self.repo_settings.get_ui_by_section_and_key(
                 section, key)
             if not repo_setting:
                 global_setting = self.global_settings.\
                     get_ui_by_section_and_key(section, key)
                 self.repo_settings.create_ui_section_value(
                     section, global_setting.ui_value, key=key, active=active)
             else:
                 repo_setting.ui_active = active
                 Session().add(repo_setting)
 
     def update_global_hook_settings(self, data):
         for section, key in self.HOOKS_SETTINGS:
             data_key = self._get_form_ui_key(section, key)
             if data_key not in data:
                 raise ValueError(
                     'The given data does not contain {} key'.format(data_key))
             active = data.get(data_key)
             repo_setting = self.global_settings.get_ui_by_section_and_key(
                 section, key)
             repo_setting.ui_active = active
             Session().add(repo_setting)
 
     @assert_repo_settings
     def create_or_update_repo_pr_settings(self, data):
         return self._create_or_update_general_settings(
             self.repo_settings, data)
 
     def create_or_update_global_pr_settings(self, data):
         return self._create_or_update_general_settings(
             self.global_settings, data)
 
     @assert_repo_settings
     def create_repo_svn_settings(self, data):
         return self._create_svn_settings(self.repo_settings, data)
 
     def create_global_svn_settings(self, data):
         return self._create_svn_settings(self.global_settings, data)
 
     @assert_repo_settings
     def create_or_update_repo_hg_settings(self, data):
         largefiles, phases = self.HG_SETTINGS
         largefiles_key, phases_key = self._get_hg_settings(
             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, *phases, value=safe_str(data[phases_key]))
 
     def create_or_update_global_hg_settings(self, data):
         largefiles, phases, subversion = self.GLOBAL_HG_SETTINGS
         largefiles_key, phases_key, subversion_key = self._get_hg_settings(
             self.GLOBAL_HG_SETTINGS, data)
         self._create_or_update_ui(
             self.global_settings, *largefiles, value='',
             active=data[largefiles_key])
         self._create_or_update_ui(
             self.global_settings, *phases, value=safe_str(data[phases_key]))
         self._create_or_update_ui(
             self.global_settings, *subversion, active=data[subversion_key])
 
     def update_global_ssl_setting(self, value):
         self._create_or_update_ui(
             self.global_settings, *self.SSL_SETTING, value=value)
 
     def update_global_path_setting(self, value):
         self._create_or_update_ui(
             self.global_settings, *self.PATH_SETTING, value=value)
 
     @assert_repo_settings
     def delete_repo_svn_pattern(self, id_):
         self.repo_settings.delete_ui(id_)
 
     def delete_global_svn_pattern(self, id_):
         self.global_settings.delete_ui(id_)
 
     @assert_repo_settings
     def get_repo_ui_settings(self, section=None, key=None):
         global_uis = self.global_settings.get_ui(section, key)
         repo_uis = self.repo_settings.get_ui(section, key)
         filtered_repo_uis = self._filter_ui_settings(repo_uis)
         filtered_repo_uis_keys = [
             (s.section, s.key) for s in filtered_repo_uis]
 
         def _is_global_ui_filtered(ui):
             return (
                 (ui.section, ui.key) in filtered_repo_uis_keys
                 or ui.section in self._svn_sections)
 
         filtered_global_uis = [
             ui for ui in global_uis if not _is_global_ui_filtered(ui)]
 
         return filtered_global_uis + filtered_repo_uis
 
     def get_global_ui_settings(self, section=None, key=None):
         return self.global_settings.get_ui(section, key)
 
     def get_ui_settings(self, section=None, key=None):
         if not self.repo_settings or self.inherit_global_settings:
             return self.get_global_ui_settings(section, key)
         else:
             return self.get_repo_ui_settings(section, key)
 
     def get_svn_patterns(self, section=None):
         if not self.repo_settings:
             return self.get_global_ui_settings(section)
         else:
             return self.get_repo_ui_settings(section)
 
     @assert_repo_settings
     def get_repo_general_settings(self):
         global_settings = self.global_settings.get_all_settings()
         repo_settings = self.repo_settings.get_all_settings()
         filtered_repo_settings = self._filter_general_settings(repo_settings)
         global_settings.update(filtered_repo_settings)
         return global_settings
 
     def get_global_general_settings(self):
         return self.global_settings.get_all_settings()
 
     def get_general_settings(self):
         if not self.repo_settings or self.inherit_global_settings:
             return self.get_global_general_settings()
         else:
             return self.get_repo_general_settings()
 
     def get_repos_location(self):
         return self.global_settings.get_ui_by_key('/').ui_value
 
     def _filter_ui_settings(self, settings):
         filtered_settings = [
             s for s in settings if self._should_keep_setting(s)]
         return filtered_settings
 
     def _should_keep_setting(self, setting):
         keep = (
             (setting.section, setting.key) in self._ui_settings or
             setting.section in self._svn_sections)
         return keep
 
     def _filter_general_settings(self, settings):
         keys = ['rhodecode_{}'.format(key) for key in self.GENERAL_SETTINGS]
         return {
             k: settings[k]
             for k in settings if k in keys}
 
     def _collect_all_settings(self, global_=False):
         settings = self.global_settings if global_ else self.repo_settings
         result = {}
 
         for section, key in self._ui_settings:
             ui = settings.get_ui_by_section_and_key(section, key)
             result_key = self._get_form_ui_key(section, key)
             if ui:
                 if section in ('hooks', 'extensions'):
                     result[result_key] = ui.ui_active
                 else:
                     result[result_key] = ui.ui_value
 
         for name in self.GENERAL_SETTINGS:
             setting = settings.get_setting_by_name(name)
             if setting:
                 result_key = 'rhodecode_{}'.format(name)
                 result[result_key] = setting.app_settings_value
 
         return result
 
     def _get_form_ui_key(self, section, key):
         return '{section}_{key}'.format(
             section=section, key=key.replace('.', '_'))
 
     def _create_or_update_ui(
             self, settings, section, key, value=None, active=None):
         ui = settings.get_ui_by_section_and_key(section, key)
         if not ui:
             active = True if active is None else active
             settings.create_ui_section_value(
                 section, value, key=key, active=active)
         else:
             if active is not None:
                 ui.ui_active = active
             if value is not None:
                 ui.ui_value = value
             Session().add(ui)
 
     def _create_svn_settings(self, settings, data):
         svn_settings = {
             'new_svn_branch': self.SVN_BRANCH_SECTION,
             'new_svn_tag': self.SVN_TAG_SECTION
         }
         for key in svn_settings:
             if data.get(key):
                 settings.create_ui_section_value(svn_settings[key], data[key])
 
     def _create_or_update_general_settings(self, settings, data):
         for name in self.GENERAL_SETTINGS:
             data_key = 'rhodecode_{}'.format(name)
             if data_key not in data:
                 raise ValueError(
                     'The given data does not contain {} key'.format(data_key))
             setting = settings.create_or_update_setting(
                 name, data[data_key], 'bool')
             Session().add(setting)
 
     def _get_hg_settings(self, settings, data):
         data_keys = [self._get_form_ui_key(*s) for s in settings]
         for data_key in data_keys:
             if data_key not in data:
                 raise ValueError(
                     'The given data does not contain {} key'.format(data_key))
         return data_keys

rhodecode/model/user.py

@@ -1,836 +1,838 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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/
 
 """
 users model for RhodeCode
 """
 
 import logging
 import traceback
 
 import datetime
-from pylons import url
 from pylons.i18n.translation import _
 
 import ipaddress
 from sqlalchemy.exc import DatabaseError
 from sqlalchemy.sql.expression import true, false
 
+from rhodecode.events import UserPreCreate, UserPreUpdate
 from rhodecode.lib.utils2 import (
     safe_unicode, get_current_rhodecode_user, action_logger_generic,
     AttributeDict)
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.model import BaseModel
 from rhodecode.model.auth_token import AuthTokenModel
 from rhodecode.model.db import (
     User, UserToPerm, UserEmailMap, UserIpMap)
 from rhodecode.lib.exceptions import (
     DefaultUserException, UserOwnsReposException, UserOwnsRepoGroupsException,
     UserOwnsUserGroupsException, NotAllowedToCreateUserError)
 from rhodecode.model.meta import Session
 from rhodecode.model.repo_group import RepoGroupModel
 
 
 log = logging.getLogger(__name__)
 
 
 class UserModel(BaseModel):
     cls = User
 
     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))
         return user.get(user_id)
 
     def get_user(self, user):
         return self._get_user(user)
 
     def get_by_username(self, username, cache=False, case_insensitive=False):
 
         if case_insensitive:
             user = self.sa.query(User).filter(User.username.ilike(username))
         else:
             user = self.sa.query(User)\
                 .filter(User.username == username)
         if cache:
             user = user.options(FromCache("sql_cache_short",
                                           "get_user_%s" % username))
         return user.scalar()
 
     def get_by_email(self, email, cache=False, case_insensitive=False):
         return User.get_by_email(email, case_insensitive, cache)
 
     def get_by_auth_token(self, auth_token, cache=False):
         return User.get_by_auth_token(auth_token, cache)
 
     def get_active_user_count(self, cache=False):
         return User.query().filter(
             User.active == True).filter(
                 User.username != User.DEFAULT_USER).count()
 
     def create(self, form_data, cur_user=None):
         if not cur_user:
             cur_user = getattr(get_current_rhodecode_user(), 'username', None)
 
         user_data = {
             'username': form_data['username'],
             'password': form_data['password'],
             'email': form_data['email'],
             'firstname': form_data['firstname'],
             'lastname': form_data['lastname'],
             'active': form_data['active'],
             'extern_type': form_data['extern_type'],
             'extern_name': form_data['extern_name'],
             'admin': False,
             'cur_user': cur_user
         }
 
         try:
             if form_data.get('create_repo_group'):
                 user_data['create_repo_group'] = True
             if form_data.get('password_change'):
                 user_data['force_password_change'] = True
 
             return UserModel().create_or_update(**user_data)
         except Exception:
             log.error(traceback.format_exc())
             raise
 
     def update_user(self, user, skip_attrs=None, **kwargs):
         from rhodecode.lib.auth import get_crypt_password
 
         user = self._get_user(user)
         if user.username == User.DEFAULT_USER:
             raise DefaultUserException(
                 _("You can't Edit this user since it's"
                   " crucial for entire application"))
 
         # first store only defaults
         user_attrs = {
             'updating_user_id': user.user_id,
             'username': user.username,
             'password': user.password,
             'email': user.email,
             'firstname': user.name,
             'lastname': user.lastname,
             'active': user.active,
             'admin': user.admin,
             'extern_name': user.extern_name,
             'extern_type': user.extern_type,
             'language': user.user_data.get('language')
         }
 
         # in case there's new_password, that comes from form, use it to
         # store password
         if kwargs.get('new_password'):
             kwargs['password'] = kwargs['new_password']
 
         # cleanups, my_account password change form
         kwargs.pop('current_password', None)
         kwargs.pop('new_password', None)
         kwargs.pop('new_password_confirmation', None)
 
         # cleanups, user edit password change form
         kwargs.pop('password_confirmation', None)
         kwargs.pop('password_change', None)
 
         # create repo group on user creation
         kwargs.pop('create_repo_group', None)
 
         # legacy forms send name, which is the firstname
         firstname = kwargs.pop('name', None)
         if firstname:
             kwargs['firstname'] = firstname
 
         for k, v in kwargs.items():
             # skip if we don't want to update this
             if skip_attrs and k in skip_attrs:
                 continue
 
             user_attrs[k] = v
 
         try:
             return self.create_or_update(**user_attrs)
         except Exception:
             log.error(traceback.format_exc())
             raise
 
     def create_or_update(
             self, username, password, email, firstname='', lastname='',
             active=True, admin=False, extern_type=None, extern_name=None,
             cur_user=None, plugin=None, force_password_change=False,
             allow_to_create_user=True, create_repo_group=False,
             updating_user_id=None, language=None, strict_creation_check=True):
         """
         Creates a new instance if not found, or updates current one
 
         :param username:
         :param password:
         :param email:
         :param firstname:
         :param lastname:
         :param active:
         :param admin:
         :param extern_type:
         :param extern_name:
         :param cur_user:
         :param plugin: optional plugin this method was called from
         :param force_password_change: toggles new or existing user flag
             for password change
         :param allow_to_create_user: Defines if the method can actually create
             new users
         :param create_repo_group: Defines if the method should also
             create an repo group with user name, and owner
         :param updating_user_id: if we set it up this is the user we want to
             update this allows to editing username.
         :param language: language of user from interface.
 
         :returns: new User object with injected `is_new_user` attribute.
         """
         if not cur_user:
             cur_user = getattr(get_current_rhodecode_user(), 'username', None)
 
         from rhodecode.lib.auth import (
             get_crypt_password, check_password, generate_auth_token)
         from rhodecode.lib.hooks_base import (
             log_create_user, check_allowed_create_user)
 
         def _password_change(new_user, password):
             # empty password
             if not new_user.password:
                 return False
 
             # password check is only needed for RhodeCode internal auth calls
             # in case it's a plugin we don't care
             if not plugin:
 
                 # first check if we gave crypted password back, and if it matches
                 # it's not password change
                 if new_user.password == password:
                     return False
 
                 password_match = check_password(password, new_user.password)
                 if not password_match:
                     return True
 
             return False
 
         user_data = {
             'username': username,
             'password': password,
             'email': email,
             'firstname': firstname,
             'lastname': lastname,
             'active': active,
             'admin': admin
         }
 
         if updating_user_id:
             log.debug('Checking for existing account in RhodeCode '
                       'database with user_id `%s` ' % (updating_user_id,))
             user = User.get(updating_user_id)
         else:
             log.debug('Checking for existing account in RhodeCode '
                       'database with username `%s` ' % (username,))
             user = User.get_by_username(username, case_insensitive=True)
 
         if user is None:
             # we check internal flag if this method is actually allowed to
             # create new user
             if not allow_to_create_user:
                 msg = ('Method wants to create new user, but it is not '
                        'allowed to do so')
                 log.warning(msg)
                 raise NotAllowedToCreateUserError(msg)
 
             log.debug('Creating new user %s', username)
 
             # only if we create user that is active
             new_active_user = active
             if new_active_user and strict_creation_check:
                 # raises UserCreationError if it's not allowed for any reason to
                 # create new active user, this also executes pre-create hooks
                 check_allowed_create_user(user_data, cur_user, strict_check=True)
+            self.send_event(UserPreCreate(user_data))
             new_user = User()
             edit = False
         else:
             log.debug('updating user %s', username)
+            self.send_event(UserPreUpdate(user, user_data))
             new_user = user
             edit = True
 
             # we're not allowed to edit default user
             if user.username == User.DEFAULT_USER:
                 raise DefaultUserException(
                     _("You can't edit this user (`%(username)s`) since it's "
                       "crucial for entire application") % {'username': user.username})
 
         # inject special attribute that will tell us if User is new or old
         new_user.is_new_user = not edit
         # for users that didn's specify auth type, we use RhodeCode built in
         from rhodecode.authentication.plugins import auth_rhodecode
         extern_name = extern_name or auth_rhodecode.RhodeCodeAuthPlugin.name
         extern_type = extern_type or auth_rhodecode.RhodeCodeAuthPlugin.name
 
         try:
             new_user.username = username
             new_user.admin = admin
             new_user.email = email
             new_user.active = active
             new_user.extern_name = safe_unicode(extern_name)
             new_user.extern_type = safe_unicode(extern_type)
             new_user.name = firstname
             new_user.lastname = lastname
 
             if not edit:
                 new_user.api_key = generate_auth_token(username)
 
             # set password only if creating an user or password is changed
             if not edit or _password_change(new_user, password):
                 reason = 'new password' if edit else 'new user'
                 log.debug('Updating password reason=>%s', reason)
                 new_user.password = get_crypt_password(password) if password else None
 
             if force_password_change:
                 new_user.update_userdata(force_password_change=True)
             if language:
                 new_user.update_userdata(language=language)
 
             self.sa.add(new_user)
 
             if not edit and create_repo_group:
                 # create new group same as username, and make this user an owner
                 desc = RepoGroupModel.PERSONAL_GROUP_DESC % {'username': username}
                 RepoGroupModel().create(group_name=username,
                                         group_description=desc,
                                         owner=username, commit_early=False)
             if not edit:
                 # add the RSS token
                 AuthTokenModel().create(username,
                                         description='Generated feed token',
                                         role=AuthTokenModel.cls.ROLE_FEED)
                 log_create_user(created_by=cur_user, **new_user.get_dict())
             return new_user
         except (DatabaseError,):
             log.error(traceback.format_exc())
             raise
 
     def create_registration(self, form_data):
         from rhodecode.model.notification import NotificationModel
         from rhodecode.model.notification import EmailNotificationModel
 
         try:
             form_data['admin'] = False
             form_data['extern_name'] = 'rhodecode'
             form_data['extern_type'] = 'rhodecode'
             new_user = self.create(form_data)
 
             self.sa.add(new_user)
             self.sa.flush()
 
             user_data = new_user.get_dict()
             kwargs = {
                 # use SQLALCHEMY safe dump of user data
                 'user': AttributeDict(user_data),
                 'date': datetime.datetime.now()
             }
             notification_type = EmailNotificationModel.TYPE_REGISTRATION
             # pre-generate the subject for notification itself
             (subject,
              _h, _e,  # we don't care about those
              body_plaintext) = EmailNotificationModel().render_email(
                 notification_type, **kwargs)
 
             # create notification objects, and emails
             NotificationModel().create(
                 created_by=new_user,
                 notification_subject=subject,
                 notification_body=body_plaintext,
                 notification_type=notification_type,
                 recipients=None,  # all admins
                 email_kwargs=kwargs,
             )
 
             return new_user
         except Exception:
             log.error(traceback.format_exc())
             raise
 
     def _handle_user_repos(self, username, repositories, handle_mode=None):
-        _superadmin = self.cls.get_first_admin()
+        _superadmin = self.cls.get_first_super_admin()
         left_overs = True
 
         from rhodecode.model.repo import RepoModel
 
         if handle_mode == 'detach':
             for obj in repositories:
                 obj.user = _superadmin
                 # set description we know why we super admin now owns
                 # additional repositories that were orphaned !
                 obj.description += '  \n::detached repository from deleted user: %s' % (username,)
                 self.sa.add(obj)
             left_overs = False
         elif handle_mode == 'delete':
             for obj in repositories:
                 RepoModel().delete(obj, forks='detach')
             left_overs = False
 
         # if nothing is done we have left overs left
         return left_overs
 
     def _handle_user_repo_groups(self, username, repository_groups,
                                  handle_mode=None):
-        _superadmin = self.cls.get_first_admin()
+        _superadmin = self.cls.get_first_super_admin()
         left_overs = True
 
         from rhodecode.model.repo_group import RepoGroupModel
 
         if handle_mode == 'detach':
             for r in repository_groups:
                 r.user = _superadmin
                 # set description we know why we super admin now owns
                 # additional repositories that were orphaned !
                 r.group_description += '  \n::detached repository group from deleted user: %s' % (username,)
                 self.sa.add(r)
             left_overs = False
         elif handle_mode == 'delete':
             for r in repository_groups:
                 RepoGroupModel().delete(r)
             left_overs = False
 
         # if nothing is done we have left overs left
         return left_overs
 
     def _handle_user_user_groups(self, username, user_groups, handle_mode=None):
-        _superadmin = self.cls.get_first_admin()
+        _superadmin = self.cls.get_first_super_admin()
         left_overs = True
 
         from rhodecode.model.user_group import UserGroupModel
 
         if handle_mode == 'detach':
             for r in user_groups:
                 for user_user_group_to_perm in r.user_user_group_to_perm:
                     if user_user_group_to_perm.user.username == username:
                         user_user_group_to_perm.user = _superadmin
                 r.user = _superadmin
                 # set description we know why we super admin now owns
                 # additional repositories that were orphaned !
                 r.user_group_description += '  \n::detached user group from deleted user: %s' % (username,)
                 self.sa.add(r)
             left_overs = False
         elif handle_mode == 'delete':
             for r in user_groups:
                 UserGroupModel().delete(r)
             left_overs = False
 
         # if nothing is done we have left overs left
         return left_overs
 
     def delete(self, user, cur_user=None, handle_repos=None,
                handle_repo_groups=None, handle_user_groups=None):
         if not cur_user:
             cur_user = getattr(get_current_rhodecode_user(), 'username', None)
         user = self._get_user(user)
 
         try:
             if user.username == User.DEFAULT_USER:
                 raise DefaultUserException(
                     _(u"You can't remove this user since it's"
                       u" crucial for entire application"))
 
             left_overs = self._handle_user_repos(
                 user.username, user.repositories, handle_repos)
             if left_overs and user.repositories:
                 repos = [x.repo_name for x in user.repositories]
                 raise UserOwnsReposException(
                     _(u'user "%s" still owns %s repositories and cannot be '
                       u'removed. Switch owners or remove those repositories:%s')
                     % (user.username, len(repos), ', '.join(repos)))
 
             left_overs = self._handle_user_repo_groups(
                 user.username, user.repository_groups, handle_repo_groups)
             if left_overs and user.repository_groups:
                 repo_groups = [x.group_name for x in user.repository_groups]
                 raise UserOwnsRepoGroupsException(
                     _(u'user "%s" still owns %s repository groups and cannot be '
                       u'removed. Switch owners or remove those repository groups:%s')
                     % (user.username, len(repo_groups), ', '.join(repo_groups)))
 
             left_overs = self._handle_user_user_groups(
                 user.username, user.user_groups, handle_user_groups)
             if left_overs and user.user_groups:
                 user_groups = [x.users_group_name for x in user.user_groups]
                 raise UserOwnsUserGroupsException(
                     _(u'user "%s" still owns %s user groups and cannot be '
                       u'removed. Switch owners or remove those user groups:%s')
                     % (user.username, len(user_groups), ', '.join(user_groups)))
 
             # we might change the user data with detach/delete, make sure
             # the object is marked as expired before actually deleting !
             self.sa.expire(user)
             self.sa.delete(user)
             from rhodecode.lib.hooks_base import log_delete_user
             log_delete_user(deleted_by=cur_user, **user.get_dict())
         except Exception:
             log.error(traceback.format_exc())
             raise
 
     def reset_password_link(self, data, pwd_reset_url):
         from rhodecode.lib.celerylib import tasks, run_task
         from rhodecode.model.notification import EmailNotificationModel
         user_email = data['email']
         try:
             user = User.get_by_email(user_email)
             if user:
                 log.debug('password reset user found %s', user)
 
                 email_kwargs = {
                     'password_reset_url': pwd_reset_url,
                     'user': user,
                     'email': user_email,
                     'date': datetime.datetime.now()
                 }
 
                 (subject, headers, email_body,
                  email_body_plaintext) = EmailNotificationModel().render_email(
                     EmailNotificationModel.TYPE_PASSWORD_RESET, **email_kwargs)
 
                 recipients = [user_email]
 
                 action_logger_generic(
                     'sending password reset email to user: {}'.format(
                         user), namespace='security.password_reset')
 
                 run_task(tasks.send_email, recipients, subject,
                          email_body_plaintext, email_body)
 
             else:
                 log.debug("password reset email %s not found", user_email)
         except Exception:
             log.error(traceback.format_exc())
             return False
 
         return True
 
     def reset_password(self, data):
         from rhodecode.lib.celerylib import tasks, run_task
         from rhodecode.model.notification import EmailNotificationModel
         from rhodecode.lib import auth
         user_email = data['email']
         pre_db = True
         try:
             user = User.get_by_email(user_email)
             new_passwd = auth.PasswordGenerator().gen_password(
                 12, auth.PasswordGenerator.ALPHABETS_BIG_SMALL)
             if user:
                 user.password = auth.get_crypt_password(new_passwd)
                 # also force this user to reset his password !
                 user.update_userdata(force_password_change=True)
 
                 Session().add(user)
                 Session().commit()
                 log.info('change password for %s', user_email)
             if new_passwd is None:
                 raise Exception('unable to generate new password')
 
             pre_db = False
 
             email_kwargs = {
                 'new_password': new_passwd,
                 'user': user,
                 'email': user_email,
                 'date': datetime.datetime.now()
             }
 
             (subject, headers, email_body,
              email_body_plaintext) = EmailNotificationModel().render_email(
                 EmailNotificationModel.TYPE_PASSWORD_RESET_CONFIRMATION, **email_kwargs)
 
             recipients = [user_email]
 
             action_logger_generic(
                 'sent new password to user: {} with email: {}'.format(
                     user, user_email), namespace='security.password_reset')
 
             run_task(tasks.send_email, recipients, subject,
                      email_body_plaintext, email_body)
 
         except Exception:
             log.error('Failed to update user password')
             log.error(traceback.format_exc())
             if pre_db:
                 # we rollback only if local db stuff fails. If it goes into
                 # run_task, we're pass rollback state this wouldn't work then
                 Session().rollback()
 
         return True
 
     def fill_data(self, auth_user, user_id=None, api_key=None, username=None):
         """
         Fetches auth_user by user_id,or api_key if present.
         Fills auth_user attributes with those taken from database.
         Additionally set's is_authenitated if lookup fails
         present in database
 
         :param auth_user: instance of user to set attributes
         :param user_id: user id to fetch by
         :param api_key: api key to fetch by
         :param username: username to fetch by
         """
         if user_id is None and api_key is None and username is None:
             raise Exception('You need to pass user_id, api_key or username')
 
         log.debug(
             'doing fill data based on: user_id:%s api_key:%s username:%s',
             user_id, api_key, username)
         try:
             dbuser = None
             if user_id:
                 dbuser = self.get(user_id)
             elif api_key:
                 dbuser = self.get_by_auth_token(api_key)
             elif username:
                 dbuser = self.get_by_username(username)
 
             if not dbuser:
                 log.warning(
                     'Unable to lookup user by id:%s api_key:%s username:%s',
                     user_id, api_key, username)
                 return False
             if not dbuser.active:
                 log.debug('User `%s` is inactive, skipping fill data', username)
                 return False
 
             log.debug('filling user:%s data', dbuser)
 
             # 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))
 
             for k, v in user_data.iteritems():
                 # properties of auth user we dont update
                 if k not in ['auth_tokens', 'permissions']:
                     setattr(auth_user, k, v)
 
             # few extras
             setattr(auth_user, 'feed_token', dbuser.feed_token)
         except Exception:
             log.error(traceback.format_exc())
             auth_user.is_authenticated = False
             return False
 
         return True
 
     def has_perm(self, user, perm):
         perm = self._get_perm(perm)
         user = self._get_user(user)
 
         return UserToPerm.query().filter(UserToPerm.user == user)\
             .filter(UserToPerm.permission == perm).scalar() is not None
 
     def grant_perm(self, user, perm):
         """
         Grant user global permissions
 
         :param user:
         :param perm:
         """
         user = self._get_user(user)
         perm = self._get_perm(perm)
         # if this permission is already granted skip it
         _perm = UserToPerm.query()\
             .filter(UserToPerm.user == user)\
             .filter(UserToPerm.permission == perm)\
             .scalar()
         if _perm:
             return
         new = UserToPerm()
         new.user = user
         new.permission = perm
         self.sa.add(new)
         return new
 
     def revoke_perm(self, user, perm):
         """
         Revoke users global permissions
 
         :param user:
         :param perm:
         """
         user = self._get_user(user)
         perm = self._get_perm(perm)
 
         obj = UserToPerm.query()\
                 .filter(UserToPerm.user == user)\
                 .filter(UserToPerm.permission == perm)\
                 .scalar()
         if obj:
             self.sa.delete(obj)
 
     def add_extra_email(self, user, email):
         """
         Adds email address to UserEmailMap
 
         :param user:
         :param email:
         """
         from rhodecode.model import forms
         form = forms.UserExtraEmailForm()()
         data = form.to_python({'email': email})
         user = self._get_user(user)
 
         obj = UserEmailMap()
         obj.user = user
         obj.email = data['email']
         self.sa.add(obj)
         return obj
 
     def delete_extra_email(self, user, email_id):
         """
         Removes email address from UserEmailMap
 
         :param user:
         :param email_id:
         """
         user = self._get_user(user)
         obj = UserEmailMap.query().get(email_id)
         if obj:
             self.sa.delete(obj)
 
     def parse_ip_range(self, ip_range):
         ip_list = []
         def make_unique(value):
             seen = []
             return [c for c in value if not (c in seen or seen.append(c))]
 
         # firsts split by commas
         for ip_range in ip_range.split(','):
             if not ip_range:
                 continue
             ip_range = ip_range.strip()
             if '-' in ip_range:
                 start_ip, end_ip = ip_range.split('-', 1)
                 start_ip = ipaddress.ip_address(start_ip.strip())
                 end_ip = ipaddress.ip_address(end_ip.strip())
                 parsed_ip_range = []
 
                 for index in xrange(int(start_ip), int(end_ip) + 1):
                     new_ip = ipaddress.ip_address(index)
                     parsed_ip_range.append(str(new_ip))
                 ip_list.extend(parsed_ip_range)
             else:
                 ip_list.append(ip_range)
 
         return make_unique(ip_list)
 
     def add_extra_ip(self, user, ip, description=None):
         """
         Adds ip address to UserIpMap
 
         :param user:
         :param ip:
         """
         from rhodecode.model import forms
         form = forms.UserExtraIpForm()()
         data = form.to_python({'ip': ip})
         user = self._get_user(user)
 
         obj = UserIpMap()
         obj.user = user
         obj.ip_addr = data['ip']
         obj.description = description
         self.sa.add(obj)
         return obj
 
     def delete_extra_ip(self, user, ip_id):
         """
         Removes ip address from UserIpMap
 
         :param user:
         :param ip_id:
         """
         user = self._get_user(user)
         obj = UserIpMap.query().get(ip_id)
         if obj:
             self.sa.delete(obj)
 
     def get_accounts_in_creation_order(self, current_user=None):
         """
         Get accounts in order of creation for deactivation for license limits
 
         pick currently logged in user, and append to the list in position 0
         pick all super-admins in order of creation date and add it to the list
         pick all other accounts in order of creation and add it to the list.
 
         Based on that list, the last accounts can be disabled as they are
         created at the end and don't include any of the super admins as well
         as the current user.
 
         :param current_user: optionally current user running this operation
         """
 
         if not current_user:
             current_user = get_current_rhodecode_user()
         active_super_admins = [
             x.user_id for x in User.query()
             .filter(User.user_id != current_user.user_id)
             .filter(User.active == true())
             .filter(User.admin == true())
             .order_by(User.created_on.asc())]
 
         active_regular_users = [
             x.user_id for x in User.query()
             .filter(User.user_id != current_user.user_id)
             .filter(User.active == true())
             .filter(User.admin == false())
             .order_by(User.created_on.asc())]
 
         list_of_accounts = [current_user.user_id]
         list_of_accounts += active_super_admins
         list_of_accounts += active_regular_users
 
         return list_of_accounts
 
     def deactivate_last_users(self, expected_users):
         """
         Deactivate accounts that are over the license limits.
         Algorithm of which accounts to disabled is based on the formula:
 
         Get current user, then super admins in creation order, then regular
         active users in creation order.
 
         Using that list we mark all accounts from the end of it as inactive.
         This way we block only latest created accounts.
 
         :param expected_users: list of users in special order, we deactivate
             the end N ammoun of users from that list
         """
 
         list_of_accounts = self.get_accounts_in_creation_order()
 
         for acc_id in list_of_accounts[expected_users + 1:]:
             user = User.get(acc_id)
             log.info('Deactivating account %s for license unlock', user)
             user.active = False
             Session().add(user)
             Session().commit()
 
         return

rhodecode/model/user_group.py

@@ -1,517 +1,517 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2011-2016  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/
 
 
 """
 user group model for RhodeCode
 """
 
 
 import logging
 import traceback
 
 from rhodecode.lib.utils2 import safe_str
 from rhodecode.model import BaseModel
 from rhodecode.model.db import 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
 
 log = logging.getLogger(__name__)
 
 
 class UserGroupModel(BaseModel):
 
     cls = UserGroup
 
     def _get_user_group(self, user_group):
         return self._get_instance(UserGroup, user_group,
                                   callback=UserGroup.get_by_group_name)
 
     def _create_default_perms(self, user_group):
         # create default permission
         default_perm = 'usergroup.read'
         def_user = User.get_default_user()
         for p in def_user.user_perms:
             if p.permission.permission_name.startswith('usergroup.'):
                 default_perm = p.permission.permission_name
                 break
 
         user_group_to_perm = UserUserGroupToPerm()
         user_group_to_perm.permission = Permission.get_by_key(default_perm)
 
         user_group_to_perm.user_group = user_group
         user_group_to_perm.user_id = def_user.user_id
         return user_group_to_perm
 
     def update_permissions(self, user_group, perm_additions=None, perm_updates=None,
                            perm_deletions=None, check_perms=True, cur_user=None):
         from rhodecode.lib.auth import HasUserGroupPermissionAny
         if not perm_additions:
             perm_additions = []
         if not perm_updates:
             perm_updates = []
         if not perm_deletions:
             perm_deletions = []
 
         req_perms = ('usergroup.read', 'usergroup.write', 'usergroup.admin')
 
         # update permissions
         for member_id, perm, member_type in perm_updates:
             member_id = int(member_id)
             if member_type == 'user':
                 # this updates existing one
                 self.grant_user_permission(
                     user_group=user_group, user=member_id, perm=perm
                 )
             else:
                 # 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.grant_user_group_permission(
                         target_user_group=user_group, user_group=member_id, perm=perm
                     )
 
         # set new permissions
         for member_id, perm, member_type in perm_additions:
             member_id = int(member_id)
             if member_type == 'user':
                 self.grant_user_permission(
                     user_group=user_group, user=member_id, perm=perm
                 )
             else:
                 # 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.grant_user_group_permission(
                         target_user_group=user_group, user_group=member_id, perm=perm
                     )
 
         # delete permissions
         for member_id, perm, member_type in perm_deletions:
             member_id = int(member_id)
             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
                 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(
                         target_user_group=user_group, user_group=member_id
                     )
 
     def get(self, user_group_id, cache=False):
         return UserGroup.get(user_group_id)
 
     def get_group(self, user_group):
         return self._get_user_group(user_group)
 
     def get_by_name(self, name, cache=False, case_insensitive=False):
         return UserGroup.get_by_group_name(name, cache, case_insensitive)
 
     def create(self, name, description, owner, active=True, group_data=None):
         try:
             new_user_group = UserGroup()
             new_user_group.user = self._get_user(owner)
             new_user_group.users_group_name = name
             new_user_group.user_group_description = description
             new_user_group.users_group_active = active
             if group_data:
                 new_user_group.group_data = group_data
             self.sa.add(new_user_group)
             perm_obj = self._create_default_perms(new_user_group)
             self.sa.add(perm_obj)
 
             self.grant_user_permission(user_group=new_user_group,
                                        user=owner, perm='usergroup.admin')
 
             return new_user_group
         except Exception:
             log.error(traceback.format_exc())
             raise
 
     def _get_memberships_for_user_ids(self, user_group, user_id_list):
         members = []
         for user_id in user_id_list:
             member = self._get_membership(user_group.users_group_id, user_id)
             members.append(member)
         return members
 
     def _get_added_and_removed_user_ids(self, user_group, user_id_list):
         current_members = user_group.members or []
         current_members_ids = [m.user.user_id for m in current_members]
 
         added_members = [
             user_id for user_id in user_id_list
             if user_id not in current_members_ids]
         if user_id_list == []:
             # all members were deleted
             deleted_members = current_members_ids
         else:
             deleted_members = [
                 user_id for user_id in current_members_ids
                 if user_id not in user_id_list]
 
         return (added_members, deleted_members)
 
     def _set_users_as_members(self, user_group, user_ids):
         user_group.members = []
         self.sa.flush()
         members = self._get_memberships_for_user_ids(
             user_group, user_ids)
         user_group.members = members
         self.sa.add(user_group)
 
     def _update_members_from_user_ids(self, user_group, user_ids):
         added, removed = self._get_added_and_removed_user_ids(
             user_group, user_ids)
         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)
 
     def _clean_members_data(self, members_data):
         # TODO: anderson: this should be in the form validation but I couldn't
         # make it work there as it conflicts with the other validator
         if not members_data:
             members_data = []
 
         if isinstance(members_data, basestring):
             new_members = [members_data]
         else:
             new_members = members_data
 
         new_members = [int(uid) for uid in new_members]
         return new_members
 
     def update(self, user_group, form_data):
         user_group = self._get_user_group(user_group)
         if 'users_group_name' in form_data:
             user_group.users_group_name = form_data['users_group_name']
         if 'users_group_active' in form_data:
             user_group.users_group_active = form_data['users_group_active']
         if 'user_group_description' in form_data:
             user_group.user_group_description = form_data[
                 'user_group_description']
 
         # handle owner change
         if 'user' in form_data:
             owner = form_data['user']
             if isinstance(owner, basestring):
                 owner = User.get_by_username(form_data['user'])
 
             if not isinstance(owner, User):
                 raise ValueError(
                     'invalid owner for user group: %s' % form_data['user'])
 
             user_group.user = owner
 
         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)
 
         self.sa.add(user_group)
 
     def delete(self, user_group, force=False):
         """
         Deletes repository group, unless force flag is used
         raises exception if there are members in that group, else deletes
         group and users
 
         :param user_group:
         :param force:
         """
         user_group = self._get_user_group(user_group)
         try:
             # check if this group is not assigned to repo
             assigned_to_repo = [x.repository for x in UserGroupRepoToPerm.query()\
                 .filter(UserGroupRepoToPerm.users_group == user_group).all()]
             # check if this group is not assigned to repo
             assigned_to_repo_group = [x.group for x in UserGroupRepoGroupToPerm.query()\
                 .filter(UserGroupRepoGroupToPerm.users_group == user_group).all()]
 
             if (assigned_to_repo or assigned_to_repo_group) and not force:
                 assigned = ','.join(map(safe_str,
                                     assigned_to_repo+assigned_to_repo_group))
 
                 raise UserGroupAssignedException(
                     'UserGroup assigned to %s' % (assigned,))
             self.sa.delete(user_group)
         except Exception:
             log.error(traceback.format_exc())
             raise
 
     def _log_user_changes(self, action, user_group, user_or_users):
         users = user_or_users
         if not isinstance(users, (list, tuple)):
             users = [users]
         rhodecode_user = get_current_rhodecode_user()
         ipaddr = getattr(rhodecode_user, 'ip_addr', '')
         group_name = user_group.users_group_name
 
         for user_or_user_id in users:
             user = self._get_user(user_or_user_id)
             log_text = 'User {user} {action} {group}'.format(
                 action=action, user=user.username, group=group_name)
             log.info('Logging action: {0} by {1} ip:{2}'.format(
                      log_text, rhodecode_user, ipaddr))
 
     def _find_user_in_group(self, user, user_group):
         user_group_member = None
         for m in user_group.members:
             if m.user_id == user.user_id:
                 # Found this user's membership row
                 user_group_member = m
                 break
 
         return user_group_member
 
     def _get_membership(self, user_group_id, user_id):
         user_group_member = UserGroupMember(user_group_id, user_id)
         return user_group_member
 
     def add_user_to_group(self, user_group, user):
         user_group = self._get_user_group(user_group)
         user = self._get_user(user)
         user_member = self._find_user_in_group(user, user_group)
         if user_member:
             # user already in the group, skip
             return True
 
         member = self._get_membership(
             user_group.users_group_id, user.user_id)
         user_group.members.append(member)
 
         try:
             self.sa.add(member)
         except Exception:
             # what could go wrong here?
             log.error(traceback.format_exc())
             raise
 
         self._log_user_changes('added to', user_group, user)
         return member
 
     def remove_user_from_group(self, user_group, user):
         user_group = self._get_user_group(user_group)
         user = self._get_user(user)
         user_group_member = self._find_user_in_group(user, user_group)
 
         if not user_group_member:
             # User isn't in that group
             return False
 
         try:
             self.sa.delete(user_group_member)
         except Exception:
             log.error(traceback.format_exc())
             raise
 
         self._log_user_changes('removed from', user_group, user)
         return True
 
     def has_perm(self, user_group, perm):
         user_group = self._get_user_group(user_group)
         perm = self._get_perm(perm)
 
         return UserGroupToPerm.query()\
             .filter(UserGroupToPerm.users_group == user_group)\
             .filter(UserGroupToPerm.permission == perm).scalar() is not None
 
     def grant_perm(self, user_group, perm):
         user_group = self._get_user_group(user_group)
         perm = self._get_perm(perm)
 
         # if this permission is already granted skip it
         _perm = UserGroupToPerm.query()\
             .filter(UserGroupToPerm.users_group == user_group)\
             .filter(UserGroupToPerm.permission == perm)\
             .scalar()
         if _perm:
             return
 
         new = UserGroupToPerm()
         new.users_group = user_group
         new.permission = perm
         self.sa.add(new)
         return new
 
     def revoke_perm(self, user_group, perm):
         user_group = self._get_user_group(user_group)
         perm = self._get_perm(perm)
 
         obj = UserGroupToPerm.query()\
             .filter(UserGroupToPerm.users_group == user_group)\
             .filter(UserGroupToPerm.permission == perm).scalar()
         if obj:
             self.sa.delete(obj)
 
     def grant_user_permission(self, user_group, user, perm):
         """
         Grant permission for user on given user group, or update
         existing one if found
 
         :param user_group: Instance of UserGroup, users_group_id,
             or users_group_name
         :param user: Instance of User, user_id or username
         :param perm: Instance of Permission, or permission_name
         """
 
         user_group = self._get_user_group(user_group)
         user = self._get_user(user)
         permission = self._get_perm(perm)
 
         # check if we have that permission already
         obj = self.sa.query(UserUserGroupToPerm)\
             .filter(UserUserGroupToPerm.user == user)\
             .filter(UserUserGroupToPerm.user_group == user_group)\
             .scalar()
         if obj is None:
             # create new !
             obj = UserUserGroupToPerm()
         obj.user_group = user_group
         obj.user = user
         obj.permission = permission
         self.sa.add(obj)
         log.debug('Granted perm %s to %s on %s', perm, user, user_group)
         action_logger_generic(
             'granted permission: {} to user: {} on usergroup: {}'.format(
                 perm, user, user_group), namespace='security.usergroup')
 
         return obj
 
     def revoke_user_permission(self, user_group, user):
         """
         Revoke permission for user on given user group
 
         :param user_group: Instance of UserGroup, users_group_id,
             or users_group name
         :param user: Instance of User, user_id or username
         """
 
         user_group = self._get_user_group(user_group)
         user = self._get_user(user)
 
         obj = self.sa.query(UserUserGroupToPerm)\
             .filter(UserUserGroupToPerm.user == user)\
             .filter(UserUserGroupToPerm.user_group == user_group)\
             .scalar()
         if obj:
             self.sa.delete(obj)
             log.debug('Revoked perm on %s on %s', user_group, user)
             action_logger_generic(
                 'revoked permission from user: {} on usergroup: {}'.format(
                     user, user_group), namespace='security.usergroup')
 
     def grant_user_group_permission(self, target_user_group, user_group, perm):
         """
         Grant user group permission for given target_user_group
 
         :param target_user_group:
         :param user_group:
         :param perm:
         """
         target_user_group = self._get_user_group(target_user_group)
         user_group = self._get_user_group(user_group)
         permission = self._get_perm(perm)
         # forbid assigning same user group to itself
         if target_user_group == user_group:
             raise RepoGroupAssignmentError('target repo:%s cannot be '
                                            'assigned to itself' % target_user_group)
 
         # check if we have that permission already
         obj = self.sa.query(UserGroupUserGroupToPerm)\
             .filter(UserGroupUserGroupToPerm.target_user_group == target_user_group)\
             .filter(UserGroupUserGroupToPerm.user_group == user_group)\
             .scalar()
         if obj is None:
             # create new !
             obj = UserGroupUserGroupToPerm()
         obj.user_group = user_group
         obj.target_user_group = target_user_group
         obj.permission = permission
         self.sa.add(obj)
         log.debug(
             'Granted perm %s to %s on %s', perm, target_user_group, user_group)
         action_logger_generic(
             'granted permission: {} to usergroup: {} on usergroup: {}'.format(
                 perm, user_group, target_user_group),
             namespace='security.usergroup')
 
         return obj
 
     def revoke_user_group_permission(self, target_user_group, user_group):
         """
         Revoke user group permission for given target_user_group
 
         :param target_user_group:
         :param user_group:
         """
         target_user_group = self._get_user_group(target_user_group)
         user_group = self._get_user_group(user_group)
 
         obj = self.sa.query(UserGroupUserGroupToPerm)\
             .filter(UserGroupUserGroupToPerm.target_user_group == target_user_group)\
             .filter(UserGroupUserGroupToPerm.user_group == user_group)\
             .scalar()
         if obj:
             self.sa.delete(obj)
             log.debug(
                 'Revoked perm on %s on %s', target_user_group, user_group)
             action_logger_generic(
                 'revoked permission from usergroup: {} on usergroup: {}'.format(
                     user_group, target_user_group),
                 namespace='security.repogroup')
 
     def enforce_groups(self, user, groups, extern_type=None):
         user = self._get_user(user)
         log.debug('Enforcing groups %s on user %s', groups, user)
         current_groups = user.group_member
         # find the external created groups
         externals = [x.users_group for x in current_groups
                      if 'extern_type' in x.users_group.group_data]
 
         # calculate from what groups user should be removed
         # externals that are not in groups
         for gr in externals:
             if gr.users_group_name not in groups:
                 log.debug('Removing user %s from user group %s', user, gr)
                 self.remove_user_from_group(gr, user)
 
         # now we calculate in which groups user should be == groups params
-        owner = User.get_first_admin().username
+        owner = User.get_first_super_admin().username
         for gr in set(groups):
             existing_group = UserGroup.get_by_group_name(gr)
             if not existing_group:
                 desc = 'Automatically created from plugin:%s' % extern_type
                 # we use first admin account to set the owner of the group
                 existing_group = UserGroupModel().create(gr, desc, owner,
                                         group_data={'extern_type': extern_type})
 
             # we can only add users to special groups created via plugins
             managed = 'extern_type' in existing_group.group_data
             if managed:
                 log.debug('Adding user %s to user group %s', user, gr)
                 UserGroupModel().add_user_to_group(existing_group, user)
             else:
                 log.debug('Skipping addition to group %s since it is '
                           'not managed by auth plugins' % gr)

rhodecode/model/validators.py

@@ -1,1120 +1,1125 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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/
 
 """
 Set of generic validators
 """
 
 import logging
 import os
 import re
 from collections import defaultdict
 
 import formencode
 import ipaddress
 from formencode.validators import (
     UnicodeString, OneOf, Int, Number, Regex, Email, Bool, StringBoolean, Set,
     NotEmpty, IPAddress, CIDR, String, FancyValidator
 )
 from pylons.i18n.translation import _
 from sqlalchemy.sql.expression import true
 from sqlalchemy.util import OrderedSet
 from webhelpers.pylonslib.secure_form import authentication_token
 
 from rhodecode.authentication import (
     legacy_plugin_prefix, _import_legacy_plugin)
 from rhodecode.authentication.base import loadplugin
 from rhodecode.config.routing import ADMIN_PREFIX
 from rhodecode.lib.auth import HasRepoGroupPermissionAny, HasPermissionAny
 from rhodecode.lib.utils import repo_name_slug, make_db_config
 from rhodecode.lib.utils2 import safe_int, str2bool, aslist, md5
 from rhodecode.lib.vcs.backends.git.repository import GitRepository
 from rhodecode.lib.vcs.backends.hg.repository import MercurialRepository
 from rhodecode.lib.vcs.backends.svn.repository import SubversionRepository
 from rhodecode.model.db import (
     RepoGroup, Repository, UserGroup, User, ChangesetStatus, Gist)
 from rhodecode.model.settings import VcsSettingsModel
 
 # silence warnings and pylint
 UnicodeString, OneOf, Int, Number, Regex, Email, Bool, StringBoolean, Set, \
     NotEmpty, IPAddress, CIDR, String, FancyValidator
 
 log = logging.getLogger(__name__)
 
 
 class _Missing(object):
     pass
 
 Missing = _Missing()
 
 
 class StateObj(object):
     """
     this is needed to translate the messages using _() in validators
     """
     _ = staticmethod(_)
 
 
 def M(self, key, state=None, **kwargs):
     """
     returns string from self.message based on given key,
     passed kw params are used to substitute %(named)s params inside
     translated strings
 
     :param msg:
     :param state:
     """
     if state is None:
         state = StateObj()
     else:
         state._ = staticmethod(_)
     # inject validator into state object
     return self.message(key, state, **kwargs)
 
 
 def UniqueList(convert=None):
     class _UniqueList(formencode.FancyValidator):
         """
         Unique List !
         """
         messages = {
             'empty': _(u'Value cannot be an empty list'),
             'missing_value': _(u'Value cannot be an empty list'),
         }
 
         def _to_python(self, value, state):
             ret_val = []
 
             def make_unique(value):
                 seen = []
                 return [c for c in value if not (c in seen or seen.append(c))]
 
             if isinstance(value, list):
                 ret_val = make_unique(value)
             elif isinstance(value, set):
                 ret_val = make_unique(list(value))
             elif isinstance(value, tuple):
                 ret_val = make_unique(list(value))
             elif value is None:
                 ret_val = []
             else:
                 ret_val = [value]
 
             if convert:
                 ret_val = map(convert, ret_val)
             return ret_val
 
         def empty_value(self, value):
             return []
 
     return _UniqueList
 
 
 def UniqueListFromString():
     class _UniqueListFromString(UniqueList()):
         def _to_python(self, value, state):
             if isinstance(value, basestring):
                 value = aslist(value, ',')
             return super(_UniqueListFromString, self)._to_python(value, state)
     return _UniqueListFromString
 
 
 def ValidSvnPattern(section, repo_name=None):
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'pattern_exists': _(u'Pattern already exists'),
         }
 
         def validate_python(self, value, state):
             if not value:
                 return
             model = VcsSettingsModel(repo=repo_name)
             ui_settings = model.get_svn_patterns(section=section)
             for entry in ui_settings:
                 if value == entry.value:
                     msg = M(self, 'pattern_exists', state)
                     raise formencode.Invalid(msg, value, state)
     return _validator
 
 
 def ValidUsername(edit=False, old_data={}):
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'username_exists': _(u'Username "%(username)s" already exists'),
             'system_invalid_username':
                 _(u'Username "%(username)s" is forbidden'),
             'invalid_username':
                 _(u'Username may only contain alphanumeric characters '
                     u'underscores, periods or dashes and must begin with '
                     u'alphanumeric character or underscore')
         }
 
         def validate_python(self, value, state):
             if value in ['default', 'new_user']:
                 msg = M(self, 'system_invalid_username', state, username=value)
                 raise formencode.Invalid(msg, value, state)
             # check if user is unique
             old_un = None
             if edit:
                 old_un = User.get(old_data.get('user_id')).username
 
             if old_un != value or not edit:
                 if User.get_by_username(value, case_insensitive=True):
                     msg = M(self, 'username_exists', state, username=value)
                     raise formencode.Invalid(msg, value, state)
 
             if (re.match(r'^[\w]{1}[\w\-\.]{0,254}$', value)
                     is None):
                 msg = M(self, 'invalid_username', state)
                 raise formencode.Invalid(msg, value, state)
     return _validator
 
 
 def ValidRegex(msg=None):
     class _validator(formencode.validators.Regex):
         messages = {'invalid': msg or _(u'The input is not valid')}
     return _validator
 
 
-def ValidRepoUser():
+def ValidRepoUser(allow_disabled=False):
     class _validator(formencode.validators.FancyValidator):
         messages = {
-            'invalid_username': _(u'Username %(username)s is not valid')
+            'invalid_username': _(u'Username %(username)s is not valid'),
+            'disabled_username': _(u'Username %(username)s is disabled')
         }
 
         def validate_python(self, value, state):
             try:
-                User.query().filter(User.active == true())\
-                    .filter(User.username == value).one()
+                user = User.query().filter(User.username == value).one()
             except Exception:
                 msg = M(self, 'invalid_username', state, username=value)
                 raise formencode.Invalid(
                     msg, value, state, error_dict={'username': msg}
                 )
+            if user and (not allow_disabled and not user.active):
+                msg = M(self, 'disabled_username', state, username=value)
+                raise formencode.Invalid(
+                    msg, value, state, error_dict={'username': msg}
+                )
 
     return _validator
 
 
 def ValidUserGroup(edit=False, old_data={}):
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'invalid_group': _(u'Invalid user group name'),
             'group_exist': _(u'User group "%(usergroup)s" already exists'),
             'invalid_usergroup_name':
                 _(u'user group name may only contain alphanumeric '
                   u'characters underscores, periods or dashes and must begin '
                   u'with alphanumeric character')
         }
 
         def validate_python(self, value, state):
             if value in ['default']:
                 msg = M(self, 'invalid_group', state)
                 raise formencode.Invalid(
                     msg, value, state, error_dict={'users_group_name': msg}
                 )
             # check if group is unique
             old_ugname = None
             if edit:
                 old_id = old_data.get('users_group_id')
                 old_ugname = UserGroup.get(old_id).users_group_name
 
             if old_ugname != value or not edit:
                 is_existing_group = UserGroup.get_by_group_name(
                     value, case_insensitive=True)
                 if is_existing_group:
                     msg = M(self, 'group_exist', state, usergroup=value)
                     raise formencode.Invalid(
                         msg, value, state, error_dict={'users_group_name': msg}
                     )
 
             if re.match(r'^[a-zA-Z0-9]{1}[a-zA-Z0-9\-\_\.]+$', value) is None:
                 msg = M(self, 'invalid_usergroup_name', state)
                 raise formencode.Invalid(
                     msg, value, state, error_dict={'users_group_name': msg}
                 )
 
     return _validator
 
 
 def ValidRepoGroup(edit=False, old_data={}, can_create_in_root=False):
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'group_parent_id': _(u'Cannot assign this group as parent'),
             'group_exists': _(u'Group "%(group_name)s" already exists'),
             'repo_exists': _(u'Repository with name "%(group_name)s" '
                              u'already exists'),
             'permission_denied': _(u"no permission to store repository group"
                                    u"in this location"),
             'permission_denied_root': _(
                 u"no permission to store repository group "
                 u"in root location")
         }
 
         def _to_python(self, value, state):
             group_name = repo_name_slug(value.get('group_name', ''))
             group_parent_id = safe_int(value.get('group_parent_id'))
             gr = RepoGroup.get(group_parent_id)
             if gr:
                 parent_group_path = gr.full_path
                 # value needs to be aware of group name in order to check
                 # db key This is an actual just the name to store in the
                 # database
                 group_name_full = (
                     parent_group_path + RepoGroup.url_sep() + group_name)
             else:
                 group_name_full = group_name
 
             value['group_name'] = group_name
             value['group_name_full'] = group_name_full
             value['group_parent_id'] = group_parent_id
             return value
 
         def validate_python(self, value, state):
 
             old_group_name = None
             group_name = value.get('group_name')
             group_name_full = value.get('group_name_full')
             group_parent_id = safe_int(value.get('group_parent_id'))
             if group_parent_id == -1:
                 group_parent_id = None
 
             group_obj = RepoGroup.get(old_data.get('group_id'))
             parent_group_changed = False
             if edit:
                 old_group_name = group_obj.group_name
                 old_group_parent_id = group_obj.group_parent_id
 
                 if group_parent_id != old_group_parent_id:
                     parent_group_changed = True
 
                 # TODO: mikhail: the following if statement is not reached
                 # since group_parent_id's OneOf validation fails before.
                 # Can be removed.
 
                 # check against setting a parent of self
                 parent_of_self = (
                     old_data['group_id'] == group_parent_id
                     if group_parent_id else False
                 )
                 if parent_of_self:
                     msg = M(self, 'group_parent_id', state)
                     raise formencode.Invalid(
                         msg, value, state, error_dict={'group_parent_id': msg}
                     )
 
             # group we're moving current group inside
             child_group = None
             if group_parent_id:
                 child_group = RepoGroup.query().filter(
                     RepoGroup.group_id == group_parent_id).scalar()
 
             # do a special check that we cannot move a group to one of
             # it's children
             if edit and child_group:
                 parents = [x.group_id for x in child_group.parents]
                 move_to_children = old_data['group_id'] in parents
                 if move_to_children:
                     msg = M(self, 'group_parent_id', state)
                     raise formencode.Invalid(
                         msg, value, state, error_dict={'group_parent_id': msg})
 
             # Check if we have permission to store in the parent.
             # Only check if the parent group changed.
             if parent_group_changed:
                 if child_group is None:
                     if not can_create_in_root:
                         msg = M(self, 'permission_denied_root', state)
                         raise formencode.Invalid(
                             msg, value, state,
                             error_dict={'group_parent_id': msg})
                 else:
                     valid = HasRepoGroupPermissionAny('group.admin')
                     forbidden = not valid(
                         child_group.group_name, 'can create group validator')
                     if forbidden:
                         msg = M(self, 'permission_denied', state)
                         raise formencode.Invalid(
                             msg, value, state,
                             error_dict={'group_parent_id': msg})
 
             # if we change the name or it's new group, check for existing names
             # or repositories with the same name
             if old_group_name != group_name_full or not edit:
                 # check group
                 gr = RepoGroup.get_by_group_name(group_name_full)
                 if gr:
                     msg = M(self, 'group_exists', state, group_name=group_name)
                     raise formencode.Invalid(
                         msg, value, state, error_dict={'group_name': msg})
 
                 # check for same repo
                 repo = Repository.get_by_repo_name(group_name_full)
                 if repo:
                     msg = M(self, 'repo_exists', state, group_name=group_name)
                     raise formencode.Invalid(
                         msg, value, state, error_dict={'group_name': msg})
 
     return _validator
 
 
 def ValidPassword():
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'invalid_password':
                 _(u'Invalid characters (non-ascii) in password')
         }
 
         def validate_python(self, value, state):
             try:
                 (value or '').decode('ascii')
             except UnicodeError:
                 msg = M(self, 'invalid_password', state)
                 raise formencode.Invalid(msg, value, state,)
     return _validator
 
 
 def ValidOldPassword(username):
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'invalid_password': _(u'Invalid old password')
         }
 
         def validate_python(self, value, state):
             from rhodecode.authentication.base import authenticate, HTTP_TYPE
             if not authenticate(username, value, '', HTTP_TYPE):
                 msg = M(self, 'invalid_password', state)
                 raise formencode.Invalid(
                     msg, value, state, error_dict={'current_password': msg}
                 )
     return _validator
 
 
 def ValidPasswordsMatch(
         passwd='new_password', passwd_confirmation='password_confirmation'):
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'password_mismatch': _(u'Passwords do not match'),
         }
 
         def validate_python(self, value, state):
 
             pass_val = value.get('password') or value.get(passwd)
             if pass_val != value[passwd_confirmation]:
                 msg = M(self, 'password_mismatch', state)
                 raise formencode.Invalid(
                     msg, value, state,
                     error_dict={passwd: msg, passwd_confirmation: msg}
                 )
     return _validator
 
 
 def ValidAuth():
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'invalid_password': _(u'invalid password'),
             'invalid_username': _(u'invalid user name'),
             'disabled_account': _(u'Your account is disabled')
         }
 
         def validate_python(self, value, state):
             from rhodecode.authentication.base import authenticate, HTTP_TYPE
 
             password = value['password']
             username = value['username']
 
             if not authenticate(username, password, '', HTTP_TYPE,
                                 skip_missing=True):
                 user = User.get_by_username(username)
                 if user and not user.active:
                     log.warning('user %s is disabled', username)
                     msg = M(self, 'disabled_account', state)
                     raise formencode.Invalid(
                         msg, value, state, error_dict={'username': msg}
                     )
                 else:
                     log.warning('user `%s` failed to authenticate', username)
                     msg = M(self, 'invalid_username', state)
                     msg2 = M(self, 'invalid_password', state)
                     raise formencode.Invalid(
                         msg, value, state,
                         error_dict={'username': msg, 'password': msg2}
                     )
     return _validator
 
 
 def ValidAuthToken():
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'invalid_token': _(u'Token mismatch')
         }
 
         def validate_python(self, value, state):
             if value != authentication_token():
                 msg = M(self, 'invalid_token', state)
                 raise formencode.Invalid(msg, value, state)
     return _validator
 
 
 def ValidRepoName(edit=False, old_data={}):
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'invalid_repo_name':
                 _(u'Repository name %(repo)s is disallowed'),
             # top level
             'repository_exists': _(u'Repository with name %(repo)s '
                                    u'already exists'),
             'group_exists': _(u'Repository group with name "%(repo)s" '
                               u'already exists'),
             # inside a group
             'repository_in_group_exists': _(u'Repository with name %(repo)s '
                                             u'exists in group "%(group)s"'),
             'group_in_group_exists': _(
                 u'Repository group with name "%(repo)s" '
                 u'exists in group "%(group)s"'),
         }
 
         def _to_python(self, value, state):
             repo_name = repo_name_slug(value.get('repo_name', ''))
             repo_group = value.get('repo_group')
             if repo_group:
                 gr = RepoGroup.get(repo_group)
                 group_path = gr.full_path
                 group_name = gr.group_name
                 # value needs to be aware of group name in order to check
                 # db key This is an actual just the name to store in the
                 # database
                 repo_name_full = group_path + RepoGroup.url_sep() + repo_name
             else:
                 group_name = group_path = ''
                 repo_name_full = repo_name
 
             value['repo_name'] = repo_name
             value['repo_name_full'] = repo_name_full
             value['group_path'] = group_path
             value['group_name'] = group_name
             return value
 
         def validate_python(self, value, state):
 
             repo_name = value.get('repo_name')
             repo_name_full = value.get('repo_name_full')
             group_path = value.get('group_path')
             group_name = value.get('group_name')
 
             if repo_name in [ADMIN_PREFIX, '']:
                 msg = M(self, 'invalid_repo_name', state, repo=repo_name)
                 raise formencode.Invalid(
                     msg, value, state, error_dict={'repo_name': msg})
 
             rename = old_data.get('repo_name') != repo_name_full
             create = not edit
             if rename or create:
 
                 if group_path:
                     if Repository.get_by_repo_name(repo_name_full):
                         msg = M(self, 'repository_in_group_exists', state,
                                 repo=repo_name, group=group_name)
                         raise formencode.Invalid(
                             msg, value, state, error_dict={'repo_name': msg})
                     if RepoGroup.get_by_group_name(repo_name_full):
                         msg = M(self, 'group_in_group_exists', state,
                                 repo=repo_name, group=group_name)
                         raise formencode.Invalid(
                             msg, value, state, error_dict={'repo_name': msg})
                 else:
                     if RepoGroup.get_by_group_name(repo_name_full):
                         msg = M(self, 'group_exists', state, repo=repo_name)
                         raise formencode.Invalid(
                             msg, value, state, error_dict={'repo_name': msg})
 
                     if Repository.get_by_repo_name(repo_name_full):
                         msg = M(
                             self, 'repository_exists', state, repo=repo_name)
                         raise formencode.Invalid(
                             msg, value, state, error_dict={'repo_name': msg})
             return value
     return _validator
 
 
 def ValidForkName(*args, **kwargs):
     return ValidRepoName(*args, **kwargs)
 
 
 def SlugifyName():
     class _validator(formencode.validators.FancyValidator):
 
         def _to_python(self, value, state):
             return repo_name_slug(value)
 
         def validate_python(self, value, state):
             pass
 
     return _validator
 
 
 def ValidCloneUri():
     class InvalidCloneUrl(Exception):
         allowed_prefixes = ()
 
     def url_handler(repo_type, url):
         config = make_db_config(clear_session=False)
         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 _validator(formencode.validators.FancyValidator):
         messages = {
             'clone_uri': _(u'invalid clone url for %(rtype)s repository'),
             'invalid_clone_uri': _(
                 u'Invalid clone url, provide a valid clone '
                 u'url starting with one of %(allowed_prefixes)s')
         }
 
         def validate_python(self, value, state):
             repo_type = value.get('repo_type')
             url = value.get('clone_uri')
 
             if url:
                 try:
                     url_handler(repo_type, url)
                 except InvalidCloneUrl as e:
                     log.warning(e)
                     msg = M(self, 'invalid_clone_uri', rtype=repo_type,
                             allowed_prefixes=','.join(e.allowed_prefixes))
                     raise formencode.Invalid(msg, value, state,
                                              error_dict={'clone_uri': msg})
                 except Exception:
                     log.exception('Url validation failed')
                     msg = M(self, 'clone_uri', rtype=repo_type)
                     raise formencode.Invalid(msg, value, state,
                                              error_dict={'clone_uri': msg})
     return _validator
 
 
 def ValidForkType(old_data={}):
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'invalid_fork_type': _(u'Fork have to be the same type as parent')
         }
 
         def validate_python(self, value, state):
             if old_data['repo_type'] != value:
                 msg = M(self, 'invalid_fork_type', state)
                 raise formencode.Invalid(
                     msg, value, state, error_dict={'repo_type': msg}
                 )
     return _validator
 
 
 def CanWriteGroup(old_data=None):
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'permission_denied': _(
                 u"You do not have the permission "
                 u"to create repositories in this group."),
             'permission_denied_root': _(
                 u"You do not have the permission to store repositories in "
                 u"the root location.")
         }
 
         def _to_python(self, value, state):
             # root location
             if value in [-1, "-1"]:
                 return None
             return value
 
         def validate_python(self, value, state):
             gr = RepoGroup.get(value)
             gr_name = gr.group_name if gr else None  # None means ROOT location
             # create repositories with write permission on group is set to true
             create_on_write = HasPermissionAny(
                 'hg.create.write_on_repogroup.true')()
             group_admin = HasRepoGroupPermissionAny('group.admin')(
                 gr_name, 'can write into group validator')
             group_write = HasRepoGroupPermissionAny('group.write')(
                 gr_name, 'can write into group validator')
             forbidden = not (group_admin or (group_write and create_on_write))
             can_create_repos = HasPermissionAny(
                 'hg.admin', 'hg.create.repository')
             gid = (old_data['repo_group'].get('group_id')
                    if (old_data and 'repo_group' in old_data) else None)
             value_changed = gid != safe_int(value)
             new = not old_data
             # do check if we changed the value, there's a case that someone got
             # revoked write permissions to a repository, he still created, we
             # don't need to check permission if he didn't change the value of
             # groups in form box
             if value_changed or new:
                 # parent group need to be existing
                 if gr and forbidden:
                     msg = M(self, 'permission_denied', state)
                     raise formencode.Invalid(
                         msg, value, state, error_dict={'repo_type': msg}
                     )
                 # check if we can write to root location !
                 elif gr is None and not can_create_repos():
                     msg = M(self, 'permission_denied_root', state)
                     raise formencode.Invalid(
                         msg, value, state, error_dict={'repo_type': msg}
                     )
 
     return _validator
 
 
 def ValidPerms(type_='repo'):
     if type_ == 'repo_group':
         EMPTY_PERM = 'group.none'
     elif type_ == 'repo':
         EMPTY_PERM = 'repository.none'
     elif type_ == 'user_group':
         EMPTY_PERM = 'usergroup.none'
 
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'perm_new_member_name':
                 _(u'This username or user group name is not valid')
         }
 
         def _to_python(self, value, state):
             perm_updates = OrderedSet()
             perm_additions = OrderedSet()
             perm_deletions = OrderedSet()
             # build a list of permission to update/delete and new permission
 
             # Read the perm_new_member/perm_del_member attributes and group
             # them by they IDs
             new_perms_group = defaultdict(dict)
             del_perms_group = defaultdict(dict)
             for k, v in value.copy().iteritems():
                 if k.startswith('perm_del_member'):
                     # delete from org storage so we don't process that later
                     del value[k]
                     # part is `id`, `type`
                     _type, part = k.split('perm_del_member_')
                     args = part.split('_')
                     if len(args) == 2:
                         _key, pos = args
                         del_perms_group[pos][_key] = v
                 if k.startswith('perm_new_member'):
                     # delete from org storage so we don't process that later
                     del value[k]
                     # part is `id`, `type`, `perm`
                     _type, part = k.split('perm_new_member_')
                     args = part.split('_')
                     if len(args) == 2:
                         _key, pos = args
                         new_perms_group[pos][_key] = v
 
             # store the deletes
             for k in sorted(del_perms_group.keys()):
                 perm_dict = del_perms_group[k]
                 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))
 
             # store additions in order of how they were added in web form
             for k in sorted(new_perms_group.keys()):
                 perm_dict = new_perms_group[k]
                 new_member = perm_dict.get('id')
                 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))
 
             # get updates of permissions
             # (read the existing radio button states)
             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)
             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:
                 try:
                     if member_type == 'user':
                         self.user_db = User.query()\
                             .filter(User.active == true())\
                             .filter(User.user_id == member_id).one()
                     if member_type == 'users_group':
                         self.user_db = UserGroup.query()\
                             .filter(UserGroup.users_group_active == true())\
                             .filter(UserGroup.users_group_id == member_id)\
                             .one()
 
                 except Exception:
                     log.exception('Updated permission failed: org_exc:')
                     msg = M(self, 'perm_new_member_type', state)
                     raise formencode.Invalid(
                         msg, value, state, error_dict={
                             'perm_new_member_name': msg}
                     )
             return value
     return _validator
 
 
 def ValidSettings():
     class _validator(formencode.validators.FancyValidator):
         def _to_python(self, value, state):
             # settings  form for users that are not admin
             # can't edit certain parameters, it's extra backup if they mangle
             # with forms
 
             forbidden_params = [
                 'user', 'repo_type', 'repo_enable_locking',
                 'repo_enable_downloads', 'repo_enable_statistics'
             ]
 
             for param in forbidden_params:
                 if param in value:
                     del value[param]
             return value
 
         def validate_python(self, value, state):
             pass
     return _validator
 
 
 def ValidPath():
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'invalid_path': _(u'This is not a valid path')
         }
 
         def validate_python(self, value, state):
             if not os.path.isdir(value):
                 msg = M(self, 'invalid_path', state)
                 raise formencode.Invalid(
                     msg, value, state, error_dict={'paths_root_path': msg}
                 )
     return _validator
 
 
 def UniqSystemEmail(old_data={}):
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'email_taken': _(u'This e-mail address is already taken')
         }
 
         def _to_python(self, value, state):
             return value.lower()
 
         def validate_python(self, value, state):
             if (old_data.get('email') or '').lower() != value:
                 user = User.get_by_email(value, case_insensitive=True)
                 if user:
                     msg = M(self, 'email_taken', state)
                     raise formencode.Invalid(
                         msg, value, state, error_dict={'email': msg}
                     )
     return _validator
 
 
 def ValidSystemEmail():
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'non_existing_email': _(u'e-mail "%(email)s" does not exist.')
         }
 
         def _to_python(self, value, state):
             return value.lower()
 
         def validate_python(self, value, state):
             user = User.get_by_email(value, case_insensitive=True)
             if user is None:
                 msg = M(self, 'non_existing_email', state, email=value)
                 raise formencode.Invalid(
                     msg, value, state, error_dict={'email': msg}
                 )
 
     return _validator
 
 
 def NotReviewedRevisions(repo_id):
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'rev_already_reviewed':
                 _(u'Revisions %(revs)s are already part of pull request '
                   u'or have set status'),
         }
 
         def validate_python(self, value, state):
             # check revisions if they are not reviewed, or a part of another
             # pull request
             statuses = ChangesetStatus.query()\
                 .filter(ChangesetStatus.revision.in_(value))\
                 .filter(ChangesetStatus.repo_id == repo_id)\
                 .all()
 
             errors = []
             for status in statuses:
                 if status.pull_request_id:
                     errors.append(['pull_req', status.revision[:12]])
                 elif status.status:
                     errors.append(['status', status.revision[:12]])
 
             if errors:
                 revs = ','.join([x[1] for x in errors])
                 msg = M(self, 'rev_already_reviewed', state, revs=revs)
                 raise formencode.Invalid(
                     msg, value, state, error_dict={'revisions': revs})
 
     return _validator
 
 
 def ValidIp():
     class _validator(CIDR):
         messages = {
             'badFormat': _(u'Please enter a valid IPv4 or IpV6 address'),
             'illegalBits': _(
                 u'The network size (bits) must be within the range '
                 u'of 0-32 (not %(bits)r)'),
         }
 
         # we ovveride the default to_python() call
         def to_python(self, value, state):
             v = super(_validator, self).to_python(value, state)
             v = v.strip()
             net = ipaddress.ip_network(address=v, strict=False)
             return str(net)
 
         def validate_python(self, value, state):
             try:
                 addr = value.strip()
                 # this raises an ValueError if address is not IpV4 or IpV6
                 ipaddress.ip_network(addr, strict=False)
             except ValueError:
                 raise formencode.Invalid(self.message('badFormat', state),
                                          value, state)
 
     return _validator
 
 
 def FieldKey():
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'badFormat': _(
                 u'Key name can only consist of letters, '
                 u'underscore, dash or numbers'),
         }
 
         def validate_python(self, value, state):
             if not re.match('[a-zA-Z0-9_-]+$', value):
                 raise formencode.Invalid(self.message('badFormat', state),
                                          value, state)
     return _validator
 
 
 def BasePath():
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'badPath': _(u'Filename cannot be inside a directory'),
         }
 
         def _to_python(self, value, state):
             return value
 
         def validate_python(self, value, state):
             if value != os.path.basename(value):
                 raise formencode.Invalid(self.message('badPath', state),
                                          value, state)
     return _validator
 
 
 def ValidAuthPlugins():
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'import_duplicate': _(
                 u'Plugins %(loaded)s and %(next_to_load)s '
                 u'both export the same name'),
             'missing_includeme': _(
                 u'The plugin "%(plugin_id)s" is missing an includeme '
                 u'function.'),
             'import_error': _(
                 u'Can not load plugin "%(plugin_id)s"'),
             'no_plugin': _(
                 u'No plugin available with ID "%(plugin_id)s"'),
         }
 
         def _to_python(self, value, state):
             # filter empty values
             return filter(lambda s: s not in [None, ''], value)
 
         def _validate_legacy_plugin_id(self, plugin_id, value, state):
             """
             Validates that the plugin import works. It also checks that the
             plugin has an includeme attribute.
             """
             try:
                 plugin = _import_legacy_plugin(plugin_id)
             except Exception as e:
                 log.exception(
                     'Exception during import of auth legacy plugin "{}"'
                     .format(plugin_id))
                 msg = M(self, 'import_error', plugin_id=plugin_id)
                 raise formencode.Invalid(msg, value, state)
 
             if not hasattr(plugin, 'includeme'):
                 msg = M(self, 'missing_includeme', plugin_id=plugin_id)
                 raise formencode.Invalid(msg, value, state)
 
             return plugin
 
         def _validate_plugin_id(self, plugin_id, value, state):
             """
             Plugins are already imported during app start up. Therefore this
             validation only retrieves the plugin from the plugin registry and
             if it returns something not None everything is OK.
             """
             plugin = loadplugin(plugin_id)
 
             if plugin is None:
                 msg = M(self, 'no_plugin', plugin_id=plugin_id)
                 raise formencode.Invalid(msg, value, state)
 
             return plugin
 
         def validate_python(self, value, state):
             unique_names = {}
             for plugin_id in value:
 
                 # Validate legacy or normal plugin.
                 if plugin_id.startswith(legacy_plugin_prefix):
                     plugin = self._validate_legacy_plugin_id(
                         plugin_id, value, state)
                 else:
                     plugin = self._validate_plugin_id(plugin_id, value, state)
 
                 # Only allow unique plugin names.
                 if plugin.name in unique_names:
                     msg = M(self, 'import_duplicate', state,
                             loaded=unique_names[plugin.name],
                             next_to_load=plugin)
                     raise formencode.Invalid(msg, value, state)
                 unique_names[plugin.name] = plugin
 
     return _validator
 
 
 def UniqGistId():
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'gistid_taken': _(u'This gistid is already in use')
         }
 
         def _to_python(self, value, state):
             return repo_name_slug(value.lower())
 
         def validate_python(self, value, state):
             existing = Gist.get_by_access_id(value)
             if existing:
                 msg = M(self, 'gistid_taken', state)
                 raise formencode.Invalid(
                     msg, value, state, error_dict={'gistid': msg}
                 )
 
     return _validator
 
 
 def ValidPattern():
 
     class _Validator(formencode.validators.FancyValidator):
 
         def _to_python(self, value, state):
             patterns = []
 
             prefix = 'new_pattern'
             for name, v in value.iteritems():
                 pattern_name = '_'.join((prefix, 'pattern'))
                 if name.startswith(pattern_name):
                     new_item_id = name[len(pattern_name)+1:]
 
                     def _field(name):
                         return '%s_%s_%s' % (prefix, name, new_item_id)
 
                     values = {
                         'issuetracker_pat': value.get(_field('pattern')),
                         'issuetracker_pat': value.get(_field('pattern')),
                         'issuetracker_url': value.get(_field('url')),
                         'issuetracker_pref': value.get(_field('prefix')),
                         'issuetracker_desc': value.get(_field('description'))
                     }
                     new_uid = md5(values['issuetracker_pat'])
 
                     has_required_fields = (
                         values['issuetracker_pat']
                         and values['issuetracker_url'])
 
                     if has_required_fields:
                         settings = [
                             ('_'.join((key, new_uid)), values[key], 'unicode')
                             for key in values]
                         patterns.append(settings)
 
             value['patterns'] = patterns
             delete_patterns = value.get('uid') or []
             if not isinstance(delete_patterns, (list, tuple)):
                 delete_patterns = [delete_patterns]
             value['delete_patterns'] = delete_patterns
             return value
     return _Validator

rhodecode/public/css/forms.less

@@ -1,293 +1,320 b''
 // forms.less
 // For use in RhodeCode applications;
 // see style guide documentation for guidelines.
 
 form.rcform {
 
     // reset for ie
     // using :not(#ie) prevents older browsers from applying these rules
     input[type="radio"],
     input[type="checkbox"] {
         padding: 0;
         border: none;
     }
     label { display: inline; border:none; padding:none; }
     .label { display: none; }
 
     max-width: 940px;
     line-height: normal;
     white-space: normal;
     font-size: @basefontsize;
     font-family: @text-light;
     color: @form-textcolor;
 
     fieldset,
     .buttons {
         clear: both;
         position: relative;
         display:block;
         width: 100%;
         min-height: 3em;
         margin-bottom: @form-vertical-margin;
         line-height: 1.2em;
 
         &:after { //clearfix
             content: "";
             clear: both;
             width: 100%;
             height: 1em;
         }
 
         .label:not(#ie) {
             display: inline;
             margin: 0 1em 0 .5em;
             line-height: 1em;
         }
     }
 
     legend {
         float: left;
         display: block;
         width: @legend-width;
         margin: 0;
         padding: 0 @padding 0 0;
     }
 
     .fields {
         float: left;
         display: block;
         width: 100%;
         max-width: 500px;
         margin: 0 0 @padding -@legend-width;
         padding: 0 0 0 @legend-width;
         
         .btn {
             display: inline-block;
             margin: 0 1em @padding 0;
         }
     }
     
     input,
     textarea {
         float: left;
         .box-sizing(content-box);
         padding: @input-padding;
         border: @border-thickness-inputs solid @grey4;
     }
 
     input {
         float: left;
         margin: 0 @input-padding 0 0;
         line-height: 1em;
     }
 
     input[type="text"],
     input[type="password"],
     textarea {
         float: left;
         min-width: 200px;
         margin: 0 1em @padding 0;
         color: @form-textcolor;
     }
 
     input[type="text"],
     input[type="password"] {
         height: 1em;
     }
 
     textarea {
         width: 100%;
         margin-top: -1em; //so it lines up with legend
         overflow: auto;
     }
 
     label:not(#ie) {
       cursor: pointer;
       display: inline-block;
       position: relative;
       background: white;
       border-radius: 4px;
       box-shadow: none;
 
       &:hover::after {
         opacity: 0.5;
       }
     }
  
     input[type="radio"]:not(#ie),
     input[type="checkbox"]:not(#ie) {
         // Hide the input, but have it still be clickable
         opacity: 0;
         float: left;
         height: 0;
         width: 0;
         margin: 0;
         padding: 0;
     }
     input[type='radio'] + label:not(#ie),
     input[type='checkbox'] + label:not(#ie) {
         margin: 0;
         clear: none;
     }
 
     input[type='radio'] + label:not(#ie) {
         .circle (@form-radio-width,white);
         float: left;
         display: inline-block;
         height: @form-radio-width;
         width: @form-radio-width;
         margin: 2px 6px 2px 0;
         border: 1px solid @grey4;
         background-color: white;
         box-shadow: none;
         text-indent: -9999px;
         transition: none;
 
         & + .label {
           float: left;
           margin-top: 7px
         }
     }
 
     input[type='radio']:checked + label:not(#ie) {
         margin: 0 4px 0 -2px;
         padding: 3px;
         border-style: double;
         border-color: white;
         border-width: thick;
         background-color: @rcblue;
         box-shadow: none;
     }
 
     input[type='checkbox'] + label:not(#ie) {
         float: left;
         width: @form-check-width;
         height: @form-check-width;
         margin: 0 5px 1em 0;
         border: 1px solid @grey3;
         .border-radius(@border-radius);
         background-color: white;
         box-shadow: none;
         text-indent: -9999px;
         transition: none;
 
         &:after {
             content: '';
             width: 9px;
             height: 5px;
             position: absolute;
             top: 4px;
             left: 4px;
             border: 3px solid @grey3;
             border-top: none;
             border-right: none;
             background: transparent;
             opacity: 0;
             transform: rotate(-45deg);
             filter: progid:DXImageTransform.Microsoft.Matrix(sizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476); /* IE6,IE7 */
 
             -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(SizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476)"; /* IE8 */        }
     
         & + .label {
           float: left;
           margin-top: 5px
         }
     }
     
     input[type=checkbox]:not(#ie) {
       visibility: hidden;
       &:checked + label:after {
         opacity: 1;
       }
     }
 
     // center checkbox and label on a drop-down
     .drop-menu + select + input[type='checkbox'] + label:not(#ie) {
       margin-top:10px;
 
       & + .label {
         margin-top: 15px;
       }
     }
 
     .formlist {
         position: relative;
         float: left;
         margin:  0;
         padding: 0;
 
         li {
             list-style-type: none;
 
             &:before { content:none; }
             &:after {
                 content: "";
                 float: left;
                 display: block;
                 height: @padding;
                 width: 100%;
             }
         }
     }
 
     .drop-menu {
         float: left;
         margin: 0 @input-padding 0 0;
     }
 
     .help-block,
     .error-message {
         display: block;
         clear: both;
         margin: @textmargin 0;
     }
 
     .error-message {
         margin-top: 5px;
     }
   
     input[type=submit] {
         &:extend(.btn-primary);
 
         &:hover {
             &:extend(.btn-primary:hover);
         }
     }
 
     input[type=reset] {
         &:extend(.btn-default);
 
         &:hover {
             &:extend(.btn-default:hover);
         }
     }
 
     select,
     option:checked {
         background-color: @rclightblue;
     }
 
 }
 
+.badged-field {
+    .user-badge {
+        line-height: 25px;
+        padding: 10px 5px;
+        border-radius: @border-radius;
+        border-top: 1px solid @rclightblue;
+        border-left: 1px solid @rclightblue;
+        border-bottom: 1px solid @rclightblue;
+        font-size: 14px;
+        font-style: normal;
+        color: @text-light;
+        display: inline-block;
+        vertical-align: top;
+        cursor: default;
+        margin-right: -2px;
+    }
+    .badge-input-container {
+        display: flex;
+        position: relative;
+    }
+    .user-disabled {
+        text-decoration: line-through;
+    }
+    .badge-input-wrap {
+        display: inline-block;
+    }
+}
 
 // for situations where we wish to display the form value but not the form input
 input.input-valuedisplay {
     border: none;
 }
 
 // for forms which only display information
 .infoform {
     .fields {
         .field {
             label,
             .label,
             input,
             .input {
                 margin-top: 0;
                 margin-bottom: 0;
                 padding-top: 0;
                 padding-bottom: 0;
             }
         }
     }
 }

rhodecode/public/css/main.less

@@ -1,2094 +1,2095 b''
 //Primary CSS
 
 //--- IMPORTS ------------------//
 
 @import 'helpers';
 @import 'mixins';
 @import 'rcicons';
 @import 'fonts';
 @import 'variables';
 @import 'bootstrap-variables';
 @import 'form-bootstrap';
 @import 'codemirror';
 @import 'legacy_code_styles';
 @import 'progress-bar';
 
 @import 'type';
 @import 'alerts';
 @import 'buttons';
 @import 'tags';
 @import 'code-block';
 @import 'examples';
 @import 'login';
 @import 'main-content';
 @import 'select2';
 @import 'comments';
 @import 'panels-bootstrap';
 @import 'panels';
 
 
 //--- BASE ------------------//
 .noscript-error {
     top: 0;
     left: 0;
     width: 100%;
     z-index: 101;
     text-align: center;
     font-family: @text-semibold;
     font-size: 120%;
     color: white;
     background-color: @alert2;
     padding: 5px 0 5px 0;
 }
 
 html {
     display: table;
     height: 100%;
     width: 100%;
 }
 
 body {
     display: table-cell;
     width: 100%;
 }
 
 //--- LAYOUT ------------------//
 
 .hidden{
 	display: none !important;
 }
 
 .box{
 	float: left;
 	width: 100%;
 }
 
 .browser-header {
     clear: both;
 }
 .main {
   clear: both;
   padding:0 0 @pagepadding;
   height: auto;
 
 	&:after { //clearfix
 		content:"";
 		clear:both;
 		width:100%;
 		display:block;
 	}
 }
 
 .action-link{
 	margin-left: @padding;
 	padding-left: @padding;
 	border-left: @border-thickness solid @border-default-color;
 }
 
 input + .action-link, .action-link.first{
 	border-left: none;
 }
 
 .action-link.last{
 	margin-right: @padding;
 	padding-right: @padding;
 }
 
 .action-link.active,
 .action-link.active a{
 	color: @grey4;
 }
 
 ul.simple-list{
 	list-style: none;
 	margin: 0;
 	padding: 0;
 }
 
 .main-content {
 	padding-bottom: @pagepadding;
 }
 
 .wrapper {
 	position: relative;
 	max-width: @wrapper-maxwidth;
 	margin: 0 auto;
 }
 
 #content {
     clear: both;
     padding: 0 @contentpadding;
 }
 
 .advanced-settings-fields{
 	input{
 		margin-left: @textmargin;
 		margin-right: @padding/2;
 	}
 }
 
 .cs_files_title {
     margin: @pagepadding 0 0;
 }
 
 input.inline[type="file"] {
 	display: inline;
 }
 
 .error_page {
     margin: 10% auto;
 
     h1 {
         color: @grey2;
     }
     
     .error-branding {
         font-family: @text-semibold;
         color: @grey4;
     }
 
     .error_message {
         font-family: @text-regular;
     }
 
     .sidebar {
         min-height: 275px;
         margin: 0;
         padding: 0 0 @sidebarpadding @sidebarpadding;
         border: none;
     }
 
     .main-content {
         position: relative;
         margin: 0 @sidebarpadding @sidebarpadding;
         padding: 0 0 0 @sidebarpadding;
         border-left: @border-thickness solid @grey5;
 
         @media (max-width:767px) {
             clear: both;
             width: 100%;
             margin: 0;
             border: none;
         }
     }
 
     .inner-column {
         float: left;
         width: 29.75%;
         min-height: 150px;
         margin: @sidebarpadding 2% 0 0;
         padding: 0 2% 0 0;
         border-right: @border-thickness solid @grey5;
 
         @media (max-width:767px) {
             clear: both;
             width: 100%;
             border: none;
         }
 
         ul {
             padding-left: 1.25em;
         }
 
         &:last-child {
             margin: @sidebarpadding 0 0;
             border: none;
         }
 
         h4 {
             margin: 0 0 @padding;
             font-family: @text-semibold;
         }
     }
 }
 .error-page-logo {
     width: 130px;
     height: 160px;
 }
 
 // HEADER
 .header {
 
     // TODO: johbo: Fix login pages, so that they work without a min-height
     // for the header and then remove the min-height. I chose a smaller value
     // intentionally here to avoid rendering issues in the main navigation.
     min-height: 49px;
 
 	position: relative;
 	vertical-align: bottom;
 	padding: 0 @header-padding;
 	background-color: @grey2;
 	color: @grey5;
 
 	.title {
 		overflow: visible;
 	}
 
 	&:before,
 	&:after {
 		content: "";
 		clear: both;
 		width: 100%;
 	}
 
 	// TODO: johbo: Avoids breaking "Repositories" chooser
 	.select2-container .select2-choice .select2-arrow {
 	    display: none;
 	}
 }
 
 #header-inner {
 	&.title {
 		margin: 0;
 	}
 	&:before,
 	&:after {
 		content: "";
 		clear: both;
 	}
 }
 
 // Gists
 #files_data {
     clear: both; //for firefox
 }
 #gistid {
     margin-right: @padding;
 }
 
 // Global Settings Editor
 .textarea.editor {
 	float: left;
 	position: relative;
 	max-width: @texteditor-width;
 
 	select {
 		position: absolute;
 		top:10px;
 		right:0;
 	}
 
 	.CodeMirror {
 		margin: 0;
 	}
 
 	.help-block {
 		margin: 0 0 @padding;
 		padding:.5em;
 		background-color: @grey6;
 	}
 }
 
 ul.auth_plugins {
 	margin: @padding 0 @padding @legend-width;
 	padding: 0;
 
 	li {
 		margin-bottom: @padding;
         line-height: 1em;
 		list-style-type: none;
 
 		.auth_buttons .btn {
 			margin-right: @padding;
 		}
 
         &:before { content: none; }
 	}
 }
 
-// Pull Requests
+
+// My Account PR list
+
+#show_closed {
+    margin: 0 1em 0 0;
+}
 
 .pullrequestlist {
-	max-width: @pullrequest-width;
-	margin-bottom: @space;
-
-    // Tweaks for "My Account" / "Pull requests"
-    .prwrapper {
-        clear: left;
+    .closed {
+        background-color: @grey6;
+    }
+    .td-status {
+        padding-left: .5em;
+    }
+    .truncate {
+        height: 2.75em;
+        white-space: pre-line;
+    }
+    table.rctable .user {
+        padding-left: 0;
+    }
+}
 
-        .pr {
-            margin: 0;
-            padding: 0;
-            border-bottom: none;
-        }
-
-        // TODO: johbo: Replace with something that makes up an inline form or
-        // similar.
-        .repolist_actions {
-            display: inline-block;
-        }
-    }
-
-}
+// Pull Requests
 
 .pullrequests_section_head {
 	display: block;
 	clear: both;
 	margin: @padding 0;
 	font-family: @text-bold;
 }
 
 .pr-origininfo, .pr-targetinfo {
     position: relative;
 
     .tag {
         display: inline-block;
         margin: 0 1em .5em 0;
     }
 
     .clone-url {
         display: inline-block;
         margin: 0 0 .5em 0;
         padding: 0;
         line-height: 1.2em;
     }
 }
 
 .pr-pullinfo {
     clear: both;
     margin: .5em 0;
 }
 
 #pr-title-input {
     width: 72%;
     font-size: 1em;
     font-family: @text-bold;
     margin: 0;
     padding: 0 0 0 @padding/4;
     line-height: 1.7em;
     color: @text-color;
     letter-spacing: .02em;
 }
 
 #pullrequest_title {
     width: 100%;
     box-sizing: border-box;
 }
 
 #pr_open_message {
     border: @border-thickness solid #fff;
     border-radius: @border-radius;
     padding: @padding-large-vertical @padding-large-vertical @padding-large-vertical 0;
     text-align: right;
     overflow: hidden;
 }
 
 .pr-submit-button {
     float: right;
     margin: 0 0 0 5px;
 }
 
 .pr-spacing-container {
     padding: 20px;
     clear: both
 }
 
 #pr-description-input {
     margin-bottom: 0;
 }
 
 .pr-description-label {
     vertical-align: top;
 }
 
 .perms_section_head {
     min-width: 625px;
 
     h2 {
         margin-bottom: 0;
     }
 
     .label-checkbox {
         float: left;
     }
 
     &.field {
         margin: @space 0 @padding;
     }
 
     &:first-child.field {
         margin-top: 0;
 
         .label {
             margin-top: 0;
             padding-top: 0;
         }
 
         .radios {
             padding-top: 0;
         }
     }
 
     .radios {
 	   float: right;
         position: relative;
         width: 405px;
     }
 }
 
 //--- MODULES ------------------//
 
 
 // Fixed Sidebar Column
 .sidebar-col-wrapper {
     padding-left: @sidebar-all-width;
 
     .sidebar {
         width: @sidebar-width;
         margin-left: -@sidebar-all-width;
     }
 }
 
 .sidebar-col-wrapper.scw-small {
     padding-left: @sidebar-small-all-width;
 
     .sidebar {
         width: @sidebar-small-width;
         margin-left: -@sidebar-small-all-width;
     }
 }
 
 
 // FOOTER
 #footer {
 	padding: 0;
 	text-align: center;
 	vertical-align: middle;
 	color: @grey2;
 	background-color: @grey6;
 
 	p {
 		margin: 0;
 		padding: 1em;
 		line-height: 1em;
 	}
 
 	.server-instance { //server instance
 		display: none;
 	}
 
 	.title {
 		float: none;
 		margin: 0 auto;
 	}
 }
 
 button.close {
 	padding: 0;
 	cursor: pointer;
 	background: transparent;
 	border: 0;
 	.box-shadow(none);
 	-webkit-appearance: none;
 }
 
 .close {
 	float: right;
 	font-size: 21px;
 	font-family: @text-bootstrap;
 	line-height: 1em;
 	font-weight: bold;
 	color: @grey2;
 
 	&:hover,
 	&:focus {
 		color: @grey1;
 		text-decoration: none;
 		cursor: pointer;
 	}
 }
 
 // GRID
 .sorting,
 .sorting_desc,
 .sorting_asc {
 	cursor: pointer;
 }
 .sorting_desc:after {
 	content: "\00A0\25B2";
 	font-size: .75em;
 }
 .sorting_asc:after {
 	content: "\00A0\25BC";
 	font-size: .68em;
 }
 
 
 .user_auth_tokens {
 
     &.truncate {
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
     }
 
 	.fields .field .input {
 		margin: 0;
 	}
 
 	input#description {
 		width: 100px;
 		margin: 0;
 	}
 
 	.drop-menu {
 	    // TODO: johbo: Remove this, should work out of the box when
 	    // having multiple inputs inline
 		margin: 0 0 0 5px;
 	}
 }
 #user_list_table {
   .closed {
     background-color: @grey6;
   }
 }
 
 
 input {
 	&.disabled {
 		opacity: .5;
 	}
 }
 
 // remove extra padding in firefox
 input::-moz-focus-inner { border:0; padding:0 }
 
 .adjacent input {
 	margin-bottom: @padding;
 }
 
 .permissions_boxes {
 	display: block;
 }
 
 //TODO: lisa: this should be in tables
 .show_more_col {
     width: 20px;
 }
 
 //FORMS
 
 .medium-inline,
 input#description.medium-inline {
 	display: inline;
 	width: @medium-inline-input-width;
 	min-width: 100px;
 }
 
 select {
 	//reset
 	-webkit-appearance: none;
 	-moz-appearance: none;
 
 	display: inline-block;
 	height: 28px;
 	width: auto;
 	margin: 0 @padding @padding 0;
 	padding: 0 18px 0 8px;
 	line-height:1em;
 	font-size: @basefontsize;
 	border: @border-thickness solid @rcblue;
 	background:white url("../images/dt-arrow-dn.png") no-repeat 100% 50%;
 	color: @rcblue;
 
 	&:after {
 		content: "\00A0\25BE";
 	}
 
 	&:focus {
 		outline: none;
 	}
 }
 
 option {
 	&:focus {
 		outline: none;
 	}
 }
 
 input,
 textarea {
 	padding: @input-padding;
 	border: @input-border-thickness solid @border-highlight-color;
 	.border-radius (@border-radius);
 	font-family: @text-light;
 	font-size: @basefontsize;
 
 	&.input-sm {
 		padding: 5px;
 	}
 
 	&#description {
 		min-width: @input-description-minwidth;
 		min-height: 1em;
 		padding: 10px;
 	}
 }
 
 .field-sm {
     input,
     textarea {
         padding: 5px;
     }
 }
 
 textarea {
 	display: block;
 	clear: both;
 	width: 100%;
 	min-height: 100px;
 	margin-bottom: @padding;
     .box-sizing(border-box);
     overflow: auto;
 }
 
 label {
 	font-family: @text-light;
 }
 
 // GRAVATARS
 // centers gravatar on username to the right
 
 .gravatar {
     display: inline;
     min-width: 16px;
     min-height: 16px;
     margin: -5px 0;
     padding: 0;
     line-height: 1em;
     border: 1px solid @grey4;
 
     &.gravatar-large {
         margin: -0.5em .25em -0.5em 0;
     }
 
     & + .user {
         display: inline;
         margin: 0;
         padding: 0 0 0 .17em;
         line-height: 1em;
     }
 }
 
 .rc-user { // gravatar + user wrapper
     float: left;
     position: relative;
     min-width: 100px;
     max-width: 200px;
     min-height: (@gravatar-size + @border-thickness * 2); // account for border
     display: block;
     padding: 0 0 0 (@gravatar-size  + @basefontsize/2 + @border-thickness * 2);
 
 
     .gravatar {
         display: block;
         position: absolute;
         top: 0;
         left: 0;
         min-width:  @gravatar-size;
         min-height: @gravatar-size;
         margin: 0;
     }
 
     .user {
         display: block;
         max-width: 175px;
         padding-top: 2px;
         overflow: hidden;
         text-overflow: ellipsis;
     }
 }
 
 .gist-gravatar,
 .journal_container {
     .gravatar-large {
         margin: 0 .5em -10px 0;
     }
 }
 
 
 // ADMIN SETTINGS
 
 // Tag Patterns
 .tag_patterns {
 	.tag_input {
 		margin-bottom: @padding;
 	}
 }
 
 .locked_input {
     position: relative;
 
     input {
         display: inline;
         margin-top: 3px;
     }
 
     br {
         display: none;
     }
 
     .error-message {
         float: left;
         width: 100%;
     }
 
     .lock_input_button {
         display: inline;
     }
 
     .help-block {
         clear: both;
     }
 }
 
 // Notifications
 
 .notifications_buttons {
 	margin: 0 0 @space 0;
 	padding: 0;
 
 	.btn {
 		display: inline-block;
 	}
 }
 
 .notification-list {
 
 	div {
 		display: inline-block;
 		vertical-align: middle;
 	}
 
 	.container {
 		display: block;
 		margin: 0 0 @padding 0;
 	}
 
 	.delete-notifications {
 		margin-left: @padding;
 		text-align: right;
         cursor: pointer;
 	}
 
 	.read-notifications {
 		margin-left: @padding/2;
 		text-align: right;
 		width: 35px;
         cursor: pointer;
 	}
 
 	.icon-minus-sign {
 		color: @alert2;
 	}
 
 	.icon-ok-sign {
 		color: @alert1;
 	}
 }
 
 .user_settings {
 	float: left;
 	clear: both;
 	display: block;
 	width: 100%;
 
 	.gravatar_box {
 		margin-bottom: @padding;
 
 		&:after {
 			content: " ";
 			clear: both;
 			width: 100%;
 		}
 	}
 
 	.fields .field {
 		clear: both;
 	}
 }
 
 .advanced_settings {
 	margin-bottom: @space;
 
 	.help-block {
 		margin-left: 0;
 	}
 
 	button + .help-block {
 		margin-top: @padding;
 	}
 }
 
 // admin settings radio buttons and labels
 .label-2 {
 	float: left;
 	width: @label2-width;
 
 	label {
 		color: @grey1;
 	}
 }
 .checkboxes {
 	float: left;
 	width: @checkboxes-width;
 	margin-bottom: @padding;
 
 	.checkbox {
 		width: 100%;
 
 		label {
 			margin: 0;
 			padding: 0;
 		}
 	}
 
 	.checkbox + .checkbox {
 		display: inline-block;
 	}
 
 	label {
 		margin-right: 1em;
 	}
 }
 
 // CHANGELOG
 .container_header {
     float: left;
 	display: block;
 	width: 100%;
 	margin: @padding 0 @padding;
 
     #filter_changelog {
         float: left;
         margin-right: @padding;
     }
 
     .breadcrumbs_light {
         display: inline-block;
     }
 }
 
 .info_box {
 	float: right;
 }
 
 
 #graph_nodes {
     padding-top: 43px;
 }
 
 #graph_content{
 
     // adjust for table headers so that graph renders properly
     //           #graph_nodes padding - table cell padding
     padding-top: (@space - (@basefontsize * 2.4));
 
     &.graph_full_width {
         width: 100%;
         max-width: 100%;
     }
 }
 
 #graph {
     .flag_status {
         margin: 0;
     }
 
     .pagination-left {
         float: left;
         clear: both;
     }
 
     .log-container {
         max-width: 345px;
 
         .message{
             max-width: 340px;
         }
     }
 
     .graph-col-wrapper {
         padding-left: 110px;
 
         #graph_nodes {
             width: 100px;
             margin-left: -110px;
             float: left;
             clear: left;
         }
     }
 }
 
 #filter_changelog {
     float: left;
 }
 
 
 //--- THEME ------------------//
 
 #logo {
 	float: left;
 	margin: 9px 0 0 0;
 
     .header {
     	background-color: transparent;
     }
 
     a {
     	display: inline-block;
     }
 
     img {
     	height:30px;
     }
 }
 
 .logo-wrapper {
 	float:left;
 }
 
 .branding{
 	float: left;
 	padding: 9px 2px;
 	line-height: 1em;
 	font-size: @navigation-fontsize;
 }
 
 img {
 	border: none;
 	outline: none;
 }
  user-profile-header
 label {
 
     input[type="checkbox"] {
         margin-right: 1em;
     }
     input[type="radio"] {
         margin-right: 1em;
     }
 }
 
 .flag_status {
     margin: 2px 8px 6px 2px;
     &.under_review {
         .circle(5px, @alert3);
     }
     &.approved {
         .circle(5px, @alert1);
     }
     &.rejected,
     &.forced_closed{
         .circle(5px, @alert2);
     }
     &.not_reviewed {
         .circle(5px, @grey5);
     }
 }
 
 .flag_status_comment_box {
 	margin: 5px 6px 0px 2px;
 }
 .test_pattern_preview {
 	margin: @space 0;
 
 	p {
         margin-bottom: 0;
 		border-bottom: @border-thickness solid @border-default-color;
 		color: @grey3;
 	}
 
 	.btn {
 		margin-bottom: @padding;
 	}
 }
 #test_pattern_result {
     display: none;
     &:extend(pre);
     padding: .9em;
     color: @grey3;
     background-color: @grey7;
     border-right: @border-thickness solid @border-default-color; 
     border-bottom: @border-thickness solid @border-default-color; 
     border-left: @border-thickness solid @border-default-color; 
 }
 
 #repo_vcs_settings {
     #inherit_overlay_vcs_default {
         display: none;
     }
     #inherit_overlay_vcs_custom {
         display: custom;
     }
     &.inherited {
         #inherit_overlay_vcs_default {
             display: block;
         }
         #inherit_overlay_vcs_custom {
             display: none;
         }
     }
 }
 
 .issue-tracker-link {
 	color: @rcblue;
 }
 
 // Issue Tracker Table Show/Hide
 #repo_issue_tracker {
     #inherit_overlay {
         display: none;
     }
     #custom_overlay {
         display: custom;
     }
     &.inherited {
         #inherit_overlay {
             display: block;
         }
         #custom_overlay {
             display: none;
         }
     }
 }
 table.issuetracker {
     &.readonly {
         tr, td {
             color: @grey3;
         }
     }
     .edit {
         display: none;
     }
     .editopen {
         .edit {
             display: inline;
         }
         .entry {
             display: none;
         }
     }
     tr td.td-action {
         min-width: 117px;
     }
     td input {
         max-width: none;
         min-width: 30px;
         width: 80%;
     }
     .issuetracker_pref input {
         width: 40%;
     }
     input.edit_issuetracker_update {
         margin-right: 0;
         width: auto;
     }
 }
 
+
 //Permissions Settings
 #add_perm {
     margin: 0 0 @padding;
 	cursor: pointer;
 }
 
 .perm_ac {
     input {
         width: 95%;
     }
 }
 
 .autocomplete-suggestions {
     width: auto !important; // overrides autocomplete.js
     margin: 0;
     border: @border-thickness solid @rcblue;
     border-radius: @border-radius;
     color: @rcblue;
     background-color: white;
 }
 .autocomplete-selected {
     background: #F0F0F0;
 }
 .ac-container-wrap {
 	margin: 0;
 	padding: 8px;
 	border-bottom: @border-thickness solid @rclightblue;
 	list-style-type: none;
 	cursor: pointer;
 
 		&:hover {
 			background-color: @rclightblue;
 	}
 
 	img {
 		margin-right: 1em;
 	}
 
 	strong {
 		font-weight: normal;
 	}
 }
 
 // Settings Dropdown
 .user-menu .container {
     padding: 0 4px;
     margin: 0;
 }
 
 .user-menu .gravatar {
     cursor: pointer;
 }
 
 .codeblock {
 	margin-bottom: @padding;
     clear: both;
 
     .stats{
         overflow: hidden;
     }
 
     .message{
         textarea{
             margin: 0;
         }
     }
 
     .code-header {
     	.stats {
             line-height: 2em;
 
     		.revision_id {
     			margin-left: 0;
     		}
 			.buttons {
                 padding-right: 0;
 			}
     	}
 
         .item{
             margin-right: 0.5em;
         }
     }
 
     #editor_container{
         position: relative;
         margin: @padding;
     }
 }
 
 #file_history_container {
     display: none;
 }
 
 .file-history-inner {
     margin-bottom: 10px;
 }
 
 // Pull Requests
 .summary-details {
     width: 72%;
 }
 .pr-summary {
     border-bottom: @border-thickness solid @grey5;
     margin-bottom: @space;
 }
 .reviewers-title {
     width: 25%;
     min-width: 200px;
 }
 .reviewers {
     width: 25%;
     min-width: 200px;
 }
 .reviewers ul li {
     position: relative;
     width: 100%;
     margin-bottom: 8px;
 }
 .reviewers_member {
     width: 100%;
     overflow: auto;
 }
 .reviewer_status {
     display: inline-block;
     vertical-align: top;
     width: 7%;
     min-width: 20px;
     height: 1.2em;
     margin-top: 3px;
     line-height: 1em;
 }
 
 .reviewer_name {
     display: inline-block;
     max-width: 83%;
     padding-right: 20px;
     vertical-align: middle;
     line-height: 1;
 
     .rc-user {
         min-width: 0;
         margin: -2px 1em 0 0;
     }
 
     .reviewer {
         float: left;
     }
 
     &.to-delete {
         .user,
         .reviewer {
             text-decoration: line-through;
         }
     }
 }
 
 .reviewer_member_remove {
     position: absolute;
     right: 0;
     top: 0;
     width: 16px;
     margin-bottom: 10px;
     padding: 0;
     color: black;
 }
 .reviewer_member_status {
     margin-top: 5px;
 }
 .pr-summary #summary{
     width: 100%;
 }
 .pr-summary .action_button:hover {
     border: 0;
     cursor: pointer;
 }
 .pr-details-title {
     padding-bottom: 8px;
     border-bottom: @border-thickness solid @grey5;
     .action_button {
         color: @rcblue;
     }
 }
 .pr-details-content {
     margin-top: @textmargin;
     margin-bottom: @textmargin;
 }
 .pr-description {
     white-space:pre-wrap;
 }
 .group_members {
     margin-top: 0;
     padding: 0;
     list-style: outside none none;
 }
 .reviewer_ac .ac-input {
     width: 92%;
     margin-bottom: 1em;
 }
 #update_commits {
     float: right;
 }
 .compare_view_commits tr{
     height: 20px;
 }
 .compare_view_commits td {
     vertical-align: top;
     padding-top: 10px;
 }
 .compare_view_commits .author {
     margin-left: 5px;
 }
 
 .compare_view_files {
     width: 100%;
 
     td {
         vertical-align: middle;
     }
 }
 
 .compare_view_filepath {
     color: @grey1;
 }
 
 .show_more {
     display: inline-block;
     position: relative;
     vertical-align: middle;
     width: 4px;
     height: @basefontsize;
 
     &:after {
         content: "\00A0\25BE";
         display: inline-block;
         width:10px;
         line-height: 5px;
         font-size: 12px;
         cursor: pointer;
     }
 }
 
 .journal_more .show_more {
     display: inline;
 
     &:after {
         content: none;
     }
 }
 
 .open .show_more:after,
 .select2-dropdown-open .show_more:after {
     .rotate(180deg);
     margin-left: 4px;
 }
 
 
 .compare_view_commits .collapse_commit:after {
     cursor: pointer;
     content: "\00A0\25B4";
     margin-left: -3px;
     font-size: 17px;
     color: @grey4;
 }
 
 .diff_links {
     margin-left: 8px;
 }
 
 p.ancestor {
     margin: @padding 0;
 }
 
 .cs_icon_td input[type="checkbox"] {
     display: none;
 }
 
 .cs_icon_td .expand_file_icon:after {
     cursor: pointer;
     content: "\00A0\25B6";
     font-size: 12px;
     color: @grey4;
 }
 
 .cs_icon_td .collapse_file_icon:after {
     cursor: pointer;
     content: "\00A0\25BC";
     font-size: 12px;
     color: @grey4;
 }
 
 /*new binary
 NEW_FILENODE = 1
 DEL_FILENODE = 2
 MOD_FILENODE = 3
 RENAMED_FILENODE = 4
 COPIED_FILENODE = 5
 CHMOD_FILENODE = 6
 BIN_FILENODE = 7
 */
 .cs_files_expand {
     font-size: @basefontsize + 5px;
     line-height: 1.8em;
     float: right;
 }
 
 .cs_files_expand span{
     color: @rcblue;
     cursor: pointer;
 }
 .cs_files {
     clear: both;
 	padding-bottom: @padding;
 
     .cur_cs {
         margin: 10px 2px;
         font-weight: bold;
     }
 
     .node {
         float: left;
     }
 
     .changes {
         float: right;
         color: white;
         font-size: @basefontsize - 4px;
         margin-top: 4px;
         opacity: 0.6;
         filter: Alpha(opacity=60); /* IE8 and earlier */
 
         .added {
             background-color: @alert1;
             float: left;
             text-align: center;
         }
 
         .deleted {
             background-color: @alert2;
             float: left;
             text-align: center;
         }
 
         .bin {
             background-color: @alert1;
             text-align: center;
         }
 
         /*new binary*/
         .bin.bin1 {
             background-color: @alert1;
             text-align: center;
         }
 
         /*deleted binary*/
         .bin.bin2 {
             background-color: @alert2;
             text-align: center;
         }
 
         /*mod binary*/
         .bin.bin3 {
             background-color: @grey2;
             text-align: center;
         }
 
         /*rename file*/
         .bin.bin4 {
             background-color: @alert4;
             text-align: center;
         }
 
         /*copied file*/
         .bin.bin5 {
             background-color: @alert4;
             text-align: center;
         }
 
         /*chmod file*/
         .bin.bin6 {
             background-color: @grey2;
             text-align: center;
         }
     }
 }
 
 .cs_files .cs_added, .cs_files .cs_A,
 .cs_files .cs_added, .cs_files .cs_M,
 .cs_files .cs_added, .cs_files .cs_D {
     height: 16px;
     padding-right: 10px;
     margin-top: 7px;
     text-align: left;
 }
 
 .cs_icon_td {
   min-width: 16px;
   width: 16px;
 }
 
 .pull-request-merge {
     padding: 10px 0;
     margin-top: 10px;
     margin-bottom: 20px;
 }
 
 .pull-request-merge .pull-request-wrap {
     height: 25px;
     padding: 5px 0;
 }
 
 .pull-request-merge span {
     margin-right: 10px;
 }
 #close_pull_request {
     margin-right: 0px;
 }
 
 .empty_data {
     color: @grey4;
 }
 
 #changeset_compare_view_content {
     margin-bottom: @space;
     clear: both;
     width: 100%;
     box-sizing: border-box;
     .border-radius(@border-radius);
 
     .help-block {
         margin: @padding 0;
         color: @text-color;
     }
 
     .empty_data {
         margin: @padding 0;
     }
 
     .alert {
         margin-bottom: @space;
     }
 }
 
 .table_disp {
 	.status {
 		width: auto;
 
 		.flag_status {
 			float: left;
 		}
 	}
 }
 
 .status_box_menu {
     margin: 0;
 }
 
 .notification-table{
 	margin-bottom: @space;
 	display: table;
 	width: 100%;
 
 	.container{
 		display: table-row;
 
 		.notification-header{
 			border-bottom: @border-thickness solid @border-default-color;
 		}
 
 		.notification-subject{
 			display: table-cell;
 		}
 	}
 }
 
 // Notifications
 .notification-header{
 	display: table;
 	width: 100%;
 	padding: floor(@basefontsize/2) 0;
     line-height: 1em;
 
 	.desc, .delete-notifications, .read-notifications{
 		display: table-cell;
 		text-align: left;
 	}
 
 	.desc{
 		width: 1163px;
 	}
 
 	.delete-notifications, .read-notifications{
 		width: 35px;
 		min-width: 35px; //fixes when only one button is displayed
 	}
 }
 
 .notification-body {
     .markdown-block,
 	.rst-block {
 		padding: @padding 0;
 	}
 
 	.notification-subject {
 		padding: @textmargin 0;
 		border-bottom: @border-thickness solid @border-default-color;
 	}
 }
 
 
 .notifications_buttons{
 	float: right;
 }
 
 // Repositories
 
 #summary.fields{
 	display: table;
 
 	.field{
 		display: table-row;
 
 		.label-summary{
 			display: table-cell;
 			min-width: @label-summary-minwidth;
 			padding-top: @padding/2;
 			padding-bottom: @padding/2;
 			padding-right: @padding/2;
 		}
 
 		.input{
 			display: table-cell;
 			padding: @padding/2;
 
 			input{
 				min-width: 29em;
 				padding:  @padding/4;
 			}
 		}
 		.statistics, .downloads{
 			.disabled{
 				color: @grey4;
 			}
 		}
 	}
 }
 
 #summary{
 	width: 70%;
 }
 
 
 // Journal
 .journal.title {
 	h5 {
 		float: left;
 		margin: 0;
 		width: 70%;
 	}
 
 	ul {
 		float: right;
 		display: inline-block;
 		margin: 0;
 		width: 30%;
 		text-align: right;
 
 		li {
 			display: inline;
 			font-size: @journal-fontsize;
             line-height: 1em;
 
             &:before { content: none; }
 		}
 	}
 }
 
 .filterexample {
     position: absolute;
     top: 95px;
     left: @contentpadding;
     color: @rcblue;
     font-size: 11px;
     font-family: @text-regular;
     cursor: help;
 
     &:hover {
         color: @rcdarkblue;
     }
 
     @media (max-width:768px) {
         position: relative;
         top: auto;
         left: auto;
         display: block;
     }
 }
 
 
 #journal{
 	margin-bottom: @space;
 
 	.journal_day{
 		margin-bottom: @textmargin/2;
 		padding-bottom: @textmargin/2;
 		font-size: @journal-fontsize;
 		border-bottom: @border-thickness solid @border-default-color;
 	}
 
 	.journal_container{
 		margin-bottom: @space;
 
 		.journal_user{
 			display: inline-block;
 		}
 		.journal_action_container{
 			display: block;
 			margin-top: @textmargin;
 
 			div{
 				display: inline;
 			}
 
 			div.journal_action_params{
 				display: block;
 			}
 
 			div.journal_repo:after{
 				content: "\A";
 				white-space: pre;
 			}
 
 			div.date{
 				display: block;
 				margin-bottom: @textmargin;
 			}
 		}
 	}
 }
 
 // Files
 .edit-file-title {
     border-bottom: @border-thickness solid @border-default-color;
 
     .breadcrumbs {
         margin-bottom: 0;
     }
 }
 
 .edit-file-fieldset {
     margin-top: @sidebarpadding;
 
     .fieldset {
         .left-label {
             width: 13%;
         }
         .right-content {
             width: 87%;
             max-width: 100%;
         }
         .filename-label {
             margin-top: 13px;
         }
         .commit-message-label {
             margin-top: 4px;
         }
         .file-upload-input {
             input {
                 display: none;
             }
         }
         p {
             margin-top: 5px;
         }
 
     }
     .custom-path-link {
         margin-left: 5px;
     }
     #commit {
         resize: vertical;
     }
 }
 
 .delete-file-preview {
     max-height: 250px;
 }
 
 .new-file,
 #filter_activate,
 #filter_deactivate {
     float: left;
     margin: 0 0 0 15px;
 }
 
 h3.files_location{
     line-height: 2.4em;
 }
 
 .browser-nav {
 	display: table;
 	margin-bottom: @space;
 
 
 	.info_box {
 		display: inline-table;
 		height: 2.5em;
 
         .browser-cur-rev, .info_box_elem {
 			display: table-cell;
 			vertical-align: middle;
 		}
 
 		.info_box_elem {
 			border-top: @border-thickness solid @rcblue;
 			border-bottom: @border-thickness solid @rcblue;
 
             #at_rev, a {
                 padding: 0.6em 0.9em;
                 margin: 0;
                 .box-shadow(none);
                 border: 0;
                 height: 12px;
             }
 
             input#at_rev {
                 max-width: 50px;
                 text-align: right;
             }
 
 			&.previous {
 				border: @border-thickness solid @rcblue;
                 .disabled {
                   color: @grey4;
                   cursor: not-allowed;
                 }
 			}
 
 			&.next {
 				border: @border-thickness solid @rcblue;
                 .disabled {
                   color: @grey4;
                   cursor: not-allowed;
                 }
 			}
 		}
 
 		.browser-cur-rev {
 
 			span{
                 margin: 0;
 				color: @rcblue;
                 height: 12px;
                 display: inline-block;
                 padding:  0.7em 1em ;
                 border: @border-thickness solid @rcblue;
                 margin-right: @padding;
 			}
 		}
 	}
 
 	.search_activate {
 		display: table-cell;
 		vertical-align: middle;
 
 		input, label{
 			margin: 0;
 			padding: 0;
 		}
 
 		input{
 			margin-left: @textmargin;
 		}
 
 	}
 }
 
 .file_author{
 	margin-bottom: @padding;
 
 	div{
 		display: inline-block;
 		margin-right: 0.5em;
 	}
 }
 
 .browser-cur-rev{
 	margin-bottom: @textmargin;
 }
 
 #node_filter_box_loading{
 	.info_text;
 }
 
 .browser-search {
 	margin: -25px 0px 5px 0px;
 }
 
 .node-filter {
   font-size: @repo-title-fontsize;
   padding: 4px 0px 0px 0px;
 
   .node-filter-path {
       float: left;
       color: @grey4;
     }
     .node-filter-input {
         float: left;
         margin: -2px 0px 0px 2px;
         input {
             padding: 2px;
             border: none;
             font-size: @repo-title-fontsize;
         }
     }
 }
 
 
 .browser-result{
 	td a{
 		margin-left: 0.5em;
 		display: inline-block;
 
 		em{
 			font-family: @text-bold;
 		}
 	}
 }
 
 .browser-highlight{
 	background-color: @grey5-alpha;
 }
 
 
 // Search
 
 .search-form{
     #q {
         width: @search-form-width;
     }
 	.fields{
 		margin: 0 0 @space;
 	}
 
 	label{
 		display: inline-block;
 		margin-right: @textmargin;
 		padding-top: 0.25em;
 	}
 
 
 	.results{
 		clear: both;
 		margin: 0 0 @padding;
 	}
 }
 
 div.search-feedback-items {
 	display: inline-block;
 	padding:0px 0px 0px 96px;
 }
 
 div.search-code-body { 
     background-color: #ffffff; padding: 5px 0 5px 10px;
     pre {
         .match { background-color: #faffa6;}
         .break { display: block; width: 100%; background-color: #DDE7EF; color: #747474; }
     }
 }
 
 .expand_commit.search {
     .show_more.open {
         height: auto;
         max-height: none;
     }
 }
 
 .search-results {
 
     h2 {
         margin-bottom: 0;
     }
     .codeblock {
         border: none;
         background: transparent;
     }
 
     .codeblock-header {
         border: none;
         background: transparent;
     }
 
     .code-body {
         border: @border-thickness solid @border-default-color;
         .border-radius(@border-radius);
     }
 
     .td-commit {
         &:extend(pre);
         border-bottom: @border-thickness solid @border-default-color;
     }
 
     .message {
         height: auto;
         max-width: 350px;
         white-space: normal;
         text-overflow: initial;
         overflow: visible;
 
         .match { background-color: #faffa6;}
         .break { background-color: #DDE7EF; width: 100%; color: #747474; display: block; }
     }
 
 }
 
 table.rctable td.td-search-results div {
     max-width: 100%;
 }
 
 #tip-box, .tip-box{
 	padding: @menupadding/2;
 	display: block;
 	border: @border-thickness solid @border-highlight-color;
 	.border-radius(@border-radius);
 	background-color: white;
     z-index: 99;
     white-space: pre-wrap;
 }
 
 #linktt {
     width: 79px;
 }
 
 #help_kb .modal-content{
 	max-width: 750px;
 	margin: 10% auto;
 
 	table{
 		td,th{
 			border-bottom: none;
 			line-height: 2.5em;
 		}
 		th{
 			padding-bottom: @textmargin/2;
 		}
 		td.keys{
 			text-align: center;
 		}
 	}
 
 	.block-left{
 		width: 45%;
 		margin-right: 5%;
 	}
 	.modal-footer{
 		clear: both;
 	}
 	.key.tag{
 		padding: 0.5em;
 		background-color: @rcblue;
 		color: white;
 		border-color: @rcblue;
 		.box-shadow(none);
 	}
 }
 
 
 
 //--- IMPORTS FOR REFACTORED STYLES ------------------//
 
 @import 'statistics-graph';
 @import 'tables';
 @import 'forms';
 @import 'diff';
 @import 'summary';
 @import 'navigation';
 
 //--- SHOW/HIDE SECTIONS --//
 
 .btn-collapse {
     float: right;
     text-align: right;
     font-family: @text-light;
     font-size: @basefontsize;
     cursor: pointer;
     border: none;
     color: @rcblue;
 }
 
 table.rctable,
 table.dataTable {
     .btn-collapse {
         float: right;
         text-align: right;
     }
 }
 
 
 // TODO: johbo: Fix for IE10, this avoids that we see a border
 // and padding around checkboxes and radio boxes. Move to the right place,
 // or better: Remove this once we did the form refactoring.
 input[type=checkbox],
 input[type=radio] {
     padding: 0;
     border: none;
 }

rhodecode/public/css/navigation.less

@@ -1,623 +1,628 b''
 // navigation.less
 // For use in RhodeCode applications;
 // see style guide documentation for guidelines.
 
 // HEADER NAVIGATION
 
 .horizontal-list {
     float: right;
     display: block;
     margin: 0;
     padding: 0;
     -webkit-padding-start: 0;
     text-align: left;
     font-size: @navigation-fontsize;
     color: @grey6;
     z-index:10;
 
     li {
         line-height: 1em;
         list-style-type: none;
 
         a {
             padding: 0 .5em;
 
             &.menu_link_notifications {
                 .pill(7px,@rcblue);
                 display: inline;
                 margin: 0 7px 0 .7em;
                 font-size: @basefontsize;
                 color: white;
-            
+
                 &.empty {
                     background-color: @grey4;
                 }
 
                 &:hover {
                     background-color: @rcdarkblue;
                 }
             }
         }
         .pill_container {
             margin: 1.25em 0px 0px 0px;
             float: right;
         }
 
         &#quick_login_li {
             &:hover {
                 color: @grey5;
             }
 
             a.menu_link_notifications {
                 color: white;
             }
 
             .user {
                 padding-bottom: 10px;
             }
 
             &.open {
                 .user {
                     border-bottom: 5px solid @rcblue;
                 }
             }
         }
 
         &:before { content: none; }
 
         &:last-child {
             .menulabel {
                 padding-right: 0;
                 border-right: none;
 
                 .show_more {
                     padding-right: 0;
                 }
             }
 
             &> a {
                 border-bottom: none;
             }
         }
 
         &.active {
             border-bottom: 5px solid @rcblue;
         }
 
         &.open {
 
             a {
                 color: white;
             }
         }
 
         &:focus {
             outline: none;
         }
-    
+
         ul li  {
             display: block;
 
             &:last-child> a {
                 border-bottom: none;
             }
 
             ul li:last-child a {
                 /* we don't expect more then 3 levels of submenu and the third
                 level can have different html structure */
                 border-bottom: none;
             }
         }
     }
 
     > li {
         float: left;
         display: block;
         padding: 0;
 
         > a,
         &.has_select2 a {
             display: block;
             padding: 10px 0 2px;
 
             .show_more {
                 margin-top: -4px;
                 padding-right: .5em;
             }
         }
 
         .menulabel {
             padding: 0 .5em;
             line-height: 1em;
             // for this specifically we do not use a variable
             border-right: 1px solid @grey4;
         }
 
         .pr_notifications {
             padding-left: .5em;
         }
 
         .pr_notifications + .menulabel {
             display:inline;
             padding-left: 0;
         }
 
         &:hover,
         &.open,
         &.active {
-            a { 
+            a {
                 color: @grey1;
             }
         }
     }
 
     pre {
         margin: 0;
         padding: 0;
     }
 
     .select2-container,
     .menulink.childs {
         position: relative;
     }
 
     #quick_login {
 
         li a {
             padding: .5em 0;
             border-bottom: none;
             color: @grey2;
 
             &:hover { color: @grey1; }
         }
 
         .show_more {
             padding-left: .5em;
         }
     }
 
     #quick_login_link {
         display: inline-block;
 
         .gravatar {
             border: 1px solid @grey2;
         }
 
         .gravatar-login {
             height: 20px;
             width: 20px;
             margin: -8px 0;
             padding: 0;
         }
 
         &:hover .user {
             color: @grey6;
         }
     }
 }
 .header .horizontal-list {
 
     li {
 
         &#quick_login_li {
             padding-left: .5em;
 
             &:hover #quick_login_link {
                 color: inherit;
             }
         }
 
         &:before { content: none; }
     }
 
     > li {
 
         a {
             padding: 18px 0 12px 0;
             color: @nav-grey;
 
             &.menu_link_notifications {
                 padding: 1px 8px;
             }
         }
 
         &:hover,
         &.open,
         &.active {
             .pill_container a {
                 // don't select text for the pill container, it has it' own
                 // hover behaviour
                 color: @nav-grey;
             }
         }
 
         &:hover,
         &.open,
         &.active {
             a {
                 color: @grey6;
             }
         }
 
         .select2-dropdown-open a {
             color: @grey6;
         }
 
         .repo-switcher {
             padding-left: 0;
 
             .menulabel {
                 padding-left: 0;
             }
         }
     }
 
     li ul li  {
         background-color:@grey2;
 
         a {
             padding: .5em 0;
             border-bottom: @border-thickness solid @border-default-color;
             color: @grey6;
         }
 
          &:last-child a, &.last a{
             border-bottom: none;
         }
 
         &:hover {
             background-color: @grey3;
         }
     }
 
     .submenu {
         margin-top: 5px;
     }
 }
 
 // SUBMENUS
 .navigation .submenu {
     display: none;
 }
 
 .navigation li.open {
 
    .submenu,
    .repo_switcher {
        display: block;
    }
 }
 
+.navigation li:last-child .submenu {
+    right: -20px;
+    left: auto;
+}
+
 .submenu {
     position: absolute;
     top: 100%;
     left: 0;
     min-width: 150px;
     margin: 6px 0 0;
     padding: 0;
     text-align: left;
     font-family: @text-light;
     border-radius: @border-radius;
     z-index: 20;
 
     li {
         display: block;
         margin: 0;
         padding: 0 .5em;
         line-height: 1em;
         color: @grey3;
         background-color: @grey6;
 
         &:before { content: none; }
 
         a {
             display: block;
             width: 100%;
             padding: .5em 0;
             border-right: none;
             border-bottom: @border-thickness solid white;
             color: @grey3;
         }
 
         ul {
             display: none;
             position: absolute;
             top: 0;
             right: 100%;
             padding: 0;
             z-index: 30;
         }
         &:hover {
             background-color: @grey5;
             -webkit-transition: background .3s;
                -moz-transition: background .3s;
                  -o-transition: background .3s;
                     transition: background .3s;
-            
+
             ul {
                 display: block;
             }
         }
     }
 }
 
 
 
 
 // repo dropdown
 .quick_repo_menu {
     width: 15px;
     text-align: center;
     position: relative;
     cursor: pointer;
 
     div {
         overflow: visible !important;
     }
 
     &.sorting {
         cursor: auto;
     }
 
     &:hover {
         .menu_items_container {
             position: absolute;
             display: block;
         }
         .menu_items {
             display: block;
         }
     }
 
     i {
         margin: 0;
         color: @grey4;
     }
 
     .menu_items_container {
         position: absolute;
         top: 0;
         left: 100%;
         margin: 0;
         padding: 0;
         list-style: none;
         background-color: @grey6;
         z-index: 999;
         text-align: left;
 
         a {
             color: @grey2;
         }
 
         ul.menu_items {
             margin: 0;
             padding: 0;
         }
 
         li {
             margin: 0;
             padding: 0;
             line-height: 1em;
             list-style-type: none;
 
             &:before { content: none; }
 
             a {
                 display: block;
                 height: 16px;
                 padding: 8px; //must add up to td height (28px)
 
                 &:hover {
                     background-color: @grey5;
                     -webkit-transition: background .3s;
                        -moz-transition: background .3s;
                          -o-transition: background .3s;
                             transition: background .3s;
                 }
             }
         }
     }
 }
 
 // Header Repository Switcher
 // Select2 Dropdown
 #select2-drop.select2-drop.repo-switcher-dropdown  {
     width: auto !important;
     margin-top: 5px;
     padding: 1em 0;
     text-align: left;
     .border-radius-bottom(@border-radius);
     border-color: transparent;
     color: @grey6;
     background-color: @grey2;
 
     input {
         min-width: 90%;
     }
 
     ul.select2-result-sub {
 
         li {
             line-height: 1em;
 
             &:hover,
             &.select2-highlighted {
                 background-color: @grey3;
             }
         }
 
         &:before { content: none; }
     }
 
     ul.select2-results {
         min-width: 200px;
         margin: 0;
         padding: 0;
         list-style-type: none;
         overflow-x: visible;
         overflow-y: scroll;
 
         li {
             padding: 0 8px;
             line-height: 1em;
             color: @grey6;
 
             &:before { content: none; }
 
             &>.select2-result-label {
                 padding: 8px 0;
                 border-bottom: @border-thickness solid @grey3;
                 white-space: nowrap;
                 color: @grey5;
                 cursor: pointer;
             }
 
             &.select2-result-with-children {
                 margin: 0;
                 padding: 0;
             }
 
             &.select2-result-unselectable > .select2-result-label {
                 margin: 0 8px;
             }
-                
+
         }
     }
 
     ul.select2-result-sub {
         margin: 0;
         padding: 0;
 
         li {
             display: block;
             margin: 0;
             border-right: none;
             line-height: 1em;
             font-family: @text-light;
             color: @grey2;
 
             &:before { content: none; }
 
             &:hover {
                 background-color: @grey3;
             }
         }
     }
 }
 
 
 #context-bar {
     display: block;
     margin: 0 auto;
     padding: 0 @header-padding;
     background-color: @grey6;
     border-bottom: @border-thickness solid @grey5;
 
     .clear {
         clear: both;
     }
 }
 
 ul#context-pages {
     li {
         line-height: 1em;
 
         &:before { content: none; }
 
         a {
             color: @grey3;
         }
 
         &.active {
             // special case, non-variable color
             border-bottom: 4px solid @nav-grey;
 
             a {
                 color: @grey1;
             }
         }
     }
 }
 
 // PAGINATION
 
 .pagination {
     border: @border-thickness solid @rcblue;
     color: @rcblue;
 
     .current {
         color: @grey4;
     }
 }
 
 .dataTables_paginate, .pagination-wh {
     text-align: left;
     display: inline-block;
     border-left: 1px solid @rcblue;
     float: none;
     overflow: hidden;
 
     .paginate_button, .pager_curpage,
     .pager_link, .pg-previous, .pg-next, .pager_dotdot {
         display: inline-block;
         padding: @menupadding/4 @menupadding;
         border: 1px solid @rcblue;
         border-left: 0;
         color: @rcblue;
         cursor: pointer;
         float: left;
     }
 
     .pager_curpage, .pager_dotdot,
     .paginate_button.current, .paginate_button.disabled,
     .disabled {
         color: @grey3;
         cursor: default;
     }
 }
 
 // SIDEBAR
 
 .sidebar {
     .block-left;
     clear: left;
     max-width: @sidebar-width;
     margin-right: @sidebarpadding;
     padding-right: @sidebarpadding;
     font-family: @text-regular;
     color: @grey1;
 
     &#graph_nodes {
         clear:both;
         width: auto;
         margin-left: -100px;
         padding: 0;
         border: none;
     }
-    
+
     .nav-pills {
         margin: 0;
     }
 
     .nav {
         list-style: none;
         padding: 0;
 
         li {
             padding-bottom: @menupadding;
             line-height: 1em;
             color: @grey4;
 
             &.active a {
                 color: @grey2;
             }
 
             a {
                 color: @grey4;
             }
 
             &:before { content: none; }
         }
 
     }
 }

rhodecode/public/css/panels.less

@@ -1,87 +1,85 b''
 // See panels-bootstrap.less
 // These provide overrides for custom styling of Bootstrap panels
 
 .panel {
     &:extend(.clearfix);
 
     width: 100%;
     margin: 0 0 25px 0;
-    border-color: @grey5;
     .border-radius(@border-radius);
     .box-shadow(none);
 
     .permalink {
         visibility: hidden;
     }
 
     &:hover .permalink {
         visibility: visible;
         color: @rcblue;
     }
 
     .panel-heading {
         position: relative;
         min-height: 1em;
         padding: @padding @panel-padding;
-        background-color: @grey6;
         border-bottom: none;
 
         .panel-title,
         h3.panel-title {
             float: left;
             padding: 0 @padding 0 0;
             line-height: 1;
             font-size: @panel-title;
             color: @grey1;
         }
 
         .panel-edit {
             float: right;
             line-height: 1;
             font-size: @panel-title;
         }
     }
 
     .panel-body {
         padding: @panel-padding;
     }
     
     .panel-footer {
         background-color: white;
         padding: .65em @panel-padding .5em;
         font-size: @panel-footer;
         color: @text-muted;
     }
 
     .q_filter_box {
         min-width: 40%;
     }
 
     // special cases
     &.user-profile {
         float: left;
 
         .panel-heading {
             margin-bottom: @padding;
         }
     
         .panel-body {
             &:extend(.clearfix);
         }
     }
 }
 
 .main-content h3.panel-title {
     font-size: @panel-title;
     color: @grey1;
 }
 
 .panel-body-title-text {
     margin: 0 0 20px 0;
 }
 
 // play nice with the current form and field css
 .field.panel-default,
 .form.panel-default {
     width: auto;
 }
  No newline at end of file

rhodecode/public/js/src/rhodecode/utils/autocomplete.js

@@ -1,42 +1,48 b''
 // # Copyright (C) 2010-2016  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/
 
 /**
  *  autocomplete formatter that uses gravatar
  * */
-var autocompleteFormatResult = function(data, value, org_formatter) {
-  var value_display = data.value_display;
+var autocompleteFormatResult = function (data, value, org_formatter) {
+  var activeUser = data.active || true;
+  var valueDisplay = data.value_display;
+
+  if (!activeUser) {
+    valueDisplay = '<strong>(disabled)</strong> ' + valueDisplay;
+  }
+
   var escapeRegExChars = function (value) {
     return value.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
   };
   var pattern = '(' + escapeRegExChars(value) + ')';
-  value_display = value_display.replace(new RegExp(pattern, 'gi'), '<strong>$1<\/strong>');
+  valueDisplay = valueDisplay.replace(new RegExp(pattern, 'gi'), '<strong>$1<\/strong>');
   var tmpl = '<div class="ac-container-wrap"><img class="gravatar" src="{0}"/>{1}</div>';
   if (data.icon_link === "") {
     tmpl = '<div class="ac-container-wrap">{0}</div>';
-    return tmpl.format(value_display);
+    return tmpl.format(valueDisplay);
   }
-  return tmpl.format(data.icon_link, value_display);
+  return tmpl.format(data.icon_link, valueDisplay);
 };
 
 /**
  * autocomplete filter that uses display value to filter
  */
 var autocompleteFilterResult = function (suggestion, originalQuery, queryLowerCase) {
   return suggestion.value_display.toLowerCase().indexOf(queryLowerCase) !== -1;
 };

rhodecode/templates/admin/my_account/my_account_pullrequests.html

@@ -1,85 +1,153 b''
+<%namespace name="base" file="/base/base.html"/>
 
 <div class="panel panel-default">
   <div class="panel-body">
-    <div class="field">
       %if c.show_closed:
         ${h.checkbox('show_closed',checked="checked", label=_('Show Closed Pull Requests'))}
       %else:
         ${h.checkbox('show_closed',label=_('Show Closed Pull Requests'))}
       %endif
-    </div>
   </div>
 </div>
 
 <div class="panel panel-default">
   <div class="panel-heading">
     <h3 class="panel-title">${_('Pull Requests You Opened')}</h3>
   </div>
-
   <div class="panel-body">
     <div class="pullrequestlist">
         %if c.my_pull_requests:
+        <table class="rctable">
+          <thead>
+            <th class="td-status"></th>
+            <th>${_('Target Repo')}</th>
+            <th>${_('Author')}</th>
+            <th></th>
+            <th>${_('Title')}</th>
+            <th class="td-time">${_('Opened On')}</th>
+            <th></th>
+          </thead>
           %for pull_request in c.my_pull_requests:
-            <div class="${'closed' if pull_request.is_closed() else ''} prwrapper">
-              <div class="pr">
+            <tr class="${'closed' if pull_request.is_closed() else ''} prwrapper">
+              <td class="td-status">
                 <div class="${'flag_status %s' % pull_request.calculated_review_status()} pull-left"></div>
-                <a href="${h.url('pullrequest_show',repo_name=pull_request.target_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">
-                  ${_('Pull request #%s opened on %s') % (pull_request.pull_request_id, h.format_date(pull_request.created_on))}
-                  %if pull_request.is_closed():
-                    (${_('Closed')})
-                  %endif
-                </a>
-                <div class="repolist_actions">
-                  ${h.secure_form(url('pullrequest_delete', repo_name=pull_request.target_repo.repo_name, pull_request_id=pull_request.pull_request_id),method='delete')}
-                    ${h.submit('remove_%s' % pull_request.pull_request_id, _('Delete'),
-                    class_="btn btn-link btn-danger",onclick="return confirm('"+_('Confirm to delete this pull request')+"');")}
-                  ${h.end_form()}
+              </td>
+              <td class="td-componentname">
+                ${h.link_to(pull_request.target_repo.repo_name,h.url('summary_home',repo_name=pull_request.target_repo.repo_name))}
+              </td>
+              <td class="user">
+                ${base.gravatar_with_user(pull_request.author.email, 16)}
+              </td>
+              <td class="td-message expand_commit" data-pr-id="m${pull_request.pull_request_id}" title="${_('Expand commit message')}">
+                <div class="show_more_col">
+                  <i class="show_more"></i>&nbsp;
                 </div>
-              </div>
-            </div>
+              </td>
+              <td class="mid td-description">
+                <div class="log-container truncate-wrap">
+                    <div class="message truncate" id="c-m${pull_request.pull_request_id}"><a href="${h.url('pullrequest_show',repo_name=pull_request.target_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">#${pull_request.pull_request_id}: ${pull_request.title}</a>\
+                    %if pull_request.is_closed():
+                      &nbsp;(${_('Closed')})\
+                    %endif
+                    <br/>${pull_request.description}</div>
+                </div>
+              </td>
+
+              <td class="td-time">
+                ${h.age_component(pull_request.created_on)}
+              </td>
+              <td class="td-action repolist_actions">
+                ${h.secure_form(url('pullrequest_delete', repo_name=pull_request.target_repo.repo_name, pull_request_id=pull_request.pull_request_id),method='delete')}
+                  ${h.submit('remove_%s' % pull_request.pull_request_id, _('Delete'),
+                  class_="btn btn-link btn-danger",onclick="return confirm('"+_('Confirm to delete this pull request')+"');")}
+                ${h.end_form()}
+              </td>
+            </tr>
           %endfor
+        </table>
        %else:
         <h2><span class="empty_data">${_('You currently have no open pull requests.')}</span></h2>
        %endif
     </div>
   </div>
 </div>
 
 <div class="panel panel-default">
   <div class="panel-heading">
     <h3 class="panel-title">${_('Pull Requests You Participate In')}</h3>
   </div>
 
   <div class="panel-body">
     <div class="pullrequestlist">
         %if c.participate_in_pull_requests:
+        <table class="rctable">
+          <thead>
+            <th class="td-status"></th>
+            <th>${_('Target Repo')}</th>
+            <th>${_('Author')}</th>
+            <th></th>
+            <th>${_('Title')}</th>
+            <th class="td-time">${_('Opened On')}</th>
+          </thead>
           %for pull_request in c.participate_in_pull_requests:
-          <div class="${'closed' if pull_request.is_closed() else ''} prwrapper">
-            <div class="pr">
-              <div class="${'flag_status %s' % pull_request.calculated_review_status()} pull-left"></div>
-              <a href="${h.url('pullrequest_show',repo_name=pull_request.target_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">
-                ${_('Pull request #%s opened by %s on %s') % (pull_request.pull_request_id, pull_request.author.full_name, h.format_date(pull_request.created_on))}
-              </a>
-              %if pull_request.is_closed():
-                (${_('Closed')})
-              %endif
-            </div>
-          </div>
+            <tr class="${'closed' if pull_request.is_closed() else ''} prwrapper">
+              <td class="td-status">
+                <div class="${'flag_status %s' % pull_request.calculated_review_status()} pull-left"></div>
+              </td>
+              <td class="td-componentname">
+                ${h.link_to(pull_request.target_repo.repo_name,h.url('summary_home',repo_name=pull_request.target_repo.repo_name))}
+              </td>
+              <td class="user">
+                ${base.gravatar_with_user(pull_request.author.email, 16)}
+              </td>
+              <td class="td-message expand_commit" data-pr-id="p${pull_request.pull_request_id}" title="${_('Expand commit message')}">
+                <div class="show_more_col">
+                  <i class="show_more"></i>&nbsp;
+                </div>
+              </td>
+              <td class="mid td-description">
+                <div class="log-container truncate-wrap">
+                    <div class="message truncate" id="c-p${pull_request.pull_request_id}"><a href="${h.url('pullrequest_show',repo_name=pull_request.target_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">#${pull_request.pull_request_id}: ${pull_request.title}</a>\
+                    %if pull_request.is_closed():
+                      &nbsp;(${_('Closed')})\
+                    %endif
+                    <br/>${pull_request.description}</div>
+                </div>
+              </td>
+
+              <td class="td-time">
+                ${h.age_component(pull_request.created_on)}
+              </td>
+            </tr>
           %endfor
+        </table>
         %else:
-         <li><span class="empty_data">${_('There are currently no open pull requests requiring your participation.')}</span></li>
+         <h2 class="empty_data">${_('There are currently no open pull requests requiring your participation.')}</h2>
         %endif
     </div>
   </div>
 </div>
 
 <script>
     $('#show_closed').on('click', function(e){
         if($(this).is(":checked")){
             window.location = "${h.url('my_account_pullrequests', pr_show_closed=1)}";
         }
         else{
             window.location = "${h.url('my_account_pullrequests')}";
         }
-    })
+    });
+    $('.expand_commit').on('click',function(e){
+      var target_expand = $(this);
+      var cid = target_expand.data('prId');
+
+      if (target_expand.hasClass('open')){
+        $('#c-'+cid).css({'height': '2.75em', 'text-overflow': 'ellipsis', 'overflow':'hidden'});
+        target_expand.removeClass('open');
+      }
+      else {
+        $('#c-'+cid).css({'height': 'auto', 'text-overflow': 'initial', 'overflow':'visible'});
+        target_expand.addClass('open');
+      }
+    });
 </script>

rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html

@@ -1,72 +1,84 b''
 ## -*- coding: utf-8 -*-
+<%namespace name="base" file="/base/base.html"/>
+
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">${_('Settings for Repository Group: %s') % c.repo_group.name}</h3>
     </div>
     <div class="panel-body">
         ${h.secure_form(url('update_repo_group',group_name=c.repo_group.group_name),method='put')}
         <div class="form">
             <!-- fields -->
             <div class="fields">
                 <div class="field">
                     <div class="label">
                         <label for="group_name">${_('Group Name')}:</label>
                     </div>
                     <div class="input">
                         ${h.text('group_name',class_='medium')}
                     </div>
                 </div>
-                <div class="field">
+
+                <div class="field badged-field">
                     <div class="label">
                         <label for="user">${_('Owner')}:</label>
                     </div>
                     <div class="input">
-                           ${h.text('user', class_="medium", autocomplete="off")}
-                           <span class="help-block">${_('Change Repository Group Owner.')}</span>
+                        <div class="badge-input-container">
+                            <div class="user-badge">
+                                ${base.gravatar_with_user(c.repo_group.user.email, show_disabled=not c.repo_group.user.active)}
+                            </div>
+                            <div class="badge-input-wrap">
+                                ${h.text('user', class_="medium", autocomplete="off")}
+                            </div>
+                        </div>
+                        <form:error name="user"/>
+                        <p class="help-block">${_('Change owner of this repository group.')}</p>
                     </div>
                 </div>
+
                 <div class="field">
                     <div class="label label-textarea">
                         <label for="group_description">${_('Description')}:</label>
                     </div>
                     <div class="textarea text-area editor">
                         ${h.textarea('group_description',cols=23,rows=5,class_="medium")}
                     </div>
                 </div>
 
                 <div class="field">
                     <div class="label">
                         <label for="group_parent_id">${_('Group parent')}:</label>
                     </div>
                     <div class="select">
                         ${h.select('group_parent_id','',c.repo_groups,class_="medium")}
                     </div>
                 </div>
                 <div class="field">
                     <div class="label label-checkbox">
                         <label for="enable_locking">${_('Enable Repository Locking')}:</label>
                     </div>
                     <div class="checkboxes">
                         ${h.checkbox('enable_locking',value="True")}
                         <span class="help-block">${_('Repository locking will be enabled on all subgroups and repositories inside this repository group. Pulling from a repository locks it, and it is unlocked by pushing back by the same user.')}</span>
                     </div>
                 </div>
                 <div class="buttons">
                   ${h.submit('save',_('Save'),class_="btn")}
                   ${h.reset('reset',_('Reset'),class_="btn")}
                 </div>
             </div>
         </div>
         ${h.end_form()}
     </div>
 </div>
 <script>
     $(document).ready(function(){
         $("#group_parent_id").select2({
             'containerCssClass': "drop-menu",
             'dropdownCssClass': "drop-menu-dropdown",
             'dropdownAutoWidth': true
         });
         UsersAutoComplete('user', '${c.rhodecode_user.user_id}');
     })
 </script>

rhodecode/templates/admin/repos/repo_edit_settings.html

@@ -1,225 +1,238 b''
+## -*- coding: utf-8 -*-
+<%namespace name="base" file="/base/base.html"/>
+
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">${_('Settings for Repository: %s') % c.repo_info.repo_name}</h3>
     </div>
     <div class="panel-body">
     ${h.secure_form(url('repo', repo_name=c.repo_info.repo_name),method='put')}
     <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>
                     <p id="clone_id" style="display:none;">
                         ${_('URL by id')}: `${c.repo_info.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="clone_uri">${_('Remote uri')}:</label>
                </div>
                <div class="input">
                    %if c.repo_info.clone_uri:
                     <div id="clone_uri_hidden" class='text-as-placeholder'>
                         <span id="clone_uri_hidden_value">${c.repo_info.clone_uri_hidden}</span>
                         <span class="link" id="edit_clone_uri"><i class="icon-edit"></i>${_('edit')}</span>
                     </div>
                     <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')}
                         <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')}
                    %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>
                </div>
             </div>
             % else:
               ${h.hidden('clone_uri', '')}
             % endif
             <div class="field">
                 <div class="label">
                     <label for="repo_group">${_('Repository group')}:</label>
                 </div>
                 <div class="select">
                     ${h.select('repo_group','',c.repo_groups,class_="medium")}
                      %if c.personal_repo_group:
                          <a style="padding: 4px" 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>
                 </div>
             </div>
-            <div class="field">
+
+            <div class="field badged-field">
                 <div class="label">
                     <label for="user">${_('Owner')}:</label>
                 </div>
                 <div class="input">
-                       ${h.text('user', class_="medium", autocomplete="off")}
-                       <p class="help-block">${_('Change owner of this repository.')}</p>
+                    <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)}
+                        </div>
+                        <div class="badge-input-wrap">
+                            ${h.text('user', class_="medium", autocomplete="off")}
+                        </div>
+                    </div>
+                    <form:error name="user"/>
+                    <p class="help-block">${_('Change owner of this repository.')}</p>
                 </div>
-             </div>
+            </div>
+
             <div class="field">
                 <div class="label label-textarea">
                     <label for="repo_description">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${h.textarea('repo_description', )}
                     <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>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('repo_private',value="True")}
                     <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>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('repo_enable_statistics',value="True")}
                     <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>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('repo_enable_downloads',value="True")}
                     <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>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('repo_enable_locking',value="True")}
                     <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>
 
             %if c.visual.repository_fields:
               ## EXTRA FIELDS
               %for field in c.repo_fields:
                 <div class="field">
                     <div class="label">
                         <label for="${field.field_key_prefixed}">${field.field_label} (${field.field_key}):</label>
                     </div>
                     <div class="input input-medium">
                         ${h.text(field.field_key_prefixed, field.field_value, class_='medium')}
                         %if field.field_desc:
                           <span class="help-block">${field.field_desc}</span>
                         %endif
                     </div>
                  </div>
               %endfor
             %endif
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="btn")}
               ${h.reset('reset',_('Reset'),class_="btn")}
             </div>
         </div>
     </div>
     ${h.end_form()}
   </div>
 </div>
 
 <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');
           var cancelEditButton = $('#cancel_edit_clone_uri');
           var hiddenUrl = $('#clone_uri_hidden');
           var hiddenUrlValue = $('#clone_uri_hidden_value');
           var input = $('#clone_uri');
           var helpBlock = $('#alter_clone_uri_help_block');
           var changedFlag = $('#clone_uri_change');
           var originalText = helpBlock.html();
           var obfuscatedUrl = hiddenUrlValue.html();
 
           var edit = function(e) {
             alterButton.show();
             editButton.hide();
             hiddenUrl.hide();
 
             //add the old value next to input for verification
             helpBlock.html("(" + obfuscatedUrl + ")" + "<br\>" + originalText);
             changedFlag.val('MOD');
           };
 
           var cancelEdit = function(e) {
             alterButton.hide();
             editButton.show();
             hiddenUrl.show();
 
             helpBlock.html(originalText);
             changedFlag.val('OLD');
             input.val('');
           };
 
           var initEvents = function() {
             editButton.on('click', edit);
             cancelEditButton.on('click', cancelEdit);
           };
 
           var setInitialState = function() {
             if (input.hasClass('error')) {
               alterButton.show();
               editButton.hide();
               hiddenUrl.hide();
             }
           };
 
           setInitialState();
           initEvents();
         }();
 
         $('#show_more_clone_id').on('click', function(e){
             $('#clone_id').show();
             e.preventDefault();
         });
 
         $('#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");
         });
     });
 </script>

rhodecode/templates/admin/settings/settings_open_source.html

@@ -1,32 +1,33 b''
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">${_('Licenses of Third Party Packages')}</h3>
     </div>
     <div class="panel-body">
         <p>
             RhodeCode Enterprise uses various third party packages, many of them
             provided by the open source community.
         </p>
 
         % if c.opensource_licenses:
             <table class="rctable dl-settings">
                 <thead>
                     <th>Product</th>
                     <th>License</th>
                 </thead>
                 %for product, licenses in c.opensource_licenses.items():
                 <tr>
                     <td>${product}</td>
                     <td>
                         ${h.literal(', '.join([
                         '<a href="%(link)s" title="%(name)s">%(name)s</a>' % {'link':link, 'name':name}
+                        if link else name
                         for name,link in licenses.items()]))}
                     </td>
                 </tr>
                 %endfor
             </table>
         % endif
     </div>
 </div>
 
 

rhodecode/templates/admin/settings/settings_system.html

@@ -1,86 +1,89 b''
 <%
  elems = [
     ## general
     (_('RhodeCode Enterprise version'), h.literal('%s <div class="link" id="check_for_update" >%s</div>' % (c.rhodecode_version, _('check for updates'))), ''),
     (_('Upgrade info endpoint'), h.literal('%s <br/><span >%s.</span>' % (c.rhodecode_update_url, _('Note: please make sure this server can access this url'))), ''),
     (_('Configuration INI file'), c.rhodecode_config_ini, ''),
     ## systems stats
     (_('RhodeCode Enterprise Server IP'), c.server_ip, ''),
     (_('RhodeCode Enterprise Server ID'), c.server_id, ''),
     (_('Platform'), c.platform, ''),
     (_('Uptime'), c.uptime_age, ''),
     (_('Storage location'), c.storage, ''),
     (_('Storage disk space'), "%s/%s, %s%% used%s" % (h.format_byte_size_binary(c.disk['used']), h.format_byte_size_binary(c.disk['total']),(c.disk['percent']), ' %s' % c.disk['error'] if 'error' in c.disk else ''), ''),
 
     (_('Search index storage'), c.index_storage, ''),
     (_('Search index size'), "%s %s" % (h.format_byte_size_binary(c.disk_index['used']), ' %s' % c.disk_index['error'] if 'error' in c.disk_index else ''), ''),
 
     (_('Gist storage'), c.gist_storage, ''),
     (_('Gist storage size'), "%s (%s items)%s" % (h.format_byte_size_binary(c.disk_gist['used']),c.disk_gist['items'], ' %s' % c.disk_gist['error'] if 'error' in c.disk_gist else ''), ''),
 
     (_('Archive cache'), h.literal('%s <br/><span >%s.</span>' % (c.archive_storage, _('Enable this by setting archive_cache_dir=/path/to/cache option in the .ini file'))), ''),
     (_('Archive cache size'), "%s%s" % (h.format_byte_size_binary(c.disk_archive['used']), ' %s' % c.disk_archive['error'] if 'error' in c.disk_archive else ''), ''),
 
     (_('System memory'), c.system_memory, ''),
     (_('CPU'), '%s %%' %(c.cpu), ''),
     (_('Load'), '1min: %s, 5min: %s, 15min: %s' %(c.load['1_min'],c.load['5_min'],c.load['15_min']), ''),
 
     ## rhodecode stuff
     (_('Python version'), c.py_version, ''),
     (_('Python path'), c.py_path, ''),
     (_('GIT version'), c.git_version, ''),
     (_('HG version'), c.hg_version, ''),
     (_('SVN version'), c.svn_version, ''),
     (_('Database'), "%s @ version: %s" % (c.db_type, c.db_migrate_version), ''),
     (_('Database version'), c.db_version, ''),
 
  ]
 %>
 
 <div id="update_notice" style="display: none; margin: -40px 0px 20px 0px">
     <div>${_('Checking for updates...')}</div>
 </div>
 
 
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">${_('System Info')}</h3>
+        % if c.allowed_to_snapshot:
+            <a href="${url('admin_settings_system', snapshot=1)}" class="panel-edit">${_('create snapshot')}</a>
+        % endif
     </div>
     <div class="panel-body">
         <dl class="dl-horizontal settings">
         %for dt, dd, tt in elems:
-          <dt >${dt}:</dt>
-          <dd  title="${tt}">${dd}</dd>
+          <dt>${dt}:</dt>
+          <dd title="${tt}">${dd}</dd>
         %endfor
         </dl>
     </div>
 </div>
 
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">${_('Python Packages')}</h3>
     </div>
     <div class="panel-body">
         <table class="table">
           <colgroup>
               <col class='label'>
               <col class='content'>
           </colgroup>
           <tbody>
               %for key, value in c.py_modules:
                   <tr>
-                      <td >${key}</td>
+                      <td>${key}</td>
                       <td>${value}</td>
                   </tr>
               %endfor
           </tbody>
         </table>
     </div>
 </div>
 
 <script>
     $('#check_for_update').click(function(e){
         $('#update_notice').show();
         $('#update_notice').load("${h.url('admin_settings_system_update')}");
     })
 </script>

rhodecode/templates/admin/user_groups/user_group_edit_settings.html

@@ -1,131 +1,144 b''
+## -*- coding: utf-8 -*-
+<%namespace name="base" file="/base/base.html"/>
+
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">${_('User Group: %s') % c.user_group.users_group_name}</h3>
     </div>
     <div class="panel-body">
     ${h.secure_form(url('update_users_group', user_group_id=c.user_group.users_group_id),method='put', id='edit_users_group')}
         <div class="form">
             <!-- fields -->
                 <div class="fields">
                      <div class="field">
                         <div class="label">
                             <label for="users_group_name">${_('Group name')}:</label>
                         </div>
                         <div class="input">
                             ${h.text('users_group_name',class_='medium')}
                         </div>
                      </div>
-                     <div class="field">
+
+                    <div class="field badged-field">
                         <div class="label">
                             <label for="user">${_('Owner')}:</label>
                         </div>
                         <div class="input">
-                               ${h.text('user', class_="medium", autocomplete="off")}
-                               <span class="help-block">${_('Change owner of this user group.')}</span>
+                            <div class="badge-input-container">
+                                <div class="user-badge">
+                                    ${base.gravatar_with_user(c.user_group.user.email, show_disabled=not c.user_group.user.active)}
+                                </div>
+                                <div class="badge-input-wrap">
+                                    ${h.text('user', class_="medium", autocomplete="off")}
+                                </div>
+                            </div>
+                            <form:error name="user"/>
+                            <p class="help-block">${_('Change owner of this user group.')}</p>
                         </div>
-                     </div>
+                    </div>
+
                      <div class="field">
                         <div class="label label-textarea">
                             <label for="user_group_description">${_('Description')}:</label>
                         </div>
                         <div class="textarea textarea-small editor">
                             ${h.textarea('user_group_description',cols=23,rows=5,class_="medium")}
                             <span class="help-block">${_('Short, optional description for this user group.')}</span>
                         </div>
                      </div>
                      <div class="field">
                         <div class="label label-checkbox">
                             <label for="users_group_active">${_('Active')}:</label>
                         </div>
                         <div class="checkboxes">
                             ${h.checkbox('users_group_active',value=True)}
                         </div>
                      </div>
                     <div class="field">
                         <div class="label">
                             <label for="users_group_active">${_('Search')}:</label>
                                ${h.text('from_user_group',
                                         placeholder="user/usergroup",
                                         class_="medium")}
                         </div>
                         <div class="select side-by-side-selector">
                             <div class="left-group">
                                 <label class="text"><strong>${_('Chosen group members')}</strong></label>
                                 ${h.select('users_group_members',[x[0] for x in c.group_members],c.group_members,multiple=True,size=8,)}
                                <div class="btn" id="remove_all_elements" >
                                    ${_('Remove all elements')}
                                    <i  class="icon-chevron-right"></i>
                                </div>
                             </div>
                             <div class="middle-group">
                                 <i  id="add_element" class="icon-chevron-left"></i>
                                 <br />
                                 <i  id="remove_element" class="icon-chevron-right"></i>
                             </div>
                             <div class="right-group">
                                  <label class="text" >${_('Available users')}
                                  </label>
                                  ${h.select('available_members',[],c.available_members,multiple=True,size=8,)}
                                  <div  class="btn" id="add_all_elements" >
                                      <i  class="icon-chevron-left"></i>${_('Add all elements')}
                                  </div>
                             </div>
                         </div>
                     </div>
                     <div class="buttons">
                       ${h.submit('Save',_('Save'),class_="btn")}
                     </div>
                 </div>
         </div>
     ${h.end_form()}
     </div>
 </div>
 <script>
     $(document).ready(function(){
         MultiSelectWidget('users_group_members','available_members','edit_users_group');
 
         $("#group_parent_id").select2({
             'containerCssClass': "drop-menu",
             'dropdownCssClass': "drop-menu-dropdown",
             'dropdownAutoWidth': true
         });
 
         $('#from_user_group').autocomplete({
             serviceUrl: pyroutes.url('user_autocomplete_data'),
             minChars:2,
             maxHeight:400,
             width:300,
             deferRequestBy: 300, //miliseconds
             showNoSuggestionNotice: true,
             params: { user_groups:true },
             formatResult: autocompleteFormatResult,
             lookupFilter: autocompleteFilterResult,
             onSelect: function(element, suggestion){
 
                 function preSelectUserIds(uids) {
                     $('#available_members').val(uids);
                     $('#users_group_members').val(uids);
                 }
 
                 if (suggestion.value_type == 'user_group') {
                     $.getJSON(
                         pyroutes.url('edit_user_group_members',
                                     {'user_group_id': suggestion.id}),
                         function(data) {
                             var uids = [];
                             $.each(data.members, function(idx, user) {
                                 var userid = user[0],
                                     username = user[1];
                                 uids.push(userid.toString());
                             });
                             preSelectUserIds(uids)
                         }
                     );
                 } else if (suggestion.value_type == 'user') {
                     preSelectUserIds([suggestion.id.toString()]);
                 }
             }
         });
         UsersAutoComplete('user', '${c.rhodecode_user.user_id}');
     })
 </script>

rhodecode/templates/admin/users/user_add.html

@@ -1,144 +1,144 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
     ${_('Add user')}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Users'),h.url('users'))}
     &raquo;
     ${_('Add User')}
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
 </%def>
 
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     ${h.secure_form(url('users'))}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label">
                     <label for="username">${_('Username')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('username', class_='medium')}
                 </div>
              </div>
 
              <div class="field">
                 <div class="label">
                     <label for="password">${_('Password')}:</label>
                 </div>
                 <div class="input">
                     ${h.password('password', class_='medium')}
                 </div>
              </div>
 
              <div class="field">
                 <div class="label">
                     <label for="password_confirmation">${_('Password confirmation')}:</label>
                 </div>
                 <div class="input">
                     ${h.password('password_confirmation',autocomplete="off", class_='medium')}
                     <div class="info-block">
                         <a id="generate_password" href="#">
                             <i class="icon-lock"></i> ${_('Generate password')}
                         </a>
                         <span id="generate_password_preview"></span>
                     </div>
                 </div>
              </div>
 
              <div class="field">
                 <div class="label">
                     <label for="firstname">${_('First Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('firstname', class_='medium')}
                 </div>
              </div>
 
              <div class="field">
                 <div class="label">
                     <label for="lastname">${_('Last Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('lastname', class_='medium')}
                 </div>
              </div>
 
              <div class="field">
                 <div class="label">
                     <label for="email">${_('Email')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('email', class_='medium')}
                     ${h.hidden('extern_name', c.default_extern_type)}
                     ${h.hidden('extern_type', c.default_extern_type)}
                 </div>
              </div>
 
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="active">${_('Active')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('active',value=True,checked='checked')}
                 </div>
              </div>
 
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="password_change">${_('Password change')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('password_change',value=True)}
                     <span class="help-block">${_('Force user to change his password on the next login')}</span>
                 </div>
              </div>
 
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="create_repo_group">${_('Add repository group')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('create_repo_group',value=True)}
                     <span class="help-block">${_('Add repository group with the same name as username. \nUser will be automatically set as this group owner.')}</span>
                 </div>
              </div>
 
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="btn")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
-</%def>
 <script>
     $(document).ready(function(){
         $('#username').focus();
 
         $('#generate_password').on('click', function(e){
             var tmpl = "(${_('generated password:')} {0})"
             var new_passwd = generatePassword(12)
             $('#generate_password_preview').html(tmpl.format(new_passwd))
             $('#password').val(new_passwd);
             $('#password_confirmation').val(new_passwd);
         })
     })
 </script>
+</%def>

rhodecode/templates/base/base.html

@@ -1,655 +1,655 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="root.html"/>
 
 <div class="outerwrapper">
   <!-- HEADER -->
   <div class="header">
       <div id="header-inner" class="wrapper">
           <div id="logo">
               <div class="logo-wrapper">
                   <a href="${h.url('home')}"><img src="${h.url('/images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
               </div>
               %if c.rhodecode_name:
                <div class="branding">- ${h.branding(c.rhodecode_name)}</div>
               %endif
           </div>
           <!-- MENU BAR NAV -->
           ${self.menu_bar_nav()}
           <!-- END MENU BAR NAV -->
           ${self.body()}
       </div>
   </div>
   ${self.menu_bar_subnav()}
   <!-- END HEADER -->
 
   <!-- CONTENT -->
   <div id="content" class="wrapper">
       ${self.flash_msg()}
       <div class="main">
           ${next.main()}
       </div>
   </div>
   <!-- END CONTENT -->
 
 </div>
 <!-- FOOTER -->
 <div id="footer">
    <div id="footer-inner" class="title wrapper">
        <div>
            <p class="footer-link-right">
                % 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.
                % if c.visual.rhodecode_support_url:
                   <a href="${c.visual.rhodecode_support_url}" target="_blank">${_('Support')}</a>
                % endif
            </p>
            <% sid = 'block' if request.GET.get('showrcid') else 'none' %>
            <p class="server-instance" style="display:${sid}">
                ## display hidden instance ID if specially defined
                % if c.rhodecode_instanceid:
                    ${_('RhodeCode instance id: %s') % c.rhodecode_instanceid}
                % endif
            </p>
        </div>
    </div>
 </div>
 
 <!-- END FOOTER -->
 
 ### MAKO DEFS ###
 
 <%def name="menu_bar_subnav()">
 </%def>
 
 <%def name="flash_msg()">
     <%include file="/base/flash_msg.html"/>
 </%def>
 
 <%def name="breadcrumbs(class_='breadcrumbs')">
     <div class="${class_}">
     ${self.breadcrumbs_links()}
     </div>
 </%def>
 
 <%def name="admin_menu()">
   <ul class="admin_menu submenu">
       <li><a href="${h.url('admin_home')}">${_('Admin journal')}</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.url('users')}">${_('Users')}</a></li>
       <li><a href="${h.url('users_groups')}">${_('User groups')}</a></li>
       <li><a href="${h.url('admin_permissions_application')}">${_('Permissions')}</a></li>
       <li><a href="${h.route_path('auth_home', traverse='')}">${_('Authentication')}</a></li>
       <li><a href="${h.url('admin_defaults_repositories')}">${_('Defaults')}</a></li>
       <li class="last"><a href="${h.url('admin_settings')}">${_('Settings')}</a></li>
   </ul>
 </%def>
 
 
 <%def name="dt_info_panel(elements)">
     <dl class="dl-horizontal">
     %for dt, dd, title, show_items in elements:
       <dt>${dt}:</dt>
       <dd title="${title}">
       %if callable(dd):
           ## allow lazy evaluation of elements
           ${dd()}
       %else:
           ${dd}
       %endif
       %if show_items:
           <span class="btn-collapse" data-toggle="item-${h.md5(dt)[:6]}-details">${_('Show More')} </span>
       %endif
       </dd>
 
       %if show_items:
           <div class="collapsable-content" data-toggle="item-${h.md5(dt)[:6]}-details" style="display: none">
           %for item in show_items:
               <dt></dt>
               <dd>${item}</dd>
           %endfor
           </div>
       %endif
 
     %endfor
     </dl>
 </%def>
 
 
 <%def name="gravatar(email, size=16)">
   <%
     if (size > 16):
         gravatar_class = 'gravatar gravatar-large'
     else:
         gravatar_class = 'gravatar'
   %>
   <%doc>
     TODO: johbo: For now we serve double size images to make it smooth
     for retina. This is how it worked until now. Should be replaced
     with a better solution at some point.
   </%doc>
   <img class="${gravatar_class}" src="${h.gravatar_url(email, size * 2)}" height="${size}" width="${size}">
 </%def>
 
 
-<%def name="gravatar_with_user(contact, size=16)">
+<%def name="gravatar_with_user(contact, size=16, show_disabled=False)">
   <div class="rc-user tooltip" title="${contact}">
     ${self.gravatar(h.email_or_none(contact), size)}
-    <span class="user"> ${h.link_to_user(contact)}</span>
+    <span class="${'user user-disabled' if show_disabled else 'user'}"> ${h.link_to_user(contact)}</span>
   </div>
 </%def>
 
 
 ## admin menu used for people that have some admin resources
 <%def name="admin_menu_simple(repositories=None, repository_groups=None, user_groups=None)">
   <ul class="submenu">
    %if repositories:
       <li><a href="${h.url('repos')}">${_('Repositories')}</a></li>
    %endif
    %if repository_groups:
       <li><a href="${h.url('repo_groups')}">${_('Repository groups')}</a></li>
    %endif
    %if user_groups:
       <li><a href="${h.url('users_groups')}">${_('User groups')}</a></li>
    %endif
   </ul>
 </%def>
 
 <%def name="repo_page_title(repo_instance)">
 <div class="title-content">
     <div class="title-main">
         ## SVN/HG/GIT icons
         %if h.is_hg(repo_instance):
             <i class="icon-hg"></i>
         %endif
         %if h.is_git(repo_instance):
             <i class="icon-git"></i>
         %endif
         %if h.is_svn(repo_instance):
             <i class="icon-svn"></i>
         %endif
 
         ## public/private
         %if repo_instance.private:
             <i class="icon-repo-private"></i>
         %else:
             <i class="icon-repo-public"></i>
         %endif
 
         ## repo name with group name
         ${h.breadcrumb_repo_link(c.rhodecode_db_repo)}
 
     </div>
 
     ## FORKED
     %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>
     </p>
     %endif
 
     ## IMPORTED FROM REMOTE
     %if repo_instance.clone_uri:
     <p>
        <i class="icon-code-fork"></i> ${_('Clone from')}
-       <a href="${h.url(str(h.hide_credentials(repo_instance.clone_uri)))}">${h.hide_credentials(repo_instance.clone_uri)}</a>
+       <a href="${h.url(h.safe_str(h.hide_credentials(repo_instance.clone_uri)))}">${h.hide_credentials(repo_instance.clone_uri)}</a>
     </p>
     %endif
 
     ## LOCKING STATUS
      %if repo_instance.locked[0]:
        <p class="locking_locked">
            <i class="icon-repo-lock"></i>
            ${_('Repository locked by %(user)s') % {'user': h.person_by_id(repo_instance.locked[0])}}
        </p>
      %elif repo_instance.enable_locking:
          <p class="locking_unlocked">
              <i class="icon-repo-unlock"></i>
              ${_('Repository not locked. Pull repository to lock it.')}
          </p>
      %endif
 
 </div>
 </%def>
 
 <%def name="repo_menu(active=None)">
     <%
     def is_active(selected):
         if selected == active:
             return "active"
     %>
 
   <!--- CONTEXT BAR -->
   <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('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')}">
             <a class="menulink" href="${h.url('compare_home',repo_name=c.repo_name)}"><div class="menulabel">${_('Compare')}</div></a>
         </li>
         ## 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}">
               %if c.repository_pull_requests:
                 <span class="pr_notifications">${c.repository_pull_requests}</span>
               %endif
               <div class="menulabel">${_('Pull Requests')}</div>
             </a>
           </li>
         %endif
         <li class="${is_active('options')}">
           <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>
              %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)}">
                    ${_('Compare fork')}</a></li>
               %endif
 
               <li><a href="${h.url('search_repo_home',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]:
                   <li><a class="locking_del" href="${h.url('toggle_locking',repo_name=c.repo_name)}">${_('Unlock')}</a></li>
                 %else:
                   <li><a class="locking_add" href="${h.url('toggle_locking',repo_name=c.repo_name)}">${_('Lock')}</a></li>
                 %endif
               %endif
               %if c.rhodecode_user.username != h.DEFAULT_USER:
                 %if c.rhodecode_db_repo.repo_type in ['git','hg']:
                   <li><a href="${h.url('repo_fork_home',repo_name=c.repo_name)}">${_('Fork')}</a></li>
                   <li><a href="${h.url('pullrequest_home',repo_name=c.repo_name)}">${_('Create Pull Request')}</a></li>
                 %endif
               %endif
              </ul>
         </li>
       </ul>
     </div>
     <div class="clear"></div>
   </div>
   <!--- END CONTEXT BAR -->
 
 </%def>
 
 <%def name="usermenu()">
     ## USER MENU
     <li id="quick_login_li">
       <a id="quick_login_link" class="menulink childs">
         ${gravatar(c.rhodecode_user.email, 20)}
         <span class="user">
           %if c.rhodecode_user.username != h.DEFAULT_USER:
             <span class="menu_link_user">${c.rhodecode_user.username}</span><div class="show_more"></div>
           %else:
             <span>${_('Sign in')}</span>
           %endif
         </span>
       </a>
 
   <div class="user-menu submenu">
       <div id="quick_login">
         %if c.rhodecode_user.username == h.DEFAULT_USER:
             <h4>${_('Sign in to your account')}</h4>
             ${h.form(h.route_path('login', _query={'came_from': h.url.current()}), needs_csrf_token=False)}
             <div class="form form-vertical">
                 <div class="fields">
                     <div class="field">
                         <div class="label">
                             <label for="username">${_('Username')}:</label>
                         </div>
                         <div class="input">
                             ${h.text('username',class_='focus',tabindex=1)}
                         </div>
 
                     </div>
                     <div class="field">
                         <div class="label">
                             <label for="password">${_('Password')}:</label>
                             <span class="forgot_password">${h.link_to(_('(Forgot password?)'),h.route_path('reset_password'))}</span>
                         </div>
                         <div class="input">
                             ${h.password('password',class_='focus',tabindex=2)}
                         </div>
                     </div>
                     <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'))}
                         %endif
                         </div>
                         <div class="submit">
                             ${h.submit('sign_in',_('Sign In'),class_="btn btn-small",tabindex=3)}
                         </div>
                     </div>
                 </div>
             </div>
             ${h.end_form()}
         %else:
             <div class="">
                 <div class="big_gravatar">${gravatar(c.rhodecode_user.email, 48)}</div>
                 <div class="full_name">${c.rhodecode_user.full_name_or_username}</div>
                 <div class="email">${c.rhodecode_user.email}</div>
             </div>
             <div class="">
             <ol class="links">
               <li>${h.link_to(_(u'My account'),h.url('my_account'))}</li>
               <li class="logout">
               ${h.secure_form(h.route_path('logout'))}
                   ${h.submit('log_out', _(u'Sign Out'),class_="btn btn-primary")}
               ${h.end_form()}
               </li>
             </ol>
             </div>
         %endif
       </div>
   </div>
       %if c.rhodecode_user.username != h.DEFAULT_USER:
         <div class="pill_container">
         % if c.unread_notifications == 0:
           <a class="menu_link_notifications empty" href="${h.url('notifications')}">${c.unread_notifications}</a>
         % else:
           <a class="menu_link_notifications" href="${h.url('notifications')}">${c.unread_notifications}</a>
         % endif
         </div>
       % endif
     </li>
 </%def>
 
 <%def name="menu_items(active=None)">
     <%
     def is_active(selected):
         if selected == active:
             return "active"
         return ""
     %>
     <ul id="quick" class="main_nav navigation horizontal-list">
       <!-- repo switcher -->
       <li class="${is_active('repositories')} repo_switcher_li has_select2">
         <input id="repo_switcher" name="repo_switcher" type="hidden">
       </li>
 
       ## ROOT MENU
       %if c.rhodecode_user.username != h.DEFAULT_USER:
         <li class="${is_active('journal')}">
           <a class="menulink" title="${_('Show activity journal')}" href="${h.url('journal')}">
             <div class="menulabel">${_('Journal')}</div>
           </a>
         </li>
       %else:
         <li class="${is_active('journal')}">
           <a class="menulink" title="${_('Show Public activity journal')}" href="${h.url('public_journal')}">
             <div class="menulabel">${_('Public journal')}</div>
           </a>
         </li>
       %endif
         <li class="${is_active('gists')}">
           <a class="menulink childs" title="${_('Show Gists')}" href="${h.url('gists')}">
             <div class="menulabel">${_('Gists')}</div>
           </a>
         </li>
       <li class="${is_active('search')}">
           <a class="menulink" title="${_('Search in repositories you have access to')}" href="${h.url('search')}">
             <div class="menulabel">${_('Search')}</div>
           </a>
       </li>
       % if h.HasPermissionAll('hg.admin')('access admin main page'):
         <li class="${is_active('admin')}">
           <a class="menulink childs" title="${_('Admin settings')}" href="#" onclick="return false;">
             <div class="menulabel">${_('Admin')} <div class="show_more"></div></div>
           </a>
           ${admin_menu()}
         </li>
       % elif c.rhodecode_user.repositories_admin or c.rhodecode_user.repository_groups_admin or c.rhodecode_user.user_groups_admin:
       <li class="${is_active('admin')}">
           <a class="menulink childs" title="${_('Delegated Admin settings')}">
             <div class="menulabel">${_('Admin')} <div class="show_more"></div></div>
           </a>
           ${admin_menu_simple(c.rhodecode_user.repositories_admin,
                               c.rhodecode_user.repository_groups_admin,
                               c.rhodecode_user.user_groups_admin or h.HasPermissionAny('hg.usergroup.create.true')())}
       </li>
       % endif
       % if c.debug_style:
       <li class="${is_active('debug_style')}">
           <a class="menulink" title="${_('Style')}" href="${h.url('debug_style_home')}">
             <div class="menulabel">${_('Style')}</div>
           </a>
       </li>
       % endif
       ## render extra user menu
       ${usermenu()}
     </ul>
 
     <script type="text/javascript">
         var visual_show_public_icon = "${c.visual.show_public_icon}" == "True";
 
         /*format the look of items in the list*/
         var format = function(state, escapeMarkup){
             if (!state.id){
               return state.text; // optgroup
             }
             var obj_dict = state.obj;
             var tmpl = '';
 
             if(obj_dict && state.type == 'repo'){
                 if(obj_dict['repo_type'] === 'hg'){
                     tmpl += '<i class="icon-hg"></i> ';
                 }
                 else if(obj_dict['repo_type'] === 'git'){
                     tmpl += '<i class="icon-git"></i> ';
                 }
                 else if(obj_dict['repo_type'] === 'svn'){
                     tmpl += '<i class="icon-svn"></i> ';
                 }
                 if(obj_dict['private']){
                     tmpl += '<i class="icon-lock" ></i> ';
                 }
                 else if(visual_show_public_icon){
                     tmpl += '<i class="icon-unlock-alt"></i> ';
                 }
             }
             if(obj_dict && state.type == 'commit') {
                 tmpl += '<i class="icon-tag"></i>';
             }
             if(obj_dict && state.type == 'group'){
                 tmpl += '<i class="icon-folder-close"></i> ';
             }
             tmpl += escapeMarkup(state.text);
             return tmpl;
         };
 
         var formatResult = function(result, container, query, escapeMarkup) {
             return format(result, escapeMarkup);
         };
 
         var formatSelection = function(data, container, escapeMarkup) {
             return format(data, escapeMarkup);
         };
 
         $("#repo_switcher").select2({
             cachedDataSource: {},
             minimumInputLength: 2,
             placeholder: '<div class="menulabel">${_('Go to')} <div class="show_more"></div></div>',
             dropdownAutoWidth: true,
             formatResult: formatResult,
             formatSelection: formatSelection,
             containerCssClass: "repo-switcher",
             dropdownCssClass: "repo-switcher-dropdown",
             escapeMarkup: function(m){
                 // don't escape our custom placeholder
                 if(m.substr(0,23) == '<div class="menulabel">'){
                     return m;
                 }
 
                 return Select2.util.escapeMarkup(m);
             },
             query: $.debounce(250, function(query){
                 self = this;
                 var cacheKey = query.term;
                 var cachedData = self.cachedDataSource[cacheKey];
 
                 if (cachedData) {
                     query.callback({results: cachedData.results});
                 } else {
                     $.ajax({
                         url: "${h.url('goto_switcher_data')}",
                         data: {'query': query.term},
                         dataType: 'json',
                         type: 'GET',
                         success: function(data) {
                             self.cachedDataSource[cacheKey] = data;
                             query.callback({results: data.results});
                         },
                         error: function(data, textStatus, errorThrown) {
                             alert("Error while fetching entries.\nError code {0} ({1}).".format(data.status, data.statusText));
                         }
                     })
                 }
             })
         });
 
         $("#repo_switcher").on('select2-selecting', function(e){
             e.preventDefault();
             window.location = e.choice.url;
         });
 
         ## Global mouse bindings ##
 
         // general help "?"
         Mousetrap.bind(['?'], function(e) {
             $('#help_kb').modal({})
         });
 
         // / open the quick filter
         Mousetrap.bind(['/'], function(e) {
             $("#repo_switcher").select2("open");
 
             // return false to prevent default browser behavior
             // and stop event from bubbling
             return false;
         });
 
         // general nav g + action
         Mousetrap.bind(['g h'], function(e) {
             window.location = pyroutes.url('home');
         });
         Mousetrap.bind(['g g'], function(e) {
             window.location = pyroutes.url('gists', {'private':1});
         });
         Mousetrap.bind(['g G'], function(e) {
             window.location = pyroutes.url('gists', {'public':1});
         });
         Mousetrap.bind(['n g'], function(e) {
             window.location = pyroutes.url('new_gist');
         });
         Mousetrap.bind(['n r'], function(e) {
             window.location = pyroutes.url('new_repo');
         });
 
         % if hasattr(c, 'repo_name') and hasattr(c, 'rhodecode_db_repo'):
             // nav in repo context
             Mousetrap.bind(['g s'], function(e) {
                 window.location = pyroutes.url('summary_home', {'repo_name': REPO_NAME});
             });
             Mousetrap.bind(['g c'], function(e) {
                 window.location = pyroutes.url('changelog_home', {'repo_name': REPO_NAME});
             });
             Mousetrap.bind(['g F'], function(e) {
                 window.location = pyroutes.url('files_home', {'repo_name': REPO_NAME, 'revision': '${c.rhodecode_db_repo.landing_rev[1]}', 'f_path': '', 'search': '1'});
             });
             Mousetrap.bind(['g f'], function(e) {
                 window.location = pyroutes.url('files_home', {'repo_name': REPO_NAME, 'revision': '${c.rhodecode_db_repo.landing_rev[1]}', 'f_path': ''});
             });
             Mousetrap.bind(['g p'], function(e) {
                 window.location = pyroutes.url('pullrequest_show_all', {'repo_name': REPO_NAME});
             });
             Mousetrap.bind(['g o'], function(e) {
                 window.location = pyroutes.url('edit_repo', {'repo_name': REPO_NAME});
             });
             Mousetrap.bind(['g O'], function(e) {
                 window.location = pyroutes.url('edit_repo_perms', {'repo_name': REPO_NAME});
             });
         % endif
 
     </script>
     <script src="${h.url('/js/rhodecode/base/keyboard-bindings.js', ver=c.rhodecode_version_hash)}"></script>
 </%def>
 
 <div class="modal" id="help_kb" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
           <h4 class="modal-title" id="myModalLabel">${_('Keyboard shortcuts')}</h4>
         </div>
         <div class="modal-body">
               <div class="block-left">
                 <table class="keyboard-mappings">
                     <tbody>
                   <tr>
                     <th></th>
                     <th>${_('Site-wide shortcuts')}</th>
                   </tr>
                   <%
                      elems = [
                          ('/', 'Open quick search box'),
                          ('g h', 'Goto home page'),
                          ('g g', 'Goto my private gists page'),
                          ('g G', 'Goto my public gists page'),
                          ('n r', 'New repository page'),
                          ('n g', 'New gist page'),
                      ]
                   %>
                   %for key, desc in elems:
                   <tr>
                     <td class="keys">
                       <span class="key tag">${key}</span>
                     </td>
                     <td>${desc}</td>
                   </tr>
                 %endfor
                 </tbody>
                   </table>
               </div>
               <div class="block-left">
                 <table class="keyboard-mappings">
                 <tbody>
                   <tr>
                     <th></th>
                     <th>${_('Repositories')}</th>
                   </tr>
                   <%
                      elems = [
                          ('g s', 'Goto summary page'),
                          ('g c', 'Goto changelog page'),
                          ('g f', 'Goto files page'),
                          ('g F', 'Goto files page with file search activated'),
                          ('g p', 'Goto pull requests page'),
                          ('g o', 'Goto repository settings'),
                          ('g O', 'Goto repository permissions settings'),
                      ]
                   %>
                   %for key, desc in elems:
                   <tr>
                     <td class="keys">
                       <span class="key tag">${key}</span>
                     </td>
                     <td>${desc}</td>
                   </tr>
                 %endfor
                 </tbody>
               </table>
             </div>
         </div>
         <div class="modal-footer">
         </div>
       </div><!-- /.modal-content -->
     </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->

rhodecode/templates/email_templates/user_registration.mako

@@ -1,21 +1,22 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 
 <%def name="subject()" filter="n,trim">
 RhodeCode new user registration
 </%def>
 
 ## plain text version of the email. Empty by default
 <%def name="body_plaintext()" filter="n,trim">
 
 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.url('user_profile', username=user.username, qualified=True)}
 </%def>
 
 ## BODY GOES BELOW
 <div style="white-space: pre-wrap">
 ${body_plaintext()}
-</div>
  No newline at end of file
+</div>

rhodecode/templates/login.html

@@ -1,77 +1,77 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base/root.html"/>
 
 <%def name="title()">
     ${_('Sign In')}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <style>body{background-color:#eeeeee;}</style>
 <div class="loginbox">
     <div class="header">
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">
                     <a href="${h.url('home')}"><img src="${h.url('/images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
                 </div>
                 %if c.rhodecode_name:
                 <div class="branding"> ${h.branding(c.rhodecode_name)}</div>
                 %endif
             </div>
         </div>
     </div>
 
     <div class="loginwrapper">
         <div class="left-column">
             <img class="sign-in-image" src="${h.url('/images/sign-in.png')}" alt="RhodeCode"/>
         </div>
-        
+        <%block name="above_login_button" />
         <div id="login" class="right-column">
             <%include file="/base/flash_msg.html"/>
             <!-- login -->
             <div class="sign-in-title">
                 <h1>${_('Sign In')}</h1>
                 %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
                 <h4>${h.link_to(_("Go to the registration page to create a new account."), request.route_path('register'))}</h4>
                 %endif
             </div>
             <div class="inner form">
                 ${h.form(request.route_path('login', _query={'came_from': came_from}), needs_csrf_token=False)}
 
                     <label for="username">${_('Username')}:</label>
                     ${h.text('username', class_='focus', value=defaults.get('username'))}
                     %if 'username' in errors:
                     <span class="error-message">${errors.get('username')}</span>
                     <br />
                     %endif
 
                     <label for="password">${_('Password')}:</label>
                     ${h.password('password', class_='focus')}
                     %if 'password' in errors:
                     <span class="error-message">${errors.get('password')}</span>
                     <br />
                     %endif
 
                     ${h.checkbox('remember', value=True, checked=defaults.get('remember'))}
                     <label class="checkbox" for="remember">${_('Remember me')}</label>
 
                     <p class="links">
                         ${h.link_to(_('Forgot your password?'), h.route_path('reset_password'))}
                     </p> 
 
                     ${h.submit('sign_in', _('Sign In'), class_="btn sign-in")}
 
                 ${h.end_form()}
                 <script type="text/javascript">
                     $(document).ready(function(){
                         $('#username').focus();
                     })
                 </script>
             </div>
             <!-- end login -->
             <%block name="below_login_button" />
         </div>
     </div>
 </div>

rhodecode/templates/pullrequests/pullrequests.html

@@ -1,132 +1,132 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
     ${_('%s Pull Requests') % c.repo_name}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
 
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='showpullrequest')}
 </%def>
 
 
 <%def name="main()">
 <div class="box">
   <div class="title">
       ${self.repo_page_title(c.rhodecode_db_repo)}
 
       <ul class="links">
         <li>
            %if c.rhodecode_user.username != h.DEFAULT_USER:
             <span>
                 <a id="open_new_pull_request" class="btn btn-small btn-success" href="${h.url('pullrequest_home',repo_name=c.repo_name)}">
                     ${_('Open new Pull Request')}
                 </a>
             </span>
            %endif
         </li>
       </ul>
 
     ${self.breadcrumbs()}
   </div>
 
   <div class="sidebar-col-wrapper">
     ##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=='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=='source' else ''}"><a href="${h.url('pullrequest_show_all',repo_name=c.repo_name,source=1)}">${_('From this repo')}</a></li>
         </ul>
     </div>
 
     <div class="main-content-full-width">
       <div class="panel panel-default">
         <div class="panel-heading">
           <h3 class="panel-title">
               %if c.source:
                   ${_('Pull Requests from %(repo_name)s repository') % {'repo_name': c.repo_name}}
               %elif c.closed:
                   ${_('Closed Pull Requests to repository %(repo_name)s') % {'repo_name': c.repo_name}}
               %elif c.my:
                   ${_('Pull Requests to %(repo_name)s repository opened by me') % {'repo_name': c.repo_name}}
               %elif c.awaiting_review:
                   ${_('Pull Requests to %(repo_name)s repository awaiting review') % {'repo_name': c.repo_name}}
               %elif c.awaiting_my_review:
                   ${_('Pull Requests to %(repo_name)s repository awaiting my review') % {'repo_name': c.repo_name}}
               %else:
                   ${_('Pull Requests to %(repo_name)s repository') % {'repo_name': c.repo_name}}
               %endif
           </h3>
         </div>
         <div class="panel-body">
           <table id="pull_request_list_table" class="display"></table>
         </div>
       </div>
     </div>
   </div>
 </div>
 
 <script type="text/javascript">
 $(document).ready(function() {
     // object list
     $('#pull_request_list_table').DataTable({
       data: ${c.data|n},
       processing: true,
       serverSide: true,
       deferLoading: ${c.records_total},
       ajax: "",
       dom: 'tp',
       pageLength: ${c.visual.dashboard_items},
       order: [[ 1, "desc" ]],
       columns: [
          { data: {"_": "status",
                   "sort": "status"}, title: "", className: "td-status", orderable: false},
          { data: {"_": "name",
                   "sort": "name_raw"}, title: "${_('Name')}", className: "td-componentname", "type": "num" },
          { data: {"_": "author",
                   "sort": "author_raw"}, title: "${_('Author')}", className: "td-user", orderable: false },
          { data: {"_": "title",
                   "sort": "title"}, title: "${_('Title')}", className: "td-description" },
          { data: {"_": "comments",
                   "sort": "comments_raw"}, title: "", className: "td-comments", orderable: false},
          { data: {"_": "updated_on",
                   "sort": "updated_on_raw"}, title: "${_('Updated on')}", className: "td-time" }
       ],
       language: {
             paginate: DEFAULT_GRID_PAGINATION
       },
       "drawCallback": function( settings, json ) {
           timeagoActivate();
           tooltip_activate();
       },
       "createdRow": function ( row, data, index ) {
           if (data['closed']) {
             $(row).addClass('closed');
           }
       }
     });
 });
 $('#pull_request_list_table').on('xhr.dt', function(e, settings, json, xhr){
     $('#pull_request_list_table').css('opacity', 1);
 });
 
 $('#pull_request_list_table').on('preXhr.dt', function(e, settings, data){
     $('#pull_request_list_table').css('opacity', 0.3);
 });
 </script>
 </%def>

rhodecode/templates/register.html

@@ -1,123 +1,123 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base/root.html"/>
 
 <%def name="title()">
     ${_('Create an Account')}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 <style>body{background-color:#eeeeee;}</style>
 
 <div class="loginbox">
     <div class="header">
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">
                     <a href="${h.url('home')}"><img src="${h.url('/images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
                 </div>
                 %if c.rhodecode_name:
                 <div class="branding"> ${h.branding(c.rhodecode_name)}</div>
                 %endif
             </div>
         </div>
     </div>
 
     <div class="loginwrapper">
         <div class="left-column">
             <img class="sign-in-image" src="${h.url('/images/sign-in.png')}" alt="RhodeCode"/>
         </div>
-        
+        <%block name="above_register_button" />
         <div id="register" class="right-column">
             <%include file="/base/flash_msg.html"/>
             <!-- login -->
             <div class="sign-in-title">
                 <h1>${_('Create an account')}</h1>
                 <h4>${h.link_to(_("Go to the login page to sign in with an existing account."), request.route_path('login'))}</h4>
             </div>
             <div class="inner form">
                 ${h.form(request.route_path('register'), needs_csrf_token=False)}
 
                     <label for="username">${_('Username')}:</label>
                     ${h.text('username', defaults.get('username'))}
                     %if 'username' in errors:
                       <span class="error-message">${errors.get('username')}</span>
                       <br />
                     %endif
 
                     <label for="password">${_('Password')}:</label>
                     ${h.password('password', defaults.get('password'))}
                     %if 'password' in errors:
                       <span class="error-message">${errors.get('password')}</span>
                       <br />
                     %endif
 
                     <label for="password_confirmation">${_('Re-enter password')}:</label>
                     ${h.password('password_confirmation', defaults.get('password_confirmation'))}
                     %if 'password_confirmation' in errors:
                       <span class="error-message">${errors.get('password_confirmation')}</span>
                       <br />
                     %endif
 
                     <label for="firstname">${_('First Name')}:</label>
                     ${h.text('firstname', defaults.get('firstname'))}
                     %if 'firstname' in errors:
                       <span class="error-message">${errors.get('firstname')}</span>
                       <br />
                     %endif
 
                     <label for="lastname">${_('Last Name')}:</label>
                     ${h.text('lastname', defaults.get('lastname'))}
                     %if 'lastname' in errors:
                       <span class="error-message">${errors.get('lastname')}</span>
                       <br />
                     %endif
 
                     <label for="email">${_('Email')}:</label>
                     ${h.text('email', defaults.get('email'))}
                     %if 'email' in errors:
                       <span class="error-message">${errors.get('email')}</span>
                       <br />
                     %endif
 
                     %if captcha_active:
                     <div>
                         <label for="recaptcha">${_('Captcha')}:</label>
                         ${h.hidden('recaptcha_field')}
                         <div id="recaptcha"></div>
                         %if 'recaptcha_field' in errors:
                           <span class="error-message">${errors.get('recaptcha_field')}</span>
                           <br />
                         %endif
                     </div>
                     %endif
 
                     %if not auto_active:
                         <p class="activation_msg">
                             ${_('Account activation requires admin approval.')}
                         </p>
                     %endif
                     <p class="register_message">
                         ${register_message|n}
                     </p>
 
                     ${h.submit('sign_up',_('Create Account'),class_="btn sign-in")}
 
                 ${h.end_form()}
             </div>
             <%block name="below_register_button" />
         </div>
     </div>
 </div>
 
 %if captcha_active:
 <script type="text/javascript" src="https://www.google.com/recaptcha/api/js/recaptcha_ajax.js"></script>
 %endif
 <script type="text/javascript">
 $(document).ready(function(){
     $('#username').focus();
     %if captcha_active:
       Recaptcha.create("${captcha_public_key}", "recaptcha", {theme: "white"});
     %endif
 });
 </script>

rhodecode/tests/functional/test_admin_my_account.py

@@ -1,341 +1,344 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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 import helpers as h
 from rhodecode.model.db import User, UserFollowing, Repository, UserApiKeys
 from rhodecode.model.meta import Session
 from rhodecode.tests import (
     TestController, url, TEST_USER_ADMIN_LOGIN, TEST_USER_REGULAR_EMAIL,
     assert_session_flash)
 from rhodecode.tests.fixture import Fixture
 from rhodecode.tests.utils import AssertResponse
 
 fixture = Fixture()
 
 
 class TestMyAccountController(TestController):
     test_user_1 = 'testme'
     destroy_users = set()
 
     @classmethod
     def teardown_class(cls):
         fixture.destroy_users(cls.destroy_users)
 
     def test_my_account(self):
         self.log_user()
         response = self.app.get(url('my_account'))
 
         response.mustcontain('test_admin')
         response.mustcontain('href="/_admin/my_account/edit"')
 
     def test_logout_form_contains_csrf(self, autologin_user, csrf_token):
         response = self.app.get(url('my_account'))
         assert_response = AssertResponse(response)
         element = assert_response.get_element('.logout #csrf_token')
         assert element.value == csrf_token
 
     def test_my_account_edit(self):
         self.log_user()
         response = self.app.get(url('my_account_edit'))
 
         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()
         response = self.app.get(url('my_account_pullrequests'))
         response.mustcontain('You currently have no open pull requests.')
 
-        pr = pr_util.create_pull_request()
+        pr = pr_util.create_pull_request(title='TestMyAccountPR')
         response = self.app.get(url('my_account_pullrequests'))
-        response.mustcontain('Pull request #%d opened' % pr.pull_request_id)
+        response.mustcontain('There are currently no open pull requests '
+                             'requiring your participation')
+
+        response.mustcontain('#%s: TestMyAccountPR' % pr.pull_request_id)
 
     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': '[e-mail]',
                                   '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 == '[e-mail]').one().email_id
 
         response.mustcontain('[e-mail]')
         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", [
             ('firstname', {'firstname': 'new_username'}),
             ('lastname', {'lastname': 'new_username'}),
             ('admin', {'admin': True}),
             ('admin', {'admin': False}),
             ('extern_type', {'extern_type': 'ldap'}),
             ('extern_type', {'extern_type': None}),
             # ('extern_name', {'extern_name': 'test'}),
             # ('extern_name', {'extern_name': None}),
             ('active', {'active': False}),
             ('active', {'active': True}),
             ('email', {'email': '[e-mail]'}),
         ])
     def test_my_account_update(self, name, attrs):
         usr = fixture.create_user(self.test_user_1, password='qweqwe',
                                   email='[e-mail]',
                                   extern_type='rhodecode',
                                   extern_name=self.test_user_1,
                                   skip_if_exists=True)
         self.destroy_users.add(self.test_user_1)
 
         params = usr.get_api_data()  # current user data
         user_id = usr.user_id
         self.log_user(username=self.test_user_1, password='qweqwe')
 
         params.update({'password_confirmation': ''})
         params.update({'new_password': ''})
         params.update({'extern_type': 'rhodecode'})
         params.update({'extern_name': self.test_user_1})
         params.update({'csrf_token': self.csrf_token})
 
         params.update(attrs)
         # my account page cannot set language param yet, only for admins
         del params['language']
         response = self.app.post(url('my_account'), params)
 
         assert_session_flash(
             response, 'Your account was updated successfully')
 
         del params['csrf_token']
 
         updated_user = User.get_by_username(self.test_user_1)
         updated_params = updated_user.get_api_data()
         updated_params.update({'password_confirmation': ''})
         updated_params.update({'new_password': ''})
 
         params['last_login'] = updated_params['last_login']
         # my account page cannot set language param yet, only for admins
         # but we get this info from API anyway
         params['language'] = updated_params['language']
 
         if name == 'email':
             params['emails'] = [attrs['email']]
         if name == 'extern_type':
             # cannot update this via form, expected value is original one
             params['extern_type'] = "rhodecode"
         if name == 'extern_name':
             # cannot update this via form, expected value is original one
             params['extern_name'] = str(user_id)
         if name == 'active':
             # my account cannot deactivate account
             params['active'] = True
         if name == 'admin':
             # my account cannot make you an admin !
             params['admin'] = False
 
         assert params == updated_params
 
     def test_my_account_update_err_email_exists(self):
         self.log_user()
 
         new_email = '[e-mail]'  # already exisitn email
         response = self.app.post(url('my_account'),
                                  params={
                                      'username': 'test_admin',
                                      'new_password': 'test12',
                                      'password_confirmation': 'test122',
                                      'firstname': 'NewName',
                                      'lastname': 'NewLastname',
                                      'email': new_email,
                                      'csrf_token': self.csrf_token,
             })
 
         response.mustcontain('This e-mail address is already taken')
 
     def test_my_account_update_err(self):
         self.log_user('test_regular2', 'test12')
 
         new_email = 'newmail.pl'
         response = self.app.post(url('my_account'),
                                  params={
                                      'username': 'test_admin',
                                      'new_password': 'test12',
                                      'password_confirmation': 'test122',
                                      'firstname': 'NewName',
                                      'lastname': 'NewLastname',
                                      'email': new_email,
                                      'csrf_token': self.csrf_token,
             })
 
         response.mustcontain('An email address must contain a single @')
         from rhodecode.model import validators
         msg = validators.ValidUsername(
             edit=False, old_data={})._messages['username_exists']
         msg = h.html_escape(msg % {'username': 'test_admin'})
         response.mustcontain(u"%s" % msg)
 
     def test_my_account_auth_tokens(self):
         usr = self.log_user('test_regular2', 'test12')
         user = User.get(usr['user_id'])
         response = self.app.get(url('my_account_auth_tokens'))
         response.mustcontain(user.api_key)
         response.mustcontain('expires: never')
 
     @pytest.mark.parametrize("desc, lifetime", [
         ('forever', -1),
         ('5mins', 60*5),
         ('30days', 60*60*24*30),
     ])
     def test_my_account_add_auth_tokens(self, desc, lifetime):
         usr = self.log_user('test_regular2', 'test12')
         user = User.get(usr['user_id'])
         response = self.app.post(url('my_account_auth_tokens'),
                                  {'description': desc, 'lifetime': lifetime,
                                   'csrf_token': self.csrf_token})
         assert_session_flash(response, 'Auth token successfully created')
         try:
             response = response.follow()
             user = User.get(usr['user_id'])
             for auth_token in user.auth_tokens:
                 response.mustcontain(auth_token)
         finally:
             for auth_token in UserApiKeys.query().all():
                 Session().delete(auth_token)
                 Session().commit()
 
     def test_my_account_remove_auth_token(self):
         # TODO: without this cleanup it fails when run with the whole
         # test suite, so there must be some interference with other tests.
         UserApiKeys.query().delete()
 
         usr = self.log_user('test_regular2', 'test12')
         User.get(usr['user_id'])
         response = self.app.post(url('my_account_auth_tokens'),
                                  {'description': 'desc', 'lifetime': -1,
                                   'csrf_token': self.csrf_token})
         assert_session_flash(response, 'Auth token successfully created')
         response = response.follow()
 
         # now delete our key
         keys = UserApiKeys.query().all()
         assert 1 == len(keys)
 
         response = self.app.post(
             url('my_account_auth_tokens'),
             {'_method': 'delete', 'del_auth_token': keys[0].api_key,
                 'csrf_token': self.csrf_token})
         assert_session_flash(response, 'Auth token successfully deleted')
         keys = UserApiKeys.query().all()
         assert 0 == len(keys)
 
     def test_my_account_reset_main_auth_token(self):
         usr = self.log_user('test_regular2', 'test12')
         user = User.get(usr['user_id'])
         api_key = user.api_key
         response = self.app.get(url('my_account_auth_tokens'))
         response.mustcontain(api_key)
         response.mustcontain('expires: never')
 
         response = self.app.post(
             url('my_account_auth_tokens'),
             {'_method': 'delete', 'del_auth_token_builtin': api_key,
                 'csrf_token': self.csrf_token})
         assert_session_flash(response, 'Auth token successfully reset')
         response = response.follow()
         response.mustcontain(no=[api_key])
 
     def test_password_is_updated_in_session_on_password_change(
             self, user_util):
         old_password = 'abcdef123'
         new_password = 'abcdef124'
 
         user = user_util.create_user(password=old_password)
         session = self.log_user(user.username, old_password)
         old_password_hash = session['password']
 
         form_data = {
             'current_password': old_password,
             'new_password': new_password,
             'new_password_confirmation': new_password,
             'csrf_token': self.csrf_token
         }
         self.app.post(url('my_account_password'), form_data)
 
         response = self.app.get(url('home'))
         new_password_hash = response.session['rhodecode_user']['password']
 
         assert old_password_hash != new_password_hash

rhodecode/tests/functional/test_admin_settings.py

@@ -1,622 +1,624 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import mock
 import pytest
 
 import rhodecode
 from rhodecode.config.routing import ADMIN_PREFIX
 from rhodecode.lib.utils2 import md5
 from rhodecode.model.db import RhodeCodeUi
 from rhodecode.model.meta import Session
 from rhodecode.model.settings import SettingsModel, IssueTrackerSettingsModel
 from rhodecode.tests import url, assert_session_flash
 from rhodecode.tests.utils import AssertResponse
 
 
 UPDATE_DATA_QUALNAME = (
     'rhodecode.controllers.admin.settings.SettingsController.get_update_data')
 
 
 @pytest.mark.usefixtures('autologin_user', 'app')
 class TestAdminSettingsController:
 
     @pytest.mark.parametrize('urlname', [
         'admin_settings_vcs',
         'admin_settings_mapping',
         'admin_settings_global',
         'admin_settings_visual',
         'admin_settings_email',
         'admin_settings_hooks',
         'admin_settings_search',
         'admin_settings_system',
     ])
     def test_simple_get(self, urlname, app):
         app.get(url(urlname))
 
     def test_create_custom_hook(self, csrf_token):
         response = self.app.post(
             url('admin_settings_hooks'),
             params={
                 'new_hook_ui_key': 'test_hooks_1',
                 'new_hook_ui_value': 'cd /tmp',
                 'csrf_token': csrf_token})
 
         response = response.follow()
         response.mustcontain('test_hooks_1')
         response.mustcontain('cd /tmp')
 
     def test_create_custom_hook_delete(self, csrf_token):
         response = self.app.post(
             url('admin_settings_hooks'),
             params={
                 'new_hook_ui_key': 'test_hooks_2',
                 'new_hook_ui_value': 'cd /tmp2',
                 'csrf_token': csrf_token})
 
         response = response.follow()
         response.mustcontain('test_hooks_2')
         response.mustcontain('cd /tmp2')
 
         hook_id = SettingsModel().get_ui_by_key('test_hooks_2').ui_id
 
         # delete
         self.app.post(
             url('admin_settings_hooks'),
             params={'hook_id': hook_id, 'csrf_token': csrf_token})
         response = self.app.get(url('admin_settings_hooks'))
         response.mustcontain(no=['test_hooks_2'])
         response.mustcontain(no=['cd /tmp2'])
 
     def test_system_update_new_version(self):
         update_data = {
             'versions': [
                 {
                     'version': '100.3.1415926535',
                     'general': 'The latest version we are ever going to ship'
                 },
                 {
                     'version': '0.0.0',
                     'general': 'The first version we ever shipped'
                 }
             ]
         }
         with mock.patch(UPDATE_DATA_QUALNAME, return_value=update_data):
             response = self.app.get(url('admin_settings_system_update'))
             response.mustcontain('A <b>new version</b> is available')
 
     def test_system_update_nothing_new(self):
         update_data = {
             'versions': [
                 {
                     'version': '0.0.0',
                     'general': 'The first version we ever shipped'
                 }
             ]
         }
         with mock.patch(UPDATE_DATA_QUALNAME, return_value=update_data):
             response = self.app.get(url('admin_settings_system_update'))
             response.mustcontain(
                 'You already have the <b>latest</b> stable version.')
 
     def test_system_update_bad_response(self):
         with mock.patch(UPDATE_DATA_QUALNAME, side_effect=ValueError('foo')):
             response = self.app.get(url('admin_settings_system_update'))
             response.mustcontain(
                 'Bad data sent from update server')
 
 
 @pytest.mark.usefixtures('autologin_user', 'app')
 class TestAdminSettingsGlobal:
 
     def test_pre_post_code_code_active(self, csrf_token):
         pre_code = 'rc-pre-code-187652122'
         post_code = 'rc-postcode-98165231'
 
         response = self.post_and_verify_settings({
             'rhodecode_pre_code': pre_code,
             'rhodecode_post_code': post_code,
             'csrf_token': csrf_token,
         })
 
         response = response.follow()
         response.mustcontain(pre_code, post_code)
 
     def test_pre_post_code_code_inactive(self, csrf_token):
         pre_code = 'rc-pre-code-187652122'
         post_code = 'rc-postcode-98165231'
         response = self.post_and_verify_settings({
             'rhodecode_pre_code': '',
             'rhodecode_post_code': '',
             'csrf_token': csrf_token,
         })
 
         response = response.follow()
         response.mustcontain(no=[pre_code, post_code])
 
     def test_captcha_activate(self, csrf_token):
         self.post_and_verify_settings({
             'rhodecode_captcha_private_key': '1234567890',
             'rhodecode_captcha_public_key': '1234567890',
             'csrf_token': csrf_token,
         })
 
         response = self.app.get(ADMIN_PREFIX + '/register')
         response.mustcontain('captcha')
 
     def test_captcha_deactivate(self, csrf_token):
         self.post_and_verify_settings({
             'rhodecode_captcha_private_key': '',
             'rhodecode_captcha_public_key': '1234567890',
             'csrf_token': csrf_token,
         })
 
         response = self.app.get(ADMIN_PREFIX + '/register')
         response.mustcontain(no=['captcha'])
 
     def test_title_change(self, csrf_token):
         old_title = 'RhodeCode'
         new_title = old_title + '_changed'
 
         for new_title in ['Changed', 'Żółwik', old_title]:
             response = self.post_and_verify_settings({
                 'rhodecode_title': new_title,
                 'csrf_token': csrf_token,
             })
 
             response = response.follow()
             response.mustcontain(
                 """<div class="branding">- %s</div>""" % new_title)
 
     def post_and_verify_settings(self, settings):
         old_title = 'RhodeCode'
         old_realm = 'RhodeCode authentication'
         params = {
             'rhodecode_title': old_title,
             'rhodecode_realm': old_realm,
             'rhodecode_pre_code': '',
             'rhodecode_post_code': '',
             'rhodecode_captcha_private_key': '',
             'rhodecode_captcha_public_key': '',
         }
         params.update(settings)
         response = self.app.post(url('admin_settings_global'), params=params)
 
         assert_session_flash(response, 'Updated application settings')
         app_settings = SettingsModel().get_all_settings()
         del settings['csrf_token']
         for key, value in settings.iteritems():
             assert app_settings[key] == value.decode('utf-8')
 
         return response
 
 
 @pytest.mark.usefixtures('autologin_user', 'app')
 class TestAdminSettingsVcs:
 
     def test_contains_svn_default_patterns(self, app):
         response = app.get(url('admin_settings_vcs'))
         expected_patterns = [
             '/trunk',
             '/branches/*',
             '/tags/*',
         ]
         for pattern in expected_patterns:
             response.mustcontain(pattern)
 
     def test_add_new_svn_branch_and_tag_pattern(
             self, app, backend_svn, form_defaults, disable_sql_cache,
             csrf_token):
         form_defaults.update({
             'new_svn_branch': '/exp/branches/*',
             'new_svn_tag': '/important_tags/*',
             'csrf_token': csrf_token,
         })
 
         response = app.post(
             url('admin_settings_vcs'), params=form_defaults, status=302)
         response = response.follow()
 
         # Expect to find the new values on the page
         response.mustcontain('/exp/branches/*')
         response.mustcontain('/important_tags/*')
 
         # Expect that those patterns are used to match branches and tags now
         repo = backend_svn['svn-simple-layout'].scm_instance()
         assert 'exp/branches/exp-sphinx-docs' in repo.branches
         assert 'important_tags/v0.5' in repo.tags
 
     def test_add_same_svn_value_twice_shows_an_error_message(
             self, app, form_defaults, csrf_token, settings_util):
         settings_util.create_rhodecode_ui('vcs_svn_branch', '/test')
         settings_util.create_rhodecode_ui('vcs_svn_tag', '/test')
 
         response = app.post(
             url('admin_settings_vcs'),
             params={
                 'paths_root_path': form_defaults['paths_root_path'],
                 'new_svn_branch': '/test',
                 'new_svn_tag': '/test',
                 'csrf_token': csrf_token,
             },
             status=200)
 
         response.mustcontain("Pattern already exists")
         response.mustcontain("Some form inputs contain invalid data.")
 
     @pytest.mark.parametrize('section', [
         'vcs_svn_branch',
         'vcs_svn_tag',
     ])
     def test_delete_svn_patterns(
             self, section, app, csrf_token, settings_util):
         setting = settings_util.create_rhodecode_ui(
             section, '/test_delete', cleanup=False)
 
         app.post(
             url('admin_settings_vcs'),
             params={
                 '_method': 'delete',
                 'delete_svn_pattern': setting.ui_id,
                 'csrf_token': csrf_token},
             headers={'X-REQUESTED-WITH': 'XMLHttpRequest'})
 
     @pytest.mark.parametrize('section', [
         'vcs_svn_branch',
         'vcs_svn_tag',
     ])
     def test_delete_svn_patterns_raises_400_when_no_xhr(
             self, section, app, csrf_token, settings_util):
         setting = settings_util.create_rhodecode_ui(section, '/test_delete')
 
         app.post(
             url('admin_settings_vcs'),
             params={
                 '_method': 'delete',
                 'delete_svn_pattern': setting.ui_id,
                 'csrf_token': csrf_token},
             status=400)
 
     def test_extensions_hgsubversion(self, app, form_defaults, csrf_token):
         form_defaults.update({
             'csrf_token': csrf_token,
             'extensions_hgsubversion': 'True',
         })
         response = app.post(
             url('admin_settings_vcs'),
             params=form_defaults,
             status=302)
 
         response = response.follow()
         extensions_input = (
             '<input id="extensions_hgsubversion" '
             'name="extensions_hgsubversion" 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')
 
     def test_has_an_input_for_invalidation_of_inline_comments(
             self, app):
         response = app.get(url('admin_settings_vcs'))
         assert_response = AssertResponse(response)
         assert_response.one_element_exists(
             '[name=rhodecode_use_outdated_comments]')
 
     @pytest.mark.parametrize('new_value', [True, False])
     def test_allows_to_change_invalidation_of_inline_comments(
             self, app, form_defaults, csrf_token, new_value):
         setting_key = 'use_outdated_comments'
         setting = SettingsModel().create_or_update_setting(
             setting_key, not new_value, 'bool')
         Session().add(setting)
         Session().commit()
 
         form_defaults.update({
             'csrf_token': csrf_token,
             'rhodecode_use_outdated_comments': str(new_value),
         })
         response = app.post(
             url('admin_settings_vcs'),
             params=form_defaults,
             status=302)
         response = response.follow()
         setting = SettingsModel().get_setting_by_name(setting_key)
         assert setting.app_settings_value is new_value
 
     @pytest.fixture
     def disable_sql_cache(self, request):
         patcher = mock.patch(
             'rhodecode.lib.caching_query.FromCache.process_query')
         request.addfinalizer(patcher.stop)
         patcher.start()
 
     @pytest.fixture
     def form_defaults(self):
         from rhodecode.controllers.admin.settings import SettingsController
         controller = SettingsController()
         return controller._form_defaults()
 
     # TODO: johbo: What we really want is to checkpoint before a test run and
     # reset the session afterwards.
     @pytest.fixture(scope='class', autouse=True)
     def cleanup_settings(self, request, pylonsapp):
         ui_id = RhodeCodeUi.ui_id
         original_ids = list(
             r.ui_id for r in RhodeCodeUi.query().values(ui_id))
 
         @request.addfinalizer
         def cleanup():
             RhodeCodeUi.query().filter(
                 ui_id.notin_(original_ids)).delete(False)
 
 
 @pytest.mark.usefixtures('autologin_user', 'app')
 class TestLabsSettings(object):
     def test_get_settings_page_disabled(self):
         with mock.patch.dict(rhodecode.CONFIG,
                              {'labs_settings_active': 'false'}):
             response = self.app.get(url('admin_settings_labs'), status=302)
 
         assert response.location.endswith(url('admin_settings'))
 
     def test_get_settings_page_enabled(self):
         from rhodecode.controllers.admin import settings
         lab_settings = [
             settings.LabSetting(
                 key='rhodecode_bool',
                 type='bool',
                 group='bool group',
                 label='bool label',
                 help='bool help'
             ),
             settings.LabSetting(
                 key='rhodecode_text',
                 type='unicode',
                 group='text group',
                 label='text label',
                 help='text help'
             ),
         ]
         with mock.patch.dict(rhodecode.CONFIG,
                              {'labs_settings_active': 'true'}):
             with mock.patch.object(settings, '_LAB_SETTINGS', lab_settings):
                 response = self.app.get(url('admin_settings_labs'))
 
         assert '<label>bool group:</label>' in response
         assert '<label for="rhodecode_bool">bool label</label>' in response
         assert '<p class="help-block">bool help</p>' in response
         assert 'name="rhodecode_bool" type="checkbox"' in response
 
         assert '<label>text group:</label>' in response
         assert '<label for="rhodecode_text">text label</label>' in response
         assert '<p class="help-block">text help</p>' in response
         assert 'name="rhodecode_text" size="60" type="text"' in response
 
     @pytest.mark.parametrize('setting_name', [
         'proxy_subversion_http_requests',
         'hg_use_rebase_for_merging',
     ])
     def test_update_boolean_settings(self, csrf_token, setting_name):
         self.app.post(
             url('admin_settings_labs'),
             params={
                 'rhodecode_{}'.format(setting_name): 'true',
                 'csrf_token': csrf_token,
             })
         setting = SettingsModel().get_setting_by_name(setting_name)
         assert setting.app_settings_value
 
         self.app.post(
             url('admin_settings_labs'),
             params={
                 'rhodecode_{}'.format(setting_name): 'false',
                 'csrf_token': csrf_token,
             })
         setting = SettingsModel().get_setting_by_name(setting_name)
         assert not setting.app_settings_value
 
     @pytest.mark.parametrize('setting_name', [
         'subversion_http_server_url',
     ])
     def test_update_string_settings(self, csrf_token, setting_name):
         self.app.post(
             url('admin_settings_labs'),
             params={
                 'rhodecode_{}'.format(setting_name): 'Test 1',
                 'csrf_token': csrf_token,
             })
         setting = SettingsModel().get_setting_by_name(setting_name)
         assert setting.app_settings_value == 'Test 1'
 
         self.app.post(
             url('admin_settings_labs'),
             params={
                 'rhodecode_{}'.format(setting_name): ' Test 2 ',
                 'csrf_token': csrf_token,
             })
         setting = SettingsModel().get_setting_by_name(setting_name)
         assert setting.app_settings_value == 'Test 2'
 
 
 @pytest.mark.usefixtures('app')
 class TestOpenSourceLicenses(object):
+
+    def _get_url(self):
+        return ADMIN_PREFIX + '/settings/open_source'
+
     def test_records_are_displayed(self, autologin_user):
         sample_licenses = {
             "python2.7-pytest-2.7.1": {
                 "UNKNOWN": None
             },
             "python2.7-Markdown-2.6.2": {
                 "BSD-3-Clause": "http://spdx.org/licenses/BSD-3-Clause"
             }
         }
         read_licenses_patch = mock.patch(
-            'rhodecode.controllers.admin.settings.read_opensource_licenses',
+            'rhodecode.admin.views.read_opensource_licenses',
             return_value=sample_licenses)
         with read_licenses_patch:
-            response = self.app.get(
-                url('admin_settings_open_source'), status=200)
+            response = self.app.get(self._get_url(), status=200)
 
         assert_response = AssertResponse(response)
         assert_response.element_contains(
             '.panel-heading', 'Licenses of Third Party Packages')
         for name in sample_licenses:
             response.mustcontain(name)
             for license in sample_licenses[name]:
                 assert_response.element_contains('.panel-body', license)
 
     def test_records_can_be_read(self, autologin_user):
-        response = self.app.get(url('admin_settings_open_source'), status=200)
+        response = self.app.get(self._get_url(), status=200)
         assert_response = AssertResponse(response)
         assert_response.element_contains(
             '.panel-heading', 'Licenses of Third Party Packages')
 
     def test_forbidden_when_normal_user(self, autologin_regular_user):
-        self.app.get(
-            url('admin_settings_open_source'), status=403)
+        self.app.get(self._get_url(), status=403)
 
 
 @pytest.mark.usefixtures("app")
 class TestAdminSettingsIssueTracker:
     RC_PREFIX = 'rhodecode_'
     SHORT_PATTERN_KEY = 'issuetracker_pat_'
     PATTERN_KEY = RC_PREFIX + SHORT_PATTERN_KEY
 
     def test_issuetracker_index(self, autologin_user):
         response = self.app.get(url('admin_settings_issuetracker'))
         assert response.status_code == 200
 
     def test_add_issuetracker_pattern(
             self, request, autologin_user, csrf_token):
         pattern = 'issuetracker_pat'
         another_pattern = pattern+'1'
         post_url = url('admin_settings_issuetracker_save')
         post_data = {
             'new_pattern_pattern_0': pattern,
             'new_pattern_url_0': 'url',
             'new_pattern_prefix_0': 'prefix',
             'new_pattern_description_0': 'description',
             'new_pattern_pattern_1': another_pattern,
             'new_pattern_url_1': 'url1',
             'new_pattern_prefix_1': 'prefix1',
             'new_pattern_description_1': 'description1',
             'csrf_token': csrf_token
         }
         self.app.post(post_url, post_data, status=302)
         settings = SettingsModel().get_all_settings()
         self.uid = md5(pattern)
         assert settings[self.PATTERN_KEY+self.uid] == pattern
         self.another_uid = md5(another_pattern)
         assert settings[self.PATTERN_KEY+self.another_uid] == another_pattern
 
         @request.addfinalizer
         def cleanup():
             defaults = SettingsModel().get_all_settings()
 
             entries = [name for name in defaults if (
                 (self.uid in name) or (self.another_uid) in name)]
             start = len(self.RC_PREFIX)
             for del_key in entries:
                 # TODO: anderson: get_by_name needs name without prefix
                 entry = SettingsModel().get_setting_by_name(del_key[start:])
                 Session().delete(entry)
 
             Session().commit()
 
     def test_edit_issuetracker_pattern(
             self, autologin_user, backend, csrf_token, request):
         old_pattern = 'issuetracker_pat'
         old_uid = md5(old_pattern)
         pattern = 'issuetracker_pat_new'
         self.new_uid = md5(pattern)
 
         SettingsModel().create_or_update_setting(
             self.SHORT_PATTERN_KEY+old_uid, old_pattern, 'unicode')
 
         post_url = url('admin_settings_issuetracker_save')
         post_data = {
             'new_pattern_pattern_0': pattern,
             'new_pattern_url_0': 'url',
             'new_pattern_prefix_0': 'prefix',
             'new_pattern_description_0': 'description',
             'uid': old_uid,
             'csrf_token': csrf_token
         }
         self.app.post(post_url, post_data, status=302)
         settings = SettingsModel().get_all_settings()
         assert settings[self.PATTERN_KEY+self.new_uid] == pattern
         assert self.PATTERN_KEY+old_uid not in settings
 
         @request.addfinalizer
         def cleanup():
             IssueTrackerSettingsModel().delete_entries(self.new_uid)
 
     def test_replace_issuetracker_pattern_description(
             self, autologin_user, csrf_token, request, settings_util):
         prefix = 'issuetracker'
         pattern = 'issuetracker_pat'
         self.uid = md5(pattern)
         pattern_key = '_'.join([prefix, 'pat', self.uid])
         rc_pattern_key = '_'.join(['rhodecode', pattern_key])
         desc_key = '_'.join([prefix, 'desc', self.uid])
         rc_desc_key = '_'.join(['rhodecode', desc_key])
         new_description = 'new_description'
 
         settings_util.create_rhodecode_setting(
             pattern_key, pattern, 'unicode', cleanup=False)
         settings_util.create_rhodecode_setting(
             desc_key, 'old description', 'unicode', cleanup=False)
 
         post_url = url('admin_settings_issuetracker_save')
         post_data = {
             'new_pattern_pattern_0': pattern,
             'new_pattern_url_0': 'url',
             'new_pattern_prefix_0': 'prefix',
             'new_pattern_description_0': new_description,
             'uid': self.uid,
             'csrf_token': csrf_token
         }
         self.app.post(post_url, post_data, status=302)
         settings = SettingsModel().get_all_settings()
         assert settings[rc_pattern_key] == pattern
         assert settings[rc_desc_key] == new_description
 
         @request.addfinalizer
         def cleanup():
             IssueTrackerSettingsModel().delete_entries(self.uid)
 
     def test_delete_issuetracker_pattern(
             self, autologin_user, backend, csrf_token, settings_util):
         pattern = 'issuetracker_pat'
         uid = md5(pattern)
         settings_util.create_rhodecode_setting(
             self.SHORT_PATTERN_KEY+uid, pattern, 'unicode', cleanup=False)
 
         post_url = url('admin_issuetracker_delete')
         post_data = {
             '_method': 'delete',
             'uid': uid,
             'csrf_token': csrf_token
         }
         self.app.post(post_url, post_data, status=302)
         settings = SettingsModel().get_all_settings()
         assert 'rhodecode_%s%s' % (self.SHORT_PATTERN_KEY, uid) not in settings

rhodecode/tests/functional/test_feed.py

@@ -1,54 +1,54 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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.model.db import User
 from rhodecode.tests import *
 
 
 class TestFeedController(TestController):
 
     def test_rss(self, backend):
         self.log_user()
         response = self.app.get(url(controller='feed', action='rss',
                                     repo_name=backend.repo_name))
 
         assert response.content_type == "application/rss+xml"
         assert """<rss version="2.0">""" in response
 
     def test_rss_with_auth_token(self, backend):
-        auth_token = User.get_first_admin().feed_token
+        auth_token = User.get_first_super_admin().feed_token
         assert auth_token != ''
         response = self.app.get(url(controller='feed', action='rss',
                                     repo_name=backend.repo_name, auth_token=auth_token))
 
         assert response.content_type == "application/rss+xml"
         assert """<rss version="2.0">""" in response
 
     def test_atom(self, backend):
         self.log_user()
         response = self.app.get(url(controller='feed', action='atom',
                                     repo_name=backend.repo_name))
 
         assert response.content_type == """application/atom+xml"""
         assert """<?xml version="1.0" encoding="utf-8"?>""" in response
 
         tag1 = '<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en-us">'
         tag2 = '<feed xml:lang="en-us" xmlns="http://www.w3.org/2005/Atom">'
         assert tag1 in response or tag2 in response

rhodecode/tests/functional/test_home.py

@@ -1,365 +1,381 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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 mock import patch
 import pytest
 
 import rhodecode
 from rhodecode.lib.utils import map_groups
 from rhodecode.model.db import Repository, User, RepoGroup
 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.fixture import Fixture
 
 
 fixture = Fixture()
 
 
 class TestHomeController(TestController):
 
     def test_index(self):
         self.log_user()
         response = self.app.get(url(controller='home', action='index'))
         # if global permission is set
         response.mustcontain('Add Repository')
 
         # search for objects inside the JavaScript JSON
         for repo in Repository.getAll():
             response.mustcontain('"name_raw": "%s"' % repo.repo_name)
 
     def test_index_contains_backend_specific_details(self, backend):
         self.log_user()
         response = self.app.get(url(controller='home', action='index'))
         tip = backend.repo.get_commit().raw_id
 
         # html in javascript variable:
         response.mustcontain(r'<i class=\"icon-%s\"' % (backend.alias, ))
         response.mustcontain(r'href=\"/%s\"' % (backend.repo_name, ))
 
         response.mustcontain("""/%s/changeset/%s""" % (backend.repo_name, tip))
         response.mustcontain("""Added a symlink""")
 
     def test_index_with_anonymous_access_disabled(self):
         with fixture.anon_access(False):
             response = self.app.get(url(controller='home', action='index'),
                                     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.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.mustcontain("gr1/repo_in_group")
 
     @pytest.fixture(scope='class')
     def repo_group(self, request):
         gr = fixture.create_repo_group('gr1')
         fixture.create_repo(name='gr1/repo_in_group', repo_group=gr)
 
         @request.addfinalizer
         def cleanup():
             RepoModel().delete('gr1/repo_in_group')
             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')
         user.name = '<img src="/image1" onload="alert(\'Hello, World!\');">'
         user.lastname = (
             '<img src="/image2" onload="alert(\'Hello, World!\');">')
         Session().add(user)
         Session().commit()
 
         response = self.app.get(url(controller='home', action='index'))
         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;')
 
     @pytest.mark.parametrize("name, state", [
         ('Disabled', False),
         ('Enabled', True),
     ])
     def test_index_show_version(self, autologin_user, name, state):
         version_string = 'RhodeCode Enterprise %s' % rhodecode.__version__
 
-        show = SettingsModel().get_setting_by_name('show_version')
-        show.app_settings_value = state
-        Session().add(show)
+        sett = SettingsModel().create_or_update_setting(
+            'show_version', state, 'bool')
+        Session().add(sett)
         Session().commit()
+        SettingsModel().invalidate_settings_cache()
+
         response = self.app.get(url(controller='home', action='index'))
         if state is True:
             response.mustcontain(version_string)
         if state is False:
             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)
-        groups_mock.assert_called_once_with(name_contains=query)
+        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 = []
     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
 
 
 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

rhodecode/tests/functional/test_login.py

@@ -1,519 +1,519 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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 urlparse
 
 import mock
 import pytest
 
 from rhodecode.config.routing import ADMIN_PREFIX
 from rhodecode.tests import (
     assert_session_flash, url, HG_REPO, TEST_USER_ADMIN_LOGIN)
 from rhodecode.tests.fixture import Fixture
 from rhodecode.tests.utils import AssertResponse, get_session_from_response
 from rhodecode.lib.auth import check_password, generate_auth_token
 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
 from rhodecode.model.meta import Session
 
 fixture = Fixture()
 
 # Hardcode URLs because we don't have a request object to use
 # pyramids URL generation methods.
 login_url = ADMIN_PREFIX + '/login'
 logut_url = ADMIN_PREFIX + '/logout'
 register_url = ADMIN_PREFIX + '/register'
 pwd_reset_url = ADMIN_PREFIX + '/password_reset'
 pwd_reset_confirm_url = ADMIN_PREFIX + '/password_reset_confirmation'
 
 
 @pytest.mark.usefixtures('app')
 class TestLoginController:
     destroy_users = set()
 
     @classmethod
     def teardown_class(cls):
         fixture.destroy_users(cls.destroy_users)
 
     def teardown_method(self, method):
         for n in Notification.query().all():
             Session().delete(n)
 
         Session().commit()
         assert Notification.query().all() == []
 
     def test_index(self):
         response = self.app.get(login_url)
         assert response.status == '200 OK'
         # Test response...
 
     def test_login_admin_ok(self):
         response = self.app.post(login_url,
                                  {'username': 'test_admin',
                                   'password': 'test12'})
         assert response.status == '302 Found'
         session = get_session_from_response(response)
         username = session['rhodecode_user'].get('username')
         assert username == 'test_admin'
         response = response.follow()
         response.mustcontain('/%s' % HG_REPO)
 
     def test_login_regular_ok(self):
         response = self.app.post(login_url,
                                  {'username': 'test_regular',
                                   'password': 'test12'})
 
         assert response.status == '302 Found'
         session = get_session_from_response(response)
         username = session['rhodecode_user'].get('username')
         assert username == 'test_regular'
         response = response.follow()
         response.mustcontain('/%s' % HG_REPO)
 
     def test_login_ok_came_from(self):
         test_came_from = '/_admin/users?branch=stable'
         _url = '{}?came_from={}'.format(login_url, test_came_from)
         response = self.app.post(
             _url, {'username': 'test_admin', 'password': 'test12'})
         assert response.status == '302 Found'
         assert 'branch=stable' in response.location
         response = response.follow()
 
         assert response.status == '200 OK'
         response.mustcontain('Users administration')
 
     def test_redirect_to_login_with_get_args(self):
         with fixture.anon_access(False):
             kwargs = {'branch': 'stable'}
             response = self.app.get(
                 url('summary_home', repo_name=HG_REPO, **kwargs))
             assert response.status == '302 Found'
             response_query = urlparse.parse_qsl(response.location)
             assert 'branch=stable' in response_query[0][1]
 
     def test_login_form_with_get_args(self):
         _url = '{}?came_from=/_admin/users,branch=stable'.format(login_url)
         response = self.app.get(_url)
         assert 'branch%3Dstable' in response.form.action
 
     @pytest.mark.parametrize("url_came_from", [
         'data:text/html,<script>window.alert("xss")</script>',
         'mailto:[e-mail]',
         'file:///etc/passwd',
         'ftp://some.ftp.server',
         'http://other.domain',
         '/\r\nX-Forwarded-Host: http://example.org',
     ])
     def test_login_bad_came_froms(self, url_came_from):
         _url = '{}?came_from={}'.format(login_url, url_came_from)
         response = self.app.post(
             _url,
             {'username': 'test_admin', 'password': 'test12'})
         assert response.status == '302 Found'
         response = response.follow()
         assert response.status == '200 OK'
         assert response.request.path == '/'
 
     def test_login_short_password(self):
         response = self.app.post(login_url,
                                  {'username': 'test_admin',
                                   'password': 'as'})
         assert response.status == '200 OK'
 
         response.mustcontain('Enter 3 characters or more')
 
     def test_login_wrong_non_ascii_password(self, user_regular):
         response = self.app.post(
             login_url,
             {'username': user_regular.username,
              'password': u'invalid-non-asci\xe4'.encode('utf8')})
 
         response.mustcontain('invalid user name')
         response.mustcontain('invalid password')
 
     def test_login_with_non_ascii_password(self, user_util):
         password = u'valid-non-ascii\xe4'
         user = user_util.create_user(password=password)
         response = self.app.post(
             login_url,
             {'username': user.username,
              'password': password.encode('utf-8')})
         assert response.status_code == 302
 
     def test_login_wrong_username_password(self):
         response = self.app.post(login_url,
                                  {'username': 'error',
                                   'password': 'test12'})
 
         response.mustcontain('invalid user name')
         response.mustcontain('invalid password')
 
     def test_login_admin_ok_password_migration(self, real_crypto_backend):
         from rhodecode.lib import auth
 
         # create new user, with sha256 password
         temp_user = 'test_admin_sha256'
         user = fixture.create_user(temp_user)
         user.password = auth._RhodeCodeCryptoSha256().hash_create(
             b'test123')
         Session().add(user)
         Session().commit()
         self.destroy_users.add(temp_user)
         response = self.app.post(login_url,
                                  {'username': temp_user,
                                   'password': 'test123'})
 
         assert response.status == '302 Found'
         session = get_session_from_response(response)
         username = session['rhodecode_user'].get('username')
         assert username == temp_user
         response = response.follow()
         response.mustcontain('/%s' % HG_REPO)
 
         # new password should be bcrypted, after log-in and transfer
         user = User.get_by_username(temp_user)
         assert user.password.startswith('$')
 
     # REGISTRATIONS
     def test_register(self):
         response = self.app.get(register_url)
         response.mustcontain('Create an Account')
 
     def test_register_err_same_username(self):
         uname = 'test_admin'
         response = self.app.post(
             register_url,
             {
                 'username': uname,
                 'password': 'test12',
                 'password_confirmation': 'test12',
                 'email': '[e-mail]',
                 'firstname': 'test',
                 'lastname': 'test'
             }
         )
 
         assertr = AssertResponse(response)
         msg = validators.ValidUsername()._messages['username_exists']
         msg = msg % {'username': uname}
         assertr.element_contains('#username+.error-message', msg)
 
     def test_register_err_same_email(self):
         response = self.app.post(
             register_url,
             {
                 'username': 'test_admin_0',
                 'password': 'test12',
                 'password_confirmation': 'test12',
                 'email': '[e-mail]',
                 'firstname': 'test',
                 'lastname': 'test'
             }
         )
 
         assertr = AssertResponse(response)
         msg = validators.UniqSystemEmail()()._messages['email_taken']
         assertr.element_contains('#email+.error-message', msg)
 
     def test_register_err_same_email_case_sensitive(self):
         response = self.app.post(
             register_url,
             {
                 'username': 'test_admin_1',
                 'password': 'test12',
                 'password_confirmation': 'test12',
                 'email': '[e-mail]',
                 'firstname': 'test',
                 'lastname': 'test'
             }
         )
         assertr = AssertResponse(response)
         msg = validators.UniqSystemEmail()()._messages['email_taken']
         assertr.element_contains('#email+.error-message', msg)
 
     def test_register_err_wrong_data(self):
         response = self.app.post(
             register_url,
             {
                 'username': 'xs',
                 'password': 'test',
                 'password_confirmation': 'test',
                 'email': 'goodmailm',
                 'firstname': 'test',
                 'lastname': 'test'
             }
         )
         assert response.status == '200 OK'
         response.mustcontain('An email address must contain a single @')
         response.mustcontain('Enter a value 6 characters long or more')
 
     def test_register_err_username(self):
         response = self.app.post(
             register_url,
             {
                 'username': 'error user',
                 'password': 'test12',
                 'password_confirmation': 'test12',
                 'email': 'goodmailm',
                 'firstname': 'test',
                 'lastname': 'test'
             }
         )
 
         response.mustcontain('An email address must contain a single @')
         response.mustcontain(
             'Username may only contain '
             'alphanumeric characters underscores, '
             'periods or dashes and must begin with '
             'alphanumeric character')
 
     def test_register_err_case_sensitive(self):
         usr = 'Test_Admin'
         response = self.app.post(
             register_url,
             {
                 'username': usr,
                 'password': 'test12',
                 'password_confirmation': 'test12',
                 'email': 'goodmailm',
                 'firstname': 'test',
                 'lastname': 'test'
             }
         )
 
         assertr = AssertResponse(response)
         msg = validators.ValidUsername()._messages['username_exists']
         msg = msg % {'username': usr}
         assertr.element_contains('#username+.error-message', msg)
 
     def test_register_special_chars(self):
         response = self.app.post(
             register_url,
             {
                 'username': 'xxxaxn',
                 'password': 'ąćźżąśśśś',
                 'password_confirmation': 'ąćźżąśśśś',
                 'email': '[e-mail]',
                 'firstname': 'test',
                 'lastname': 'test'
             }
         )
 
         msg = validators.ValidPassword()._messages['invalid_password']
         response.mustcontain(msg)
 
     def test_register_password_mismatch(self):
         response = self.app.post(
             register_url,
             {
                 'username': 'xs',
                 'password': '123qwe',
                 'password_confirmation': 'qwe123',
                 'email': '[e-mail]',
                 'firstname': 'test',
                 'lastname': 'test'
             }
         )
         msg = validators.ValidPasswordsMatch()._messages['password_mismatch']
         response.mustcontain(msg)
 
     def test_register_ok(self):
         username = 'test_regular4'
         password = 'qweqwe'
         email = '[e-mail]'
         name = 'testname'
         lastname = 'testlastname'
 
         response = self.app.post(
             register_url,
             {
                 'username': username,
                 'password': password,
                 'password_confirmation': password,
                 'email': email,
                 'firstname': name,
                 'lastname': lastname,
                 'admin': True
             }
         )  # This should be overriden
         assert response.status == '302 Found'
         assert_session_flash(
             response, 'You have successfully registered with RhodeCode')
 
         ret = Session().query(User).filter(
             User.username == 'test_regular4').one()
         assert ret.username == username
         assert check_password(password, ret.password)
         assert ret.email == email
         assert ret.name == name
         assert ret.lastname == lastname
         assert ret.api_key is not None
         assert not ret.admin
 
     def test_forgot_password_wrong_mail(self):
         bad_email = '[e-mail]'
         response = self.app.post(
             pwd_reset_url,
             {'email': bad_email, }
         )
 
         msg = validators.ValidSystemEmail()._messages['non_existing_email']
         msg = h.html_escape(msg % {'email': bad_email})
         response.mustcontain()
 
     def test_forgot_password(self):
         response = self.app.get(pwd_reset_url)
         assert response.status == '200 OK'
 
         username = 'test_password_reset_1'
         password = 'qweqwe'
         email = '[e-mail]'
         name = 'passwd'
         lastname = 'reset'
 
         new = User()
         new.username = username
         new.password = password
         new.email = email
         new.name = name
         new.lastname = lastname
         new.api_key = generate_auth_token(username)
         Session().add(new)
         Session().commit()
 
         response = self.app.post(pwd_reset_url,
                                  {'email': email, })
 
         assert_session_flash(
             response, 'Your password reset link was sent')
 
         response = response.follow()
 
         # BAD KEY
 
         key = "bad"
         confirm_url = '{}?key={}'.format(pwd_reset_confirm_url, key)
         response = self.app.get(confirm_url)
         assert response.status == '302 Found'
         assert response.location.endswith(pwd_reset_url)
 
         # GOOD KEY
 
         key = User.get_by_username(username).api_key
         confirm_url = '{}?key={}'.format(pwd_reset_confirm_url, key)
         response = self.app.get(confirm_url)
         assert response.status == '302 Found'
         assert response.location.endswith(login_url)
 
         assert_session_flash(
             response,
             'Your password reset was successful, '
             'a new password has been sent to your email')
 
         response = response.follow()
 
     def _get_api_whitelist(self, values=None):
         config = {'api_access_controllers_whitelist': values or []}
         return config
 
     @pytest.mark.parametrize("test_name, auth_token", [
         ('none', None),
         ('empty_string', ''),
         ('fake_number', '123456'),
         ('proper_auth_token', None)
     ])
     def test_access_not_whitelisted_page_via_auth_token(self, test_name,
                                                         auth_token):
         whitelist = self._get_api_whitelist([])
         with mock.patch.dict('rhodecode.CONFIG', whitelist):
             assert [] == whitelist['api_access_controllers_whitelist']
             if test_name == 'proper_auth_token':
                 # use builtin if api_key is None
-                auth_token = User.get_first_admin().api_key
+                auth_token = User.get_first_super_admin().api_key
 
             with fixture.anon_access(False):
                 self.app.get(url(controller='changeset',
                                  action='changeset_raw',
                                  repo_name=HG_REPO, revision='tip',
                                  api_key=auth_token),
                              status=302)
 
     @pytest.mark.parametrize("test_name, auth_token, code", [
         ('none', None, 302),
         ('empty_string', '', 302),
         ('fake_number', '123456', 302),
         ('proper_auth_token', None, 200)
     ])
     def test_access_whitelisted_page_via_auth_token(self, test_name,
                                                     auth_token, code):
         whitelist = self._get_api_whitelist(
             ['ChangesetController:changeset_raw'])
         with mock.patch.dict('rhodecode.CONFIG', whitelist):
             assert ['ChangesetController:changeset_raw'] == \
                 whitelist['api_access_controllers_whitelist']
             if test_name == 'proper_auth_token':
-                auth_token = User.get_first_admin().api_key
+                auth_token = User.get_first_super_admin().api_key
 
             with fixture.anon_access(False):
                 self.app.get(url(controller='changeset',
                                  action='changeset_raw',
                                  repo_name=HG_REPO, revision='tip',
                                  api_key=auth_token),
                              status=code)
 
     def test_access_page_via_extra_auth_token(self):
         whitelist = self._get_api_whitelist(
             ['ChangesetController:changeset_raw'])
         with mock.patch.dict('rhodecode.CONFIG', whitelist):
             assert ['ChangesetController:changeset_raw'] == \
                 whitelist['api_access_controllers_whitelist']
 
             new_auth_token = AuthTokenModel().create(
                 TEST_USER_ADMIN_LOGIN, 'test')
             Session().commit()
             with fixture.anon_access(False):
                 self.app.get(url(controller='changeset',
                                  action='changeset_raw',
                                  repo_name=HG_REPO, revision='tip',
                                  api_key=new_auth_token.api_key),
                              status=200)
 
     def test_access_page_via_expired_auth_token(self):
         whitelist = self._get_api_whitelist(
             ['ChangesetController:changeset_raw'])
         with mock.patch.dict('rhodecode.CONFIG', whitelist):
             assert ['ChangesetController:changeset_raw'] == \
                 whitelist['api_access_controllers_whitelist']
 
             new_auth_token = AuthTokenModel().create(
                 TEST_USER_ADMIN_LOGIN, 'test')
             Session().commit()
             # patch the api key and make it expired
             new_auth_token.expires = 0
             Session().add(new_auth_token)
             Session().commit()
             with fixture.anon_access(False):
                 self.app.get(url(controller='changeset',
                                  action='changeset_raw',
                                  repo_name=HG_REPO, revision='tip',
                                  api_key=new_auth_token.api_key),
                              status=302)

rhodecode/tests/lib/middleware/test_disable_vcs.py

@@ -1,54 +1,53 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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.middleware.disable_vcs import DisableVCSPagesWrapper
+from pyramid.response import Response
+from pyramid.testing import DummyRequest
+from rhodecode.lib.middleware.disable_vcs import (
+    DisableVCSPagesWrapper, VCSServerUnavailable)
 
 
[e-mail]('url, expected_url', [
-    ('/', '/'),
-    ('/_admin/settings', '/_admin/settings'),
-    ('/_admin/i_am_fine', '/_admin/i_am_fine'),
-    ('/_admin/settings/mappings', '/error/vcs_unavailable'),
-    ('/_admin/my_account/repos', '/error/vcs_unavailable'),
-    ('/_admin/create_repository', '/error/vcs_unavailable'),
-    ('/_admin/gists/1', '/error/vcs_unavailable'),
-    ('/_admin/notifications/1', '/error/vcs_unavailable'),
[e-mail]('url, should_raise', [
+    ('/', False),
+    ('/_admin/settings', False),
+    ('/_admin/i_am_fine', False),
+    ('/_admin/settings/mappings', True),
+    ('/_admin/my_account/repos', True),
+    ('/_admin/create_repository', True),
+    ('/_admin/gists/1', True),
+    ('/_admin/notifications/1', True),
 ])
-def test_vcs_disabled(url, expected_url):
-    app = DisableVCSPagesWrapper(app=SimpleApp())
-    assert expected_url == app(get_environ(url), None)
-
+def test_vcs_disabled(url, should_raise):
+    wrapped_view = DisableVCSPagesWrapper(pyramid_view)
+    request = DummyRequest(path=url)
 
-def get_environ(url):
-    """Construct a minimum WSGI environ based on the URL."""
-    environ = {
-        'PATH_INFO': url,
-    }
-    return environ
-
+    if should_raise:
+        with pytest.raises(VCSServerUnavailable):
+            response = wrapped_view(None, request)
+    else:
+        response = wrapped_view(None, request)
+        assert response.status_int == 200
 
-class SimpleApp(object):
+def pyramid_view(context, request):
     """
-    A mock app to be used in the wrapper that returns the modified URL
-    from the middleware
+    A mock pyramid view to be used in the wrapper
     """
-    def __call__(self, environ, start_response):
-        return environ['PATH_INFO']
+    return Response('success')

rhodecode/tests/lib/test_encrypt.py

@@ -1,40 +1,76 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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.encrypt import AESCipher
+from rhodecode.lib.encrypt import (
+    AESCipher, SignatureVerificationError, InvalidDecryptedValue)
 
 
 class TestEncryptModule(object):
 
     @pytest.mark.parametrize(
         "key, text",
         [
             ('a', 'short'),
             ('a'*64, 'too long(trimmed to 32)'),
             ('a'*32, 'just enough'),
             ('ąćęćę', 'non asci'),
             ('$asa$asa', 'special $ used'),
         ]
     )
     def test_encryption(self, key, text):
         enc = AESCipher(key).encrypt(text)
         assert AESCipher(key).decrypt(enc) == text
+
+    def test_encryption_with_hmac(self):
+        key = 'secret'
+        text = 'ihatemysql'
+        enc = AESCipher(key, hmac=True).encrypt(text)
+        assert AESCipher(key, hmac=True).decrypt(enc) == text
+
+    def test_encryption_with_hmac_with_bad_key(self):
+        key = 'secretstring'
+        text = 'ihatemysql'
+        enc = AESCipher(key, hmac=True).encrypt(text)
+
+        with pytest.raises(SignatureVerificationError) as e:
+            assert AESCipher('differentsecret', hmac=True).decrypt(enc) == ''
+
+        assert 'Encryption signature verification failed' in str(e)
+
+    def test_encryption_with_hmac_with_bad_data(self):
+        key = 'secret'
+        text = 'ihatemysql'
+        enc = AESCipher(key, hmac=True).encrypt(text)
+        enc = 'xyz' + enc[3:]
+        with pytest.raises(SignatureVerificationError) as e:
+            assert AESCipher(key, hmac=True).decrypt(enc) == text
+
+        assert 'Encryption signature verification failed' in str(e)
+
+    def test_encryption_with_hmac_with_bad_key_not_strict(self):
+        key = 'secretstring'
+        text = 'ihatemysql'
+        enc = AESCipher(key, hmac=True).encrypt(text)
+
+        assert isinstance(AESCipher(
+            'differentsecret', hmac=True, strict_verification=False
+        ).decrypt(enc), InvalidDecryptedValue)

rhodecode/tests/lib/test_helpers.py

@@ -1,196 +1,210 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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 copy
 import mock
 import pytest
 
 from pylons.util import ContextObj
 
 from rhodecode.lib import helpers
 from rhodecode.lib.utils2 import AttributeDict
 from rhodecode.model.settings import IssueTrackerSettingsModel
 
 
 @pytest.mark.parametrize('url, expected_url', [
     ('http://rc.rc/test', '<a href="http://rc.rc/test">http://rc.rc/test</a>'),
     ('http://rc.rc/@foo', '<a href="http://rc.rc/@foo">http://rc.rc/@foo</a>'),
     ('http://rc.rc/!foo', '<a href="http://rc.rc/!foo">http://rc.rc/!foo</a>'),
     ('http://rc.rc/&foo', '<a href="http://rc.rc/&foo">http://rc.rc/&foo</a>'),
     ('http://rc.rc/#foo', '<a href="http://rc.rc/#foo">http://rc.rc/#foo</a>'),
 ])
 def test_urlify_text(url, expected_url):
     assert helpers.urlify_text(url) == expected_url
 
 
 @pytest.mark.parametrize('repo_name, commit_id, path, expected_result', [
     ('rX<X', 'cX<X', 'pX<X/aX<X/bX<X',
      '<a class="pjax-link" href="/rX%3CX/files/cX%3CX/">rX&lt;X</a>/'
      '<a class="pjax-link" href="/rX%3CX/files/cX%3CX/pX%3CX">pX&lt;X</a>/'
      '<a class="pjax-link" href="/rX%3CX/files/cX%3CX/pX%3CX/aX%3CX">aX&lt;X'
      '</a>/bX&lt;X'),
     # Path with only one segment
     ('rX<X', 'cX<X', 'pX<X',
      '<a class="pjax-link" href="/rX%3CX/files/cX%3CX/">rX&lt;X</a>/pX&lt;X'),
     # Empty path
     ('rX<X', 'cX<X', '', 'rX&lt;X'),
     ('rX"X', 'cX"X', 'pX"X/aX"X/bX"X',
      '<a class="pjax-link" href="/rX%22X/files/cX%22X/">rX&#34;X</a>/'
      '<a class="pjax-link" href="/rX%22X/files/cX%22X/pX%22X">pX&#34;X</a>/'
      '<a class="pjax-link" href="/rX%22X/files/cX%22X/pX%22X/aX%22X">aX&#34;X'
      '</a>/bX&#34;X'),
 ], ids=['simple', 'one_segment', 'empty_path', 'simple_quote'])
 def test_files_breadcrumbs_xss(
         repo_name, commit_id, path, pylonsapp, expected_result):
     result = helpers.files_breadcrumbs(repo_name, commit_id, path)
     # Expect it to encode all path fragments properly. This is important
     # because it returns an instance of `literal`.
     assert result == expected_result
 
 
 def test_format_binary():
     assert helpers.format_byte_size_binary(298489462784) == '278.0 GiB'
 
 
 @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
 ])
 def test_process_patterns_repo(backend, text_string, pattern, expected_text):
     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
+
     with mock.patch.object(IssueTrackerSettingsModel,
-                           'get_settings', lambda s: config):
+                           'get_settings', get_settings_mock):
         processed_text = helpers.process_patterns(
             text_string, repo.repo_name, config)
 
     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
 ])
 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
+
     with mock.patch.object(IssueTrackerSettingsModel,
-                           'get_global_settings', lambda s, cache: config):
+                           'get_global_settings', get_settings_mock):
         processed_text = helpers.process_patterns(
             text_string, '', config)
 
     assert processed_text == expected_text
 
 
 def test_process_patterns_non_existent_repo_name(backend):
     text_string = 'Fix #42'
     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
+
     with mock.patch.object(IssueTrackerSettingsModel,
-                           'get_global_settings', lambda s, cache: config):
+                           'get_global_settings', get_settings_mock):
         processed_text = helpers.process_patterns(
             text_string, 'do-not-exist', config)
 
     assert processed_text == expected_text
 
 
 def test_get_visual_attr(pylonsapp):
     c = ContextObj()
     assert None is helpers.get_visual_attr(c, 'fakse')
 
     # emulate the c.visual behaviour
     c.visual = AttributeDict({})
     assert None is helpers.get_visual_attr(c, 'some_var')
 
     c.visual.some_var = 'foobar'
     assert 'foobar' == helpers.get_visual_attr(c, 'some_var')
 
 
 @pytest.mark.parametrize('test_text, inclusive, expected_text', [
     ('just a string', False, 'just a string'),
     ('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...'),
 ])
 def test_chop_at(test_text, inclusive, expected_text):
     assert helpers.chop_at_smart(
         test_text, '\n', inclusive, '...') == expected_text
 
 
 @pytest.mark.parametrize('test_text, expected_output', [
     ('some text', ['some', 'text']),
     ('some    text', ['some', 'text']),
     ('some text "with  a phrase"', ['some', 'text', 'with  a phrase']),
     ('"a phrase" "another phrase"', ['a phrase', 'another phrase']),
     ('"justphrase"', ['justphrase']),
     ('""', []),
     ('', []),
     ('  ', []),
     ('"   "', []),
 ])
 def test_extract_phrases(test_text, expected_output):
     assert helpers.extract_phrases(test_text) == expected_output
 
 
 @pytest.mark.parametrize('test_text, text_phrases, expected_output', [
     ('some text here', ['some', 'here'], [(0, 4), (10, 14)]),
     ('here here there', ['here'], [(0, 4), (5, 9), (11, 15)]),
     ('irrelevant', ['not found'], []),
     ('irrelevant', ['not found'], []),
 ])
 def test_get_matching_offsets(test_text, text_phrases, expected_output):
     assert helpers.get_matching_offsets(
         test_text, text_phrases) == expected_output
 
+
 def test_normalize_text_for_matching():
     assert helpers.normalize_text_for_matching(
         'OJjfe)*#$*@)$JF*)3r2f80h') == 'ojjfe        jf  3r2f80h'
 
+
 def test_get_matching_line_offsets():
     assert helpers.get_matching_line_offsets([
         'words words words',
         'words words words',
         'some text some',
         'words words words',
         'words words words',
-        'text here what'], 'text') == {3: [(5, 9)], 6: [(0, 4)]}
  No newline at end of file
+        'text here what'], 'text') == {3: [(5, 9)], 6: [(0, 4)]}

rhodecode/tests/lib/test_utils.py

@@ -1,466 +1,467 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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 multiprocessing
 import os
 
 import mock
 import py
 import pytest
 
 from rhodecode.lib import caching_query
 from rhodecode.lib import utils
 from rhodecode.lib.utils2 import md5
+from rhodecode.model import settings
 from rhodecode.model import db
 from rhodecode.model import meta
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.settings import UiSetting, SettingsModel
 from rhodecode.tests.fixture import Fixture
 from rhodecode.tests import TEST_USER_ADMIN_LOGIN
 
 
 fixture = Fixture()
 
 
 def extract_hooks(config):
     """Return a dictionary with the hook entries of the given config."""
     hooks = {}
     config_items = config.serialize()
     for section, name, value in config_items:
         if section != 'hooks':
             continue
         hooks[name] = value
 
     return hooks
 
 
 def disable_hooks(request, hooks):
     """Disables the given hooks from the UI settings."""
     session = meta.Session()
 
     model = SettingsModel()
     for hook_key in hooks:
         sett = model.get_ui_by_key(hook_key)
         sett.ui_active = False
         session.add(sett)
 
     # Invalidate cache
     ui_settings = session.query(db.RhodeCodeUi).options(
         caching_query.FromCache('sql_cache_short', 'get_hg_ui_settings'))
     ui_settings.invalidate()
 
     ui_settings = session.query(db.RhodeCodeUi).options(
         caching_query.FromCache(
             'sql_cache_short', 'get_hook_settings', 'get_hook_settings'))
     ui_settings.invalidate()
 
     @request.addfinalizer
     def rollback():
         session.rollback()
 
 
 HOOK_PRE_PUSH = db.RhodeCodeUi.HOOK_PRE_PUSH
 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
 
 HG_HOOKS = frozenset(
     (HOOK_PRE_PULL, HOOK_PULL, HOOK_PRE_PUSH, HOOK_PUSH, HOOK_REPO_SIZE))
 
 
 @pytest.mark.parametrize('disabled_hooks,expected_hooks', [
     ([], HG_HOOKS),
     ([HOOK_PRE_PUSH, HOOK_REPO_SIZE], [HOOK_PRE_PULL, HOOK_PULL, HOOK_PUSH]),
     (HG_HOOKS, []),
     # 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_PUSH, HOOK_REPO_SIZE]),
 ])
 def test_make_db_config_hg_hooks(pylonsapp, request, disabled_hooks,
                                  expected_hooks):
     disable_hooks(request, disabled_hooks)
 
     config = utils.make_db_config()
     hooks = extract_hooks(config)
 
     assert set(hooks.iterkeys()).intersection(HG_HOOKS) == set(expected_hooks)
 
 
 @pytest.mark.parametrize('disabled_hooks,expected_hooks', [
     ([], ['pull', 'push']),
     ([HOOK_PUSH], ['pull']),
     ([HOOK_PULL], ['push']),
     ([HOOK_PULL, HOOK_PUSH], []),
 ])
 def test_get_enabled_hook_classes(disabled_hooks, expected_hooks):
     hook_keys = (HOOK_PUSH, HOOK_PULL)
     ui_settings = [
         ('hooks', key, 'some value', key not in disabled_hooks)
         for key in hook_keys]
 
     result = utils.get_enabled_hook_classes(ui_settings)
     assert sorted(result) == expected_hooks
 
 
 def test_get_filesystem_repos_finds_repos(tmpdir, pylonsapp):
     _stub_git_repo(tmpdir.ensure('repo', dir=True))
     repos = list(utils.get_filesystem_repos(str(tmpdir)))
     assert repos == [('repo', ('git', tmpdir.join('repo')))]
 
 
 def test_get_filesystem_repos_skips_directories(tmpdir, pylonsapp):
     tmpdir.ensure('not-a-repo', dir=True)
     repos = list(utils.get_filesystem_repos(str(tmpdir)))
     assert repos == []
 
 
 def test_get_filesystem_repos_skips_directories_with_repos(tmpdir, pylonsapp):
     _stub_git_repo(tmpdir.ensure('subdir/repo', dir=True))
     repos = list(utils.get_filesystem_repos(str(tmpdir)))
     assert repos == []
 
 
 def test_get_filesystem_repos_finds_repos_in_subdirectories(tmpdir, pylonsapp):
     _stub_git_repo(tmpdir.ensure('subdir/repo', dir=True))
     repos = list(utils.get_filesystem_repos(str(tmpdir), recursive=True))
     assert repos == [('subdir/repo', ('git', tmpdir.join('subdir', 'repo')))]
 
 
 def test_get_filesystem_repos_skips_names_starting_with_dot(tmpdir):
     _stub_git_repo(tmpdir.ensure('.repo', dir=True))
     repos = list(utils.get_filesystem_repos(str(tmpdir)))
     assert repos == []
 
 
 def test_get_filesystem_repos_skips_files(tmpdir):
     tmpdir.ensure('test-file')
     repos = list(utils.get_filesystem_repos(str(tmpdir)))
     assert repos == []
 
 
 def test_get_filesystem_repos_skips_removed_repositories(tmpdir):
     removed_repo_name = 'rm__00000000_000000_000000__.stub'
     assert utils.REMOVED_REPO_PAT.match(removed_repo_name)
     _stub_git_repo(tmpdir.ensure(removed_repo_name, dir=True))
     repos = list(utils.get_filesystem_repos(str(tmpdir)))
     assert repos == []
 
 
 def _stub_git_repo(repo_path):
     """
     Make `repo_path` look like a Git repository.
     """
     repo_path.ensure('.git', dir=True)
 
 
 @pytest.mark.parametrize('str_class', [str, unicode], ids=['str', 'unicode'])
 def test_get_dirpaths_returns_all_paths(tmpdir, str_class):
     tmpdir.ensure('test-file')
     dirpaths = utils._get_dirpaths(str_class(tmpdir))
     assert dirpaths == ['test-file']
 
 
 def test_get_dirpaths_returns_all_paths_bytes(
         tmpdir, platform_encodes_filenames):
     if platform_encodes_filenames:
         pytest.skip("This platform seems to encode filenames.")
     tmpdir.ensure('repo-a-umlaut-\xe4')
     dirpaths = utils._get_dirpaths(str(tmpdir))
     assert dirpaths == ['repo-a-umlaut-\xe4']
 
 
 def test_get_dirpaths_skips_paths_it_cannot_decode(
         tmpdir, platform_encodes_filenames):
     if platform_encodes_filenames:
         pytest.skip("This platform seems to encode filenames.")
     path_with_latin1 = 'repo-a-umlaut-\xe4'
     tmpdir.ensure(path_with_latin1)
     dirpaths = utils._get_dirpaths(unicode(tmpdir))
     assert dirpaths == []
 
 
 @pytest.fixture(scope='session')
 def platform_encodes_filenames():
     """
     Boolean indicator if the current platform changes filename encodings.
     """
     path_with_latin1 = 'repo-a-umlaut-\xe4'
     tmpdir = py.path.local.mkdtemp()
     tmpdir.ensure(path_with_latin1)
     read_path = tmpdir.listdir()[0].basename
     tmpdir.remove()
     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()
     zombie_group = fixture.create_repo_group('zombie')
     parent_group = fixture.create_repo_group('parent')
     child_group = fixture.create_repo_group('parent/child')
     groups_in_db = session.query(db.RepoGroup).all()
     assert len(groups_in_db) == 3
     assert child_group.group_parent_id == parent_group.group_id
 
     @request.addfinalizer
     def cleanup():
         fixture.destroy_repo_group(zombie_group)
         fixture.destroy_repo_group(child_group)
         fixture.destroy_repo_group(parent_group)
 
     return (zombie_group, parent_group, child_group)
 
 
 def test_repo2db_mapper_groups(repo_groups):
     session = meta.Session()
     zombie_group, parent_group, child_group = repo_groups
     zombie_path = os.path.join(
         RepoGroupModel().repos_path, zombie_group.full_path)
     os.rmdir(zombie_path)
 
     # Avoid removing test repos when calling repo2db_mapper
     repo_list = {
         repo.repo_name: 'test' for repo in session.query(db.Repository).all()
     }
     utils.repo2db_mapper(repo_list, remove_obsolete=True)
 
     groups_in_db = session.query(db.RepoGroup).all()
     assert child_group in groups_in_db
     assert parent_group in groups_in_db
     assert zombie_path not in groups_in_db
 
 
 def test_repo2db_mapper_enables_largefiles(backend):
     repo = backend.create_repo()
     repo_list = {repo.repo_name: 'test'}
     with mock.patch('rhodecode.model.db.Repository.scm_instance') as scm_mock:
         with mock.patch.multiple('rhodecode.model.scm.ScmModel',
                                  install_git_hook=mock.DEFAULT,
                                  install_svn_hooks=mock.DEFAULT):
             utils.repo2db_mapper(repo_list, remove_obsolete=False)
             _, kwargs = scm_mock.call_args
             assert kwargs['config'].get('extensions', 'largefiles') == ''
 
 
 @pytest.mark.backends("git", "svn")
 def test_repo2db_mapper_installs_hooks_for_repos_in_db(backend):
     repo = backend.create_repo()
     repo_list = {repo.repo_name: 'test'}
     with mock.patch.object(ScmModel, 'install_hooks') as install_hooks_mock:
         utils.repo2db_mapper(repo_list, remove_obsolete=False)
     install_hooks_mock.assert_called_once_with(
         repo.scm_instance(), repo_type=backend.alias)
 
 
 @pytest.mark.backends("git", "svn")
 def test_repo2db_mapper_installs_hooks_for_newly_added_repos(backend):
     repo = backend.create_repo()
     RepoModel().delete(repo, fs_remove=False)
     meta.Session().commit()
     repo_list = {repo.repo_name: repo.scm_instance()}
     with mock.patch.object(ScmModel, 'install_hooks') as install_hooks_mock:
         utils.repo2db_mapper(repo_list, remove_obsolete=False)
     assert install_hooks_mock.call_count == 1
     install_hooks_args, _ = install_hooks_mock.call_args
     assert install_hooks_args[0].name == repo.repo_name
 
 
 class TestPasswordChanged(object):
     def setup(self):
         self.session = {
             'rhodecode_user': {
                 'password': '0cc175b9c0f1b6a831c399e269772661'
             }
         }
         self.auth_user = mock.Mock()
         self.auth_user.userame = 'test'
         self.auth_user.password = 'abc123'
 
     def test_returns_false_for_default_user(self):
         self.auth_user.username = db.User.DEFAULT_USER
         result = utils.password_changed(self.auth_user, self.session)
         assert result is False
 
     def test_returns_false_if_password_was_not_changed(self):
         self.session['rhodecode_user']['password'] = md5(
             self.auth_user.password)
         result = utils.password_changed(self.auth_user, self.session)
         assert result is False
 
     def test_returns_true_if_password_was_changed(self):
         result = utils.password_changed(self.auth_user, self.session)
         assert result is True
 
     def test_returns_true_if_auth_user_password_is_empty(self):
         self.auth_user.password = None
         result = utils.password_changed(self.auth_user, self.session)
         assert result is True
 
     def test_returns_true_if_session_password_is_empty(self):
         self.session['rhodecode_user'].pop('password')
         result = utils.password_changed(self.auth_user, self.session)
         assert result is True
 
 
 class TestReadOpensourceLicenses(object):
     def test_success(self):
         utils._license_cache = None
         json_data = '''
         {
             "python2.7-pytest-2.7.1": {"UNKNOWN": null},
             "python2.7-Markdown-2.6.2": {
                 "BSD-3-Clause": "http://spdx.org/licenses/BSD-3-Clause"
             }
         }
         '''
         resource_string_patch = mock.patch.object(
             utils.pkg_resources, 'resource_string', return_value=json_data)
         with resource_string_patch:
             result = utils.read_opensource_licenses()
         assert result == json.loads(json_data)
 
     def test_caching(self):
         utils._license_cache = {
             "python2.7-pytest-2.7.1": {
                 "UNKNOWN": None
             },
             "python2.7-Markdown-2.6.2": {
                 "BSD-3-Clause": "http://spdx.org/licenses/BSD-3-Clause"
             }
         }
         resource_patch = mock.patch.object(
             utils.pkg_resources, 'resource_string', side_effect=Exception)
         json_patch = mock.patch.object(
             utils.json, 'loads', side_effect=Exception)
 
         with resource_patch as resource_mock, json_patch as json_mock:
             result = utils.read_opensource_licenses()
 
         assert resource_mock.call_count == 0
         assert json_mock.call_count == 0
         assert result == utils._license_cache
 
     def test_licenses_file_contains_no_unknown_licenses(self):
         utils._license_cache = None
         result = utils.read_opensource_licenses()
         license_names = []
         for licenses in result.values():
             license_names.extend(licenses.keys())
         assert 'UNKNOWN' not in license_names
 
 
 class TestMakeDbConfig(object):
     def test_data_from_config_data_from_db_returned(self):
         test_data = [
             ('section1', 'option1', 'value1'),
             ('section2', 'option2', 'value2'),
             ('section3', 'option3', 'value3'),
         ]
         with mock.patch.object(utils, 'config_data_from_db') as config_mock:
             config_mock.return_value = test_data
             kwargs = {'clear_session': False, 'repo': 'test_repo'}
             result = utils.make_db_config(**kwargs)
         config_mock.assert_called_once_with(**kwargs)
         for section, option, expected_value in test_data:
             value = result.get(section, option)
             assert value == expected_value
 
 
 class TestConfigDataFromDb(object):
     def test_config_data_from_db_returns_active_settings(self):
         test_data = [
             UiSetting('section1', 'option1', 'value1', True),
             UiSetting('section2', 'option2', 'value2', True),
             UiSetting('section3', 'option3', 'value3', False),
         ]
         repo_name = 'test_repo'
 
-        model_patch = mock.patch.object(utils, 'VcsSettingsModel')
+        model_patch = mock.patch.object(settings, 'VcsSettingsModel')
         hooks_patch = mock.patch.object(
             utils, 'get_enabled_hook_classes',
             return_value=['pull', 'push', 'repo_size'])
         with model_patch as model_mock, hooks_patch:
             instance_mock = mock.Mock()
             model_mock.return_value = instance_mock
             instance_mock.get_ui_settings.return_value = test_data
             result = utils.config_data_from_db(
                 clear_session=False, repo=repo_name)
 
         self._assert_repo_name_passed(model_mock, repo_name)
 
         expected_result = [
             ('section1', 'option1', 'value1'),
             ('section2', 'option2', 'value2'),
         ]
         assert result == expected_result
 
     def _assert_repo_name_passed(self, model_mock, repo_name):
         assert model_mock.call_count == 1
         call_args, call_kwargs = model_mock.call_args
         assert call_kwargs['repo'] == repo_name
 
 
 class TestIsDirWritable(object):
     def test_returns_false_when_not_writable(self):
         with mock.patch('__builtin__.open', side_effect=OSError):
             assert not utils._is_dir_writable('/stub-path')
 
     def test_returns_true_when_writable(self, tmpdir):
         assert utils._is_dir_writable(str(tmpdir))
 
     def test_is_safe_against_race_conditions(self, tmpdir):
         workers = multiprocessing.Pool()
         directories = [str(tmpdir)] * 10
         workers.map(utils._is_dir_writable, directories)
 
 
 class TestGetEnabledHooks(object):
     def test_only_active_hooks_are_enabled(self):
         ui_settings = [
             UiSetting('hooks', db.RhodeCodeUi.HOOK_PUSH, 'value', True),
             UiSetting('hooks', db.RhodeCodeUi.HOOK_REPO_SIZE, 'value', True),
             UiSetting('hooks', db.RhodeCodeUi.HOOK_PULL, 'value', False)
         ]
         result = utils.get_enabled_hook_classes(ui_settings)
         assert result == ['push', 'repo_size']
 
     def test_all_hooks_are_enabled(self):
         ui_settings = [
             UiSetting('hooks', db.RhodeCodeUi.HOOK_PUSH, 'value', True),
             UiSetting('hooks', db.RhodeCodeUi.HOOK_REPO_SIZE, 'value', True),
             UiSetting('hooks', db.RhodeCodeUi.HOOK_PULL, 'value', True)
         ]
         result = utils.get_enabled_hook_classes(ui_settings)
         assert result == ['push', 'repo_size', 'pull']
 
     def test_no_enabled_hooks_when_no_hook_settings_are_found(self):
         ui_settings = []
         result = utils.get_enabled_hook_classes(ui_settings)
         assert result == []

rhodecode/tests/other/test_libs.py

@@ -1,510 +1,518 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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/
 
 
 """
 Package for testing various lib/helper functions in rhodecode
 """
 
 import datetime
 import string
 import mock
 import pytest
 from rhodecode.tests.utils import run_test_concurrently
 from rhodecode.lib.helpers import InitialsGravatar
 
 from rhodecode.lib.utils2 import AttributeDict
 from rhodecode.model.db import Repository
 
 
 def _urls_for_proto(proto):
     return [
         ('%s://127.0.0.1' % proto, ['%s://' % proto, '127.0.0.1'],
          '%s://127.0.0.1' % proto),
         ('%s://marcink@127.0.0.1' % proto, ['%s://' % proto, '127.0.0.1'],
          '%s://127.0.0.1' % proto),
         ('%s://marcink:pass@127.0.0.1' % proto, ['%s://' % proto, '127.0.0.1'],
          '%s://127.0.0.1' % proto),
         ('%s://127.0.0.1:8080' % proto, ['%s://' % proto, '127.0.0.1', '8080'],
          '%s://127.0.0.1:8080' % proto),
         ('%s://domain.org' % proto, ['%s://' % proto, 'domain.org'],
          '%s://domain.org' % proto),
         ('%s://user:[e-mail]:8080' % proto,
          ['%s://' % proto, 'domain.org', '8080'],
          '%s://domain.org:8080' % proto),
     ]
 
 TEST_URLS = _urls_for_proto('http') + _urls_for_proto('https')
 
 
 @pytest.mark.parametrize("test_url, expected, expected_creds", TEST_URLS)
 def test_uri_filter(test_url, expected, expected_creds):
     from rhodecode.lib.utils2 import uri_filter
     assert uri_filter(test_url) == expected
 
 
 @pytest.mark.parametrize("test_url, expected, expected_creds", TEST_URLS)
 def test_credentials_filter(test_url, expected, expected_creds):
     from rhodecode.lib.utils2 import credentials_filter
     assert credentials_filter(test_url) == expected_creds
 
 
 @pytest.mark.parametrize("str_bool, expected", [
     ('t', True),
     ('true', True),
     ('y', True),
     ('yes', True),
     ('on', True),
     ('1', True),
     ('Y', True),
     ('yeS', True),
     ('Y', True),
     ('TRUE', True),
     ('T', True),
     ('False', False),
     ('F', False),
     ('FALSE', False),
     ('0', False),
     ('-1', False),
     ('', False)
 ])
 def test_str2bool(str_bool, expected):
     from rhodecode.lib.utils2 import str2bool
     assert str2bool(str_bool) == expected
 
 
 @pytest.mark.parametrize("text, expected", reduce(lambda a1,a2:a1+a2, [
 [
 (pref+"", []),
 (pref+"Hi there @marcink", ['marcink']),
 (pref+"Hi there @marcink and @bob", ['bob', 'marcink']),
 (pref+"Hi there @marcink\n", ['marcink']),
 (pref+"Hi there @marcink and @bob\n", ['bob', 'marcink']),
 (pref+"Hi there [e-mail]", []),
 (pref+"Hi there @john.malcovic and @bob\n", ['bob', 'john.malcovic']),
 (pref+"This needs to be reviewed: (@marcink,@john)", ["john", "marcink"]),
 (pref+"This needs to be reviewed: (@marcink, @john)", ["john", "marcink"]),
 (pref+"This needs to be reviewed: [@marcink,@john]", ["john", "marcink"]),
 (pref+"This needs to be reviewed: (@marcink @john)", ["john", "marcink"]),
 (pref+"@john @mary, please review", ["john", "mary"]),
 (pref+"@john,@mary, please review", ["john", "mary"]),
 (pref+"Hej @123, @22john,@mary, please review", ['123', '22john', 'mary']),
 (pref+"@first hi there @marcink here's my email [e-mail] "
  "@lukaszb check @one_more22 it pls @ ttwelve @D[] @one@two@three ", ['first', 'lukaszb', 'marcink', 'one', 'one_more22']),
 (pref+"@MARCIN    @maRCiN @2one_more22 @john please see this http://org.pl", ['2one_more22', 'john', 'MARCIN', 'maRCiN']),
 (pref+"@marian.user just do it @marco-polo and next extract @marco_polo", ['marco-polo', 'marco_polo', 'marian.user']),
 (pref+"user.dot  hej ! not-needed [e-mail]", []),
 (pref+"\n@marcin", ['marcin']),
 ]
 for pref in ['', '\n', 'hi !', '\t', '\n\n']]))
 def test_mention_extractor(text, expected):
     from rhodecode.lib.utils2 import extract_mentioned_users
     got = extract_mentioned_users(text)
     assert sorted(got, key=lambda x: x.lower()) == got
     assert set(expected) == set(got)
 
 @pytest.mark.parametrize("age_args, expected, kw", [
     ({}, u'just now', {}),
     ({'seconds': -1}, u'1 second ago', {}),
     ({'seconds': -60 * 2}, u'2 minutes ago', {}),
     ({'hours': -1}, u'1 hour ago', {}),
     ({'hours': -24}, u'1 day ago', {}),
     ({'hours': -24 * 5}, u'5 days ago', {}),
     ({'months': -1}, u'1 month ago', {}),
     ({'months': -1, 'days': -2}, u'1 month and 2 days ago', {}),
     ({'years': -1, 'months': -1}, u'1 year and 1 month ago', {}),
     ({}, u'just now', {'short_format': True}),
     ({'seconds': -1}, u'1sec ago', {'short_format': True}),
     ({'seconds': -60 * 2}, u'2min ago', {'short_format': True}),
     ({'hours': -1}, u'1h ago', {'short_format': True}),
     ({'hours': -24}, u'1d ago', {'short_format': True}),
     ({'hours': -24 * 5}, u'5d ago', {'short_format': True}),
     ({'months': -1}, u'1m ago', {'short_format': True}),
     ({'months': -1, 'days': -2}, u'1m, 2d ago', {'short_format': True}),
     ({'years': -1, 'months': -1}, u'1y, 1m ago', {'short_format': True}),
 ])
 def test_age(age_args, expected, kw, pylonsapp):
     from rhodecode.lib.utils2 import age
     from dateutil import relativedelta
     n = datetime.datetime(year=2012, month=5, day=17)
     delt = lambda *args, **kwargs: relativedelta.relativedelta(*args, **kwargs)
     assert age(n + delt(**age_args), now=n, **kw) == expected
 
 @pytest.mark.parametrize("age_args, expected, kw", [
     ({}, u'just now', {}),
     ({'seconds': 1}, u'in 1 second', {}),
     ({'seconds': 60 * 2}, u'in 2 minutes', {}),
     ({'hours': 1}, u'in 1 hour', {}),
     ({'hours': 24}, u'in 1 day', {}),
     ({'hours': 24 * 5}, u'in 5 days', {}),
     ({'months': 1}, u'in 1 month', {}),
     ({'months': 1, 'days': 1}, u'in 1 month and 1 day', {}),
     ({'years': 1, 'months': 1}, u'in 1 year and 1 month', {}),
     ({}, u'just now', {'short_format': True}),
     ({'seconds': 1}, u'in 1sec', {'short_format': True}),
     ({'seconds': 60 * 2}, u'in 2min', {'short_format': True}),
     ({'hours': 1}, u'in 1h', {'short_format': True}),
     ({'hours': 24}, u'in 1d', {'short_format': True}),
     ({'hours': 24 * 5}, u'in 5d', {'short_format': True}),
     ({'months': 1}, u'in 1m', {'short_format': True}),
     ({'months': 1, 'days': 1}, u'in 1m, 1d', {'short_format': True}),
     ({'years': 1, 'months': 1}, u'in 1y, 1m', {'short_format': True}),
 ])
 def test_age_in_future(age_args, expected, kw, pylonsapp):
     from rhodecode.lib.utils2 import age
     from dateutil import relativedelta
     n = datetime.datetime(year=2012, month=5, day=17)
     delt = lambda *args, **kwargs: relativedelta.relativedelta(*args, **kwargs)
     assert age(n + delt(**age_args), now=n, **kw) == expected
 
 
 def test_tag_exctrator():
     sample = (
         "hello pta[tag] gog [[]] [[] sda ero[or]d [me =>>< sa]"
         "[requires] [stale] [see<>=>] [see => http://url.com]"
         "[requires => url] [lang => python] [just a tag] <html_tag first='abc' attr=\"my.url?attr=&another=\"></html_tag>"
         "[,d] [ => ULR ] [obsolete] [desc]]"
     )
     from rhodecode.lib.helpers import desc_stylize, escaped_stylize
     res = desc_stylize(sample)
     assert '<div class="metatag" tag="tag">tag</div>' in res
     assert '<div class="metatag" tag="obsolete">obsolete</div>' in res
     assert '<div class="metatag" tag="stale">stale</div>' in res
     assert '<div class="metatag" tag="lang">python</div>' in res
     assert '<div class="metatag" tag="requires">requires =&gt; <a href="/url">url</a></div>' in res
     assert '<div class="metatag" tag="tag">tag</div>' in res
     assert '<html_tag first=\'abc\' attr=\"my.url?attr=&another=\"></html_tag>' in res
 
     res_encoded = escaped_stylize(sample)
     assert '<div class="metatag" tag="tag">tag</div>' in res_encoded
     assert '<div class="metatag" tag="obsolete">obsolete</div>' in res_encoded
     assert '<div class="metatag" tag="stale">stale</div>' in res_encoded
     assert '<div class="metatag" tag="lang">python</div>' in res_encoded
     assert '<div class="metatag" tag="requires">requires =&gt; <a href="/url">url</a></div>' in res_encoded
     assert '<div class="metatag" tag="tag">tag</div>' in res_encoded
     assert '&lt;html_tag first=&#39;abc&#39; attr=&#34;my.url?attr=&amp;another=&#34;&gt;&lt;/html_tag&gt;' in res_encoded
 
 
 @pytest.mark.parametrize("tmpl_url, email, expected", [
     ('http://test.com/{email}', '[e-mail]', 'http://test.com/[e-mail]'),
 
     ('http://test.com/{md5email}', '[e-mail]', 'http://test.com/3cb7232fcc48743000cb86d0d5022bd9'),
     ('http://test.com/{md5email}', 'testąć@foo.com', 'http://test.com/978debb907a3c55cd741872ab293ef30'),
 
     ('http://testX.com/{md5email}?s={size}', '[e-mail]', 'http://testX.com/3cb7232fcc48743000cb86d0d5022bd9?s=24'),
     ('http://testX.com/{md5email}?s={size}', 'testąć@foo.com', 'http://testX.com/978debb907a3c55cd741872ab293ef30?s=24'),
 
     ('{scheme}://{netloc}/{md5email}/{size}', '[e-mail]', 'https://server.com/3cb7232fcc48743000cb86d0d5022bd9/24'),
     ('{scheme}://{netloc}/{md5email}/{size}', 'testąć@foo.com', 'https://server.com/978debb907a3c55cd741872ab293ef30/24'),
 
     ('http://test.com/{email}', 'testąć@foo.com', 'http://test.com/testąć@foo.com'),
     ('http://test.com/{email}?size={size}', '[e-mail]', 'http://test.com/[e-mail]?size=24'),
     ('http://test.com/{email}?size={size}', 'testąć@foo.com', 'http://test.com/testąć@foo.com?size=24'),
 ])
 def test_gravatar_url_builder(tmpl_url, email, expected, request_stub):
     from rhodecode.lib.helpers import gravatar_url
 
     # mock pyramid.threadlocals
     def fake_get_current_request():
         request_stub.scheme = 'https'
         request_stub.host = 'server.com'
         return request_stub
 
     # mock pylons.tmpl_context
     def fake_tmpl_context(_url):
         _c = AttributeDict()
         _c.visual = AttributeDict()
         _c.visual.use_gravatar = True
         _c.visual.gravatar_url = _url
 
         return _c
 
     with mock.patch('rhodecode.lib.helpers.get_current_request',
                     fake_get_current_request):
         fake = fake_tmpl_context(_url=tmpl_url)
         with mock.patch('pylons.tmpl_context', fake):
             grav = gravatar_url(email_address=email, size=24)
             assert grav == expected
 
 
 @pytest.mark.parametrize(
     "email, first_name, last_name, expected_initials, expected_color", [
 
         ('[e-mail]', '', '', 'TR', '#8a994d'),
         ('[e-mail]', '', '', 'MK', '#6559b3'),
         # special cases of email
         ('[e-mail]', '', '', 'JD', '#526600'),
         ('[e-mail]', '', '', 'GR', '#990052'),
         ('[e-mail]', 'Guido', 'Van Rossum', 'GR', '#990052'),
 
         ('[e-mail]', '', '', 'RR', '#46598c'),
         ('[e-mail]', 'Nguyễn Thái', 'Tgọc Duy', 'ND', '#665200'),
 
         ('[e-mail]', '', '', 'JF', '#73006b'),
         ('[e-mail]', 'Marcin', 'Kuzminski', 'MK', '#104036'),
         # partials
         ('[e-mail]', 'Marcin', '', 'MR', '#104036'),  # fn+email
         ('[e-mail]', '', 'Kuzminski', 'AK', '#104036'),  # em+ln
         # non-ascii
         ('[e-mail]', 'Marcin', 'Śuzminski', 'MS', '#104036'),
         ('marcin.ś[e-mail]', '', '', 'MS', '#73000f'),
 
         # special cases, LDAP can provide those...
         ('admin@', 'Marcin', 'Śuzminski', 'MS', '#aa00ff'),
         ('marcin.śuzminski', '', '', 'MS', '#402020'),
         ('null', '', '', 'NL', '#8c4646'),
 ])
 def test_initials_gravatar_pick_of_initials_and_color_algo(
         email, first_name, last_name, expected_initials, expected_color):
     instance = InitialsGravatar(email, first_name, last_name)
     assert instance.get_initials() == expected_initials
     assert instance.str2color(email) == expected_color
 
 
 def test_initials_gravatar_mapping_algo():
     pos = set()
     instance = InitialsGravatar('', '', '')
     iterations = 0
 
     variations = []
     for letter1 in string.ascii_letters:
         for letter2 in string.ascii_letters[::-1][:10]:
             for letter3 in string.ascii_letters[:10]:
                 variations.append(
                     '[e-mail]' % (letter1+letter2+letter3))
 
     max_variations = 4096
     for email in variations[:max_variations]:
         iterations += 1
         pos.add(
             instance.pick_color_bank_index(email,
                                            instance.get_color_bank()))
 
     # we assume that we have match all 256 possible positions,
     # in reasonable amount of different email addresses
     assert len(pos) == 256
     assert iterations == max_variations
 
 
 @pytest.mark.parametrize("tmpl, repo_name, overrides, prefix, expected", [
     (Repository.DEFAULT_CLONE_URI, 'group/repo1', {}, '', 'http://vps1:8000/group/repo1'),
     (Repository.DEFAULT_CLONE_URI, 'group/repo1', {'user': 'marcink'}, '', 'http://marcink@vps1:8000/group/repo1'),
     (Repository.DEFAULT_CLONE_URI, 'group/repo1', {}, '/rc', 'http://vps1:8000/rc/group/repo1'),
     (Repository.DEFAULT_CLONE_URI, 'group/repo1', {'user': 'user'}, '/rc', 'http://user@vps1:8000/rc/group/repo1'),
     (Repository.DEFAULT_CLONE_URI, 'group/repo1', {'user': 'marcink'}, '/rc', 'http://marcink@vps1:8000/rc/group/repo1'),
     (Repository.DEFAULT_CLONE_URI, 'group/repo1', {'user': 'user'}, '/rc/', 'http://user@vps1:8000/rc/group/repo1'),
     (Repository.DEFAULT_CLONE_URI, 'group/repo1', {'user': 'marcink'}, '/rc/', 'http://marcink@vps1:8000/rc/group/repo1'),
     ('{scheme}://{user}@{netloc}/_{repoid}', 'group/repo1', {}, '', 'http://vps1:8000/_23'),
     ('{scheme}://{user}@{netloc}/_{repoid}', 'group/repo1', {'user': 'marcink'}, '', 'http://marcink@vps1:8000/_23'),
     ('http://{user}@{netloc}/_{repoid}', 'group/repo1', {'user': 'marcink'}, '', 'http://marcink@vps1:8000/_23'),
     ('http://{netloc}/_{repoid}', 'group/repo1', {'user': 'marcink'}, '', 'http://vps1:8000/_23'),
     ('https://{user}@proxy1.server.com/{repo}', 'group/repo1', {'user': 'marcink'}, '', 'https://[e-mail]/group/repo1'),
     ('https://{user}@proxy1.server.com/{repo}', 'group/repo1', {}, '', 'https://proxy1.server.com/group/repo1'),
     ('https://proxy1.server.com/{user}/{repo}', 'group/repo1', {'user': 'marcink'}, '', 'https://proxy1.server.com/marcink/group/repo1'),
 ])
 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)
     assert clone_url == expected
 
 
 def _quick_url(text, tmpl="""<a class="revision-link" href="%s">%s</a>""", url_=None):
     """
     Changes `some text url[foo]` => `some text <a href="/">foo</a>
 
     :param text:
     """
     import re
     # quickly change expected url[] into a link
     URL_PAT = re.compile(r'(?:url\[)(.+?)(?:\])')
 
     def url_func(match_obj):
         _url = match_obj.groups()[0]
         return tmpl % (url_ or '/some-url', _url)
     return URL_PAT.sub(url_func, text)
 
 
 @pytest.mark.parametrize("sample, expected", [
   ("",
    ""),
   ("git-svn-id: https://svn.apache.org/repos/asf/libcloud/trunk@1441655 13f79535-47bb-0310-9956-ffa450edef68",
    "git-svn-id: https://svn.apache.org/repos/asf/libcloud/trunk@1441655 13f79535-47bb-0310-9956-ffa450edef68"),
   ("from rev 000000000000",
    "from rev url[000000000000]"),
   ("from rev 000000000000123123 also rev 000000000000",
    "from rev url[000000000000123123] also rev url[000000000000]"),
   ("this should-000 00",
    "this should-000 00"),
   ("longtextffffffffff rev 123123123123",
    "longtextffffffffff rev url[123123123123]"),
   ("rev ffffffffffffffffffffffffffffffffffffffffffffffffff",
    "rev ffffffffffffffffffffffffffffffffffffffffffffffffff"),
   ("ffffffffffff some text traalaa",
    "url[ffffffffffff] some text traalaa"),
    ("""Multi line
    123123123123
    some text 123123123123
    sometimes !
    """,
    """Multi line
    url[123123123123]
    some text url[123123123123]
    sometimes !
    """)
 ])
 def test_urlify_commits(sample, expected):
     def fake_url(self, *args, **kwargs):
         return '/some-url'
 
     expected = _quick_url(expected)
 
     with mock.patch('pylons.url', fake_url):
         from rhodecode.lib.helpers import urlify_commits
         assert urlify_commits(sample, 'repo_name') == expected
 
 
 @pytest.mark.parametrize("sample, expected, url_", [
     ("",
      "",
      ""),
     ("https://svn.apache.org/repos",
      "url[https://svn.apache.org/repos]",
      "https://svn.apache.org/repos"),
     ("http://svn.apache.org/repos",
      "url[http://svn.apache.org/repos]",
      "http://svn.apache.org/repos"),
     ("from rev a also rev http://google.com",
      "from rev a also rev url[http://google.com]",
      "http://google.com"),
     ("""Multi line
      https://foo.bar.com
      some text lalala""",
      """Multi line
      url[https://foo.bar.com]
      some text lalala""",
      "https://foo.bar.com")
 ])
 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_)
     assert urlify_text(sample) == expected
 
 
 @pytest.mark.parametrize("test, expected", [
   ("", None),
   ("/_2", '2'),
   ("_2", '2'),
   ("/_2/", '2'),
   ("_2/", '2'),
 
   ("/_21", '21'),
   ("_21", '21'),
   ("/_21/", '21'),
   ("_21/", '21'),
 
   ("/_21/foobar", '21'),
   ("_21/121", '21'),
   ("/_21/_12", '21'),
   ("_21/rc/foo", '21'),
 
 ])
 def test_get_repo_by_id(test, expected):
     from rhodecode.model.repo import RepoModel
     _test = RepoModel()._extract_id_from_repo_name(test)
     assert _test == expected
 
 
-def test_invalidation_context(pylonsapp):
[e-mail]("test_repo_name, repo_type", [
+  ("test_repo_1", None),
+  ("repo_group/foobar", None),
+  ("test_non_asci_ąćę", None),
+  (u"test_non_asci_unicode_ąćę", None),
+])
+def test_invalidation_context(pylonsapp, test_repo_name, repo_type):
     from beaker.cache import cache_region
     from rhodecode.lib import caches
     from rhodecode.model.db import CacheKey
 
     @cache_region('long_term')
     def _dummy_func(cache_key):
         return 'result'
 
     invalidator_context = CacheKey.repo_context_cache(
-        _dummy_func, 'test_repo_1', 'repo')
+        _dummy_func, test_repo_name, 'repo')
 
     with invalidator_context as context:
         invalidated = context.invalidate()
         result = context.compute()
 
     assert invalidated == True
     assert 'result' == result
     assert isinstance(context, caches.FreshRegionCache)
 
+    assert 'InvalidationContext' in repr(invalidator_context)
+
     with invalidator_context as context:
         context.invalidate()
         result = context.compute()
 
     assert 'result' == result
     assert isinstance(context, caches.ActiveRegionCache)
 
 
 def test_invalidation_context_exception_in_compute(pylonsapp):
     from rhodecode.model.db import CacheKey
     from beaker.cache import cache_region
 
     @cache_region('long_term')
     def _dummy_func(cache_key):
         # this causes error since it doesn't get any params
         raise Exception('ups')
 
     invalidator_context = CacheKey.repo_context_cache(
         _dummy_func, 'test_repo_2', 'repo')
 
     with pytest.raises(Exception):
         with invalidator_context as context:
             context.invalidate()
             context.compute()
 
 
 @pytest.mark.parametrize('execution_number', range(5))
 def test_cache_invalidation_race_condition(execution_number, pylonsapp):
     import time
     from beaker.cache import cache_region
     from rhodecode.model.db import CacheKey
 
     if CacheKey.metadata.bind.url.get_backend_name() == "mysql":
         reason = (
             'Fails on MariaDB due to some locking issues. Investigation'
             ' needed')
         pytest.xfail(reason=reason)
 
     @run_test_concurrently(25)
     def test_create_and_delete_cache_keys():
         time.sleep(0.2)
 
         @cache_region('long_term')
         def _dummy_func(cache_key):
             return 'result'
 
         invalidator_context = CacheKey.repo_context_cache(
             _dummy_func, 'test_repo_1', 'repo')
 
         with invalidator_context as context:
             context.invalidate()
             context.compute()
 
         CacheKey.set_invalidate('test_repo_1', delete=True)
 
     test_create_and_delete_cache_keys()

rhodecode/tests/vcs/test_client_http.py

@@ -1,87 +1,100 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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 mock
 import msgpack
 import pytest
 
 from rhodecode.lib import vcs
 from rhodecode.lib.vcs import client_http
 
 
 def test_uses_persistent_http_connections(caplog, vcsbackend_hg):
     repo = vcsbackend_hg.repo
     remote_call = repo._remote.branches
 
     with caplog.at_level(logging.INFO):
         for x in range(5):
             remote_call(normal=True, closed=False)
 
     new_connections = [
         r for r in caplog.record_tuples() if is_new_connection(*r)]
     assert len(new_connections) <= 1
 
 
 def is_new_connection(logger, level, message):
     return (
         logger == 'requests.packages.urllib3.connectionpool' and
         message.startswith('Starting new HTTP'))
 
 
 @pytest.fixture
 def stub_session():
     """
     Stub of `requests.Session()`.
     """
     session = mock.Mock()
     session.post().content = msgpack.packb({})
     session.reset_mock()
     return session
 
 
-def test_repo_maker_uses_session_for_classmethods(stub_session):
[e-mail]
+def stub_session_factory(stub_session):
+    """
+    Stub of `rhodecode.lib.vcs.client_http.ThreadlocalSessionFactory`.
+    """
+    session_factory = mock.Mock()
+    session_factory.return_value = stub_session
+    return session_factory
+
+
+def test_repo_maker_uses_session_for_classmethods(stub_session_factory):
     repo_maker = client_http.RepoMaker(
-        'server_and_port', 'endpoint', stub_session)
+        'server_and_port', 'endpoint', stub_session_factory)
     repo_maker.example_call()
-    stub_session.post.assert_called_with(
+    stub_session_factory().post.assert_called_with(
         'http://server_and_port/endpoint', data=mock.ANY)
 
 
 def test_repo_maker_uses_session_for_instance_methods(
-        stub_session, config):
+        stub_session_factory, config):
     repo_maker = client_http.RepoMaker(
-        'server_and_port', 'endpoint', stub_session)
+        'server_and_port', 'endpoint', stub_session_factory)
     repo = repo_maker('stub_path', config)
     repo.example_call()
-    stub_session.post.assert_called_with(
+    stub_session_factory().post.assert_called_with(
         'http://server_and_port/endpoint', data=mock.ANY)
 
 
[e-mail]('rhodecode.lib.vcs.client_http.ThreadlocalSessionFactory')
 @mock.patch('rhodecode.lib.vcs.connection')
-def test_connect_passes_in_the_same_session(connection, stub_session):
-    session_factory_patcher = mock.patch.object(
-        vcs, '_create_http_rpc_session', return_value=stub_session)
-    with session_factory_patcher:
-        vcs.connect_http('server_and_port')
-    assert connection.Hg._session == stub_session
-    assert connection.Svn._session == stub_session
-    assert connection.Git._session == stub_session
+def test_connect_passes_in_the_same_session(
+        connection, session_factory_class, stub_session):
+    session_factory = session_factory_class.return_value
+    session_factory.return_value = stub_session
+
+    vcs.connect_http('server_and_port')
+
+    assert connection.Hg._session_factory() == stub_session
+    assert connection.Svn._session_factory() == stub_session
+    assert connection.Git._session_factory() == stub_session

rhodecode/tweens.py

@@ -1,87 +1,86 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2016  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 pylons
 import rhodecode
 
 from pylons.i18n.translation import _get_translator
 from pylons.util import ContextObj
 from routes.util import URLGenerator
 
 from rhodecode.lib.base import attach_context_attributes, get_auth_user
 from rhodecode.model import meta
 
 log = logging.getLogger(__name__)
 
 
 def pylons_compatibility_tween_factory(handler, registry):
     def pylons_compatibility_tween(request):
         """
         While migrating from pylons to pyramid we need to call some pylons code
         from pyramid. For example while rendering an old template that uses the
         'c' or 'h' objects. This tween sets up the needed pylons globals.
         """
         try:
             config = rhodecode.CONFIG
             environ = request.environ
             session = request.session
             session_key = (config['pylons.environ_config']
                            .get('session', 'beaker.session'))
 
             # Setup pylons globals.
             pylons.config._push_object(config)
             pylons.request._push_object(request)
             pylons.session._push_object(session)
             environ[session_key] = session
             pylons.url._push_object(URLGenerator(config['routes.map'],
                                                  environ))
 
             # TODO: Maybe we should use the language from pyramid.
             translator = _get_translator(config.get('lang'))
             pylons.translator._push_object(translator)
 
             # Get the rhodecode auth user object and make it available.
             auth_user = get_auth_user(environ)
             request.user = auth_user
             environ['rc_auth_user'] = auth_user
 
             # Setup the pylons context object ('c')
             context = ContextObj()
             context.rhodecode_user = auth_user
             attach_context_attributes(context)
             pylons.tmpl_context._push_object(context)
-
             return handler(request)
         finally:
             # Dispose current database session and rollback uncommitted
             # transactions.
             meta.Session.remove()
 
     return pylons_compatibility_tween
 
 
 def includeme(config):
     config.add_subscriber('rhodecode.subscribers.add_renderer_globals',
                           'pyramid.events.BeforeRender')
     config.add_subscriber('rhodecode.subscribers.add_localizer',
                           'pyramid.events.NewRequest')
     config.add_tween('rhodecode.tweens.pylons_compatibility_tween_factory')

test.ini

@@ -1,612 +1,606 b''
 ################################################################################
 ################################################################################
 # RhodeCode Enterprise - configuration file                                    #
 # Built-in functions and variables                                             #
 # The %(here)s variable will be replaced with the parent directory of this file#
 #                                                                              #
 ################################################################################
 
 [DEFAULT]
 debug = true
 pdebug = false
 ################################################################################
 ## Uncomment and replace with the email address which should receive          ##
 ## any error reports after an application crash                               ##
 ## Additionally these settings will be used by the RhodeCode mailing system   ##
 ################################################################################
 #email_to = admin@localhost
 #error_email_from = paste_error@localhost
 #app_email_from = rhodecode-noreply@localhost
 #error_message =
 #email_prefix = [RhodeCode]
 
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =
 #smtp_port =
 #smtp_use_tls = false
 #smtp_use_ssl = true
 ## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
 #smtp_auth =
 
 [server:main]
 ## COMMON ##
 host = 0.0.0.0
 port = 5000
 
 ##########################
 ## WAITRESS WSGI SERVER ##
 ##########################
 use = egg:waitress#main
 ## number of worker threads
 threads = 5
 ## MAX BODY SIZE 100GB
 max_request_body_size = 107374182400
 ## Use poll instead of select, fixes file descriptors limits problems.
 ## May not work on old windows systems.
 asyncore_use_poll = true
 
 ## PASTE HTTP ##
 #use = egg:Paste#http
 ## nr of worker threads to spawn
 #threadpool_workers = 5
 ## max request before thread respawn
 #threadpool_max_requests = 10
 ## option to use threads of process
 #use_threadpool = true
 
 ##########################
 ## GUNICORN WSGI SERVER ##
 ##########################
 ## run with gunicorn --log-config <inifile.ini> --paste <inifile.ini>
 #use = egg:gunicorn#main
 ## Sets the number of process workers. You must set `instance_id = *`
 ## when this option is set to more than one worker, recommended
 ## value is (2 * NUMBER_OF_CPUS + 1), eg 2CPU = 5 workers
 ## The `instance_id = *` must be set in the [app:main] section below
 #workers = 1
 ## number of threads for each of the worker, must be set to 1 for gevent
 ## generally recommened to be at 1
 #threads = 1
 ## process name
 #proc_name = rhodecode
 ## type of worker class, one of sync, gevent
 ## recommended for bigger setup is using of of other than sync one
 #worker_class = sync
 ## max number of requests that worker will handle before being gracefully
 ## restarted, could prevent memory leaks
 #max_requests = 1000
 #max_requests_jitter = 30
 ## ammount of time a worker can spend with handling a request before it
 ## gets killed and restarted. Set to 6hrs
 #timeout = 21600
 
 ## UWSGI ##
 ## run with uwsgi --ini-paste-logged <inifile.ini>
 #[uwsgi]
 #socket = /tmp/uwsgi.sock
 #master = true
 #http = 127.0.0.1:5000
 
 ## set as deamon and redirect all output to file
 #daemonize = ./uwsgi_rhodecode.log
 
 ## master process PID
 #pidfile = ./uwsgi_rhodecode.pid
 
 ## stats server with workers statistics, use uwsgitop
 ## for monitoring, `uwsgitop 127.0.0.1:1717`
 #stats = 127.0.0.1:1717
 #memory-report = true
 
 ## log 5XX errors
 #log-5xx = true
 
 ## Set the socket listen queue size.
 #listen = 256
 
 ## Gracefully Reload workers after the specified amount of managed requests
 ## (avoid memory leaks).
 #max-requests = 1000
 
 ## enable large buffers
 #buffer-size=65535
 
 ## socket and http timeouts ##
 #http-timeout=3600
 #socket-timeout=3600
 
 ## Log requests slower than the specified number of milliseconds.
 #log-slow = 10
 
 ## Exit if no app can be loaded.
 #need-app = true
 
 ## Set lazy mode (load apps in workers instead of master).
 #lazy = true
 
 ## scaling ##
 ## set cheaper algorithm to use, if not set default will be used
 #cheaper-algo = spare
 
 ## minimum number of workers to keep at all times
 #cheaper = 1
 
 ## number of workers to spawn at startup
 #cheaper-initial = 1
 
 ## maximum number of workers that can be spawned
 #workers = 4
 
 ## how many workers should be spawned at a time
 #cheaper-step = 1
 
 ## prefix middleware for RhodeCode, disables force_https flag.
 ## allows to set RhodeCode under a prefix in server.
 ## eg https://server.com/<prefix>. Enable `filter-with =` option below as well.
 #[filter:proxy-prefix]
 #use = egg:PasteDeploy#prefix
 #prefix = /<your-prefix>
 
 [app:main]
 is_test = True
 use = egg:rhodecode-enterprise-ce
 ## enable proxy prefix middleware, defined below
 #filter-with = proxy-prefix
 
 rhodecode.includes = rhodecode.api
 
 # api prefix url
 rhodecode.api.url = /_admin/api
 
 
 full_stack = true
 
 ## Serve static files via RhodeCode, disable to serve them via HTTP server
 static_files = true
 
 ## Optional Languages
 ## en(default), be, de, es, fr, it, ja, pl, pt, ru, zh
 lang = en
 
 ## perform a full repository scan on each server start, this should be
 ## set to false after first startup, to allow faster server restarts.
 startup.import_repos = true
 
 ## Uncomment and set this path to use archive download cache.
 ## Once enabled, generated archives will be cached at this location
 ## and served from the cache during subsequent requests for the same archive of
 ## the repository.
 #archive_cache_dir = /tmp/tarballcache
 
 ## change this to unique ID for security
 app_instance_uuid = rc-production
 
 ## cut off limit for large diffs (size in bytes)
 cut_off_limit_diff = 1024000
 cut_off_limit_file = 256000
 
 ## use cache version of scm repo everywhere
 vcs_full_cache = false
 
 ## force https in RhodeCode, fixes https redirects, assumes it's always https
 ## Normally this is controlled by proper http flags sent from http server
 force_https = false
 
 ## use Strict-Transport-Security headers
 use_htsts = false
 
 ## number of commits stats will parse on each iteration
 commit_parse_limit = 25
 
 ## git rev filter option, --all is the default filter, if you need to
 ## hide all refs in changelog switch this to --branches --tags
 git_rev_filter = --all
 
 # Set to true if your repos are exposed using the dumb protocol
 git_update_server_info = false
 
 ## RSS/ATOM feed options
 rss_cut_off_limit = 256000
 rss_items_per_page = 10
 rss_include_diff = false
 
 ## gist URL alias, used to create nicer urls for gist. This should be an
 ## url that does rewrites to _admin/gists/<gistid>.
 ## example: http://gist.rhodecode.org/{gistid}. Empty means use the internal
 ## RhodeCode url, ie. http[s]://rhodecode.server/_admin/gists/<gistid>
 gist_alias_url =
 
 ## List of controllers (using glob pattern syntax) that AUTH TOKENS could be
 ## used for access.
 ## Adding ?auth_token = <token> to the url authenticates this request as if it
 ## came from the the logged in user who own this authentication token.
 ##
 ## Syntax is <ControllerClass>:<function_pattern>.
 ## To enable access to raw_files put `FilesController:raw`.
 ## To enable access to patches add `ChangesetController:changeset_patch`.
 ## The list should be "," separated and on a single line.
 ##
 ## Recommended controllers to enable:
 #    ChangesetController:changeset_patch,
 #    ChangesetController:changeset_raw,
 #    FilesController:raw,
 #    FilesController:archivefile,
 #    GistsController:*,
 api_access_controllers_whitelist =
 
 ## default encoding used to convert from and to unicode
 ## can be also a comma separated list of encoding in case of mixed encodings
 default_encoding = UTF-8
 
 ## instance-id prefix
 ## a prefix key for this instance used for cache invalidation when running
 ## multiple instances of rhodecode, make sure it's globally unique for
 ## all running rhodecode instances. Leave empty if you don't use it
 instance_id =
 
 ## alternative return HTTP header for failed authentication. Default HTTP
 ## response is 401 HTTPUnauthorized. Currently HG clients have troubles with
 ## handling that causing a series of failed authentication calls.
 ## Set this variable to 403 to return HTTPForbidden, or any other HTTP code
 ## This will be served instead of default 401 on bad authnetication
 auth_ret_code =
 
 ## use special detection method when serving auth_ret_code, instead of serving
 ## ret_code directly, use 401 initially (Which triggers credentials prompt)
 ## and then serve auth_ret_code to clients
 auth_ret_code_detection = false
 
 ## locking return code. When repository is locked return this HTTP code. 2XX
 ## codes don't break the transactions while 4XX codes do
 lock_ret_code = 423
 
 ## allows to change the repository location in settings page
 allow_repo_location_change = true
 
 ## allows to setup custom hooks in settings page
 allow_custom_hooks_settings = true
 
 ## generated license token, goto license page in RhodeCode settings to obtain
 ## new token
 license_token = abra-cada-bra1-rce3
 
 ## supervisor connection uri, for managing supervisor and logs.
 supervisor.uri =
 ## supervisord group name/id we only want this RC instance to handle
 supervisor.group_id = dev
 
 ## Display extended labs settings
 labs_settings_active = true
 
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
 use_celery = false
 broker.host = localhost
 broker.vhost = rabbitmqhost
 broker.port = 5672
 broker.user = rabbitmq
 broker.password = qweqwe
 
 celery.imports = rhodecode.lib.celerylib.tasks
 
 celery.result.backend = amqp
 celery.result.dburi = amqp://
 celery.result.serialier = json
 
 #celery.send.task.error.emails = true
 #celery.amqp.task.result.expires = 18000
 
 celeryd.concurrency = 2
 #celeryd.log.file = celeryd.log
 celeryd.log.level = debug
 celeryd.max.tasks.per.child = 1
 
 ## tasks will never be sent to the queue, but executed locally instead.
 celery.always.eager = false
 
 ####################################
 ###         BEAKER CACHE        ####
 ####################################
 # default cache dir for templates.  Putting this into a ramdisk
 ## can boost performance, eg. %(here)s/data_ramdisk
 cache_dir = %(here)s/data
 
 ## locking and default file storage for Beaker. Putting this into a ramdisk
 ## can boost performance, eg. %(here)s/data_ramdisk/cache/beaker_data
 beaker.cache.data_dir = %(here)s/rc/data/cache/beaker_data
 beaker.cache.lock_dir = %(here)s/rc/data/cache/beaker_lock
 
 beaker.cache.regions = super_short_term, short_term, long_term, sql_cache_short, auth_plugins, repo_cache_long
 
 beaker.cache.super_short_term.type = memory
 beaker.cache.super_short_term.expire = 1
 beaker.cache.super_short_term.key_length = 256
 
 beaker.cache.short_term.type = memory
 beaker.cache.short_term.expire = 60
 beaker.cache.short_term.key_length = 256
 
 beaker.cache.long_term.type = memory
 beaker.cache.long_term.expire = 36000
 beaker.cache.long_term.key_length = 256
 
 beaker.cache.sql_cache_short.type = memory
 beaker.cache.sql_cache_short.expire = 1
 beaker.cache.sql_cache_short.key_length = 256
 
 # default is memory cache, configure only if required
 # using multi-node or multi-worker setup
 #beaker.cache.auth_plugins.type = ext:database
 #beaker.cache.auth_plugins.lock_dir = %(here)s/data/cache/auth_plugin_lock
 #beaker.cache.auth_plugins.url = postgresql://postgres:secret@localhost/rhodecode
 #beaker.cache.auth_plugins.url = mysql://root:secret@127.0.0.1/rhodecode
 #beaker.cache.auth_plugins.sa.pool_recycle = 3600
 #beaker.cache.auth_plugins.sa.pool_size = 10
 #beaker.cache.auth_plugins.sa.max_overflow = 0
 
 beaker.cache.repo_cache_long.type = memorylru_base
 beaker.cache.repo_cache_long.max_items = 4096
 beaker.cache.repo_cache_long.expire = 2592000
 
 # default is memorylru_base cache, configure only if required
 # using multi-node or multi-worker setup
 #beaker.cache.repo_cache_long.type = ext:memcached
 #beaker.cache.repo_cache_long.url = localhost:11211
 #beaker.cache.repo_cache_long.expire = 1209600
 #beaker.cache.repo_cache_long.key_length = 256
 
 ####################################
 ###       BEAKER SESSION        ####
 ####################################
 
 ## .session.type is type of storage options for the session, current allowed
 ## types are file(default), ext:memcached, ext:database, and memory.
 #beaker.session.type = file
 
 ## db based session, fast, and allows easy management over logged in users ##
 #beaker.session.type = ext:database
 #beaker.session.lock_dir = %(here)s/data/cache/session_db_lock
 #beaker.session.table_name = db_session
 #beaker.session.sa.url = postgresql://postgres:secret@localhost/rhodecode
 #beaker.session.sa.url = mysql://root:secret@127.0.0.1/rhodecode
 #beaker.session.sa.pool_recycle = 3600
 #beaker.session.sa.echo = false
 
 beaker.session.key = rhodecode
 beaker.session.secret = test-rc-uytcxaz
 
 ## Secure encrypted cookie. Requires AES and AES python libraries
 ## you must disable beaker.session.secret to use this
 #beaker.session.encrypt_key = <key_for_encryption>
 #beaker.session.validate_key = <validation_key>
 
 ## sets session as invalid(also logging out user) if it haven not been
 ## accessed for given amount of time in seconds
 beaker.session.timeout = 2592000
 beaker.session.httponly = true
 #beaker.session.cookie_path = /<your-prefix>
 
 ## uncomment for https secure cookie
 beaker.session.secure = false
 
 ## auto save the session to not to use .save()
 beaker.session.auto = false
 
 ## default cookie expiration time in seconds, set to `true` to set expire
 ## at browser close
 #beaker.session.cookie_expires = 3600
 
 ###################################
 ## SEARCH INDEXING CONFIGURATION ##
 ###################################
 
 search.module = rhodecode.lib.index.whoosh
 search.location = %(here)s/data/index
 
 ###################################
 ## ERROR AND LOG HANDLING SYSTEM ##
 ###################################
 
 ## Appenlight is tailored to work with RhodeCode, see
 ## http://appenlight.com for details how to obtain an account
 
 ## appenlight integration enabled
 appenlight = false
 
 appenlight.server_url = https://api.appenlight.com
 appenlight.api_key = YOUR_API_KEY
 ;appenlight.transport_config = https://api.appenlight.com?threaded=1&timeout=5
 
 # used for JS client
 appenlight.api_public_key = YOUR_API_PUBLIC_KEY
 
 ## TWEAK AMOUNT OF INFO SENT HERE
 
 ## enables 404 error logging (default False)
 appenlight.report_404 = false
 
 ## time in seconds after request is considered being slow (default 1)
 appenlight.slow_request_time = 1
 
 ## record slow requests in application
 ## (needs to be enabled for slow datastore recording and time tracking)
 appenlight.slow_requests = true
 
 ## enable hooking to application loggers
 appenlight.logging = true
 
 ## minimum log level for log capture
 appenlight.logging.level = WARNING
 
 ## send logs only from erroneous/slow requests
 ## (saves API quota for intensive logging)
 appenlight.logging_on_error = false
 
 ## list of additonal keywords that should be grabbed from environ object
 ## can be string with comma separated list of words in lowercase
 ## (by default client will always send following info:
 ## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that
 ## start with HTTP* this list be extended with additional keywords here
 appenlight.environ_keys_whitelist =
 
 ## list of keywords that should be blanked from request object
 ## can be string with comma separated list of words in lowercase
 ## (by default client will always blank keys that contain following words
 ## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
 ## this list be extended with additional keywords set here
 appenlight.request_keys_blacklist =
 
 ## list of namespaces that should be ignores when gathering log entries
 ## can be string with comma separated list of namespaces
 ## (by default the client ignores own entries: appenlight_client.client)
 appenlight.log_namespace_blacklist =
 
 
 ################################################################################
 ## WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT*  ##
 ## Debug mode will enable the interactive debugging tool, allowing ANYONE to  ##
 ## execute malicious code after an exception is raised.                       ##
 ################################################################################
 set debug = false
 
 
 ##############
 ## STYLING  ##
 ##############
 debug_style = false
 
 #########################################################
 ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###
 #########################################################
 sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode_test.db
 #sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode_test
 #sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode_test
 
 # see sqlalchemy docs for other advanced settings
 
 ## print the sql statements to output
 sqlalchemy.db1.echo = false
 ## recycle the connections after this ammount of seconds
 sqlalchemy.db1.pool_recycle = 3600
 sqlalchemy.db1.convert_unicode = true
 
 ## the number of connections to keep open inside the connection pool.
 ## 0 indicates no limit
 #sqlalchemy.db1.pool_size = 5
 
 ## the number of connections to allow in connection pool "overflow", that is
 ## connections that can be opened above and beyond the pool_size setting,
 ## which defaults to five.
 #sqlalchemy.db1.max_overflow = 10
 
 
 ##################
 ### VCS CONFIG ###
 ##################
 vcs.server.enable = true
 vcs.server = localhost:9901
 # Available protocols: pyro4, http
 vcs.server.protocol = pyro4
 vcs.server.log_level = info
 vcs.start_server = false
 vcs.backends = hg, git, svn
 vcs.connection_timeout = 3600
 
 ################################
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
-keys = root, routes, rhodecode, sqlalchemy, beaker, pyro4, templates, whoosh_indexer
+keys = root, routes, rhodecode, sqlalchemy, beaker, pyro4, templates
 
 [handlers]
 keys = console, console_sql
 
 [formatters]
 keys = generic, color_formatter, color_formatter_sql
 
 #############
 ## LOGGERS ##
 #############
 [logger_root]
 level = DEBUG
 handlers = console
 
 [logger_routes]
 level = DEBUG
 handlers =
 qualname = routes.middleware
 ## "level = DEBUG" logs the route matched and routing variables.
 propagate = 1
 
 [logger_beaker]
 level = DEBUG
 handlers =
 qualname = beaker.container
 propagate = 1
 
 [logger_pyro4]
 level = DEBUG
 handlers =
 qualname = Pyro4
 propagate = 1
 
 [logger_templates]
 level = INFO
 handlers =
 qualname = pylons.templating
 propagate = 1
 
 [logger_rhodecode]
 level = DEBUG
 handlers =
 qualname = rhodecode
 propagate = 1
 
 [logger_sqlalchemy]
 level = ERROR
 handlers = console_sql
 qualname = sqlalchemy.engine
 propagate = 0
 
-[logger_whoosh_indexer]
-level = DEBUG
-handlers =
-qualname = whoosh_indexer
-propagate = 1
-
 ##############
 ## HANDLERS ##
 ##############
 
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
 level = INFO
 formatter = generic
 
 [handler_console_sql]
 class = StreamHandler
 args = (sys.stderr,)
 level = WARN
 formatter = generic
 
 ################
 ## FORMATTERS ##
 ################
 
 [formatter_generic]
 class = rhodecode.lib.logging_formatter.Pyro4AwareFormatter
 format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %Y-%m-%d %H:%M:%S
 
 [formatter_color_formatter]
 class = rhodecode.lib.logging_formatter.ColorFormatter
 format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %Y-%m-%d %H:%M:%S
 
 [formatter_color_formatter_sql]
 class = rhodecode.lib.logging_formatter.ColorFormatterSql
 format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %Y-%m-%d %H:%M:%S

rhodecode/controllers/error.py

@@ -1,138 +0,0 b''
-# -*- coding: utf-8 -*-
-
-# Copyright (C) 2010-2016  RhodeCode GmbH
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License, version 3
-# (only), as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# This program is dual-licensed. If you wish to learn more about the
-# RhodeCode Enterprise Edition, including its added features, Support services,
-# and proprietary license terms, please see https://rhodecode.com/licenses/
-
-"""
-RhodeCode error controller
-"""
-
-import cgi
-import logging
-import os
-import paste.fileapp
-
-from pylons import tmpl_context as c, request, config, url
-from pylons.i18n.translation import _
-from pylons.middleware import media_path
-from webob.exc import HTTPNotFound
-
-from rhodecode.lib.base import BaseController, render
-from rhodecode.lib.utils2 import AttributeDict
-from rhodecode.model.settings import SettingsModel
-
-log = logging.getLogger(__name__)
-
-
-class ErrorController(BaseController):
-    """Generates error documents as and when they are required.
-
-    The ErrorDocuments middleware forwards to ErrorController when error
-    related status codes are returned from the application.
-
-    This behavior can be altered by changing the parameters to the
-    ErrorDocuments middleware in your config/middleware.py file.
-    """
-
-    def __before__(self):
-
-        try:
-            rc_config = SettingsModel().get_all_settings()
-        except Exception:
-            log.exception('failed to fetch settings')
-            rc_config = {}
-
-        c.visual = AttributeDict({})
-        c.visual.rhodecode_support_url = (
-            rc_config.get('rhodecode_support_url') or url('rhodecode_support'))
-        return
-
-    def document(self):
-        resp = request.environ.get('pylons.original_response', None)
-        if not resp:
-            raise HTTPNotFound()
-
-        c.rhodecode_name = config.get('rhodecode_title')
-
-        log.debug('### %s ###' % resp.status)
-
-        e = request.environ
-        c.serv_p = r'%(protocol)s://%(host)s/' % {
-            'protocol': e.get('wsgi.url_scheme'),
-            'host': e.get('HTTP_HOST'),
-        }
-
-        c.error_message = cgi.escape(request.GET.get('code', str(resp.status)))
-        c.error_explanation = self.get_error_explanation(resp.status_int)
-
-        #  redirect to when error with given seconds
-        c.redirect_time = 0
-        c.redirect_module = _('Home page')
-        c.url_redirect = "/"
-
-        return render('/errors/error_document.html')
-
-    def img(self, id):
-        """Serve Pylons' stock images"""
-        return self._serve_file(os.path.join(media_path, 'img', id))
-
-    def style(self, id):
-        """Serve Pylons' stock stylesheets"""
-        return self._serve_file(os.path.join(media_path, 'style', id))
-
-    def _serve_file(self, path):
-        """Call Paste's FileApp (a WSGI application) to serve the file
-        at the specified path
-        """
-        fapp = paste.fileapp.FileApp(path)
-        return fapp(request.environ, self.start_response)
-
-    def get_error_explanation(self, code):
-        """ get the error explanations of int codes
-            [400, 401, 403, 404, 500]"""
-        try:
-            code = int(code)
-        except Exception:
-            code = 500
-
-        if code == 400:
-            return _('The request could not be understood by the server'
-                     ' due to malformed syntax.')
-        if code == 401:
-            return _('Unauthorized access to resource')
-        if code == 403:
-            return _("You don't have permission to view this page")
-        if code == 404:
-            return _('The resource could not be found')
-        if code == 500:
-            return _('The server encountered an unexpected condition'
-                     ' which prevented it from fulfilling the request.')
-
-    def vcs_unavailable(self):
-        c.rhodecode_name = config.get('rhodecode_title')
-        c.error_message = _('VCS Server Required')
-        c.error_explanation = _(
-            'A VCS Server is required for this action. '
-            'There is currently no VCS Server configured.')
-        c.error_docs_link = 'https://docs.rhodecode.com/RhodeCode-Control/'\
-            'tasks/upgrade-from-cli.html#manually-changing-vcs-server-settings'
-        #  redirect to when error with given seconds
-        c.redirect_time = 0
-        c.redirect_module = _('Home page')
-        c.url_redirect = "/"
-        return render('/errors/error_document.html')

rhodecode/lib/profiler.py

@@ -1,79 +0,0 b''
-# -*- coding: utf-8 -*-
-
-# Copyright (C) 2010-2016  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 gc
-import objgraph
-import cProfile
-import pstats
-import cgi
-import pprint
-import threading
-
-from StringIO import StringIO
-
-
-class ProfilingMiddleware(object):
-    def __init__(self, app):
-        self.lock = threading.Lock()
-        self.app = app
-
-    def __call__(self, environ, start_response):
-        with self.lock:
-            profiler = cProfile.Profile()
-
-            def run_app(*a, **kw):
-                self.response = self.app(environ, start_response)
-
-            profiler.runcall(run_app, environ, start_response)
-
-            profiler.snapshot_stats()
-
-            stats = pstats.Stats(profiler)
-            stats.sort_stats('calls') #cummulative
-
-            # Redirect output
-            out = StringIO()
-            stats.stream = out
-
-            stats.print_stats()
-
-            resp = ''.join(self.response)
-
-            # Lets at least only put this on html-like responses.
-            if resp.strip().startswith('<'):
-                ## The profiling info is just appended to the response.
-                ##  Browsers don't mind this.
-                resp += ('<pre style="text-align:left; '
-                         'border-top: 4px dashed red; padding: 1em;">')
-                resp += cgi.escape(out.getvalue(), True)
-
-                ct = objgraph.show_most_common_types()
-                print ct
-
-                resp += ct if ct else '---'
-
-                output = StringIO()
-                pprint.pprint(environ, output, depth=3)
-
-                resp += cgi.escape(output.getvalue(), True)
-                resp += '</pre>'
-
-            return resp

rhodecode/tests/controllers/test_error.py

@@ -1,29 +0,0 b''
-# -*- coding: utf-8 -*-
-
-# Copyright (C) 2010-2016  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 url
-
-
[e-mail]('app')
-class TestErrorController(object):
-    def test_direct_document_call(self):
-        self.app.get(url(controller='error', action='document'), status=404)