conflict resolving

lib/gitlab/checks/change_access.rb

@@ -87,32 +87,14 @@ module Gitlab
         Checks::MatchingMergeRequest.new(@newrev, @branch_name, @project).match?
       end
 
-      def branch_name(ref)
-        ref = @ref.to_s
-        if Gitlab::Git.branch_ref?(ref)
-          Gitlab::Git.ref_name(ref)
-        else
-          nil
-        end
-      end
-
-      def tag_name(ref)
-        ref = @ref.to_s
-        if Gitlab::Git.tag_ref?(ref)
-          Gitlab::Git.ref_name(ref)
-        else
-          nil
-        end
-      end
-
       def push_rule_check
         return unless project.push_rule && @newrev && @oldrev
 
         push_rule = project.push_rule
 
         # Prevent tag removal
-        if tag_name(@ref)
-          if push_rule.deny_delete_tag && protected_tag?(tag_name(@ref)) && Gitlab::Git.blank_ref?(@newrev)
+        if Gitlab::Git.tag_name(@ref)
+          if push_rule.deny_delete_tag && protected_tag?(Gitlab::Git.tag_name(@ref)) && Gitlab::Git.blank_ref?(@newrev)
             "You can not delete tag"
           end
         else

lib/gitlab/git_access.rb

@@ -100,8 +100,6 @@ module Gitlab
         return build_status_object(false, message)
       end
 
-      changes = changes.lines if changes.kind_of?(String)
-
       changes_list = Gitlab::ChangesList.new(changes)
 
       # Iterate over all changes to find if user allowed all of them to be applied