Merge branch 'ee-7126-admin-projects-geo-status' into 'master'
EE Backport: enable Geo Status widget in admin/projects See merge request gitlab-org/gitlab-ce!22161
This commit is contained in:
commit
1bd0817776
2 changed files with 13 additions and 0 deletions
|
@ -112,6 +112,8 @@
|
||||||
= visibility_level_icon(@project.visibility_level)
|
= visibility_level_icon(@project.visibility_level)
|
||||||
= visibility_level_label(@project.visibility_level)
|
= visibility_level_label(@project.visibility_level)
|
||||||
|
|
||||||
|
= render_if_exists 'admin/projects/geo_status_widget', locals: { project: @project }
|
||||||
|
|
||||||
.card
|
.card
|
||||||
.card-header
|
.card-header
|
||||||
Transfer project
|
Transfer project
|
||||||
|
|
|
@ -42,4 +42,15 @@ describe Admin::ProjectsController do
|
||||||
expect { get :index }.not_to exceed_query_limit(control_count)
|
expect { get :index }.not_to exceed_query_limit(control_count)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe 'GET /projects/:id' do
|
||||||
|
render_views
|
||||||
|
|
||||||
|
it 'renders show page' do
|
||||||
|
get :show, namespace_id: project.namespace.path, id: project.path
|
||||||
|
|
||||||
|
expect(response).to have_gitlab_http_status(200)
|
||||||
|
expect(response.body).to match(project.name)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue