Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-08-18 11:17:02 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-08-18 11:17:02 +0300
commitb39512ed755239198a9c294b6a45e65c05900235 (patch)
treed234a3efade1de67c46b9e5a38ce813627726aa7 /app/models/design_management
parentd31474cf3b17ece37939d20082b07f6657cc79a9 (diff)
Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42
Diffstat (limited to 'app/models/design_management')
-rw-r--r--app/models/design_management/design.rb4
-rw-r--r--app/models/design_management/design_action.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/design_management/design.rb b/app/models/design_management/design.rb
index feb1bf5438c..317399e780a 100644
--- a/app/models/design_management/design.rb
+++ b/app/models/design_management/design.rb
@@ -28,8 +28,8 @@ module DesignManagement
has_many :events, as: :target, dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent
has_internal_id :iid, scope: :project, presence: true,
- hook_names: %i[create update], # Deal with old records
- track_if: -> { !importing? }
+ hook_names: %i[create update], # Deal with old records
+ track_if: -> { !importing? }
validates :project, :filename, presence: true
validates :issue, presence: true, unless: :importing?
diff --git a/app/models/design_management/design_action.rb b/app/models/design_management/design_action.rb
index 43dcce545d2..eae470a1ae2 100644
--- a/app/models/design_management/design_action.rb
+++ b/app/models/design_management/design_action.rb
@@ -21,7 +21,7 @@ module DesignManagement
validates :action, presence: true, inclusion: { in: EVENT_FOR_GITALY_ACTION.keys }
validates :content,
absence: { if: :forbids_content?,
- message: 'this action forbids content' },
+ message: 'this action forbids content' },
presence: { if: :needs_content?,
message: 'this action needs content' }