Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 2 deletions

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index a59734d643d..9b2c6c37fd6 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -738,6 +738,12 @@ module API
         namespace: namespace,
         project: project
       )
+    rescue Gitlab::InternalEvents::UnknownEventError => e
+      Gitlab::ErrorTracking.track_exception(e, event_name: event_name)
+
+      # We want to keep the error silent on production to keep the behavior
+      # consistent with StandardError rescue
+      unprocessable_entity!(e.message) if Gitlab.dev_or_test_env?
     rescue StandardError => e
       Gitlab::ErrorTracking.track_and_raise_for_dev_exception(e, event_name: event_name)
     end
diff --git a/lib/api/invitations.rb b/lib/api/invitations.rb
index d625b2c0fe6..09bb336e19c 100644
--- a/lib/api/invitations.rb
+++ b/lib/api/invitations.rb
@@ -73,7 +73,7 @@ module API
         end
 
         desc 'Updates a group or project invitation.' do
-          success Entities::Member
+          success Entities::Invitation
           tags %w[invitations]
         end
         params do
@@ -103,7 +103,7 @@ module API
           updated_member = result[:members].first
 
           if result[:status] == :success
-            present_members updated_member
+            present_member_invitations updated_member
           else
             render_validation_error!(updated_member)
           end