diff --git a/rhodecode/controllers/admin/settings.py b/rhodecode/controllers/admin/settings.py --- a/rhodecode/controllers/admin/settings.py +++ b/rhodecode/controllers/admin/settings.py @@ -66,10 +66,10 @@ class SettingsController(BaseController) def __before__(self): c.admin_user = session.get('admin_user') c.admin_username = session.get('admin_username') - c.modules = sorted([(p.project_name, p.version) + c.modules = sorted([(p.project_name, p.version) for p in pkg_resources.working_set]) c.py_version = platform.python_version() - c.platform = platform.platform() + c.platform = platform.platform() super(SettingsController, self).__before__() @HasPermissionAllDecorator('hg.admin') diff --git a/rhodecode/lib/middleware/simplegit.py b/rhodecode/lib/middleware/simplegit.py --- a/rhodecode/lib/middleware/simplegit.py +++ b/rhodecode/lib/middleware/simplegit.py @@ -284,4 +284,3 @@ class SimpleGit(BaseVCSController): log_push_action(ui=baseui, repo=repo) elif action == 'pull' and _hooks.get(pull_hook): log_pull_action(ui=baseui, repo=repo) - diff --git a/rhodecode/lib/utils2.py b/rhodecode/lib/utils2.py --- a/rhodecode/lib/utils2.py +++ b/rhodecode/lib/utils2.py @@ -406,4 +406,3 @@ def extract_mentioned_users(s): usrs.add(username) return sorted(list(usrs), key=lambda k: k.lower()) - diff --git a/rhodecode/lib/vcs/utils/hgcompat.py b/rhodecode/lib/vcs/utils/hgcompat.py --- a/rhodecode/lib/vcs/utils/hgcompat.py +++ b/rhodecode/lib/vcs/utils/hgcompat.py @@ -11,4 +11,4 @@ from mercurial.localrepo import localrep from mercurial.match import match from mercurial.mdiff import diffopts from mercurial.node import hex -from mercurial.encoding import tolocal \ No newline at end of file +from mercurial.encoding import tolocal diff --git a/rhodecode/templates/admin/notifications/notifications.html b/rhodecode/templates/admin/notifications/notifications.html --- a/rhodecode/templates/admin/notifications/notifications.html +++ b/rhodecode/templates/admin/notifications/notifications.html @@ -44,7 +44,7 @@ YUE.on('mark_all_read','click',function( ypjax(url,'notification_data',function(){ var notification_counter = YUD.get('notification_counter'); if(notification_counter){ - notification_counter.innerHTML=0; + notification_counter.innerHTML=0; } YUE.on(YUQ('.delete-notification'),'click',function(e){ var notification_id = e.currentTarget.id; diff --git a/rhodecode/templates/admin/settings/settings.html b/rhodecode/templates/admin/settings/settings.html --- a/rhodecode/templates/admin/settings/settings.html +++ b/rhodecode/templates/admin/settings/settings.html @@ -218,7 +218,7 @@ + - + - +