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 @@
         ##    </li>
         ##</ul>
     </div>
-    
+
       <div style="padding:14px 18px;text-align: right;float:left">
       <span id='all' class="ui-btn"><a href="${h.url.current()}">${_('All')}</a></span>
       <span id='comment' class="ui-btn"><a href="${h.url.current(type=c.comment_type)}">${_('Comments')}</a></span>
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:
       <div class="read-notifications">
         <span id="${notification.notification.notification_id}" class="read-notification accept_icon action"></span>
-      </div>      
+      </div>
       %endif
     </div>
     <div class="notification-subject">${h.literal(notification.notification.subject)}</div>
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 @@
     </div>
     <div class="table yui-skin-sam" id="repos_list_wrap"></div>
     <div id="user-paginator" style="padding: 0px 0px 0px 20px"></div>
-    
+
 
 </div>
 <script>
@@ -49,7 +49,7 @@
       var data     = res.results || [],
           filtered = [],
           i,l;
-     
+
       if (req) {
           req = req.toLowerCase();
           for (i = 0; i<data.length; i++) {
@@ -102,7 +102,7 @@
       tooltip_activate();
       quick_repo_menu();
   });
-  
+
   var filterTimeout = null;
 
   updateFilter  = function () {
@@ -121,7 +121,7 @@
           argument: state
       });
 
-  };  
+  };
   YUE.on('q_filter','click',function(){
       YUD.get('q_filter').value = '';
    });
@@ -129,7 +129,7 @@
   YUE.on('q_filter','keyup',function (e) {
       clearTimeout(filterTimeout);
       filterTimeout = setTimeout(updateFilter,600);
-  });  
+  });
 </script>
 
 </%def>
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 @@
                                 <a href="${h.url('edit_repos_group',id=k,anchor='permissions_manage')}">${_('edit')}</a>
                             %else:
                                 --
-                            %endif                        
+                            %endif
                         </td>
                     </tr>
                 %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
     </div>
     <div id="my" class="table" style="display:none">
-    </div>    
+    </div>
     <div id="pullrequests" class="table" style="display:none">
 </div>
 <script type="text/javascript">
