Commit b040f5da authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'show-shared-projects' into 'master'

Show shared projects in Group#show page of admin area
parents 44b3404e 822be2c7
......@@ -44,6 +44,22 @@
%span.pull-right.light
%span.monospace= project.path_with_namespace + ".git"
- if @group.shared_projects.any?
.ui-box
.title
Projects shared with #{@group.name}
%small
(#{@group.shared_projects.count})
%ul.well-list
- @group.shared_projects.sort_by(&:name).each do |project|
%li
%strong
= link_to project.name_with_namespace, [:admin, project]
%span.label.label-gray
= repository_size(project)
%span.pull-right.light
%span.monospace= project.path_with_namespace + ".git"
.col-md-6
.ui-box
.title
......
......@@ -16,6 +16,3 @@
= truncate(project.name, length: 25)
%span.arrow
%i.icon-angle-right
%span.last-activity
%span Last activity:
%span.date= project_last_activity(project)
......@@ -9,7 +9,7 @@
Members
= nav_link(controller: :group_links) do
= link_to project_group_links_path(@project) do
%span
%i.icon-share
Groups
= nav_link(controller: :deploy_keys) do
= link_to project_deploy_keys_path(@project) do
......
......@@ -19,3 +19,8 @@ Feature: Admin Groups
When I visit admin group page
When I select user "John Doe" from user list as "Reporter"
Then I should see "John Doe" in team list in every project as "Reporter"
Scenario: Shared projects
Given group has shared projects
When I visit group page
Then I should see project shared with group
......@@ -58,9 +58,28 @@ class AdminGroups < Spinach::FeatureSteps
end
end
step 'group has shared projects' do
share_link = shared_project.project_group_links.new(group_access: Gitlab::Access::MASTER)
share_link.group_id = current_group.id
share_link.save!
end
step 'I visit group page' do
visit admin_group_path(current_group)
end
step 'I should see project shared with group' do
page.should have_content(shared_project.name_with_namespace)
page.should have_content "Projects shared with"
end
protected
def current_group
@group ||= Group.first
end
def shared_project
@shared_project ||= create(:empty_project)
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment