# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 1365352642 -7200
# Node ID 3563bb7b4b82973987c34f1b77b7de1264d97398
# Parent  0cef54d346059dfb140468c24531d87653b18214# Parent  49b34e3c0812adcca1351c7beb992e8e9c09184d
merge with rc1

diff -r 49b34e3c0812 -r 3563bb7b4b82 .hgignore
--- a/.hgignore	Sun Apr 07 16:44:46 2013 +0200
+++ b/.hgignore	Sun Apr 07 18:37:22 2013 +0200
@@ -3,7 +3,8 @@
 *.swp
 *.sqlite
 *.tox
-Paste*.egg
+*.egg-info
+*.egg
 
 syntax: regexp
 ^rcextensions
diff -r 49b34e3c0812 -r 3563bb7b4b82 .hgtags
--- a/.hgtags	Sun Apr 07 16:44:46 2013 +0200
+++ b/.hgtags	Sun Apr 07 18:37:22 2013 +0200
@@ -23,7 +23,43 @@
 2fa16ec5822da0c6fade3dd1ed9b6c0655e5dbbf v0.8.4
 16ba57d8fe2317c49dbd422afd07ab497687aa02 v0.8.5
 53128b6b9a4ddb6ee9554cbb83a082a6d1316b42 v1.0.0rc4
-bdc438fb4fe46fc0408de71bb659c691799a2de6 v1.1.4
-2ab211e0aecdb15fd767e5584244152db5b6f4c1 v1.1.7
-2ab211e0aecdb15fd767e5584244152db5b6f4c1 v1.1.7
+afd98d1f817e6a6b52172735c22160239e615a6b v1.0.0
+bee56f209c40a6880f2f633b02227b5ee1f8ff5a v1.0.1
+d85b0948e53925ebbbc49e9f7967013a04f866e9 v1.0.2
+d9c8dddb96af521e346f05b88d515c536eef3d17 v1.1.0
+344f748517814ed0408a49e392dc625f4cc37fdc v1.1.1
+6c01c12eafb8cc72d4c4cbd121400fad755b2862 v1.1.2
+4fa80e0484ef5c33feaa9c39fc66916f410ba353 v1.1.3
+cb77867d69d3c5931712aac486c980a42ee90745 v1.1.5
+cb77867d69d3c5931712aac486c980a42ee90745 v1.1.5
+008bdfdd95c8bd31ae6d89f76c75c1f49cbcd0bc v1.1.5
+c5af1d3c861fb36b156224e75c2f55a97f54657d v1.1.6
 7327a0d1584cf28d33e738048af1f6809d499451 v1.1.7
