diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py --- a/rhodecode/model/db.py +++ b/rhodecode/model/db.py @@ -1166,7 +1166,7 @@ class Repository(Base, BaseModel): """ Mark caches of this repo as invalid. """ - CacheInvalidation.set_invalidate(repo_name=self.repo_name) + CacheInvalidation.set_invalidate(self.repo_name) def scm_instance_no_cache(self): return self.__get_instance() diff --git a/rhodecode/model/scm.py b/rhodecode/model/scm.py --- a/rhodecode/model/scm.py +++ b/rhodecode/model/scm.py @@ -105,8 +105,7 @@ class CachedRepoList(object): scmr = dbr.scm_instance_cached(cache_map) # check permission at this level if not HasRepoPermissionAny( - *self.perm_set - )(dbr.repo_name, 'get repo check'): + *self.perm_set)(dbr.repo_name, 'get repo check'): continue try: @@ -151,8 +150,7 @@ class SimpleCachedRepoList(CachedRepoLis for dbr in self.db_repo_list: # check permission at this level if not HasRepoPermissionAny( - *self.perm_set - )(dbr.repo_name, 'get repo check'): + *self.perm_set)(dbr.repo_name, 'get repo check'): continue tmp_d = {} diff --git a/rhodecode/public/css/contextbar.css b/rhodecode/public/css/contextbar.css --- a/rhodecode/public/css/contextbar.css +++ b/rhodecode/public/css/contextbar.css @@ -247,6 +247,7 @@ ul#context-actions { border-left: 1px solid rgba(255,255,255,0.1); padding: 0; } + #header #header-inner #quick li:last-child, #content #context-pages li:last-child { border-right: none; 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 @@ -275,7 +275,7 @@ ${h.submit('set_unlock' ,_('Unlock locked repo'),class_="ui-btn",onclick="return confirm('"+_('Confirm to unlock repository')+"');")} ${'Locked by %s on %s' % (h.person_by_id(c.repo_info.locked[0]),h.fmt_date(h.time_to_datetime(c.repo_info.locked[1])))} %else: - ${h.submit('set_lock',_('lock repo'),class_="ui-btn",onclick="return confirm('"+_('Confirm to lock repository')+"');")} + ${h.submit('set_lock',_('Lock repo'),class_="ui-btn",onclick="return confirm('"+_('Confirm to lock repository')+"');")} ${_('Repository is not locked')} %endif @@ -293,7 +293,7 @@
${h.select('id_fork_of','',c.repos_list,class_="medium")} - ${h.submit('set_as_fork_%s' % c.repo_info.repo_name,_('set'),class_="ui-btn",)} + ${h.submit('set_as_fork_%s' % c.repo_info.repo_name,_('Set'),class_="ui-btn",)}
- +
${h.literal(c.pull_request.description)}
diff --git a/rhodecode/templates/summary/summary.html b/rhodecode/templates/summary/summary.html --- a/rhodecode/templates/summary/summary.html +++ b/rhodecode/templates/summary/summary.html @@ -148,7 +148,7 @@ window.onhashchange = function() { %else: ${_('Statistics are disabled for this repository')} %if h.HasPermissionAll('hg.admin')('enable stats on from summary'): - ${h.link_to(_('enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-btn")} + ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-btn")} %endif %endif
@@ -164,7 +164,7 @@ window.onhashchange = function() { %elif not c.enable_downloads: ${_('Downloads are disabled for this repository')} %if h.HasPermissionAll('hg.admin')('enable downloads on from summary'): - ${h.link_to(_('enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-btn")} + ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-btn")} %endif %else: ${h.select('download_options',c.rhodecode_repo.get_changeset().raw_id,c.download_options)}