diff options
| -rw-r--r-- | config/initializers/8_default_url_options.rb | 13 | ||||
| -rw-r--r-- | lib/gitlab/markdown.rb | 17 | ||||
| -rw-r--r-- | lib/gitlab/markdown/cross_project_reference.rb | 2 |
3 files changed, 28 insertions, 4 deletions
diff --git a/config/initializers/8_default_url_options.rb b/config/initializers/8_default_url_options.rb new file mode 100644 index 00000000000..8c1b56846d2 --- /dev/null +++ b/config/initializers/8_default_url_options.rb @@ -0,0 +1,13 @@ +unless Rails.env.test? + default_url_options = { + host: Gitlab.config.gitlab.host, + protocol: Gitlab.config.gitlab.protocol, + script_name: Gitlab.config.gitlab.relative_url_root + } + + unless Gitlab.config.gitlab_on_standard_port? + default_url_options[:port] = Gitlab.config.gitlab.port + end + + Rails.application.routes.default_url_options = default_url_options +end diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb index 37b250d353e..44779d7fdd8 100644 --- a/lib/gitlab/markdown.rb +++ b/lib/gitlab/markdown.rb @@ -29,6 +29,17 @@ module Gitlab # >> gfm(":trollface:") # => "<img alt=\":trollface:\" class=\"emoji\" src=\"/images/trollface.png" title=\":trollface:\" /> module Markdown + # Provide autoload paths for filters to prevent a circular dependency error + autoload :CommitRangeReferenceFilter, 'gitlab/markdown/commit_range_reference_filter' + autoload :CommitReferenceFilter, 'gitlab/markdown/commit_reference_filter' + autoload :EmojiFilter, 'gitlab/markdown/emoji_filter' + autoload :ExternalIssueReferenceFilter, 'gitlab/markdown/external_issue_reference_filter' + autoload :IssueReferenceFilter, 'gitlab/markdown/issue_reference_filter' + autoload :LabelReferenceFilter, 'gitlab/markdown/label_reference_filter' + autoload :MergeRequestReferenceFilter, 'gitlab/markdown/merge_request_reference_filter' + autoload :SnippetReferenceFilter, 'gitlab/markdown/snippet_reference_filter' + autoload :UserReferenceFilter, 'gitlab/markdown/user_reference_filter' + # Public: Parse the provided text with GitLab-Flavored Markdown # # text - the source text @@ -64,11 +75,11 @@ module Gitlab context = { # SanitizationFilter - whitelist: sanitization_whitelist, + whitelist: sanitization_whitelist, # EmojiFilter - asset_root: Gitlab.config.gitlab.url, - asset_host: Gitlab::Application.config.asset_host, + asset_root: Gitlab.config.gitlab.url, + asset_host: Gitlab::Application.config.asset_host, # ReferenceFilter current_user: current_user, diff --git a/lib/gitlab/markdown/cross_project_reference.rb b/lib/gitlab/markdown/cross_project_reference.rb index 887c205cdc9..c436fabd658 100644 --- a/lib/gitlab/markdown/cross_project_reference.rb +++ b/lib/gitlab/markdown/cross_project_reference.rb @@ -20,7 +20,7 @@ module Gitlab other = Project.find_with_namespace(ref) return nil unless other && user_can_reference_project?(other) - + other end |