diff options
author | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-11-03 11:08:36 +0100 |
---|---|---|
committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-11-03 11:08:36 +0100 |
commit | 39d00bddc494c7f13527887e005b53431642d24c (patch) | |
tree | 0eddca2a370d8d93897a99d46960ee33ad9ba58f /app/views/projects/edit.html.haml | |
parent | 5c147b6b8ef3f543f98c15ce2a54d4e3f2821303 (diff) | |
download | gitlab-ce-39d00bddc494c7f13527887e005b53431642d24c.tar.gz |
Make sure the settings page renders when root of a fork is deleted
Diffstat (limited to 'app/views/projects/edit.html.haml')
-rw-r--r-- | app/views/projects/edit.html.haml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 5703ef1d4bb..5ebeae5c35f 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -173,7 +173,10 @@ %p This will remove the fork relationship to source project = succeed "." do - = link_to @project.forked_from_project.name_with_namespace, project_path(@project.forked_from_project) + - if @project.fork_source + = link_to(fork_source_name(@project), project_path(@project.fork_source)) + - else + = fork_source_name(@project) = form_for([@project.namespace.becomes(Namespace), @project], url: remove_fork_project_path(@project), method: :delete, remote: true, html: { class: 'transfer-project' }) do |f| %p %strong Once removed, the fork relationship cannot be restored and you will no longer be able to send merge requests to the source. |