Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
f54ddbf1
Commit
f54ddbf1
authored
Nov 16, 2016
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix MembersHelper
parent
f438a2aa
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
11 deletions
+11
-11
app/helpers/members_helper.rb
app/helpers/members_helper.rb
+11
-11
No files found.
app/helpers/members_helper.rb
View file @
f54ddbf1
...
@@ -11,17 +11,17 @@ module MembersHelper
...
@@ -11,17 +11,17 @@ module MembersHelper
text
=
'Are you sure you want to '
text
=
'Are you sure you want to '
action
=
action
=
if
member
.
request?
if
member
.
request?
if
member
.
user
==
user
if
member
.
user
==
user
'withdraw your access request for'
'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"
else
else
"
remove
#{
member
.
user
.
name
}
from
"
"
deny
#{
member
.
user
.
name
}
's request to join
"
end
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
)
}
?"
text
<<
action
<<
" the
#{
member
.
source
.
human_name
}
#{
member
.
real_source_type
.
humanize
(
capitalize:
false
)
}
?"
end
end
...
@@ -39,8 +39,8 @@ module MembersHelper
...
@@ -39,8 +39,8 @@ module MembersHelper
def
filter_group_project_member_path
(
options
=
{})
def
filter_group_project_member_path
(
options
=
{})
exist_opts
=
{
exist_opts
=
{
search:
params
[
:search
],
search:
params
[
:search
],
sort:
params
[
:sort
]
sort:
params
[
:sort
]
}
}
options
=
exist_opts
.
merge
(
options
)
options
=
exist_opts
.
merge
(
options
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment