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
b64b8377
Commit
b64b8377
authored
May 03, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '44846-improve-web-ide-left-panel-and-modes' into ide-sidebar-merge-request
parents
9644ed82
fa8d70a9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
8 deletions
+3
-8
app/assets/javascripts/ide/components/commit_sidebar/success_message.vue
...scripts/ide/components/commit_sidebar/success_message.vue
+1
-7
app/assets/javascripts/ide/components/repo_commit_section.vue
...assets/javascripts/ide/components/repo_commit_section.vue
+0
-1
app/assets/javascripts/ide/components/repo_editor.vue
app/assets/javascripts/ide/components/repo_editor.vue
+1
-0
app/assets/javascripts/ide/stores/getters.js
app/assets/javascripts/ide/stores/getters.js
+1
-0
No files found.
app/assets/javascripts/ide/components/commit_sidebar/success_message.vue
View file @
b64b8377
...
@@ -2,14 +2,8 @@
...
@@ -2,14 +2,8 @@
import
{
mapState
}
from
'
vuex
'
;
import
{
mapState
}
from
'
vuex
'
;
export
default
{
export
default
{
props
:
{
committedStateSvgPath
:
{
type
:
String
,
required
:
true
,
},
},
computed
:
{
computed
:
{
...
mapState
([
'
lastCommitMsg
'
]),
...
mapState
([
'
lastCommitMsg
'
,
'
committedStateSvgPath
'
]),
},
},
};
};
</
script
>
</
script
>
...
...
app/assets/javascripts/ide/components/repo_commit_section.vue
View file @
b64b8377
...
@@ -105,7 +105,6 @@ export default {
...
@@ -105,7 +105,6 @@ export default {
>
>
<success-message
<success-message
v-if=
"lastCommitMsg && !someUncommitedChanges"
v-if=
"lastCommitMsg && !someUncommitedChanges"
:committed-state-svg-path=
"committedStateSvgPath"
/>
/>
<commit-message-field
<commit-message-field
:text=
"commitMessage"
:text=
"commitMessage"
...
...
app/assets/javascripts/ide/components/repo_editor.vue
View file @
b64b8377
...
@@ -26,6 +26,7 @@ export default {
...
@@ -26,6 +26,7 @@ export default {
'
getStagedFile
'
,
'
getStagedFile
'
,
'
isEditModeActive
'
,
'
isEditModeActive
'
,
'
isCommitModeActive
'
,
'
isCommitModeActive
'
,
'
isReviewModeActive
'
,
]),
]),
shouldHideEditor
()
{
shouldHideEditor
()
{
return
this
.
file
&&
this
.
file
.
binary
&&
!
this
.
file
.
content
;
return
this
.
file
&&
this
.
file
.
binary
&&
!
this
.
file
.
content
;
...
...
app/assets/javascripts/ide/stores/getters.js
View file @
b64b8377
...
@@ -56,6 +56,7 @@ export const getStagedFile = state => path => state.stagedFiles.find(f => f.path
...
@@ -56,6 +56,7 @@ export const getStagedFile = state => path => state.stagedFiles.find(f => f.path
export
const
isEditModeActive
=
state
=>
state
.
currentActivityView
===
activityBarViews
.
edit
;
export
const
isEditModeActive
=
state
=>
state
.
currentActivityView
===
activityBarViews
.
edit
;
export
const
isCommitModeActive
=
state
=>
state
.
currentActivityView
===
activityBarViews
.
commit
;
export
const
isCommitModeActive
=
state
=>
state
.
currentActivityView
===
activityBarViews
.
commit
;
export
const
isReviewModeActive
=
state
=>
state
.
currentActivityView
===
activityBarViews
.
review
;
// 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