Merge branch 'ce-to-ee-2018-07-16' into 'master'

CE upstream - 2018-07-16 15:23 UTC

See merge request gitlab-org/gitlab-ee!6524

.gitlab-ci.yml

-image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29"
+image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.4-golang-1.9-git-2.18-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29"
 
 .dedicated-runner: &dedicated-runner
   retry: 1

app/services/access_token_validation_service.rb

+# frozen_string_literal: true
+
 class AccessTokenValidationService
   # Results:
   VALID = :valid

app/services/after_branch_delete_service.rb

+# frozen_string_literal: true
+
 ##
 # Branch can be deleted either by DeleteBranchService
 # or by GitPushService.

app/services/akismet_service.rb

+# frozen_string_literal: true
+
 class AkismetService
   attr_accessor :owner, :text, :options
 

app/services/audit_event_service.rb

+# frozen_string_literal: true
+
 class AuditEventService
   prepend EE::AuditEventService
 

app/services/base_count_service.rb

+# frozen_string_literal: true
+
 # Base class for services that count a single resource such as the number of
 # issues for a project.
 class BaseCountService

app/services/base_renderer.rb

+# frozen_string_literal: true
+
 class BaseRenderer
   attr_reader :current_user
 

app/services/base_service.rb

+# frozen_string_literal: true
+
 class BaseService
   include Gitlab::Allowable
 

app/services/cohorts_service.rb

+# frozen_string_literal: true
+
 class CohortsService
   MONTHS_INCLUDED = 12
 

app/services/compare_service.rb

+# frozen_string_literal: true
+
 require 'securerandom'
 
 # Compare 2 refs for one repo or between repositories

app/services/create_branch_service.rb

+# frozen_string_literal: true
+
 class CreateBranchService < BaseService
   def execute(branch_name, ref, create_master_if_empty: true)
     create_master_branch if create_master_if_empty && project.empty_repo?

app/services/create_deployment_service.rb

+# frozen_string_literal: true
+
 class CreateDeploymentService
   attr_reader :job
 

app/services/create_release_service.rb

+# frozen_string_literal: true
+
 class CreateReleaseService < BaseService
   def execute(tag_name, release_description)
     repository = project.repository

app/services/create_snippet_service.rb

+# frozen_string_literal: true
+
 class CreateSnippetService < BaseService
   include SpamCheckService
 

app/services/delete_branch_service.rb

+# frozen_string_literal: true
+
 class DeleteBranchService < BaseService
   def execute(branch_name)
     repository = project.repository

app/services/delete_merged_branches_service.rb

+# frozen_string_literal: true
+
 class DeleteMergedBranchesService < BaseService
   def async_execute
     DeleteMergedBranchesWorker.perform_async(project.id, current_user.id)

app/services/event_create_service.rb

+# frozen_string_literal: true
+
 # EventCreateService class
 #
 # Used for creating events feed on dashboard after certain user action

app/services/git_push_service.rb

+# frozen_string_literal: true
+
 class GitPushService < BaseService
   attr_accessor :push_data, :push_commits
   include Gitlab::Access

app/services/git_tag_push_service.rb

+# frozen_string_literal: true
+
 class GitTagPushService < BaseService
   attr_accessor :push_data
 

app/services/gravatar_service.rb

+# frozen_string_literal: true
+
 class GravatarService
   def execute(email, size = nil, scale = 2, username: nil)
     return unless Gitlab::CurrentSettings.gravatar_enabled?

app/services/ham_service.rb

+# frozen_string_literal: true
+
 class HamService
   attr_accessor :spam_log
 

app/services/import_export_clean_up_service.rb

+# frozen_string_literal: true
+
 class ImportExportCleanUpService
   LAST_MODIFIED_TIME_IN_MINUTES = 1440
 

app/services/issuable_base_service.rb

+# frozen_string_literal: true
+
 class IssuableBaseService < BaseService
   prepend ::EE::IssuableBaseService
 

app/services/merge_request_metrics_service.rb

+# frozen_string_literal: true
+
 class MergeRequestMetricsService
   delegate :update!, to: :@merge_request_metrics
 

app/services/metrics_service.rb

+# frozen_string_literal: true
+
 require 'prometheus/client/formats/text'
 
 class MetricsService

app/services/note_summary.rb

+# frozen_string_literal: true
+
 class NoteSummary
   attr_reader :note
   attr_reader :metadata

app/services/notification_recipient_service.rb

+# frozen_string_literal: true
+
 #
 # Used by NotificationService to determine who should receive notification
 #

app/services/notification_service.rb

+# frozen_string_literal: true
+
 # rubocop:disable GitlabSecurity/PublicSend
 
 # NotificationService class

app/services/preview_markdown_service.rb

+# frozen_string_literal: true
+
 class PreviewMarkdownService < BaseService
   def execute
     text, commands = explain_quick_actions(params[:text])

app/services/push_event_payload_service.rb

+# frozen_string_literal: true
+
 # Service class for creating push event payloads as stored in the
 # "push_event_payloads" table.
 #

app/services/repair_ldap_blocked_user_service.rb

+# frozen_string_literal: true
+
 class RepairLdapBlockedUserService
   attr_accessor :user
 

app/services/repository_archive_clean_up_service.rb

+# frozen_string_literal: true
+
 class RepositoryArchiveCleanUpService
   LAST_MODIFIED_TIME_IN_MINUTES = 120
 

app/services/reset_project_cache_service.rb

+# frozen_string_literal: true
+
 class ResetProjectCacheService < BaseService
   def execute
     @project.increment!(:jobs_cache_index)

app/services/search_service.rb

+# frozen_string_literal: true
+
 class SearchService
   include Gitlab::Allowable
 

app/services/spam_check_service.rb

+# frozen_string_literal: true
+
 # SpamCheckService
 #
 # Provide helper methods for checking if a given spammable object has

app/services/spam_service.rb

+# frozen_string_literal: true
+
 class SpamService
   attr_accessor :spammable, :request, :options
   attr_reader :spam_log

app/services/submit_usage_ping_service.rb

+# frozen_string_literal: true
+
 class SubmitUsagePingService
   URL = 'https://version.gitlab.com/usage_data'.freeze
 

app/services/system_hooks_service.rb

+# frozen_string_literal: true
+
 class SystemHooksService
   prepend EE::SystemHooksService
 

app/services/system_note_service.rb

+# frozen_string_literal: true
+
 # SystemNoteService
 #
 # Used for creating system notes (e.g., when a user references a merge request
@@ -22,9 +24,11 @@ module SystemNoteService
     total_count  = new_commits.length + existing_commits.length
     commits_text = "#{total_count} commit".pluralize(total_count)
 
-    body = "added #{commits_text}\n\n"
-    body << commits_list(noteable, new_commits, existing_commits, oldrev)
-    body << "\n\n[Compare with previous version](#{diff_comparison_url(noteable, project, oldrev)})"
+    text_parts = ["added #{commits_text}"]
+    text_parts << commits_list(noteable, new_commits, existing_commits, oldrev)
+    text_parts << "[Compare with previous version](#{diff_comparison_url(noteable, project, oldrev)})"
+
+    body = text_parts.join("\n\n")
 
     create_note(NoteSummary.new(noteable, project, author, body, action: 'commit', commit_count: total_count))
   end
@@ -104,18 +108,19 @@ module SystemNoteService
     added_labels   = added_labels.map(&references).join(' ')
     removed_labels = removed_labels.map(&references).join(' ')
 
-    body = ''
+    text_parts = []
 
     if added_labels.present?
-      body << "added #{added_labels}"
-      body << ' and ' if removed_labels.present?
+      text_parts << "added #{added_labels}"
+      text_parts << 'and' if removed_labels.present?
     end
 
     if removed_labels.present?
