Merge branch...

Merge branch '6104-extract-ee-specific-files-lines-for-some-platform-related-project-views' into 'master'

[CE] Resolve "Extract EE specific files/lines for some platform related project views"

See merge request gitlab-org/gitlab-ce!19859

app/models/concerns/protected_ref_access.rb

@@ -17,6 +17,11 @@ module ProtectedRefAccess
     scope :master, -> { maintainer } # @deprecated
     scope :maintainer, -> { where(access_level: Gitlab::Access::MAINTAINER) }
     scope :developer, -> { where(access_level: Gitlab::Access::DEVELOPER) }
+    scope :by_user, -> (user) { where(user_id: user ) }
+    scope :by_group, -> (group) { where(group_id: group ) }
+    scope :for_role, -> { where(user_id: nil, group_id: nil) }
+    scope :for_user, -> { where.not(user_id: nil) }
+    scope :for_group, -> { where.not(group_id: nil) }
 
     validates :access_level, presence: true, if: :role?, inclusion: {
       in: ALLOWED_ACCESS_LEVELS

app/views/projects/protected_tags/_protected_tag.html.haml

 = render layout: 'projects/protected_tags/shared/protected_tag', locals: { protected_tag: protected_tag } do
-  = render partial: 'projects/protected_tags/update_protected_tag', locals: { protected_tag: protected_tag }
+  %td
+    = render 'projects/protected_tags/protected_tag_create_access_levels', protected_tag: protected_tag, create_access_level: protected_tag.create_access_levels.for_role.first
+    = render_if_exists 'projects/protected_tags/protected_tag_extra_create_access_levels', protected_tag: protected_tag

app/views/projects/protected_tags/_protected_tag_create_access_levels.haml

+- protected_tag = local_assigns.fetch(:protected_tag)
+- create_access_level = local_assigns.fetch(:create_access_level)
+- dropdown_label = create_access_level&.humanize || 'Select'
+
+= hidden_field_tag "allowed_to_create_#{protected_tag.id}", create_access_level&.access_level
+= dropdown_tag(dropdown_label,
+               options: { toggle_class: 'js-allowed-to-create', dropdown_class: 'dropdown-menu-selectable capitalize-header js-allowed-to-create-container',
+               data: { field_name: "allowed_to_create_#{protected_tag.id}", access_level_id: create_access_level&.id }})

app/views/projects/protected_tags/_update_protected_tag.haml

-%td
-  = hidden_field_tag "allowed_to_create_#{protected_tag.id}", protected_tag.create_access_levels.first.access_level
-  = dropdown_tag( (protected_tag.create_access_levels.first.humanize || 'Select') ,
-                 options: { toggle_class: 'js-allowed-to-create', dropdown_class: 'dropdown-menu-selectable capitalize-header js-allowed-to-create-container',
-                 data: { field_name: "allowed_to_create_#{protected_tag.id}", access_level_id: protected_tag.create_access_levels.first.id }})

app/views/projects/services/prometheus/_metrics.html.haml

+- project = local_assigns.fetch(:project)
+
+.card.js-panel-monitored-metrics{ data: { active_metrics: active_common_project_prometheus_metrics_path(project, :json), metrics_help_path: help_page_path('user/project/integrations/prometheus_library/metrics') } }
+  .card-header
+    %h3.card-title
+      = s_('PrometheusService|Common metrics')
+      %span.badge.badge-pill.js-monitored-count 0
+  .card-body
+    .loading-metrics.js-loading-metrics
+      %p.prepend-top-10.prepend-left-10
+        = icon('spinner spin', class: 'metrics-load-spinner')
+        = s_('PrometheusService|Finding and configuring metrics...')
+    .empty-metrics.hidden.js-empty-metrics
+      %p.text-tertiary.prepend-top-10.prepend-left-10
+        = s_('PrometheusService|Waiting for your first deployment to an environment to find common metrics')
+    %ul.list-unstyled.metrics-list.hidden.js-metrics-list
+
+.card.hidden.js-panel-missing-env-vars
+  .card-header
+    %h3.card-title
+      = icon('caret-right lg fw', class: 'panel-toggle js-panel-toggle', 'aria-label' => 'Toggle panel')
+      = s_('PrometheusService|Missing environment variable')
+      %span.badge.badge-pill.js-env-var-count 0
+  .card-body.hidden
+    .flash-container
+      .flash-notice
+        .flash-text
+          = s_("PrometheusService|To set up automatic monitoring, add the environment variable %{variable} to exporter's queries." % { variable: "<code>$CI_ENVIRONMENT_SLUG</code>" }).html_safe
+          = link_to s_('PrometheusService|More information'), help_page_path('user/project/integrations/prometheus', anchor: 'metrics-and-labels')
+    %ul.list-unstyled.metrics-list.js-missing-var-metrics-list

app/views/projects/services/prometheus/_show.html.haml

@@ -3,35 +3,8 @@
     %h4.prepend-top-0
       = s_('PrometheusService|Metrics')
     %p
-      = s_('PrometheusService|Metrics are automatically configured and monitored based on a library of metrics from popular exporters.')
-      = link_to s_('PrometheusService|More information'), help_page_path('user/project/integrations/prometheus')
+      = s_('PrometheusService|Common metrics are automatically monitored based on a library of metrics from popular exporters.')
+      = link_to s_('PrometheusService|More information'), help_page_path('user/project/integrations/prometheus_library/metrics'), target: '_blank', rel: "noopener noreferrer"
 
   .col-lg-9
-    .card.js-panel-monitored-metrics{ data: { active_metrics: active_common_project_prometheus_metrics_path(@project, :json), metrics_help_path: help_page_path('user/project/integrations/prometheus_library/metrics') } }
-      .card-header
-        %h3.card-title
-          = s_('PrometheusService|Common metrics')
-          %span.badge.badge-pill.js-monitored-count 0
-      .card-body
-        .loading-metrics.js-loading-metrics
-          %p.prepend-top-10.prepend-left-10
-            = icon('spinner spin', class: 'metrics-load-spinner')
-            = s_('PrometheusService|Finding and configuring metrics...')
-        .empty-metrics.hidden.js-empty-metrics
-          %p.text-tertiary.prepend-top-10.prepend-left-10
-            = s_('PrometheusService|Waiting for your first deployment to an environment to find common metrics')
-        %ul.list-unstyled.metrics-list.hidden.js-metrics-list
-
-    .card.hidden.js-panel-missing-env-vars
-      .card-header
-        %h3.card-title
-          = icon('caret-right lg fw', class: 'panel-toggle js-panel-toggle', 'aria-label' => 'Toggle panel')
-          = s_('PrometheusService|Missing environment variable')
-          %span.badge.badge-pill.js-env-var-count 0
-      .card-body.hidden
-        .flash-container
-          .flash-notice
-            .flash-text
-              = s_("PrometheusService|To set up automatic monitoring, add the environment variable %{variable} to exporter's queries." % { variable: "<code>$CI_ENVIRONMENT_SLUG</code>" }).html_safe
-              = link_to s_('PrometheusService|More information'), help_page_path('user/project/integrations/prometheus', anchor: 'metrics-and-labels')
-        %ul.list-unstyled.metrics-list.js-missing-var-metrics-list
+    = render_if_exists 'projects/services/prometheus/metrics', project: @project

app/views/projects/tags/index.html.haml

@@ -26,6 +26,8 @@
         = link_to new_project_tag_path(@project), class: 'btn btn-create new-tag-btn' do
           = s_('TagsPage|New tag')
 
+  = render_if_exists 'projects/commits/mirror_status'
+
   .tags
     - if @tags.any?
       %ul.flex-list.content-list

locale/gitlab.pot

@@ -4114,6 +4114,9 @@ msgstr ""
 msgid "PrometheusService|Common metrics"
 msgstr ""
 
+msgid "PrometheusService|Common metrics are automatically monitored based on a library of metrics from popular exporters."
+msgstr ""
+
 msgid "PrometheusService|Finding and configuring metrics..."
 msgstr ""
 
@@ -4129,9 +4132,6 @@ msgstr ""
 msgid "PrometheusService|Metrics"
 msgstr ""
 
-msgid "PrometheusService|Metrics are automatically configured and monitored based on a library of metrics from popular exporters."
-msgstr ""
-
 msgid "PrometheusService|Missing environment variable"
 msgstr ""