Merge branch 'issue_214839_1' into 'master'

Downgrade service desk to starter plan

See merge request gitlab-org/gitlab!29980

doc/user/project/issues/managing_issues.md

@@ -50,7 +50,7 @@ create issues for the same project.
 
 ![Create issue from group-level issue tracker](img/create_issue_from_group_level_issue_tracker.png)
 
-### New issue via Service Desk **(PREMIUM)**
+### New issue via Service Desk **(STARTER)**
 
 Enable [Service Desk](../service_desk.md) for your project and offer email support.
 By doing so, when your customer sends a new email, a new issue can be created in

doc/user/project/service_desk.md

-# Service Desk **(PREMIUM)**
+# Service Desk **(Starter)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/149) in [GitLab Premium 9.1](https://about.gitlab.com/releases/2017/04/22/gitlab-9-1-released/#service-desk-eep).
 

doc/user/project/settings/index.md

@@ -67,7 +67,7 @@ Some features depend on others:
 - If you disable the **Issues** option, GitLab also removes the following
   features:
   - **Issue Boards**
-  - [**Service Desk**](#service-desk-premium) **(PREMIUM)**
+  - [**Service Desk**](#service-desk-starter) **(STARTER)**
 
   NOTE: **Note:**
   When the **Issues** option is disabled, you can still access **Milestones**
@@ -106,7 +106,7 @@ Set up your project's merge request settings:
 
 ![project's merge request settings](img/merge_requests_settings.png)
 
-### Service Desk **(PREMIUM)**
+### Service Desk **(STARTER)**
 
 Enable [Service Desk](../service_desk.md) for your project to offer customer support.
 

ee/app/models/license.rb

@@ -35,6 +35,7 @@ class License < ApplicationRecord
     repository_mirrors
     repository_size_limit
     seat_link
+    service_desk
     scoped_issue_board
     usage_quotas
     visual_review_app
@@ -96,7 +97,6 @@ class License < ApplicationRecord
     reject_unsigned_commits
     required_ci_templates
     scoped_labels
-    service_desk
     smartcard_auth
     group_timelogs
     type_of_work_analytics

ee/changelogs/unreleased/issue_214839_1.yml

+---
+title: Move service desk from Premium to Starter plan
+merge_request: 29980
+author:
+type: other

ee/spec/features/projects/navbar_spec.rb

@@ -11,6 +11,12 @@ describe 'Project navbar' do
   let_it_be(:project) { create(:project, :repository) }
 
   before do
+    insert_after_sub_nav_item(
+      _('Labels'),
+      within: _('Issues'),
+      new_sub_nav_item_name: _('Service Desk')
+    )
+
     project.add_maintainer(user)
     sign_in(user)
   end
@@ -31,22 +37,6 @@ describe 'Project navbar' do
     it_behaves_like 'verified navigation bar'
   end
 
-  context 'when service desk is available' do
-    before do
-      stub_licensed_features(service_desk: true)
-
-      insert_after_sub_nav_item(
-        _('Labels'),
-        within: _('Issues'),
-        new_sub_nav_item_name: _('Service Desk')
-      )
-
-      visit project_path(project)
-    end
-
-    it_behaves_like 'verified navigation bar'
-  end
-
   context 'when security dashboard is available' do
     before do
       stub_licensed_features(security_dashboard: true)

ee/spec/lib/gitlab/email/handler/ee/service_desk_handler_spec.rb

@@ -290,7 +290,7 @@ describe Gitlab::Email::Handler::EE::ServiceDeskHandler do
   end
 
   context 'service desk is disabled for the project' do
-    let(:project) { create(:project, :public, namespace: namespace, path: 'test') }
+    let(:project) { create(:project, :public, namespace: namespace, path: 'test', service_desk_enabled: false) }
 
     it 'bounces the email' do
       expect { receiver.execute }.to raise_error(Gitlab::Email::ProcessingError)

ee/spec/models/ee/namespace_spec.rb

@@ -244,7 +244,7 @@ describe Namespace do
   describe '#feature_available?' do
     let(:hosted_plan) { create(:bronze_plan) }
     let(:group) { create(:group) }
-    let(:licensed_feature) { :service_desk }
+    let(:licensed_feature) { :epics }
     let(:feature) { licensed_feature }
 
     subject { group.feature_available?(feature) }

ee/spec/models/project_spec.rb

@@ -1433,7 +1433,7 @@ describe Project do
         let(:plan_license) { :bronze }
 
         it 'filters for bronze features' do
-          is_expected.to contain_exactly(:audit_events, :geo)
+          is_expected.to contain_exactly(:audit_events, :geo, :service_desk)
         end
       end
 

spec/features/projects/navbar_spec.rb

@@ -12,6 +12,8 @@ describe 'Project navbar' do
   let_it_be(:project) { create(:project, :repository) }
 
   before do
+    stub_licensed_features(service_desk: false)
+
     project.add_maintainer(user)
     sign_in(user)
   end