diff --git a/rhodecode/lib/cleanup.py b/rhodecode/lib/cleanup.py --- a/rhodecode/lib/cleanup.py +++ b/rhodecode/lib/cleanup.py @@ -140,4 +140,3 @@ class CleanupCommand(BasePasterCommand): action='store_true', dest='dont_ask', help=("Don't ask to remove repos")) - \ No newline at end of file diff --git a/rhodecode/lib/indexers/__init__.py b/rhodecode/lib/indexers/__init__.py --- a/rhodecode/lib/indexers/__init__.py +++ b/rhodecode/lib/indexers/__init__.py @@ -238,7 +238,7 @@ class WhooshResultWrapper(object): :param size: """ memory = [(0, 0)] - if self.matcher.supports('positions'): + if self.matcher.supports('positions'): for span in self.matcher.spans(): start = span.startchar or 0 end = span.endchar or 0 diff --git a/rhodecode/lib/middleware/simplehg.py b/rhodecode/lib/middleware/simplehg.py --- a/rhodecode/lib/middleware/simplehg.py +++ b/rhodecode/lib/middleware/simplehg.py @@ -73,7 +73,7 @@ class SimpleHg(BaseVCSController): return HTTPNotAcceptable('SSL REQUIRED !')(environ, start_response) ipaddr = self._get_ip_addr(environ) - username = None + username = None # skip passing error to error controller environ['pylons.status_code_redirect'] = True diff --git a/rhodecode/lib/rcmail/utils.py b/rhodecode/lib/rcmail/utils.py --- a/rhodecode/lib/rcmail/utils.py +++ b/rhodecode/lib/rcmail/utils.py @@ -16,4 +16,4 @@ class CachedDnsName(object): self._fqdn = socket.getfqdn() return self._fqdn -DNS_NAME = CachedDnsName() \ No newline at end of file +DNS_NAME = CachedDnsName() 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 @@ -24,7 +24,7 @@ ## ## - +
${_('All')} ${_('Comments')} diff --git a/rhodecode/templates/admin/notifications/notifications_data.html b/rhodecode/templates/admin/notifications/notifications_data.html --- a/rhodecode/templates/admin/notifications/notifications_data.html +++ b/rhodecode/templates/admin/notifications/notifications_data.html @@ -21,7 +21,7 @@ unread = lambda n:{False:'unread'}.get(n %if not notification.read:
-
+
%endif
${h.literal(notification.notification.subject)}
diff --git a/rhodecode/templates/admin/repos/repos.html b/rhodecode/templates/admin/repos/repos.html --- a/rhodecode/templates/admin/repos/repos.html +++ b/rhodecode/templates/admin/repos/repos.html @@ -24,7 +24,7 @@
- + diff --git a/rhodecode/templates/admin/users/user_edit.html b/rhodecode/templates/admin/users/user_edit.html --- a/rhodecode/templates/admin/users/user_edit.html +++ b/rhodecode/templates/admin/users/user_edit.html @@ -206,7 +206,7 @@ ${_('edit')} %else: -- - %endif + %endif %endfor diff --git a/rhodecode/templates/admin/users/user_edit_my_account.html b/rhodecode/templates/admin/users/user_edit_my_account.html --- a/rhodecode/templates/admin/users/user_edit_my_account.html +++ b/rhodecode/templates/admin/users/user_edit_my_account.html @@ -95,7 +95,7 @@ %endfor + diff --git a/rhodecode/templates/changeset/changeset.html b/rhodecode/templates/changeset/changeset.html --- a/rhodecode/templates/changeset/changeset.html +++ b/rhodecode/templates/changeset/changeset.html @@ -126,7 +126,7 @@ var _USERS_AC_DATA = ${c.users_array|n}; var _GROUPS_AC_DATA = ${c.users_groups_array|n}; AJAX_COMMENT_URL = "${url('changeset_comment',repo_name=c.repo_name,revision=c.changeset.raw_id)}"; - AJAX_COMMENT_DELETE_URL = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}"; + AJAX_COMMENT_DELETE_URL = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}"; ## diff block <%namespace name="diff_block" file="/changeset/diff_block.html"/> diff --git a/rhodecode/templates/changeset/changeset_file_comment.html b/rhodecode/templates/changeset/changeset_file_comment.html --- a/rhodecode/templates/changeset/changeset_file_comment.html +++ b/rhodecode/templates/changeset/changeset_file_comment.html @@ -105,7 +105,7 @@ ${comment_block(co)} %endfor - + ## MAIN COMMENT FORM diff --git a/rhodecode/templates/changeset/changeset_range.html b/rhodecode/templates/changeset/changeset_range.html --- a/rhodecode/templates/changeset/changeset_range.html +++ b/rhodecode/templates/changeset/changeset_range.html @@ -72,7 +72,7 @@ ${'r%s:%s' % (cs.revision,h.short_id(cs.raw_id))}
gravatar -
+ ${diff_block.diff_block(c.changes[cs.raw_id])} ##${comment.comments(cs)} diff --git a/rhodecode/templates/errors/error_document.html b/rhodecode/templates/errors/error_document.html --- a/rhodecode/templates/errors/error_document.html +++ b/rhodecode/templates/errors/error_document.html @@ -6,7 +6,7 @@ - + %if c.redirect_time: diff --git a/rhodecode/templates/forks/fork.html b/rhodecode/templates/forks/fork.html --- a/rhodecode/templates/forks/fork.html +++ b/rhodecode/templates/forks/fork.html @@ -44,7 +44,7 @@ ${h.select('landing_rev','',c.landing_revs,class_="medium")} ${_('Default revision for files page, downloads, whoosh and readme')} - +
diff --git a/rhodecode/templates/forks/forks_data.html b/rhodecode/templates/forks/forks_data.html --- a/rhodecode/templates/forks/forks_data.html +++ b/rhodecode/templates/forks/forks_data.html @@ -16,8 +16,8 @@
${_('forked')} - ${h.age(f.created_on)} - ${_('Compare fork')}
diff --git a/rhodecode/templates/pullrequests/pullrequest.html b/rhodecode/templates/pullrequests/pullrequest.html --- a/rhodecode/templates/pullrequests/pullrequest.html +++ b/rhodecode/templates/pullrequests/pullrequest.html @@ -83,13 +83,13 @@ %endfor -
- +
+
${h.text('user', class_='yui-ac-input')} ${_('Add reviewer to this pull request.')} -
+
diff --git a/rhodecode/templates/pullrequests/pullrequest_show.html b/rhodecode/templates/pullrequests/pullrequest_show.html --- a/rhodecode/templates/pullrequests/pullrequest_show.html +++ b/rhodecode/templates/pullrequests/pullrequest_show.html @@ -21,12 +21,12 @@ %if c.pull_request.is_closed():
${_('Closed %s') % (h.age(c.pull_request.updated_on))}
- %endif -

${_('Title')}: ${c.pull_request.title} + %endif +

${_('Title')}: ${c.pull_request.title}
%if c.current_changeset_status:
[${h.changeset_status_lbl(c.current_changeset_status)}]
-
+
%endif

@@ -45,7 +45,7 @@ ##CS
${_('Incoming changesets')}
<%include file="/compare/compare_cs.html" /> - + ## FILES
${_('Files affected')}
@@ -70,7 +70,7 @@
-
+
gravatar
${member.full_name} (${_('owner')})
@@ -81,21 +81,21 @@ %endfor -
+ %if not c.pull_request.is_closed():
${h.text('user', class_='yui-ac-input')} ${_('Add reviewer to this pull request.')} -
+
${_('save')}
%endif - - + +