diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2017-05-04 13:50:05 +0300 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-07-20 11:57:40 +0300 |
| commit | f0e4e3993b1f5a21ab61aaff95f73ac4e5b88ad3 (patch) | |
| tree | fee0292121d40bf332117bf5583c4dfe70b1cbdb | |
| parent | 72a85ae9ac2468b099a565d3848bf8e0dcdf4499 (diff) | |
WIP: Display a project's `delete_error` on the project homepage.
| -rw-r--r-- | app/views/projects/_deletion_failed.html.haml | 9 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/app/views/projects/_deletion_failed.html.haml b/app/views/projects/_deletion_failed.html.haml new file mode 100644 index 00000000000..cd717760432 --- /dev/null +++ b/app/views/projects/_deletion_failed.html.haml @@ -0,0 +1,9 @@ +- if @project.delete_error.present? + .project-deletion-failed-message.alert.alert-warning + This project was scheduled for deletion, but failed with the message: + = @project.delete_error + + .alert-link-group + = link_to "Don't show again", profile_path(user: {hide_no_ssh_key: true}), method: :put, class: 'alert-link' + | + = link_to 'Remind later', '#', class: 'hide-no-ssh-message alert-link' diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 49d0a6828fe..336bc694ffc 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -7,6 +7,7 @@ = auto_discovery_link_tag(:atom, project_path(@project, rss_url_options), title: "#{@project.name} activity") = content_for flash_message_container do + = render 'deletion_failed' - if current_user && can?(current_user, :download_code, @project) = render 'shared/no_ssh' = render 'shared/no_password' |