Douwe Maan 10387f6b8a Merge branch 'master' into tmp-reference-pipeline-and-caching ...

# Conflicts:
#	spec/lib/gitlab/markdown/autolink_filter_spec.rb
#	spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/cross_project_reference_spec.rb
#	spec/lib/gitlab/markdown/emoji_filter_spec.rb
#	spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/external_link_filter_spec.rb
#	spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/label_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/redactor_filter_spec.rb
#	spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb
#	spec/lib/gitlab/markdown/relative_link_filter_spec.rb
#	spec/lib/gitlab/markdown/sanitization_filter_spec.rb
#	spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb
#	spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb
#	spec/lib/gitlab/markdown/task_list_filter_spec.rb
#	spec/lib/gitlab/markdown/upload_link_filter_spec.rb
#	spec/lib/gitlab/markdown/user_reference_filter_spec.rb

2015-12-10 14:04:34 +01:00

..

filter

Merge branch 'master' into tmp-reference-pipeline-and-caching

2015-12-10 14:04:34 +01:00

pipeline

Move CombinedPipeline methods around

2015-12-08 12:29:48 +01:00

abstract_reference_filter.rb

Expand inline docs.

2015-12-01 17:14:42 +01:00

combined_pipeline.rb

Move CombinedPipeline methods around

2015-12-08 12:29:48 +01:00

cross_project_reference.rb

Remove all permission checking from Reference filters

2015-09-01 16:58:38 -04:00

pipeline.rb

Move Markdown filters and pipelines into folders.

2015-11-19 16:18:13 +01:00

reference_filter.rb

Store the demodulized reference filter name in data attribute

2015-12-07 19:40:46 -05:00