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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
ce1b742b
Commit
ce1b742b
authored
Oct 09, 2012
by
randx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Group: new link on dashboard if admin. Fixed people count
parent
26045d7a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
2 deletions
+11
-2
app/controllers/groups_controller.rb
app/controllers/groups_controller.rb
+1
-1
app/roles/account.rb
app/roles/account.rb
+4
-0
app/views/dashboard/_groups.html.haml
app/views/dashboard/_groups.html.haml
+5
-0
app/views/groups/people.html.haml
app/views/groups/people.html.haml
+1
-1
No files found.
app/controllers/groups_controller.rb
View file @
ce1b742b
...
@@ -52,7 +52,7 @@ class GroupsController < ApplicationController
...
@@ -52,7 +52,7 @@ class GroupsController < ApplicationController
end
end
def
people
def
people
@users
=
group
.
users
@users
=
group
.
users
.
all
end
end
protected
protected
...
...
app/roles/account.rb
View file @
ce1b742b
...
@@ -22,6 +22,10 @@ module Account
...
@@ -22,6 +22,10 @@ module Account
projects_limit
>
my_own_projects
.
count
projects_limit
>
my_own_projects
.
count
end
end
def
can_create_group?
is_admin?
end
def
last_activity_project
def
last_activity_project
projects
.
first
projects
.
first
end
end
...
...
app/views/dashboard/_groups.html.haml
View file @
ce1b742b
...
@@ -3,6 +3,11 @@
...
@@ -3,6 +3,11 @@
Groups
Groups
%small
%small
(
#{
groups
.
count
}
)
(
#{
groups
.
count
}
)
-
if
current_user
.
can_create_group?
%span
.right
=
link_to
new_admin_group_path
,
class:
"btn very_small info"
do
%i
.icon-plus
New Group
%ul
.unstyled
%ul
.unstyled
-
groups
.
each
do
|
group
|
-
groups
.
each
do
|
group
|
%li
.wll
%li
.wll
...
...
app/views/groups/people.html.haml
View file @
ce1b742b
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
%h5
%h5
People
People
%small
%small
(
#{
@users
.
count
}
)
(
#{
@users
.
size
}
)
%ul
.unstyled
%ul
.unstyled
-
@users
.
each
do
|
user
|
-
@users
.
each
do
|
user
|
%li
.wll
%li
.wll
...
...
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