diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2017-07-06 12:43:51 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-07-06 12:43:51 -0400 |
| commit | eef068754af7437baf327c5cb4e2b454ba40a617 (patch) | |
| tree | 3583327140b2994432de317b4ac06d66b274b430 /app/views/projects/pages | |
| parent | 9eeba8fb49c5da7cf0b2c22bc33cbd33a83918ed (diff) | |
| parent | 9274c3c1598f3ff32339e681d5812feeb0f62605 (diff) | |
| download | gitlab-ce-eef068754af7437baf327c5cb4e2b454ba40a617.tar.gz | |
Merge branch 'master' into rs-sign_in
Diffstat (limited to 'app/views/projects/pages')
| -rw-r--r-- | app/views/projects/pages/_destroy.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/pages/_list.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/pages/show.html.haml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/pages/_destroy.haml b/app/views/projects/pages/_destroy.haml index 42d9ef5ccba..7d6c30b7f8d 100644 --- a/app/views/projects/pages/_destroy.haml +++ b/app/views/projects/pages/_destroy.haml @@ -7,6 +7,6 @@ %p Removing the pages will prevent from exposing them to outside world. .form-actions - = link_to 'Remove pages', namespace_project_pages_path(@project.namespace, @project), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove" + = link_to 'Remove pages', project_pages_path(@project), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove" - else .nothing-here-block Only the project owner can remove pages diff --git a/app/views/projects/pages/_list.html.haml b/app/views/projects/pages/_list.html.haml index 4f2dd1a1398..a85cda407af 100644 --- a/app/views/projects/pages/_list.html.haml +++ b/app/views/projects/pages/_list.html.haml @@ -6,8 +6,8 @@ - @domains.each do |domain| %li .pull-right - = link_to 'Details', namespace_project_pages_domain_path(@project.namespace, @project, domain), class: "btn btn-sm btn-grouped" - = link_to 'Remove', namespace_project_pages_domain_path(@project.namespace, @project, domain), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove btn-sm btn-grouped" + = link_to 'Details', project_pages_domain_path(@project, domain), class: "btn btn-sm btn-grouped" + = link_to 'Remove', project_pages_domain_path(@project, domain), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove btn-sm btn-grouped" .clearfix %span= link_to domain.domain, domain.url %p diff --git a/app/views/projects/pages/show.html.haml b/app/views/projects/pages/show.html.haml index b22a54d75c8..098b0ef56ef 100644 --- a/app/views/projects/pages/show.html.haml +++ b/app/views/projects/pages/show.html.haml @@ -5,7 +5,7 @@ Pages - if can?(current_user, :update_pages, @project) && (Gitlab.config.pages.external_http || Gitlab.config.pages.external_https) - = link_to new_namespace_project_pages_domain_path(@project.namespace, @project), class: 'btn btn-new pull-right', title: 'New Domain' do + = link_to new_project_pages_domain_path(@project), class: 'btn btn-new pull-right', title: 'New Domain' do %i.fa.fa-plus New Domain |