summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-08 12:29:48 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-08 12:29:48 +0100
commit13f44822d97e643b55047cf619f7bb1f354f165b (patch)
tree0393150758cdf3a9e7c560caae1163257ba13c1c /lib
parent611912fe6870cac43fef9eea389f1229945f186a (diff)
downloadgitlab-ce-13f44822d97e643b55047cf619f7bb1f354f165b.tar.gz
Move CombinedPipeline methods around
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/markdown/combined_pipeline.rb12
-rw-r--r--lib/gitlab/markdown/pipeline/full_pipeline.rb2
2 files changed, 8 insertions, 6 deletions
diff --git a/lib/gitlab/markdown/combined_pipeline.rb b/lib/gitlab/markdown/combined_pipeline.rb
index a3d717550f5..6b08a5e9f72 100644
--- a/lib/gitlab/markdown/combined_pipeline.rb
+++ b/lib/gitlab/markdown/combined_pipeline.rb
@@ -7,16 +7,18 @@ module Gitlab
Class.new(Pipeline) do
const_set :PIPELINES, pipelines
+ def self.pipelines
+ self::PIPELINES
+ end
+
def self.filters
pipelines.flat_map(&:filters)
end
def self.transform_context(context)
- pipelines.reduce(context) { |context, pipeline| pipeline.transform_context(context) }
- end
-
- def self.pipelines
- self::PIPELINES
+ pipelines.reduce(context) do |context, pipeline|
+ pipeline.transform_context(context)
+ end
end
end
end
diff --git a/lib/gitlab/markdown/pipeline/full_pipeline.rb b/lib/gitlab/markdown/pipeline/full_pipeline.rb
index 553e9367c1c..b3b7a3c27c0 100644
--- a/lib/gitlab/markdown/pipeline/full_pipeline.rb
+++ b/lib/gitlab/markdown/pipeline/full_pipeline.rb
@@ -3,7 +3,7 @@ require 'gitlab/markdown'
module Gitlab
module Markdown
class FullPipeline < CombinedPipeline.new(PlainMarkdownPipeline, GfmPipeline)
-
+
end
end
end