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
39ed07a8
Commit
39ed07a8
authored
Jun 12, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
karma updates
parent
6139050e
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
4 deletions
+7
-4
app/assets/stylesheets/pages/repo.scss
app/assets/stylesheets/pages/repo.scss
+4
-4
spec/javascripts/ide/components/commit_sidebar/list_item_spec.js
...vascripts/ide/components/commit_sidebar/list_item_spec.js
+1
-0
spec/javascripts/ide/components/commit_sidebar/list_spec.js
spec/javascripts/ide/components/commit_sidebar/list_spec.js
+1
-0
spec/javascripts/ide/components/repo_commit_section_spec.js
spec/javascripts/ide/components/repo_commit_section_spec.js
+1
-0
No files found.
app/assets/stylesheets/pages/repo.scss
View file @
39ed07a8
...
@@ -553,6 +553,10 @@
...
@@ -553,6 +553,10 @@
}
}
.multi-file-commit-list-item
{
.multi-file-commit-list-item
{
&
.is-active
{
background-color
:
$white-normal
;
}
.multi-file-discard-btn
{
.multi-file-discard-btn
{
display
:
none
;
display
:
none
;
margin-top
:
-2px
;
margin-top
:
-2px
;
...
@@ -612,10 +616,6 @@
...
@@ -612,10 +616,6 @@
}
}
}
}
.multi-file-commit-list-item.is-active
{
background-color
:
$white-normal
;
}
.multi-file-commit-list-path
{
.multi-file-commit-list-path
{
padding
:
0
;
padding
:
0
;
background
:
none
;
background
:
none
;
...
...
spec/javascripts/ide/components/commit_sidebar/list_item_spec.js
View file @
39ed07a8
...
@@ -19,6 +19,7 @@ describe('Multi-file editor commit sidebar list item', () => {
...
@@ -19,6 +19,7 @@ describe('Multi-file editor commit sidebar list item', () => {
vm
=
createComponentWithStore
(
Component
,
store
,
{
vm
=
createComponentWithStore
(
Component
,
store
,
{
file
:
f
,
file
:
f
,
actionComponent
:
'
stage-button
'
,
actionComponent
:
'
stage-button
'
,
activeFileKey
:
`staged-
${
f
.
key
}
`
,
}).
$mount
();
}).
$mount
();
});
});
...
...
spec/javascripts/ide/components/commit_sidebar/list_spec.js
View file @
39ed07a8
...
@@ -17,6 +17,7 @@ describe('Multi-file editor commit sidebar list', () => {
...
@@ -17,6 +17,7 @@ describe('Multi-file editor commit sidebar list', () => {
action
:
'
stageAllChanges
'
,
action
:
'
stageAllChanges
'
,
actionBtnText
:
'
stage all
'
,
actionBtnText
:
'
stage all
'
,
itemActionComponent
:
'
stage-button
'
,
itemActionComponent
:
'
stage-button
'
,
activeFileKey
:
'
staged-testing
'
,
});
});
vm
.
$store
.
state
.
rightPanelCollapsed
=
false
;
vm
.
$store
.
state
.
rightPanelCollapsed
=
false
;
...
...
spec/javascripts/ide/components/repo_commit_section_spec.js
View file @
39ed07a8
...
@@ -98,6 +98,7 @@ describe('RepoCommitSection', () => {
...
@@ -98,6 +98,7 @@ describe('RepoCommitSection', () => {
store
.
state
.
noChangesStateSvgPath
=
'
nochangessvg
'
;
store
.
state
.
noChangesStateSvgPath
=
'
nochangessvg
'
;
store
.
state
.
committedStateSvgPath
=
'
svg
'
;
store
.
state
.
committedStateSvgPath
=
'
svg
'
;
vm
.
$destroy
();
vm
=
createComponentWithStore
(
Component
,
store
).
$mount
();
vm
=
createComponentWithStore
(
Component
,
store
).
$mount
();
expect
(
vm
.
$el
.
querySelector
(
'
.js-empty-state
'
).
textContent
.
trim
()).
toContain
(
'
No changes
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.js-empty-state
'
).
textContent
.
trim
()).
toContain
(
'
No changes
'
);
...
...
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