-      body << "removed #{removed_labels}"
+      text_parts << "removed #{removed_labels}"
     end
 
-    body << ' ' << 'label'.pluralize(labels_count)
+    text_parts << 'label'.pluralize(labels_count)
+    body = text_parts.join(' ')
 
     create_note(NoteSummary.new(noteable, project, author, body, action: 'label'))
   end
@@ -189,8 +194,10 @@ module SystemNoteService
       spent_at = noteable.spent_at
       parsed_time = Gitlab::TimeTrackingFormatter.output(time_spent.abs)
       action = time_spent > 0 ? 'added' : 'subtracted'
-      body = "#{action} #{parsed_time} of time spent"
-      body << " at #{spent_at}" if spent_at
+
+      text_parts = ["#{action} #{parsed_time} of time spent"]
+      text_parts << "at #{spent_at}" if spent_at
+      body = text_parts.join(' ')
     end
 
     create_note(NoteSummary.new(noteable, project, author, body, action: 'time_tracking'))
@@ -269,17 +276,19 @@ module SystemNoteService
     diff_refs = change_position.diff_refs
     version_index = merge_request.merge_request_diffs.viewable.count
 
-    body = "changed this line in"
+    text_parts = ["changed this line in"]
     if version_params = merge_request.version_params_for(diff_refs)
       line_code = change_position.line_code(project.repository)
       url = url_helpers.diffs_project_merge_request_url(project, merge_request, version_params.merge(anchor: line_code))
 
-      body << " [version #{version_index} of the diff](#{url})"
+      text_parts << "[version #{version_index} of the diff](#{url})"
     else
-      body << " version #{version_index} of the diff"
+      text_parts << "version #{version_index} of the diff"
     end
 
+    body = text_parts.join(' ')
     note_attributes = discussion.reply_attributes.merge(project: project, author: author, note: body)
+
     note = Note.create(note_attributes.merge(system: true))
     note.system_note_metadata = SystemNoteMetadata.new(action: 'outdated')
 

app/services/todo_service.rb

+# frozen_string_literal: true
+
 # TodoService class
 #
 # Used for creating/updating todos after certain user actions

app/services/update_release_service.rb

+# frozen_string_literal: true
+
 class UpdateReleaseService < BaseService
   def execute(tag_name, release_description)
     repository = project.repository

app/services/update_snippet_service.rb

+# frozen_string_literal: true
+
 class UpdateSnippetService < BaseService
   include SpamCheckService
 

app/services/upload_service.rb

+# frozen_string_literal: true
+
 class UploadService
   def initialize(model, file, uploader_class = FileUploader, **uploader_context)
     @model, @file, @uploader_class, @uploader_context = model, file, uploader_class, uploader_context

app/services/user_agent_detail_service.rb

+# frozen_string_literal: true
+
 class UserAgentDetailService
   attr_accessor :spammable, :request
 

app/services/user_project_access_changed_service.rb

+# frozen_string_literal: true
+
 class UserProjectAccessChangedService
   prepend EE::UserProjectAccessChangedService
 

app/services/validate_new_branch_service.rb

+# frozen_string_literal: true
+
 require_relative 'base_service'
 
 class ValidateNewBranchService < BaseService

app/services/verify_pages_domain_service.rb

+# frozen_string_literal: true
+
 require 'resolv'
 
 class VerifyPagesDomainService < BaseService

app/services/web_hook_service.rb

+# frozen_string_literal: true
+
 class WebHookService
   class InternalErrorResponse
     attr_reader :body, :headers, :code

app/views/import/bitbucket/deploy_key.js.haml

 :plain
   job = $("tr#repo_#{@repo_id}")
-  job.find(".import-actions").html("<p class='alert alert-danger'>Access denied! Please verify you can add deploy keys to this repository.</p>")
+  job.find(".import-actions").html("<p class='alert alert-danger'>#{_('Access denied! Please verify you can add deploy keys to this repository.')}</p>")

app/views/import/bitbucket/status.html.haml

-- page_title 'Bitbucket import'
-- header_title 'Projects', root_path
+- page_title _('Bitbucket import')
+- header_title _('Projects'), root_path
 
 %h3.page-title
   %i.fa.fa-bitbucket
-  Import projects from Bitbucket
+  = _('Import projects from Bitbucket')
 
 - if @repos.any?
   %p.light
-    Select projects you want to import.
+    = _('Select projects you want to import.')
   %hr
   %p
   - if @incompatible_repos.any?
     = button_tag class: 'btn btn-import btn-success js-import-all' do
-      Import all compatible projects
+      = _('Import all compatible projects')
       = icon('spinner spin', class: 'loading-icon')
   - else
     = button_tag class: 'btn btn-import btn-success js-import-all' do
-      Import all projects
+      = _('Import all projects')
       = icon('spinner spin', class: 'loading-icon')
 
 .table-responsive
@@ -26,9 +26,9 @@
     %colgroup.import-jobs-status-col
     %thead
       %tr
-        %th From Bitbucket
-        %th To GitLab
-        %th Status
+        %th= _('From Bitbucket')
+        %th= _('To GitLab')
+        %th= _('Status')
     %tbody
       - @already_added_projects.each do |project|
         %tr{ id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}" }
@@ -40,10 +40,10 @@
             - if project.import_status == 'finished'
               %span
                 %i.fa.fa-check
-                done
+                = _('done')
             - elsif project.import_status == 'started'
               %i.fa.fa-spinner.fa-spin
-              started
+              = _('started')
             - else
               = project.human_import_status_name
 
@@ -66,7 +66,7 @@
               = text_field_tag :path, repo.name, class: "input-mini form-control", tabindex: 2, autofocus: true, required: true
           %td.import-actions.job-status
             = button_tag class: 'btn btn-import js-add-to-import' do
-              Import
+              = _('Import')
               = icon('spinner spin', class: 'loading-icon')
       - @incompatible_repos.each do |repo|
         %tr{ id: "repo_#{repo.owner}___#{repo.slug}" }
@@ -74,16 +74,13 @@
             = link_to repo.full_name, "https://bitbucket.org/#{repo.full_name}", target: '_blank', rel: 'noopener noreferrer'
           %td.import-target
           %td.import-actions-job-status
-            = label_tag 'Incompatible Project', nil, class: 'label badge-danger'
+            = label_tag _('Incompatible Project'), nil, class: 'label badge-danger'
 
 - if @incompatible_repos.any?
   %p
-    One or more of your Bitbucket projects cannot be imported into GitLab
-    directly because they use Subversion or Mercurial for version control,
-    rather than Git. Please convert
-    = link_to 'them to Git,', 'https://www.atlassian.com/git/tutorials/migrating-overview'
-    and go through the
-    = link_to 'import flow', status_import_bitbucket_path
-    again.
+    = _("One or more of your Bitbucket projects cannot be imported into GitLab directly because they use Subversion or Mercurial for version control, rather than Git.")
+    - link_to_git = link_to(_('Git'), 'https://www.atlassian.com/git/tutorials/migrating-overview')
+    - link_to_import_flow = link_to(_('import flow'), status_import_bitbucket_path)
+    = _("Please convert them to %{link_to_git}, and go through the %{link_to_import_flow} again.").html_safe % { link_to_git: link_to_git, link_to_import_flow: link_to_import_flow }
 
 .js-importer-status{ data: { jobs_import_path: "#{jobs_import_bitbucket_path}", import_path: "#{import_bitbucket_path}" } }

app/views/import/fogbugz/new.html.haml

-- page_title "FogBugz Import"
-- header_title "Projects", root_path
+- page_title _("FogBugz Import")
+- header_title _("Projects"), root_path
 %h3.page-title
   %i.fa.fa-bug
