diff --git a/app/assets/stylesheets/_page_specific_files.scss b/app/assets/stylesheets/_page_specific_files.scss index 483c4dc226bcd3d78239f7032d771e430d7209dc..47701d0490a662545e92978208451dcfdb1c56ed 100644 --- a/app/assets/stylesheets/_page_specific_files.scss +++ b/app/assets/stylesheets/_page_specific_files.scss @@ -5,7 +5,6 @@ @import './pages/hierarchy'; @import './pages/issues'; @import './pages/labels'; -@import './pages/merge_requests'; @import './pages/note_form'; @import './pages/notes'; @import './pages/pipelines'; diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/page_bundles/merge_request.scss similarity index 98% rename from app/assets/stylesheets/pages/merge_requests.scss rename to app/assets/stylesheets/page_bundles/merge_request.scss index 0a17b2c47a46611e9200a5b20fefc1856d40441f..5f3fbea6ad5f975626d79508f515ebb08c10964b 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/page_bundles/merge_request.scss @@ -1,7 +1,6 @@ -/** - * MR -> show: Automerge widget - * - */ +@import 'mixins_and_variables_and_functions'; +@import 'framework/buttons'; + $tabs-holder-z-index: 250; $comparison-empty-state-height: 62px; diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml index 8afc9ade3e14c52b15f2c601b42f5736d22cc6f5..1034f06f722f81ecd90ed4976f35093f6571292f 100644 --- a/app/views/projects/commits/show.html.haml +++ b/app/views/projects/commits/show.html.haml @@ -1,5 +1,6 @@ - breadcrumb_title _("Commits") - add_page_specific_style 'page_bundles/tree' +- add_page_specific_style 'page_bundles/merge_request' - page_title _("Commits"), @ref = content_for :meta_tags do diff --git a/app/views/projects/issues/new.html.haml b/app/views/projects/issues/new.html.haml index d344ae6a4e63f8d5ce3987ec0c12458ef791af9d..64143502b7739ac6fdfde4b38acfa9fb6d0f0e9c 100644 --- a/app/views/projects/issues/new.html.haml +++ b/app/views/projects/issues/new.html.haml @@ -1,3 +1,4 @@ +- add_page_specific_style 'page_bundles/merge_request' - add_to_breadcrumbs _("Issues"), project_issues_path(@project) - breadcrumb_title _("New") - page_title _("New Issue") diff --git a/app/views/projects/jobs/index.html.haml b/app/views/projects/jobs/index.html.haml index d39d292fb53af8ab63aa6bfa2628870cdb144ef6..0073c6b89cd72df78c4e305095de26accb9bd463 100644 --- a/app/views/projects/jobs/index.html.haml +++ b/app/views/projects/jobs/index.html.haml @@ -1,5 +1,6 @@ - page_title _("Jobs") - add_page_specific_style 'page_bundles/ci_status' +- add_page_specific_style 'page_bundles/merge_request' - admin = local_assigns.fetch(:admin, false) #js-jobs-table{ data: { admin: admin, full_path: @project.full_path, job_statuses: job_statuses.to_json, pipeline_editor_path: project_ci_pipeline_editor_path(@project), empty_state_svg_path: image_path('jobs-empty-state.svg') } } diff --git a/app/views/projects/jobs/show.html.haml b/app/views/projects/jobs/show.html.haml index b151c355b3eb43e56727f6bce63b41129821959f..d81855b12eda47781644fe55347de9af1eab5626 100644 --- a/app/views/projects/jobs/show.html.haml +++ b/app/views/projects/jobs/show.html.haml @@ -4,6 +4,7 @@ - add_page_specific_style 'page_bundles/build' - add_page_specific_style 'page_bundles/xterm' - add_page_specific_style 'page_bundles/ci_status' +- add_page_specific_style 'page_bundles/merge_request' = render_if_exists "shared/shared_runners_minutes_limit_flash_message" diff --git a/app/views/projects/merge_requests/conflicts/show.html.haml b/app/views/projects/merge_requests/conflicts/show.html.haml index 3facca4d4f7dce42734b431de59cfc2c1d30375f..f8d0e2d2a1517f3a60f917a225ce02195b52b6c5 100644 --- a/app/views/projects/merge_requests/conflicts/show.html.haml +++ b/app/views/projects/merge_requests/conflicts/show.html.haml @@ -3,6 +3,7 @@ - breadcrumb_title _("Merge conflicts") - page_title _("Merge Conflicts"), "#{@merge_request.title} (#{@merge_request.to_reference}", _("Merge requests") - add_page_specific_style 'page_bundles/merge_conflicts' +- add_page_specific_style 'page_bundles/merge_request' = render "projects/merge_requests/mr_title", hide_gutter_toggle: true diff --git a/app/views/projects/merge_requests/creations/new.html.haml b/app/views/projects/merge_requests/creations/new.html.haml index 6a8894384df6ed9f3ced350d4adee0e8c68e021a..726dc87105cc41e8909775ea9a3d89643956f0ac 100644 --- a/app/views/projects/merge_requests/creations/new.html.haml +++ b/app/views/projects/merge_requests/creations/new.html.haml @@ -3,6 +3,7 @@ - page_title _("New merge request") - add_page_specific_style 'page_bundles/pipelines' - add_page_specific_style 'page_bundles/ci_status' +- add_page_specific_style 'page_bundles/merge_request' - if @merge_request.can_be_created && !params[:change_branches] = render 'new_submit' diff --git a/app/views/projects/merge_requests/diffs.html.haml b/app/views/projects/merge_requests/diffs.html.haml index 1ef212ee5ce3f323fa2cff2599543e0e76991608..03306e98407455c87bca3a4ae058e0b157250acd 100644 --- a/app/views/projects/merge_requests/diffs.html.haml +++ b/app/views/projects/merge_requests/diffs.html.haml @@ -1 +1,3 @@ +- add_page_specific_style 'page_bundles/merge_request' + = render 'page' diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml index 79da09c52051190357deff6868e7167e32facf0d..e2d3e08228980731dc441156130a65c46a4f76b1 100644 --- a/app/views/projects/merge_requests/index.html.haml +++ b/app/views/projects/merge_requests/index.html.haml @@ -6,6 +6,7 @@ - page_title _("Merge requests") - new_merge_request_email = @project.new_issuable_address(current_user, 'merge_request') - add_page_specific_style 'page_bundles/issuable_list' +- add_page_specific_style 'page_bundles/merge_request' = content_for :meta_tags do = auto_discovery_link_tag(:atom, safe_params.merge(rss_url_options).to_h, title: "#{@project.name} merge requests") diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml index 1ef212ee5ce3f323fa2cff2599543e0e76991608..03306e98407455c87bca3a4ae058e0b157250acd 100644 --- a/app/views/projects/merge_requests/show.html.haml +++ b/app/views/projects/merge_requests/show.html.haml @@ -1 +1,3 @@ +- add_page_specific_style 'page_bundles/merge_request' + = render 'page' diff --git a/app/views/projects/pipeline_schedules/index.html.haml b/app/views/projects/pipeline_schedules/index.html.haml index 88a60b1fb068031c94f7920e3a77b3101741d5e2..5051fc6a5f5c66538aec38b10f0ca5b56568a976 100644 --- a/app/views/projects/pipeline_schedules/index.html.haml +++ b/app/views/projects/pipeline_schedules/index.html.haml @@ -2,6 +2,7 @@ - page_title _("Pipeline Schedules") - add_page_specific_style 'page_bundles/pipeline_schedules' - add_page_specific_style 'page_bundles/ci_status' +- add_page_specific_style 'page_bundles/merge_request' #pipeline-schedules-callout{ data: { docs_url: help_page_path('ci/pipelines/schedules'), illustration_url: image_path('illustrations/pipeline_schedule_callout.svg') } } diff --git a/app/views/projects/pipelines/show.html.haml b/app/views/projects/pipelines/show.html.haml index bdf09e5356f02b58b21806ccd436d3411372cc28..435edde319b09a7287dc3910b5b5005091c49587 100644 --- a/app/views/projects/pipelines/show.html.haml +++ b/app/views/projects/pipelines/show.html.haml @@ -6,6 +6,7 @@ - add_page_specific_style 'page_bundles/pipeline' - add_page_specific_style 'page_bundles/reports' - add_page_specific_style 'page_bundles/ci_status' +- add_page_specific_style 'page_bundles/merge_request' - add_page_startup_graphql_call('pipelines/get_pipeline_details', { projectPath: @project.full_path, iid: @pipeline.iid }) .js-pipeline-container{ data: { controller_action: "#{controller.action_name}" } } diff --git a/config/application.rb b/config/application.rb index 1e2a6a69dc8a712e5dd9587985479281fa289aee..703afd0edf06a4efbf2126a9aacc65b6cfa01aa1 100644 --- a/config/application.rb +++ b/config/application.rb @@ -316,6 +316,7 @@ class Application < Rails::Application config.assets.precompile << "page_bundles/members.css" config.assets.precompile << "page_bundles/merge_conflicts.css" config.assets.precompile << "page_bundles/merge_request_analytics.css" + config.assets.precompile << "page_bundles/merge_request.css" config.assets.precompile << "page_bundles/merge_requests.css" config.assets.precompile << "page_bundles/milestone.css" config.assets.precompile << "page_bundles/ml_experiment_tracking.css" diff --git a/ee/app/views/projects/security/vulnerabilities/show.html.haml b/ee/app/views/projects/security/vulnerabilities/show.html.haml index 79fa188d782d43f3a29d31e7aa67e33ecda508f4..1169bea13f3c6ffe8125b77d2f079aba2d68d9d0 100644 --- a/ee/app/views/projects/security/vulnerabilities/show.html.haml +++ b/ee/app/views/projects/security/vulnerabilities/show.html.haml @@ -3,6 +3,7 @@ - page_title @vulnerability.title - page_description @vulnerability.description - add_page_specific_style 'page_bundles/security_dashboard' +- add_page_specific_style 'page_bundles/merge_request' #js-vulnerability-main{ data: { vulnerability: vulnerability_details_json(@vulnerability, @pipeline), can_view_false_positive: @project.licensed_feature_available?(:sast_fp_reduction).to_s,