Add latest changes from gitlab-org/gitlab@master

6 files changed, 24 insertions, 1 deletions

diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index c36bbaab23b..f24ce9b5d03 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -2,6 +2,7 @@
 
 class Admin::DashboardController < Admin::ApplicationController
   include CountHelper
+  helper_method :show_license_breakdown?
 
   COUNTED_ITEMS = [Project, User, Group].freeze
 
@@ -13,6 +14,10 @@ class Admin::DashboardController < Admin::ApplicationController
     @groups = Group.order_id_desc.with_route.limit(10)
   end
   # rubocop: enable CodeReuse/ActiveRecord
+
+  def show_license_breakdown?
+    false
+  end
 end
 
 Admin::DashboardController.prepend_if_ee('EE::Admin::DashboardController')
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 2b913808c2f..41147950c40 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -1,6 +1,7 @@
 - breadcrumb_title "Dashboard"
 
-= render_if_exists 'admin/licenses/breakdown', license: @license
+- if show_license_breakdown?
+  = render_if_exists 'admin/licenses/breakdown', license: @license
 
 .admin-dashboard.prepend-top-default
   .row
diff --git a/changelogs/unreleased/30525-iframe_jaeger.yml b/changelogs/unreleased/30525-iframe_jaeger.yml
new file mode 100644
index 00000000000..19fdccf6333
--- /dev/null
+++ b/changelogs/unreleased/30525-iframe_jaeger.yml
@@ -0,0 +1,5 @@
+---
+title: Embed Jaeger in Gitlab UI
+merge_request:
+author:
+type: changed
diff --git a/changelogs/unreleased/sh-hide-license-breakdown.yml b/changelogs/unreleased/sh-hide-license-breakdown.yml
new file mode 100644
index 00000000000..f6b8efdc773
--- /dev/null
+++ b/changelogs/unreleased/sh-hide-license-breakdown.yml
@@ -0,0 +1,5 @@
+---
+title: Hide license breakdown in /admin if user count is high
+merge_request: 18825
+author:
+type: performance
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index b56d50cabad..74d52dad839 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -7922,6 +7922,9 @@ msgstr ""
 msgid "GitLab single sign on URL"
 msgstr ""
 
+msgid "GitLab uses %{jaeger_link} to monitor distributed systems."
+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 ""
 
@@ -19289,6 +19292,9 @@ msgstr ""
 msgid "Your new personal access token has been created."
 msgstr ""
 
+msgid "Your password isn't required to view this page. If a password or any other personal details are requested, please contact your administrator to report abuse."
+msgstr ""
+
 msgid "Your password reset token has expired."
 msgstr ""
 
diff --git a/spec/views/admin/dashboard/index.html.haml_spec.rb b/spec/views/admin/dashboard/index.html.haml_spec.rb
index 3aaaabe4629..93fedde6e96 100644
--- a/spec/views/admin/dashboard/index.html.haml_spec.rb
+++ b/spec/views/admin/dashboard/index.html.haml_spec.rb
@@ -17,6 +17,7 @@ describe 'admin/dashboard/index.html.haml' do
 
     allow(view).to receive(:admin?).and_return(true)
     allow(view).to receive(:current_application_settings).and_return(Gitlab::CurrentSettings.current_application_settings)
+    allow(view).to receive(:show_license_breakdown?).and_return(false)
   end
 
   it "shows version of GitLab Workhorse" do