Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc41

1 files changed, 9 insertions, 8 deletions

diff --git a/app/helpers/learn_gitlab_helper.rb b/app/helpers/learn_gitlab_helper.rb
index e72a9c83fc9..f50c1e52bed 100644
--- a/app/helpers/learn_gitlab_helper.rb
+++ b/app/helpers/learn_gitlab_helper.rb
@@ -15,7 +15,8 @@ module LearnGitlabHelper
       [
         action,
         url: url,
-        completed: attributes[OnboardingProgress.column_name(action)].present?
+        completed: attributes[OnboardingProgress.column_name(action)].present?,
+        svg: image_path("learn_gitlab/#{action}.svg")
       ]
     end.to_h
   end
@@ -23,13 +24,13 @@ module LearnGitlabHelper
   private
 
   ACTION_ISSUE_IDS = {
-    git_write: 2,
-    pipeline_created: 4,
-    merge_request_created: 6,
-    user_added: 7,
-    trial_started: 13,
-    required_mr_approvals_enabled: 15,
-    code_owners_enabled: 16
+    git_write: 6,
+    pipeline_created: 7,
+    merge_request_created: 9,
+    user_added: 8,
+    trial_started: 2,
+    required_mr_approvals_enabled: 11,
+    code_owners_enabled: 10
   }.freeze
 
   ACTION_DOC_URLS = {