From 1c0def2a769befa3f0e3c8654e723645b8625117 Mon Sep 17 00:00:00 2001
From: Maxim Rydkin <maks.rydkin@gmail.com>
Date: Thu, 24 Aug 2017 20:03:50 +0300
Subject: [PATCH] replace `is_default_branch?` with `default_branch?`

---
 app/services/git_push_service.rb       | 10 +++++-----
 spec/services/git_push_service_spec.rb |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index e81a56672e2..bb61136e33b 100644
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -30,7 +30,7 @@ class GitPushService < BaseService
       @project.repository.after_create_branch
 
       # Re-find the pushed commits.
-      if is_default_branch?
+      if default_branch?
         # Initial push to the default branch. Take the full history of that branch as "newly pushed".
         process_default_branch
       else
@@ -50,7 +50,7 @@ class GitPushService < BaseService
 
       # Update the bare repositories info/attributes file using the contents of the default branches
       # .gitattributes file
-      update_gitattributes if is_default_branch?
+      update_gitattributes if default_branch?
     end
 
     execute_related_hooks
@@ -66,7 +66,7 @@ class GitPushService < BaseService
   end
 
   def update_caches
-    if is_default_branch?
+    if default_branch?
       if push_to_new_branch?
         # If this is the initial push into the default branch, the file type caches
         # will already be reset as a result of `Project#change_head`.
@@ -108,7 +108,7 @@ class GitPushService < BaseService
 
   # Schedules processing of commit messages.
   def process_commit_messages
-    default = is_default_branch?
+    default = default_branch?
 
     @push_commits.last(PROCESS_COMMIT_LIMIT).each do |commit|
       if commit.matches_cross_reference_regex?
@@ -202,7 +202,7 @@ class GitPushService < BaseService
     Gitlab::Git.branch_ref?(params[:ref])
   end
 
-  def is_default_branch?
+  def default_branch?
     Gitlab::Git.branch_ref?(params[:ref]) &&
       (Gitlab::Git.ref_name(params[:ref]) == project.default_branch || project.default_branch.nil?)
   end
diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb
index e3c1bdce300..cc3d4e7da49 100644
--- a/spec/services/git_push_service_spec.rb
+++ b/spec/services/git_push_service_spec.rb
@@ -617,7 +617,7 @@ describe GitPushService, services: true do
 
     context 'on the default branch' do
       before do
-        allow(service).to receive(:is_default_branch?).and_return(true)
+        allow(service).to receive(:default_branch?).and_return(true)
       end
 
       it 'flushes the caches of any special files that have been changed' do
@@ -638,7 +638,7 @@ describe GitPushService, services: true do
 
     context 'on a non-default branch' do
       before do
-        allow(service).to receive(:is_default_branch?).and_return(false)
+        allow(service).to receive(:default_branch?).and_return(false)
       end
 
       it 'does not flush any conditional caches' do