diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-19 06:14:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-19 06:14:18 +0300 |
| commit | 1947c080b33184b0204e302f36954c0fa55b9109 (patch) | |
| tree | 3bc1075481babcbf97ac62faea63ccd5d5f5e497 /app/controllers | |
| parent | 0aa559415ca12dd0f0efd226873dd2a8e5313e3d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/membership_actions.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/concerns/membership_actions.rb b/app/controllers/concerns/membership_actions.rb index 8fd4e98d557..f716c1f6c2f 100644 --- a/app/controllers/concerns/membership_actions.rb +++ b/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) } |