Skip to content

Remove expires_in key

Siddharth Asthana requested to merge edith007/gitlab:issue_341248_1 into master

What does this MR do and why?

This MR aims to solve the issue #341248 (closed)

GroupMembersController#update and ProjectMembersController#update return an expires_in key. The value of the expires_in key uses distance_of_time_in_words_to_now which does not respect the User#time_display_relative setting added in #14560 (closed). So, we planned on changing it to use time_ago_with_tooltip. But the expires_in key doesn't seem to be used. So this MR removes the expires_in key.

Changes in File

  • app/controllers/concerns/membership_actions.rb
  • spec/controllers/groups/group_members_controller_spec.rb
  • spec/controllers/projects/project_members_controller_spec.rb
Project members table Group members table
As a maintainer/owner project_as_admin group_as_admin
As a Developer project_as_developer group_as_developer

How to set up and validate locally:

For group members table:

  1. In your GDK, go to any group.
  2. Go to Group Information > Members.
  3. Change the expiry date of any member.

For project members table:

  1. In your GDK, go to any project.
  2. Go to Project Information > Members.
  3. Change the expiry date of any member.
Edited by Siddharth Asthana

Merge request reports

Loading