summaryrefslogtreecommitdiff
path: root/app/controllers/projects_controller.rb
diff options
context:
space:
mode:
authorTomasz Maczukin <tomasz@maczukin.pl>2018-02-27 01:25:52 +0100
committerTomasz Maczukin <tomasz@maczukin.pl>2018-04-04 19:47:37 +0200
commit99caa5bb04dea578f767e89296301b00d7401c5d (patch)
treeee11f50cb12cb146f088628f6a0e6262c8bd4b86 /app/controllers/projects_controller.rb
parentb15dd5dfa2ac269763d6342d7f0b3d9a64eb7fe4 (diff)
downloadgitlab-ce-99caa5bb04dea578f767e89296301b00d7401c5d.tar.gz
Use ChronicDurationAttribute to handle CI/CD timeout setting
Diffstat (limited to 'app/controllers/projects_controller.rb')
-rw-r--r--app/controllers/projects_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index ee197c75764..37f14230196 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -324,7 +324,7 @@ class ProjectsController < Projects::ApplicationController
:avatar,
:build_allow_git_fetch,
:build_coverage_regex,
- :build_timeout_in_minutes,
+ :build_timeout_human_readable,
:resolve_outdated_diff_discussions,
:container_registry_enabled,
:default_branch,