@@ -110,7 +110,7 @@ YUE.on('show_perms','click',function(e){
 	YUD.addClass('show_perms', 'current');
 	YUD.removeClass('show_my','current');
 	YUD.removeClass('show_pullrequests','current');
-	
+
     YUD.setStyle('my','display','none');
     YUD.setStyle('pullrequests','display','none');
     YUD.setStyle('perms','display','');
@@ -121,12 +121,12 @@ YUE.on('show_my','click',function(e){
     YUD.addClass('show_my', 'current');
     YUD.removeClass('show_perms','current');
     YUD.removeClass('show_pullrequests','current');
-    
+
     YUD.setStyle('perms','display','none');
     YUD.setStyle('pullrequests','display','none');
     YUD.setStyle('my','display','');
     YUD.setStyle('q_filter','display','');
-    
+
     YUE.preventDefault(e);
     var url = "${h.url('admin_settings_my_repos')}";
     ypjax(url, 'my', function(){
diff --git a/rhodecode/templates/admin/users/user_edit_my_account_repos.html b/rhodecode/templates/admin/users/user_edit_my_account_repos.html
--- a/rhodecode/templates/admin/users/user_edit_my_account_repos.html
+++ b/rhodecode/templates/admin/users/user_edit_my_account_repos.html
@@ -43,4 +43,4 @@
    %endif
    </tbody>
    </table>
-</div>
\ No newline at end of file
+</div>
diff --git a/rhodecode/templates/admin/users/users.html b/rhodecode/templates/admin/users/users.html
--- a/rhodecode/templates/admin/users/users.html
+++ b/rhodecode/templates/admin/users/users.html
@@ -17,7 +17,7 @@
 <div class="box">
     <!-- box / title -->
     <div class="title">
-        ${self.breadcrumbs()} 
+        ${self.breadcrumbs()}
         <ul class="links">
           <li>
             <span>${h.link_to(_(u'ADD NEW USER'),h.url('new_user'))}</span>
@@ -55,7 +55,7 @@
       var data     = res.results || [],
           filtered = [],
           i,l;
-     
+
       if (req) {
           req = req.toLowerCase();
           for (i = 0; i<data.length; i++) {
@@ -72,7 +72,7 @@
 
   // main table sorting
   var myColumnDefs = [
-      {key:"gravatar",label:"",sortable:false,},                      
+      {key:"gravatar",label:"",sortable:false,},
       {key:"username",label:"${_('username')}",sortable:true,
     	  sortOptions: { sortFunction: linkSort }
       },
@@ -112,7 +112,7 @@
   myDataTable.subscribe('postRenderEvent',function(oArgs) {
 
   });
-  
+
   var filterTimeout = null;
 
   updateFilter  = function () {
@@ -131,7 +131,7 @@
           argument: state
       });
 
-  };  
+  };
   YUE.on('q_filter','click',function(){
       YUD.get('q_filter').value = '';
    });
@@ -139,7 +139,7 @@
   YUE.on('q_filter','keyup',function (e) {
       clearTimeout(filterTimeout);
       filterTimeout = setTimeout(updateFilter,600);
-  });  
+  });
 </script>
 
 </%def>
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__')}";
     </script>
     ## 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)}
         </div>
     %endfor
-</div>    
+</div>
 </%def>
 
 ## 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 @@
           <a class="tooltip" title="${h.tooltip(cs.message)}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">${'r%s:%s' % (cs.revision,h.short_id(cs.raw_id))}</a>
            <div class="gravatar">
                <img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),20)}"/>
-           </div>            
+           </div>
            </h3>
           ${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 @@
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
         <meta name="robots" content="index, nofollow"/>
         <link rel="icon" href="${h.url('/images/icons/database_gear.png')}" type="image/png" />
-                
+
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 	    %if c.redirect_time:
 	        <meta http-equiv="refresh" content="${c.redirect_time}; url=${c.url_redirect}"/>
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")}
                     <span class="help-block">${_('Default revision for files page, downloads, whoosh and readme')}</span>
                 </div>
-            </div>            
+            </div>
             <div class="field">
                  <div class="label">
                      <label for="repo_group">${_('Repository group')}:</label>
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 @@
 	        <div style="clear:both;padding-top: 10px"></div>
 	        <div class="follower_date">${_('forked')} -
 	        <span class="tooltip" title="${h.tooltip(h.fmt_date(f.created_on))}"> ${h.age(f.created_on)}</span>
-            <a title="${_('compare fork with %s' % c.repo_name)}" 
-               href="${h.url('compare_url',repo_name=f.repo_name,org_ref_type='branch',org_ref='default',other_ref_type='branch',other_ref='default', repo=c.repo_name)}" 
+            <a title="${_('compare fork with %s' % c.repo_name)}"
+               href="${h.url('compare_url',repo_name=f.repo_name,org_ref_type='branch',org_ref='default',other_ref_type='branch',other_ref='default', repo=c.repo_name)}"
                class="ui-btn small">${_('Compare fork')}</a>
              </div>
 	        <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div>
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 @@
               </li>
             %endfor
             </ul>
-          </div>                
-          
+          </div>
+
           <div class='ac'>
             <div class="reviewer_ac">
                ${h.text('user', class_='yui-ac-input')}
                <span class="help-block">${_('Add reviewer to this pull request.')}</span>
-               <div id="reviewers_container"></div>           
+               <div id="reviewers_container"></div>
             </div>
           </div>
         </div>
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 @@
     </div>
         %if c.pull_request.is_closed():
         <div style="padding:10px; font-size:22px;width:100%;text-align: center; color:#88D882">${_('Closed %s') % (h.age(c.pull_request.updated_on))}</div>
-        %endif        
-    <h3>${_('Title')}: ${c.pull_request.title} 
+        %endif
+    <h3>${_('Title')}: ${c.pull_request.title}
         <div class="changeset-status-container" style="float:none">
         %if c.current_changeset_status:
           <div title="${_('Pull request status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.current_changeset_status)}]</div>
-          <div class="changeset-status-ico" style="padding:4px"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></div>          
+          <div class="changeset-status-ico" style="padding:4px"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></div>
         %endif
         </div>
     </h3>
@@ -45,7 +45,7 @@
               ##CS
               <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Incoming changesets')}</div>
               <%include file="/compare/compare_cs.html" />
-  
+
               ## FILES
               <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>
               <div class="cs_files">
@@ -70,7 +70,7 @@
                 <div class="reviewers_member">
                     <div style="float:left;padding:0px 3px 0px 0px" class="tooltip" title="${h.tooltip(h.changeset_status_lbl(status[0][1].status if status else 'not_reviewed'))}">
                       <img src="${h.url(str('/images/icons/flag_status_%s.png' % (status[0][1].status if status else 'not_reviewed')))}"/>
-                    </div>                
+                    </div>
                   <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(member.email,14)}"/> </div>
                   <div style="float:left">${member.full_name} (${_('owner')})</div>
                   <input type="hidden" value="${member.user_id}" name="review_members" />
@@ -81,21 +81,21 @@
               </li>
             %endfor
             </ul>
-          </div>                
+          </div>
           %if not c.pull_request.is_closed():
           <div class='ac'>
             <div class="reviewer_ac">
                ${h.text('user', class_='yui-ac-input')}
                <span class="help-block">${_('Add reviewer to this pull request.')}</span>
-               <div id="reviewers_container"></div>       
+               <div id="reviewers_container"></div>
             </div>
             <div style="padding:0px 10px">
              <span id="update_pull_request" class="ui-btn xsmall">${_('save')}</span>
             </div>
           </div>
           %endif
-        </div>      
-       </div>      
+        </div>
+       </div>
     </div>
     <script>
     var _USERS_AC_DATA = ${c.users_array|n};
@@ -114,10 +114,10 @@
     ## template for inline comment form
     <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
     ${comment.comment_inline_form()}
-    
+
     ## render comments and inlines
     ${comment.generate_comments()}
-    
+
     % if not c.pull_request.is_closed():
       ## main comment form and it status
       ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name,
@@ -155,9 +155,9 @@
           // inject comments into they proper positions
           var file_comments = YUQ('.inline-comment-placeholder');
           renderInlineComments(file_comments);
-          
+
           YUE.on(YUD.get('update_pull_request'),'click',function(e){
-        	  
+
         	  var reviewers_ids = [];
         	  var ids = YUQ('#review_members input');
         	  for(var i=0; i<ids.length;i++){
diff --git a/rhodecode/templates/pullrequests/pullrequest_show_all.html b/rhodecode/templates/pullrequests/pullrequest_show_all.html
--- a/rhodecode/templates/pullrequests/pullrequest_show_all.html
+++ b/rhodecode/templates/pullrequests/pullrequest_show_all.html
@@ -25,7 +25,7 @@
           <h4>
           %if pr.is_closed():
           <img src="${h.url('/images/icons/tick.png')}" alt="${_('Closed')}" />
-          %endif          
+          %endif
           <a href="${h.url('pullrequest_show',repo_name=c.repo_name,pull_request_id=pr.pull_request_id)}">
           ${_('Pull request #%s opened by %s on %s') % (pr.pull_request_id, pr.author.full_name, h.fmt_date(pr.created_on))}
           </a>
diff --git a/rhodecode/templates/settings/repo_settings.html b/rhodecode/templates/settings/repo_settings.html
--- a/rhodecode/templates/settings/repo_settings.html
+++ b/rhodecode/templates/settings/repo_settings.html
@@ -60,7 +60,7 @@
                     ${h.select('landing_rev','',c.landing_revs,class_="medium")}
                     <span class="help-block">${_('Default revision for files page, downloads, whoosh and readme')}</span>
                 </div>
-            </div>            
+            </div>
             <div class="field">
                 <div class="label label-textarea">
                     <label for="description">${_('Description')}:</label>
diff --git a/rhodecode/templates/shortlog/shortlog_data.html b/rhodecode/templates/shortlog/shortlog_data.html
--- a/rhodecode/templates/shortlog/shortlog_data.html
+++ b/rhodecode/templates/shortlog/shortlog_data.html
@@ -83,6 +83,6 @@
     git push -u origin master
 %else:
     hg push ${c.clone_repo_url}
-%endif    
+%endif
 </pre>
 %endif
diff --git a/rhodecode/tests/api/api_base.py b/rhodecode/tests/api/api_base.py
--- a/rhodecode/tests/api/api_base.py
+++ b/rhodecode/tests/api/api_base.py
@@ -988,4 +988,3 @@ class BaseTestApi(object):
                     TEST_USERS_GROUP, self.REPO
                 )
         self._compare_error(id_, expected, given=response.body)
-
diff --git a/rhodecode/tests/api/test_api_hg.py b/rhodecode/tests/api/test_api_hg.py
--- a/rhodecode/tests/api/test_api_hg.py
+++ b/rhodecode/tests/api/test_api_hg.py
@@ -4,4 +4,4 @@ from rhodecode.tests.api.api_base import
 
 class TestHgApi(BaseTestApi, TestController):
     REPO = HG_REPO
-    REPO_TYPE = 'hg'
\ No newline at end of file
+    REPO_TYPE = 'hg'
diff --git a/rhodecode/tests/functional/test_admin_settings.py b/rhodecode/tests/functional/test_admin_settings.py
--- a/rhodecode/tests/functional/test_admin_settings.py
+++ b/rhodecode/tests/functional/test_admin_settings.py
@@ -263,4 +263,4 @@ class TestAdminSettingsController(TestCo
                                     id_fork_of=repo.repo_id
                                  ))
         self.checkSessionFlash(response,
-                               'An error occurred during this operation')
\ No newline at end of file
+                               'An error occurred during this operation')
diff --git a/rhodecode/tests/models/test_notifications.py b/rhodecode/tests/models/test_notifications.py
--- a/rhodecode/tests/models/test_notifications.py
+++ b/rhodecode/tests/models/test_notifications.py
@@ -185,7 +185,3 @@ class TestNotifications(unittest.TestCas
                          .get_unread_cnt_for_user(self.u2), 1)
         self.assertEqual(NotificationModel()
                          .get_unread_cnt_for_user(self.u3), 2)
-
-
-
-
diff --git a/rhodecode/tests/models/test_repos_groups.py b/rhodecode/tests/models/test_repos_groups.py
--- a/rhodecode/tests/models/test_repos_groups.py
+++ b/rhodecode/tests/models/test_repos_groups.py
@@ -167,4 +167,4 @@ class TestReposGroups(unittest.TestCase)
         # we moved out group from t1 to '' so it's full path should be 'g2'
         self.assertEqual(g2.full_path, 'g22')
         self.assertFalse(self.__check_path('t11', 't22'))
-        self.assertTrue(self.__check_path('g22'))
\ No newline at end of file
+        self.assertTrue(self.__check_path('g22'))