diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-02-03 01:56:11 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-02-03 12:20:59 +0100 |
| commit | 56bcb3e8c87bf25cb33ed02832c146e966cc4d7d (patch) | |
| tree | bb8aadd524ab052da693ef28e0cfc390024edb70 /app/models/project_auto_devops.rb | |
| parent | bf278f791b0f112c79e8cdeaa82db91ae2af4fe4 (diff) | |
| download | gitlab-ce-56bcb3e8c87bf25cb33ed02832c146e966cc4d7d.tar.gz | |
Use Gitlab::CurrentSettings instead of current_application_settings
Diffstat (limited to 'app/models/project_auto_devops.rb')
| -rw-r--r-- | app/models/project_auto_devops.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/models/project_auto_devops.rb b/app/models/project_auto_devops.rb index f23310e854a..728e64e8fe3 100644 --- a/app/models/project_auto_devops.rb +++ b/app/models/project_auto_devops.rb @@ -1,6 +1,4 @@ class ProjectAutoDevops < ActiveRecord::Base - include Gitlab::CurrentSettings - belongs_to :project scope :enabled, -> { where(enabled: true) } @@ -9,7 +7,7 @@ class ProjectAutoDevops < ActiveRecord::Base validates :domain, allow_blank: true, hostname: { allow_numeric_hostname: true } def instance_domain - current_application_settings.auto_devops_domain + Gitlab::CurrentSettings.auto_devops_domain end def has_domain? |