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
Kazuhiko Shiozaki
gitlab-ce
Commits
e9356356
Commit
e9356356
authored
Feb 26, 2014
by
Timm Drevensek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed regex to match url pointing to a user repo
parent
fe8c9021
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
app/helpers/submodule_helper.rb
app/helpers/submodule_helper.rb
+3
-3
No files found.
app/helpers/submodule_helper.rb
View file @
e9356356
...
@@ -39,8 +39,8 @@ module SubmoduleHelper
...
@@ -39,8 +39,8 @@ module SubmoduleHelper
end
end
def
relative_self_url?
(
url
)
def
relative_self_url?
(
url
)
# (./)?
( (../repo.git) |
(../../project/repo.git) )
# (./)?
(../repo.git) || (./)?
(../../project/repo.git) )
url
=~
/
(^((\.\/)?(((\.\.)\/)|((\.\.)\/(\.\.)\/.*\/)))[^\.\/]*\.git)
\Z/
url
=~
/
^((\.\/)?(\.\.\/))(?!(\.\.)|(.*\/)).*\.git\Z/
||
url
=~
/^((\.\/)?(\.\.\/){2})(?!(\.\.))([^\/]*)\/(?!(\.\.)|(.*\/)).*\.git
\Z/
end
end
def
standard_links
(
host
,
project
,
commit
)
def
standard_links
(
host
,
project
,
commit
)
...
@@ -49,7 +49,7 @@ module SubmoduleHelper
...
@@ -49,7 +49,7 @@ module SubmoduleHelper
end
end
def
relative_self_links
(
url
,
commit
)
def
relative_self_links
(
url
,
commit
)
if
url
.
scan
(
/(\.\.)/
).
size
==
2
if
url
.
scan
(
/(\.\.
\/
)/
).
size
==
2
base
=
[
Gitlab
.
config
.
gitlab
.
url
,
'/'
,
url
[
/.*\/(.*)\/.*\.git/
,
1
]
].
join
(
''
)
base
=
[
Gitlab
.
config
.
gitlab
.
url
,
'/'
,
url
[
/.*\/(.*)\/.*\.git/
,
1
]
].
join
(
''
)
else
else
base
=
[
Gitlab
.
config
.
gitlab
.
url
,
'/'
,
@project
.
group
.
path
].
join
(
''
)
base
=
[
Gitlab
.
config
.
gitlab
.
url
,
'/'
,
@project
.
group
.
path
].
join
(
''
)
...
...
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