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:
authorTomasz Maczukin <tomasz@maczukin.pl>2018-02-27 03:25:52 +0300
committerTomasz Maczukin <tomasz@maczukin.pl>2018-04-04 20:47:37 +0300
commit99caa5bb04dea578f767e89296301b00d7401c5d (patch)
treeee11f50cb12cb146f088628f6a0e6262c8bd4b86 /app/controllers/projects/pipelines_settings_controller.rb
parentb15dd5dfa2ac269763d6342d7f0b3d9a64eb7fe4 (diff)
Use ChronicDurationAttribute to handle CI/CD timeout setting
Diffstat (limited to 'app/controllers/projects/pipelines_settings_controller.rb')
-rw-r--r--app/controllers/projects/pipelines_settings_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/pipelines_settings_controller.rb b/app/controllers/projects/pipelines_settings_controller.rb
index 557671ab186..dc12b76e2b0 100644
--- a/app/controllers/projects/pipelines_settings_controller.rb
+++ b/app/controllers/projects/pipelines_settings_controller.rb
@@ -36,7 +36,7 @@ class Projects::PipelinesSettingsController < Projects::ApplicationController
def update_params
params.require(:project).permit(
:runners_token, :builds_enabled, :build_allow_git_fetch,
- :build_timeout_in_minutes, :build_coverage_regex, :public_builds,
+ :build_timeout_human_readable, :build_coverage_regex, :public_builds,
:auto_cancel_pending_pipelines, :ci_config_path,
auto_devops_attributes: [:id, :domain, :enabled]
)