diff options
author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-09-18 11:54:48 +0200 |
---|---|---|
committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-09-18 12:02:47 +0200 |
commit | cf851ce559b1af2b0fecd13a06c362b15b5d5df8 (patch) | |
tree | bb494bf09e6293fc5bf83e21219ba66f71368434 /app | |
parent | 65e5888f1d42fed563f2c369e6c05cd64fde0341 (diff) | |
download | gitlab-ce-cf851ce559b1af2b0fecd13a06c362b15b5d5df8.tar.gz |
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
Diffstat (limited to 'app')
-rw-r--r-- | app/views/projects/pipelines_settings/_show.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
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 |