Merge branch 'devel' into v1.0.x

redmine-git-hosting · Mar 31, 2015 · fb5578a · fb5578a
2 parents 624767d + fbd896d
commit fb5578a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/views/common/_git_urls.html.haml b/app/views/common/_git_urls.html.haml
@@ -7,7 +7,7 @@
   = javascript_include_tag 'application', plugin: 'redmine_git_hosting'
 
 - repositories = Array.wrap(repository) unless repositories
-- if repositories.map(&:available_urls).flatten.reject { |m| m.blank? }.any?
+- if repositories.map(&:available_urls).reject { |h| h.empty? }.any?
   - repositories.sort_by { |r| r.is_default ? 0 : 1 }.each do |repository|
     - next if repository.available_urls.empty?
     - present repository do |p|

diff --git a/lib/redmine_git_hosting/patches/users_controller_patch.rb b/lib/redmine_git_hosting/patches/users_controller_patch.rb
@@ -14,6 +14,7 @@ def self.included(base)
           alias_method_chain :destroy, :git_hosting
 
           helper :gitolite_public_keys
+          helper :redmine_bootstrap_kit
         end
       end
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,7 @@ def self.included(base) @@
               alias_method_chain :destroy, :git_hosting
               helper :gitolite_public_keys
+              helper :redmine_bootstrap_kit
             end
           end
@@ Expand Down @@