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
53ccf938
Commit
53ccf938
authored
Jun 27, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed commit action radio buttons getting into a weird state
parent
c1b29823
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
5 deletions
+13
-5
app/assets/javascripts/ide/components/commit_sidebar/actions.vue
...ets/javascripts/ide/components/commit_sidebar/actions.vue
+13
-5
No files found.
app/assets/javascripts/ide/components/commit_sidebar/actions.vue
View file @
53ccf938
...
@@ -22,15 +22,23 @@ export default {
...
@@ -22,15 +22,23 @@ export default {
return
this
.
changedFiles
.
length
>
0
&&
this
.
stagedFiles
.
length
>
0
;
return
this
.
changedFiles
.
length
>
0
&&
this
.
stagedFiles
.
length
>
0
;
},
},
},
},
watch
:
{
disableMergeRequestRadio
()
{
this
.
updateSelectedCommitAction
();
},
},
mounted
()
{
mounted
()
{
if
(
this
.
currentBranch
&&
!
this
.
currentBranch
.
can_push
)
{
this
.
updateSelectedCommitAction
();
this
.
updateCommitAction
(
consts
.
COMMIT_TO_NEW_BRANCH
);
}
else
if
(
this
.
disableMergeRequestRadio
)
{
this
.
updateCommitAction
(
consts
.
COMMIT_TO_CURRENT_BRANCH
);
}
},
},
methods
:
{
methods
:
{
...
mapActions
(
'
commit
'
,
[
'
updateCommitAction
'
]),
...
mapActions
(
'
commit
'
,
[
'
updateCommitAction
'
]),
updateSelectedCommitAction
()
{
if
(
this
.
currentBranch
&&
!
this
.
currentBranch
.
can_push
)
{
this
.
updateCommitAction
(
consts
.
COMMIT_TO_NEW_BRANCH
);
}
else
if
(
this
.
disableMergeRequestRadio
)
{
this
.
updateCommitAction
(
consts
.
COMMIT_TO_CURRENT_BRANCH
);
}
},
},
},
commitToCurrentBranch
:
consts
.
COMMIT_TO_CURRENT_BRANCH
,
commitToCurrentBranch
:
consts
.
COMMIT_TO_CURRENT_BRANCH
,
commitToNewBranch
:
consts
.
COMMIT_TO_NEW_BRANCH
,
commitToNewBranch
:
consts
.
COMMIT_TO_NEW_BRANCH
,
...
...
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