From 7267f57e946dc7b15eb31204dc97ecf0aefb0a1f Mon Sep 17 00:00:00 2001
From: Kyle Wiebers <kwiebers@gitlab.com>
Date: Wed, 24 Jun 2020 21:49:22 +0000
Subject: [PATCH] Revert "Merge branch 'nelbacha-master-patch-50345' into
'master'"
This reverts merge request !33042
---
app/helpers/deploy_tokens_helper.rb | 10 +---
.../shared/deploy_tokens/_form.html.haml | 1 -
.../nelbacha-master-patch-50345.yml | 5 --
.../deploy_tokens/_form.html.haml_spec.rb | 56 -------------------
4 files changed, 2 insertions(+), 70 deletions(-)
delete mode 100644 ee/changelogs/unreleased/nelbacha-master-patch-50345.yml
delete mode 100644 ee/spec/views/shared/deploy_tokens/_form.html.haml_spec.rb
diff --git a/app/helpers/deploy_tokens_helper.rb b/app/helpers/deploy_tokens_helper.rb
index eeeeb14d991a3..80a5bb44c6961 100644
--- a/app/helpers/deploy_tokens_helper.rb
+++ b/app/helpers/deploy_tokens_helper.rb
@@ -7,14 +7,8 @@ def expand_deploy_tokens_section?(deploy_token)
Rails.env.test?
end
- def container_registry_enabled?(subject)
+ def container_registry_enabled?(project)
Gitlab.config.registry.enabled &&
- can?(current_user, :read_container_image, subject)
- end
-
- def packages_registry_enabled?(subject)
- Gitlab.config.packages.enabled &&
- subject.feature_available?(:packages) &&
- can?(current_user, :read_package, subject)
+ can?(current_user, :read_container_image, project)
end
end
diff --git a/app/views/shared/deploy_tokens/_form.html.haml b/app/views/shared/deploy_tokens/_form.html.haml
index 00e1cc4e9ca13..512644518fab7 100644
--- a/app/views/shared/deploy_tokens/_form.html.haml
+++ b/app/views/shared/deploy_tokens/_form.html.haml
@@ -35,7 +35,6 @@
= label_tag ("deploy_token_write_registry"), 'write_registry', class: 'label-bold form-check-label'
.text-secondary= s_('DeployTokens|Allows write access to the registry images')
- - if packages_registry_enabled?(group_or_project)
%fieldset.form-group.form-check
= f.check_box :read_package_registry, class: 'form-check-input'
= label_tag ("deploy_token_read_package_registry"), 'read_package_registry', class: 'label-bold form-check-label'
diff --git a/ee/changelogs/unreleased/nelbacha-master-patch-50345.yml b/ee/changelogs/unreleased/nelbacha-master-patch-50345.yml
deleted file mode 100644
index ab5e932384487..0000000000000
--- a/ee/changelogs/unreleased/nelbacha-master-patch-50345.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Conditionally render the packages scopes in deploy token settings
-merge_request: 33042
-author:
-type: fixed
diff --git a/ee/spec/views/shared/deploy_tokens/_form.html.haml_spec.rb b/ee/spec/views/shared/deploy_tokens/_form.html.haml_spec.rb
deleted file mode 100644
index abeafd09e3783..0000000000000
--- a/ee/spec/views/shared/deploy_tokens/_form.html.haml_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe 'shared/deploy_tokens/_form.html.haml' do
- using RSpec::Parameterized::TableSyntax
-
- let_it_be(:user) { create(:user) }
- let_it_be(:token) { build(:deploy_token) }
- let_it_be(:project, refind: true) { create(:project, :private) }
- let_it_be(:group, refind: true) { create(:group) }
-
- RSpec.shared_examples "display deploy token settings" do |role, type, can|
- let(:subject) { type == :project ? project : group }
-
- if can
- it "renders the packages scopes for user role #{role} in #{type}" do
- render 'shared/deploy_tokens/form', token: token, group_or_project: subject
-
- expect(rendered).to have_content('Allows read access to the package registry')
- end
- else
- it "does not render the packages scopes for user role #{role} in #{type}" do
- render 'shared/deploy_tokens/form', token: token, group_or_project: subject
-
- expect(rendered).not_to have_content('Allows read access to the package registry')
- end
- end
- end
-
- where(:packages_enabled, :feature_enabled, :role, :subject, :can) do
- true | true | :owner | :group | true
- true | false | :owner | :group | false
- false | true | :owner | :group | false
- false | false | :owner | :group | false
- true | true | :maintainer | :group | true
- true | false | :maintainer | :group | false
- false | true | :maintainer | :group | false
- false | false | :maintainer | :group | false
- true | true | :maintainer | :project | true
- false | true | :maintainer | :project | false
- true | false | :maintainer | :project | false
- false | false | :maintainer | :project | false
- end
-
- with_them do
- before do
- subject.send("add_#{role}", user)
- allow(view).to receive(:current_user).and_return(user)
- stub_config(packages: { enabled: packages_enabled })
- stub_licensed_features(packages: feature_enabled)
- end
-
- it_behaves_like 'display deploy token settings', params[:role], params[:subject], params[:can]
- end
-end
--
GitLab