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
9f95fe18
Commit
9f95fe18
authored
Jul 08, 2020
by
Illya Klymov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix incorrect urls
parent
265ae979
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
app/assets/javascripts/import_projects/components/bitbucket_status_table.vue
...pts/import_projects/components/bitbucket_status_table.vue
+1
-1
app/helpers/import_helper.rb
app/helpers/import_helper.rb
+5
-1
No files found.
app/assets/javascripts/import_projects/components/bitbucket_status_table.vue
View file @
9f95fe18
...
@@ -28,7 +28,7 @@ export default {
...
@@ -28,7 +28,7 @@ export default {
};
};
</
script
>
</
script
>
<
template
>
<
template
>
<import-projects-table
provider-title=
"providerTitle"
>
<import-projects-table
:
provider-title=
"providerTitle"
>
<template
#actions
>
<template
#actions
>
<slot
name=
"actions"
></slot>
<slot
name=
"actions"
></slot>
</
template
>
</
template
>
...
...
app/helpers/import_helper.rb
View file @
9f95fe18
...
@@ -19,8 +19,12 @@ module ImportHelper
...
@@ -19,8 +19,12 @@ module ImportHelper
end
end
def
provider_project_link_url
(
provider_url
,
full_path
)
def
provider_project_link_url
(
provider_url
,
full_path
)
if
Gitlab
::
Utils
.
parse_url
(
full_path
)
&
.
absolute?
full_path
else
Gitlab
::
Utils
.
append_path
(
provider_url
,
full_path
)
Gitlab
::
Utils
.
append_path
(
provider_url
,
full_path
)
end
end
end
def
import_will_timeout_message
(
_ci_cd_only
)
def
import_will_timeout_message
(
_ci_cd_only
)
timeout
=
time_interval_in_words
(
Gitlab
.
config
.
gitlab_shell
.
git_timeout
)
timeout
=
time_interval_in_words
(
Gitlab
.
config
.
gitlab_shell
.
git_timeout
)
...
...
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