diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-10-05 22:16:03 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-10-05 22:16:03 +0000 |
| commit | 1bd08177761a6599d2ebfdfb02bcadee574e9c44 (patch) | |
| tree | bf9de3a653ed32976459969ceafb85c094dff760 | |
| parent | 5ad5d2f14e688733e177a18dc15e3e7645fcdc57 (diff) | |
| parent | 7b8b2563c4d6b0090fd33fd50aad81561519f9cd (diff) | |
| download | gitlab-ce-1bd08177761a6599d2ebfdfb02bcadee574e9c44.tar.gz | |
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
| -rw-r--r-- | app/views/admin/projects/show.html.haml | 2 | ||||
| -rw-r--r-- | spec/controllers/admin/projects_controller_spec.rb | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index 32f6eefc16a..fefb4c7455d 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -112,6 +112,8 @@ = visibility_level_icon(@project.visibility_level) = visibility_level_label(@project.visibility_level) + = render_if_exists 'admin/projects/geo_status_widget', locals: { project: @project } + .card .card-header Transfer project diff --git a/spec/controllers/admin/projects_controller_spec.rb b/spec/controllers/admin/projects_controller_spec.rb index cc200b9fed9..ee1aff09bdf 100644 --- a/spec/controllers/admin/projects_controller_spec.rb +++ b/spec/controllers/admin/projects_controller_spec.rb @@ -42,4 +42,15 @@ describe Admin::ProjectsController do expect { get :index }.not_to exceed_query_limit(control_count) 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 |