diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-04-07 17:15:28 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-04-07 17:15:28 +0200 |
| commit | d5201119ee2a139c18b51babd80f6c6490f90b6e (patch) | |
| tree | 9e2f1ba98c51a0518b8c5b98ad28ca8cac3b9b65 /app/views | |
| parent | 344001d7384ec227fdf18cc87b62981f18c7c580 (diff) | |
| download | gitlab-ce-d5201119ee2a139c18b51babd80f6c6490f90b6e.tar.gz | |
Fix test failures
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/triggers/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/triggers/_trigger.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/triggers/_form.html.haml b/app/views/projects/triggers/_form.html.haml index 8ec2f05e3d6..8582bcbb8cc 100644 --- a/app/views/projects/triggers/_form.html.haml +++ b/app/views/projects/triggers/_form.html.haml @@ -18,7 +18,7 @@ = schedule_fields.check_box :active %strong Schedule trigger (experimental) .help-block - If checked, this trigger will be executed periodically according to `Cron` and `Timezone`. + If checked, this trigger will be executed periodically according to cron and timezone. = link_to icon('question-circle'), help_page_path('ci/triggers', anchor: 'schedule') .form-group = schedule_fields.label :cron, "Cron", class: "label-light" diff --git a/app/views/projects/triggers/_trigger.html.haml b/app/views/projects/triggers/_trigger.html.haml index ca4549fc557..ebd91a8e2af 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&.active? = trigger.trigger_schedule.real_next_run - else - None + Never %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?" |