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
c152d514
Commit
c152d514
authored
Dec 22, 2020
by
Lukas Eipert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Run prettier on 30 files: 2 of 8
Mandatory not to break master. Automatically created with prettier.
parent
26b68c70
Changes
30
Hide whitespace changes
Inline
Side-by-side
Showing
30 changed files
with
59 additions
and
144 deletions
+59
-144
app/assets/javascripts/create_label.js
app/assets/javascripts/create_label.js
+3
-9
app/assets/javascripts/cycle_analytics/components/total_time_component.vue
...ripts/cycle_analytics/components/total_time_component.vue
+1
-3
app/assets/javascripts/deprecated_jquery_dropdown/gl_dropdown.js
...ets/javascripts/deprecated_jquery_dropdown/gl_dropdown.js
+4
-15
app/assets/javascripts/deprecated_jquery_dropdown/gl_dropdown_filter.js
...ascripts/deprecated_jquery_dropdown/gl_dropdown_filter.js
+2
-5
app/assets/javascripts/deprecated_jquery_dropdown/gl_dropdown_input.js
...vascripts/deprecated_jquery_dropdown/gl_dropdown_input.js
+2
-8
app/assets/javascripts/deprecated_jquery_dropdown/index.js
app/assets/javascripts/deprecated_jquery_dropdown/index.js
+1
-1
app/assets/javascripts/design_management/components/design_destroyer.vue
...scripts/design_management/components/design_destroyer.vue
+1
-6
app/assets/javascripts/design_management/components/design_todo_button.vue
...ripts/design_management/components/design_todo_button.vue
+1
-6
app/assets/javascripts/design_management/pages/design/index.vue
...sets/javascripts/design_management/pages/design/index.vue
+2
-12
app/assets/javascripts/design_management/pages/index.vue
app/assets/javascripts/design_management/pages/index.vue
+1
-6
app/assets/javascripts/design_management/router/routes.js
app/assets/javascripts/design_management/router/routes.js
+1
-7
app/assets/javascripts/diff.js
app/assets/javascripts/diff.js
+1
-3
app/assets/javascripts/diffs/components/app.vue
app/assets/javascripts/diffs/components/app.vue
+2
-10
app/assets/javascripts/diffs/components/diff_file.vue
app/assets/javascripts/diffs/components/diff_file.vue
+1
-1
app/assets/javascripts/diffs/components/inline_diff_view.vue
app/assets/javascripts/diffs/components/inline_diff_view.vue
+3
-3
app/assets/javascripts/diffs/components/parallel_diff_view.vue
...ssets/javascripts/diffs/components/parallel_diff_view.vue
+4
-4
app/assets/javascripts/diffs/store/actions.js
app/assets/javascripts/diffs/store/actions.js
+2
-1
app/assets/javascripts/diffs/store/getters.js
app/assets/javascripts/diffs/store/getters.js
+4
-1
app/assets/javascripts/droplab/keyboard.js
app/assets/javascripts/droplab/keyboard.js
+1
-1
app/assets/javascripts/droplab/plugins/ajax.js
app/assets/javascripts/droplab/plugins/ajax.js
+1
-1
app/assets/javascripts/droplab/plugins/ajax_filter.js
app/assets/javascripts/droplab/plugins/ajax_filter.js
+3
-3
app/assets/javascripts/droplab/plugins/filter.js
app/assets/javascripts/droplab/plugins/filter.js
+5
-5
app/assets/javascripts/droplab/utils.js
app/assets/javascripts/droplab/utils.js
+1
-6
app/assets/javascripts/dropzone_input.js
app/assets/javascripts/dropzone_input.js
+3
-10
app/assets/javascripts/due_date_select.js
app/assets/javascripts/due_date_select.js
+1
-3
app/assets/javascripts/editor/editor_ci_schema_ext.js
app/assets/javascripts/editor/editor_ci_schema_ext.js
+1
-3
app/assets/javascripts/emoji/index.js
app/assets/javascripts/emoji/index.js
+3
-2
app/assets/javascripts/error_tracking/components/stacktrace_entry.vue
...avascripts/error_tracking/components/stacktrace_entry.vue
+2
-2
app/assets/javascripts/feature_flags/components/strategy_parameters.vue
...ascripts/feature_flags/components/strategy_parameters.vue
+1
-1
app/assets/javascripts/feature_flags/store/index/mutations.js
...assets/javascripts/feature_flags/store/index/mutations.js
+1
-6
No files found.
app/assets/javascripts/create_label.js
View file @
c152d514
...
...
@@ -46,7 +46,7 @@ export default class CreateLabelDropdown {
addBinding
()
{
const
self
=
this
;
this
.
$colorSuggestions
.
on
(
'
click
'
,
function
(
e
)
{
this
.
$colorSuggestions
.
on
(
'
click
'
,
function
(
e
)
{
const
$this
=
$
(
this
);
self
.
addColorValue
(
e
,
$this
);
});
...
...
@@ -72,10 +72,7 @@ export default class CreateLabelDropdown {
e
.
stopPropagation
();
this
.
$newColorField
.
val
(
$this
.
data
(
'
color
'
)).
trigger
(
'
change
'
);
this
.
$colorPreview
.
css
(
'
background-color
'
,
$this
.
data
(
'
color
'
))
.
parent
()
.
addClass
(
'
is-active
'
);
this
.
$colorPreview
.
css
(
'
background-color
'
,
$this
.
data
(
'
color
'
)).
parent
().
addClass
(
'
is-active
'
);
}
enableLabelCreateButton
()
{
...
...
@@ -94,10 +91,7 @@ export default class CreateLabelDropdown {
this
.
$addList
.
prop
(
'
checked
'
,
this
.
addListDefault
);
this
.
$colorPreview
.
css
(
'
background-color
'
,
''
)
.
parent
()
.
removeClass
(
'
is-active
'
);
this
.
$colorPreview
.
css
(
'
background-color
'
,
''
).
parent
().
removeClass
(
'
is-active
'
);
}
saveLabel
(
e
)
{
...
...
app/assets/javascripts/cycle_analytics/components/total_time_component.vue
View file @
c152d514
...
...
@@ -30,8 +30,6 @@ export default {
{{
time
.
seconds
}}
<span>
{{
s__
(
'
Time|s
'
)
}}
</span>
</
template
>
</template>
<
template
v-else
>
--
</
template
>
<
template
v-else
>
--
</
template
>
</span>
</template>
app/assets/javascripts/deprecated_jquery_dropdown/gl_dropdown.js
View file @
c152d514
...
...
@@ -123,10 +123,7 @@ export class GitLabDropdown {
if
(
$
(
this
.
el
).
is
(
'
input
'
))
{
currentIndex
=
-
1
;
}
else
{
$
(
selector
,
this
.
dropdown
)
.
first
()
.
find
(
'
a
'
)
.
addClass
(
'
is-focused
'
);
$
(
selector
,
this
.
dropdown
).
first
().
find
(
'
a
'
).
addClass
(
'
is-focused
'
);
currentIndex
=
0
;
}
}
...
...
@@ -493,10 +490,7 @@ export class GitLabDropdown {
if
(
!
this
.
options
.
multiSelect
||
el
.
hasClass
(
'
dropdown-clear-active
'
))
{
this
.
dropdown
.
find
(
`.
${
ACTIVE_CLASS
}
`
).
removeClass
(
ACTIVE_CLASS
);
if
(
!
isInput
)
{
this
.
dropdown
.
parent
()
.
find
(
`input[name='
${
fieldName
}
']`
)
.
remove
();
this
.
dropdown
.
parent
().
find
(
`input[name='
${
fieldName
}
']`
).
remove
();
}
}
if
(
field
&&
field
.
length
&&
value
==
null
)
{
...
...
@@ -536,10 +530,7 @@ export class GitLabDropdown {
$
(
`input[name="
${
fieldName
}
"]`
).
remove
();
}
const
$input
=
$
(
'
<input>
'
)
.
attr
(
'
type
'
,
'
hidden
'
)
.
attr
(
'
name
'
,
fieldName
)
.
val
(
value
);
const
$input
=
$
(
'
<input>
'
).
attr
(
'
type
'
,
'
hidden
'
).
attr
(
'
name
'
,
fieldName
).
val
(
value
);
if
(
this
.
options
.
inputId
!=
null
)
{
$input
.
attr
(
'
id
'
,
this
.
options
.
inputId
);
}
...
...
@@ -678,9 +669,7 @@ export class GitLabDropdown {
toggleText
=
this
.
options
.
updateLabel
;
}
return
$
(
this
.
el
)
.
find
(
'
.dropdown-toggle-text
'
)
.
text
(
toggleText
);
return
$
(
this
.
el
).
find
(
'
.dropdown-toggle-text
'
).
text
(
toggleText
);
}
// eslint-disable-next-line class-methods-use-this
...
...
app/assets/javascripts/deprecated_jquery_dropdown/gl_dropdown_filter.js
View file @
c152d514
...
...
@@ -22,10 +22,7 @@ export class GitLabDropdownFilter {
// Clear click
e
.
preventDefault
();
e
.
stopPropagation
();
return
this
.
input
.
val
(
''
)
.
trigger
(
'
input
'
)
.
focus
();
return
this
.
input
.
val
(
''
).
trigger
(
'
input
'
).
focus
();
});
// Key events
timeout
=
''
;
...
...
@@ -113,7 +110,7 @@ export class GitLabDropdownFilter {
const
elements
=
this
.
options
.
elements
();
if
(
searchText
)
{
// eslint-disable-next-line func-names
elements
.
each
(
function
()
{
elements
.
each
(
function
()
{
const
$el
=
$
(
this
);
const
matches
=
fuzzaldrinPlus
.
match
(
$el
.
text
().
trim
(),
searchText
);
if
(
!
$el
.
is
(
'
.dropdown-header
'
))
{
...
...
app/assets/javascripts/deprecated_jquery_dropdown/gl_dropdown_input.js
View file @
c152d514
...
...
@@ -9,10 +9,7 @@ export class GitLabDropdownInput {
// Clear click
e
.
preventDefault
();
e
.
stopPropagation
();
return
this
.
input
.
val
(
''
)
.
trigger
(
'
input
'
)
.
focus
();
return
this
.
input
.
val
(
''
).
trigger
(
'
input
'
).
focus
();
});
this
.
input
...
...
@@ -31,10 +28,7 @@ export class GitLabDropdownInput {
.
toLowerCase
()
// replace non alphanumeric
.
replace
(
/
(
-
)\1
+/g
,
'
-
'
);
// replace repeated dashes
this
.
cb
(
this
.
options
.
fieldName
,
val
,
{},
true
);
this
.
input
.
closest
(
'
.dropdown
'
)
.
find
(
'
.dropdown-toggle-text
'
)
.
text
(
val
);
this
.
input
.
closest
(
'
.dropdown
'
).
find
(
'
.dropdown-toggle-text
'
).
text
(
val
);
});
}
...
...
app/assets/javascripts/deprecated_jquery_dropdown/index.js
View file @
c152d514
...
...
@@ -3,7 +3,7 @@ import { GitLabDropdown } from './gl_dropdown';
export
default
function
initDeprecatedJQueryDropdown
(
$el
,
opts
)
{
// eslint-disable-next-line func-names
return
$el
.
each
(
function
()
{
return
$el
.
each
(
function
()
{
if
(
!
$
.
data
(
this
,
'
deprecatedJQueryDropdown
'
))
{
$
.
data
(
this
,
'
deprecatedJQueryDropdown
'
,
new
GitLabDropdown
(
this
,
opts
));
}
...
...
app/assets/javascripts/design_management/components/design_destroyer.vue
View file @
c152d514
...
...
@@ -32,12 +32,7 @@ export default {
},
},
methods
:
{
updateStoreAfterDelete
(
store
,
{
data
:
{
designManagementDelete
},
},
)
{
updateStoreAfterDelete
(
store
,
{
data
:
{
designManagementDelete
}
})
{
updateStoreAfterDesignsDelete
(
store
,
designManagementDelete
,
...
...
app/assets/javascripts/design_management/components/design_todo_button.vue
View file @
c152d514
...
...
@@ -116,12 +116,7 @@ export default {
variables
:
{
id
,
},
update
(
store
,
{
data
:
{
todoMarkDone
},
},
)
{
update
(
store
,
{
data
:
{
todoMarkDone
}
})
{
const
todoMarkDoneFirstError
=
(
todoMarkDone
.
errors
||
[])[
0
];
if
(
todoMarkDoneFirstError
)
{
this
.
$emit
(
'
error
'
,
Error
(
todoMarkDoneFirstError
));
...
...
app/assets/javascripts/design_management/pages/design/index.vue
View file @
c152d514
...
...
@@ -167,12 +167,7 @@ export default {
next
();
},
methods
:
{
addImageDiffNoteToStore
(
store
,
{
data
:
{
createImageDiffNote
},
},
)
{
addImageDiffNoteToStore
(
store
,
{
data
:
{
createImageDiffNote
}
})
{
updateStoreAfterAddImageDiffNote
(
store
,
createImageDiffNote
,
...
...
@@ -180,12 +175,7 @@ export default {
this
.
designVariables
,
);
},
updateImageDiffNoteInStore
(
store
,
{
data
:
{
repositionImageDiffNote
},
},
)
{
updateImageDiffNoteInStore
(
store
,
{
data
:
{
repositionImageDiffNote
}
})
{
return
updateStoreAfterRepositionImageDiffNote
(
store
,
repositionImageDiffNote
,
...
...
app/assets/javascripts/design_management/pages/index.vue
View file @
c152d514
...
...
@@ -187,12 +187,7 @@ export default {
.
then
(
res
=>
this
.
onUploadDesignDone
(
res
))
.
catch
(()
=>
this
.
onUploadDesignError
());
},
afterUploadDesign
(
store
,
{
data
:
{
designManagementUpload
},
},
)
{
afterUploadDesign
(
store
,
{
data
:
{
designManagementUpload
}
})
{
updateStoreAfterUploadDesign
(
store
,
designManagementUpload
,
this
.
projectQueryBody
);
},
onUploadDesignDone
(
res
)
{
...
...
app/assets/javascripts/design_management/router/routes.js
View file @
c152d514
...
...
@@ -13,13 +13,7 @@ export default [
name
:
DESIGN_ROUTE_NAME
,
path
:
'
/designs/:id
'
,
component
:
DesignDetail
,
beforeEnter
(
{
params
:
{
id
},
},
_
,
next
,
)
{
beforeEnter
({
params
:
{
id
}
},
_
,
next
)
{
if
(
typeof
id
===
'
string
'
)
{
next
();
}
...
...
app/assets/javascripts/diff.js
View file @
c152d514
...
...
@@ -24,9 +24,7 @@ export default class Diff {
if
(
!
tab
||
(
tab
&&
tab
.
dataset
&&
tab
.
dataset
.
isLocked
!==
''
))
FilesCommentButton
.
init
(
$diffFile
);
const
firstFile
=
$
(
'
.files
'
)
.
first
()
.
get
(
0
);
const
firstFile
=
$
(
'
.files
'
).
first
().
get
(
0
);
const
canCreateNote
=
firstFile
&&
firstFile
.
hasAttribute
(
'
data-can-create-note
'
);
$diffFile
.
each
((
index
,
file
)
=>
initImageDiffHelper
.
initImageDiff
(
file
,
canCreateNote
));
...
...
app/assets/javascripts/diffs/components/app.vue
View file @
c152d514
...
...
@@ -281,12 +281,7 @@ export default {
const
id
=
window
?.
location
?.
hash
;
if
(
id
&&
id
.
indexOf
(
'
#note
'
)
!==
0
)
{
this
.
setHighlightedRow
(
id
.
split
(
'
diff-content
'
)
.
pop
()
.
slice
(
1
),
);
this
.
setHighlightedRow
(
id
.
split
(
'
diff-content
'
).
pop
().
slice
(
1
));
}
},
beforeCreate
()
{
...
...
@@ -404,10 +399,7 @@ export default {
},
setDiscussions
()
{
requestIdleCallback
(
()
=>
this
.
assignDiscussionsToDiff
()
.
then
(
this
.
$nextTick
)
.
then
(
this
.
startTaskList
),
()
=>
this
.
assignDiscussionsToDiff
().
then
(
this
.
$nextTick
).
then
(
this
.
startTaskList
),
{
timeout
:
1000
},
);
},
...
...
app/assets/javascripts/diffs/components/diff_file.vue
View file @
c152d514
...
...
@@ -139,7 +139,7 @@ export default {
return
!
this
.
isCollapsed
||
this
.
automaticallyCollapsed
;
},
showWarning
()
{
return
this
.
isCollapsed
&&
(
this
.
automaticallyCollapsed
&&
!
this
.
viewDiffsFileByFile
)
;
return
this
.
isCollapsed
&&
this
.
automaticallyCollapsed
&&
!
this
.
viewDiffsFileByFile
;
},
showContent
()
{
return
!
this
.
isCollapsed
&&
!
this
.
isFileTooLarge
;
...
...
app/assets/javascripts/diffs/components/inline_diff_view.vue
View file @
c152d514
...
...
@@ -58,9 +58,9 @@ export default {
class=
"code diff-wrap-lines js-syntax-highlight text-file js-diff-inline-view"
>
<colgroup>
<col
style=
"width: 50px
;
"
/>
<col
style=
"width: 50px
;
"
/>
<col
style=
"width: 8px
;
"
/>
<col
style=
"width: 50px"
/>
<col
style=
"width: 50px"
/>
<col
style=
"width: 8px"
/>
<col
/>
</colgroup>
<tbody>
...
...
app/assets/javascripts/diffs/components/parallel_diff_view.vue
View file @
c152d514
...
...
@@ -57,11 +57,11 @@ export default {
class=
"code diff-wrap-lines js-syntax-highlight text-file"
>
<colgroup>
<col
style=
"width: 50px
;
"
/>
<col
style=
"width: 8px
;
"
/>
<col
style=
"width: 50px"
/>
<col
style=
"width: 8px"
/>
<col
/>
<col
style=
"width: 50px
;
"
/>
<col
style=
"width: 8px
;
"
/>
<col
style=
"width: 50px"
/>
<col
style=
"width: 8px"
/>
<col
/>
</colgroup>
<tbody>
...
...
app/assets/javascripts/diffs/store/actions.js
View file @
c152d514
...
...
@@ -307,7 +307,8 @@ export const startRenderDiffsQueue = ({ state, commit }) => {
const
nextFile
=
state
.
diffFiles
.
find
(
file
=>
!
file
.
renderIt
&&
(
file
.
viewer
&&
(
!
isCollapsed
(
file
)
||
file
.
viewer
.
name
!==
diffViewerModes
.
text
)),
file
.
viewer
&&
(
!
isCollapsed
(
file
)
||
file
.
viewer
.
name
!==
diffViewerModes
.
text
),
);
if
(
nextFile
)
{
...
...
app/assets/javascripts/diffs/store/getters.js
View file @
c152d514
...
...
@@ -138,7 +138,10 @@ export const fileLineCoverage = state => (file, line) => {
* @returns {number}
*/
export
const
currentDiffIndex
=
state
=>
Math
.
max
(
0
,
state
.
diffFiles
.
findIndex
(
diff
=>
diff
.
file_hash
===
state
.
currentDiffFileId
));
Math
.
max
(
0
,
state
.
diffFiles
.
findIndex
(
diff
=>
diff
.
file_hash
===
state
.
currentDiffFileId
),
);
export
const
diffLines
=
state
=>
(
file
,
unifiedDiffComponents
)
=>
{
if
(
!
unifiedDiffComponents
&&
state
.
diffViewType
===
INLINE_DIFF_VIEW_TYPE
)
{
...
...
app/assets/javascripts/droplab/keyboard.js
View file @
c152d514
...
...
@@ -2,7 +2,7 @@
import
{
ACTIVE_CLASS
}
from
'
./constants
'
;
const
Keyboard
=
function
()
{
const
Keyboard
=
function
()
{
var
currentKey
;
var
currentFocus
;
var
isUpArrow
=
false
;
...
...
app/assets/javascripts/droplab/plugins/ajax.js
View file @
c152d514
...
...
@@ -46,7 +46,7 @@ const Ajax = {
.
then
(
data
=>
self
.
_loadData
(
data
,
config
,
self
))
.
catch
(
config
.
onError
);
},
destroy
:
function
()
{
destroy
:
function
()
{
this
.
destroyed
=
true
;
},
};
...
...
app/assets/javascripts/droplab/plugins/ajax_filter.js
View file @
c152d514
...
...
@@ -2,7 +2,7 @@
import
AjaxCache
from
'
../../lib/utils/ajax_cache
'
;
const
AjaxFilter
=
{
init
:
function
(
hook
)
{
init
:
function
(
hook
)
{
this
.
destroyed
=
false
;
this
.
hook
=
hook
;
this
.
notLoading
();
...
...
@@ -93,9 +93,9 @@ const AjaxFilter = {
list
.
currentIndex
=
0
;
},
buildParams
:
function
(
params
)
{
buildParams
:
function
(
params
)
{
if
(
!
params
)
return
''
;
var
paramsArray
=
Object
.
keys
(
params
).
map
(
function
(
param
)
{
var
paramsArray
=
Object
.
keys
(
params
).
map
(
function
(
param
)
{
return
param
+
'
=
'
+
(
params
[
param
]
||
''
);
});
return
'
?
'
+
paramsArray
.
join
(
'
&
'
);
...
...
app/assets/javascripts/droplab/plugins/filter.js
View file @
c152d514
/* eslint-disable */
const
Filter
=
{
keydown
:
function
(
e
)
{
keydown
:
function
(
e
)
{
if
(
this
.
destroyed
)
return
;
var
hiddenCount
=
0
;
...
...
@@ -21,22 +21,22 @@ const Filter = {
if
(
config
&&
config
.
filterFunction
&&
typeof
config
.
filterFunction
===
'
function
'
)
{
filterFunction
=
config
.
filterFunction
;
}
else
{
filterFunction
=
function
(
o
)
{
filterFunction
=
function
(
o
)
{
// cheap string search
o
.
droplab_hidden
=
o
[
config
.
template
].
toLowerCase
().
indexOf
(
value
)
===
-
1
;
return
o
;
};
}
dataHiddenCount
=
data
.
filter
(
function
(
o
)
{
dataHiddenCount
=
data
.
filter
(
function
(
o
)
{
return
!
o
.
droplab_hidden
;
}).
length
;
matches
=
data
.
map
(
function
(
o
)
{
matches
=
data
.
map
(
function
(
o
)
{
return
filterFunction
(
o
,
value
);
});
hiddenCount
=
matches
.
filter
(
function
(
o
)
{
hiddenCount
=
matches
.
filter
(
function
(
o
)
{
return
!
o
.
droplab_hidden
;
}).
length
;
...
...
app/assets/javascripts/droplab/utils.js
View file @
c152d514
...
...
@@ -5,12 +5,7 @@ import { DATA_TRIGGER, DATA_DROPDOWN, TEMPLATE_REGEX } from './constants';
const
utils
=
{
toCamelCase
(
attr
)
{
return
this
.
camelize
(
attr
.
split
(
'
-
'
)
.
slice
(
1
)
.
join
(
'
'
),
);
return
this
.
camelize
(
attr
.
split
(
'
-
'
).
slice
(
1
).
join
(
'
'
));
},
template
(
templateString
,
data
)
{
...
...
app/assets/javascripts/dropzone_input.js
View file @
c152d514
...
...
@@ -219,12 +219,8 @@ export default function dropzoneInput(form, config = { parallelUploads: 2 }) {
const
caretStart
=
textarea
.
selectionStart
;
const
caretEnd
=
textarea
.
selectionEnd
;
const
textEnd
=
$
(
child
).
val
().
length
;
const
beforeSelection
=
$
(
child
)
.
val
()
.
substring
(
0
,
caretStart
);
const
afterSelection
=
$
(
child
)
.
val
()
.
substring
(
caretEnd
,
textEnd
);
const
beforeSelection
=
$
(
child
).
val
().
substring
(
0
,
caretStart
);
const
afterSelection
=
$
(
child
).
val
().
substring
(
caretEnd
,
textEnd
);
$
(
child
).
val
(
beforeSelection
+
formattedText
+
afterSelection
);
textarea
.
setSelectionRange
(
caretStart
+
formattedText
.
length
,
caretEnd
+
formattedText
.
length
);
textarea
.
style
.
height
=
`
${
textarea
.
scrollHeight
}
px`
;
...
...
@@ -289,10 +285,7 @@ export default function dropzoneInput(form, config = { parallelUploads: 2 }) {
form
.
find
(
'
.markdown-selector
'
).
click
(
function
onMarkdownClick
(
e
)
{
e
.
preventDefault
();
$
(
this
)
.
closest
(
'
.gfm-form
'
)
.
find
(
'
.div-dropzone
'
)
.
click
();
$
(
this
).
closest
(
'
.gfm-form
'
).
find
(
'
.div-dropzone
'
).
click
();
formTextarea
.
focus
();
});
...
...
app/assets/javascripts/due_date_select.js
View file @
c152d514
...
...
@@ -197,9 +197,7 @@ export default class DueDateSelectors {
$
(
'
.js-clear-due-date,.js-clear-start-date
'
).
on
(
'
click
'
,
e
=>
{
e
.
preventDefault
();
const
calendar
=
$
(
e
.
target
)
.
siblings
(
'
.datepicker
'
)
.
data
(
'
pikaday
'
);
const
calendar
=
$
(
e
.
target
).
siblings
(
'
.datepicker
'
).
data
(
'
pikaday
'
);
calendar
.
setDate
(
null
);
});
}
...
...
app/assets/javascripts/editor/editor_ci_schema_ext.js
View file @
c152d514
...
...
@@ -22,9 +22,7 @@ export class CiSchemaExtension extends EditorLiteExtension {
.
replace
(
'
:project_path
'
,
projectPath
)
.
replace
(
'
:ref
'
,
ref
)
.
replace
(
'
:filename
'
,
EXTENSION_CI_SCHEMA_FILE_NAME_MATCH
);
const
modelFileName
=
this
.
getModel
()
.
uri
.
path
.
split
(
'
/
'
)
.
pop
();
const
modelFileName
=
this
.
getModel
().
uri
.
path
.
split
(
'
/
'
).
pop
();
registerSchema
({
uri
:
ciSchemaUri
,
...
...
app/assets/javascripts/emoji/index.js
View file @
c152d514
...
...
@@ -242,8 +242,9 @@ export function getEmojiInfo(query) {
export
function
emojiFallbackImageSrc
(
inputName
)
{
const
{
name
}
=
getEmojiInfo
(
inputName
);
return
`
${
gon
.
asset_host
||
''
}${
gon
.
relative_url_root
||
''
}
/-/emojis/
${
EMOJI_VERSION
}
/
${
name
}
.png`
;
return
`
${
gon
.
asset_host
||
''
}${
gon
.
relative_url_root
||
''
}
/-/emojis/
${
EMOJI_VERSION
}
/
${
name
}
.png`
;
}
export
function
emojiImageTag
(
name
,
src
)
{
...
...
app/assets/javascripts/error_tracking/components/stacktrace_entry.vue
View file @
c152d514
...
...
@@ -100,7 +100,7 @@ export default {
/>
<gl-sprintf
v-if=
"errorFn"
:message=
"__('%
{spanStart}in%{spanEnd} %{errorFn}')">
<template
#span
="
{
content
}">
<template
#span
="
{
content
}">
<span
class=
"gl-text-gray-200"
>
{{
content
}}
</span>
</
template
>
<
template
#errorFn
>
...
...
@@ -109,7 +109,7 @@ export default {
</gl-sprintf>
<gl-sprintf
:message=
"__('%{spanStart}at line%{spanEnd} %{errorLine}%{errorColumn}')"
>
<
template
#span=
"{
content
}"
>
<
template
#span=
"{
content
}"
>
<span
class=
"gl-text-gray-200"
>
{{
content
}}
</span>
</
template
>
<
template
#errorLine
>
...
...
app/assets/javascripts/feature_flags/components/strategy_parameters.vue
View file @
c152d514
...
...
@@ -30,7 +30,7 @@ export default {
},
computed
:
{
strategyComponent
()
{
return
STRATEGIES
[
(
this
.
strategy
?.
name
)
];
return
STRATEGIES
[
this
.
strategy
?.
name
];
},
},
methods
:
{
...
...
app/assets/javascripts/feature_flags/store/index/mutations.js
View file @
c152d514
...
...
@@ -74,12 +74,7 @@ export default {
state
.
isRotating
=
true
;
state
.
hasRotateError
=
false
;
},
[
types
.
RECEIVE_ROTATE_INSTANCE_ID_SUCCESS
](
state
,
{
data
:
{
token
},
},
)
{
[
types
.
RECEIVE_ROTATE_INSTANCE_ID_SUCCESS
](
state
,
{
data
:
{
token
}
})
{
state
.
isRotating
=
false
;
state
.
instanceId
=
token
;
state
.
hasRotateError
=
false
;
...
...
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