Add latest changes from gitlab-org/gitlab@master

app/assets/stylesheets/page_bundles/trial_discover_page.scss

@@ -1,9 +0,0 @@
-@import 'mixins_and_variables_and_functions';
-
-.trial-discover-page-card {
-  @include media-breakpoint-down(md) {
-    .description-text {
-      height: 6em;
-    }
-  }
-}

app/views/projects/settings/ci_cd/show.html.haml

@@ -53,6 +53,8 @@
       - c.with_body do
         #js-artifacts-settings-app{ data: { full_path: @project.full_path, help_page_path: help_page_path('ci/jobs/job_artifacts.md', anchor: 'keep-artifacts-from-most-recent-successful-jobs') } }
 
+= render_if_exists 'projects/settings/ci_cd/secrets', expanded: expanded
+
 - if can?(current_user, :admin_cicd_variables, @project)
   = render ::Layouts::SettingsBlockComponent.new(_('Variables'),
     id: 'js-cicd-variables-settings',

locale/gitlab.pot

@@ -6037,6 +6037,9 @@ msgstr ""
 msgid "An error occurred while fetching reviewers."
 msgstr ""
 
+msgid "An error occurred while fetching secrets, please try again."
+msgstr ""
+
 msgid "An error occurred while fetching tags. Retry the search."
 msgstr ""
 
@@ -20467,6 +20470,9 @@ msgstr ""
 msgid "DuoProDiscover|Improve developer experience"
 msgstr ""
 
+msgid "DuoProDiscover|Maintain control over the data that's sent to an external large language model (LLM) service. Your organization's proprietary data and code are never used to train external AI models."
+msgstr ""
+
 msgid "DuoProDiscover|Maintain control over the data that's sent to an external large language model (LLM) service. Your organization's proprietary data or code are never used to train external AI models."
 msgstr ""
 
@@ -20491,6 +20497,9 @@ msgstr ""
 msgid "DuoProDiscover|Streamline the refactoring process with AI-powered recommendations to optimize code structure and improve readability."
 msgstr ""
 
+msgid "DuoProDiscover|The GitLab %{link_start}AI Transparency Center%{link_end} details how GitLab upholds ethics and transparency in its AI-powered features."
+msgstr ""
+
 msgid "DuoProDiscover|The GitLab %{link_start}AI Transparency Center%{link_end} details how we uphold ethics and transparency in our AI-powered features."
 msgstr ""
 
@@ -48848,6 +48857,9 @@ msgstr[1] ""
 msgid "Secrets"
 msgstr ""
 
+msgid "Secrets represent sensitive information your CI job needs to complete work."
+msgstr ""
+
 msgid "Secrets|Actions"
 msgstr ""
 
@@ -57956,21 +57968,12 @@ msgstr ""
 msgid "TrialDiscoverPage|A single application eliminates complex integrations, data checkpoints, and toolchain maintenance, resulting in greater productivity and lower cost."
 msgstr ""
 
-msgid "TrialDiscoverPage|Access advanced features"
-msgstr ""
-
-msgid "TrialDiscoverPage|Access advanced features, build more efficiently, strengthen security and compliance."
-msgstr ""
-
 msgid "TrialDiscoverPage|Break down silos to coordinate seamlessly across development, operations, and security with a consistent experience across the development lifecycle."
 msgstr ""
 
 msgid "TrialDiscoverPage|Burn down charts"
 msgstr ""
 
-msgid "TrialDiscoverPage|Calculate seats"
-msgstr ""
-
 msgid "TrialDiscoverPage|Code owners"
 msgstr ""
 
@@ -57983,24 +57986,12 @@ msgstr ""
 msgid "TrialDiscoverPage|Collaboration made easy"
 msgstr ""
 
-msgid "TrialDiscoverPage|Compare all plans"
-msgstr ""
-
 msgid "TrialDiscoverPage|Create a more advanced workflow for issues, merge requests, and epics by using scoped, mutually exclusive labels."
 msgstr ""
 
 msgid "TrialDiscoverPage|Dependency scanning"
 msgstr ""
 
-msgid "TrialDiscoverPage|Discover"
-msgstr ""
-
-msgid "TrialDiscoverPage|Discover Premium & Ultimate"
-msgstr ""
-
-msgid "TrialDiscoverPage|Documentation"
-msgstr ""
-
 msgid "TrialDiscoverPage|Dynamic application security testing (DAST)"
 msgstr ""
 
@@ -58043,9 +58034,6 @@ msgstr ""
 msgid "TrialDiscoverPage|Scoped Labels"
 msgstr ""
 
-msgid "TrialDiscoverPage|Speed. Efficiency. Trust."
-msgstr ""
-
 msgid "TrialDiscoverPage|Target the right approvers for your merge request by assigning owners to specific files."
 msgstr ""
 
@@ -58061,6 +58049,42 @@ msgstr ""
 msgid "TrialDiscoverPage|Your software, deployed your way"
 msgstr ""
 
+msgid "TrialDiscover|Deliver value faster with metrics derived from a unified data store to increase revenue, accelerate speed."
+msgstr ""
+
+msgid "TrialDiscover|Discover"
+msgstr ""
+
+msgid "TrialDiscover|Duo Enterprise"
+msgstr ""
+
+msgid "TrialDiscover|End-to-end security and compliance, built right into the platform your developers already use."
+msgstr ""
+
+msgid "TrialDiscover|GitLab Value Streams Dashboard"
+msgstr ""
+
+msgid "TrialDiscover|How to use GitLab for Agile software development"
+msgstr ""
+
+msgid "TrialDiscover|One platform to empower Dev, Sec, and Ops teams"
+msgstr ""
+
+msgid "TrialDiscover|Reliable and feature rich automations help remove cognitive load and unnecessary repetitive work."
+msgstr ""
+
+msgid "TrialDiscover|Security Dashboard - Advanced Security Testing"
+msgstr ""
+
+msgid "TrialDiscover|Ship software faster and more securely with AI integrated into your entire DevSecOps lifecycle."
+msgstr ""
+
+msgid "TrialDiscover|Streamline communication to build, test, package, and deploy secure software in a fraction of the time."
+msgstr ""
+
+msgid "TrialDiscover|Why Ultimate & GitLab Duo Enterprise?"
+msgstr ""
+
 msgid "TrialRegistration|To complete registration, we need additional details from you."
 msgstr ""
 
@@ -58112,6 +58136,18 @@ msgstr ""
 msgid "TrialWidget|Your trial of Ultimate with GitLab Duo Enterprise has ended"
 msgstr ""
 
+msgid "TrialsDiscover|Enhance productivity"
+msgstr ""
+
+msgid "TrialsDiscover|Gain actionable insights"
+msgstr ""
+
+msgid "TrialsDiscover|Improve collaboration"
+msgstr ""
+
+msgid "TrialsDiscover|Increase security"
+msgstr ""
+
 msgid "Trials|Create a new group and start your trial of Ultimate with GitLab Duo Enterprise."
 msgstr ""
 

workhorse/go.mod

@@ -25,7 +25,7 @@ require (
 	github.com/jpillora/backoff v1.0.0
 	github.com/mitchellh/copystructure v1.2.0
 	github.com/prometheus/client_golang v1.20.5
-	github.com/redis/go-redis/v9 v9.6.1
+	github.com/redis/go-redis/v9 v9.7.0
 	github.com/sebest/xff v0.0.0-20210106013422-671bd2870b3a
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.9.0

workhorse/go.sum

@@ -421,8 +421,8 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg
 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/prometheus/prometheus v0.54.0 h1:6+VmEkohHcofl3W5LyRlhw1Lfm575w/aX6ZFyVAmzM0=
 github.com/prometheus/prometheus v0.54.0/go.mod h1:xlLByHhk2g3ycakQGrMaU8K7OySZx98BzeCR99991NY=
-github.com/redis/go-redis/v9 v9.6.1 h1:HHDteefn6ZkTtY5fGUE8tj8uy85AHk6zP7CpzIAM0y4=
+github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa9E=
-github.com/redis/go-redis/v9 v9.6.1/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA=
+github.com/redis/go-redis/v9 v9.7.0/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=