From 8cceeb8b640a6b9a7f91923f1228a3282fadcde1 Mon Sep 17 00:00:00 2001
From: "Luke \"Jared\" Bennett" <lbennett@gitlab.com>
Date: Tue, 18 Jul 2017 10:54:38 +0100
Subject: [PATCH] Restore file_spec and parser_spec file conflict markers

---
 spec/lib/gitlab/conflict/file_spec.rb   | 19 +++++++++++++++++++
 spec/lib/gitlab/conflict/parser_spec.rb | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/spec/lib/gitlab/conflict/file_spec.rb b/spec/lib/gitlab/conflict/file_spec.rb
index 058aa83be0c..585eeb77bd5 100644
--- a/spec/lib/gitlab/conflict/file_spec.rb
+++ b/spec/lib/gitlab/conflict/file_spec.rb
@@ -151,12 +151,21 @@ describe Gitlab::Conflict::File, lib: true do
     default_regexp
   end
 
+<<<<<<< files/ruby/regex.rb
 def project_name_regexp
   /\A[a-zA-Z0-9][a-zA-Z0-9_\-\. ]*\z/
 end
 
 def name_regexp
   /\A[a-zA-Z0-9_\-\. ]*\z/
+=======
+def project_name_regex
+  %r{\A[a-zA-Z0-9][a-zA-Z0-9_\-\. ]*\z}
+end
+
+def name_regex
+  %r{\A[a-zA-Z0-9_\-\. ]*\z}
+>>>>>>> files/ruby/regex.rb
 end
 
 # Some extra lines
@@ -167,8 +176,13 @@ def path_regexp
   default_regexp
 end
 
+<<<<<<< files/ruby/regex.rb
 def archive_formats_regexp
   /(zip|tar|7z|tar\.gz|tgz|gz|tar\.bz2|tbz|tbz2|tb2|bz2)/
+=======
+def archive_formats_regex
+  %r{(zip|tar|7z|tar\.gz|tgz|gz|tar\.bz2|tbz|tbz2|tb2|bz2)}
+>>>>>>> files/ruby/regex.rb
 end
 
 def git_reference_regexp
@@ -195,8 +209,13 @@ end
 
 protected
 
+<<<<<<< files/ruby/regex.rb
 def default_regexp
   /\A[.?]?[a-zA-Z0-9][a-zA-Z0-9_\-\.]*(?<!\.git)\z/
+=======
+def default_regex
+  %r{\A[.?]?[a-zA-Z0-9][a-zA-Z0-9_\-\.]*(?<!\.git)\z}
+>>>>>>> files/ruby/regex.rb
 end
 FILE
       end
diff --git a/spec/lib/gitlab/conflict/parser_spec.rb b/spec/lib/gitlab/conflict/parser_spec.rb
index 53c6fcd17f4..aed57b75789 100644
--- a/spec/lib/gitlab/conflict/parser_spec.rb
+++ b/spec/lib/gitlab/conflict/parser_spec.rb
@@ -19,20 +19,34 @@ module Gitlab
       default_regexp
     end
 
+<<<<<<< files/ruby/regex.rb
     def project_name_regexp
       /\A[a-zA-Z0-9][a-zA-Z0-9_\-\. ]*\z/
     end
 
     def name_regexp
       /\A[a-zA-Z0-9_\-\. ]*\z/
+=======
+    def project_name_regex
+      %r{\A[a-zA-Z0-9][a-zA-Z0-9_\-\. ]*\z}
+    end
+
+    def name_regex
+      %r{\A[a-zA-Z0-9_\-\. ]*\z}
+>>>>>>> files/ruby/regex.rb
     end
 
     def path_regexp
       default_regexp
     end
 
+<<<<<<< files/ruby/regex.rb
     def archive_formats_regexp
       /(zip|tar|7z|tar\.gz|tgz|gz|tar\.bz2|tbz|tbz2|tb2|bz2)/
+=======
+    def archive_formats_regex
+      %r{(zip|tar|7z|tar\.gz|tgz|gz|tar\.bz2|tbz|tbz2|tb2|bz2)}
+>>>>>>> files/ruby/regex.rb
     end
 
     def git_reference_regexp
@@ -59,8 +73,13 @@ module Gitlab
 
     protected
 
+<<<<<<< files/ruby/regex.rb
     def default_regexp
       /\A[.?]?[a-zA-Z0-9][a-zA-Z0-9_\-\.]*(?<!\.git)\z/
+=======
+    def default_regex
+      %r{\A[.?]?[a-zA-Z0-9][a-zA-Z0-9_\-\.]*(?<!\.git)\z}
+>>>>>>> files/ruby/regex.rb
     end
   end
 end