kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

N/A to None. Revert validates from validates_presence_of.

This commit is contained in:
Shinya Maeda 2017-04-07 20:01:14 +09:00 committed by Kamil Trzcinski
parent fb8c49db8b
commit 1ae1d85cdc
No known key found for this signature in database
GPG Key ID: 4505F5C7E12C6A5A
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/ci/trigger_schedule.rb
View File

@ -10,7 +10,7 @@ module Ci
delegate :ref, to: :trigger, allow_nil: true
validates_presence_of :trigger
validates :trigger, presence: { unless: :importing? }
validates :cron, cron: true, presence: { unless: :importing? }
validates :cron_timezone, cron_timezone: true, presence: { unless: :importing? }
validates :ref, presence: { unless: :importing? }

2
app/views/projects/triggers/_trigger.html.haml
View File

@ -33,7 +33,7 @@
- if trigger.trigger_schedule.persisted?
= trigger.trigger_schedule.real_next_run
- else
N/A (External trigger)
None (External trigger)
%td.text-right.trigger-actions
- take_ownership_confirmation = "By taking ownership you will bind this trigger to your user account. With this the trigger will have access to all your projects as if it was you. Are you sure?"