diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-26 09:06:04 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-26 09:06:04 +0000 |
commit | 759cd6c2985088d187ed519f2a881c2c690b34ec (patch) | |
tree | 183e291c0404bf9b3ac7638be6fa1fe94b7d2d14 /app/models | |
parent | 9735395f94088df7e6470e3e8a2638385ede36b6 (diff) | |
download | gitlab-ce-759cd6c2985088d187ed519f2a881c2c690b34ec.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/audit_event.rb | 9 | ||||
-rw-r--r-- | app/models/ci/pipeline.rb | 6 | ||||
-rw-r--r-- | app/models/concerns/mentionable.rb | 2 | ||||
-rw-r--r-- | app/models/project_services/hipchat_service.rb | 2 | ||||
-rw-r--r-- | app/models/project_services/irker_service.rb | 4 | ||||
-rw-r--r-- | app/models/project_services/jira_service.rb | 2 | ||||
-rw-r--r-- | app/models/project_services/packagist_service.rb | 2 | ||||
-rw-r--r-- | app/models/wiki_page.rb | 6 |
8 files changed, 17 insertions, 16 deletions
diff --git a/app/models/audit_event.rb b/app/models/audit_event.rb index c2eef500fb0..06a607b75a4 100644 --- a/app/models/audit_event.rb +++ b/app/models/audit_event.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class AuditEvent < ApplicationRecord + include CreatedAtFilterable + serialize :details, Hash # rubocop:disable Cop/ActiveRecordSerialize belongs_to :user, foreign_key: :author_id @@ -9,6 +11,9 @@ class AuditEvent < ApplicationRecord validates :entity_id, presence: true validates :entity_type, presence: true + scope :by_entity_type, -> (entity_type) { where(entity_type: entity_type) } + scope :by_entity_id, -> (entity_id) { where(entity_id: entity_id) } + after_initialize :initialize_details def initialize_details @@ -18,6 +23,10 @@ class AuditEvent < ApplicationRecord def author_name self.user.name end + + def formatted_details + details.merge(details.slice(:from, :to).transform_values(&:to_s)) + end end AuditEvent.prepend_if_ee('EE::AuditEvent') diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 49656a32c03..12295c0457d 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -584,11 +584,7 @@ module Ci def ci_yaml_file_path return unless repository_source? || unknown_source? - if project.ci_config_path.blank? - '.gitlab-ci.yml' - else - project.ci_config_path - end + project.ci_config_path.presence || '.gitlab-ci.yml' end def ci_yaml_file diff --git a/app/models/concerns/mentionable.rb b/app/models/concerns/mentionable.rb index 377600ef6e5..9b6c57261d8 100644 --- a/app/models/concerns/mentionable.rb +++ b/app/models/concerns/mentionable.rb @@ -150,7 +150,7 @@ module Mentionable # # Returns a Hash. def detect_mentionable_changes - source = (changes.present? ? changes : previous_changes).dup + source = (changes.presence || previous_changes).dup mentionable = self.class.mentionable_attrs.map { |attr, options| attr } diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb index 3320405e9e9..1d0b37abf72 100644 --- a/app/models/project_services/hipchat_service.rb +++ b/app/models/project_services/hipchat_service.rb @@ -73,7 +73,7 @@ class HipchatService < Service private def gate - options = { api_version: api_version.present? ? api_version : 'v2' } + options = { api_version: api_version.presence || 'v2' } options[:server_url] = server unless server.blank? @gate ||= HipChat::Client.new(token, options) end diff --git a/app/models/project_services/irker_service.rb b/app/models/project_services/irker_service.rb index fb76bc89c98..4a6c8339625 100644 --- a/app/models/project_services/irker_service.rb +++ b/app/models/project_services/irker_service.rb @@ -36,8 +36,8 @@ class IrkerService < Service def settings { - server_host: server_host.present? ? server_host : 'localhost', - server_port: server_port.present? ? server_port : 6659 + server_host: server_host.presence || 'localhost', + server_port: server_port.presence || 6659 } end diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb index 4a02da975f2..cfdf55b5155 100644 --- a/app/models/project_services/jira_service.rb +++ b/app/models/project_services/jira_service.rb @@ -337,7 +337,7 @@ class JiraService < IssueTrackerService end def client_url - api_url.present? ? api_url : url + api_url.presence || url end def reset_password? diff --git a/app/models/project_services/packagist_service.rb b/app/models/project_services/packagist_service.rb index 003884bb7ac..35dbedd1341 100644 --- a/app/models/project_services/packagist_service.rb +++ b/app/models/project_services/packagist_service.rb @@ -59,7 +59,7 @@ class PackagistService < Service end def hook_url - base_url = server.present? ? server : 'https://packagist.org' + base_url = server.presence || 'https://packagist.org' "#{base_url}/api/update-package?username=#{username}&apiToken=#{token}" end end diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb index cd4c7895587..1fa29e5b933 100644 --- a/app/models/wiki_page.rb +++ b/app/models/wiki_page.rb @@ -77,11 +77,7 @@ class WikiPage # The escaped URL path of this page. def slug - if @attributes[:slug].present? - @attributes[:slug] - else - wiki.wiki.preview_slug(title, format) - end + @attributes[:slug].presence || wiki.wiki.preview_slug(title, format) end alias_method :to_param, :slug |