-  Import projects from FogBugz
+  = _('Import projects from FogBugz')
 %hr
 
 = form_tag callback_import_fogbugz_path do
   %p
-    To get started you enter your FogBugz URL and login information below.
-    In the next steps, you'll be able to map users and select the projects
-    you want to import.
+    = _("To get started you enter your FogBugz URL and login information below. In the next steps, you'll be able to map users and select the projects you want to import.")
   .form-group.row
-    = label_tag :uri, 'FogBugz URL', class: 'col-form-label col-md-2'
+    = label_tag :uri, _('FogBugz URL'), class: 'col-form-label col-md-2'
     .col-md-4
       = text_field_tag :uri, nil, placeholder: 'https://mycompany.fogbugz.com', class: 'form-control'
   .form-group.row
-    = label_tag :email, 'FogBugz Email', class: 'col-form-label col-md-2'
+    = label_tag :email, _('FogBugz Email'), class: 'col-form-label col-md-2'
     .col-md-4
       = text_field_tag :email, nil, class: 'form-control'
   .form-group.row
-    = label_tag :password, 'FogBugz Password', class: 'col-form-label col-md-2'
+    = label_tag :password, _('FogBugz Password'), class: 'col-form-label col-md-2'
     .col-md-4
       = password_field_tag :password, nil, class: 'form-control'
   .form-actions
-    = submit_tag 'Continue to the next step', class: 'btn btn-create'
+    = submit_tag _('Continue to the next step'), class: 'btn btn-create'

app/views/import/fogbugz/new_user_map.html.haml

-- page_title 'User map', 'FogBugz import'
-- header_title "Projects", root_path
+- page_title _('User map'), _('FogBugz import')
+- header_title _("Projects"), root_path
 %h3.page-title
   %i.fa.fa-bug
-  Import projects from FogBugz
+  = _('Import projects from FogBugz')
 %hr
 
 = form_tag create_user_map_import_fogbugz_path do
   %p
-    Customize how FogBugz email addresses and usernames are imported into GitLab.
-    In the next step, you'll be able to select the projects you want to import.
+    = _("Customize how FogBugz email addresses and usernames are imported into GitLab. In the next step, you'll be able to select the projects you want to import.")
   %p
-    The user map is a mapping of the FogBugz users that participated on your projects to the way their email address and usernames will be imported into GitLab. You can change this by populating the table below.
+    = _("The user map is a mapping of the FogBugz users that participated on your projects to the way their email address and usernames will be imported into GitLab. You can change this by populating the table below.")
   %ul
     %li
-      %strong Default: Map a FogBugz account ID to a full name
+      %strong= _("Default: Map a FogBugz account ID to a full name")
       %p
-        An empty GitLab User field will add the FogBugz user's full name
-        (e.g. "By John Smith") in the description of all issues and comments.
-        It will also associate and/or assign these issues and comments with
-        the project creator.
+        = _("An empty GitLab User field will add the FogBugz user's full name (e.g. \"By John Smith\") in the description of all issues and comments. It will also associate and/or assign these issues and comments with the project creator.")
     %li
-      %strong Map a FogBugz account ID to a GitLab user
+      %strong= _("Map a FogBugz account ID to a GitLab user")
       %p
-        Selecting a GitLab user will add a link to the GitLab user in the descriptions
-        of issues and comments (e.g. "By <a href="#">@johnsmith</a>"). It will also
-        associate and/or assign these issues and comments with the selected user.
+        = _('Selecting a GitLab user will add a link to the GitLab user in the descriptions of issues and comments (e.g. "By <a href="#">@johnsmith</a>"). It will also associate and/or assign these issues and comments with the selected user.').html_safe
 
   .table-holder
     %table.table
       %thead
         %tr
-          %th ID
-          %th Name
-          %th Email
-          %th GitLab User
+          %th= _("ID")
+          %th= _("Name")
+          %th= _("Email")
+          %th= _("GitLab User")
       %tbody
         - @user_map.each do |id, user|
           %tr
@@ -45,4 +39,4 @@
                 scope: :all, email_user: true, selected: user[:gitlab_user])
 
   .form-actions
-    = submit_tag 'Continue to the next step', class: 'btn btn-create'
+    = submit_tag _('Continue to the next step'), class: 'btn btn-create'

app/views/import/fogbugz/status.html.haml

-- page_title "FogBugz import"
-- header_title "Projects", root_path
+- page_title _("FogBugz import")
+- header_title _("Projects"), root_path
 %h3.page-title
   %i.fa.fa-bug
-  Import projects from FogBugz
+  = _('Import projects from FogBugz')
 
 - if @repos.any?
   %p.light
-    Select projects you want to import.
+    = _('Select projects you want to import.')
   %p.light
-    Optionally, you can
-    = link_to 'customize', new_user_map_import_fogbugz_path
-    how FogBugz email addresses and usernames are imported into GitLab.
+    - link_to_customize = link_to('customize', new_user_map_import_fogbugz_path)
+    = _('Optionally, you can %{link_to_customize} how FogBugz email addresses and usernames are imported into GitLab.').html_safe % { link_to_customize: link_to_customize }
   %hr
   %p
   = button_tag class: 'btn btn-import btn-success js-import-all' do
-    Import all projects
+    = _('Import all projects')
     = icon("spinner spin", class: "loading-icon")
 
 .table-responsive
@@ -24,9 +23,9 @@
     %colgroup.import-jobs-status-col
     %thead
       %tr
-        %th From FogBugz
-        %th To GitLab
-        %th Status
+        %th= _("From FogBugz")
+        %th= _("To GitLab")
+        %th= _("Status")
     %tbody
       - @already_added_projects.each do |project|
         %tr{ id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}" }
@@ -38,10 +37,10 @@
             - if project.import_status == 'finished'
               %span
                 %i.fa.fa-check
-                done
+                = _("done")
             - elsif project.import_status == 'started'
               %i.fa.fa-spinner.fa-spin
-              started
+              = _("started")
             - else
               = project.human_import_status_name
 
@@ -53,7 +52,7 @@
             #{current_user.username}/#{repo.name}
           %td.import-actions.job-status
             = button_tag class: "btn btn-import js-add-to-import" do
-              Import
+              = _("Import")
               = icon("spinner spin", class: "loading-icon")
 
 .js-importer-status{ data: { jobs_import_path: "#{jobs_import_fogbugz_path}", import_path: "#{import_fogbugz_path}" } }

app/views/import/gitea/new.html.haml

-- page_title "Gitea Import"
-- header_title "Projects", root_path
+- page_title _("Gitea Import")
+- header_title _("Projects"), root_path
 
 %h3.page-title
   = custom_icon('go_logo')
-  Import Projects from Gitea
+  = _('Import Projects from Gitea')
 
 %p
-  To get started, please enter your Gitea Host URL and a
-  = succeed '.' do
-    = link_to 'Personal Access Token', 'https://github.com/gogits/go-gogs-client/wiki#access-token'
+  - link_to_personal_token = link_to(_('Personal Access Token'), 'https://github.com/gogits/go-gogs-client/wiki#access-token')
+  = _('To get started, please enter your Gitea Host URL and a %{link_to_personal_token}.').html_safe % { link_to_personal_token: link_to_personal_token }
 
 = form_tag personal_access_token_import_gitea_path do
   .form-group.row
-    = label_tag :gitea_host_url, 'Gitea Host URL', class: 'col-form-label col-sm-2'
+    = label_tag :gitea_host_url, _('Gitea Host URL'), class: 'col-form-label col-sm-2'
     .col-sm-4
       = text_field_tag :gitea_host_url, nil, placeholder: 'https://try.gitea.io', class: 'form-control'
   .form-group.row
