Commit 839aae0e authored by Jeroen Nijhof's avatar Jeroen Nijhof

Added housekeeping status and moved path check to gitlab-shell

parent 4f0a38f1
......@@ -8,7 +8,7 @@ class ProjectsController < ApplicationController
before_action :assign_ref_vars, :tree, only: [:show], if: :repo_exists?
# Authorize
before_action :authorize_admin_project!, only: [:edit, :update]
before_action :authorize_admin_project!, only: [:edit, :update, :housekeeping]
before_action :event_filter, only: [:show, :activity]
layout :determine_layout
......@@ -172,9 +172,14 @@ class ProjectsController < ApplicationController
end
def housekeeping
::Projects::HousekeepingService.new(@project).execute
status = ::Projects::HousekeepingService.new(@project).execute
respond_to do |format|
if status
flash[:notice] = "Housekeeping finished successfully."
else
flash[:alert] = "Housekeeping failed."
end
format.html { redirect_to project_path(@project) }
end
end
......
......@@ -3,7 +3,7 @@
# Used for git housekeeping
#
# Ex.
# Projects::HousekeepingService.new(project, user).execute
# Projects::HousekeepingService.new(project).execute
#
module Projects
class HousekeepingService < BaseService
......@@ -14,9 +14,7 @@ module Projects
end
def execute
if gitlab_shell.exists?(@project.path_with_namespace + '.git')
gitlab_shell.gc(@project.path_with_namespace)
end
gitlab_shell.gc(@project.path_with_namespace)
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment