Automatic merge of gitlab-org/gitlab master

app/assets/javascripts/operation_settings/components/metrics_settings.vue

@@ -31,7 +31,9 @@ export default {
 <template>
   <section class="settings no-animate">
     <div class="settings-header">
-      <h4 class="js-section-header">
+      <h4
+        class="js-section-header settings-title js-settings-toggle js-settings-toggle-trigger-only"
+      >
         {{ s__('MetricsSettings|Metrics dashboard') }}
       </h4>
       <gl-button class="js-settings-toggle">{{ __('Expand') }}</gl-button>

app/views/notify/unknown_sign_in_email.html.haml

@@ -44,9 +44,11 @@
           %td{ style: "#{default_style}text-align:center;" }
             - password_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: 'https://docs.gitlab.com/ee/user/profile/#changing-your-password' }
             = _('If you recently signed in and recognize the IP address, you may disregard this email.')
-            %p
-              = _('If you did not recently sign in, you should immediately %{password_link_start}change your password%{password_link_end}.').html_safe % { password_link_start: password_link_start, password_link_end: '</a>'.html_safe }
-              = _('Passwords should be unique and not used for any other sites or services.')
+
+            - if password_authentication_enabled_for_web?
+              %p
+                = _('If you did not recently sign in, you should immediately %{password_link_start}change your password%{password_link_end}.').html_safe % { password_link_start: password_link_start, password_link_end: '</a>'.html_safe }
+                = _('Passwords should be unique and not used for any other sites or services.')
 
             - unless @user.two_factor_enabled?
               %p

app/views/projects/blob/_header.html.haml

@@ -9,6 +9,8 @@
     - else
       = edit_blob_button(@project, @ref, @path, blob: blob)
       = ide_edit_button(@project, @ref, @path, blob: blob)
+      - if can_view_pipeline_editor?(@project) && @path == @project.ci_config_path_or_default
+        = link_to "Pipeline Editor", project_ci_pipeline_editor_path(@project), class: "btn gl-button btn-confirm-secondary gl-ml-3"
     .btn-group{ role: "group", class: ("gl-ml-3" if current_user) }>
       = render_if_exists 'projects/blob/header_file_locks_link'
       - if current_user

app/views/projects/environments/_form.html.haml

@@ -17,5 +17,5 @@
       = f.url_field :external_url, class: 'form-control'
 
     .form-actions
-      = f.submit _('Save'), class: 'gl-button btn btn-success'
+      = f.submit _('Save'), class: 'gl-button btn btn-confirm'
       = link_to _('Cancel'), project_environments_path(@project), class: 'gl-button btn btn-cancel'

app/views/projects/environments/empty_metrics.html.haml

@@ -11,4 +11,4 @@
       %p.state-description
         = s_('Metrics|Check out the CI/CD documentation on deploying to an environment')
       .text-center
-        = link_to s_("Environments|Learn about environments"), help_page_path('ci/environments/index.md'), class: 'gl-button btn btn-success'
+        = link_to s_("Environments|Learn about environments"), help_page_path('ci/environments/index.md'), class: 'gl-button btn btn-confirm'

app/views/projects/environments/show.html.haml

@@ -67,7 +67,7 @@
           %p.blank-state-text
             = html_escape(_("Define environments in the deploy stage(s) in %{code_open}.gitlab-ci.yml%{code_close} to track deployments here.")) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
           .text-center
-            = link_to _("Read more"), help_page_path("ci/environments/index.md"), class: "gl-button btn btn-success"
+            = link_to _("Read more"), help_page_path("ci/environments/index.md"), class: "gl-button btn btn-confirm"
     - else
       .table-holder.gl-overflow-visible
         .ci-table.environments{ role: 'grid' }

app/views/projects/network/show.html.haml

@@ -6,7 +6,7 @@
     .controls.gl-bg-gray-50.gl-p-2.gl-font-base.gl-text-gray-400.gl-border-b-1.gl-border-b-solid.gl-border-b-gray-300
       = form_tag project_network_path(@project, @id), method: :get, class: 'form-inline network-form' do |f|
         = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: _("Git revision"), class: 'search-input form-control gl-form-input input-mx-250 search-sha gl-mr-2'
-        = button_tag class: 'btn gl-button btn-success btn-icon' do
+        = button_tag class: 'btn gl-button btn-confirm btn-icon' do
           = sprite_icon('search')
         .inline.gl-ml-5
           .form-check.light

changelogs/unreleased/205484-prj-set-ops-4-metrics.yml

+---
+title: Project Settings Operations header Metrics dashboard expand/collapse on-click/on-tap
+merge_request: 56274
+author: Daniel Schömer
+type: changed

changelogs/unreleased/btn-confirm-metrics.yml

+---
+title: Move from btn-success to btn-confirm in environments directory
+merge_request: 56212
+author: Yogi (@yo)
+type: changed

changelogs/unreleased/btn-confirm-project-network.yml

+---
+title: Move from btn-success to btn-confirm in network directory
+merge_request: 56345
+author: Yogi (@yo)
+type: changed

changelogs/unreleased/chore-unknown-sign-in-info-text.yml

+---
+title: Show password hint only if password_authentication_enabled_for_web? on new location logins
+merge_request: 56783
+author: Roger Meier
+type: changed

spec/features/projects/blobs/user_views_pipeline_editor_button_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'User views pipeline editor button on root ci config file', :js do
+  include BlobSpecHelpers
+
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project, :public, :repository) }
+
+  context "when the ci config is the root file" do
+    before do
+      stub_feature_flags(consolidated_edit_button: false)
+      project.add_developer(user)
+      sign_in(user)
+    end
+
+    it 'shows the button to the Pipeline Editor' do
+      project.update!(ci_config_path: '.my-config.yml')
+      project.repository.create_file(user, project.ci_config_path_or_default, 'test', message: 'testing', branch_name: 'master')
+      visit project_blob_path(project, File.join('master', '.my-config.yml'))
+
+      expect(page).to have_content('Pipeline Editor')
+    end
+
+    it 'does not shows the Pipeline Editor button' do
+      project.repository.create_file(user, '.my-sub-config.yml', 'test', message: 'testing', branch_name: 'master')
+      visit project_blob_path(project, File.join('master', '.my-sub-config.yml'))
+
+      expect(page).not_to have_content('Pipeline Editor')
+    end
+  end
+
+  context "when user cannot collaborate" do
+    before do
+      stub_feature_flags(consolidated_edit_button: false)
+      sign_in(user)
+    end
+    it 'does not shows the Pipeline Editor button' do
+      visit project_blob_path(project, File.join('master', '.my-config.yml'))
+      expect(page).not_to have_content('Pipeline Editor')
+    end
+  end
+end