BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
f8137075
Commit
f8137075
authored
Aug 06, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show correct group membership in profile
parent
0b747a0f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
groups_controller.rb
app/controllers/profiles/groups_controller.rb
+1
-1
index.html.haml
app/views/profiles/groups/index.html.haml
+7
-3
No files found.
app/controllers/profiles/groups_controller.rb
View file @
f8137075
...
...
@@ -2,7 +2,7 @@ class Profiles::GroupsController < ApplicationController
layout
"profile"
def
index
@
groups
=
current_user
.
authorized
_groups
.
page
(
params
[
:page
]).
per
(
20
)
@
user_groups
=
current_user
.
users
_groups
.
page
(
params
[
:page
]).
per
(
20
)
end
def
leave
...
...
app/views/profiles/groups/index.html.haml
View file @
f8137075
...
...
@@ -11,9 +11,10 @@
.ui-box
.title
%strong
Groups
(
#{
@groups
.
count
}
)
(
#{
@
user_
groups
.
count
}
)
%ul
.well-list
-
@groups
.
each
do
|
group
|
-
@user_groups
.
each
do
|
user_group
|
-
group
=
user_group
.
group
%li
.pull-right
-
if
can?
(
current_user
,
:manage_group
,
group
)
...
...
@@ -28,4 +29,7 @@
=
link_to
group
,
class:
'group-name'
do
=
group
.
name
=
paginate
@groups
as
#{
user_group
.
human_access
}
=
paginate
@user_groups
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