diff --git a/rhodecode/controllers/admin/repos.py b/rhodecode/controllers/admin/repos.py
--- a/rhodecode/controllers/admin/repos.py
+++ b/rhodecode/controllers/admin/repos.py
@@ -44,7 +44,7 @@ from rhodecode.lib.helpers import get_to
 from rhodecode.model.meta import Session
 from rhodecode.model.db import User, Repository, UserFollowing, RepoGroup,\
     RhodeCodeSetting, RepositoryField
-from rhodecode.model.forms import RepoForm, RepoFieldForm 
+from rhodecode.model.forms import RepoForm, RepoFieldForm
 from rhodecode.model.scm import ScmModel, GroupList
 from rhodecode.model.repo import RepoModel
 from rhodecode.lib.compat import json
@@ -528,4 +528,3 @@ class ReposController(BaseRepoController
             msg = _('An error occurred during removal of field')
             h.flash(msg, category='error')
         return redirect(url('edit_repo', repo_name=repo_name))
-    
diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py
--- a/rhodecode/model/pull_request.py
+++ b/rhodecode/model/pull_request.py
@@ -201,7 +201,7 @@ class PullRequestModel(BaseModel):
                 hgrepo = org_repo._repo
                 revs = ["ancestors(id('%s')) and not ancestors(id('%s'))" %
                         (other_rev, org_rev)]
-    
+
             out = scmutil.revrange(hgrepo, revs)
             for cs in (out):
                 changesets.append(org_repo.get_changeset(cs))
diff --git a/rhodecode/templates/admin/repos/repo_edit.html b/rhodecode/templates/admin/repos/repo_edit.html
--- a/rhodecode/templates/admin/repos/repo_edit.html
+++ b/rhodecode/templates/admin/repos/repo_edit.html
@@ -344,7 +344,7 @@
                 </div>
                 <div class="input">
                     ${h.text('new_field_label', class_='small', placeholder=_('Enter short label'))}
-                </div>             
+                </div>
              </div>
 
              <div class="field">
@@ -353,7 +353,7 @@
                 </div>
                 <div class="input">
                     ${h.text('new_field_desc', class_='small', placeholder=_('Enter description of a field'))}
-                </div>             
+                </div>
              </div>
 
             <div class="buttons">
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
@@ -137,7 +137,7 @@
                         ${h.checkbox('rhodecode_repository_fields','True')}
                         <label for="rhodecode_repository_fields">${_('Use repository extra fields')}</label>
                     </div>
-                </div>                
+                </div>
              </div>
 
              <div class="field">
diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html
--- a/rhodecode/templates/base/base.html
+++ b/rhodecode/templates/base/base.html
@@ -360,7 +360,7 @@
      });
 
      YUE.on('header-dd', 'click',function(e){
-         YUD.addClass('header-inner', 'hover');	 
+         YUD.addClass('header-inner', 'hover');
      });
 
 </script>
diff --git a/rhodecode/templates/email_templates/pull_request_comment.html b/rhodecode/templates/email_templates/pull_request_comment.html
--- a/rhodecode/templates/email_templates/pull_request_comment.html
+++ b/rhodecode/templates/email_templates/pull_request_comment.html
@@ -11,5 +11,3 @@ ${body}
     <span>${_('New status')} -&gt; ${status_change}</span>
 %endif
 </p>
-
-