-    = label_tag :personal_access_token, 'Personal Access Token', class: 'col-form-label col-sm-2'
+    = label_tag :personal_access_token, _('Personal Access Token'), class: 'col-form-label col-sm-2'
     .col-sm-4
       = text_field_tag :personal_access_token, nil, class: 'form-control'
   .form-actions
-    = submit_tag 'List Your Gitea Repositories', class: 'btn btn-create'
+    = submit_tag _('List Your Gitea Repositories'), class: 'btn btn-create'

app/views/import/gitea/status.html.haml

-- page_title "Gitea Import"
-- header_title "Projects", root_path
+- page_title _("Gitea Import")
+- header_title _("Projects"), root_path
 %h3.page-title
   = custom_icon('go_logo')
-  Import Projects from Gitea
+  = _('Import Projects from Gitea')
 
 = render 'import/githubish_status', provider: 'gitea'

app/views/import/github/new.html.haml

 - title = has_ci_cd_only_params? ? _('Connect repositories from GitHub') : _('GitHub import')
 - page_title title
 - breadcrumb_title title
-- header_title "Projects", root_path
+- header_title _("Projects"), root_path
 
 %h3.page-title
   = icon 'github', text: import_github_title

app/views/import/github/status.html.haml

 - title = has_ci_cd_only_params? ? _('Connect repositories from GitHub') : _('GitHub import')
 - page_title title
 - breadcrumb_title title
-- header_title "Projects", root_path
+- header_title _("Projects"), root_path
 %h3.page-title
   = icon 'github', text: import_github_title
 

app/views/import/gitlab/status.html.haml

-- page_title "GitLab.com import"
-- header_title "Projects", root_path
+- page_title _("GitLab.com import")
+- header_title _("Projects"), root_path
 %h3.page-title
   %i.fa.fa-heart
-  Import projects from GitLab.com
+  = _('Import projects from GitLab.com')
 
 %p.light
-  Select projects you want to import.
+  = _('Select projects you want to import.')
 %hr
 %p
   = button_tag class: "btn btn-import btn-success js-import-all" do
-    Import all projects
+    = _('Import all projects')
     = icon("spinner spin", class: "loading-icon")
 
 .table-responsive
@@ -19,9 +19,9 @@
     %colgroup.import-jobs-status-col
     %thead
       %tr
-        %th From GitLab.com
-        %th To this GitLab instance
-        %th Status
+        %th= _('From GitLab.com')
+        %th= _('To this GitLab instance')
+        %th= _('Status')
     %tbody
       - @already_added_projects.each do |project|
         %tr{ id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}" }
@@ -33,10 +33,10 @@
             - if project.import_status == 'finished'
               %span
                 %i.fa.fa-check
-                done
+                = _('done')
             - elsif project.import_status == 'started'
               %i.fa.fa-spinner.fa-spin
-              started
+              = _('started')
             - else
               = project.human_import_status_name
 
@@ -48,7 +48,7 @@
             = import_project_target(repo['namespace']['path'], repo['name'])
           %td.import-actions.job-status
             = button_tag class: "btn btn-import js-add-to-import" do
-              Import
+              = _('Import')
               = icon("spinner spin", class: "loading-icon")
 
 .js-importer-status{ data: { jobs_import_path: "#{jobs_import_gitlab_path}", import_path: "#{import_gitlab_path}" } }

app/views/import/gitlab_projects/new.html.haml

-- page_title "GitLab Import"
-- header_title "Projects", root_path
+- page_title _("GitLab Import")
+- header_title _("Projects"), root_path
 
 %h3.page-title
   = icon('gitlab')
-  Import an exported GitLab project
+  = _('Import an exported GitLab project')
 %hr
 
 = form_tag import_gitlab_project_path, class: 'new_project', multipart: true do
@@ -24,19 +24,19 @@
                 #{user_url(current_user.username)}/
             = hidden_field_tag :namespace_id, value: current_user.namespace_id
     .form-group.col-12.col-sm-6.project-path
-      = label_tag :path, 'Project name', class: 'label-light'
+      = label_tag :path, _('Project name'), class: 'label-light'
       = text_field_tag :path, @path, placeholder: "my-awesome-project", class: "js-path-name form-control", tabindex: 2, autofocus: true, required: true
 
   .row
     .form-group.col-md-12
-      To move or copy an entire GitLab project from another GitLab installation to this one, navigate to the original project's settings page, generate an export file, and upload it here.
+      = _("To move or copy an entire GitLab project from another GitLab installation to this one, navigate to the original project's settings page, generate an export file, and upload it here.")
   .row
     .form-group.col-sm-12
       = hidden_field_tag :namespace_id, @namespace.id
-      = label_tag :file, 'GitLab project export', class: 'label-light'
+      = label_tag :file, _('GitLab project export'), class: 'label-light'
       .form-group
         = file_field_tag :file, class: ''
   .row
     .form-actions.col-sm-12
-      = submit_tag 'Import project', class: 'btn btn-create'
-      = link_to 'Cancel', new_project_path, class: 'btn btn-cancel'
+      = submit_tag _('Import project'), class: 'btn btn-create'
+      = link_to _('Cancel'), new_project_path, class: 'btn btn-cancel'

app/views/import/google_code/new.html.haml

-- page_title "Google Code import"
-- header_title "Projects", root_path
+- page_title _("Google Code import")
+- header_title _("Projects"), root_path
 %h3.page-title
   %i.fa.fa-google
-  Import projects from Google Code
+  = _('Import projects from Google Code')
 %hr
 
 = form_tag callback_import_google_code_path, multipart: true do
   %p
-    Follow the steps below to export your Google Code project data.
-    In the next step, you'll be able to select the projects you want to import.
+    = _('Follow the steps below to export your Google Code project data.')
+    = _("In the next step, you'll be able to select the projects you want to import.")
   %ol
     %li
       %p
-        Go to
-        #{link_to "Google Takeout", "https://www.google.com/settings/takeout", target: '_blank', rel: 'noopener noreferrer'}.
+        - link_to_google_takeout = link_to(_("Google Takeout"), "https://www.google.com/settings/takeout", target: '_blank', rel: 'noopener noreferrer')
+        = _("Go to %{link_to_google_takeout}.").html_safe % { link_to_google_takeout: link_to_google_takeout }
     %li
       %p
-        Make sure you're logged into the account that owns the projects you'd like to import.
+        = _("Make sure you're logged into the account that owns the projects you'd like to import.")
     %li
       %p
-        Click the <strong>Select none</strong> button on the right, since we only need "Google Code Project Hosting".
+        = _('Click the <strong>Select none</strong> button on the right, since we only need "Google Code Project Hosting".').html_safe
     %li
       %p
-        Scroll down to <strong>Google Code Project Hosting</strong> and enable the switch on the right.
+        = _('Scroll down to <strong>Google Code Project Hosting</strong> and enable the switch on the right.').html_safe
     %li
       %p
-        Choose <strong>Next</strong> at the bottom of the page.
+        = _('Choose <strong>Next</strong> at the bottom of the page.').html_safe
     %li
       %p
-        Leave the "File type" and "Delivery method" options on their default values.
+        = _('Leave the "File type" and "Delivery method" options on their default values.')
     %li
       %p
-        Choose <strong>Create archive</strong> and wait for archiving to complete.
+        = _('Choose <strong>Create archive</strong> and wait for archiving to complete.').html_safe
     %li
       %p
-        Click the <strong>Download</strong> button and wait for downloading to complete.
+        = _('Click the <strong>Download</strong> button and wait for downloading to complete.').html_safe
     %li
       %p
-        Find the downloaded ZIP file and decompress it.
+        = _('Find the downloaded ZIP file and decompress it.')
     %li
       %p
