Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
09be7938
Commit
09be7938
authored
Apr 20, 2020
by
Felipe Artur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Downgrade service desk to starter plan
Moves service desk feature from premium to starter
parent
e934aee7
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
21 additions
and
24 deletions
+21
-24
doc/user/project/issues/managing_issues.md
doc/user/project/issues/managing_issues.md
+1
-1
doc/user/project/service_desk.md
doc/user/project/service_desk.md
+1
-1
doc/user/project/settings/index.md
doc/user/project/settings/index.md
+2
-2
ee/app/models/license.rb
ee/app/models/license.rb
+1
-1
ee/changelogs/unreleased/issue_214839_1.yml
ee/changelogs/unreleased/issue_214839_1.yml
+5
-0
ee/spec/features/projects/navbar_spec.rb
ee/spec/features/projects/navbar_spec.rb
+6
-16
ee/spec/lib/gitlab/email/handler/ee/service_desk_handler_spec.rb
.../lib/gitlab/email/handler/ee/service_desk_handler_spec.rb
+1
-1
ee/spec/models/ee/namespace_spec.rb
ee/spec/models/ee/namespace_spec.rb
+1
-1
ee/spec/models/project_spec.rb
ee/spec/models/project_spec.rb
+1
-1
spec/features/projects/navbar_spec.rb
spec/features/projects/navbar_spec.rb
+2
-0
No files found.
doc/user/project/issues/managing_issues.md
View file @
09be7938
...
@@ -50,7 +50,7 @@ create issues for the same project.
...
@@ -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
)
![
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.
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
By doing so, when your customer sends a new email, a new issue can be created in
...
...
doc/user/project/service_desk.md
View file @
09be7938
# 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).
> [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
View file @
09be7938
...
@@ -67,7 +67,7 @@ Some features depend on others:
...
@@ -67,7 +67,7 @@ Some features depend on others:
-
If you disable the
**Issues**
option, GitLab also removes the following
-
If you disable the
**Issues**
option, GitLab also removes the following
features:
features:
-
**Issue Boards**
-
**Issue Boards**
-
[
**Service Desk**
](
#service-desk-
premium
)
**(PREMIUM
)**
-
[
**Service Desk**
](
#service-desk-
starter
)
**(STARTER
)**
NOTE:
**Note:**
NOTE:
**Note:**
When the
**Issues**
option is disabled, you can still access
**Milestones**
When the
**Issues**
option is disabled, you can still access
**Milestones**
...
@@ -106,7 +106,7 @@ Set up your project's merge request settings:
...
@@ -106,7 +106,7 @@ Set up your project's merge request settings:
![
project's merge request settings
](
img/merge_requests_settings.png
)
![
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.
Enable
[
Service Desk
](
../service_desk.md
)
for your project to offer customer support.
...
...
ee/app/models/license.rb
View file @
09be7938
...
@@ -35,6 +35,7 @@ class License < ApplicationRecord
...
@@ -35,6 +35,7 @@ class License < ApplicationRecord
repository_mirrors
repository_mirrors
repository_size_limit
repository_size_limit
seat_link
seat_link
service_desk
scoped_issue_board
scoped_issue_board
usage_quotas
usage_quotas
visual_review_app
visual_review_app
...
@@ -95,7 +96,6 @@ class License < ApplicationRecord
...
@@ -95,7 +96,6 @@ class License < ApplicationRecord
reject_unsigned_commits
reject_unsigned_commits
required_ci_templates
required_ci_templates
scoped_labels
scoped_labels
service_desk
smartcard_auth
smartcard_auth
group_timelogs
group_timelogs
type_of_work_analytics
type_of_work_analytics
...
...
ee/changelogs/unreleased/issue_214839_1.yml
0 → 100644
View file @
09be7938
---
title
:
Move service desk from Premium to Starter plan
merge_request
:
29980
author
:
type
:
other
ee/spec/features/projects/navbar_spec.rb
View file @
09be7938
...
@@ -11,6 +11,12 @@ describe 'Project navbar' do
...
@@ -11,6 +11,12 @@ describe 'Project navbar' do
let_it_be
(
:project
)
{
create
(
:project
,
:repository
)
}
let_it_be
(
:project
)
{
create
(
:project
,
:repository
)
}
before
do
before
do
insert_after_sub_nav_item
(
_
(
'Labels'
),
within:
_
(
'Issues'
),
new_sub_nav_item_name:
_
(
'Service Desk'
)
)
project
.
add_maintainer
(
user
)
project
.
add_maintainer
(
user
)
sign_in
(
user
)
sign_in
(
user
)
end
end
...
@@ -31,22 +37,6 @@ describe 'Project navbar' do
...
@@ -31,22 +37,6 @@ describe 'Project navbar' do
it_behaves_like
'verified navigation bar'
it_behaves_like
'verified navigation bar'
end
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
context
'when security dashboard is available'
do
before
do
before
do
stub_licensed_features
(
security_dashboard:
true
)
stub_licensed_features
(
security_dashboard:
true
)
...
...
ee/spec/lib/gitlab/email/handler/ee/service_desk_handler_spec.rb
View file @
09be7938
...
@@ -290,7 +290,7 @@ describe Gitlab::Email::Handler::EE::ServiceDeskHandler do
...
@@ -290,7 +290,7 @@ describe Gitlab::Email::Handler::EE::ServiceDeskHandler do
end
end
context
'service desk is disabled for the project'
do
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
it
'bounces the email'
do
expect
{
receiver
.
execute
}.
to
raise_error
(
Gitlab
::
Email
::
ProcessingError
)
expect
{
receiver
.
execute
}.
to
raise_error
(
Gitlab
::
Email
::
ProcessingError
)
...
...
ee/spec/models/ee/namespace_spec.rb
View file @
09be7938
...
@@ -244,7 +244,7 @@ describe Namespace do
...
@@ -244,7 +244,7 @@ describe Namespace do
describe
'#feature_available?'
do
describe
'#feature_available?'
do
let
(
:hosted_plan
)
{
create
(
:bronze_plan
)
}
let
(
:hosted_plan
)
{
create
(
:bronze_plan
)
}
let
(
:group
)
{
create
(
:group
)
}
let
(
:group
)
{
create
(
:group
)
}
let
(
:licensed_feature
)
{
:
service_desk
}
let
(
:licensed_feature
)
{
:
epics
}
let
(
:feature
)
{
licensed_feature
}
let
(
:feature
)
{
licensed_feature
}
subject
{
group
.
feature_available?
(
feature
)
}
subject
{
group
.
feature_available?
(
feature
)
}
...
...
ee/spec/models/project_spec.rb
View file @
09be7938
...
@@ -1433,7 +1433,7 @@ describe Project do
...
@@ -1433,7 +1433,7 @@ describe Project do
let
(
:plan_license
)
{
:bronze
}
let
(
:plan_license
)
{
:bronze
}
it
'filters for bronze features'
do
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
end
end
...
...
spec/features/projects/navbar_spec.rb
View file @
09be7938
...
@@ -12,6 +12,8 @@ describe 'Project navbar' do
...
@@ -12,6 +12,8 @@ describe 'Project navbar' do
let_it_be
(
:project
)
{
create
(
:project
,
:repository
)
}
let_it_be
(
:project
)
{
create
(
:project
,
:repository
)
}
before
do
before
do
stub_licensed_features
(
service_desk:
false
)
project
.
add_maintainer
(
user
)
project
.
add_maintainer
(
user
)
sign_in
(
user
)
sign_in
(
user
)
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment