diff options
| author | mfluharty <mfluharty@gitlab.com> | 2019-02-21 12:13:32 -0700 |
|---|---|---|
| committer | mfluharty <mfluharty@gitlab.com> | 2019-02-21 12:13:32 -0700 |
| commit | c10de2c6cd4e9712670cbf01d8172e231e536845 (patch) | |
| tree | 5ef06f14e18038715a4267aa51edece161df8991 | |
| parent | ccb18655590bd2e63e0ddb6835bea2e8ecf1309f (diff) | |
| download | gitlab-ce-13784-validate-protected-variables-for-masking.tar.gz | |
Save masked status, expose it for retrieval13784-validate-protected-variables-for-masking
| -rw-r--r-- | app/controllers/groups/variables_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/variables_controller.rb | 2 | ||||
| -rw-r--r-- | app/serializers/group_variable_entity.rb | 1 | ||||
| -rw-r--r-- | app/serializers/variable_entity.rb | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/groups/variables_controller.rb b/app/controllers/groups/variables_controller.rb index 4f641de0357..b44e3b0fff4 100644 --- a/app/controllers/groups/variables_controller.rb +++ b/app/controllers/groups/variables_controller.rb @@ -41,7 +41,7 @@ module Groups end def variable_params_attributes - %i[id key secret_value protected _destroy] + %i[id key secret_value protected masked _destroy] end def authorize_admin_build! 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 diff --git a/app/serializers/group_variable_entity.rb b/app/serializers/group_variable_entity.rb index 0edab4a3092..19c5fa26f34 100644 --- a/app/serializers/group_variable_entity.rb +++ b/app/serializers/group_variable_entity.rb @@ -6,4 +6,5 @@ class GroupVariableEntity < Grape::Entity expose :value expose :protected?, as: :protected + expose :masked?, as: :masked end diff --git a/app/serializers/variable_entity.rb b/app/serializers/variable_entity.rb index 85cf367fe51..4d48e13cfca 100644 --- a/app/serializers/variable_entity.rb +++ b/app/serializers/variable_entity.rb @@ -6,4 +6,5 @@ class VariableEntity < Grape::Entity expose :value expose :protected?, as: :protected + expose :masked?, as: :masked end |