+bd102f45950f779995a1beae42b6eb099cdd27b3 v1.1.7
+c8974135732aa0ceb841cee6df66e29f089b4963 v1.1.8
+c252049af24cd98eef5f4143fa3abbff3c912e29 1.2.0
+c252049af24cd98eef5f4143fa3abbff3c912e29 1.2.0
+0000000000000000000000000000000000000000 1.2.0
+c252049af24cd98eef5f4143fa3abbff3c912e29 v1.2.0
+0b8fba8ab90b01f811a50e6e7384989cced21d38 v1.2.1
+22273bec00ba2fd860c60a9277d3d7229e288e18 v1.2.2
+1ff606a7858dbd8a5f70b3da5cc89524bd0d84f9 v1.2.3
+a7a282a902b207ce34e830d643c79b7ab52e3b35 v1.2.4
+b6b611e7722e754abebaae6e265cbb4c823d344d v1.2.5
+dbc82e3362a25d2aece42060089824c4342efd17 v1.3.0
+79a95f338fd0115b2cdb77118f39e17d22ff505c v1.3.1
+9ab21c5ddb84935bea5c743b4e147ed5a398b30c v1.3.2
+934906f028b582a254e0028ba25e5d20dd32b9cd v1.3.3
+af21362474e3ab5aa0e2fbb1c872356f2c16c4f3 v1.3.4
+0e2792e04bd316fe64335cbe6a476031ac60b29b v1.3.5
+edfff9f37916389144d3a3644d0a7d7adfd79b11 v1.3.6
+9ae95fdeca184f2404205645f06c6597b74ef2db v1.4.0
+909143a4dde53c46d4f24abb426ec870471c7de1 v1.4.1
+d998cc84cf726798486a438763053f0e1dc1b646 v1.4.2
+3f5d40b9dd99ccb009ea2211ee2d4b594c634946 v1.4.3
+3148c08cf86f1849917e2d50f7ab7766c1550b0a v1.4.4
+a5f0bc867edc88be23eb808693e5393a97d4c54a v1.5.0
+3259dc7caea48687eab018ee646ae6ad7e7ef377 v1.5.1
+efe23d6c178c11d575a0214181276a3452776e48 v1.5.2
+1a498b11f1540f5b94b6f6009298f5dc3eaad9e9 v1.5.3
+3447862ad8c9ceba85857774c526e39fde3a2281 v1.5.4
diff -r 49b34e3c0812 -r 3563bb7b4b82 CONTRIBUTORS
diff -r 49b34e3c0812 -r 3563bb7b4b82 MANIFEST.in
diff -r 49b34e3c0812 -r 3563bb7b4b82 README.rst
diff -r 49b34e3c0812 -r 3563bb7b4b82 development.ini
diff -r 49b34e3c0812 -r 3563bb7b4b82 docs/api/api.rst
diff -r 49b34e3c0812 -r 3563bb7b4b82 docs/changelog.rst
diff -r 49b34e3c0812 -r 3563bb7b4b82 docs/contributing.rst
diff -r 49b34e3c0812 -r 3563bb7b4b82 docs/index.rst
diff -r 49b34e3c0812 -r 3563bb7b4b82 docs/installation.rst
diff -r 49b34e3c0812 -r 3563bb7b4b82 docs/installation_win.rst
diff -r 49b34e3c0812 -r 3563bb7b4b82 docs/setup.rst
diff -r 49b34e3c0812 -r 3563bb7b4b82 docs/theme/nature/layout.html
diff -r 49b34e3c0812 -r 3563bb7b4b82 docs/upgrade.rst
diff -r 49b34e3c0812 -r 3563bb7b4b82 docs/usage/general.rst
--- a/docs/usage/general.rst	Sun Apr 07 16:44:46 2013 +0200
+++ b/docs/usage/general.rst	Sun Apr 07 18:37:22 2013 +0200
@@ -109,7 +109,7 @@
 
 If you need to clone repositories that are protected via basic auth, you
 might pass the url with stored credentials inside eg.
-`http://user:passw@remote.server/repo, RhodeCode will try to login and clone
+`http://user:passw@remote.server/repo`, RhodeCode will try to login and clone
 using given credentials. Please take a note that they will be stored as
 plaintext inside the database. RhodeCode will remove auth info when showing the
 clone url in summary page.
diff -r 49b34e3c0812 -r 3563bb7b4b82 docs/usage/git_support.rst
diff -r 49b34e3c0812 -r 3563bb7b4b82 docs/usage/statistics.rst
diff -r 49b34e3c0812 -r 3563bb7b4b82 docs/usage/troubleshooting.rst
diff -r 49b34e3c0812 -r 3563bb7b4b82 ez_setup.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 production.ini
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/__init__.py
--- a/rhodecode/__init__.py	Sun Apr 07 16:44:46 2013 +0200
+++ b/rhodecode/__init__.py	Sun Apr 07 18:37:22 2013 +0200
@@ -30,7 +30,7 @@
 
 try:
     from rhodecode.lib import get_current_revision
