diff options
| author | Shinya Maeda <gitlab.shinyamaeda@gmail.com> | 2017-04-07 20:01:14 +0900 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-04-07 16:17:29 +0200 |
| commit | 1ae1d85cdc835c8ed7907e83f3e371018c7c8fe6 (patch) | |
| tree | 414f36a58b0c5f23d780195fff11368a6f9862be /app | |
| parent | fb8c49db8b16e45a33cff2839390bcbaab262075 (diff) | |
| download | gitlab-ce-1ae1d85cdc835c8ed7907e83f3e371018c7c8fe6.tar.gz | |
N/A to None. Revert validates from validates_presence_of.
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/ci/trigger_schedule.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/triggers/_trigger.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/ci/trigger_schedule.rb b/app/models/ci/trigger_schedule.rb index bb58c510277..72716eb416b 100644 --- a/app/models/ci/trigger_schedule.rb +++ b/app/models/ci/trigger_schedule.rb @@ -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? } diff --git a/app/views/projects/triggers/_trigger.html.haml b/app/views/projects/triggers/_trigger.html.haml index 9ab0cd3486c..3ed1fc9ac23 100644 --- a/app/views/projects/triggers/_trigger.html.haml +++ b/app/views/projects/triggers/_trigger.html.haml @@ -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?" |