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
e1ec70cf
Commit
e1ec70cf
authored
Jun 12, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more karma fixes
parent
39ed07a8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
app/assets/javascripts/ide/components/commit_sidebar/list.vue
...assets/javascripts/ide/components/commit_sidebar/list.vue
+2
-1
app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
...s/javascripts/ide/components/commit_sidebar/list_item.vue
+2
-1
app/assets/javascripts/ide/components/repo_commit_section.vue
...assets/javascripts/ide/components/repo_commit_section.vue
+5
-2
No files found.
app/assets/javascripts/ide/components/commit_sidebar/list.vue
View file @
e1ec70cf
...
@@ -45,7 +45,8 @@ export default {
...
@@ -45,7 +45,8 @@ export default {
},
},
activeFileKey
:
{
activeFileKey
:
{
type
:
String
,
type
:
String
,
required
:
true
,
required
:
false
,
default
:
null
,
},
},
},
},
data
()
{
data
()
{
...
...
app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
View file @
e1ec70cf
...
@@ -32,7 +32,8 @@ export default {
...
@@ -32,7 +32,8 @@ export default {
},
},
activeFileKey
:
{
activeFileKey
:
{
type
:
String
,
type
:
String
,
required
:
true
,
required
:
false
,
default
:
null
,
},
},
},
},
computed
:
{
computed
:
{
...
...
app/assets/javascripts/ide/components/repo_commit_section.vue
View file @
e1ec70cf
...
@@ -32,6 +32,9 @@ export default {
...
@@ -32,6 +32,9 @@ export default {
showStageUnstageArea
()
{
showStageUnstageArea
()
{
return
!!
(
this
.
someUncommitedChanges
||
this
.
lastCommitMsg
||
!
this
.
unusedSeal
);
return
!!
(
this
.
someUncommitedChanges
||
this
.
lastCommitMsg
||
!
this
.
unusedSeal
);
},
},
activeFileKey
()
{
return
this
.
activeFile
?
this
.
activeFile
.
key
:
null
;
},
},
},
watch
:
{
watch
:
{
hasChanges
()
{
hasChanges
()
{
...
@@ -93,7 +96,7 @@ export default {
...
@@ -93,7 +96,7 @@ export default {
action=
"stageAllChanges"
action=
"stageAllChanges"
:action-btn-text=
"__('Stage all')"
:action-btn-text=
"__('Stage all')"
item-action-component=
"stage-button"
item-action-component=
"stage-button"
:active-file-key=
"activeFile
.k
ey"
:active-file-key=
"activeFile
K
ey"
/>
/>
<commit-files-list
<commit-files-list
icon-name=
"staged"
icon-name=
"staged"
...
@@ -103,7 +106,7 @@ export default {
...
@@ -103,7 +106,7 @@ export default {
:action-btn-text=
"__('Unstage all')"
:action-btn-text=
"__('Unstage all')"
item-action-component=
"unstage-button"
item-action-component=
"unstage-button"
:staged-list=
"true"
:staged-list=
"true"
:active-file-key=
"activeFile
.k
ey"
:active-file-key=
"activeFile
K
ey"
/>
/>
</
template
>
</
template
>
<empty-state
<empty-state
...
...
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