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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
dd6a7ec1
Commit
dd6a7ec1
authored
Jun 25, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐛
fix bug where currentBranch would actually be null
parent
9dce759f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/assets/javascripts/ide/components/commit_sidebar/actions.vue
...ets/javascripts/ide/components/commit_sidebar/actions.vue
+2
-2
app/assets/javascripts/ide/stores/getters.js
app/assets/javascripts/ide/stores/getters.js
+1
-1
No files found.
app/assets/javascripts/ide/components/commit_sidebar/actions.vue
View file @
dd6a7ec1
...
@@ -23,7 +23,7 @@ export default {
...
@@ -23,7 +23,7 @@ export default {
},
},
},
},
mounted
()
{
mounted
()
{
if
(
!
this
.
currentBranch
.
can_push
)
{
if
(
this
.
currentBranch
&&
!
this
.
currentBranch
.
can_push
)
{
this
.
updateCommitAction
(
consts
.
COMMIT_TO_NEW_BRANCH
);
this
.
updateCommitAction
(
consts
.
COMMIT_TO_NEW_BRANCH
);
}
else
if
(
this
.
disableMergeRequestRadio
)
{
}
else
if
(
this
.
disableMergeRequestRadio
)
{
this
.
updateCommitAction
(
consts
.
COMMIT_TO_CURRENT_BRANCH
);
this
.
updateCommitAction
(
consts
.
COMMIT_TO_CURRENT_BRANCH
);
...
@@ -45,7 +45,7 @@ export default {
...
@@ -45,7 +45,7 @@ export default {
<div
class=
"append-bottom-15 ide-commit-radios"
>
<div
class=
"append-bottom-15 ide-commit-radios"
>
<radio-group
<radio-group
:value=
"$options.commitToCurrentBranch"
:value=
"$options.commitToCurrentBranch"
:disabled=
"!currentBranch.can_push"
:disabled=
"
currentBranch &&
!currentBranch.can_push"
:title=
"$options.currentBranchPermissionsTooltip"
:title=
"$options.currentBranchPermissionsTooltip"
>
>
<span
<span
...
...
app/assets/javascripts/ide/stores/getters.js
View file @
dd6a7ec1
...
@@ -88,7 +88,7 @@ export const lastCommit = (state, getters) => {
...
@@ -88,7 +88,7 @@ export const lastCommit = (state, getters) => {
};
};
export
const
currentBranch
=
(
state
,
getters
)
=>
export
const
currentBranch
=
(
state
,
getters
)
=>
getters
.
currentProject
.
branches
[
state
.
currentBranchId
];
getters
.
currentProject
&&
getters
.
currentProject
.
branches
[
state
.
currentBranchId
];
// prevent babel-plugin-rewire from generating an invalid default during karma tests
// prevent babel-plugin-rewire from generating an invalid default during karma tests
export
default
()
=>
{};
export
default
()
=>
{};
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