Add latest changes from gitlab-org/gitlab@master

3 files changed, 7 insertions, 7 deletions

diff --git a/app/controllers/concerns/onboarding/redirectable.rb b/app/controllers/concerns/onboarding/redirectable.rb
index 7e669db9199..15c1847ebe4 100644
--- a/app/controllers/concerns/onboarding/redirectable.rb
+++ b/app/controllers/concerns/onboarding/redirectable.rb
@@ -9,7 +9,7 @@ module Onboarding
     def after_sign_up_path
       if onboarding_status.single_invite?
         flash[:notice] = helpers.invite_accepted_notice(onboarding_status.last_invited_member)
-        onboarding_status.last_invited_member_source.activity_path
+        polymorphic_path(onboarding_status.last_invited_member_source)
       else
         # Invites will come here if there is more than 1.
         path_for_signed_in_user
@@ -17,13 +17,13 @@ module Onboarding
     end
 
     def path_for_signed_in_user
-      stored_location_for(:user) || last_member_activity_path
+      stored_location_for(:user) || last_member_source_path
     end
 
-    def last_member_activity_path
+    def last_member_source_path
       return dashboard_projects_path unless onboarding_status.last_invited_member_source.present?
 
-      onboarding_status.last_invited_member_source.activity_path
+      polymorphic_path(onboarding_status.last_invited_member_source)
     end
   end
 end
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index c058329680a..fcd87f46f67 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -125,14 +125,14 @@ class InvitesController < ApplicationController
                             name: member.source.full_name,
                             url: project_url(member.source),
                             title: _("project"),
-                            path: member.source.activity_path
+                            path: project_path(member.source)
                           }
                         when Group
                           {
                             name: member.source.name,
                             url: group_url(member.source),
                             title: _("group"),
-                            path: member.source.activity_path
+                            path: group_path(member.source)
                           }
                         end
   end
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 595d79abcf2..a8a09bd6ac6 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -100,7 +100,7 @@ class SessionsController < Devise::SessionsController
   def after_pending_invitations_hook
     member = resource.members.last
 
-    store_location_for(:user, member.source.activity_path) if member
+    store_location_for(:user, polymorphic_path(member.source)) if member
   end
 
   def captcha_enabled?