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
2cd19eb9
Commit
2cd19eb9
authored
Apr 29, 2020
by
derek-knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update branch payload with web_url
parent
0dee6c6e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
7 deletions
+4
-7
app/assets/javascripts/static_site_editor/components/saved_changes_message.vue
...s/static_site_editor/components/saved_changes_message.vue
+1
-1
app/assets/javascripts/static_site_editor/services/submit_content_changes.js
...pts/static_site_editor/services/submit_content_changes.js
+2
-2
spec/frontend/static_site_editor/components/saved_changes_message_spec.js
...atic_site_editor/components/saved_changes_message_spec.js
+1
-4
No files found.
app/assets/javascripts/static_site_editor/components/saved_changes_message.vue
View file @
2cd19eb9
...
...
@@ -60,7 +60,7 @@ export default {
<ul>
<li>
{{
s__
(
'
StaticSiteEditor|You created a new branch:
'
)
}}
<
span
ref=
"branchLink"
>
{{
branch
.
label
}}
</span
>
<
gl-link
ref=
"branchLink"
:href=
"branch.url"
>
{{
branch
.
label
}}
</gl-link
>
</li>
<li>
{{
s__
(
'
StaticSiteEditor|You created a merge request:
'
)
}}
...
...
app/assets/javascripts/static_site_editor/services/submit_content_changes.js
View file @
2cd19eb9
...
...
@@ -56,8 +56,8 @@ const submitContentChanges = ({ username, projectId, sourcePath, content }) => {
const
meta
=
{};
return
createBranch
(
projectId
,
branch
)
.
then
(()
=>
{
Object
.
assign
(
meta
,
{
branch
:
{
label
:
branch
}
});
.
then
((
{
data
:
{
web_url
:
url
}
}
)
=>
{
Object
.
assign
(
meta
,
{
branch
:
{
label
:
branch
,
url
}
});
return
commitContent
(
projectId
,
mergeRequestTitle
,
branch
,
sourcePath
,
content
);
})
...
...
spec/frontend/static_site_editor/components/saved_changes_message_spec.js
View file @
2cd19eb9
...
...
@@ -51,9 +51,6 @@ describe('~/static_site_editor/components/saved_changes_message.vue', () => {
expect
(
el
.
exists
()).
toBe
(
true
);
expect
(
el
.
text
()).
toBe
(
prop
.
label
);
if
(
desc
!==
'
branch
'
)
{
expect
(
el
.
attributes
(
'
href
'
)).
toBe
(
prop
.
url
);
}
expect
(
el
.
attributes
(
'
href
'
)).
toBe
(
prop
.
url
);
});
});
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