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
4b4439e6
Commit
4b4439e6
authored
Mar 27, 2018
by
Tim Zallmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes for ESLint Errors
parent
9961498e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
4 deletions
+12
-4
app/assets/javascripts/ide/components/editor_mode_dropdown.vue
...ssets/javascripts/ide/components/editor_mode_dropdown.vue
+11
-2
app/assets/javascripts/ide/components/ide.vue
app/assets/javascripts/ide/components/ide.vue
+1
-2
No files found.
app/assets/javascripts/ide/components/editor_mode_dropdown.vue
View file @
4b4439e6
...
...
@@ -26,6 +26,13 @@ export default {
required
:
true
,
},
},
computed
:
{
mergeReviewLine
()
{
return
sprintf
(
__
(
'
Reviewing (merge request !%{mergeRequestId})
'
),
{
mergeRequestId
:
this
.
mergeRequestId
,
});
},
},
methods
:
{
changeMode
(
mode
)
{
this
.
$emit
(
'
click
'
,
mode
);
...
...
@@ -50,7 +57,7 @@ export default {
data-toggle="dropdown"
>
<template
v-if=
"viewer === 'mrdiff' && mergeRequestId"
>
{{
sprintf
(
__
(
'
Reviewing (merge request !%{mergeRequestId
}
)
'
),
{
mergeRequestId
}
)
}}
{{
mergeReviewLine
}}
</
template
>
<
template
v-else-if=
"viewer === 'editor'"
>
{{
__
(
'
Editing
'
)
}}
...
...
@@ -75,7 +82,9 @@ export default {
'is-active': viewer === 'mrdiff',
}"
>
<
strong
class
=
"
dropdown-menu-inner-title
"
>
{{
sprintf
(
__
(
'
Reviewing (merge request !%{mergeRequestId
}
)
'
),
{
mergeRequestId
}
)
}}
<
/strong
>
<strong
class=
"dropdown-menu-inner-title"
>
{{
mergeReviewLine
}}
</strong>
<span
class=
"dropdown-menu-inner-content"
>
{{
__
(
'
Compare changes with the merge request target branch
'
)
}}
</span>
...
...
app/assets/javascripts/ide/components/ide.vue
View file @
4b4439e6
...
...
@@ -6,7 +6,6 @@ import repoTabs from './repo_tabs.vue';
import
repoFileButtons
from
'
./repo_file_buttons.vue
'
;
import
ideStatusBar
from
'
./ide_status_bar.vue
'
;
import
repoEditor
from
'
./repo_editor.vue
'
;
import
{
currentMergeRequest
}
from
'
../stores/getters
'
;
export
default
{
components
:
{
...
...
@@ -33,7 +32,7 @@ export default {
},
computed
:
{
...
mapState
([
'
changedFiles
'
,
'
openFiles
'
,
'
viewer
'
,
'
currentMergeRequestId
'
]),
...
mapGetters
([
'
activeFile
'
,
'
hasChanges
'
,
'
currentMergeRequest
'
]),
...
mapGetters
([
'
activeFile
'
,
'
hasChanges
'
]),
},
mounted
()
{
const
returnValue
=
'
Are you sure you want to lose unsaved 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