Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-03-30 11:42:39 +0300
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-03-30 11:44:18 +0300
commite64b1e52a23016e51d581b87c08beaa4b18da689 (patch)
treeb8ed9edcd20d02d03017661e553645aea27f88e7 /lib
parentd08de5ed0e894b4d201a7737db630667b9760a35 (diff)
Check if GFM rewriters need rewrite internally
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/gfm/reference_rewriter.rb2
-rw-r--r--lib/gitlab/gfm/uploads_rewriter.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/gfm/reference_rewriter.rb b/lib/gitlab/gfm/reference_rewriter.rb
index 5f906d07177..47e1aa67976 100644
--- a/lib/gitlab/gfm/reference_rewriter.rb
+++ b/lib/gitlab/gfm/reference_rewriter.rb
@@ -38,6 +38,8 @@ module Gitlab
end
def rewrite(target_project)
+ return @text unless needs_rewrite?
+
@text.gsub(@pattern) do |reference|
unfold_reference(reference, Regexp.last_match, target_project)
end
diff --git a/lib/gitlab/gfm/uploads_rewriter.rb b/lib/gitlab/gfm/uploads_rewriter.rb
index 5818766c974..bdf054a6192 100644
--- a/lib/gitlab/gfm/uploads_rewriter.rb
+++ b/lib/gitlab/gfm/uploads_rewriter.rb
@@ -15,7 +15,7 @@ module Gitlab
end
def rewrite(target_project)
- return unless @text
+ return @text unless needs_rewrite?
new_uploader = file_uploader(target_project)
@text.gsub(@pattern) do |markdown|