Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
d5201119
Commit
d5201119
authored
Apr 07, 2017
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix test failures
parent
344001d7
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
4 deletions
+6
-4
app/models/ci/trigger_schedule.rb
app/models/ci/trigger_schedule.rb
+3
-2
app/views/projects/triggers/_form.html.haml
app/views/projects/triggers/_form.html.haml
+1
-1
app/views/projects/triggers/_trigger.html.haml
app/views/projects/triggers/_trigger.html.haml
+1
-1
spec/features/triggers_spec.rb
spec/features/triggers_spec.rb
+1
-0
No files found.
app/models/ci/trigger_schedule.rb
View file @
d5201119
...
...
@@ -31,7 +31,8 @@ module Ci
update_attribute
(
:next_run_at
,
nil
)
# update without validation
end
def
real_next_run
(
worker_cron:
Settings
.
cron_jobs
[
'trigger_schedule_worker'
][
'cron'
],
def
real_next_run
(
worker_cron:
Settings
.
cron_jobs
[
'trigger_schedule_worker'
][
'cron'
],
worker_time_zone:
Time
.
zone
.
name
)
Gitlab
::
Ci
::
CronParser
.
new
(
worker_cron
,
worker_time_zone
)
.
next_time_from
(
next_run_at
)
...
...
app/views/projects/triggers/_form.html.haml
View file @
d5201119
...
...
@@ -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"
...
...
app/views/projects/triggers/_trigger.html.haml
View file @
d5201119
...
...
@@ -33,7 +33,7 @@
-
if
trigger
.
trigger_schedule
&
.
active?
=
trigger
.
trigger_schedule
.
real_next_run
-
else
N
one
N
ever
%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?"
...
...
spec/features/triggers_spec.rb
View file @
d5201119
...
...
@@ -120,6 +120,7 @@ feature 'Triggers', feature: true, js: true do
visit
edit_namespace_project_trigger_path
(
@project
.
namespace
,
@project
,
trigger
)
checkbox
=
find_field
(
'trigger_trigger_schedule_attributes_active'
)
expect
(
checkbox
).
not_to
be_checked
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment