Don't override existing method (default_branch)

Author: root

Diff for: app/models/concerns/gitolitable_features.rb

@@ -13,7 +13,7 @@ def extra_report_last_commit
   end
 
 
-  def default_branch
+  def git_default_branch
     extra[:default_branch]
   end
 

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

@@ -19,7 +19,7 @@
           %td= link_to h(repository.url), {controller: 'repositories', action: 'show', id: @project, repository_id: repository.identifier_param}
           %td
             - if repository.is_a?(Repository::Xitolite)
-              %span{ class: 'label label-info' }= repository.default_branch
+              %span{ class: 'label label-info' }= repository.git_default_branch
             - else
               -
           %td{ align: 'center' }

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

@@ -38,7 +38,7 @@
                 - if !repository.branches.empty?
                   = f.select :default_branch, repository_branches_list(repository.branches)
                 - else
-                  %span{ class: 'label label-info' }= repository.default_branch
+                  %span{ class: 'label label-info' }= repository.git_default_branch
 
           .col-md-6
 

Diff for: lib/redmine_git_hosting/plugins/extenders/base_extender.rb

@@ -5,7 +5,7 @@ class BaseExtender < RedmineGitHosting::Plugins::GitolitePlugin
     attr_reader :recovered
     attr_reader :gitolite_repo_name
     attr_reader :gitolite_repo_path
-    attr_reader :default_branch
+    attr_reader :git_default_branch
     attr_reader :options
 
 
@@ -14,7 +14,7 @@ def initialize(repository, options = {})
       @recovered          = options.delete(:recovered){ false }
       @gitolite_repo_name = repository.gitolite_repository_name
       @gitolite_repo_path = repository.gitolite_repository_path
-      @default_branch     = repository.default_branch
+      @git_default_branch = repository.git_default_branch
       @options            = options
     end
 

Diff for: lib/redmine_git_hosting/plugins/extenders/branch_updater.rb

@@ -37,7 +37,7 @@ def do_update_default_branch
 
 
       def new_default_branch
-        "refs/heads/#{default_branch}"
+        "refs/heads/#{git_default_branch}"
       end
 
   end

Diff for: lib/redmine_git_hosting/plugins/extenders/readme_creator.rb

@@ -93,7 +93,7 @@ def push_commit(repo)
 
 
       def remote_branch
-        "refs/heads/#{default_branch}"
+        "refs/heads/#{git_default_branch}"
       end