fix broken specs

3 files changed, 3 insertions, 3 deletions

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 5ff85ad7a1d..faa0968fc74 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -284,7 +284,7 @@ class MergeRequest < ActiveRecord::Base
     end
   end
 
-  def valid?
+  def is_valid?
     !(target_project.above_size_limit? || target_project.blank? || source_branch.blank?)
   end
 
diff --git a/app/models/project.rb b/app/models/project.rb
index 41122caf4ae..05d4132b100 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1292,7 +1292,7 @@ class Project < ActiveRecord::Base
   end
 
   def size_to_remove
-    return repository_size - current_application_settings.repository_size_limit
+    repository_size - current_application_settings.repository_size_limit
   end
 
   private
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb
index 3666e23f9fa..67327e297a6 100644
--- a/app/services/merge_requests/build_service.rb
+++ b/app/services/merge_requests/build_service.rb
@@ -29,7 +29,7 @@ module MergeRequests
         merge_request.errors.add(:base, message) unless message.nil?
       end
 
-      return build_failed(merge_request) unless merge_request.valid?
+      return build_failed(merge_request) unless merge_request.is_valid?
 
       compare = CompareService.new.execute(
         merge_request.source_project,