kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix broken project_url routing when protected branches are accessed with an empty repo

Browse source
This commit is contained in:
Stan Hu 2015-03-01 20:15:59 -08:00
parent 4e5bc1d535
commit 4bc5c66fe1
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/helpers/gitlab_routing_helper.rb
View file

@ -28,4 +28,20 @@ module GitlabRoutingHelper
def merge_request_path(entity, *args)
namespace_project_merge_request_path(entity.project.namespace, entity.project, entity, *args)
end
def project_url(project, *args)
namespace_project_url(project.namespace, project, *args)
end
def edit_project_url(project, *args)
edit_namespace_project_url(project.namespace, project, *args)
end
def issue_url(entity, *args)
namespace_project_issue_url(entity.project.namespace, entity.project, entity, *args)
end
def merge_request_url(entity, *args)
namespace_project_merge_request_url(entity.project.namespace, entity.project, entity, *args)
end
end

10
spec/controllers/projects/protected_branches_controller_spec.rb Normal file
View file

@ -0,0 +1,10 @@
require('spec_helper')
describe Projects::ProtectedBranchesController do
describe "GET #index" do
let(:project) { create(:project_empty_repo, :public) }
it "redirect empty repo to projects page" do
get(:index, namespace_id: project.namespace.to_param, project_id: project.to_param)
end
end
end