diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-03-27 19:13:55 +0000 |
|---|---|---|
| committer | Miranda Fluharty <mfluharty@gitlab.com> | 2019-03-28 22:39:21 +0000 |
| commit | 1588e69116def6e70414b9ed6fddbf9c99c9927c (patch) | |
| tree | 8ce0a9d5b5cac9fcaf72bfcfaa5ab4f37170af94 /app/controllers/projects/variables_controller.rb | |
| parent | ee8f3d5cd806c5558a2153b1a545b371c47c600f (diff) | |
| download | gitlab-ce-cherry-pick-c624c61a.tar.gz | |
Merge branch '13784-validate-variables-for-masking' into 'master'cherry-pick-c624c61a
Add control for masking variable values in runner logs
Closes #13784
See merge request gitlab-org/gitlab-ce!25476
(cherry picked from commit c624c61a0c65d9b61c06579840d3fb11207b20e7)
8dd486e2 Scaffold UI elements for minimal version
4eaf895e Save masked status, expose it for retrieval
124127f1 Add live validation for unmaskable values
db792a23 Update text in variables section
244ec729 Move classes and selectors into relevant function
f00dc3eb Fix internationalization problems
05c604f7 Stop rows being added when switches are toggled
1d789998 Validate after row check to stop duplicate errors
729e14f4 Update relevant variable tests
5c866df7 Refactor maskability validation function
Diffstat (limited to 'app/controllers/projects/variables_controller.rb')
| -rw-r--r-- | app/controllers/projects/variables_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/variables_controller.rb b/app/controllers/projects/variables_controller.rb index bb658bfcc19..05a79d59ffd 100644 --- a/app/controllers/projects/variables_controller.rb +++ b/app/controllers/projects/variables_controller.rb @@ -38,6 +38,6 @@ class Projects::VariablesController < Projects::ApplicationController end def variable_params_attributes - %i[id key secret_value protected _destroy] + %i[id key secret_value protected masked _destroy] end end |