Merge branch 'revert-690b8762' into 'master'

Revert "Merge branch 'add_requirements_visibility_access_project_settings' into 'master'"

Closes gitlab-foss#78586

See merge request gitlab-org/gitlab!35627

app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue

@@ -67,11 +67,6 @@ export default {
       required: false,
       default: false,
     },
-    requirementsAvailable: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
     visibilityHelpPath: {
       type: String,
       required: false,
@@ -136,7 +131,6 @@ export default {
       snippetsAccessLevel: featureAccessLevel.EVERYONE,
       pagesAccessLevel: featureAccessLevel.EVERYONE,
       metricsDashboardAccessLevel: featureAccessLevel.PROJECT_MEMBERS,
-      requirementsAccessLevel: featureAccessLevel.EVERYONE,
       containerRegistryEnabled: true,
       lfsEnabled: true,
       requestAccessEnabled: true,
@@ -239,10 +233,6 @@ export default {
           featureAccessLevel.PROJECT_MEMBERS,
           this.metricsDashboardAccessLevel,
         );
-        this.requirementsAccessLevel = Math.min(
-          featureAccessLevel.PROJECT_MEMBERS,
-          this.requirementsAccessLevel,
-        );
         if (this.pagesAccessLevel === featureAccessLevel.EVERYONE) {
           // When from Internal->Private narrow access for only members
           this.pagesAccessLevel = featureAccessLevel.PROJECT_MEMBERS;
@@ -266,9 +256,6 @@ export default {
           this.pagesAccessLevel = featureAccessLevel.EVERYONE;
         if (this.metricsDashboardAccessLevel === featureAccessLevel.PROJECT_MEMBERS)
           this.metricsDashboardAccessLevel = featureAccessLevel.EVERYONE;
-        if (this.requirementsAccessLevel === featureAccessLevel.PROJECT_MEMBERS)
-          this.requirementsAccessLevel = featureAccessLevel.EVERYONE;
-
         this.highlightChanges();
       }
     },
@@ -483,18 +470,6 @@ export default {
           />
         </project-setting-row>
       </div>
-      <project-setting-row
-        v-if="requirementsAvailable"
-        ref="requirements-settings"
-        :label="s__('ProjectSettings|Requirements')"
-        :help-text="s__('ProjectSettings|Requirements management system for this project')"
-      >
-        <project-feature-setting
-          v-model="requirementsAccessLevel"
-          :options="featureAccessLevelOptions"
-          name="project[project_feature_attributes][requirements_access_level]"
-        />
-      </project-setting-row>
       <project-setting-row
         ref="wiki-settings"
         :label="s__('ProjectSettings|Wiki')"

app/assets/javascripts/pages/projects/shared/permissions/mixins/settings_pannel_mixin.js

@@ -2,7 +2,6 @@ export default {
   data() {
     return {
       packagesEnabled: false,
-      requirementsEnabled: false,
     };
   },
   watch: {

app/controllers/projects_controller.rb

@@ -356,20 +356,6 @@ class ProjectsController < Projects::ApplicationController
       .merge(import_url_params)
   end
 
-  def project_feature_attributes
-    %i[
-      builds_access_level
-      issues_access_level
-      forking_access_level
-      merge_requests_access_level
-      repository_access_level
-      snippets_access_level
-      wiki_access_level
-      pages_access_level
-      metrics_dashboard_access_level
-    ]
-  end
-
   def project_params_attributes
     [
       :allow_merge_on_skipped_pipeline,
@@ -405,10 +391,22 @@ class ProjectsController < Projects::ApplicationController
       :initialize_with_readme,
       :autoclose_referenced_issues,
       :suggestion_commit_message,
+
+      project_feature_attributes: %i[
+        builds_access_level
+        issues_access_level
+        forking_access_level
+        merge_requests_access_level
+        repository_access_level
+        snippets_access_level
+        wiki_access_level
+        pages_access_level
+        metrics_dashboard_access_level
+      ],
       project_setting_attributes: %i[
         show_default_award_emojis
       ]
-    ] + [project_feature_attributes: project_feature_attributes]
+    ]
   end
 
   def project_params_create_attributes

app/models/concerns/featurable.rb

@@ -37,8 +37,7 @@ module Featurable
 
   class_methods do
     def set_available_features(available_features = [])
-      @available_features ||= []
-      @available_features += available_features
+      @available_features = available_features
 
       class_eval do
         available_features.each do |feature|

app/models/concerns/project_features_compatibility.rb

@@ -88,5 +88,3 @@ module ProjectFeaturesCompatibility
     project_feature.__send__(:write_attribute, field, value) # rubocop:disable GitlabSecurity/PublicSend
   end
 end
-
-ProjectsHelper.prepend_if_ee('EE::ProjectFeaturesCompatibility')

changelogs/unreleased/add_requirements_visibility_access_project_settings.yml

----
-title: Add requirements visibility/access project settings
-merge_request: 34420
-author: Lee Tickett
-type: added

db/migrate/20200615203153_add_requirements_access_level_to_project_features.rb

-# frozen_string_literal: true
-
-class AddRequirementsAccessLevelToProjectFeatures < ActiveRecord::Migration[6.0]
-  include Gitlab::Database::MigrationHelpers
-
-  DOWNTIME = false
-
-  def up
-    with_lock_retries do
-      add_column :project_features, :requirements_access_level, :integer, default: 20, null: false
-    end
-  end
-
-  def down
-    with_lock_retries do
-      remove_column :project_features, :requirements_access_level, :integer
-    end
-  end
-end

db/structure.sql

@@ -13976,8 +13976,7 @@ CREATE TABLE public.project_features (
     repository_access_level integer DEFAULT 20 NOT NULL,
     pages_access_level integer NOT NULL,
     forking_access_level integer,
-    metrics_dashboard_access_level integer,
-    requirements_access_level integer DEFAULT 20 NOT NULL
+    metrics_dashboard_access_level integer
 );
 
 CREATE SEQUENCE public.project_features_id_seq
@@ -23462,7 +23461,6 @@ COPY "schema_migrations" (version) FROM STDIN;
 20200615121217
 20200615123055
 20200615193524
-20200615203153
 20200615232735
 20200615234047
 20200616145031

doc/api/projects.md

@@ -1048,7 +1048,6 @@ POST /projects
 | `wiki_access_level` | string | no | One of `disabled`, `private` or `enabled` |
 | `snippets_access_level` | string | no | One of `disabled`, `private` or `enabled` |
 | `pages_access_level` | string | no | One of `disabled`, `private`, `enabled` or `public` |
-| `requirements_access_level` | string | no | One of `disabled`, `private`, `enabled` or `public` |
 | `emails_disabled` | boolean | no | Disable email notifications |
 | `show_default_award_emojis` | boolean | no | Show default award emojis |
 | `resolve_outdated_diff_discussions` | boolean | no | Automatically resolve merge request diffs discussions on lines changed with a push |
@@ -1120,7 +1119,6 @@ POST /projects/user/:user_id
 | `wiki_access_level` | string | no | One of `disabled`, `private` or `enabled` |
 | `snippets_access_level` | string | no | One of `disabled`, `private` or `enabled` |
 | `pages_access_level` | string | no | One of `disabled`, `private`, `enabled` or `public` |
-| `requirements_access_level` | string | no | One of `disabled`, `private`, `enabled` or `public` |
 | `emails_disabled` | boolean | no | Disable email notifications |
 | `show_default_award_emojis` | boolean | no | Show default award emojis |
 | `resolve_outdated_diff_discussions` | boolean | no | Automatically resolve merge request diffs discussions on lines changed with a push |
@@ -1191,7 +1189,6 @@ PUT /projects/:id
 | `wiki_access_level` | string | no | One of `disabled`, `private` or `enabled` |
 | `snippets_access_level` | string | no | One of `disabled`, `private` or `enabled` |
 | `pages_access_level` | string | no | One of `disabled`, `private`, `enabled` or `public` |
-| `requirements_access_level` | string | no | One of `disabled`, `private`, `enabled` or `public` |
 | `emails_disabled` | boolean | no | Disable email notifications |
 | `show_default_award_emojis` | boolean | no | Show default award emojis |
 | `resolve_outdated_diff_discussions` | boolean | no | Automatically resolve merge request diffs discussions on lines changed with a push |

doc/user/project/settings/index.md

@@ -62,7 +62,6 @@ Use the switches to enable or disable the following features:
 | **Snippets**                      | ✓                         | Enables [sharing of code and text](../../snippets.md)                                                                                                                                          |
 | **Pages**                         | ✓                         | Allows you to [publish static websites](../pages/)                                                                                                                                             |
 | **Metrics Dashboard**             | ✓                         | Control access to [metrics dashboard](../integrations/prometheus.md)
-| **Requirements**                  | ✓                         | Control access to [Requirements Management](../requirements/index.md)
 
 Some features depend on others:
 

ee/app/assets/javascripts/pages/projects/shared/permissions/mixins/settings_pannel_mixin.js

@@ -2,7 +2,6 @@ export default {
   data() {
     return {
       packagesEnabled: true,
-      requirementsEnabled: true,
     };
   },
   watch: {

ee/app/controllers/ee/projects_controller.rb

@@ -49,11 +49,6 @@ module EE
       end
     end
 
-    override :project_feature_attributes
-    def project_feature_attributes
-      super + [:requirements_access_level]
-    end
-
     override :project_params_attributes
     def project_params_attributes
       super + project_params_ee

ee/app/helpers/ee/projects_helper.rb

@@ -53,10 +53,6 @@ module EE
         nav_tabs << :project_insights
       end
 
-      if can?(current_user, :read_requirement, project)
-        nav_tabs << :requirements
-      end
-
       nav_tabs
     end
 
@@ -70,8 +66,7 @@ module EE
     override :project_permissions_settings
     def project_permissions_settings(project)
       super.merge(
-        packagesEnabled: !!project.packages_enabled,
-        requirementsAccessLevel: project.requirements_access_level
+        packagesEnabled: !!project.packages_enabled
       )
     end
 
@@ -79,8 +74,7 @@ module EE
     def project_permissions_panel_data(project)
       super.merge(
         packagesAvailable: ::Gitlab.config.packages.enabled && project.feature_available?(:packages),
-        packagesHelpPath: help_page_path('user/packages/index'),
-        requirementsAvailable: project.feature_available?(:requirements)
+        packagesHelpPath: help_page_path('user/packages/index')
       )
     end
 

ee/app/models/concerns/ee/project_features_compatibility.rb

-# frozen_string_literal: true
-
-module EE
-  module ProjectFeaturesCompatibility
-    extend ActiveSupport::Concern
-
-    # TODO: remove in API v5, replaced by *_access_level
-    def requirements_enabled=(value)
-      write_feature_attribute_boolean(:requirements_access_level, value)
-    end
-
-    def requirements_access_level=(value)
-      write_feature_attribute_string(:requirements_access_level, value)
-    end
-  end
-end

ee/app/models/ee/project.rb

@@ -167,8 +167,6 @@ module EE
       delegate :merge_trains_enabled?, to: :ci_cd_settings
       delegate :closest_gitlab_subscription, to: :namespace
 
-      delegate :requirements_access_level, to: :project_feature, allow_nil: true
-
       validates :repository_size_limit,
         numericality: { only_integer: true, greater_than_or_equal_to: 0, allow_nil: true }
       validates :max_pages_size,
@@ -186,7 +184,6 @@ module EE
       end
 
       default_value_for :packages_enabled, true
-      default_value_for :requirements_enabled, true
 
       accepts_nested_attributes_for :tracing_setting, update_only: true, allow_destroy: true
       accepts_nested_attributes_for :status_page_setting, update_only: true, allow_destroy: true

ee/app/models/ee/project_feature.rb

@@ -4,17 +4,11 @@ module EE
   module ProjectFeature
     extend ActiveSupport::Concern
 
-    EE_FEATURES = %i(requirements).freeze
-
     prepended do
-      set_available_features(available_features + EE_FEATURES)
-
       # Ensure changes to project visibility settings go to elasticsearch
       after_commit on: :update do
         project.maintain_elasticsearch_update if project.maintaining_elasticsearch?
       end
-
-      default_value_for :requirements_access_level, value: Featurable::ENABLED, allows_nil: false
     end
   end
 end

ee/app/policies/ee/project_policy.rb

@@ -34,7 +34,7 @@ module EE
       condition(:iterations_available) { @subject.feature_available?(:iterations) }
 
       with_scope :subject
-      condition(:requirements_available) { @subject.feature_available?(:requirements) & feature_available?(:requirements) }
+      condition(:requirements_available) { @subject.feature_available?(:requirements) }
 
       condition(:compliance_framework_available) { @subject.feature_available?(:compliance_framework, @user) }
 

ee/app/views/layouts/nav/_requirements_link.html.haml

 - return unless Feature.enabled?(:requirements_management, project, default_enabled: true)
-- return unless project_nav_tab? :requirements
+- return unless can?(current_user, :read_requirement, project)
 
 = nav_link(path: 'requirements#index') do
   = link_to project_requirements_management_requirements_path(project), class: 'qa-project-requirements-link' do

ee/lib/ee/api/entities/project.rb

@@ -31,9 +31,6 @@ module EE
           expose :marked_for_deletion_on, if: ->(project, _) { project.feature_available?(:adjourned_deletion_for_projects_and_groups) } do |project, _|
             project.marked_for_deletion_at
           end
-          expose :requirements_enabled do |project, options|
-            project.feature_available?(:requirements, options[:current_user])
-          end
           expose :compliance_frameworks do |project, _|
             [project.compliance_framework_setting&.framework].compact
           end

ee/lib/ee/audit/project_feature_changes_auditor.rb

@@ -13,8 +13,7 @@ module EE
                  :builds_access_level,
                  :repository_access_level,
                  :pages_access_level,
-                 :metrics_dashboard_access_level,
-                 :requirements_access_level].freeze
+                 :metrics_dashboard_access_level].freeze
 
       def initialize(current_user, model, project)
         @project = project

ee/spec/controllers/projects/requirements_management/requirements_controller_spec.rb

@@ -3,48 +3,33 @@
 require 'spec_helper'
 
 RSpec.describe Projects::RequirementsManagement::RequirementsController do
+  let_it_be(:project) { create(:project) }
   let_it_be(:user) { create(:user) }
 
   subject { get :index, params: { namespace_id: project.namespace, project_id: project } }
 
   describe 'GET #index' do
-    context 'private project' do
-      let(:project) { create(:project) }
+    context 'with authorized user' do
+      before do
+        project.add_developer(user)
+        sign_in(user)
+      end
 
-      context 'with authorized user' do
+      context 'when feature is available' do
         before do
-          project.add_developer(user)
-          sign_in(user)
+          stub_licensed_features(requirements: true)
         end
 
-        context 'when feature is available' do
-          before do
-            stub_licensed_features(requirements: true)
-          end
-
-          it 'renders the index template' do
-            subject
-
-            expect(response).to have_gitlab_http_status(:ok)
-            expect(response).to render_template(:index)
-          end
-
-          context 'when requirements_management flag is disabled' do
-            before do
-              stub_feature_flags(requirements_management: false)
-            end
-
-            it 'returns 404' do
-              subject
+        it 'renders the index template' do
+          subject
 
-              expect(response).to have_gitlab_http_status(:not_found)
-            end
-          end
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(response).to render_template(:index)
         end
 
-        context 'when feature is not available' do
+        context 'when requirements_management flag is disabled' do
           before do
-            stub_licensed_features(requirements: false)
+            stub_feature_flags(requirements_management: false)
           end
 
           it 'returns 404' do
@@ -55,46 +40,27 @@ RSpec.describe Projects::RequirementsManagement::RequirementsController do
         end
       end
 
-      context 'with unauthorized user' do
+      context 'when feature is not available' do
         before do
-          sign_in(user)
-        end
-
-        context 'when feature is available' do
-          before do
-            stub_licensed_features(requirements: true)
-          end
-
-          it 'returns 404' do
-            subject
-
-            expect(response).to have_gitlab_http_status(:not_found)
-          end
+          stub_licensed_features(requirements: false)
         end
-      end
 
-      context 'with anonymous user' do
-        it 'returns 302' do
+        it 'returns 404' do
           subject
 
-          expect(response).to have_gitlab_http_status(:found)
-          expect(response).to redirect_to(new_user_session_path)
+          expect(response).to have_gitlab_http_status(:not_found)
         end
       end
     end
 
-    context 'public project' do
-      let(:project) { create(:project, :public) }
-
+    context 'with unauthorized user' do
       before do
-        stub_licensed_features(requirements: true)
+        sign_in(user)
       end
 
-      context 'with requirements disabled' do
+      context 'when feature is available' do
         before do
-          project.project_feature.update!({ requirements_access_level: ::ProjectFeature::DISABLED })
-          project.add_developer(user)
-          sign_in(user)
+          stub_licensed_features(requirements: true)
         end
 
         it 'returns 404' do
@@ -103,52 +69,14 @@ RSpec.describe Projects::RequirementsManagement::RequirementsController do
           expect(response).to have_gitlab_http_status(:not_found)
         end
       end
+    end
 
-      context 'with requirements visible to project memebers' do
-        before do
-          project.project_feature.update!({ requirements_access_level: ::ProjectFeature::PRIVATE })
-        end
-
-        context 'with authorized user' do
-          before do
-            project.add_developer(user)
-            sign_in(user)
-          end
-
-          it 'renders the index template' do
-            subject
-
-            expect(response).to have_gitlab_http_status(:ok)
-            expect(response).to render_template(:index)
-          end
-        end
-
-        context 'with unauthorized user' do
-          before do
-            sign_in(user)
-          end
-
-          it 'returns 404' do
-            subject
-
-            expect(response).to have_gitlab_http_status(:not_found)
-          end
-        end
-      end
-
-      context 'with requirements visible to everyone' do
-        before do
-          project.project_feature.update!({ requirements_access_level: ::ProjectFeature::ENABLED })
-        end
-
-        context 'with anonymous user' do
-          it 'renders the index template' do
-            subject
+    context 'with anonymous user' do
+      it 'returns 302' do
+        subject
 
-            expect(response).to have_gitlab_http_status(:ok)
-            expect(response).to render_template(:index)
-          end
-        end
+        expect(response).to have_gitlab_http_status(:found)
+        expect(response).to redirect_to(new_user_session_path)
       end
     end
   end

ee/spec/factories/projects.rb

@@ -76,10 +76,6 @@ FactoryBot.modify do
       service_desk_enabled { true }
     end
 
-    trait(:issues_enabled) do
-      issues_access_level { ProjectFeature::ENABLED }
-    end
-
     trait :github_imported do
       import_type { 'github' }
     end

ee/spec/support/shared_examples/policies/requirement_policy_shared_examples.rb

 # frozen_string_literal: true
 
 RSpec.shared_examples 'resource with requirement permissions' do
-  include AdminModeHelper
-
   let(:all_permissions) do
     [:read_requirement, :create_requirement, :admin_requirement,
      :update_requirement, :destroy_requirement,
@@ -79,82 +77,6 @@ RSpec.shared_examples 'resource with requirement permissions' do
         it { is_expected.to be_disallowed(*all_permissions) }
       end
     end
-
-    context 'when access level is disabled' do
-      before do
-        parent = resource.is_a?(Project) ? resource : resource.resource_parent
-        parent.project_feature.update!(requirements_access_level: ProjectFeature::DISABLED)
-      end
-
-      context 'with owner' do
-        let(:current_user) { owner }
-
-        it { is_expected.to be_disallowed(*all_permissions) }
-      end
-
-      context 'with admin' do
-        let(:current_user) { admin }
-
-        it { is_expected.to be_disallowed(*all_permissions) }
-      end
-    end
-
-    context 'when access level is private' do
-      before do
-        parent = resource.is_a?(Project) ? resource : resource.resource_parent
-        parent.project_feature.update!(requirements_access_level: ProjectFeature::PRIVATE)
-      end
-
-      context 'with admin' do
-        let(:current_user) { admin }
-
-        it { is_expected.to be_disallowed(*all_permissions) }
-
-        context 'with ' do
-          before do
-            enable_admin_mode!(current_user)
-          end
-
-          it_behaves_like 'user with read only permissions'
-        end
-      end
-
-      context 'with owner' do
-        let(:current_user) { owner }
-
-        it { is_expected.to be_allowed(*all_permissions) }
-      end
-
-      context 'with maintainer' do
-        let(:current_user) { maintainer }
-
-        it_behaves_like 'user with manage permissions'
-      end
-
-      context 'with developer' do
-        let(:current_user) { developer }
-
-        it_behaves_like 'user with manage permissions'
-      end
-
-      context 'with reporter' do
-        let(:current_user) { reporter }
-
-        it_behaves_like 'user with manage permissions'
-      end
-
-      context 'with guest' do
-        let(:current_user) { guest }
-
-        it_behaves_like 'user with read only permissions'
-      end
-
-      context 'with non member' do
-        let(:current_user) { create(:user) }
-
-        it { is_expected.to be_disallowed(*all_permissions) }
-      end
-    end
   end
 
   context 'when requirements feature is disabled' do

locale/gitlab.pot

@@ -17788,12 +17788,6 @@ msgstr ""
 msgid "ProjectSettings|Repository"
 msgstr ""
 
-msgid "ProjectSettings|Requirements"
-msgstr ""
-
-msgid "ProjectSettings|Requirements management system for this project"
-msgstr ""
-
 msgid "ProjectSettings|Share code pastes with others out of Git repository"
 msgstr ""
 

spec/lib/gitlab/import_export/safe_model_attributes.yml

@@ -533,7 +533,6 @@ Project:
 - merge_requests_enabled
 - wiki_enabled
 - snippets_enabled
-- requirements_enabled
 - visibility_level
 - archived
 - created_at
@@ -601,7 +600,6 @@ ProjectFeature:
 - repository_access_level
 - pages_access_level
 - metrics_dashboard_access_level
-- requirements_access_level
 - created_at
 - updated_at
 ProtectedBranch::MergeAccessLevel:

spec/policies/project_policy_spec.rb

@@ -80,7 +80,6 @@ RSpec.describe ProjectPolicy do
   let(:additional_guest_permissions) { [] }
   let(:additional_reporter_permissions) { [] }
   let(:additional_maintainer_permissions) { [] }
-  let(:additional_owner_permissions) { [] }
 
   let(:guest_permissions) { base_guest_permissions + additional_guest_permissions }
   let(:reporter_permissions) { base_reporter_permissions + additional_reporter_permissions }