diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-05-03 10:41:32 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-05-03 10:41:32 +0000 |
| commit | a7e24db6b33997cef44a6627844003ef0ba86aca (patch) | |
| tree | 959e88e81c216a9aaf3b1cd64c347fa2b2993cf7 /app/controllers/projects/pipelines_controller.rb | |
| parent | 739c0ca11a62a966094feabe892e170b10a65d3c (diff) | |
| parent | 84bce2d954f6b633dab6ee56fd3c04338dd55c9a (diff) | |
| download | gitlab-ce-46806-env-table.tar.gz | |
Merge branch '46806-typed-ci-variables' into '46806-env-table'46806-env-table
# Conflicts:
# app/views/ci/variables/_variable_row.html.haml
Diffstat (limited to 'app/controllers/projects/pipelines_controller.rb')
| -rw-r--r-- | app/controllers/projects/pipelines_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb index 22c4b8eef1f..db3b7c8b177 100644 --- a/app/controllers/projects/pipelines_controller.rb +++ b/app/controllers/projects/pipelines_controller.rb @@ -169,7 +169,7 @@ class Projects::PipelinesController < Projects::ApplicationController end def create_params - params.require(:pipeline).permit(:ref, variables_attributes: %i[key secret_value]) + params.require(:pipeline).permit(:ref, variables_attributes: %i[key variable_type secret_value]) end # rubocop: disable CodeReuse/ActiveRecord |