Merge branch 'rs-issue-2266' into 'master'

config/initializers/8_default_url_options.rb

+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

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,

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