Merge branch 'devel' into feat_protected_branches

Conflicts:
	lib/redmine_git_hosting/patches/repository_git_patch.rb

Author: root

Diff for: app/controllers/gitolite_public_keys_controller.rb

@@ -123,8 +123,8 @@ def suggested_title
     default_title = "#{@project.name} Deploy Key"
 
     # Find number of keys or max default deploy key that matches
-    maxnum = @repository.repository_deployment_credentials.map(&:gitolite_public_key).uniq.count
-    @repository.repository_deployment_credentials.each do |credential|
+    maxnum = @repository.deployment_credentials.map(&:gitolite_public_key).uniq.count
+    @repository.deployment_credentials.each do |credential|
       if matches = credential.gitolite_public_key.title.match(/#{default_title} (\d+)$/)
         maxnum = [maxnum, matches[1].to_i].max
       end

Diff for: app/controllers/repository_deployment_credentials_controller.rb

@@ -142,7 +142,7 @@ def find_key
   def find_all_keys
     # display create_with_key view.  Find preexisting keys to offer to user
     @user_keys = GitolitePublicKey.by_user(User.current).deploy_key.active.order('title ASC')
-    @disabled_keys = @repository.repository_deployment_credentials.active.map(&:gitolite_public_key)
+    @disabled_keys = @repository.deployment_credentials.active.map(&:gitolite_public_key)
 
     @other_keys = []
     if User.current.admin?

Diff for: app/helpers/git_hosting_helper.rb

@@ -99,17 +99,17 @@ def render_feature(repository, feature)
       when :repository_deployment_credentials
         label = l(:label_deployment_credentials)
         css_class << ' icon-deployment-credentials'
-        enabled = repository.repository_deployment_credentials.active.any?
+        enabled = repository.deployment_credentials.active.any?
 
       when :repository_post_receive_urls
         label = l(:label_post_receive_urls)
         css_class << ' icon-post-receive-urls'
-        enabled = repository.repository_post_receive_urls.active.any?
+        enabled = repository.post_receive_urls.active.any?
 
       when :repository_mirrors
         label = l(:label_repository_mirrors)
         css_class << ' icon-mirrors'
-        enabled = repository.repository_mirrors.active.any?
+        enabled = repository.mirrors.active.any?
 
       when :git_daemon
         label = l(:label_git_daemon)

Diff for: app/services/hooks/git_mirrors.rb

@@ -27,12 +27,12 @@ def call_mirrors
       y = ""
 
       ## Push to each mirror
-      if @repository.repository_mirrors.active.any?
+      if @repository.mirrors.active.any?
 
         logger.info { "Notifying mirrors about changes to this repository :" }
         y << "\nNotifying mirrors about changes to this repository :\n"
 
-        @repository.repository_mirrors.active.each do |mirror|
+        @repository.mirrors.active.each do |mirror|
           if mirror.needs_push(@payload)
             logger.info { "Pushing changes to #{mirror.url} ... " }
             y << "  - Pushing changes to #{mirror.url} ... "

Diff for: app/services/hooks/webservices.rb

@@ -29,12 +29,12 @@ def call_webservices
       y = ""
 
       ## Post to each post-receive URL
-      if @repository.repository_post_receive_urls.active.any?
+      if @repository.post_receive_urls.active.any?
 
         logger.info { "Notifying post receive urls about changes to this repository :" }
         y << "\nNotifying post receive urls about changes to this repository :\n"
 
-        @repository.repository_post_receive_urls.active.each do |post_receive_url|
+        @repository.post_receive_urls.active.each do |post_receive_url|
           if payloads = post_receive_url.needs_push(@payload)
 
             method = (post_receive_url.mode == :github) ? :post : :get

Diff for: lib/redmine_git_hosting/patches/repository_git_patch.rb

@@ -11,11 +11,11 @@ def self.included(base)
           has_one  :git_extra,        :foreign_key => 'repository_id', :class_name => 'RepositoryGitExtra', :dependent => :destroy
           has_one  :git_notification, :foreign_key => 'repository_id', :class_name => 'RepositoryGitNotification', :dependent => :destroy
 
-          has_many :repository_mirrors,                :dependent => :destroy, :foreign_key => 'repository_id'
-          has_many :repository_post_receive_urls,      :dependent => :destroy, :foreign_key => 'repository_id'
-          has_many :repository_deployment_credentials, :dependent => :destroy, :foreign_key => 'repository_id'
-          has_many :repository_git_config_keys,        :dependent => :destroy, :foreign_key => 'repository_id'
-          has_many :repository_protected_branches,     :dependent => :destroy, :foreign_key => 'repository_id'
+          has_many :mirrors,                :dependent => :destroy, :foreign_key => 'repository_id', :class_name => 'RepositoryMirror'
+          has_many :post_receive_urls,      :dependent => :destroy, :foreign_key => 'repository_id', :class_name => 'RepositoryPostReceiveUrl'
+          has_many :deployment_credentials, :dependent => :destroy, :foreign_key => 'repository_id', :class_name => 'RepositoryDeploymentCredential'
+          has_many :git_config_keys,        :dependent => :destroy, :foreign_key => 'repository_id', :class_name => 'RepositoryGitConfigKey'
+          has_many :protected_branches,     :dependent => :destroy, :foreign_key => 'repository_id', :class_name => 'RepositoryProtectedBranche'
 
           alias_method_chain :report_last_commit,       :git_hosting
           alias_method_chain :extra_report_last_commit, :git_hosting

Diff for: lib/redmine_gitolite/gitolite_wrapper/repositories_helper.rb

@@ -112,8 +112,8 @@ def do_update_repository(repository, old_permissions)
           end
 
           # Set Git config keys
-          if repository.repository_git_config_keys.any?
-            repository.repository_git_config_keys.each do |git_config_key|
+          if repository.git_config_keys.any?
+            repository.git_config_keys.each do |git_config_key|
               repo_conf.set_git_config(git_config_key.key, git_config_key.value)
             end
           end
@@ -228,7 +228,7 @@ def build_permissions(repository)
           read   = read_users.map{|user| user.gitolite_identifier}
 
           ## DEPLOY KEY
-          repository.repository_deployment_credentials.active.each do |cred|
+          repository.deployment_credentials.active.each do |cred|
             if cred.perm == "RW+"
               rewind << cred.gitolite_public_key.owner
             elsif cred.perm == "R"