-        Find the newly extracted <code>Takeout/Google Code Project Hosting/GoogleCodeProjectHosting.json</code> file.
+        = _('Find the newly extracted <code>Takeout/Google Code Project Hosting/GoogleCodeProjectHosting.json</code> file.').html_safe
     %li
       %p
-        Upload <code>GoogleCodeProjectHosting.json</code> here:
+        = _('Upload <code>GoogleCodeProjectHosting.json</code> here:').html_safe
       %p
         %input{ type: "file", name: "dump_file", id: "dump_file" }
     %li
       %p
-        Do you want to customize how Google Code email addresses and usernames are imported into GitLab?
+        = _('Do you want to customize how Google Code email addresses and usernames are imported into GitLab?')
       %p
         = label_tag :create_user_map_0 do
           = radio_button_tag :create_user_map, 0, true
-          No, directly import the existing email addresses and usernames.
+          = _('No, directly import the existing email addresses and usernames.')
       %p
         = label_tag :create_user_map_1 do
           = radio_button_tag :create_user_map, 1, false
-          Yes, let me map Google Code users to full names or GitLab users.
+          = _('Yes, let me map Google Code users to full names or GitLab users.')
     %li
       %p
-        = submit_tag 'Continue to the next step', class: "btn btn-create"
+        = submit_tag _('Continue to the next step'), class: "btn btn-create"

app/views/import/google_code/new_user_map.html.haml

-- page_title "User map", "Google Code import"
-- header_title "Projects", root_path
+- page_title _("User map"), _("Google Code import")
+- header_title _("Projects"), root_path
 %h3.page-title
   %i.fa.fa-google
-  Import projects from Google Code
+  = _('Import projects from Google Code')
 %hr
 
 = form_tag create_user_map_import_google_code_path do
   %p
-    Customize how Google Code email addresses and usernames are imported into GitLab.
-    In the next step, you'll be able to select the projects you want to import.
+    = _("Customize how Google Code email addresses and usernames are imported into GitLab. In the next step, you'll be able to select the projects you want to import.")
   %p
-    The user map is a JSON document mapping the Google Code users that participated on your projects to the way their email addresses and usernames will be imported into GitLab. You can change this by changing the value on the right hand side of <code>:</code>. Be sure to preserve the surrounding double quotes, other punctuation and the email address or username on the left hand side.
+    = _("The user map is a JSON document mapping the Google Code users that participated on your projects to the way their email addresses and usernames will be imported into GitLab. You can change this by changing the value on the right hand side of <code>:</code>. Be sure to preserve the surrounding double quotes, other punctuation and the email address or username on the left hand side.").html_safe
   %ul
     %li
-      %strong Default: Directly import the Google Code email address or username
+      %strong= _("Default: Directly import the Google Code email address or username")
       %p
-        <code>"johnsmith@example.com": "johnsm...@example.com"</code>
-        will add "By johnsm...@example.com" to all issues and comments originally created by johnsmith@example.com.
-        The email address or username is masked to ensure the user's privacy.
+        = _('<code>"johnsmith@example.com": "johnsm...@example.com"</code> will add "By johnsm...@example.com" to all issues and comments originally created by johnsmith@example.com. The email address or username is masked to ensure the user\'s privacy.').html_safe
     %li
-      %strong Map a Google Code user to a GitLab user
+      %strong= _("Map a Google Code user to a GitLab user")
       %p
-        <code>"johnsmith@example.com": "@johnsmith"</code>
-        will add "By <a href="#">@johnsmith</a>" to all issues and comments originally created by johnsmith@example.com,
-        and will set <a href="#">@johnsmith</a> as the assignee on all issues originally assigned to johnsmith@example.com.
+        = _('<code>"johnsmith@example.com": "@johnsmith"</code> will add "By <a href="#">@johnsmith</a>" to all issues and comments originally created by johnsmith@example.com, and will set <a href="#">@johnsmith</a> as the assignee on all issues originally assigned to johnsmith@example.com.').html_safe
     %li
-      %strong Map a Google Code user to a full name
+      %strong= _("Map a Google Code user to a full name")
       %p
-        <code>"johnsmith@example.com": "John Smith"</code>
-        will add "By John Smith" to all issues and comments originally created by johnsmith@example.com.
+        = _('<code>"johnsmith@example.com": "John Smith"</code> will add "By John Smith" to all issues and comments originally created by johnsmith@example.com.').html_safe
     %li
-      %strong Map a Google Code user to a full email address
+      %strong= _("Map a Google Code user to a full email address")
       %p
-        <code>"johnsmith@example.com": "johnsmith@example.com"</code>
-        will add "By <a href="#">johnsmith@example.com</a>" to all issues and comments originally created by johnsmith@example.com.
-        By default, the email address or username is masked to ensure the user's privacy. Use this option if you want to show the full email address.
+        = _('<code>"johnsmith@example.com": "johnsmith@example.com"</code> will add "By <a href="#">johnsmith@example.com</a>" to all issues and comments originally created by johnsmith@example.com. By default, the email address or username is masked to ensure the user\'s privacy. Use this option if you want to show the full email address.').html_safe
 
   .form-group.row
     .col-sm-12
       = text_area_tag :user_map, JSON.pretty_generate(@user_map), class: 'form-control', rows: 15
 
   .form-actions
-    = submit_tag 'Continue to the next step', class: "btn btn-create"
+    = submit_tag _('Continue to the next step'), class: "btn btn-create"

app/views/import/google_code/status.html.haml

-- page_title "Google Code import"
-- header_title "Projects", root_path
+- page_title _("Google Code import")
+- header_title _("Projects"), root_path
 %h3.page-title
   %i.fa.fa-google
-  Import projects from Google Code
+  = _('Import projects from Google Code')
 
 - if @repos.any?
   %p.light
-    Select projects you want to import.
+    = _('Select projects you want to import.')
   %p.light
-    Optionally, you can
-    = link_to "customize", new_user_map_import_google_code_path
-    how Google Code email addresses and usernames are imported into GitLab.
+    - link_to_customize = link_to(_("customize"), new_user_map_import_google_code_path)
+    = _("Optionally, you can %{link_to_customize} how Google Code email addresses and usernames are imported into GitLab.").html_safe % { link_to_customize: link_to_customize }
   %hr
   %p
   - if @incompatible_repos.any?
     = button_tag class: "btn btn-import btn-success js-import-all" do
-      Import all compatible projects
+      = _("Import all compatible projects")
       = icon("spinner spin", class: "loading-icon")
   - else
     = button_tag class: "btn btn-import btn-success js-import-all" do
-      Import all projects
+      = _("Import all projects")
       = icon("spinner spin", class: "loading-icon")
 
 .table-responsive
@@ -29,9 +28,9 @@
     %colgroup.import-jobs-status-col
     %thead
       %tr
-        %th From Google Code
-        %th To GitLab
-        %th Status
+        %th= _("From Google Code")
+        %th= _("To GitLab")
+        %th= _("Status")
     %tbody
       - @already_added_projects.each do |project|
         %tr{ id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}" }
@@ -43,10 +42,10 @@
             - if project.import_status == 'finished'
               %span
                 %i.fa.fa-check
-                done
+                = _("done")
             - elsif project.import_status == 'started'
               %i.fa.fa-spinner.fa-spin
-              started
+              = _("started")
             - else
               = project.human_import_status_name
 
@@ -58,7 +57,7 @@
             #{current_user.username}/#{repo.name}
           %td.import-actions.job-status
             = button_tag class: "btn btn-import js-add-to-import" do
-              Import
+              = _("Import")
               = icon("spinner spin", class: "loading-icon")
       - @incompatible_repos.each do |repo|
         %tr{ id: "repo_#{repo.id}" }
