fixes for 1.2.1 releasev1.2.1

5 files changed, 29 insertions, 14 deletions

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5cc35fe1..77ff95be 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -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**)
 ======================
 
diff --git a/rhodecode/__init__.py b/rhodecode/__init__.py
index d8d06998..612070ff 100644
--- a/rhodecode/__init__.py
+++ b/rhodecode/__init__.py
@@ -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()
diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py
index 354c3a60..9225ded1 100644
--- a/rhodecode/config/middleware.py
+++ b/rhodecode/config/middleware.py
@@ -51,6 +51,11 @@ def make_app(global_conf, full_stack=True, static_files=True, **app_conf):
         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
         app = ErrorHandler(app, global_conf, **config['pylons.errorware'])
@@ -74,11 +79,6 @@ def make_app(global_conf, full_stack=True, static_files=True, **app_conf):
         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
diff --git a/rhodecode/lib/utils.py b/rhodecode/lib/utils.py
index 230faeaf..133f6efb 100644
--- a/rhodecode/lib/utils.py
+++ b/rhodecode/lib/utils.py
@@ -112,7 +112,7 @@ def action_logger(user, action, repo, ipaddr='', sa=None):
         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 @@ def is_valid_repo(repo_name, base_path):
     :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 @@ def is_valid_repos_group(repos_group_name, base_path):
     :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)
diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css
index 088f4c75..33865e2d 100644
--- a/rhodecode/public/css/style.css
+++ b/rhodecode/public/css/style.css
@@ -1466,7 +1466,7 @@ clear:both;
 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-top:1px solid #DDD;
 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;