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
b745e1cf
Commit
b745e1cf
authored
Dec 02, 2021
by
Jarka Košanová
Committed by
GitLab Release Tools Bot
Dec 02, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix service desk email visibility in API
parent
3f9e766e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
2 deletions
+26
-2
lib/api/entities/project.rb
lib/api/entities/project.rb
+3
-1
spec/lib/api/entities/project_spec.rb
spec/lib/api/entities/project_spec.rb
+22
-0
spec/requests/api/projects_spec.rb
spec/requests/api/projects_spec.rb
+1
-1
No files found.
lib/api/entities/project.rb
View file @
b745e1cf
...
@@ -55,7 +55,9 @@ module API
...
@@ -55,7 +55,9 @@ module API
expose
(
:snippets_enabled
)
{
|
project
,
options
|
project
.
feature_available?
(
:snippets
,
options
[
:current_user
])
}
expose
(
:snippets_enabled
)
{
|
project
,
options
|
project
.
feature_available?
(
:snippets
,
options
[
:current_user
])
}
expose
(
:container_registry_enabled
)
{
|
project
,
options
|
project
.
feature_available?
(
:container_registry
,
options
[
:current_user
])
}
expose
(
:container_registry_enabled
)
{
|
project
,
options
|
project
.
feature_available?
(
:container_registry
,
options
[
:current_user
])
}
expose
:service_desk_enabled
expose
:service_desk_enabled
expose
:service_desk_address
expose
:service_desk_address
,
if:
->
(
project
,
options
)
do
Ability
.
allowed?
(
options
[
:current_user
],
:admin_issue
,
project
)
end
expose
(
:can_create_merge_request_in
)
do
|
project
,
options
|
expose
(
:can_create_merge_request_in
)
do
|
project
,
options
|
Ability
.
allowed?
(
options
[
:current_user
],
:create_merge_request_in
,
project
)
Ability
.
allowed?
(
options
[
:current_user
],
:create_merge_request_in
,
project
)
...
...
spec/lib/api/entities/project_spec.rb
View file @
b745e1cf
...
@@ -13,6 +13,28 @@ RSpec.describe ::API::Entities::Project do
...
@@ -13,6 +13,28 @@ RSpec.describe ::API::Entities::Project do
subject
(
:json
)
{
entity
.
as_json
}
subject
(
:json
)
{
entity
.
as_json
}
describe
'.service_desk_address'
do
before
do
allow
(
project
).
to
receive
(
:service_desk_enabled?
).
and_return
(
true
)
end
context
'when a user can admin issues'
do
before
do
project
.
add_reporter
(
current_user
)
end
it
'is present'
do
expect
(
json
[
:service_desk_address
]).
to
be_present
end
end
context
'when a user can not admin project'
do
it
'is empty'
do
expect
(
json
[
:service_desk_address
]).
to
be_nil
end
end
end
describe
'.shared_with_groups'
do
describe
'.shared_with_groups'
do
let
(
:group
)
{
create
(
:group
,
:private
)
}
let
(
:group
)
{
create
(
:group
,
:private
)
}
...
...
spec/requests/api/projects_spec.rb
View file @
b745e1cf
...
@@ -225,7 +225,7 @@ RSpec.describe API::Projects do
...
@@ -225,7 +225,7 @@ RSpec.describe API::Projects do
create
(
:project
,
:public
,
group:
create
(
:group
))
create
(
:project
,
:public
,
group:
create
(
:group
))
end
end
it_behaves_like
'projects response without N + 1 queries'
,
0
do
it_behaves_like
'projects response without N + 1 queries'
,
1
do
let
(
:current_user
)
{
user
}
let
(
:current_user
)
{
user
}
let
(
:additional_project
)
{
create
(
:project
,
:public
,
group:
create
(
:group
))
}
let
(
:additional_project
)
{
create
(
:project
,
:public
,
group:
create
(
:group
))
}
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