Add latest changes from gitlab-org/gitlab@master

4 files changed, 37 insertions, 45 deletions

diff --git a/app/helpers/branches_helper.rb b/app/helpers/branches_helper.rb
index ef855718c43..8f87cd5bfe0 100644
--- a/app/helpers/branches_helper.rb
+++ b/app/helpers/branches_helper.rb
@@ -20,10 +20,6 @@ module BranchesHelper
       end
     end
   end
-
-  def gldropdrown_branches_enabled?
-    Feature.enabled?(:gldropdown_branches, default_enabled: :yaml)
-  end
 end
 
 BranchesHelper.prepend_if_ee('EE::BranchesHelper')
diff --git a/app/helpers/ci/pipelines_helper.rb b/app/helpers/ci/pipelines_helper.rb
index 766c46249eb..cabb43f45fd 100644
--- a/app/helpers/ci/pipelines_helper.rb
+++ b/app/helpers/ci/pipelines_helper.rb
@@ -34,39 +34,39 @@ module Ci
     # and will be cleaned up with https://gitlab.com/gitlab-org/gitlab/-/issues/326299
     def experiment_suggested_ci_templates
       [
-        { name: 'Android', logo: image_path('/assets/illustrations/logos/android.svg') },
-        { name: 'Bash', logo: image_path('/assets/illustrations/logos/bash.svg') },
-        { name: 'C++', logo: image_path('/assets/illustrations/logos/c_plus_plus.svg') },
-        { name: 'Clojure', logo: image_path('/assets/illustrations/logos/clojure.svg') },
-        { name: 'Composer', logo: image_path('/assets/illustrations/logos/composer.svg') },
-        { name: 'Crystal', logo: image_path('/assets/illustrations/logos/crystal.svg') },
-        { name: 'Dart', logo: image_path('/assets/illustrations/logos/dart.svg') },
-        { name: 'Django', logo: image_path('/assets/illustrations/logos/django.svg') },
-        { name: 'Docker', logo: image_path('/assets/illustrations/logos/docker.svg') },
-        { name: 'Elixir', logo: image_path('/assets/illustrations/logos/elixir.svg') },
-        { name: 'iOS-Fastlane', logo: image_path('/assets/illustrations/logos/fastlane.svg') },
-        { name: 'Flutter', logo: image_path('/assets/illustrations/logos/flutter.svg') },
-        { name: 'Go', logo: image_path('/assets/illustrations/logos/go_logo.svg') },
-        { name: 'Gradle', logo: image_path('/assets/illustrations/logos/gradle.svg') },
-        { name: 'Grails', logo: image_path('/assets/illustrations/logos/grails.svg') },
-        { name: 'dotNET', logo: image_path('/assets/illustrations/logos/dotnet.svg') },
-        { name: 'Rails', logo: image_path('/assets/illustrations/logos/rails.svg') },
-        { name: 'Julia', logo: image_path('/assets/illustrations/logos/julia.svg') },
-        { name: 'Laravel', logo: image_path('/assets/illustrations/logos/laravel.svg') },
-        { name: 'Latex', logo: image_path('/assets/illustrations/logos/latex.svg') },
-        { name: 'Maven', logo: image_path('/assets/illustrations/logos/maven.svg') },
-        { name: 'Mono', logo: image_path('/assets/illustrations/logos/mono.svg') },
-        { name: 'Nodejs', logo: image_path('/assets/illustrations/logos/node_js.svg') },
-        { name: 'npm', logo: image_path('/assets/illustrations/logos/npm.svg') },
-        { name: 'OpenShift', logo: image_path('/assets/illustrations/logos/openshift.svg') },
-        { name: 'Packer', logo: image_path('/assets/illustrations/logos/packer.svg') },
-        { name: 'PHP', logo: image_path('/assets/illustrations/logos/php.svg') },
-        { name: 'Python', logo: image_path('/assets/illustrations/logos/python.svg') },
-        { name: 'Ruby', logo: image_path('/assets/illustrations/logos/ruby.svg') },
-        { name: 'Rust', logo: image_path('/assets/illustrations/logos/rust.svg') },
-        { name: 'Scala', logo: image_path('/assets/illustrations/logos/scala.svg') },
-        { name: 'Swift', logo: image_path('/assets/illustrations/logos/swift.svg') },
-        { name: 'Terraform', logo: image_path('/assets/illustrations/logos/terraform.svg') }
+        { name: 'Android', logo: image_path('illustrations/logos/android.svg') },
+        { name: 'Bash', logo: image_path('illustrations/logos/bash.svg') },
+        { name: 'C++', logo: image_path('illustrations/logos/c_plus_plus.svg') },
+        { name: 'Clojure', logo: image_path('illustrations/logos/clojure.svg') },
+        { name: 'Composer', logo: image_path('illustrations/logos/composer.svg') },
+        { name: 'Crystal', logo: image_path('illustrations/logos/crystal.svg') },
+        { name: 'Dart', logo: image_path('illustrations/logos/dart.svg') },
+        { name: 'Django', logo: image_path('illustrations/logos/django.svg') },
+        { name: 'Docker', logo: image_path('illustrations/logos/docker.svg') },
+        { name: 'Elixir', logo: image_path('illustrations/logos/elixir.svg') },
+        { name: 'iOS-Fastlane', logo: image_path('illustrations/logos/fastlane.svg') },
+        { name: 'Flutter', logo: image_path('illustrations/logos/flutter.svg') },
+        { name: 'Go', logo: image_path('illustrations/logos/go_logo.svg') },
+        { name: 'Gradle', logo: image_path('illustrations/logos/gradle.svg') },
+        { name: 'Grails', logo: image_path('illustrations/logos/grails.svg') },
+        { name: 'dotNET', logo: image_path('illustrations/logos/dotnet.svg') },
+        { name: 'Rails', logo: image_path('illustrations/logos/rails.svg') },
+        { name: 'Julia', logo: image_path('illustrations/logos/julia.svg') },
+        { name: 'Laravel', logo: image_path('illustrations/logos/laravel.svg') },
+        { name: 'Latex', logo: image_path('illustrations/logos/latex.svg') },
+        { name: 'Maven', logo: image_path('illustrations/logos/maven.svg') },
+        { name: 'Mono', logo: image_path('illustrations/logos/mono.svg') },
+        { name: 'Nodejs', logo: image_path('illustrations/logos/node_js.svg') },
+        { name: 'npm', logo: image_path('illustrations/logos/npm.svg') },
+        { name: 'OpenShift', logo: image_path('illustrations/logos/openshift.svg') },
+        { name: 'Packer', logo: image_path('illustrations/logos/packer.svg') },
+        { name: 'PHP', logo: image_path('illustrations/logos/php.svg') },
+        { name: 'Python', logo: image_path('illustrations/logos/python.svg') },
+        { name: 'Ruby', logo: image_path('illustrations/logos/ruby.svg') },
+        { name: 'Rust', logo: image_path('illustrations/logos/rust.svg') },
+        { name: 'Scala', logo: image_path('illustrations/logos/scala.svg') },
+        { name: 'Swift', logo: image_path('illustrations/logos/swift.svg') },
+        { name: 'Terraform', logo: image_path('illustrations/logos/terraform.svg') }
       ]
     end
 
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 70c094c7ec6..68c3738d19e 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -729,14 +729,6 @@ module ProjectsHelper
     ]
   end
 
-  def sidebar_projects_paths
-    %w[
-      projects#show
-      projects#activity
-      releases#index
-    ]
-  end
-
   def sidebar_settings_paths
     %w[
       projects#edit
diff --git a/app/helpers/whats_new_helper.rb b/app/helpers/whats_new_helper.rb
index 23ed2fc987c..9362ae1491f 100644
--- a/app/helpers/whats_new_helper.rb
+++ b/app/helpers/whats_new_helper.rb
@@ -8,4 +8,8 @@ module WhatsNewHelper
   def whats_new_version_digest
     ReleaseHighlight.most_recent_version_digest
   end
+
+  def display_whats_new?
+    Gitlab.dev_env_org_or_com? || user_signed_in?
+  end
 end