Mercurial > public > src > rhodecode
changeset 1619:98fb507e4c8c demo
merged stable into demo
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sat, 08 Oct 2011 16:26:42 +0200 |
parents | 2913444c3848 (current diff) a05d16fc1d87 (diff) |
children | 7695d34b76b4 |
files | rhodecode/config/middleware.py |
diffstat | 6 files changed, 30 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Sat Oct 08 02:33:26 2011 +0200 +++ b/.hgtags Sat Oct 08 16:26:42 2011 +0200 @@ -41,3 +41,4 @@ c252049af24cd98eef5f4143fa3abbff3c912e29 1.2.0 0000000000000000000000000000000000000000 1.2.0 c252049af24cd98eef5f4143fa3abbff3c912e29 v1.2.0 +0b8fba8ab90b01f811a50e6e7384989cced21d38 v1.2.1
--- a/docs/changelog.rst Sat Oct 08 02:33:26 2011 +0200 +++ b/docs/changelog.rst Sat Oct 08 16:26:42 2011 +0200 @@ -3,6 +3,21 @@ Changelog ========= +1.2.1 (**2011-10-08**) +====================== + +news +---- + + +fixes +----- + +- fixed problems with basic auth and push problems +- gui fixes +- fixed logger + + 1.2.0 (**2011-10-07**) ======================
--- a/rhodecode/__init__.py Sat Oct 08 02:33:26 2011 +0200 +++ b/rhodecode/__init__.py Sat Oct 08 16:26:42 2011 +0200 @@ -25,7 +25,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. import platform -VERSION = (1, 2, 0) +VERSION = (1, 2, 1) __version__ = '.'.join((str(each) for each in VERSION[:4])) __dbversion__ = 3 #defines current db version for migrations __platform__ = platform.system()
--- a/rhodecode/config/middleware.py Sat Oct 08 02:33:26 2011 +0200 +++ b/rhodecode/config/middleware.py Sat Oct 08 16:26:42 2011 +0200 @@ -51,6 +51,11 @@ from rhodecode.lib.profiler import ProfilingMiddleware app = ProfilingMiddleware(app) + # we want our low level middleware to get to the request ASAP. We don't + # need any pylons stack middleware in them + app = SimpleHg(app, config) + app = SimpleGit(app, config) + if asbool(full_stack): # Handle Python exceptions if asbool(config.get('errormator')): @@ -82,11 +87,6 @@ app = Cascade([static_app, app]) app = make_gzip_middleware(app, global_conf, compress_level=1) - # we want our low level middleware to get to the request ASAP. We don't - # need any pylons stack middleware in them - app = SimpleHg(app, config) - app = SimpleGit(app, config) - app.config = config return app
--- a/rhodecode/lib/utils.py Sat Oct 08 02:33:26 2011 +0200 +++ b/rhodecode/lib/utils.py Sat Oct 08 16:26:42 2011 +0200 @@ -112,7 +112,7 @@ if hasattr(user, 'user_id'): user_obj = user elif isinstance(user, basestring): - user_obj = User.by_username(user, cache=False) + user_obj = User.by_username(user) else: raise Exception('You have to provide user object or username') @@ -189,7 +189,7 @@ :return True: if given path is a valid repository """ full_path = os.path.join(base_path, repo_name) - + try: get_scm(full_path) return True @@ -204,17 +204,17 @@ :param base_path: """ full_path = os.path.join(base_path, repos_group_name) - + # check if it's not a repo if is_valid_repo(repos_group_name, base_path): return False - + # check if it's a valid path if os.path.isdir(full_path): return True - + return False - + def ask_ok(prompt, retries=4, complaint='Yes or no, please!'): while True: ok = raw_input(prompt)
--- a/rhodecode/public/css/style.css Sat Oct 08 02:33:26 2011 +0200 +++ b/rhodecode/public/css/style.css Sat Oct 08 16:26:42 2011 +0200 @@ -1466,7 +1466,7 @@ overflow:hidden; text-align:right; margin:0; -padding:10px 14px 3px 5px; +padding:10px 14px 0px 5px; } #quick_login div.form div.links { @@ -2555,7 +2555,7 @@ border-left:1px solid #c6c6c6; border-right:1px solid #DDD; border-bottom:1px solid #c6c6c6; -color:#515151; +color:#515151 !important; outline:none; margin:0; padding:6px 12px;