Fix regexpread-template-from-repository

1 files changed, 2 insertions, 2 deletions

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 961bf6a0324..f778af1b188 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -379,7 +379,7 @@ class Repository
     cache.fetch(:issue_template) do
       [nil, '.gitlab', '.github'].each do |path|
         tree(:head, path).blobs.find do |file|
-          file.name =~ /\Aissue_template(?\.txt)(?\.md)\z/i
+          file.name =~ /\Aissue_template(\.txt|\.md)?\z/i
         end
       end
     end
@@ -389,7 +389,7 @@ class Repository
     cache.fetch(:merge_request_template) do
       [nil, '.gitlab', '.github'].each do |path|
         tree(:head, path).blobs.find do |file|
-          file.name =~ /\Amerge_request_template(?\.txt)(?\.md)\z/i
+          file.name =~ /\Amerge_request_template(\.txt|\.md)?\z/i
         end
       end
     end