deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

refcatoring. cleaning after gitosis

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2011-12-05 09:43:53 +02:00
parent 8134fe0efe
commit bdc658095c
13 changed files with 58 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/application_controller.rb
View file

@ -3,8 +3,8 @@ class ApplicationController < ActionController::Base
protect_from_forgery
helper_method :abilities, :can?
rescue_from Gitlabhq::Gitosis::AccessDenied, Gitlabhq::Gitolite::AccessDenied do |exception|
render :file => File.join(Rails.root, "public", "gitosis_error"), :layout => false
rescue_from Gitlabhq::Gitolite::AccessDenied do |exception|
render :file => File.join(Rails.root, "public", "githost_error"), :layout => false
end
layout :layout_by_resource

4
app/controllers/errors_controller.rb
View file

@ -1,5 +1,5 @@
class ErrorsController < ApplicationController
def gitosis
render :file => File.join(Rails.root, "public", "gitosis_error"), :layout => false
def githost
render :file => File.join(Rails.root, "public", "githost_error"), :layout => false
end
end

4
app/controllers/projects_controller.rb
View file

@ -42,8 +42,8 @@ class ProjectsController < ApplicationController
format.js
end
end
rescue Gitlabhq::Gitosis::AccessDenied, Gitlabhq::Gitolite::AccessDenied
render :js => "location.href = '#{errors_gitosis_path}'" and return
rescue Gitlabhq::Gitolite::AccessDenied
render :js => "location.href = '#{errors_githost_path}'" and return
rescue StandardError => ex
@project.errors.add(:base, "Cant save project. Please try again later")
respond_to do |format|