@@ -66,15 +65,12 @@
             = link_to repo.name, "https://code.google.com/p/#{repo.name}", target: "_blank", rel: 'noopener noreferrer'
           %td.import-target
           %td.import-actions-job-status
-            = label_tag "Incompatible Project", nil, class: "label badge-danger"
+            = label_tag _("Incompatible Project"), nil, class: "label badge-danger"
 
 - if @incompatible_repos.any?
   %p
-    One or more of your Google Code projects cannot be imported into GitLab
-    directly because they use Subversion or Mercurial for version control,
-    rather than Git. Please convert them to Git on Google Code, and go
-    through the
-    = link_to "import flow", new_import_google_code_path
-    again.
+    = _("One or more of your Google Code projects cannot be imported into GitLab directly because they use Subversion or Mercurial for version control, rather than Git.")
+    - link_to_import_flow = link_to(_("import flow"), new_import_google_code_path)
+    = _("Please convert them to Git on Google Code, and go through the %{link_to_import_flow} again.").html_safe % { link_to_import_flow: link_to_import_flow }
 
 .js-importer-status{ data: { jobs_import_path: "#{jobs_import_google_code_path}", import_path: "#{import_google_code_path}" } }

changelogs/unreleased/frozen-string-enable-app-services.yml

+---
+title: Enable frozen string in apps/uploaders/*.rb
+merge_request: 20401
+author: gfyoung
+type: other

changelogs/unreleased/tweak-sql-buckets.yml

+---
+title: Add a 10 ms bucket for SQL timings
+merge_request:
+author:
+type: changed

changelogs/unreleased/update-issue-closing-pattern.yml

+---
+title: Update issue closing pattern
+merge_request: 20554
+author: George Tsiolis
+type: changed

config/initializers/1_settings.rb

@@ -142,7 +142,7 @@ Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].
 Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].nil?
 Settings.gitlab['restricted_visibility_levels'] = Settings.__send__(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], [])
 Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil?
-Settings.gitlab['issue_closing_pattern'] = '((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?|[Rr]esolv(?:e[sd]?|ing)|[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?: *,? +and +| *, *)?)|([A-Z][A-Z0-9_]+-\d+))+)' if Settings.gitlab['issue_closing_pattern'].nil?
+Settings.gitlab['issue_closing_pattern'] = '((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?|[Rr]esolv(?:e[sd]?|ing)|[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?: *,? +and +| *,? *)?)|([A-Z][A-Z0-9_]+-\d+))+)' if Settings.gitlab['issue_closing_pattern'].nil?
 Settings.gitlab['default_projects_features'] ||= {}
 Settings.gitlab['webhook_timeout'] ||= 10
 Settings.gitlab['max_attachment_size'] ||= 10

doc/development/architecture.md

@@ -197,4 +197,4 @@ Note: It is recommended to log into the `git` user using `sudo -i -u git` or `su
 
 ## GitLab.com
 
-We've also detailed [our architecture of GitLab.com](https://about.gitlab.com/handbook/infrastructure/production-architecture/) but this is probably over the top unless you have millions of users.
+We've also detailed [our architecture of GitLab.com](https://about.gitlab.com/handbook/engineering/infrastructure/production-architecture/) but this is probably over the top unless you have millions of users.

doc/install/installation.md

@@ -92,9 +92,9 @@ Is the system packaged Git too old? Remove it and compile from source.
 
     # Download and compile from source
     cd /tmp
-    curl --remote-name --progress https://www.kernel.org/pub/software/scm/git/git-2.16.3.tar.gz
-    echo 'dda229e9c73f4fbb7d4324e0d993e11311673df03f73b194c554c2e9451e17cd  git-2.16.3.tar.gz' | shasum -a256 -c - && tar -xzf git-2.16.3.tar.gz
-    cd git-2.16.3/
+    curl --remote-name --progress https://www.kernel.org/pub/software/scm/git/git-2.18.0.tar.gz
+    echo '94faf2c0b02a7920b0b46f4961d8e9cad08e81418614102898a55f980fa3e7e4  git-2.18.0.tar.gz' | shasum -a256 -c - && tar -xzf git-2.18.0.tar.gz
+    cd git-2.18.0/
     ./configure
     make prefix=/usr/local all
 

lib/gitlab/metrics/subscribers/active_record.rb

@@ -20,7 +20,7 @@ module Gitlab
         define_histogram :gitlab_sql_duration_seconds do
           docstring 'SQL time'
           base_labels Transaction::BASE_LABELS
-          buckets [0.05, 0.1, 0.25, 0.5, 1.0, 2.5, 5.0]
+          buckets [0.01, 0.05, 0.1, 0.25, 0.5, 1.0, 2.5, 5.0]
         end
 
         def current_transaction

locale/gitlab.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-16 12:42+0000\n"
-"PO-Revision-Date: 2018-07-16 12:42+0000\n"
+"POT-Creation-Date: 2018-07-17 07:12+0000\n"
+"PO-Revision-Date: 2018-07-17 07:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -238,6 +238,18 @@ msgstr ""
 msgid "404|Please contact your GitLab administrator if you think this is a mistake."
 msgstr ""
 
+msgid "<code>\"johnsmith@example.com\": \"@johnsmith\"</code> will add \"By <a href=\"#\">@johnsmith</a>\" to all issues and comments originally created by johnsmith@example.com, and will set <a href=\"#\">@johnsmith</a> as the assignee on all issues originally assigned to johnsmith@example.com."
+msgstr ""
+
+msgid "<code>\"johnsmith@example.com\": \"John Smith\"</code> will add \"By John Smith\" to all issues and comments originally created by johnsmith@example.com."
+msgstr ""
+
+msgid "<code>\"johnsmith@example.com\": \"johnsm...@example.com\"</code> will add \"By johnsm...@example.com\" to all issues and comments originally created by johnsmith@example.com. The email address or username is masked to ensure the user's privacy."
+msgstr ""
+
+msgid "<code>\"johnsmith@example.com\": \"johnsmith@example.com\"</code> will add \"By <a href=\"#\">johnsmith@example.com</a>\" to all issues and comments originally created by johnsmith@example.com. By default, the email address or username is masked to ensure the user's privacy. Use this option if you want to show the full email address."
+msgstr ""
+
 msgid "<strong>%{created_count}</strong> created, <strong>%{accepted_count}</strong> accepted."
 msgstr ""
 
@@ -292,6 +304,9 @@ msgstr ""
 msgid "Access Tokens"
 msgstr ""
 
+msgid "Access denied! Please verify you can add deploy keys to this repository."
+msgstr ""
+
 msgid "Access to '%{classification_label}' not allowed"
 msgstr ""
 
@@ -457,6 +472,9 @@ msgstr ""
 msgid "An application called %{link_to_client} is requesting access to your GitLab account."
 msgstr ""
 
+msgid "An empty GitLab User field will add the FogBugz user's full name (e.g. \"By John Smith\") in the description of all issues and comments. It will also associate and/or assign these issues and comments with the project creator."
+msgstr ""
+
 msgid "An error accured whilst committing your changes."
 msgstr ""
 
@@ -931,6 +949,9 @@ msgstr ""
 msgid "BillingPlans|per user"
 msgstr ""
 
+msgid "Bitbucket import"
+msgstr ""
+
 msgid "Boards"
 msgstr ""
 
@@ -1239,6 +1260,12 @@ msgstr ""
 msgid "Cherry-pick this merge request"
 msgstr ""
 
+msgid "Choose <strong>Create archive</strong> and wait for archiving to complete."
+msgstr ""
+
+msgid "Choose <strong>Next</strong> at the bottom of the page."
+msgstr ""
+
 msgid "Choose File ..."
 msgstr ""
 
@@ -1371,9 +1398,15 @@ msgstr ""
 msgid "Click any <strong>project name</strong> in the project list below to navigate to the project milestone."
 msgstr ""
 
+msgid "Click the <strong>Download</strong> button and wait for downloading to complete."
+msgstr ""
+
 msgid "Click the <strong>Promote</strong> button in the top right corner to promote it to a group milestone."
 msgstr ""
 
+msgid "Click the <strong>Select none</strong> button on the right, since we only need \"Google Code Project Hosting\"."
+msgstr ""
+
 msgid "Click the button below to begin the install process by navigating to the Kubernetes page"
 msgstr ""
 
@@ -1960,6 +1993,9 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+msgid "Continue to the next step"
+msgstr ""
+
 msgid "Continuous Integration and Deployment"
 msgstr ""
 
@@ -2149,6 +2185,12 @@ msgstr ""
 msgid "Customize colors"
 msgstr ""
 
+msgid "Customize how FogBugz email addresses and usernames are imported into GitLab. In the next step, you'll be able to select the projects you want to import."
+msgstr ""
+
+msgid "Customize how Google Code email addresses and usernames are imported into GitLab. In the next step, you'll be able to select the projects you want to import."
+msgstr ""
+
 msgid "Cycle Analytics"
 msgstr ""
 
@@ -2191,6 +2233,12 @@ msgstr ""
 msgid "Default classification label"
 msgstr ""
 
+msgid "Default: Directly import the Google Code email address or username"
+msgstr ""
+
+msgid "Default: Map a FogBugz account ID to a full name"
+msgstr ""
+
 msgid "Define a custom pattern with cron syntax"
 msgstr ""
 
@@ -2394,6 +2442,9 @@ msgstr ""
 msgid "Dismiss Merge Request promotion"
 msgstr ""
 
+msgid "Do you want to customize how Google Code email addresses and usernames are imported into GitLab?"
+msgstr ""
+
 msgid "Documentation for popular identity providers"
 msgstr ""
 
@@ -2808,6 +2859,12 @@ msgstr ""
 msgid "Find file"
 msgstr ""
 
+msgid "Find the downloaded ZIP file and decompress it."
+msgstr ""
+
+msgid "Find the newly extracted <code>Takeout/Google Code Project Hosting/GoogleCodeProjectHosting.json</code> file."
+msgstr ""
+
 msgid "Finished"
 msgstr ""
 
@@ -2817,6 +2874,24 @@ msgstr ""
 msgid "FirstPushedBy|pushed by"
 msgstr ""
 
+msgid "FogBugz Email"
+msgstr ""
+
+msgid "FogBugz Import"
+msgstr ""
+
+msgid "FogBugz Password"
+msgstr ""
+
+msgid "FogBugz URL"
+msgstr ""
+
+msgid "FogBugz import"
+msgstr ""
+
+msgid "Follow the steps below to export your Google Code project data."
+msgstr ""
+
 msgid "Font Color"
 msgstr ""
 
@@ -2855,6 +2930,18 @@ msgstr ""
 msgid "From %{provider_title}"
 msgstr ""
 
+msgid "From Bitbucket"
+msgstr ""
+
+msgid "From FogBugz"
+msgstr ""
+
+msgid "From GitLab.com"
+msgstr ""
+
+msgid "From Google Code"
+msgstr ""
+
 msgid "From issue creation until deploy to production"
 msgstr ""
 
@@ -3068,6 +3155,9 @@ msgstr ""
 msgid "Geo|Verification capacity"
 msgstr ""
 
+msgid "Git"
+msgstr ""
+
 msgid "Git repository URL"
 msgstr ""
 
@@ -3095,15 +3185,27 @@ msgstr ""
 msgid "GitLab Group Runners can execute code for all the projects in this group."
 msgstr ""
 
+msgid "GitLab Import"
+msgstr ""
+
 msgid "GitLab Runner section"
 msgstr ""
 
+msgid "GitLab User"
+msgstr ""
+
+msgid "GitLab project export"
+msgstr ""
+
 msgid "GitLab single sign on URL"
 msgstr ""
 
 msgid "GitLab will run a background job that will produce pseudonymized CSVs of the GitLab database that will be uploaded to your configured object storage directory."
 msgstr ""
 
+msgid "GitLab.com import"
+msgstr ""
+
 msgid "Gitaly"
 msgstr ""
 
@@ -3113,18 +3215,33 @@ msgstr ""
 msgid "Gitaly|Address"
 msgstr ""
 
+msgid "Gitea Host URL"
+msgstr ""
+
+msgid "Gitea Import"
+msgstr ""
+
 msgid "Go Back"
 msgstr ""
 
 msgid "Go back"
 msgstr ""
 
+msgid "Go to %{link_to_google_takeout}."
+msgstr ""
+
 msgid "Go to your fork"
 msgstr ""
 
 msgid "GoToYourFork|Fork"
 msgstr ""
 
+msgid "Google Code import"
+msgstr ""
+
+msgid "Google Takeout"
+msgstr ""
+
 msgid "Google authentication is not %{link_to_documentation}. Ask your GitLab administrator if you want to use this service."
 msgstr ""
 
@@ -3397,15 +3514,42 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Import Projects from Gitea"
+msgstr ""
+
+msgid "Import all compatible projects"
+msgstr ""
+
+msgid "Import all projects"
+msgstr ""
+
 msgid "Import all repositories"
 msgstr ""
 
+msgid "Import an exported GitLab project"
+msgstr ""
+
 msgid "Import in progress"
 msgstr ""
 
 msgid "Import multiple repositories by uploading a manifest file."
 msgstr ""
 
+msgid "Import project"
+msgstr ""
+
+msgid "Import projects from Bitbucket"
+msgstr ""
+
+msgid "Import projects from FogBugz"
+msgstr ""
+
+msgid "Import projects from GitLab.com"
+msgstr ""
+
+msgid "Import projects from Google Code"
+msgstr ""
+
 msgid "Import repositories from GitHub"
 msgstr ""
 
@@ -3424,9 +3568,15 @@ msgstr ""
 msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition."
 msgstr ""
 
+msgid "In the next step, you'll be able to select the projects you want to import."
+msgstr ""
+
 msgid "Include a Terms of Service agreement and Privacy Policy that all users must accept."
 msgstr ""
 
+msgid "Incompatible Project"
+msgstr ""
+
 msgid "Inline"
 msgstr ""
 
@@ -3644,12 +3794,18 @@ msgstr ""
 msgid "Leave project"
 msgstr ""
 
+msgid "Leave the \"File type\" and \"Delivery method\" options on their default values."
+msgstr ""
+
 msgid "License"
 msgstr ""
 
 msgid "List"
 msgstr ""
 
+msgid "List Your Gitea Repositories"
+msgstr ""
+
 msgid "List available repositories"
 msgstr ""
 
@@ -3692,6 +3848,9 @@ msgstr ""
 msgid "Make everyone on your team more productive regardless of their location. GitLab Geo creates read-only mirrors of your GitLab instance so you can reduce the time it takes to clone and fetch large repos."
 msgstr ""
 
+msgid "Make sure you're logged into the account that owns the projects you'd like to import."
+msgstr ""
+
 msgid "Manage access"
 msgstr ""
 
@@ -3722,6 +3881,18 @@ msgstr ""
 msgid "Manifest file import"
 msgstr ""
 
+msgid "Map a FogBugz account ID to a GitLab user"
+msgstr ""
+
+msgid "Map a Google Code user to a GitLab user"
+msgstr ""
+
+msgid "Map a Google Code user to a full email address"
+msgstr ""
+
+msgid "Map a Google Code user to a full name"
+msgstr ""
+
 msgid "Mar"
 msgstr ""
 
@@ -4126,6 +4297,9 @@ msgstr ""
 msgid "No schedules"
 msgstr ""
 
+msgid "No, directly import the existing email addresses and usernames."
+msgstr ""
+
 msgid "None"
 msgstr ""
 
@@ -4249,6 +4423,12 @@ msgstr ""
 msgid "Once imported, repositories can be mirrored over SSH. Read more %{ssh_link}"
 msgstr ""
 
+msgid "One or more of your Bitbucket projects cannot be imported into GitLab directly because they use Subversion or Mercurial for version control, rather than Git."
+msgstr ""
+
+msgid "One or more of your Google Code projects cannot be imported into GitLab directly because they use Subversion or Mercurial for version control, rather than Git."
+msgstr ""
+
 msgid "Online IDE integration settings."
 msgstr ""
 
@@ -4285,6 +4465,12 @@ msgstr ""
 msgid "Operations"
 msgstr ""
 
+msgid "Optionally, you can %{link_to_customize} how FogBugz email addresses and usernames are imported into GitLab."
+msgstr ""
+
+msgid "Optionally, you can %{link_to_customize} how Google Code email addresses and usernames are imported into GitLab."
+msgstr ""
+
 msgid "Options"
 msgstr ""
 
@@ -4531,6 +4717,12 @@ msgstr ""
 msgid "Please accept the Terms of Service before continuing."
 msgstr ""
 
+msgid "Please convert them to %{link_to_git}, and go through the %{link_to_import_flow} again."
+msgstr ""
+
+msgid "Please convert them to Git on Google Code, and go through the %{link_to_import_flow} again."
+msgstr ""
+
 msgid "Please note that this application is not provided by GitLab and you should verify its authenticity before allowing access."
 msgstr ""
 
@@ -4699,6 +4891,9 @@ msgstr ""
 msgid "Project export started. A download link will be sent by email."
 msgstr ""
 
+msgid "Project name"
+msgstr ""
+
 msgid "ProjectActivityRSS|Subscribe"
 msgstr ""
 
@@ -5160,6 +5355,9 @@ msgstr ""
 msgid "Scoped issue boards"
 msgstr ""
 
+msgid "Scroll down to <strong>Google Code Project Hosting</strong> and enable the switch on the right."
+msgstr ""
+
 msgid "Scroll to bottom"
 msgstr ""
 
@@ -5244,12 +5442,18 @@ msgstr ""
 msgid "Select project to choose zone"
 msgstr ""
 
+msgid "Select projects you want to import."
+msgstr ""
+
 msgid "Select source branch"
 msgstr ""
 
 msgid "Select target branch"
 msgstr ""
 
+msgid "Selecting a GitLab user will add a link to the GitLab user in the descriptions of issues and comments (e.g. \"By <a href=\"#\">@johnsmith</a>\"). It will also associate and/or assign these issues and comments with the selected user."
+msgstr ""
+
 msgid "Selective synchronization"
 msgstr ""
 
@@ -5857,6 +6061,12 @@ msgstr ""
 msgid "The time taken by each data entry gathered by that stage."
 msgstr ""
 
+msgid "The user map is a JSON document mapping the Google Code users that participated on your projects to the way their email addresses and usernames will be imported into GitLab. You can change this by changing the value on the right hand side of <code>:</code>. Be sure to preserve the surrounding double quotes, other punctuation and the email address or username on the left hand side."
+msgstr ""
+
+msgid "The user map is a mapping of the FogBugz users that participated on your projects to the way their email address and usernames will be imported into GitLab. You can change this by populating the table below."
+msgstr ""
+
 msgid "The value lying at the midpoint of a series of observed values. E.g., between 3, 5, 9, the median is 5. Between 3, 5, 7, 8, the median is (5+7)/2 = 6."
 msgstr ""
 
@@ -6194,6 +6404,12 @@ msgstr ""
 msgid "To connect an SVN repository, check out %{svn_link}."
 msgstr ""
 
+msgid "To get started you enter your FogBugz URL and login information below. In the next steps, you'll be able to map users and select the projects you want to import."
+msgstr ""
+
+msgid "To get started, please enter your Gitea Host URL and a %{link_to_personal_token}."
+msgstr ""
+
 msgid "To import GitHub repositories, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to import."
 msgstr ""
 
@@ -6203,6 +6419,9 @@ msgstr ""
 msgid "To import an SVN repository, check out %{svn_link}."
 msgstr ""
 
+msgid "To move or copy an entire GitLab project from another GitLab installation to this one, navigate to the original project's settings page, generate an export file, and upload it here."
+msgstr ""
+
 msgid "To only use CI/CD features for an external repository, choose <strong>CI/CD for external repo</strong>."
 msgstr ""
 
@@ -6212,6 +6431,9 @@ msgstr ""
 msgid "To start serving your jobs you can add Runners to your group"
 msgstr ""
 
+msgid "To this GitLab instance"
+msgstr ""
+
 msgid "To validate your GitLab CI configurations, go to 'CI/CD → Pipelines' inside your project, and click on the 'CI Lint' button."
 msgstr ""
 
@@ -6352,6 +6574,9 @@ msgstr ""
 msgid "Upgrade your plan to improve Issue boards."
 msgstr ""
 
+msgid "Upload <code>GoogleCodeProjectHosting.json</code> here:"
+msgstr ""
+
 msgid "Upload New File"
 msgstr ""
 
@@ -6394,6 +6619,9 @@ msgstr ""
 msgid "User and IP Rate Limits"
 msgstr ""
 
+msgid "User map"
+msgstr ""
+
 msgid "Users"
 msgstr ""
 
@@ -6652,6 +6880,9 @@ msgstr ""
 msgid "Yes, add it"
 msgstr ""
 
+msgid "Yes, let me map Google Code users to full names or GitLab users."
+msgstr ""
+
 msgid "You are an admin, which means granting access to <strong>%{client_name}</strong> will allow them to interact with GitLab as an admin as well. Proceed with caution."
 msgstr ""
 
@@ -7053,6 +7284,9 @@ msgstr ""
 msgid "could not read private key, is the passphrase correct?"
 msgstr ""
 
+msgid "customize"
+msgstr ""
+
 msgid "day"
 msgid_plural "days"
 msgstr[0] ""
@@ -7077,6 +7311,9 @@ msgstr ""
 msgid "disabled"
 msgstr ""
 
+msgid "done"
+msgstr ""
+
 msgid "enabled"
 msgstr ""
 
@@ -7089,6 +7326,9 @@ msgstr ""
 msgid "here"
 msgstr ""
 
+msgid "import flow"
+msgstr ""
+
 msgid "importing"
 msgstr ""
 
@@ -7345,6 +7585,9 @@ msgstr ""
 msgid "spendCommand|%{slash_command} will update the sum of the time spent."
 msgstr ""
 
+msgid "started"
+msgstr ""
+
 msgid "this document"
 msgstr ""
 

spec/lib/gitlab/closing_issue_extractor_spec.rb

@@ -379,6 +379,20 @@ describe Gitlab::ClosingIssueExtractor do
             .to match_array([issue, other_issue, third_issue])
       end
 
+      it 'allows non-comma-separated issue numbers in single line message' do
+        message = "Closes #{reference} #{reference2} #{reference3}"
+
+        expect(subject.closed_by_message(message))
+            .to match_array([issue, other_issue, third_issue])
+      end
+
+      it 'allows mixed comma-separated and non-comma-separated issue numbers in single line message' do
+        message = "Closes #{reference}, #{reference2} and #{reference3}"
+
+        expect(subject.closed_by_message(message))
+            .to match_array([issue, other_issue, third_issue])
+      end
+
       it 'fetches issues in multi-line message' do
         message = "Awesome commit (closes #{reference})\nAlso fixes #{reference2}"