Merge branch 'devel' into v1.0.x

Author: root

Diff for: README.md

@@ -50,6 +50,7 @@ Thanks for their contribution to :
 * Nicholas Clark
 * Robert Chady
 * Sébastien Dinot
+* wilsoc5
 * and others :)
 
 ## Contribute

Diff for: app/controllers/repository_git_extras_controller.rb

@@ -2,12 +2,12 @@ class RepositoryGitExtrasController < RedmineGitHostingController
   unloadable
 
   skip_before_filter :set_current_tab
-  before_filter      :set_git_extra
 
   helper :extend_repositories
 
 
   def update
+    @git_extra = @repository.extra
     ## Update attributes
     if @git_extra.update_attributes(params[:repository_git_extra])
       flash.now[:notice] = l(:notice_gitolite_extra_updated)
@@ -17,12 +17,4 @@ def update
     end
   end
 
-
-  private
-
-
-    def set_git_extra
-      @git_extra = @repository.extra
-    end
-
 end

Diff for: app/controllers/repository_protected_branches_controller.rb

@@ -52,7 +52,7 @@ def clone
 
   def sort
     params[:repository_protected_branche].each_with_index do |id, index|
-      @repository.protected_branches.update_all({position: index + 1}, {id: id})
+      @repository.protected_branches.where(:id => id).update_all({:position => index + 1})
     end
     # Update Gitolite repository
     call_use_case

Diff for: app/models/repository_protected_branche.rb

@@ -14,7 +14,7 @@ class RepositoryProtectedBranche < ActiveRecord::Base
 
   ## Validations
   validates :repository_id, presence: true
-  validates :path,          presence: true, uniqueness: { scope: :permissions }
+  validates :path,          presence: true, uniqueness: { scope: [:permissions, :repository_id] }
   validates :permissions,   presence: true, inclusion: { in: VALID_PERMS }
   validates :user_list,     presence: true
 

Diff for: app/views/common/_git_urls.html.haml

@@ -19,4 +19,4 @@
   #git_url_box= l(:label_repository_access_not_configured)
 
 :javascript
-  $(document).ready(function() { setFirstGitUrl('.git_url_list'); bindGitUrls('.git_url'); });
+  $(document).ready(function() { setGitUrls('.git_url'); });

Diff for: app/views/repositories/git_instructions.html.haml

@@ -55,22 +55,4 @@
       = render 'common/git_urls', repository: @repository
 
 :javascript
-  $(document).ready(function() {
-    var key = $('.git_url_list li').first().attr('id');
-    var access = access_list[key];
-
-    $('.git_url_access').html(access.url);
-
-    $('.git_url_list li').on('click', function(){
-      var key  = $(this).attr('id');
-      var access = access_list[key];
-
-      $('.git_url_access').html(access.url);
-
-      if (access.committer == true) {
-        $('#repository_setup').show();
-      } else {
-        $('#repository_setup').hide();
-      }
-    });
-  });
+  $(document).ready(function() { setGitUrlsInstructions('.git_url'); });

Diff for: app/views/repository_git_notifications/show.html.haml

@@ -24,7 +24,7 @@
 
     %div{ style: 'display:block;height:10px;clear:both;' }
 
-    %table{ class: 'list git_mailing_list' }
+    %table{ class: 'table table-hover' }
       %thead
         %tr
           %th= l(:label_git_notification_default_list)
@@ -36,31 +36,34 @@
         %tr
           %td
             - if @repository.default_list.any?
-              %ul
+              %ul{ class: 'list-unstyled' }
                 - @repository.default_list.each do |item|
                   %li= item
 
           %td
             - if !@git_notification.nil? && @git_notification.include_list.any?
-              %ul
+              %ul{ class: 'list-unstyled' }
                 - @git_notification.include_list.sort.each do |item|
                   %li= item
 
           %td
             - if !@git_notification.nil? && @git_notification.exclude_list.any?
-              %ul
+              %ul{ class: 'list-unstyled' }
                 - @git_notification.exclude_list.sort.each do |item|
                   %li= item
 
           %td
             - if @repository.mail_mapping.any?
-              %ul
+              %ul{ class: 'list-unstyled' }
                 - @repository.mail_mapping.each do |item, from|
                   %li
                     = item
                     (
                     = from
                     )
 
+  - if [email protected]_notification_enabled?
+    %em= l(:git_notifications_reminder)
+
 :javascript
   $(document).ready(function() { initModalBoxes(modals); });

Diff for: app/views/repository_protected_branches/index.html.haml

@@ -7,7 +7,10 @@
 
   - if @repository_protected_branches.any?
 
-    %table{ class: 'table table-hover', id: 'protected_branches', data: { 'update-url' => sort_repository_protected_branches_url } }
+    %table{ class: 'table table-hover',
+            id: 'protected_branches',
+            data: { 'update-url' => sort_repository_protected_branches_url },
+            style: "opacity: #{@repository.protected_branches_enabled? ? '1' : '0.5'};" }
       %thead
         %tr
           %th
@@ -39,6 +42,9 @@
                 = link_to l(:button_clone), clone_repository_protected_branch_path(@repository, protected_branch), class: 'icon icon-clone modal-box'
                 = link_to l(:button_delete), repository_protected_branch_path(@repository, protected_branch), remote: true, method: :delete, confirm: l(:text_are_you_sure), class: 'icon icon-del'
 
