Merge branch 'devel' into feat_protected_branches

Author: root

Diff for: .gitignore

@@ -1,6 +1,5 @@
 .*.swp
 Gemfile.lock
-/selinux/tmp
 /tmp
 /rdoc
 /coverage

Diff for: app/helpers/git_hosting_helper.rb

@@ -82,15 +82,6 @@ def plugin_asset_link(asset_name)
   end
 
 
-  # Generic helper functions
-  def reldir_add_dotslash(path)
-    # Is this a relative path?
-    stripped = (path || "").lstrip.rstrip
-    norm = File.expand_path(stripped, "/")
-    ((stripped[0, 1] != "/") ? '.' : '') + norm + ((norm[-1, 1] != "/") ? "/" : "")
-  end
-
-
   def render_feature(repository, feature)
     css_class = [ 'icon icon-git' ]
 

Diff for: app/models/repository_mirror.rb

@@ -43,25 +43,16 @@ class RepositoryMirror < ActiveRecord::Base
   include GitoliteHooksHelper
 
 
-  def push
-    push_args = []
-
-    if push_mode == PUSHMODE_MIRROR
-      push_args << "--mirror"
-    else
-      # Not mirroring -- other possible push_args
-      push_args << "--force" if push_mode == PUSHMODE_FORCE
-      push_args << "--all"   if include_all_branches
-      push_args << "--tags"  if include_all_tags
-    end
-
-    push_args << "#{dequote(url)}"
-    push_args << "#{dequote(explicit_refspec)}" unless explicit_refspec.blank?
+  def to_s
+    return "#{repository.project.identifier}-#{url}"
+  end
 
-    command = "cd #{repository.gitolite_repository_path} && env GIT_SSH=~/.ssh/run_gitolite_admin_ssh git push #{push_args.join(' ')}"
 
+  def push
     begin
-      push_message = RedmineGitolite::GitoliteWrapper.pipe_sudo('echo', "'#{command}'", "bash")[0].chomp
+      push_message = RedmineGitolite::GitoliteWrapper.sudo_pipe("bash") do
+        [ 'cd', repository.gitolite_repository_path, '&&', 'env', 'GIT_SSH=~/.ssh/run_gitolite_admin_ssh', 'git', 'push', *push_args, '2>&1' ].join(' ')
+      end
       push_failed = false
     rescue RedmineGitolite::GitHosting::GitHostingException => e
       push_message = e.output
@@ -91,11 +82,6 @@ def needs_push(payloads = [])
   end
 
 
-  def to_s
-    return "#{repository.project.identifier}-#{url}"
-  end
-
-
   private
 
 
@@ -155,4 +141,23 @@ def refcomp_valid(spec)
     end
   end
 
+
+  def push_args
+    push_args = []
+
+    if self.push_mode == PUSHMODE_MIRROR
+      push_args << "--mirror"
+    else
+      # Not mirroring -- other possible push_args
+      push_args << "--force" if self.push_mode == PUSHMODE_FORCE
+      push_args << "--all"   if self.include_all_branches?
+      push_args << "--tags"  if self.include_all_tags?
+    end
+
+    push_args << "#{dequote(self.url)}"
+    push_args << "#{dequote(self.explicit_refspec)}" unless self.explicit_refspec.blank?
+
+    return push_args
+  end
+
 end

Diff for: app/views/repository_mirrors/index.html.erb

@@ -36,12 +36,10 @@
             <td class="buttons">
               <% if user_allowed_to(:edit_repository_mirrors, @project) %>
 
-                <% if mirror.active? %>
-                  <%= link_to l(:label_mirror_push), push_to_mirror_path(@repository, mirror),
-                                                     :title => l(:label_mirror_push_title),
-                                                     :alt   => l(:label_mirror_push_title),
-                                                     :class => 'icon icon-push modal-box-close-only' %>
-                <% end %>
+                <%= link_to l(:label_mirror_push), push_to_mirror_path(@repository, mirror),
+                                                   :title => l(:label_mirror_push_title),
+                                                   :alt   => l(:label_mirror_push_title),
+                                                   :class => 'icon icon-push modal-box-close-only' %>
 
                 <%= link_to l(:button_edit), edit_repository_mirror_path(@repository, mirror),
                                              :class => 'icon icon-edit modal-box' %>

Diff for: app/views/settings/_gitolite_config_global.html.erb

@@ -3,15 +3,12 @@
   gitolite_recycle_bin_expiration_time = RedmineGitolite::Config.get_setting(:gitolite_recycle_bin_expiration_time)
 
   gitolite_temp_dir    = RedmineGitolite::Config.get_setting(:gitolite_temp_dir)
-  gitolite_scripts_dir = RedmineGitolite::Config.get_setting(:gitolite_scripts_dir)
   gitolite_timeout     = RedmineGitolite::Config.get_setting(:gitolite_timeout)
   gitolite_log_level   = RedmineGitolite::Config.get_setting(:gitolite_log_level)
   gitolite_log_split   = RedmineGitolite::Config.get_setting(:gitolite_log_split)
 
   git_config_username  = RedmineGitolite::Config.get_setting(:git_config_username)
   git_config_email     = RedmineGitolite::Config.get_setting(:git_config_email)
-
-  scripts_dir_writeable = RedmineGitolite::Scripts.scripts_dir_writeable?(:reset => true)
 %>
 
 <h3><%= l(:label_gitolite_global_config) %></h3>
@@ -23,16 +20,6 @@
   <em><%= l(:label_gitolite_temp_dir_desc) %></em>
 </p>
 
