Merge branch 'rs-issue-2269' into 'master'
Remove duplicate settings for default_url_options Closes #2269 See merge request !1797
This commit is contained in:
commit
8140c68289
6 changed files with 10 additions and 52 deletions
|
@ -182,18 +182,6 @@ class ApplicationController < ActionController::Base
|
||||||
response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
|
response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
|
||||||
end
|
end
|
||||||
|
|
||||||
def default_url_options
|
|
||||||
if !Rails.env.test?
|
|
||||||
port = Gitlab.config.gitlab.port unless Gitlab.config.gitlab_on_standard_port?
|
|
||||||
{ host: Gitlab.config.gitlab.host,
|
|
||||||
protocol: Gitlab.config.gitlab.protocol,
|
|
||||||
port: port,
|
|
||||||
script_name: Gitlab.config.gitlab.relative_url_root }
|
|
||||||
else
|
|
||||||
super
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def default_headers
|
def default_headers
|
||||||
headers['X-Frame-Options'] = 'DENY'
|
headers['X-Frame-Options'] = 'DENY'
|
||||||
headers['X-XSS-Protection'] = '1; mode=block'
|
headers['X-XSS-Protection'] = '1; mode=block'
|
||||||
|
|
|
@ -16,11 +16,6 @@ class Notify < ActionMailer::Base
|
||||||
attr_accessor :current_user
|
attr_accessor :current_user
|
||||||
helper_method :current_user, :can?
|
helper_method :current_user, :can?
|
||||||
|
|
||||||
default_url_options[:host] = Gitlab.config.gitlab.host
|
|
||||||
default_url_options[:protocol] = Gitlab.config.gitlab.protocol
|
|
||||||
default_url_options[:port] = Gitlab.config.gitlab.port unless Gitlab.config.gitlab_on_standard_port?
|
|
||||||
default_url_options[:script_name] = Gitlab.config.gitlab.relative_url_root
|
|
||||||
|
|
||||||
default from: Proc.new { default_sender_address.format }
|
default from: Proc.new { default_sender_address.format }
|
||||||
default reply_to: Gitlab.config.gitlab.email_reply_to
|
default reply_to: Gitlab.config.gitlab.email_reply_to
|
||||||
|
|
||||||
|
@ -69,7 +64,7 @@ class Notify < ActionMailer::Base
|
||||||
# Only the displayed name changes; the actual email address is always the same.
|
# Only the displayed name changes; the actual email address is always the same.
|
||||||
def sender(sender_id, send_from_user_email = false)
|
def sender(sender_id, send_from_user_email = false)
|
||||||
return unless sender = User.find(sender_id)
|
return unless sender = User.find(sender_id)
|
||||||
|
|
||||||
address = default_sender_address
|
address = default_sender_address
|
||||||
address.display_name = sender.name
|
address.display_name = sender.name
|
||||||
|
|
||||||
|
|
|
@ -21,11 +21,6 @@
|
||||||
class GitlabIssueTrackerService < IssueTrackerService
|
class GitlabIssueTrackerService < IssueTrackerService
|
||||||
include Rails.application.routes.url_helpers
|
include Rails.application.routes.url_helpers
|
||||||
|
|
||||||
default_url_options[:host] = Gitlab.config.gitlab.host
|
|
||||||
default_url_options[:protocol] = Gitlab.config.gitlab.protocol
|
|
||||||
default_url_options[:port] = Gitlab.config.gitlab.port unless Gitlab.config.gitlab_on_standard_port?
|
|
||||||
default_url_options[:script_name] = Gitlab.config.gitlab.relative_url_root
|
|
||||||
|
|
||||||
prop_accessor :title, :description, :project_url, :issues_url, :new_issue_url
|
prop_accessor :title, :description, :project_url, :issues_url, :new_issue_url
|
||||||
|
|
||||||
def default?
|
def default?
|
||||||
|
|
|
@ -1,13 +1,11 @@
|
||||||
unless Rails.env.test?
|
default_url_options = {
|
||||||
default_url_options = {
|
host: Gitlab.config.gitlab.host,
|
||||||
host: Gitlab.config.gitlab.host,
|
protocol: Gitlab.config.gitlab.protocol,
|
||||||
protocol: Gitlab.config.gitlab.protocol,
|
script_name: Gitlab.config.gitlab.relative_url_root
|
||||||
script_name: Gitlab.config.gitlab.relative_url_root
|
}
|
||||||
}
|
|
||||||
|
|
||||||
unless Gitlab.config.gitlab_on_standard_port?
|
unless Gitlab.config.gitlab_on_standard_port?
|
||||||
default_url_options[:port] = Gitlab.config.gitlab.port
|
default_url_options[:port] = Gitlab.config.gitlab.port
|
||||||
end
|
|
||||||
|
|
||||||
Rails.application.routes.default_url_options = default_url_options
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Rails.application.routes.default_url_options = default_url_options
|
||||||
|
|
|
@ -1,13 +1,6 @@
|
||||||
require 'spec_helper'
|
require 'spec_helper'
|
||||||
|
|
||||||
feature 'Users' do
|
feature 'Users' do
|
||||||
around do |ex|
|
|
||||||
old_url_options = Rails.application.routes.default_url_options
|
|
||||||
Rails.application.routes.default_url_options = { host: 'example.foo' }
|
|
||||||
ex.run
|
|
||||||
Rails.application.routes.default_url_options = old_url_options
|
|
||||||
end
|
|
||||||
|
|
||||||
scenario 'GET /users/sign_in creates a new user account' do
|
scenario 'GET /users/sign_in creates a new user account' do
|
||||||
visit new_user_session_path
|
visit new_user_session_path
|
||||||
fill_in 'user_name', with: 'Name Surname'
|
fill_in 'user_name', with: 'Name Surname'
|
||||||
|
|
|
@ -4,17 +4,6 @@
|
||||||
module ReferenceFilterSpecHelper
|
module ReferenceFilterSpecHelper
|
||||||
extend ActiveSupport::Concern
|
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
|
# Shortcut to Rails' auto-generated routes helpers, to avoid including the
|
||||||
# module
|
# module
|
||||||
def urls
|
def urls
|
||||||
|
|
Loading…
Reference in a new issue