diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2015-10-12 16:42:14 +0200 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2015-11-16 12:39:13 +0100 |
| commit | 14032d8eb1a60ae5920286249c1044be2fa27278 (patch) | |
| tree | 78d27cfb47590f5c30b1ae75de60368c5e269cc9 /app/controllers | |
| parent | 9179fcece813d0fe54abb5d7a28874cfa799f9c5 (diff) | |
| download | gitlab-ce-14032d8eb1a60ae5920286249c1044be2fa27278.tar.gz | |
Add support for git lfs.lfs
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects_controller.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 30b166334a9..23453195e85 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -72,8 +72,7 @@ class ProjectsController < ApplicationController def remove_fork return access_denied! unless can?(current_user, :remove_fork_project, @project) - if @project.forked? - @project.forked_project_link.destroy + if @project.unlink_fork flash[:notice] = 'The fork relationship has been removed.' end end @@ -243,7 +242,7 @@ class ProjectsController < ApplicationController project.repository_exists? && !project.empty_repo? end - # Override get_id from ExtractsPath, which returns the branch and file path + # Override get_id from ExtractsPath, which returns the branch and file path # for the blob/tree, which in this case is just the root of the default branch. def get_id project.repository.root_ref |