diff --git a/rhodecode/apps/_base/__init__.py b/rhodecode/apps/_base/__init__.py
index 1117f0e3..c2ab22cb 100644
--- a/rhodecode/apps/_base/__init__.py
+++ b/rhodecode/apps/_base/__init__.py
@@ -309,9 +309,6 @@ class BaseReferencesView(RepoAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
-        c.repo_info = self.db_repo
-
         self._register_global_c(c)
         return c
 
diff --git a/rhodecode/apps/repository/views/repo_caches.py b/rhodecode/apps/repository/views/repo_caches.py
index cd147edd..4c801fc1 100644
--- a/rhodecode/apps/repository/views/repo_caches.py
+++ b/rhodecode/apps/repository/views/repo_caches.py
@@ -37,9 +37,6 @@ class RepoCachesView(RepoAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
-        c.repo_info = self.db_repo
-
         self._register_global_c(c)
         return c
 
diff --git a/rhodecode/apps/repository/views/repo_changelog.py b/rhodecode/apps/repository/views/repo_changelog.py
index 3897099a..4d320466 100644
--- a/rhodecode/apps/repository/views/repo_changelog.py
+++ b/rhodecode/apps/repository/views/repo_changelog.py
@@ -150,10 +150,7 @@ class RepoChangelogView(RepoAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context(include_app_defaults=True)
 
-        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
-        c.repo_info = self.db_repo
         c.rhodecode_repo = self.rhodecode_vcs_repo
-
         self._register_global_c(c)
         return c
 
diff --git a/rhodecode/apps/repository/views/repo_commits.py b/rhodecode/apps/repository/views/repo_commits.py
index 02da8067..cc119c83 100644
--- a/rhodecode/apps/repository/views/repo_commits.py
+++ b/rhodecode/apps/repository/views/repo_commits.py
@@ -148,9 +148,6 @@ def _context_url(request, fileid=None):
 class RepoCommitsView(RepoAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context(include_app_defaults=True)
-
-        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
-        c.repo_info = self.db_repo
         c.rhodecode_repo = self.rhodecode_vcs_repo
 
         self._register_global_c(c)
diff --git a/rhodecode/apps/repository/views/repo_compare.py b/rhodecode/apps/repository/views/repo_compare.py
index a584819c..b312cac7 100644
--- a/rhodecode/apps/repository/views/repo_compare.py
+++ b/rhodecode/apps/repository/views/repo_compare.py
@@ -45,8 +45,6 @@ class RepoCompareView(RepoAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context(include_app_defaults=True)
 
-        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
-        c.repo_info = self.db_repo
         c.rhodecode_repo = self.rhodecode_vcs_repo
 
         self._register_global_c(c)
diff --git a/rhodecode/apps/repository/views/repo_feed.py b/rhodecode/apps/repository/views/repo_feed.py
index 04ccbc81..aed87788 100644
--- a/rhodecode/apps/repository/views/repo_feed.py
+++ b/rhodecode/apps/repository/views/repo_feed.py
@@ -42,9 +42,6 @@ class RepoFeedView(RepoAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
-        c.repo_info = self.db_repo
-
         self._register_global_c(c)
         self._load_defaults()
         return c
diff --git a/rhodecode/apps/repository/views/repo_files.py b/rhodecode/apps/repository/views/repo_files.py
index 2727071a..89bf102e 100644
--- a/rhodecode/apps/repository/views/repo_files.py
+++ b/rhodecode/apps/repository/views/repo_files.py
@@ -81,8 +81,6 @@ class RepoFilesView(RepoAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context(include_app_defaults=True)
 
-        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
-        c.repo_info = self.db_repo
         c.rhodecode_repo = self.rhodecode_vcs_repo
 
         self._register_global_c(c)
diff --git a/rhodecode/apps/repository/views/repo_forks.py b/rhodecode/apps/repository/views/repo_forks.py
index 5936e0f1..318fe75d 100644
--- a/rhodecode/apps/repository/views/repo_forks.py
+++ b/rhodecode/apps/repository/views/repo_forks.py
@@ -46,9 +46,6 @@ class RepoForksView(RepoAppView, DataGridAppView):
 
     def load_default_context(self):
         c = self._get_local_tmpl_context(include_app_defaults=True)
-
-        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
-        c.repo_info = self.db_repo
         c.rhodecode_repo = self.rhodecode_vcs_repo
 
         acl_groups = RepoGroupList(
@@ -227,7 +224,7 @@ class RepoForksView(RepoAppView, DataGridAppView):
             if isinstance(task, BaseAsyncResult):
                 task_id = task.task_id
         except formencode.Invalid as errors:
-            c.repo_info = self.db_repo
+            c.rhodecode_db_repo = self.db_repo
 
             data = render('rhodecode:templates/forks/fork.mako',
                           self._get_template_context(c), self.request)
diff --git a/rhodecode/apps/repository/views/repo_maintainance.py b/rhodecode/apps/repository/views/repo_maintainance.py
index f0dac266..ea27703a 100644
--- a/rhodecode/apps/repository/views/repo_maintainance.py
+++ b/rhodecode/apps/repository/views/repo_maintainance.py
@@ -33,9 +33,6 @@ class RepoMaintenanceView(RepoAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
-        c.repo_info = self.db_repo
-
         self._register_global_c(c)
         return c
 
diff --git a/rhodecode/apps/repository/views/repo_permissions.py b/rhodecode/apps/repository/views/repo_permissions.py
index 5b1974e7..87db1e1e 100644
--- a/rhodecode/apps/repository/views/repo_permissions.py
+++ b/rhodecode/apps/repository/views/repo_permissions.py
@@ -40,9 +40,6 @@ class RepoSettingsPermissionsView(RepoAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
-        c.repo_info = self.db_repo
-
         self._register_global_c(c)
         return c
 
diff --git a/rhodecode/apps/repository/views/repo_pull_requests.py b/rhodecode/apps/repository/views/repo_pull_requests.py
index b284eebb..e638a88a 100644
--- a/rhodecode/apps/repository/views/repo_pull_requests.py
+++ b/rhodecode/apps/repository/views/repo_pull_requests.py
@@ -57,8 +57,6 @@ class RepoPullRequestsView(RepoAppView, DataGridAppView):
 
     def load_default_context(self):
         c = self._get_local_tmpl_context(include_app_defaults=True)
-        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
-        c.repo_info = self.db_repo
         c.REVIEW_STATUS_APPROVED = ChangesetStatus.STATUS_APPROVED
         c.REVIEW_STATUS_REJECTED = ChangesetStatus.STATUS_REJECTED
         self._register_global_c(c)
diff --git a/rhodecode/apps/repository/views/repo_review_rules.py b/rhodecode/apps/repository/views/repo_review_rules.py
index b57d8e5c..e7730952 100644
--- a/rhodecode/apps/repository/views/repo_review_rules.py
+++ b/rhodecode/apps/repository/views/repo_review_rules.py
@@ -33,9 +33,6 @@ class RepoReviewRulesView(RepoAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
-        c.repo_info = self.db_repo
-
         self._register_global_c(c)
         return c
 
diff --git a/rhodecode/apps/repository/views/repo_settings.py b/rhodecode/apps/repository/views/repo_settings.py
index 08b870c8..535f4f52 100644
--- a/rhodecode/apps/repository/views/repo_settings.py
+++ b/rhodecode/apps/repository/views/repo_settings.py
@@ -44,9 +44,6 @@ class RepoSettingsView(RepoAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
-        c.repo_info = self.db_repo
-
         acl_groups = RepoGroupList(
             RepoGroup.query().all(),
             perm_set=['group.write', 'group.admin'])
diff --git a/rhodecode/apps/repository/views/repo_settings_advanced.py b/rhodecode/apps/repository/views/repo_settings_advanced.py
index 173a0a7f..fd600c40 100644
--- a/rhodecode/apps/repository/views/repo_settings_advanced.py
+++ b/rhodecode/apps/repository/views/repo_settings_advanced.py
@@ -43,9 +43,6 @@ class RepoSettingsView(RepoAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
-        c.repo_info = self.db_repo
-
         self._register_global_c(c)
         return c
 
diff --git a/rhodecode/apps/repository/views/repo_settings_fields.py b/rhodecode/apps/repository/views/repo_settings_fields.py
index 53fd6cdd..5c811898 100644
--- a/rhodecode/apps/repository/views/repo_settings_fields.py
+++ b/rhodecode/apps/repository/views/repo_settings_fields.py
@@ -43,9 +43,6 @@ class RepoSettingsFieldsView(RepoAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
-        c.repo_info = self.db_repo
-
         self._register_global_c(c)
         return c
 
diff --git a/rhodecode/apps/repository/views/repo_settings_issue_trackers.py b/rhodecode/apps/repository/views/repo_settings_issue_trackers.py
index 8c6c3fea..fe8da28b 100644
--- a/rhodecode/apps/repository/views/repo_settings_issue_trackers.py
+++ b/rhodecode/apps/repository/views/repo_settings_issue_trackers.py
@@ -39,9 +39,6 @@ class RepoSettingsIssueTrackersView(RepoAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
-        c.repo_info = self.db_repo
-
         self._register_global_c(c)
         return c
 
diff --git a/rhodecode/apps/repository/views/repo_settings_remote.py b/rhodecode/apps/repository/views/repo_settings_remote.py
index eaecb6b0..c0121be4 100644
--- a/rhodecode/apps/repository/views/repo_settings_remote.py
+++ b/rhodecode/apps/repository/views/repo_settings_remote.py
@@ -36,9 +36,6 @@ class RepoSettingsRemoteView(RepoAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
-        c.repo_info = self.db_repo
-
         self._register_global_c(c)
         return c
 
diff --git a/rhodecode/apps/repository/views/repo_settings_vcs.py b/rhodecode/apps/repository/views/repo_settings_vcs.py
index ff93d319..3e30196f 100644
--- a/rhodecode/apps/repository/views/repo_settings_vcs.py
+++ b/rhodecode/apps/repository/views/repo_settings_vcs.py
@@ -43,9 +43,6 @@ class RepoSettingsVcsView(RepoAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
-        c.repo_info = self.db_repo
-
         self._register_global_c(c)
         return c
 
diff --git a/rhodecode/apps/repository/views/repo_strip.py b/rhodecode/apps/repository/views/repo_strip.py
index 854ad964..9828e5b5 100644
--- a/rhodecode/apps/repository/views/repo_strip.py
+++ b/rhodecode/apps/repository/views/repo_strip.py
@@ -35,9 +35,6 @@ class StripView(RepoAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context()
 
-        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
-        c.repo_info = self.db_repo
-
         self._register_global_c(c)
         return c
 
diff --git a/rhodecode/apps/repository/views/repo_summary.py b/rhodecode/apps/repository/views/repo_summary.py
index 5c8f915e..74b4ccc7 100644
--- a/rhodecode/apps/repository/views/repo_summary.py
+++ b/rhodecode/apps/repository/views/repo_summary.py
@@ -48,8 +48,6 @@ class RepoSummaryView(RepoAppView):
     def load_default_context(self):
         c = self._get_local_tmpl_context(include_app_defaults=True)
 
-        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
-        c.repo_info = self.db_repo
         c.rhodecode_repo = None
         if not c.repository_requirements_missing:
             c.rhodecode_repo = self.rhodecode_vcs_repo
diff --git a/rhodecode/integrations/views.py b/rhodecode/integrations/views.py
index 71e2ae8b..7b0fd263 100644
--- a/rhodecode/integrations/views.py
+++ b/rhodecode/integrations/views.py
@@ -393,8 +393,7 @@ class RepoIntegrationsView(IntegrationSettingsViewBase):
         c.repo = self.repo
         c.repo_group = self.repo_group
 
-        # TODO(marcink): remove repo_info and use c.rhodecode_db_repo instead
-        c.repo_info = self.db_repo = self.repo
+        self.db_repo = self.repo
         c.rhodecode_db_repo = self.repo
         c.repo_name = self.db_repo.repo_name
         c.repository_pull_requests = ScmModel().get_pull_requests(self.repo)
diff --git a/rhodecode/templates/admin/repos/repo_edit.mako b/rhodecode/templates/admin/repos/repo_edit.mako
index 2024feca..1e0637bb 100644
--- a/rhodecode/templates/admin/repos/repo_edit.mako
+++ b/rhodecode/templates/admin/repos/repo_edit.mako
@@ -5,7 +5,7 @@
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
-    ${_('%s repository settings') % c.repo_info.repo_name}
+    ${_('%s repository settings') % c.rhodecode_db_repo.repo_name}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
@@ -63,7 +63,7 @@
           <li class="${'active' if c.active=='caches' else ''}">
               <a href="${h.route_path('edit_repo_caches', repo_name=c.repo_name)}">${_('Caches')}</a>
           </li>
-          %if c.repo_info.repo_type != 'svn':
+          %if c.rhodecode_db_repo.repo_type != 'svn':
           <li class="${'active' if c.active=='remote' else ''}">
               <a href="${h.route_path('edit_repo_remote', repo_name=c.repo_name)}">${_('Remote')}</a>
           </li>
@@ -74,7 +74,7 @@
           <li class="${'active' if c.active=='integrations' else ''}">
               <a href="${h.route_path('repo_integrations_home', repo_name=c.repo_name)}">${_('Integrations')}</a>
           </li>
-          %if c.repo_info.repo_type != 'svn':
+          %if c.rhodecode_db_repo.repo_type != 'svn':
           <li class="${'active' if c.active=='reviewers' else ''}">
               <a href="${h.route_path('repo_reviewers', repo_name=c.repo_name)}">${_('Reviewer Rules')}</a>
           </li>
diff --git a/rhodecode/templates/admin/repos/repo_edit_advanced.mako b/rhodecode/templates/admin/repos/repo_edit_advanced.mako
index 5cbd6250..c83d0728 100644
--- a/rhodecode/templates/admin/repos/repo_edit_advanced.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_advanced.mako
@@ -2,16 +2,16 @@
 
 <%
  elems = [
-    (_('Owner'), lambda:base.gravatar_with_user(c.repo_info.user.email), '', ''),
-    (_('Created on'), h.format_date(c.repo_info.created_on), '', ''),
-    (_('Updated on'), h.format_date(c.repo_info.updated_on), '', ''),
-    (_('Cached Commit id'), lambda: h.link_to(c.repo_info.changeset_cache.get('short_id'), h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.repo_info.changeset_cache.get('raw_id'))), '', ''),
+    (_('Owner'), lambda:base.gravatar_with_user(c.rhodecode_db_repo.user.email), '', ''),
+    (_('Created on'), h.format_date(c.rhodecode_db_repo.created_on), '', ''),
+    (_('Updated on'), h.format_date(c.rhodecode_db_repo.updated_on), '', ''),
+    (_('Cached Commit id'), lambda: h.link_to(c.rhodecode_db_repo.changeset_cache.get('short_id'), h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.rhodecode_db_repo.changeset_cache.get('raw_id'))), '', ''),
  ]
 %>
 
 <div class="panel panel-default">
     <div class="panel-heading" id="advanced-info" >
-        <h3 class="panel-title">${_('Repository: %s') % c.repo_info.repo_name} <a class="permalink" href="#advanced-info"> ¶</a></h3>
+        <h3 class="panel-title">${_('Repository: %s') % c.rhodecode_db_repo.repo_name} <a class="permalink" href="#advanced-info"> ¶</a></h3>
     </div>
     <div class="panel-body">
         ${base.dt_info_panel(elems)}
@@ -24,16 +24,16 @@
         <h3 class="panel-title">${_('Fork Reference')} <a class="permalink" href="#advanced-fork"> ¶</a></h3>
     </div>
     <div class="panel-body">
-      ${h.secure_form(h.route_path('edit_repo_advanced_fork', repo_name=c.repo_info.repo_name), method='POST', request=request)}
+      ${h.secure_form(h.route_path('edit_repo_advanced_fork', repo_name=c.rhodecode_db_repo.repo_name), method='POST', request=request)}
 
-        % if c.repo_info.fork:
-            <div class="panel-body-title-text">${h.literal(_('This repository is a fork of %(repo_link)s') % {'repo_link': h.link_to_if(c.has_origin_repo_read_perm,c.repo_info.fork.repo_name, h.route_path('repo_summary', repo_name=c.repo_info.fork.repo_name))})}
+        % if c.rhodecode_db_repo.fork:
+            <div class="panel-body-title-text">${h.literal(_('This repository is a fork of %(repo_link)s') % {'repo_link': h.link_to_if(c.has_origin_repo_read_perm,c.rhodecode_db_repo.fork.repo_name, h.route_path('repo_summary', repo_name=c.rhodecode_db_repo.fork.repo_name))})}
             | <button class="btn btn-link btn-danger" type="submit">Remove fork reference</button></div>
         % endif
 
          <div class="field">
              ${h.hidden('id_fork_of')}
-             ${h.submit('set_as_fork_%s' % c.repo_info.repo_name,_('Set'),class_="btn btn-small",)}
+             ${h.submit('set_as_fork_%s' % c.rhodecode_db_repo.repo_name,_('Set'),class_="btn btn-small",)}
          </div>
          <div class="field">
              <span class="help-block">${_('Manually set this repository as a fork of another from the list')}</span>
@@ -48,7 +48,7 @@
         <h3 class="panel-title">${_('Public Journal Visibility')} <a class="permalink" href="#advanced-journal"> ¶</a></h3>
     </div>
     <div class="panel-body">
-      ${h.secure_form(h.route_path('edit_repo_advanced_journal', repo_name=c.repo_info.repo_name), method='POST', request=request)}
+      ${h.secure_form(h.route_path('edit_repo_advanced_journal', repo_name=c.rhodecode_db_repo.repo_name), method='POST', request=request)}
         <div class="field">
         %if c.in_public_journal:
           <button class="btn btn-small" type="submit">
@@ -73,17 +73,17 @@
         <h3 class="panel-title">${_('Locking state')} <a class="permalink" href="#advanced-locking"> ¶</a></h3>
     </div>
     <div class="panel-body">
-        ${h.secure_form(h.route_path('edit_repo_advanced_locking', repo_name=c.repo_info.repo_name), method='POST', request=request)}
+        ${h.secure_form(h.route_path('edit_repo_advanced_locking', repo_name=c.rhodecode_db_repo.repo_name), method='POST', request=request)}
 
-        %if c.repo_info.locked[0]:
-             <div class="panel-body-title-text">${'Locked by %s on %s. Lock reason: %s' % (h.person_by_id(c.repo_info.locked[0]),
-             h.format_date(h. time_to_datetime(c.repo_info.locked[1])), c.repo_info.locked[2])}</div>
+        %if c.rhodecode_db_repo.locked[0]:
+             <div class="panel-body-title-text">${'Locked by %s on %s. Lock reason: %s' % (h.person_by_id(c.rhodecode_db_repo.locked[0]),
+             h.format_date(h. time_to_datetime(c.rhodecode_db_repo.locked[1])), c.rhodecode_db_repo.locked[2])}</div>
         %else:
             <div class="panel-body-title-text">${_('This Repository is not currently locked.')}</div>
         %endif
 
         <div class="field" >
-            %if c.repo_info.locked[0]:
+            %if c.rhodecode_db_repo.locked[0]:
               ${h.hidden('set_unlock', '1')}
               <button class="btn btn-small" type="submit"
                       onclick="return confirm('${_('Confirm to unlock repository.')}');">
@@ -117,15 +117,15 @@
         <table class="display">
             <tr>
                 <td>
-                    ${_ungettext('This repository has %s fork.', 'This repository has %s forks.', c.repo_info.forks.count()) % c.repo_info.forks.count()}
+                    ${_ungettext('This repository has %s fork.', 'This repository has %s forks.', c.rhodecode_db_repo.forks.count()) % c.rhodecode_db_repo.forks.count()}
                 </td>
                 <td>
-                    %if c.repo_info.forks.count():
+                    %if c.rhodecode_db_repo.forks.count():
                         <input type="radio" name="forks" value="detach_forks" checked="checked"/> <label for="forks">${_('Detach forks')}</label>
                     %endif
                 </td>
                 <td>
-                    %if c.repo_info.forks.count():
+                    %if c.rhodecode_db_repo.forks.count():
                         <input type="radio" name="forks" value="delete_forks"/> <label for="forks">${_('Delete forks')}</label>
                     %endif
                 </td>
@@ -153,7 +153,7 @@
 
 <script>
 
-var currentRepoId = ${c.repo_info.repo_id};
+var currentRepoId = ${c.rhodecode_db_repo.repo_id};
 
 var repoTypeFilter = function(data) {
     var results = [];
@@ -176,7 +176,7 @@ var repoTypeFilter = function(data) {
 $("#id_fork_of").select2({
     cachedDataSource: {},
     minimumInputLength: 2,
-    placeholder: "${_('Change repository') if c.repo_info.fork else _('Pick repository')}",
+    placeholder: "${_('Change repository') if c.rhodecode_db_repo.fork else _('Pick repository')}",
     dropdownAutoWidth: true,
     containerCssClass: "drop-menu",
     dropdownCssClass: "drop-menu-dropdown",
@@ -191,7 +191,7 @@ $("#id_fork_of").select2({
         } else {
             $.ajax({
                 url: pyroutes.url('repo_list_data'),
-                data: {'query': query.term, repo_type: '${c.repo_info.repo_type}'},
+                data: {'query': query.term, repo_type: '${c.rhodecode_db_repo.repo_type}'},
                 dataType: 'json',
                 type: 'GET',
                 success: function(data) {
diff --git a/rhodecode/templates/admin/repos/repo_edit_caches.mako b/rhodecode/templates/admin/repos/repo_edit_caches.mako
index 39ae237d..e2fb9760 100644
--- a/rhodecode/templates/admin/repos/repo_edit_caches.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_caches.mako
@@ -10,14 +10,14 @@
             ${_('Cache purge can be automated by such api call. Can be called periodically in crontab etc.')}
             <br/>
             <code>
-            ${h.api_call_example(method='invalidate_cache', args={"repoid": c.repo_info.repo_name})}
+            ${h.api_call_example(method='invalidate_cache', args={"repoid": c.rhodecode_db_repo.repo_name})}
             </code>
         </p>
 
         ${h.secure_form(h.route_path('edit_repo_caches', repo_name=c.repo_name), method='POST', request=request)}
         <div class="form">
            <div class="fields">
-               ${h.submit('reset_cache_%s' % c.repo_info.repo_name,_('Invalidate repository cache'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to invalidate repository cache')+"');")}
+               ${h.submit('reset_cache_%s' % c.rhodecode_db_repo.repo_name,_('Invalidate repository cache'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to invalidate repository cache')+"');")}
            </div>
         </div>
         ${h.end_form()}
@@ -29,7 +29,7 @@
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">
-            ${(_ungettext('List of repository caches (%(count)s entry)', 'List of repository caches (%(count)s entries)' ,len(c.repo_info.cache_keys)) % {'count': len(c.repo_info.cache_keys)})}
+            ${(_ungettext('List of repository caches (%(count)s entry)', 'List of repository caches (%(count)s entries)' ,len(c.rhodecode_db_repo.cache_keys)) % {'count': len(c.rhodecode_db_repo.cache_keys)})}
         </h3>
     </div>
     <div class="panel-body">
@@ -40,7 +40,7 @@
             <th>${_('Key')}</th>
             <th>${_('Active')}</th>
             </tr>
-          %for cache in c.repo_info.cache_keys:
+          %for cache in c.rhodecode_db_repo.cache_keys:
               <tr>
                 <td class="td-prefix">${cache.get_prefix() or '-'}</td>
                 <td class="td-cachekey">${cache.cache_key}</td>
diff --git a/rhodecode/templates/admin/repos/repo_edit_fields.mako b/rhodecode/templates/admin/repos/repo_edit_fields.mako
index 2bbad84d..e1921499 100644
--- a/rhodecode/templates/admin/repos/repo_edit_fields.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_fields.mako
@@ -18,7 +18,7 @@
                     <td class="td-hash">${field.field_key}</td>
                     <td class="td-type">${field.field_type}</td>
                     <td class="td-action">
-                      ${h.secure_form(h.route_path('edit_repo_fields_delete', repo_name=c.repo_info.repo_name, field_id=field.repo_field_id), method='POST', request=request)}
+                      ${h.secure_form(h.route_path('edit_repo_fields_delete', repo_name=c.rhodecode_db_repo.repo_name, field_id=field.repo_field_id), method='POST', request=request)}
                             ${h.hidden('del_repo_field',field.repo_field_id)}
                             <button class="btn btn-link btn-danger" type="submit"
                                     onclick="return confirm('${_('Confirm to delete this field: %s') % field.field_key}');">
diff --git a/rhodecode/templates/admin/repos/repo_edit_issuetracker.mako b/rhodecode/templates/admin/repos/repo_edit_issuetracker.mako
index 60c483da..86abc7d6 100644
--- a/rhodecode/templates/admin/repos/repo_edit_issuetracker.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_issuetracker.mako
@@ -72,8 +72,8 @@
             <div class="panel-body">
                     ${its.issue_tracker_settings_table(
                         patterns=c.repo_patterns.items(),
-                        form_url=h.route_path('edit_repo_issuetracker', repo_name=c.repo_info.repo_name),
-                        delete_url=h.route_path('edit_repo_issuetracker_delete', repo_name=c.repo_info.repo_name)
+                        form_url=h.route_path('edit_repo_issuetracker', repo_name=c.rhodecode_db_repo.repo_name),
+                        delete_url=h.route_path('edit_repo_issuetracker_delete', repo_name=c.rhodecode_db_repo.repo_name)
                     )}
                   <div class="buttons">
                       <button type="submit" class="btn btn-primary save-inheritance" id="save">${_('Save')}</button>
@@ -92,7 +92,7 @@
     </div>
     <div class="panel-body">
         ${its.issue_tracker_new_row()}
-        ${its.issue_tracker_settings_test(test_url=h.route_path('edit_repo_issuetracker_test', repo_name=c.repo_info.repo_name))}
+        ${its.issue_tracker_settings_test(test_url=h.route_path('edit_repo_issuetracker_test', repo_name=c.rhodecode_db_repo.repo_name))}
     </div>
 </div>
 
diff --git a/rhodecode/templates/admin/repos/repo_edit_maintenance.mako b/rhodecode/templates/admin/repos/repo_edit_maintenance.mako
index 7ae20e77..662be268 100644
--- a/rhodecode/templates/admin/repos/repo_edit_maintenance.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_maintenance.mako
@@ -17,7 +17,7 @@
             ${_('Maintenance can be automated by such api call. Can be called periodically in crontab etc.')}
             <br/>
             <code>
-                ${h.api_call_example(method='maintenance', args={"repoid": c.repo_info.repo_name})}
+                ${h.api_call_example(method='maintenance', args={"repoid": c.rhodecode_db_repo.repo_name})}
             </code>
         </p>
 
@@ -51,7 +51,7 @@ executeTask = function() {
     btn.attr('disabled', 'disabled');
     btn.addClass('disabled');
 
-    var url = "${h.route_path('edit_repo_maintenance_execute', repo_name=c.repo_info.repo_name)}";
+    var url = "${h.route_path('edit_repo_maintenance_execute', repo_name=c.rhodecode_db_repo.repo_name)}";
     var success = function (data) {
         var displayHtml = $('<pre></pre>');
 
diff --git a/rhodecode/templates/admin/repos/repo_edit_permissions.mako b/rhodecode/templates/admin/repos/repo_edit_permissions.mako
index 1b180e19..c0b06747 100644
--- a/rhodecode/templates/admin/repos/repo_edit_permissions.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_permissions.mako
@@ -16,7 +16,7 @@
                 <th></th>
             </tr>
             ## USERS
-            %for _user in c.repo_info.permissions():
+            %for _user in c.rhodecode_db_repo.permissions():
                 %if getattr(_user, 'admin_row', None) or getattr(_user, 'owner_row', None):
                     <tr class="perm_admin_row">
                         <td class="td-radio">${h.radio('admin_perm_%s' % _user.user_id,'repository.none', disabled="disabled")}</td>
@@ -35,7 +35,7 @@
                         </td>
                         <td></td>
                     </tr>
-                %elif _user.username == h.DEFAULT_USER and c.repo_info.private:
+                %elif _user.username == h.DEFAULT_USER and c.rhodecode_db_repo.private:
                     <tr>
                         <td colspan="4">
                             <span class="private_repo_msg">
@@ -76,7 +76,7 @@
             %endfor
 
             ## USER GROUPS
-            %for _user_group in c.repo_info.permission_user_groups():
+            %for _user_group in c.rhodecode_db_repo.permission_user_groups():
                 <tr>
                     <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'repository.none', checked=_user_group.permission=='repository.none')}</td>
                     <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'repository.read', checked=_user_group.permission=='repository.read')}</td>
diff --git a/rhodecode/templates/admin/repos/repo_edit_remote.mako b/rhodecode/templates/admin/repos/repo_edit_remote.mako
index 9a1ec390..fd22ab2d 100644
--- a/rhodecode/templates/admin/repos/repo_edit_remote.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_remote.mako
@@ -6,30 +6,30 @@
 
         <h4>${_('Manually pull changes from external repository.')}</h4>
 
-        %if c.repo_info.clone_uri:
+        %if c.rhodecode_db_repo.clone_uri:
 
             ${_('Remote mirror url')}:
-            <a href="${c.repo_info.clone_uri}">${c.repo_info.clone_uri_hidden}</a>
+            <a href="${c.rhodecode_db_repo.clone_uri}">${c.rhodecode_db_repo.clone_uri_hidden}</a>
 
             <p>
                 ${_('Pull can be automated by such api call. Can be called periodically in crontab etc.')}
                 <br/>
                 <code>
-                ${h.api_call_example(method='pull', args={"repoid": c.repo_info.repo_name})}
+                ${h.api_call_example(method='pull', args={"repoid": c.rhodecode_db_repo.repo_name})}
                 </code>
             </p>
 
             ${h.secure_form(h.route_path('edit_repo_remote_pull', repo_name=c.repo_name), method='POST', request=request)}
             <div class="form">
                <div class="fields">
-                   ${h.submit('remote_pull_%s' % c.repo_info.repo_name,_('Pull changes from remote location'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to pull changes from remote side')+"');")}
+                   ${h.submit('remote_pull_%s' % c.rhodecode_db_repo.repo_name,_('Pull changes from remote location'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to pull changes from remote side')+"');")}
                </div>
             </div>
             ${h.end_form()}
         %else:
 
           ${_('This repository does not have any remote mirror url set.')}
-          <a href="${h.route_path('edit_repo', repo_name=c.repo_info.repo_name)}">${_('Set remote url.')}</a>
+          <a href="${h.route_path('edit_repo', repo_name=c.rhodecode_db_repo.repo_name)}">${_('Set remote url.')}</a>
           <br/>
           <br/>
           <button class="btn disabled" type="submit" disabled="disabled">
diff --git a/rhodecode/templates/admin/repos/repo_edit_statistics.mako b/rhodecode/templates/admin/repos/repo_edit_statistics.mako
index 00537b4c..91a017dc 100644
--- a/rhodecode/templates/admin/repos/repo_edit_statistics.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_statistics.mako
@@ -3,7 +3,7 @@
         <h3 class="panel-title">${_('Repository statistics')}</h3>
     </div>
     <div class="panel-body">
-        ${h.secure_form(h.route_path('edit_repo_statistics_reset', repo_name=c.repo_info.repo_name), method='POST', request=request)}
+        ${h.secure_form(h.route_path('edit_repo_statistics_reset', repo_name=c.rhodecode_db_repo.repo_name), method='POST', request=request)}
         <div class="form">
             <div class="fields">
                <div class="field" >
@@ -12,7 +12,7 @@
                     <dt>${_('Processed progress')}:</dt><dd>${c.stats_percentage}%</dd>
                 </dl>
                </div>
-                ${h.submit('reset_stats_%s' % c.repo_info.repo_name,_('Reset statistics'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to remove current statistics')+"');")}
+                ${h.submit('reset_stats_%s' % c.rhodecode_db_repo.repo_name,_('Reset statistics'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to remove current statistics')+"');")}
            </div>
         </div>
         ${h.end_form()}
diff --git a/rhodecode/templates/admin/repos/repo_edit_strip.mako b/rhodecode/templates/admin/repos/repo_edit_strip.mako
index 91571024..5778890f 100644
--- a/rhodecode/templates/admin/repos/repo_edit_strip.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_strip.mako
@@ -3,13 +3,13 @@
         <h3 class="panel-title">${_('Strip commits from repository')}</h3>
     </div>
     <div class="panel-body">
-        %if c.repo_info.repo_type != 'svn':
+        %if c.rhodecode_db_repo.repo_type != 'svn':
             <h4>${_('Please provide up to %d commits commits to strip') % c.strip_limit}</h4>
             <p>
                 ${_('In the first step commits will be verified for existance in the repository')}. </br>
                 ${_('In the second step, correct commits will be available for stripping')}.
             </p>
-            ${h.secure_form(h.route_path('strip_check', repo_name=c.repo_info.repo_name), method='POST', request=request)}
+            ${h.secure_form(h.route_path('strip_check', repo_name=c.rhodecode_db_repo.repo_name), method='POST', request=request)}
                 <div id="change_body" class="field">
                     <div id="box-1" class="inputx locked_input">
                         <input class="text" id="changeset_id-1" name="changeset_id-1" size="59"
@@ -112,7 +112,7 @@ checkCommits = function() {
     var postData = $('form').serialize();
     $('#results').show();
     $('#results').html('<h4>${_('Checking commits')}...</h4>');
-    var url = "${h.route_path('strip_check', repo_name=c.repo_info.repo_name)}";
+    var url = "${h.route_path('strip_check', repo_name=c.rhodecode_db_repo.repo_name)}";
     var btn = $('#strip_action');
     btn.attr('disabled', 'disabled');
     btn.addClass('disabled');
@@ -171,7 +171,7 @@ checkCommits = function() {
 };
 
 strip = function() {
-    var url = "${h.route_path('strip_execute', repo_name=c.repo_info.repo_name)}";
+    var url = "${h.route_path('strip_execute', repo_name=c.rhodecode_db_repo.repo_name)}";
     var success = function(data) {
         var result = '<h4>Strip executed</h4><ol>';
         $.each(data, function(index, value){
diff --git a/rhodecode/templates/admin/repos/repo_edit_vcs.mako b/rhodecode/templates/admin/repos/repo_edit_vcs.mako
index 32d8b6b9..c5f09d22 100644
--- a/rhodecode/templates/admin/repos/repo_edit_vcs.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_vcs.mako
@@ -1,7 +1,7 @@
 <%namespace name="vcss" file="/base/vcs_settings.mako"/>
 
 <div id="repo_vcs_settings" class="${'inherited' if c.inherit_global_settings else ''}">
-    ${h.secure_form(h.route_path('edit_repo_vcs_update', repo_name=c.repo_info.repo_name), method='POST', request=request)}
+    ${h.secure_form(h.route_path('edit_repo_vcs_update', repo_name=c.rhodecode_db_repo.repo_name), method='POST', request=request)}
         <div class="form panel panel-default">
             <div class="fields panel-body">
                 <div class="field">
@@ -22,7 +22,7 @@
                     suffix='_inherited',
                     svn_tag_patterns=c.global_svn_tag_patterns,
                     svn_branch_patterns=c.global_svn_branch_patterns,
-                    repo_type=c.repo_info.repo_type,
+                    repo_type=c.rhodecode_db_repo.repo_type,
                     disabled='disabled'
                 )}
             </div>
@@ -34,7 +34,7 @@
                     suffix='',
                     svn_tag_patterns=c.svn_tag_patterns,
                     svn_branch_patterns=c.svn_branch_patterns,
-                    repo_type=c.repo_info.repo_type
+                    repo_type=c.rhodecode_db_repo.repo_type
                 )}
             </div>
         </div>
@@ -50,7 +50,7 @@
 <script type="text/javascript">
 
     function ajaxDeletePattern(pattern_id, field_id) {
-        var sUrl = "${h.route_path('edit_repo_vcs_svn_pattern_delete', repo_name=c.repo_info.repo_name)}";
+        var sUrl = "${h.route_path('edit_repo_vcs_svn_pattern_delete', repo_name=c.rhodecode_db_repo.repo_name)}";
         var callback =  function (o) {
             var elem = $("#"+field_id);
             elem.remove();
diff --git a/rhodecode/templates/forks/fork.mako b/rhodecode/templates/forks/fork.mako
index 01040348..f70a03d5 100644
--- a/rhodecode/templates/forks/fork.mako
+++ b/rhodecode/templates/forks/fork.mako
@@ -27,7 +27,7 @@
           ${self.breadcrumbs()}
       </div>
 
-    ${h.secure_form(h.route_path('repo_fork_create',repo_name=c.repo_info.repo_name), method='POST', request=request)}
+    ${h.secure_form(h.route_path('repo_fork_create',repo_name=c.rhodecode_db_repo.repo_name), method='POST', request=request)}
     <div class="form">
         <!-- fields -->
         <div class="fields">
@@ -38,8 +38,8 @@
               </div>
               <div class="input">
                   ${h.text('repo_name', class_="medium")}
-                  ${h.hidden('repo_type',c.repo_info.repo_type)}
-                  ${h.hidden('fork_parent_id',c.repo_info.repo_id)}
+                  ${h.hidden('repo_type',c.rhodecode_db_repo.repo_type)}
+                  ${h.hidden('fork_parent_id',c.rhodecode_db_repo.repo_id)}
               </div>
             </div>