diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-11-16 19:35:33 -0200 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-16 20:28:38 -0200 |
commit | f54ddbf1ecb91ea96b52e18f87ff5ed10ad45747 (patch) | |
tree | 87fdb4a07dbed191d768ab5a64bf0939882f4d0a /app/helpers/members_helper.rb | |
parent | f438a2aabe7f75c0d6ed3a6c1ce2ab5a62e33b31 (diff) | |
download | gitlab-ce-f54ddbf1ecb91ea96b52e18f87ff5ed10ad45747.tar.gz |
Fix MembersHelper
Diffstat (limited to 'app/helpers/members_helper.rb')
-rw-r--r-- | app/helpers/members_helper.rb | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb index f1b8962eb36..cf8fdfca1bd 100644 --- a/app/helpers/members_helper.rb +++ b/app/helpers/members_helper.rb @@ -11,17 +11,17 @@ module MembersHelper text = 'Are you sure you want to ' action = - if member.request? - if member.user == user - 'withdraw your access request for' - else - "deny #{member.user.name}'s request to join" - end - elsif member.invite? - "revoke the invitation for #{member.invite_email} to join" + if member.request? + if member.user == user + 'withdraw your access request for' else - "remove #{member.user.name} from" + "deny #{member.user.name}'s request to join" end + elsif member.invite? + "revoke the invitation for #{member.invite_email} to join" + else + "remove #{member.user.name} from" + end text << action << " the #{member.source.human_name} #{member.real_source_type.humanize(capitalize: false)}?" end @@ -39,8 +39,8 @@ module MembersHelper def filter_group_project_member_path(options = {}) exist_opts = { - search: params[:search], - sort: params[:sort] + search: params[:search], + sort: params[:sort] } options = exist_opts.merge(options) |