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
442eb843
Commit
442eb843
authored
May 04, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed mis-aligned icon
hide success message when staging files improve action button hover
parent
5c25ea48
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
3 deletions
+6
-3
app/assets/javascripts/ide/components/commit_sidebar/list.vue
...assets/javascripts/ide/components/commit_sidebar/list.vue
+2
-2
app/assets/javascripts/ide/stores/actions.js
app/assets/javascripts/ide/stores/actions.js
+2
-0
app/assets/javascripts/ide/stores/actions/file.js
app/assets/javascripts/ide/stores/actions/file.js
+1
-0
app/assets/stylesheets/pages/repo.scss
app/assets/stylesheets/pages/repo.scss
+1
-1
No files found.
app/assets/javascripts/ide/components/commit_sidebar/list.vue
View file @
442eb843
...
@@ -74,6 +74,8 @@ export default {
...
@@ -74,6 +74,8 @@ export default {
>
>
<header
<header
class=
"multi-file-commit-panel-header"
class=
"multi-file-commit-panel-header"
@
mouseenter=
"setShowActionButton(true)"
@
mouseleave=
"setShowActionButton(false)"
>
>
<div
<div
class=
"multi-file-commit-panel-header-title"
class=
"multi-file-commit-panel-header-title"
...
@@ -86,14 +88,12 @@ export default {
...
@@ -86,14 +88,12 @@ export default {
{{
titleText
}}
{{
titleText
}}
<span
<span
v-show=
"!showActionButton"
v-show=
"!showActionButton"
@
mouseenter=
"setShowActionButton(true)"
class=
"ide-commit-file-count"
class=
"ide-commit-file-count"
>
>
{{
fileList
.
length
}}
{{
fileList
.
length
}}
</span>
</span>
<button
<button
v-show=
"showActionButton"
v-show=
"showActionButton"
@
mouseleave=
"setShowActionButton(false)"
type=
"button"
type=
"button"
class=
"btn btn-blank btn-link ide-staged-action-btn"
class=
"btn btn-blank btn-link ide-staged-action-btn"
@
click=
"actionBtnClicked"
@
click=
"actionBtnClicked"
...
...
app/assets/javascripts/ide/stores/actions.js
View file @
442eb843
...
@@ -123,6 +123,8 @@ export const scrollToTab = () => {
...
@@ -123,6 +123,8 @@ export const scrollToTab = () => {
};
};
export
const
stageAllChanges
=
({
state
,
commit
})
=>
{
export
const
stageAllChanges
=
({
state
,
commit
})
=>
{
commit
(
types
.
SET_LAST_COMMIT_MSG
,
''
);
state
.
changedFiles
.
forEach
(
file
=>
commit
(
types
.
STAGE_CHANGE
,
file
.
path
));
state
.
changedFiles
.
forEach
(
file
=>
commit
(
types
.
STAGE_CHANGE
,
file
.
path
));
};
};
...
...
app/assets/javascripts/ide/stores/actions/file.js
View file @
442eb843
...
@@ -184,6 +184,7 @@ export const stageChange = ({ commit, state }, path) => {
...
@@ -184,6 +184,7 @@ export const stageChange = ({ commit, state }, path) => {
const
stagedFile
=
state
.
stagedFiles
.
find
(
f
=>
f
.
path
===
path
);
const
stagedFile
=
state
.
stagedFiles
.
find
(
f
=>
f
.
path
===
path
);
commit
(
types
.
STAGE_CHANGE
,
path
);
commit
(
types
.
STAGE_CHANGE
,
path
);
commit
(
types
.
SET_LAST_COMMIT_MSG
,
''
);
if
(
stagedFile
)
{
if
(
stagedFile
)
{
eventHub
.
$emit
(
`editor.update.model.new.content.staged-
${
stagedFile
.
key
}
`
,
stagedFile
.
content
);
eventHub
.
$emit
(
`editor.update.model.new.content.staged-
${
stagedFile
.
key
}
`
,
stagedFile
.
content
);
...
...
app/assets/stylesheets/pages/repo.scss
View file @
442eb843
...
@@ -189,7 +189,7 @@
...
@@ -189,7 +189,7 @@
display
:
block
;
display
:
block
;
position
:
relative
;
position
:
relative
;
top
:
1px
;
top
:
1px
;
right
:
3
px
;
right
:
-2
px
;
}
}
&
:not
([
disabled
])
:hover
{
&
:not
([
disabled
])
:hover
{
...
...
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