Add latest changes from gitlab-org/gitlab@master

app/assets/stylesheets/utilities.scss

@@ -40,12 +40,12 @@
 // Classes using mixins coming from @gitlab-ui
 // can be removed once https://gitlab.com/gitlab-org/gitlab/merge_requests/19021 has been merged
-.gl-bg-blue-500 { @include gl-bg-blue-500; }
 .gl-bg-red-100 { @include gl-bg-red-100; }
 .gl-bg-orange-100 { @include gl-bg-orange-100; }
 .gl-bg-gray-100 { @include gl-bg-gray-100; }
 .gl-bg-green-100 { @include gl-bg-green-100;}
+.gl-text-blue-500 { @include gl-text-blue-500; }
 .gl-text-gray-900 { @include gl-text-gray-900; }
 .gl-text-red-700 { @include gl-text-red-700; }
 .gl-text-orange-700 { @include gl-text-orange-700; }

app/helpers/submodule_helper.rb

@@ -43,6 +43,8 @@ module SubmoduleHelper
       elsif github_dot_com_url?(url)
         standard_links('github.com', namespace, project, submodule_item_id)
       elsif gitlab_dot_com_url?(url)
+        # This need to be replaced with /-/tree routing once one is landed on
+        # GitLab.com. Issue https://gitlab.com/gitlab-org/gitlab/issues/42764
         standard_links('gitlab.com', namespace, project, submodule_item_id)
       else
         [sanitize_submodule_url(url), nil]

app/helpers/tree_helper.rb

@@ -38,13 +38,13 @@ module TreeHelper
   # many paths, as with a repository tree that has thousands of items.
   def fast_project_blob_path(project, blob_path)
     ActionDispatch::Journey::Router::Utils.escape_path(
-      File.join(relative_url_root, project.path_with_namespace, 'blob', blob_path)
+      File.join(relative_url_root, project.path_with_namespace, '-', 'blob', blob_path)
     )
   end
   def fast_project_tree_path(project, tree_path)
     ActionDispatch::Journey::Router::Utils.escape_path(
-      File.join(relative_url_root, project.path_with_namespace, 'tree', tree_path)
+      File.join(relative_url_root, project.path_with_namespace, '-', 'tree', tree_path)
     )
   end

app/models/clusters/applications/knative.rb

@@ -3,7 +3,7 @@
 module Clusters
   module Applications
     class Knative < ApplicationRecord
-      VERSION = '0.7.0'
+      VERSION = '0.9.0'
       REPOSITORY = 'https://storage.googleapis.com/triggermesh-charts'
       METRICS_CONFIG = 'https://storage.googleapis.com/triggermesh-charts/istio-metrics.yaml'
       FETCH_IP_ADDRESS_DELAY = 30.seconds

app/views/admin/users/_access_levels.html.haml

@@ -43,7 +43,7 @@
       = f.check_box :external do
         External
       %p.light
-        External users cannot see internal or private projects unless access is explicitly granted. Also, external users cannot create projects or groups.
+        External users cannot see internal or private projects unless access is explicitly granted. Also, external users cannot create projects, groups, or personal snippets.
       %row.hidden#warning_external_automatically_set.hidden
         .badge.badge-warning.text-white
           = _('Automatically marked as default internal user')

app/views/dashboard/_snippets_head.html.haml

@@ -3,7 +3,8 @@
   - if current_user && current_user.snippets.any? || @snippets.any?
     .page-title-controls
-      = link_to _("New snippet"), new_snippet_path, class: "btn btn-success", title: _("New snippet")
+      - if can?(current_user, :create_personal_snippet)
+        = link_to _("New snippet"), new_snippet_path, class: "btn btn-success", title: _("New snippet")
 .top-area
   %ul.nav-links.nav.nav-tabs

app/views/dashboard/snippets/index.html.haml

 - @hide_top_links = true
 - page_title    "Snippets"
 - header_title  "Snippets", dashboard_snippets_path
+- button_path = new_snippet_path if can?(current_user, :create_personal_snippet)
 = render 'dashboard/snippets_head'
 - if current_user.snippets.exists?
@@ -9,4 +10,4 @@
 - if current_user.snippets.exists?
   = render partial: 'shared/snippets/list', locals: { link_project: true }
 - else
-  = render 'shared/empty_states/snippets', button_path: new_snippet_path
+  = render 'shared/empty_states/snippets', button_path: button_path

app/views/profiles/accounts/_providers.html.haml

@@ -16,6 +16,6 @@
             %a.provider-btn
               = s_('Profiles|Active')
         - elsif link_allowed
-          = link_to omniauth_authorize_path(:user, provider), method: :post, class: 'provider-btn gl-bg-blue-500' do
+          = link_to omniauth_authorize_path(:user, provider), method: :post, class: 'provider-btn gl-text-blue-500' do
             = s_('Profiles|Connect')
   = render_if_exists 'profiles/accounts/group_saml_unlink_buttons', group_saml_identities: group_saml_identities

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

@@ -8,8 +8,7 @@
       - if can?(current_user, :create_project_snippet, @project)
         .nav-controls
-          - if can?(current_user, :create_project_snippet, @project)
-            = link_to _("New snippet"), new_project_snippet_path(@project), class: "btn btn-success", title: _("New snippet")
+          = link_to _("New snippet"), new_project_snippet_path(@project), class: "btn btn-success", title: _("New snippet")
   = render 'shared/snippets/list'
 - else

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

@@ -3,13 +3,16 @@
 - breadcrumb_title @snippet.to_reference
 - page_title "#{@snippet.title} (#{@snippet.to_reference})", _("Snippets")
-= render 'shared/snippets/header'
-.project-snippets
-  %article.file-holder.snippet-file-content
-    = render 'shared/snippets/blob'
-  .row-content-block.top-block.content-component-block
-    = render 'award_emoji/awards_block', awardable: @snippet, inline: true
-  #notes.limited-width-notes= render "shared/notes/notes_with_form", :autocomplete => true
+- if Feature.enabled?(:snippets_vue)
+  #js-snippet-view{ data: {'qa-selector': 'snippet_view', 'snippet-gid': @snippet.to_global_id} }
+- else
+  = render 'shared/snippets/header'
+  .project-snippets
+    %article.file-holder.snippet-file-content
+      = render 'shared/snippets/blob'
+    .row-content-block.top-block.content-component-block
+      = render 'award_emoji/awards_block', awardable: @snippet, inline: true
+    #notes.limited-width-notes= render "shared/notes/notes_with_form", :autocomplete => true

app/views/shared/empty_states/_snippets.html.haml

@@ -11,7 +11,8 @@
         %p
           = s_('SnippetsEmptyState|They can be either public or private.')
         .text-center
-          = link_to s_('SnippetsEmptyState|New snippet'), button_path, class: 'btn btn-success', title: s_('SnippetsEmptyState|New snippet'), id: 'new_snippet_link'
+          - if button_path
+            = link_to s_('SnippetsEmptyState|New snippet'), button_path, class: 'btn btn-success', title: s_('SnippetsEmptyState|New snippet'), id: 'new_snippet_link'
           - unless current_page?(dashboard_snippets_path)
             = link_to s_('SnippetsEmptyState|Explore public snippets'), explore_snippets_path, class: 'btn btn-default', title: s_('SnippetsEmptyState|Explore public snippets')
       - else

app/views/snippets/_snippets.html.haml

@@ -3,7 +3,7 @@
 - current_user_empty_message_header = s_('UserProfile|You haven\'t created any snippets.')
 - current_user_empty_message_description = s_('UserProfile|Snippets in GitLab can either be private, internal, or public.')
 - primary_button_label = _('New snippet')
-- primary_button_link = new_snippet_path
+- primary_button_link = new_snippet_path if can?(current_user, :create_personal_snippet)
 - visitor_empty_message = s_('UserProfile|No snippets found.')
 .snippets-list-holder

babel.config.js

@@ -21,6 +21,7 @@ const plugins = [
   '@babel/plugin-proposal-class-properties',
   '@babel/plugin-proposal-json-strings',
   '@babel/plugin-proposal-private-methods',
+  '@babel/plugin-proposal-optional-chaining',
 ];
 // add code coverage tooling if necessary

changelogs/unreleased/39498-part-1.yml

+---
+title: "!21542 Part 1: Add new utils for Web IDE store"
+merge_request: 21673
+author:
+type: fixed

changelogs/unreleased/ap-14330-external-personal-snippets.yml

+---
+title: Match external user new snippet button visibility to permissions
+merge_request: 21718
+author:
+type: fixed

changelogs/unreleased/dz-scope-repository-routes.yml

+---
+title: Move repository routes under - scope
+merge_request: 20455
+author:
+type: deprecated

changelogs/unreleased/knative-0-9-update.yml

+---
+title: Update Knative to 0.9.0
+merge_request: 21361
+author: cab105
+type: added

changelogs/unreleased/service-desk-name.yml

+---
+title: Added migration which adds service desk username column
+merge_request: 21733
+author:
+type: added

config/prometheus/common_metrics.yml

@@ -209,6 +209,6 @@ panel_groups:
     weight: 1
     metrics:
     - id: system_metrics_knative_function_invocation_count
-      query_range: 'sum(ceil(rate(istio_requests_total{destination_service_namespace="%{kube_namespace}", destination_app=~"%{function_name}.*"}[1m])*60))'
+      query_range: 'sum(ceil(rate(istio_requests_total{destination_service_namespace="%{kube_namespace}", destination_service=~"%{function_name}.*"}[1m])*60))'
       label: invocations / minute
       unit: requests

config/routes/project.rb

@@ -554,7 +554,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
                                             :forks, :group_links, :import, :avatar, :mirror,
                                             :cycle_analytics, :mattermost, :variables, :triggers,
                                             :environments, :protected_environments, :error_tracking,
-                                            :serverless, :clusters, :audit_events, :wikis, :merge_requests)
+                                            :serverless, :clusters, :audit_events, :wikis, :merge_requests,
+                                            :blob, :tree, :raw, :blame, :commits, :create_dir, :find_file, :files)
     end
     # rubocop: disable Cop/PutProjectRoutesUnderScope