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
b3e2856d
Commit
b3e2856d
authored
Sep 29, 2020
by
jerasmus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Address code review comments
Addressed code review comments
parent
14a1621d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
3 deletions
+1
-3
app/assets/javascripts/lib/utils/url_utility.js
app/assets/javascripts/lib/utils/url_utility.js
+0
-1
app/assets/javascripts/static_site_editor/services/templater.js
...sets/javascripts/static_site_editor/services/templater.js
+1
-1
spec/frontend/lib/utils/url_utility_spec.js
spec/frontend/lib/utils/url_utility_spec.js
+0
-1
No files found.
app/assets/javascripts/lib/utils/url_utility.js
View file @
b3e2856d
...
...
@@ -445,7 +445,6 @@ export function stripPathTail(path = '') {
return
path
.
replace
(
/
[^/]
+$/
,
''
);
}
export
function
getURLOrigin
(
url
)
{
if
(
!
url
)
{
return
window
.
location
.
origin
;
...
...
app/assets/javascripts/static_site_editor/services/templater.js
View file @
b3e2856d
...
...
@@ -15,7 +15,7 @@ const markPrefix = `${marker}-${Date.now()}`;
const
reHelpers
=
{
template
:
`.| |\\t|\\n(?!(\\n|
${
markPrefix
}
))`
,
openTag
:
'
<
[^iframe
]+.*?>
'
,
openTag
:
'
<
(?!iframe)[a-zA-Z
]+.*?>
'
,
closeTag
:
'
</.+>
'
,
};
const
reTemplated
=
new
RegExp
(
`(^
${
wrapPrefix
}
(
${
reHelpers
.
template
}
)+?
${
wrapPostfix
}
$)`
,
'
gm
'
);
...
...
spec/frontend/lib/utils/url_utility_spec.js
View file @
b3e2856d
...
...
@@ -815,7 +815,6 @@ describe('URL utility', () => {
});
});
describe
(
'
getURLOrigin
'
,
()
=>
{
it
(
'
when no url passed, returns correct origin from window location
'
,
()
=>
{
const
origin
=
'
https://foo.bar
'
;
...
...
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