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
971e4bfe
Commit
971e4bfe
authored
Jul 09, 2021
by
David Fernandez
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'helm_fix_context_path' into 'master'
Fix helm context path See merge request gitlab-org/gitlab!65770
parents
dfe060f0
50147826
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/presenters/packages/helm/index_presenter.rb
app/presenters/packages/helm/index_presenter.rb
+1
-1
spec/support/shared_examples/requests/api/helm_packages_shared_examples.rb
...ed_examples/requests/api/helm_packages_shared_examples.rb
+1
-1
No files found.
app/presenters/packages/helm/index_presenter.rb
View file @
971e4bfe
...
@@ -45,7 +45,7 @@ module Packages
...
@@ -45,7 +45,7 @@ module Packages
channel:
CHANNEL
channel:
CHANNEL
)
)
{
{
'contextPath'
=>
expose_url
(
path
.
delete_suffix
(
INDEX_YAML_SUFFIX
)
)
'contextPath'
=>
path
.
delete_suffix
(
INDEX_YAML_SUFFIX
)
}
}
end
end
end
end
...
...
spec/support/shared_examples/requests/api/helm_packages_shared_examples.rb
View file @
971e4bfe
...
@@ -37,7 +37,7 @@ RSpec.shared_examples 'process helm service index request' do |user_type, status
...
@@ -37,7 +37,7 @@ RSpec.shared_examples 'process helm service index request' do |user_type, status
expect
(
yaml_response
.
keys
).
to
contain_exactly
(
'apiVersion'
,
'entries'
,
'generated'
,
'serverInfo'
)
expect
(
yaml_response
.
keys
).
to
contain_exactly
(
'apiVersion'
,
'entries'
,
'generated'
,
'serverInfo'
)
expect
(
yaml_response
[
'entries'
]).
to
be_a
(
Hash
)
expect
(
yaml_response
[
'entries'
]).
to
be_a
(
Hash
)
expect
(
yaml_response
[
'entries'
].
keys
).
to
contain_exactly
(
package
.
name
)
expect
(
yaml_response
[
'entries'
].
keys
).
to
contain_exactly
(
package
.
name
)
expect
(
yaml_response
[
'serverInfo'
]).
to
eq
({
'contextPath'
=>
"
http://localhost
/api/v4/projects/
#{
project
.
id
}
/packages/helm"
})
expect
(
yaml_response
[
'serverInfo'
]).
to
eq
({
'contextPath'
=>
"/api/v4/projects/
#{
project
.
id
}
/packages/helm"
})
package_entry
=
yaml_response
[
'entries'
][
package
.
name
]
package_entry
=
yaml_response
[
'entries'
][
package
.
name
]
...
...
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