Automatic merge of gitlab-org/gitlab-ce master

.gitlab/merge_request_templates/Change documentation location.md

@@ -26,7 +26,7 @@ https://docs.gitlab.com/ce/development/documentation/index.html#changing-documen
       to the new document if there are any Disqus comments on the old document thread.
 - [ ] Update the link in `features.yml` (if applicable)
 - [ ] If working on CE and the `ee-compat-check` jobs fails, submit an MR to EE
-      with the changes as well (https://docs.gitlab.com/ce/development/writing_documentation.html#cherry-picking-from-ce-to-ee).
+      with the changes as well (https://docs.gitlab.com/ce/development/documentation/index.html#cherry-picking-from-ce-to-ee).
 - [ ] Ping one of the technical writers for review.
 
 /label ~Documentation

.gitlab/merge_request_templates/Database changes.md

@@ -16,7 +16,7 @@ Add a description of your merge request here.
 
 ## Database checklist
 
-- [ ] Conforms to the [database guides](https://docs.gitlab.com/ee/development/README.html#databases-guides)
+- [ ] Conforms to the [database guides](https://docs.gitlab.com/ee/development/README.html#database-guides)
 
 When adding migrations:
 
@@ -49,10 +49,10 @@ When removing columns, tables, indexes or other structures:
 ## General checklist
 
 - [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
-- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/documentation/index.html#contributing-to-docs)
+- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/documentation/)
 - [ ] [Tests added for this feature/bug](https://docs.gitlab.com/ee/development/testing_guide/index.html)
 - [ ] Conforms to the [code review guidelines](https://docs.gitlab.com/ee/development/code_review.html)
 - [ ] Conforms to the [merge request performance guidelines](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
-- [ ] Conforms to the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
+- [ ] Conforms to the [style guides](https://docs.gitlab.com/ee/development/contributing/style_guides.html)
 
 /label ~database

.gitlab/merge_request_templates/Documentation.md

@@ -16,7 +16,7 @@ Closes
 
 ## Author's checklist
 
-- [ ] [Apply the correct labels and milestone](https://docs.gitlab.com/ee/development/documentation/workflow.html#2-developer-s-role-in-the-documentation-process)
+- [ ] [Apply the correct labels and milestone](https://docs.gitlab.com/ee/development/documentation/feature-change-workflow.html#1-product-managers-role)
 - [ ] Crosslink the document from the higher-level index
 - [ ] Crosslink the document from other subject-related docs
 - [ ] Feature moving tiers? Make sure the change is also reflected in [`features.yml`](https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/data/features.yml)

app/views/projects/commit/_ajax_signature.html.haml

 - if commit.has_signature?
-  %a{ href: 'javascript:void(0)', tabindex: 0, class: commit_signature_badge_classes('js-loading-gpg-badge'), data: { toggle: 'tooltip', placement: 'top', title: 'GPG signature (loading...)', 'commit-sha' => commit.sha } }
+  %a{ href: 'javascript:void(0)', tabindex: 0, class: commit_signature_badge_classes('js-loading-gpg-badge'), data: { toggle: 'tooltip', placement: 'top', title: _('GPG signature (loading...)'), 'commit-sha' => commit.sha } }

app/views/projects/commit/_ci_menu.html.haml

@@ -3,10 +3,10 @@
 %ul.nav-links.no-top.no-bottom.commit-ci-menu.nav.nav-tabs
   = nav_link(path: 'commit#show') do
     = link_to project_commit_path(@project, @commit.id) do
-      Changes
+      = _('Changes')
       %span.badge.badge-pill= @diffs.size
   - if any_pipelines
     = nav_link(path: 'commit#pipelines') do
       = link_to pipelines_project_commit_path(@project, @commit.id) do
-        Pipelines
+        = _('Pipelines')
         %span.badge.badge-pill.js-pipelines-mr-count= @commit.pipelines.size

app/views/projects/commit/_commit_box.html.haml

@@ -6,8 +6,8 @@
     %strong
       #{ s_('CommitBoxTitle|Commit') }
       %span.commit-sha= @commit.short_id
-    = clipboard_button(text: @commit.id, title: _("Copy commit SHA to clipboard"))
-    %span.d-none.d-sm-inline authored
+    = clipboard_button(text: @commit.id, title: _('Copy commit SHA to clipboard'))
+    %span.d-none.d-sm-inline= _('authored')
     #{time_ago_with_tooltip(@commit.authored_date)}
     %span= s_('ByAuthor|by')
     = author_avatar(@commit, size: 24, has_tooltip: false)
@@ -43,13 +43,13 @@
             = cherry_pick_commit_link(@commit, project_commit_path(@project, @commit.id), has_tooltip: false)
         - if can?(current_user, :push_code, @project)
           %li.clearfix
-            = link_to s_("CreateTag|Tag"), new_project_tag_path(@project, ref: @commit)
+            = link_to s_('CreateTag|Tag'), new_project_tag_path(@project, ref: @commit)
         %li.divider
         %li.dropdown-header
           #{ _('Download') }
         - unless @commit.parents.length > 1
-          %li= link_to s_("DownloadCommit|Email Patches"), project_commit_path(@project, @commit, format: :patch), class: "qa-email-patches"
-        %li= link_to s_("DownloadCommit|Plain Diff"), project_commit_path(@project, @commit, format: :diff), class: "qa-plain-diff"
+          %li= link_to s_('DownloadCommit|Email Patches'), project_commit_path(@project, @commit, format: :patch), class: "qa-email-patches"
+        %li= link_to s_('DownloadCommit|Plain Diff'), project_commit_path(@project, @commit, format: :diff), class: "qa-plain-diff"
 
 .commit-box{ data: { project_path: project_path(@project) } }
   %h3.commit-title
@@ -95,8 +95,5 @@
     .well-segment
       = icon('info-circle fw')
 
-      This commit is part of merge request
-      = succeed '.' do
-        = link_to @merge_request.to_reference, diffs_project_merge_request_path(@project, @merge_request, commit_id: @commit.id)
-
-      Comments created here will be created in the context of that merge request.
+      - link_to_merge_request = link_to(@merge_request.to_reference, diffs_project_merge_request_path(@project, @merge_request, commit_id: @commit.id))
+      = _('This commit is part of merge request %{link_to_merge_request}. Comments created here will be created in the context of that merge request.').html_safe % { link_to_merge_request: link_to_merge_request }

app/views/projects/commit/_limit_exceeded_message.html.haml

-.has-tooltip{ class: "limit-box limit-box-#{objects} prepend-left-5", data: { title: "Project has too many #{label_for_message} to search"} }
+.has-tooltip{ class: "limit-box limit-box-#{objects} prepend-left-5", data: { title: _('Project has too many %{label_for_message} to search') % { label_for_message: label_for_message } } }
   .limit-icon
     - if objects == :branch
       = sprite_icon('fork', size: 12)
     - else
       = icon('tag')
   .limit-message
-    %span #{label_for_message.capitalize} unavailable
+    %span= _('%{label_for_message} unavailable') % { label_for_message: label_for_message.capitalize }

app/views/projects/commit/_other_user_signature_badge.html.haml

 - title = capture do
-  This commit was signed with a different user's verified signature.
+  = _("This commit was signed with a different user's verified signature.")
 
-- locals = { signature: signature, title: title, label: 'Unverified', css_class: 'invalid', icon: 'status_notfound_borderless', show_user: true }
+- locals = { signature: signature, title: title, label: _('Unverified'), css_class: 'invalid', icon: 'status_notfound_borderless', show_user: true }
 
 = render partial: 'projects/commit/signature_badge', locals: locals

app/views/projects/commit/_same_user_different_email_signature_badge.html.haml

 - title = capture do
-  This commit was signed with a verified signature, but the committer email
-  is <strong>not verified</strong> to belong to the same user.
+  = _('This commit was signed with a verified signature, but the committer email is <strong>not verified</strong> to belong to the same user.').html_safe
 
-- locals = { signature: signature, title: title, label: 'Unverified', css_class: ['invalid'], icon: 'status_notfound_borderless', show_user: true }
+- locals = { signature: signature, title: title, label: _('Unverified'), css_class: ['invalid'], icon: 'status_notfound_borderless', show_user: true }
 
 = render partial: 'projects/commit/signature_badge', locals: locals

app/views/projects/commit/_signature_badge.html.haml

@@ -19,10 +19,10 @@
     .clearfix
       = render partial: 'projects/commit/signature_badge_user', locals: { signature: signature }
 
-  GPG Key ID:
+  = _('GPG Key ID:')
   %span.monospace= signature.gpg_key_primary_keyid
 
-  = link_to('Learn more about signing commits', help_page_path('user/project/repository/gpg_signed_commits/index.md'), class: 'gpg-popover-help-link')
+  = link_to(_('Learn more about signing commits'), help_page_path('user/project/repository/gpg_signed_commits/index.md'), class: 'gpg-popover-help-link')
 
 %a{ href: 'javascript:void(0)', tabindex: 0, class: css_classes, data: { toggle: 'popover', html: 'true', placement: 'top', title: title, content: content } }
   = label

app/views/projects/commit/_unverified_signature_badge.html.haml

 - title = capture do
-  This commit was signed with an <strong>unverified</strong> signature.
+  = _('This commit was signed with an <strong>unverified</strong> signature.').html_safe
 
-- locals = { signature: signature, title: title, label: 'Unverified', css_class: 'invalid', icon: 'status_notfound_borderless' }
+- locals = { signature: signature, title: title, label: _('Unverified'), css_class: 'invalid', icon: 'status_notfound_borderless' }
 
 = render partial: 'projects/commit/signature_badge', locals: locals

app/views/projects/commit/_verified_signature_badge.html.haml

 - title = capture do
-  This commit was signed with a <strong>verified</strong> signature and the
-  committer email is verified to belong to the same user.
+  = _('This commit was signed with a <strong>verified</strong> signature and the committer email is verified to belong to the same user.').html_safe
 
-- locals = { signature: signature, title: title, label: 'Verified', css_class: 'valid', icon: 'status_success_borderless', show_user: true }
+- locals = { signature: signature, title: title, label: _('Verified'), css_class: 'valid', icon: 'status_success_borderless', show_user: true }
 
 = render partial: 'projects/commit/signature_badge', locals: locals

app/views/projects/commit/pipelines.html.haml

-- page_title 'Pipelines', "#{@commit.title} (#{@commit.short_id})", 'Commits'
+- page_title _('Pipelines'), "#{@commit.title} (#{@commit.short_id})", _('Commits')
 
 = render 'commit_box'
 = render 'ci_menu'

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

 - @no_container = true
-- add_to_breadcrumbs "Commits", project_commits_path(@project)
+- add_to_breadcrumbs _('Commits'), project_commits_path(@project)
 - breadcrumb_title @commit.short_id
 - container_class = !fluid_layout && diff_view == :inline ? 'container-limited' : ''
 - limited_container_width = fluid_layout ? '' : 'limit-container-width'
 - @content_class = limited_container_width
-- page_title        "#{@commit.title} (#{@commit.short_id})", "Commits"
+- page_title        "#{@commit.title} (#{@commit.short_id})", _('Commits')
 - page_description  @commit.description
 
 .container-fluid{ class: [limited_container_width, container_class] }

changelogs/unreleased/gt-externalize-app-views-projects-commit.yml

+---
+title: Externalize strings from `/app/views/projects/commit`
+merge_request: 24668
+author: George Tsiolis
+type: other

doc/user/project/integrations/webhooks.md

@@ -1235,7 +1235,7 @@ Typically, this is because the root certificate isn't issued by a trusted certif
 determined by [CAcert.org](http://www.cacert.org/).
 
 Should that not be the case, consider using [SSL Checker](https://www.sslshopper.com/ssl-checker.html) to identify faults.
-Missing intermediate certificates are a commong point of verification failure.
+Missing intermediate certificates are a common point of verification failure.
 
 ## Example webhook receiver
 

locale/gitlab.pot

@@ -172,6 +172,9 @@ msgstr ""
 msgid "%{issuableType} will be removed! Are you sure?"
 msgstr ""
 
+msgid "%{label_for_message} unavailable"
+msgstr ""
+
 msgid "%{link_start}Read more%{link_end} about role permissions"
 msgstr ""
 
@@ -1754,6 +1757,9 @@ msgstr ""
 msgid "ChangeTypeAction|This will create a new commit in order to revert the existing changes."
 msgstr ""
 
+msgid "Changes"
+msgstr ""
+
 msgid "Changes are shown as if the <b>source</b> revision was being merged into the <b>target</b> revision."
 msgstr ""
 
@@ -4346,9 +4352,15 @@ msgstr ""
 msgid "From the Kubernetes cluster details view, install Runner from the applications list"
 msgstr ""
 
+msgid "GPG Key ID:"
+msgstr ""
+
 msgid "GPG Keys"
 msgstr ""
 
+msgid "GPG signature (loading...)"
+msgstr ""
+
 msgid "General"
 msgstr ""
 
@@ -5675,6 +5687,9 @@ msgstr ""
 msgid "Learn more about protected branches"
 msgstr ""
 
+msgid "Learn more about signing commits"
+msgstr ""
+
 msgid "Learn more in the"
 msgstr ""
 
@@ -7541,6 +7556,9 @@ msgstr ""
 msgid "Project export started. A download link will be sent by email."
 msgstr ""
 
+msgid "Project has too many %{label_for_message} to search"
+msgstr ""
+
 msgid "Project members"
 msgstr ""
 
@@ -9717,6 +9735,21 @@ msgstr ""
 msgid "This branch has changed since you started editing. Would you like to create a new branch?"
 msgstr ""
 
+msgid "This commit is part of merge request %{link_to_merge_request}. Comments created here will be created in the context of that merge request."
+msgstr ""
+
+msgid "This commit was signed with a <strong>verified</strong> signature and the committer email is verified to belong to the same user."
+msgstr ""
+
+msgid "This commit was signed with a different user's verified signature."
+msgstr ""
+
+msgid "This commit was signed with a verified signature, but the committer email is <strong>not verified</strong> to belong to the same user."
+msgstr ""
+
+msgid "This commit was signed with an <strong>unverified</strong> signature."
+msgstr ""
+
 msgid "This container registry has been scheduled for deletion."
 msgstr ""
 
@@ -11206,6 +11239,9 @@ msgstr ""
 msgid "attach a new file"
 msgstr ""
 
+msgid "authored"
+msgstr ""
+
 msgid "branch name"
 msgstr ""