+    - if [email protected]_branches_enabled?
+      %em= l(:protected_branches_reminder)
+
   - else
     %p{ class: 'nodata' }= l(:label_no_data)
 

Diff for: assets/javascripts/application.js

@@ -37,6 +37,7 @@ function trigger_mode_change(element) {
   }
 }
 
+// GIT URLS
 function updateUrl(element) {
   var url = $(element).data('url');
   var target = $(element).data('target');
@@ -47,21 +48,41 @@ function updateUrl(element) {
   $(element).addClass('selected');
 }
 
-function setFirstGitUrl(elements) {
+function setGitUrls(elements) {
   $(elements).each(function(index, element){
-    var first_url = $(element).children().first();
-    updateUrl(first_url);
+    if (index == 0){
+      updateUrl(element);
+    };
+    $(element).on('click', function(){
+      updateUrl($(this));
+    });
   });
 }
 
-function bindGitUrls(elements) {
+// GIT INSTRUCTIONS
+function updateInstructionUrl(element) {
+  var url = $(element).data('url');
+  var committer = $(element).data('committer');
+  $('.git_url_access').html(url);
+  if (committer == 'RW') {
+    $('#repository_setup').show();
+  } else {
+    $('#repository_setup').hide();
+  }
+}
+
+function setGitUrlsInstructions(elements) {
   $(elements).each(function(index, element){
+    if (index == 0){
+      updateInstructionUrl(element);
+    };
     $(element).on('click', function(){
-      updateUrl($(this));
+      updateInstructionUrl($(this));
     });
   });
 }
 
+// REPOSITORY EDIT
 function setRepositoryActiveTab(current_tab) {
   var all_tabs = $("#repository-tabs li");
   var active_tab = '';

Diff for: assets/stylesheets/application.css

@@ -9,12 +9,6 @@ PLUGIN ICONS
 .icon-git { padding-right: 15px; }
 .icon-git-disabled { opacity: 0.5; }
 
-table.git_mailing_list { width: 100%; margin-top: 15px; }
-table.git_mailing_list th { width: 25%; }
-table.git_mailing_list td { text-align: center; }
-table.git_mailing_list td ul { padding-left: 0px; list-style-type: none; }
-
-
 /*
 PLUGIN SETTINGS
 */

Diff for: config/locales/models/repository_git_notification/en.yml

@@ -24,6 +24,8 @@ en:
   label_gitolite_notify_prefix: Mailing list prefix
   label_gitolite_notify_sender_address: Mailing list sender address
 
+  git_notifications_reminder: The mailing list above is not enabled. Please enable Mailing List in the repository settings above.
+
   activerecord:
     errors:
       models:

Diff for: config/locales/models/repository_git_notification/fr.yml

@@ -24,6 +24,8 @@ fr:
   label_gitolite_notify_prefix: Préfixe de la liste de diffusion
   label_gitolite_notify_sender_address: Adresse de l'expéditeur de la liste de diffusion
 
+  git_notifications_reminder: La liste de diffusion n'est pas activée. Pour l'activer veuillez d'abord cocher la case "Activer la liste de diffusion" dans les paramètres du dépôt ci-dessus.
+
   activerecord:
     errors:
       models:

Diff for: config/locales/models/repository_protected_branche/en.yml

@@ -17,3 +17,5 @@ en:
 
   label_branch_path: Branch path
   label_user_list: Users allowed
+
+  protected_branches_reminder: The protected branches above are not enabled. Please enable Protected Branches in the repository settings above.

Diff for: config/locales/models/repository_protected_branche/fr.yml

@@ -17,3 +17,5 @@ fr:
 
   label_branch_path: Chemin de la branche
   label_user_list: Liste des utilisateurs autorisés
+
+  protected_branches_reminder: Les branches protégées ci-dessus ne sont pas actives. Pour les activer veuillez d'abord cocher la case "Activer les branches protégées" dans les paramètres du dépôt ci-dessus.

Diff for: spec/models/repository_git_extra_spec.rb

@@ -13,8 +13,11 @@
     it { should allow_mass_assignment_of(:git_http) }
     it { should allow_mass_assignment_of(:git_daemon) }
     it { should allow_mass_assignment_of(:git_notify) }
+    it { should allow_mass_assignment_of(:git_annex) }
     it { should allow_mass_assignment_of(:default_branch) }
     it { should allow_mass_assignment_of(:protected_branch) }
+    it { should allow_mass_assignment_of(:public_repo) }
+    it { should allow_mass_assignment_of(:key) }
 
     ## Relations
     it { should belong_to(:repository) }

Diff for: spec/models/repository_protected_branche_spec.rb

@@ -31,6 +31,8 @@ def build_protected_branch(opts = {})
     it { should validate_presence_of(:permissions) }
     it { should validate_presence_of(:user_list) }
 
+    it { should validate_uniqueness_of(:path).scoped_to([:permissions, :repository_id]) }
+
     it { should validate_inclusion_of(:permissions).in_array(%w(RW RW+)) }
 
     ## Serializations