Add latest changes from gitlab-org/gitlab@master

6 files changed, 28 insertions, 30 deletions

diff --git a/app/assets/javascripts/blob/openapi/index.js b/app/assets/javascripts/blob/openapi/index.js
index a04da98ff77..4c497db9842 100644
--- a/app/assets/javascripts/blob/openapi/index.js
+++ b/app/assets/javascripts/blob/openapi/index.js
@@ -11,6 +11,7 @@ export default () => {
         url: el.dataset.endpoint,
         dom_id: '#js-openapi-viewer',
         deepLinking: true,
+        displayOperationId: true,
       });
     })
     .catch((error) => {
diff --git a/app/controllers/admin/runners_controller.rb b/app/controllers/admin/runners_controller.rb
index df9d125b377..4a3139066f1 100644
--- a/app/controllers/admin/runners_controller.rb
+++ b/app/controllers/admin/runners_controller.rb
@@ -15,11 +15,6 @@ class Admin::RunnersController < Admin::ApplicationController
   end
 
   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
 
   def edit
diff --git a/app/views/admin/runners/edit.html.haml b/app/views/admin/runners/edit.html.haml
index dba18b2f608..ccdfe67ea77 100644
--- a/app/views/admin/runners/edit.html.haml
+++ b/app/views/admin/runners/edit.html.haml
@@ -1,12 +1,8 @@
 - runner_name = "##{@runner.id} (#{@runner.short_sha})"
-- if Feature.enabled?(:runner_read_only_admin_view, default_enabled: :yaml)
-  - breadcrumb_title _('Edit')
-  - page_title _('Edit'), runner_name
-  - add_to_breadcrumbs _('Runners'), admin_runners_path
-  - add_to_breadcrumbs runner_name, admin_runner_path(@runner)
-- else
-  - breadcrumb_title runner_name
-  - page_title runner_name
+- breadcrumb_title _('Edit')
+- page_title _('Edit'), runner_name
+- add_to_breadcrumbs _('Runners'), admin_runners_path
+- add_to_breadcrumbs runner_name, admin_runner_path(@runner)
 
 #js-admin-runner-edit{ data: {runner_id: @runner.id, runner_path: admin_runner_path(@runner) } }
 
diff --git a/config/feature_flags/development/runner_read_only_admin_view.yml b/config/feature_flags/development/runner_read_only_admin_view.yml
deleted file mode 100644
index 7a412e70dd9..00000000000
--- a/config/feature_flags/development/runner_read_only_admin_view.yml
+++ /dev/null
@@ -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
diff --git a/spec/controllers/admin/runners_controller_spec.rb b/spec/controllers/admin/runners_controller_spec.rb
index 8bdfbdcb46f..fea59969400 100644
--- a/spec/controllers/admin/runners_controller_spec.rb
+++ b/spec/controllers/admin/runners_controller_spec.rb
@@ -32,15 +32,6 @@ RSpec.describe Admin::RunnersController do
       expect(response).to have_gitlab_http_status(:ok)
       expect(response).to render_template(:show)
     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
 
   describe '#edit' do
diff --git a/spec/frontend/blob/openapi/index_spec.js b/spec/frontend/blob/openapi/index_spec.js
new file mode 100644
index 00000000000..4b3d3ce2d35
--- /dev/null
+++ b/spec/frontend/blob/openapi/index_spec.js
@@ -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,
+    });
+  });
+});