Show ProtectedBranch feature in repositories list

Author: root

Diff for: app/helpers/git_hosting_helper.rb

@@ -92,46 +92,51 @@ def reldir_add_dotslash(path)
 
 
   def render_feature(repository, feature)
-    css_class = 'icon icon-git'
+    css_class = [ 'icon icon-git' ]
 
     case feature
 
-      when :repository_deployment_credentials
-        label = l(:label_deployment_credentials)
-        css_class << ' icon-deployment-credentials'
+      when :deployment_credentials
+        label = [ l(:label_deployment_credentials) ]
+        css_class << 'icon-deployment-credentials'
         enabled = repository.deployment_credentials.active.any?
 
-      when :repository_post_receive_urls
-        label = l(:label_post_receive_urls)
-        css_class << ' icon-post-receive-urls'
+      when :post_receive_urls
+        label = [ l(:label_post_receive_urls) ]
+        css_class << 'icon-post-receive-urls'
         enabled = repository.post_receive_urls.active.any?
 
-      when :repository_mirrors
-        label = l(:label_repository_mirrors)
-        css_class << ' icon-mirrors'
+      when :mirrors
+        label = [ l(:label_repository_mirrors) ]
+        css_class << 'icon-mirrors'
         enabled = repository.mirrors.active.any?
 
       when :git_daemon
-        label = l(:label_git_daemon)
-        css_class << ' icon-git-daemon'
+        label = [ l(:label_git_daemon) ]
+        css_class << 'icon-git-daemon'
         enabled = (repository.project.is_public && repository.extra[:git_daemon])
 
       when :git_http
-        label = l(:label_smart_http)
-        css_class << ' icon-git-smarthttp'
+        label = [ l(:label_smart_http) ]
+        css_class << 'icon-git-smarthttp'
         enabled = repository.extra[:git_http] != 0
 
       when :git_notify
-        label = l(:label_git_notify)
-        css_class << ' icon-git-notify'
+        label = [ l(:label_git_notify) ]
+        css_class << 'icon-git-notify'
         enabled = repository.extra[:git_notify]
 
+      when :protected_branch
+        label = [ l(:label_protected_branch) ]
+        css_class << 'icon-git-protected-branch'
+        enabled = repository.extra[:protected_branch]
+
     end
 
-    label << (!enabled ? " (#{l(:label_disabled)})" : '')
-    css_class << (!enabled ? ' icon-git-disabled' : '')
+    label << "(#{l(:label_disabled)})" if !enabled
+    css_class << 'icon-git-disabled' if !enabled
 
-    content_tag(:span, '', :title => label, :class => css_class)
+    content_tag(:span, '', :title => label.join(' '), :class => css_class.join(' '))
   end
 
 

Diff for: app/views/projects/settings/_repositories.html.erb

@@ -35,12 +35,13 @@
       </td>
       <td align="center">
         <% if repository.is_a?(Repository::Git) %>
-          <%= render_feature(repository, :repository_deployment_credentials) %>
-          <%= render_feature(repository, :repository_post_receive_urls) %>
-          <%= render_feature(repository, :repository_mirrors) %>
+          <%= render_feature(repository, :deployment_credentials) %>
+          <%= render_feature(repository, :post_receive_urls) %>
+          <%= render_feature(repository, :mirrors) %>
           <%= render_feature(repository, :git_daemon) %>
           <%= render_feature(repository, :git_http) %>
           <%= render_feature(repository, :git_notify) %>
+          <%= render_feature(repository, :protected_branch) %>
         <% end %>
       </td>
       <td class="buttons">

Diff for: assets/images/locked.png

@@ -12,6 +12,7 @@ PLUGIN ICONS
 .icon-git-daemon { background-image: url("../images/changeset.png"); }
 .icon-git-smarthttp { background-image: url("../images/web.png"); }
 .icon-git-notify { background-image: url("../images/email.png"); }
+.icon-git-protected-branch { background-image: url("../images/locked.png"); }
 
 .icon-git { padding-right: 15px; }
 .icon-git-disabled { opacity: 0.5; }

Diff for: assets/stylesheets/application.css

@@ -222,6 +222,7 @@ en:
   label_git_daemon: Git Daemon
   label_smart_http: Smart HTTP
   label_git_notify: Git Notifications
+  label_protected_branch: Protected Branches
   label_repository_default_branch: Repository default branch
   label_init_repo_with_readme: Initialize this repository with a README
   label_browse_repository: Browse repository

Diff for: config/locales/plugin_interface/en.yml

@@ -222,6 +222,7 @@ fr:
   label_git_daemon: Daemon Git
   label_smart_http: Smart HTTP
   label_git_notify: Notifications Git
+  label_protected_branch: Branches Protégées
   label_repository_default_branch: Branche par défaut
   label_init_repo_with_readme: Initialiser le dépôt avec un fichier README
   label_browse_repository: Parcourir les sources