Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
f38bcf2e44
commit
47efbe732c
|
@ -11,6 +11,7 @@ export default () => {
|
||||||
url: el.dataset.endpoint,
|
url: el.dataset.endpoint,
|
||||||
dom_id: '#js-openapi-viewer',
|
dom_id: '#js-openapi-viewer',
|
||||||
deepLinking: true,
|
deepLinking: true,
|
||||||
|
displayOperationId: true,
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
|
|
|
@ -15,11 +15,6 @@ class Admin::RunnersController < Admin::ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
# We will show runner details in a read-only view in
|
|
||||||
# future iterations. For now, this route will have a
|
|
||||||
# redirect until this new view is developed. See more:
|
|
||||||
# https://gitlab.com/gitlab-org/gitlab/-/issues/347856
|
|
||||||
redirect_to edit_admin_runner_path(runner) unless Feature.enabled?(:runner_read_only_admin_view, default_enabled: :yaml)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def edit
|
def edit
|
||||||
|
|
|
@ -1,12 +1,8 @@
|
||||||
- runner_name = "##{@runner.id} (#{@runner.short_sha})"
|
- runner_name = "##{@runner.id} (#{@runner.short_sha})"
|
||||||
- if Feature.enabled?(:runner_read_only_admin_view, default_enabled: :yaml)
|
- breadcrumb_title _('Edit')
|
||||||
- breadcrumb_title _('Edit')
|
- page_title _('Edit'), runner_name
|
||||||
- page_title _('Edit'), runner_name
|
- add_to_breadcrumbs _('Runners'), admin_runners_path
|
||||||
- add_to_breadcrumbs _('Runners'), admin_runners_path
|
- add_to_breadcrumbs runner_name, admin_runner_path(@runner)
|
||||||
- add_to_breadcrumbs runner_name, admin_runner_path(@runner)
|
|
||||||
- else
|
|
||||||
- breadcrumb_title runner_name
|
|
||||||
- page_title runner_name
|
|
||||||
|
|
||||||
#js-admin-runner-edit{ data: {runner_id: @runner.id, runner_path: admin_runner_path(@runner) } }
|
#js-admin-runner-edit{ data: {runner_id: @runner.id, runner_path: admin_runner_path(@runner) } }
|
||||||
|
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
---
|
|
||||||
name: runner_read_only_admin_view
|
|
||||||
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77682
|
|
||||||
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350164
|
|
||||||
milestone: '14.7'
|
|
||||||
type: development
|
|
||||||
group: group::runner
|
|
||||||
default_enabled: true
|
|
|
@ -32,15 +32,6 @@ RSpec.describe Admin::RunnersController do
|
||||||
expect(response).to have_gitlab_http_status(:ok)
|
expect(response).to have_gitlab_http_status(:ok)
|
||||||
expect(response).to render_template(:show)
|
expect(response).to render_template(:show)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'when runner_read_only_admin_view is off, redirects to the runner edit page' do
|
|
||||||
stub_feature_flags(runner_read_only_admin_view: false)
|
|
||||||
|
|
||||||
get :show, params: { id: runner.id }
|
|
||||||
|
|
||||||
expect(response).to have_gitlab_http_status(:redirect)
|
|
||||||
expect(response).to redirect_to edit_admin_runner_path(runner)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '#edit' do
|
describe '#edit' do
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
import { SwaggerUIBundle } from 'swagger-ui-dist';
|
||||||
|
import renderOpenApi from '~/blob/openapi';
|
||||||
|
|
||||||
|
jest.mock('swagger-ui-dist');
|
||||||
|
|
||||||
|
describe('OpenAPI blob viewer', () => {
|
||||||
|
const id = 'js-openapi-viewer';
|
||||||
|
const mockEndpoint = 'some/endpoint';
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
setFixtures(`<div id="${id}" data-endpoint="${mockEndpoint}"></div>`);
|
||||||
|
renderOpenApi();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('initializes SwaggerUI with the correct configuration', () => {
|
||||||
|
expect(SwaggerUIBundle).toHaveBeenCalledWith({
|
||||||
|
url: mockEndpoint,
|
||||||
|
dom_id: `#${id}`,
|
||||||
|
deepLinking: true,
|
||||||
|
displayOperationId: true,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
Loading…
Reference in New Issue