Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
This commit is contained in:
commit
f84bd771d4
4 changed files with 28 additions and 1 deletions
|
@ -23,6 +23,7 @@ v 7.8.1
|
|||
- Fix urls for the issues when relative url was enabled
|
||||
- Add Bitbucket omniauth provider.
|
||||
- Add Bitbucket importer.
|
||||
- Support referencing issues to a project whose name starts with a digit
|
||||
|
||||
v 7.8.0
|
||||
- Fix access control and protection against XSS for note attachments and other uploads.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -121,7 +121,7 @@ module Gitlab
|
|||
text
|
||||
end
|
||||
|
||||
NAME_STR = '[a-zA-Z][a-zA-Z0-9_\-\.]*'
|
||||
NAME_STR = '[a-zA-Z0-9_][a-zA-Z0-9_\-\.]*'
|
||||
PROJ_STR = "(?<project>#{NAME_STR}/#{NAME_STR})"
|
||||
|
||||
REFERENCE_PATTERN = %r{
|
||||
|
|
|
@ -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
|
Loading…
Reference in a new issue