diff options
author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-04-28 11:34:34 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-04-28 11:34:34 +0300 |
commit | 8140c6828905345ea510b23ee09e53f01a74f97d (patch) | |
tree | fb65a901dd5b0c331e162f819fafe963dc84ab56 /app/models/project_services | |
parent | f0227d761fa24b7f0fdf0b5fecd6d52a6d991714 (diff) | |
parent | e3d2304d6971c42436e711ccf70b8e4d5114f887 (diff) |
Merge branch 'rs-issue-2269' into 'master'
Remove duplicate settings for default_url_options
Closes #2269
See merge request !1797
Diffstat (limited to 'app/models/project_services')
-rw-r--r-- | app/models/project_services/gitlab_issue_tracker_service.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/models/project_services/gitlab_issue_tracker_service.rb b/app/models/project_services/gitlab_issue_tracker_service.rb index 5f0553f3b0b..0ebc0a3ba1a 100644 --- a/app/models/project_services/gitlab_issue_tracker_service.rb +++ b/app/models/project_services/gitlab_issue_tracker_service.rb @@ -21,11 +21,6 @@ class GitlabIssueTrackerService < IssueTrackerService 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 def default? |