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
0c333373
Commit
0c333373
authored
Jan 17, 2020
by
Himanshu Kapoor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix issue with commit form not collapsing
Commit form should be collapsed after a commit in Web IDE.
parent
56d2fcfd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
0 deletions
+29
-0
app/assets/javascripts/ide/components/commit_sidebar/form.vue
...assets/javascripts/ide/components/commit_sidebar/form.vue
+5
-0
changelogs/unreleased/197343-iscompact.yml
changelogs/unreleased/197343-iscompact.yml
+5
-0
spec/javascripts/ide/components/commit_sidebar/form_spec.js
spec/javascripts/ide/components/commit_sidebar/form_spec.js
+19
-0
No files found.
app/assets/javascripts/ide/components/commit_sidebar/form.vue
View file @
0c333373
...
@@ -60,6 +60,11 @@ export default {
...
@@ -60,6 +60,11 @@ export default {
);
);
}
}
},
},
lastCommitMsg
()
{
this
.
isCompact
=
this
.
currentActivityView
!==
activityBarViews
.
commit
&&
this
.
lastCommitMsg
===
''
;
},
},
},
methods
:
{
methods
:
{
...
mapActions
([
'
updateActivityBarView
'
]),
...
mapActions
([
'
updateActivityBarView
'
]),
...
...
changelogs/unreleased/197343-iscompact.yml
0 → 100644
View file @
0c333373
---
title
:
Fix unexpected behaviour of the commit form after committing in Web IDE
merge_request
:
23238
author
:
type
:
fixed
spec/javascripts/ide/components/commit_sidebar/form_spec.js
View file @
0c333373
...
@@ -76,6 +76,25 @@ describe('IDE commit form', () => {
...
@@ -76,6 +76,25 @@ describe('IDE commit form', () => {
done
();
done
();
});
});
});
});
it
(
'
collapses if lastCommitMsg is set to empty and current view is not commit view
'
,
done
=>
{
store
.
state
.
lastCommitMsg
=
'
abc
'
;
store
.
state
.
currentActivityView
=
activityBarViews
.
edit
;
vm
.
$nextTick
(()
=>
{
// if commit message is set, form is uncollapsed
expect
(
vm
.
isCompact
).
toBe
(
false
);
store
.
state
.
lastCommitMsg
=
''
;
vm
.
$nextTick
(()
=>
{
// collapsed when set to empty
expect
(
vm
.
isCompact
).
toBe
(
true
);
done
();
});
});
});
});
});
describe
(
'
full
'
,
()
=>
{
describe
(
'
full
'
,
()
=>
{
...
...
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