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:
authorShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-04-07 13:24:20 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2017-04-07 17:17:28 +0300
commit2f5095c2546af30da152e85a499c98d608465988 (patch)
treeb202de4ec000902ccba15323db1f8835e82543b2 /app/controllers
parent4131ed2bd85d3efdfe0e27d47ffc95567dae11af (diff)
Add def trigger_schedule in Trigger. Use persisted? for checling existance
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects/settings/ci_cd_controller.rb1
-rw-r--r--app/controllers/projects/triggers_controller.rb1
2 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb
index 0ae4b4d3945..6f009d61950 100644
--- a/app/controllers/projects/settings/ci_cd_controller.rb
+++ b/app/controllers/projects/settings/ci_cd_controller.rb
@@ -27,7 +27,6 @@ module Projects
def define_triggers_variables
@triggers = @project.triggers
@trigger = Ci::Trigger.new
- @trigger.build_trigger_schedule
end
def define_badges_variables
diff --git a/app/controllers/projects/triggers_controller.rb b/app/controllers/projects/triggers_controller.rb
index 2a3c563890b..4f5d336ce40 100644
--- a/app/controllers/projects/triggers_controller.rb
+++ b/app/controllers/projects/triggers_controller.rb
@@ -34,7 +34,6 @@ class Projects::TriggersController < Projects::ApplicationController
end
def edit
- @trigger.build_trigger_schedule unless @trigger.trigger_schedule.present?
end
def update