diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-01-05 15:23:44 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-01-15 11:23:07 +0100 |
| commit | cada2f515469cdee36e38e7fb61d33ead06dc3e8 (patch) | |
| tree | 83189c9878d0bcaba32a578e0edee6c4a545fb8c /app/serializers | |
| parent | 638f28626d67cf6e518a0ec249ebbc0157fb0831 (diff) | |
| download | gitlab-ce-cada2f515469cdee36e38e7fb61d33ead06dc3e8.tar.gz | |
Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'security-10-3'
[10.3] Migrate `can_push` column from `keys` to `deploy_keys_project`
See merge request gitlab/gitlabhq!2276
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/deploy_key_entity.rb | 9 | ||||
| -rw-r--r-- | app/serializers/deploy_keys_project_entity.rb | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/app/serializers/deploy_key_entity.rb b/app/serializers/deploy_key_entity.rb index c75431a79ae..2678f99510c 100644 --- a/app/serializers/deploy_key_entity.rb +++ b/app/serializers/deploy_key_entity.rb @@ -3,19 +3,20 @@ class DeployKeyEntity < Grape::Entity expose :user_id expose :title expose :fingerprint - expose :can_push expose :destroyed_when_orphaned?, as: :destroyed_when_orphaned expose :almost_orphaned?, as: :almost_orphaned expose :created_at expose :updated_at - expose :projects, using: ProjectEntity do |deploy_key| - deploy_key.projects.without_deleted.select { |project| options[:user].can?(:read_project, project) } + expose :deploy_keys_projects, using: DeployKeysProjectEntity do |deploy_key| + deploy_key.deploy_keys_projects + .without_project_deleted + .select { |deploy_key_project| Ability.allowed?(options[:user], :read_project, deploy_key_project.project) } end expose :can_edit private def can_edit - options[:user].can?(:update_deploy_key, object) + Ability.allowed?(options[:user], :update_deploy_key, object) end end diff --git a/app/serializers/deploy_keys_project_entity.rb b/app/serializers/deploy_keys_project_entity.rb new file mode 100644 index 00000000000..568ef5ab75e --- /dev/null +++ b/app/serializers/deploy_keys_project_entity.rb @@ -0,0 +1,4 @@ +class DeployKeysProjectEntity < Grape::Entity + expose :can_push + expose :project, using: ProjectEntity +end |