summaryrefslogtreecommitdiff
path: root/app/presenters
diff options
context:
space:
mode:
authorAlexander Randa <randa.alex@gmail.com>2017-03-31 12:54:38 +0000
committerAlexander Randa <randa.alex@gmail.com>2017-06-02 19:44:36 +0300
commit3d70eeb5bb9dac8073a149547dc3b85c90d65e7d (patch)
treeb925f3518e991df59a094ae9d7a6926241c9f5aa /app/presenters
parentf07aee72bef4604312e11a43fce3a47865bce100 (diff)
downloadgitlab-ce-3d70eeb5bb9dac8073a149547dc3b85c90d65e7d.tar.gz
Implement ability to update deploy keys
Diffstat (limited to 'app/presenters')
-rw-r--r--app/presenters/projects/settings/deploy_keys_presenter.rb14
1 files changed, 3 insertions, 11 deletions
diff --git a/app/presenters/projects/settings/deploy_keys_presenter.rb b/app/presenters/projects/settings/deploy_keys_presenter.rb
index 070b0c35e36..229311eb6ee 100644
--- a/app/presenters/projects/settings/deploy_keys_presenter.rb
+++ b/app/presenters/projects/settings/deploy_keys_presenter.rb
@@ -11,7 +11,7 @@ module Projects
end
def enabled_keys
- @enabled_keys ||= project.deploy_keys
+ @enabled_keys ||= project.deploy_keys.includes(:projects)
end
def any_keys_enabled?
@@ -23,11 +23,7 @@ module Projects
end
def available_project_keys
- @available_project_keys ||= current_user.project_deploy_keys - enabled_keys
- end
-
- def any_available_project_keys_enabled?
- available_project_keys.any?
+ @available_project_keys ||= current_user.project_deploy_keys.includes(:projects) - enabled_keys
end
def key_available?(deploy_key)
@@ -37,17 +33,13 @@ module Projects
def available_public_keys
return @available_public_keys if defined?(@available_public_keys)
- @available_public_keys ||= DeployKey.are_public - enabled_keys
+ @available_public_keys ||= DeployKey.are_public.includes(:projects) - enabled_keys
# Public keys that are already used by another accessible project are already
# in @available_project_keys.
@available_public_keys -= available_project_keys
end
- def any_available_public_keys_enabled?
- available_public_keys.any?
- end
-
def as_json
serializer = DeployKeySerializer.new
opts = { user: current_user }