summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Miller <travis@travismiller.com>2017-10-20 01:33:52 -0500
committerTravis Miller <travis@travismiller.com>2017-10-22 08:04:42 -0500
commit66a8f3d4330b27624569e61680f150fdc026a347 (patch)
tree966b303edcb16adcc81569e02a531f4c4c33fe51
parent064eb397941ee0dbc1c478c62987505511c8272a (diff)
downloadgitlab-ce-66a8f3d4330b27624569e61680f150fdc026a347.tar.gz
Rename conflicting private method in PagesDomain model
-rw-r--r--app/models/pages_domain.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/pages_domain.rb b/app/models/pages_domain.rb
index 5d798247863..2e824cda525 100644
--- a/app/models/pages_domain.rb
+++ b/app/models/pages_domain.rb
@@ -16,9 +16,9 @@ class PagesDomain < ActiveRecord::Base
key: Gitlab::Application.secrets.db_key_base,
algorithm: 'aes-256-cbc'
- after_create :update
- after_save :update
- after_destroy :update
+ after_create :update_daemon
+ after_save :update_daemon
+ after_destroy :update_daemon
def to_param
domain
@@ -80,7 +80,7 @@ class PagesDomain < ActiveRecord::Base
private
- def update
+ def update_daemon
::Projects::UpdatePagesConfigurationService.new(project).execute
end