-<p>
-  <label><%= l(:label_gitolite_scripts_dir) %></label>
-  <%= text_field_tag("settings[gitolite_scripts_dir]", reldir_add_dotslash(gitolite_scripts_dir), :size => 60) %>
-  <br />
-  <em><%= l(:label_gitolite_scripts_dir_desc) %></em>
-  <% if !scripts_dir_writeable %>
-    <br /><span class="label label-warning"><%= l(:label_cannot_change_selinux) %></span>
-  <% end %>
-</p>
-
 <p>
   <label><%= l(:label_gitolite_timeout) %></label>
   <%= text_field_tag("settings[gitolite_timeout]", "#{gitolite_timeout}", :size => 10) %>

Diff for: app/views/settings/_gitolite_config_ssh.html.erb

@@ -4,39 +4,26 @@
   gitolite_server_port     = RedmineGitolite::Config.get_setting(:gitolite_server_port)
   gitolite_ssh_private_key = RedmineGitolite::Config.get_setting(:gitolite_ssh_private_key)
   gitolite_ssh_public_key  = RedmineGitolite::Config.get_setting(:gitolite_ssh_public_key)
-  scripts_dir_writeable    = RedmineGitolite::Scripts.scripts_dir_writeable?(:reset => true)
 %>
 
 <h3><%= l(:label_gitolite_ssh_config) %></h3>
 
 <p>
   <label><%= l(:label_gitolite_user) %></label>
   <%= text_field_tag("settings[gitolite_user]", gitolite_user, :size => 60) %>
-  <% if !scripts_dir_writeable %>
-    <br /><span class="label label-warning"><%= l(:label_cannot_change_selinux) %></span>
-  <% end %>
 </p>
 
 <p>
   <label><%= l(:label_gitolite_ssh_private_key) %></label>
   <%= text_field_tag("settings[gitolite_ssh_private_key]", gitolite_ssh_private_key, :size => 110) %>
-  <% if !scripts_dir_writeable %>
-    <br /><span class="label label-warning"><%= l(:label_cannot_change_selinux) %></span>
-  <% end %>
 </p>
 
 <p>
   <label><%= l(:label_gitolite_ssh_public_key) %></label>
   <%= text_field_tag("settings[gitolite_ssh_public_key]", gitolite_ssh_public_key, :size => 110) %>
-  <% if !scripts_dir_writeable %>
-    <br /><span class="label label-warning"><%= l(:label_cannot_change_selinux) %></span>
-  <% end %>
 </p>
 
 <p>
   <label><%= l(:label_gitolite_server_port) %></label>
   <%= text_field_tag("settings[gitolite_server_port]", gitolite_server_port, :size => 5) %>
-  <% if !scripts_dir_writeable %>
-    <br /><span class="label label-warning"><%= l(:label_cannot_change_selinux) %></span>
-  <% end %>
 </p>

Diff for: app/views/settings/_gitolite_config_test.html.erb

@@ -2,14 +2,6 @@
 
 <table class="table table-hover">
 
-  <tr>
-    <td><%= l(:label_scripts_dir_writeable) %></td>
-    <td>
-      <% state = RedmineGitolite::Scripts.scripts_dir_writeable?(:reset => true) %>
-      <span class="label label-<%= state ? 'success' : 'warning' %>"><%= RedmineGitolite::Scripts.get_scripts_dir_path %></span>
-    </td>
-  </tr>
-
   <tr>
     <td><%= l(:label_temp_dir_writeable) %></td>
     <td>
@@ -18,22 +10,6 @@
     </td>
   </tr>
 
-  <tr>
-    <td><%= l(:label_git_cmd_script_installed) %></td>
-    <td>
-      <% state = RedmineGitolite::Scripts.script_is_installed?(:git_cmd) %>
-      <span class="label label-<%= state ? 'success' : 'important' %>"><%= RedmineGitolite::Scripts.git_cmd_script_path %></span>
-    </td>
-  </tr>
-
-  <tr>
-    <td><%= l(:label_shell_cmd_script_installed) %></td>
-    <td>
-      <% state = RedmineGitolite::Scripts.script_is_installed?(:shell_cmd) %>
-      <span class="label label-<%= state ? 'success' : 'important' %>"><%= RedmineGitolite::Scripts.shell_cmd_script_path %></span>
-    </td>
-  </tr>
-
   <tr>
     <td><%= l(:label_redmine_user) %></td>
     <td><span class="label label-success"><%= RedmineGitolite::Scripts.redmine_user %></span></td>
@@ -44,11 +20,6 @@
     <td><span class="label label-success"><%= RedmineGitolite::Scripts.gitolite_user %></span></td>
   </tr>
 
-  <tr>
-    <td><%= l(:label_sudo_version) %></td>
-    <td><span class="label label-success"><%= RedmineGitolite::Scripts.sudo_version_raw %></span></td>
-  </tr>
-
   <tr>
     <td><%= l(:label_sudo_gitolite_to_redmine_user) %></td>
     <td><%= image_tag (RedmineGitolite::Scripts.can_gitolite_sudo_to_redmine_user? ? 'true.png' : 'exclamation.png') %></td>

Diff for: bin/.placeholder

@@ -15,8 +15,6 @@ en:
   label_gitolite_ssh_public_key: Gitolite SSH public key
   label_gitolite_server_port: SSH local server port
 
-  label_cannot_change_selinux: Cannot change in current configuration
-
   # Gitolite Storage Config
   label_tab_storage: Storage
   label_gitolite_storage_config: Gitolite Storage Configuration

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

@@ -15,8 +15,6 @@ fr:
   label_gitolite_ssh_public_key: Clé publique SSH de Gitolite
   label_gitolite_server_port: Port du serveur SSH local
 
-  label_cannot_change_selinux: Ne peut être changé dans la configuration actuelle
-
   # Gitolite Storage Config
   label_tab_storage: Stockage
   label_gitolite_storage_config: Configuration du stockage dans Gitolite