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
8578cf7c
Commit
8578cf7c
authored
Sep 09, 2020
by
dmoraBerlin
Committed by
Jarek Ostrowski
Oct 19, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated discard changes button in webIDE
parent
3dcbfee2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
5 deletions
+12
-5
app/assets/javascripts/ide/components/commit_sidebar/editor_header.vue
...vascripts/ide/components/commit_sidebar/editor_header.vue
+7
-5
changelogs/unreleased/229330-update-discard-changes-button.yml
...elogs/unreleased/229330-update-discard-changes-button.yml
+5
-0
No files found.
app/assets/javascripts/ide/components/commit_sidebar/editor_header.vue
View file @
8578cf7c
<
script
>
<
script
>
import
{
mapActions
}
from
'
vuex
'
;
import
{
mapActions
}
from
'
vuex
'
;
import
{
GlModal
}
from
'
@gitlab/ui
'
;
import
{
GlModal
,
GlButton
}
from
'
@gitlab/ui
'
;
import
{
sprintf
,
__
}
from
'
~/locale
'
;
import
{
sprintf
,
__
}
from
'
~/locale
'
;
import
FileIcon
from
'
~/vue_shared/components/file_icon.vue
'
;
import
FileIcon
from
'
~/vue_shared/components/file_icon.vue
'
;
import
ChangedFileIcon
from
'
~/vue_shared/components/changed_file_icon.vue
'
;
import
ChangedFileIcon
from
'
~/vue_shared/components/changed_file_icon.vue
'
;
...
@@ -8,6 +8,7 @@ import ChangedFileIcon from '~/vue_shared/components/changed_file_icon.vue';
...
@@ -8,6 +8,7 @@ import ChangedFileIcon from '~/vue_shared/components/changed_file_icon.vue';
export
default
{
export
default
{
components
:
{
components
:
{
GlModal
,
GlModal
,
GlButton
,
FileIcon
,
FileIcon
,
ChangedFileIcon
,
ChangedFileIcon
,
},
},
...
@@ -52,15 +53,16 @@ export default {
...
@@ -52,15 +53,16 @@ export default {
</strong>
</strong>
<changed-file-icon
:file=
"activeFile"
:is-centered=
"false"
/>
<changed-file-icon
:file=
"activeFile"
:is-centered=
"false"
/>
<div
class=
"ml-auto"
>
<div
class=
"ml-auto"
>
<button
<
gl-
button
v-if=
"canDiscard"
v-if=
"canDiscard"
ref=
"discardButton"
ref=
"discardButton"
type=
"button"
category=
"secondary"
class=
"btn btn-remove btn-inverted gl-mr-3"
variant=
"danger"
class=
"gl-mr-3"
@
click=
"showDiscardModal"
@
click=
"showDiscardModal"
>
>
{{ __('Discard changes') }}
{{ __('Discard changes') }}
</button>
</
gl-
button>
</div>
</div>
<gl-modal
<gl-modal
ref=
"discardModal"
ref=
"discardModal"
...
...
changelogs/unreleased/229330-update-discard-changes-button.yml
0 → 100644
View file @
8578cf7c
---
title
:
Updated Discard Changes button in WebIDE
merge_request
:
41899
author
:
type
:
changed
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