diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-28 15:26:00 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-28 15:26:00 +0100 |
| commit | dc04fdc1a3165134fc9245e9a591daceee857ef4 (patch) | |
| tree | e3b01475f2e224cd1595167c9a5dd0d0dc013a89 /app/serializers | |
| parent | ec302c6c0cf7d4b3a19bea43ce380dbaa60b363d (diff) | |
| parent | 48c51e207e4cba8a69e4ca65cba1e169d384cefa (diff) | |
| download | gitlab-ce-dc04fdc1a3165134fc9245e9a591daceee857ef4.tar.gz | |
Merge remote-tracking branch 'origin/master' into ide
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/build_details_entity.rb | 3 | ||||
| -rw-r--r-- | app/serializers/deploy_key_entity.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb index 20f9938f038..743a08acefe 100644 --- a/app/serializers/build_details_entity.rb +++ b/app/serializers/build_details_entity.rb @@ -16,7 +16,8 @@ class BuildDetailsEntity < JobEntity end expose :path do |build| - project_merge_request_path(project, build.merge_request) + project_merge_request_path(build.merge_request.project, + build.merge_request) end end diff --git a/app/serializers/deploy_key_entity.rb b/app/serializers/deploy_key_entity.rb index 068013c8829..c75431a79ae 100644 --- a/app/serializers/deploy_key_entity.rb +++ b/app/serializers/deploy_key_entity.rb @@ -9,7 +9,7 @@ class DeployKeyEntity < Grape::Entity expose :created_at expose :updated_at expose :projects, using: ProjectEntity do |deploy_key| - deploy_key.projects.select { |project| options[:user].can?(:read_project, project) } + deploy_key.projects.without_deleted.select { |project| options[:user].can?(:read_project, project) } end expose :can_edit |