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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
a7026369
Commit
a7026369
authored
Jul 11, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show real shared projects at group page
parent
909e479e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
1 deletion
+7
-1
app/controllers/groups_controller.rb
app/controllers/groups_controller.rb
+2
-0
app/controllers/projects/group_links_controller.rb
app/controllers/projects/group_links_controller.rb
+1
-0
app/models/group.rb
app/models/group.rb
+3
-0
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+1
-1
No files found.
app/controllers/groups_controller.rb
View file @
a7026369
...
@@ -34,6 +34,8 @@ class GroupsController < ApplicationController
...
@@ -34,6 +34,8 @@ class GroupsController < ApplicationController
@events
=
Event
.
in_projects
(
project_ids
).
limit
(
20
).
offset
(
params
[
:offset
]
||
0
)
@events
=
Event
.
in_projects
(
project_ids
).
limit
(
20
).
offset
(
params
[
:offset
]
||
0
)
@last_push
=
current_user
.
recent_push
@last_push
=
current_user
.
recent_push
@shared_projects
=
@group
.
shared_projects
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
format
.
html
format
.
js
format
.
js
...
...
app/controllers/projects/group_links_controller.rb
View file @
a7026369
...
@@ -12,6 +12,7 @@
...
@@ -12,6 +12,7 @@
class
Projects::GroupLinksController
<
Projects
::
ApplicationController
class
Projects::GroupLinksController
<
Projects
::
ApplicationController
layout
'project_settings'
layout
'project_settings'
before_filter
:authorize_admin_project!
def
index
def
index
@group_links
=
project
.
project_group_links
.
all
@group_links
=
project
.
project_group_links
.
all
...
...
app/models/group.rb
View file @
a7026369
...
@@ -16,6 +16,9 @@ class Group < Namespace
...
@@ -16,6 +16,9 @@ class Group < Namespace
has_many
:users_groups
,
dependent: :destroy
has_many
:users_groups
,
dependent: :destroy
has_many
:users
,
through: :users_groups
has_many
:users
,
through: :users_groups
has_many
:project_group_links
,
dependent: :destroy
has_many
:shared_projects
,
through: :project_group_links
,
source:
'project'
after_create
:add_owner
after_create
:add_owner
def
human_name
def
human_name
...
...
app/views/groups/show.html.haml
View file @
a7026369
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
=
@group
.
description
=
@group
.
description
=
render
"projects"
,
projects:
@projects
=
render
"projects"
,
projects:
@projects
%br
%br
=
render
"shared_projects"
,
projects:
Project
.
first
(
3
)
=
render
"shared_projects"
,
projects:
@shared_projects
.prepend-top-20
.prepend-top-20
=
link_to
group_path
(
@group
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"Feed"
do
=
link_to
group_path
(
@group
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"Feed"
do
...
...
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