diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-07-07 18:37:04 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-07-07 18:37:04 +0000 |
| commit | 426271dacbb3b7462e4f7a78fa3628bbd267609a (patch) | |
| tree | 930dabccfd90cfad90e7aa86dd557bc309c075c9 /app/models | |
| parent | 787a23475a6de02438608d2af8d21577afbbd447 (diff) | |
| parent | c81928cfa757b6f42debd6d1c3b6cdb860fc14f5 (diff) | |
| download | gitlab-ce-426271dacbb3b7462e4f7a78fa3628bbd267609a.tar.gz | |
Merge branch 'dm-fix-project-path-helpers-production' into 'master'
Include new URL helpers retroactively into includers of Gitlab::Routing
Closes #34821
See merge request !12716
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project_services/gitlab_issue_tracker_service.rb | 2 | ||||
| -rw-r--r-- | app/models/project_services/jira_service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project_services/gitlab_issue_tracker_service.rb b/app/models/project_services/gitlab_issue_tracker_service.rb index 5e31f393bbe..420102875a5 100644 --- a/app/models/project_services/gitlab_issue_tracker_service.rb +++ b/app/models/project_services/gitlab_issue_tracker_service.rb @@ -1,5 +1,5 @@ class GitlabIssueTrackerService < IssueTrackerService - include Gitlab::Routing.url_helpers + include Gitlab::Routing validates :project_url, :issues_url, :new_issue_url, presence: true, url: true, if: :activated? diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb index 8af642b44aa..5498a2e17b2 100644 --- a/app/models/project_services/jira_service.rb +++ b/app/models/project_services/jira_service.rb @@ -1,5 +1,5 @@ class JiraService < IssueTrackerService - include Gitlab::Routing.url_helpers + include Gitlab::Routing validates :url, url: true, presence: true, if: :activated? validates :api_url, url: true, allow_blank: true |