diff options
author | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-02-26 16:26:39 +0100 |
---|---|---|
committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-03-28 13:56:55 +0200 |
commit | 4ce376c0649faf4dea01857c312379771bdf37b7 (patch) | |
tree | 875d8016867fb4e23e46cefc56fa068c0991295e /app/models | |
parent | c21e817a9081e01bdbf27f4a28bdb7af791a7e8a (diff) | |
download | gitlab-ce-4ce376c0649faf4dea01857c312379771bdf37b7.tar.gz |
Rename chronic_duration_attribute* to chronic_duration_attr*
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/ci/build.rb | 2 | ||||
-rw-r--r-- | app/models/ci/runner.rb | 2 | ||||
-rw-r--r-- | app/models/concerns/chronic_duration_attribute.rb | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 3072817f443..5b9e06ab203 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -91,7 +91,7 @@ module Ci after_commit :update_project_statistics_after_save, on: [:create, :update] after_commit :update_project_statistics, on: :destroy - chronic_duration_attribute_reader :used_timeout_user_readable, :used_timeout + chronic_duration_attr_reader :used_timeout_user_readable, :used_timeout class << self # This is needed for url_for to work, diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb index 3d83e00ccfe..f95afd4c40c 100644 --- a/app/models/ci/runner.rb +++ b/app/models/ci/runner.rb @@ -52,7 +52,7 @@ module Ci cached_attr_reader :version, :revision, :platform, :architecture, :contacted_at, :ip_address - chronic_duration_attribute :maximum_job_timeout_user_readable, :maximum_job_timeout + chronic_duration_attr :maximum_job_timeout_user_readable, :maximum_job_timeout # Searches for runners matching the given query. # diff --git a/app/models/concerns/chronic_duration_attribute.rb b/app/models/concerns/chronic_duration_attribute.rb index 2bf33174640..ae3aeda1709 100644 --- a/app/models/concerns/chronic_duration_attribute.rb +++ b/app/models/concerns/chronic_duration_attribute.rb @@ -2,19 +2,19 @@ module ChronicDurationAttribute extend ActiveSupport::Concern class_methods do - def chronic_duration_attribute(virtual_attribute, source_attribute) - chronic_duration_attribute_reader(virtual_attribute, source_attribute) - chronic_duration_attribute_writer(virtual_attribute, source_attribute) + def chronic_duration_attr(virtual_attribute, source_attribute) + chronic_duration_attr_reader(virtual_attribute, source_attribute) + chronic_duration_attr_writer(virtual_attribute, source_attribute) end - def chronic_duration_attribute_reader(virtual_attribute, source_attribute) + def chronic_duration_attr_reader(virtual_attribute, source_attribute) define_method(virtual_attribute) do value = self.send(source_attribute) # rubocop:disable GitlabSecurity/PublicSend ChronicDuration.output(value, format: :short) unless value.nil? end end - def chronic_duration_attribute_writer(virtual_attribute, source_attribute) + def chronic_duration_attr_writer(virtual_attribute, source_attribute) define_method("#{virtual_attribute}=") do |value| new_value = ChronicDuration.parse(value).to_i self.send("#{source_attribute}=", new_value) # rubocop:disable GitlabSecurity/PublicSend |