Automatic merge of gitlab-org/gitlab master

.rubocop_manual_todo.yml

@@ -176,8 +176,6 @@ Rails/SaveBang:
     - 'spec/lib/gitlab/database/custom_structure_spec.rb'
     - 'spec/lib/gitlab/database/partitioning_migration_helpers/table_management_helpers_spec.rb'
     - 'spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb'
-    - 'spec/lib/gitlab/email/handler/create_note_handler_spec.rb'
-    - 'spec/lib/gitlab/email/handler/unsubscribe_handler_spec.rb'
     - 'spec/lib/gitlab/gfm/reference_rewriter_spec.rb'
     - 'spec/lib/gitlab/git_access_spec.rb'
     - 'spec/lib/gitlab/import_export/avatar_saver_spec.rb'

app/views/devise/shared/_sign_in_link.html.haml

 %p.text-center
   %span.light
-    Already have login and password?
+    = _('Already have login and password?')
     - path_params = { redirect_to_referer: 'yes' }
     - path_params[:invite_email] = @invite_email if @invite_email.present?
-    = link_to "Sign in", new_session_path(:user, path_params)
+    = link_to _('Sign in'), new_session_path(:user, path_params)

app/views/shared/_file_picker_button.html.haml

 - classes = local_assigns.fetch(:classes, '')
 
 %span.js-filepicker
-  %button.gl-button.btn.js-filepicker-button{ type: 'button', class: classes }= _("Choose file…")
+  %button.gl-button.btn.btn-default.js-filepicker-button{ type: 'button', class: classes }= _("Choose file…")
   %span.file_name.js-filepicker-filename= _("No file chosen.")
   = f.file_field field, class: "js-filepicker-input hidden"
   - if help_text.present?

changelogs/unreleased/Externalise-strings-in-shared-_sign_in_link-html-haml.yml

+---
+title: Externalize strings in shared/_sign_in_link.html.haml
+merge_request: 58283
+author: nuwe1
+type: other

changelogs/unreleased/btn-default-filepicker.yml

+---
+title: Add btn-default class for file picker button
+merge_request: 58238
+author: Yogi (@yo)
+type: changed

changelogs/unreleased/issue-220040-fix-rails-savebang-email-handlers.yml

+---
+title: Fix Rails/SaveBang Rubocop offenses for email handlers
+merge_request: 58095
+author: Huzaifa Iftikhar @huzaifaiftikhar
+type: fixed

doc/user/admin_area/abuse_reports.md

@@ -45,7 +45,7 @@ There are 3 ways to resolve an abuse report, with a button for each method:
 
 The following is an example of the **Abuse Reports** page:
 
-![abuse-reports-page-image](img/abuse_reports_page.png)
+![abuse-reports-page-image](img/abuse_reports_page_v13_11.png)
 
 ### Blocking users
 

doc/user/analytics/code_review_analytics.md

@@ -24,11 +24,11 @@ Initially, no data appears. Data is populated as users comment on open merge req
 
 Code Review Analytics is available to users with Reporter access and above, and displays a table of open merge requests that have at least one non-author comment. The review time is measured from the time the first non-author comment was submitted.
 
-To access Code Review Analytics, from your project's menu, go to **Project Analytics > Code Review**.
+To access Code Review Analytics, from your project's menu, go to **Analytics > Code Review**.
 
 You can filter the list of merge requests by milestone and label.
 
-![Code Review Analytics](img/code_review_analytics_v12_8.png "List of code reviews; oldest review first.")
+![Code Review Analytics](img/code_review_analytics_v13_11.png "List of code reviews; oldest review first.")
 
 The table is sorted by:
 

doc/user/analytics/issue_analytics.md

@@ -13,7 +13,7 @@ Issue Analytics is a bar graph which illustrates the number of issues created ea
 The default time span is 13 months, which includes the current month, and the 12 months
 prior.
 
-To access the chart, navigate to your project sidebar and select **{chart}** **Analytics > Issue Analytics**.
+To access the chart, navigate to your project sidebar and select **Analytics > Issue**.
 
 Hover over each bar to see the total number of issues.
 
@@ -31,7 +31,7 @@ You can change the total number of months displayed by setting a URL parameter.
 For example, `https://gitlab.com/groups/gitlab-org/-/issues_analytics?months_back=15`
 shows a total of 15 months for the chart in the GitLab.org group.
 
-![Issues created per month](img/issues_created_per_month_v12_8.png)
+![Issues created per month](img/issues_created_per_month_v13_11.png)
 
 ## Drill into the information
 

doc/user/compliance/compliance_dashboard/index.md

@@ -17,7 +17,7 @@ for merging into production.
 
 To access the Compliance Dashboard for a group, navigate to **{shield}** **Security & Compliance > Compliance** on the group's menu.
 
-![Compliance Dashboard](img/compliance_dashboard_v13_6.png)
+![Compliance Dashboard](img/compliance_dashboard_v13_11.png)
 
 NOTE:
 The Compliance Dashboard shows only the latest MR on each project.

doc/user/group/insights/index.md

@@ -13,14 +13,12 @@ Configure the Insights that matter for your groups to explore data such as
 triage hygiene, issues created/closed per a given period, average time for merge
 requests to be merged and much more.
 
-![Insights example stacked bar chart](img/insights_example_stacked_bar_chart.png)
+![Insights example stacked bar chart](img/insights_example_stacked_bar_chart_v13_11.png)
 
 ## View your group's Insights
 
 You can access your group's Insights by clicking the **Analytics > Insights**
-link in the left sidebar:
-
-![Insights sidebar link](img/insights_sidebar_link_v12_8.png)
+link in the left sidebar.
 
 ## Configure your Insights
 

locale/gitlab.pot

@@ -3266,6 +3266,9 @@ msgstr ""
 msgid "Already blocked"
 msgstr ""
 
+msgid "Already have login and password?"
+msgstr ""
+
 msgid "Also called \"Issuer\" or \"Relying party trust identifier\""
 msgstr ""
 

spec/lib/gitlab/email/handler/unsubscribe_handler_spec.rb

@@ -74,7 +74,7 @@ RSpec.describe Gitlab::Email::Handler::UnsubscribeHandler do
 
   context 'when the noteable could not be found' do
     before do
-      noteable.destroy
+      noteable.destroy!
     end
 
     it 'raises a NoteableNotFoundError' do