From cf851ce559b1af2b0fecd13a06c362b15b5d5df8 Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Mon, 18 Sep 2017 11:54:48 +0200 Subject: Fix instance default option being true as value When a user selected 'Instance default' as value for the auto devops settings, this was interpreted as a true value. Now we post an empty string in this case, meaning we want to set `NULL` in the database. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37893#note_40541294 --- app/views/projects/pipelines_settings/_show.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/projects/pipelines_settings') diff --git a/app/views/projects/pipelines_settings/_show.html.haml b/app/views/projects/pipelines_settings/_show.html.haml index 324cd423ede..2aceb4b529c 100644 --- a/app/views/projects/pipelines_settings/_show.html.haml +++ b/app/views/projects/pipelines_settings/_show.html.haml @@ -25,8 +25,8 @@ %span.descr A specific .gitlab-ci.yml file needs to be specified before you can begin using Continious Integration and Delivery. .radio - = form.label :enabled do - = form.radio_button :enabled, nil + = form.label :enabled_nil do + = form.radio_button :enabled, '' %strong Instance default (status: #{current_application_settings.auto_devops_enabled?}) %br -- cgit v1.2.1