-    _rev = get_current_revision()
+    _rev = get_current_revision(quiet=True)
     if _rev and len(VERSION) > 3:
         VERSION += ('dev%s' % _rev[0],)
 except ImportError:
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/bin/rhodecode_backup.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/config/deployment.ini_tmpl
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/config/environment.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/config/middleware.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/config/routing.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/controllers/admin/admin.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/controllers/admin/ldap_settings.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/controllers/admin/permissions.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/controllers/admin/repos.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/controllers/admin/settings.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/controllers/admin/users.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/controllers/api/__init__.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/controllers/api/api.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/controllers/branches.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/controllers/changelog.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/controllers/changeset.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/controllers/error.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/controllers/feed.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/controllers/files.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/controllers/home.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/controllers/journal.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/controllers/login.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/controllers/search.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/controllers/shortlog.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/controllers/summary.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/controllers/tags.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/i18n/rhodecode.pot
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/__init__.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/auth.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/auth_ldap.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/base.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/celerylib/__init__.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/celerylib/tasks.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/colored_formatter.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/db_manage.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/dbmigrate/__init__.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/dbmigrate/versions/002_version_1_1_0.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/dbmigrate/versions/003_version_1_2_0.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/dbmigrate/versions/__init__.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/exceptions.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/helpers.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/hooks.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/indexers/__init__.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/indexers/daemon.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/middleware/https_fixup.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/middleware/simplegit.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/middleware/simplehg.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/paster_commands/cleanup.py
--- a/rhodecode/lib/paster_commands/cleanup.py	Sun Apr 07 16:44:46 2013 +0200
+++ b/rhodecode/lib/paster_commands/cleanup.py	Sun Apr 07 18:37:22 2013 +0200
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-    rhodecode.lib.paster_commands.make_rcextensions
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    package.rhodecode.lib.cleanup
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     cleanup-repos paster command for RhodeCode
 
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/rcmail/smtp_mailer.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/timerproxy.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/utils.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/lib/utils2.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/model/__init__.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/model/db.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/model/forms.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/model/permission.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/model/repo.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/model/repo_permission.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/model/repos_group.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/model/scm.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/model/user.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/model/validators.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/public/css/style.css
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/templates/admin/permissions/permissions.html
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/templates/admin/repos/repos.html
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/templates/admin/settings/settings.html
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/templates/admin/users/user_edit.html
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/templates/admin/users/user_edit_my_account.html
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/templates/base/base.html
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/templates/changelog/changelog.html
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/templates/changeset/changeset.html
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/templates/errors/error_document.html
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/templates/files/files_browser.html
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/templates/files/files_source.html
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/templates/index.html
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/templates/journal/journal.html
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/templates/login.html
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/templates/password_reset.html
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/templates/register.html
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/templates/search/search_content.html
--- a/rhodecode/templates/search/search_content.html	Sun Apr 07 16:44:46 2013 +0200
+++ b/rhodecode/templates/search/search_content.html	Sun Apr 07 18:37:22 2013 +0200
@@ -26,7 +26,7 @@
     %endif
 %endfor
 %if c.cur_query and c.formated_results:
-<div class="pagination-wh pagination-left">
+<div class="pagination-wh pagination-left" style="padding-left:16px">
     ${c.formated_results.pager('$link_previous ~2~ $link_next')}
 </div>
 %endif
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/templates/summary/summary.html
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/tests/__init__.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/tests/functional/test_changelog.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/tests/functional/test_summary.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/tests/models/test_repos_groups.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 rhodecode/websetup.py
diff -r 49b34e3c0812 -r 3563bb7b4b82 setup.cfg
diff -r 49b34e3c0812 -r 3563bb7b4b82 setup.py
--- a/setup.py	Sun Apr 07 16:44:46 2013 +0200
+++ b/setup.py	Sun Apr 07 18:37:22 2013 +0200
@@ -72,7 +72,7 @@
 ]
 
 classifiers = [
-    'Development Status :: 4 - Beta',
+    'Development Status :: 5 - Production/Stable',
     'Environment :: Web Environment',
     'Framework :: Pylons',
     'Intended Audience :: Developers',
diff -r 49b34e3c0812 -r 3563bb7b4b82 test.ini