Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
f84bd771
Commit
f84bd771
authored
Mar 02, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
parents
27e75344
229eb732
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
1 deletion
+28
-1
CHANGELOG
CHANGELOG
+1
-0
app/helpers/gitlab_routing_helper.rb
app/helpers/gitlab_routing_helper.rb
+16
-0
lib/gitlab/markdown.rb
lib/gitlab/markdown.rb
+1
-1
spec/controllers/projects/protected_branches_controller_spec.rb
...ontrollers/projects/protected_branches_controller_spec.rb
+10
-0
No files found.
CHANGELOG
View file @
f84bd771
...
@@ -23,6 +23,7 @@ v 7.8.1
...
@@ -23,6 +23,7 @@ v 7.8.1
- Fix urls for the issues when relative url was enabled
- Fix urls for the issues when relative url was enabled
- Add Bitbucket omniauth provider.
- Add Bitbucket omniauth provider.
- Add Bitbucket importer.
- Add Bitbucket importer.
- Support referencing issues to a project whose name starts with a digit
v 7.8.0
v 7.8.0
- Fix access control and protection against XSS for note attachments and other uploads.
- Fix access control and protection against XSS for note attachments and other uploads.
...
...
app/helpers/gitlab_routing_helper.rb
View file @
f84bd771
...
@@ -28,4 +28,20 @@ module GitlabRoutingHelper
...
@@ -28,4 +28,20 @@ module GitlabRoutingHelper
def
merge_request_path
(
entity
,
*
args
)
def
merge_request_path
(
entity
,
*
args
)
namespace_project_merge_request_path
(
entity
.
project
.
namespace
,
entity
.
project
,
entity
,
*
args
)
namespace_project_merge_request_path
(
entity
.
project
.
namespace
,
entity
.
project
,
entity
,
*
args
)
end
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
end
lib/gitlab/markdown.rb
View file @
f84bd771
...
@@ -121,7 +121,7 @@ module Gitlab
...
@@ -121,7 +121,7 @@ module Gitlab
text
text
end
end
NAME_STR
=
'[a-zA-Z][a-zA-Z0-9_\-\.]*'
NAME_STR
=
'[a-zA-Z
0-9_
][a-zA-Z0-9_\-\.]*'
PROJ_STR
=
"(?<project>
#{
NAME_STR
}
/
#{
NAME_STR
}
)"
PROJ_STR
=
"(?<project>
#{
NAME_STR
}
/
#{
NAME_STR
}
)"
REFERENCE_PATTERN
=
%r{
REFERENCE_PATTERN
=
%r{
...
...
spec/controllers/projects/protected_branches_controller_spec.rb
0 → 100644
View file @
f84bd771
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment