Merge branch 'issue_341248_1' into 'master'

Remove expires_in key

See merge request gitlab-org/gitlab!72212

app/controllers/concerns/membership_actions.rb

@@ -26,7 +26,6 @@ module MembershipActions
 
     member_data = if member.expires?
                     {
-                      expires_in: helpers.distance_of_time_in_words_to_now(member.expires_at),
                       expires_soon: member.expires_soon?,
                       expires_at_formatted: member.expires_at.to_time.in_time_zone.to_s(:medium)
                     }

spec/controllers/groups/group_members_controller_spec.rb

@@ -293,7 +293,6 @@ RSpec.describe Groups::GroupMembersController do
       context 'when `expires_at` is set' do
         it 'returns correct json response' do
           expect(json_response).to eq({
-            "expires_in" => "about 1 month",
             "expires_soon" => false,
             "expires_at_formatted" => expiry_date.to_time.in_time_zone.to_s(:medium)
           })

spec/controllers/projects/project_members_controller_spec.rb

@@ -369,7 +369,6 @@ RSpec.describe Projects::ProjectMembersController do
       context 'when `expires_at` is set' do
         it 'returns correct json response' do
           expect(json_response).to eq({
-            "expires_in" => "about 1 month",
             "expires_soon" => false,
             "expires_at_formatted" => expiry_date.to_time.in_time_zone.to_s(:medium)
           })