summaryrefslogtreecommitdiff
path: root/spec/support
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-04-28 08:34:34 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-04-28 08:34:34 +0000
commit8140c6828905345ea510b23ee09e53f01a74f97d (patch)
treefb65a901dd5b0c331e162f819fafe963dc84ab56 /spec/support
parentf0227d761fa24b7f0fdf0b5fecd6d52a6d991714 (diff)
parente3d2304d6971c42436e711ccf70b8e4d5114f887 (diff)
downloadgitlab-ce-8140c6828905345ea510b23ee09e53f01a74f97d.tar.gz
Merge branch 'rs-issue-2269' into 'master'
Remove duplicate settings for default_url_options Closes #2269 See merge request !1797
Diffstat (limited to 'spec/support')
-rw-r--r--spec/support/reference_filter_spec_helper.rb11
1 files changed, 0 insertions, 11 deletions
diff --git a/spec/support/reference_filter_spec_helper.rb b/spec/support/reference_filter_spec_helper.rb
index 41253811490..06c39e1ada5 100644
--- a/spec/support/reference_filter_spec_helper.rb
+++ b/spec/support/reference_filter_spec_helper.rb
@@ -4,17 +4,6 @@
module ReferenceFilterSpecHelper
extend ActiveSupport::Concern
- included do
- before { set_default_url_options }
- end
-
- # Allow *_url helpers to work
- def set_default_url_options
- Rails.application.routes.default_url_options = {
- host: 'example.foo'
- }
- end
-
# Shortcut to Rails' auto-generated routes helpers, to avoid including the
# module
def urls