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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
dee11dad
Commit
dee11dad
authored
Feb 10, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix submodules
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
8b6a14b5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
5 deletions
+8
-5
app/helpers/submodule_helper.rb
app/helpers/submodule_helper.rb
+8
-5
No files found.
app/helpers/submodule_helper.rb
View file @
dee11dad
...
@@ -3,7 +3,10 @@ module SubmoduleHelper
...
@@ -3,7 +3,10 @@ module SubmoduleHelper
# links to files listing for submodule if submodule is a project on this server
# links to files listing for submodule if submodule is a project on this server
def
submodule_links
(
submodule_item
)
def
submodule_links
(
submodule_item
)
url
=
submodule_item
.
submodule_url
submodule
=
@repository
.
submodules
(
@ref
)[
submodule_item
.
path
]
url
=
submodule
[
'url'
]
if
submodule
return
url
,
nil
unless
url
=~
/([^\/:]+\/[^\/]+\.git)\Z/
return
url
,
nil
unless
url
=~
/([^\/:]+\/[^\/]+\.git)\Z/
project
=
$1
project
=
$1
...
@@ -19,7 +22,7 @@ module SubmoduleHelper
...
@@ -19,7 +22,7 @@ module SubmoduleHelper
return
url
,
nil
return
url
,
nil
end
end
end
end
protected
protected
def
github_dot_com_url?
(
url
)
def
github_dot_com_url?
(
url
)
...
@@ -29,14 +32,14 @@ module SubmoduleHelper
...
@@ -29,14 +32,14 @@ module SubmoduleHelper
def
gitlab_dot_com_url?
(
url
)
def
gitlab_dot_com_url?
(
url
)
url
=~
/gitlab\.com[\/:][^\/]+\/[^\/]+\Z/
url
=~
/gitlab\.com[\/:][^\/]+\/[^\/]+\Z/
end
end
def
self_url?
(
url
,
project
)
def
self_url?
(
url
,
project
)
return
true
if
url
==
[
Gitlab
.
config
.
gitlab
.
url
,
'/'
,
project
,
'.git'
].
join
(
''
)
return
true
if
url
==
[
Gitlab
.
config
.
gitlab
.
url
,
'/'
,
project
,
'.git'
].
join
(
''
)
url
==
gitlab_shell
.
url_to_repo
(
project
)
url
==
gitlab_shell
.
url_to_repo
(
project
)
end
end
def
standard_links
(
host
,
project
,
commit
)
def
standard_links
(
host
,
project
,
commit
)
base
=
[
'https://'
,
host
,
'/'
,
project
].
join
(
''
)
base
=
[
'https://'
,
host
,
'/'
,
project
].
join
(
''
)
return
base
,
[
base
,
'/tree/'
,
commit
].
join
(
''
)
return
base
,
[
base
,
'/tree/'
,
commit
].
join
(
''
)
end
end
end
end
\ No newline at end of file
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