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
94255cdf
Commit
94255cdf
authored
Feb 21, 2018
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Harmonize CE and EE JS code
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
9f6f6fd4
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
28 additions
and
31 deletions
+28
-31
app/assets/javascripts/diff_notes/diff_notes_bundle.js
app/assets/javascripts/diff_notes/diff_notes_bundle.js
+0
-1
app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
...ripts/filtered_search/filtered_search_dropdown_manager.js
+10
-10
app/assets/javascripts/gl_dropdown.js
app/assets/javascripts/gl_dropdown.js
+1
-1
app/assets/javascripts/notebook/cells/output/html.vue
app/assets/javascripts/notebook/cells/output/html.vue
+0
-1
app/assets/javascripts/notes/components/comment_form.vue
app/assets/javascripts/notes/components/comment_form.vue
+1
-2
app/assets/javascripts/notes/components/note_attachment.vue
app/assets/javascripts/notes/components/note_attachment.vue
+1
-2
app/assets/javascripts/notes/components/note_form.vue
app/assets/javascripts/notes/components/note_form.vue
+1
-2
app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
...projects/shared/permissions/components/settings_panel.vue
+3
-0
app/assets/javascripts/pages/projects/shared/project_new.js
app/assets/javascripts/pages/projects/shared/project_new.js
+3
-2
app/assets/javascripts/pipelines/components/async_button.vue
app/assets/javascripts/pipelines/components/async_button.vue
+1
-3
app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
...pts/pipelines/components/graph/stage_column_component.vue
+2
-1
app/assets/javascripts/pipelines/components/header_component.vue
...ets/javascripts/pipelines/components/header_component.vue
+0
-1
app/assets/javascripts/project_find_file.js
app/assets/javascripts/project_find_file.js
+1
-1
app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue
...avascripts/sidebar/components/lock/lock_issue_sidebar.vue
+2
-0
app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue
...idebar/components/subscriptions/sidebar_subscriptions.vue
+0
-2
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
...ue_merge_request_widget/components/mr_widget_pipeline.vue
+1
-0
app/assets/javascripts/vue_shared/components/issue/issue_warning.vue
...javascripts/vue_shared/components/issue/issue_warning.vue
+0
-1
app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue
...ascripts/vue_shared/components/sidebar/toggle_sidebar.vue
+1
-1
No files found.
app/assets/javascripts/diff_notes/diff_notes_bundle.js
View file @
94255cdf
/* eslint-disable func-names, comma-dangle, new-cap, no-new, max-len */
/* global ResolveCount */
/* global ResolveServiceClass */
import
Vue
from
'
vue
'
;
import
'
./models/discussion
'
;
...
...
app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
View file @
94255cdf
...
...
@@ -51,16 +51,6 @@ export default class FilteredSearchDropdownManager {
gl
:
DropdownUser
,
element
:
this
.
container
.
querySelector
(
'
#js-dropdown-author
'
),
},
label
:
{
reference
:
null
,
gl
:
DropdownNonUser
,
extraArguments
:
{
endpoint
:
`
${
this
.
baseEndpoint
}
/labels.json
${
this
.
groupsOnly
?
'
?only_group_labels=true
'
:
''
}
`
,
symbol
:
'
~
'
,
preprocessing
:
DropdownUtils
.
duplicateLabelPreprocessing
,
},
element
:
this
.
container
.
querySelector
(
'
#js-dropdown-label
'
),
},
assignee
:
{
reference
:
null
,
gl
:
DropdownUser
,
...
...
@@ -75,6 +65,16 @@ export default class FilteredSearchDropdownManager {
},
element
:
this
.
container
.
querySelector
(
'
#js-dropdown-milestone
'
),
},
label
:
{
reference
:
null
,
gl
:
DropdownNonUser
,
extraArguments
:
{
endpoint
:
`
${
this
.
baseEndpoint
}
/labels.json
${
this
.
groupsOnly
?
'
?only_group_labels=true
'
:
''
}
`
,
symbol
:
'
~
'
,
preprocessing
:
DropdownUtils
.
duplicateLabelPreprocessing
,
},
element
:
this
.
container
.
querySelector
(
'
#js-dropdown-label
'
),
},
'
my-reaction
'
:
{
reference
:
null
,
gl
:
DropdownEmoji
,
...
...
app/assets/javascripts/gl_dropdown.js
View file @
94255cdf
...
...
@@ -634,7 +634,7 @@ GitLabDropdown = (function() {
html
.
style
.
display
=
'
none
'
;
}
if
(
(
data
===
'
divider
'
||
data
===
'
separator
'
)
)
{
if
(
data
===
'
divider
'
||
data
===
'
separator
'
)
{
html
.
className
=
data
;
return
html
;
}
...
...
app/assets/javascripts/notebook/cells/output/html.vue
View file @
94255cdf
...
...
@@ -33,4 +33,3 @@
<div
v-html=
"sanitizedOutput"
></div>
</div>
</
template
>
app/assets/javascripts/notes/components/comment_form.vue
View file @
94255cdf
...
...
@@ -325,8 +325,7 @@ js-gfm-input js-autosize markdown-area js-vue-textarea"
<div
class=
"note-form-actions"
>
<div
class=
"pull-left btn-group
append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown"
>
append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown"
>
<button
@
click.prevent=
"handleSave()"
:disabled=
"isSubmitButtonDisabled"
...
...
app/assets/javascripts/notes/components/note_attachment.vue
View file @
94255cdf
...
...
@@ -30,8 +30,7 @@
rel=
"noopener noreferrer"
>
<i
class=
"fa fa-paperclip"
aria-hidden=
"true"
>
aria-hidden=
"true"
>
</i>
{{
attachment
.
filename
}}
</a>
...
...
app/assets/javascripts/notes/components/note_form.vue
View file @
94255cdf
...
...
@@ -116,8 +116,7 @@
<
template
>
<div
ref=
"editNoteForm"
class=
"note-edit-form current-note-edit-form"
>
class=
"note-edit-form current-note-edit-form"
>
<div
v-if=
"conflictWhileEditing"
class=
"js-conflict-edit-warning alert alert-danger"
>
...
...
app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
View file @
94255cdf
...
...
@@ -12,6 +12,7 @@
projectFeatureToggle
,
projectSettingRow
,
},
props
:
{
currentSettings
:
{
type
:
Object
,
...
...
@@ -95,6 +96,7 @@
return
visibilityLevelDescriptions
[
this
.
visibilityLevel
];
},
},
watch
:
{
visibilityLevel
(
value
,
oldValue
)
{
if
(
value
===
visibilityOptions
.
PRIVATE
)
{
...
...
@@ -151,6 +153,7 @@
else
if
(
oldValue
===
0
)
toggleHiddenClassBySelector
(
'
.builds-feature
'
,
false
);
},
},
methods
:
{
highlightChanges
()
{
this
.
highlightChangesClass
=
true
;
...
...
app/assets/javascripts/pages/projects/shared/project_new.js
View file @
94255cdf
...
...
@@ -106,7 +106,7 @@ export default class ProjectNew {
}
}
toggleRepoVisibility
()
{
toggleRepoVisibility
()
{
var
$repoAccessLevel
=
$
(
'
.js-repo-access-level select
'
);
var
$lfsEnabledOption
=
$
(
'
.js-lfs-enabled select
'
);
var
containerRegistry
=
document
.
querySelectorAll
(
'
.js-container-registry
'
)[
0
];
...
...
@@ -117,7 +117,8 @@ export default class ProjectNew {
.
nextAll
()
.
hide
();
$repoAccessLevel
.
off
(
'
change
'
)
$repoAccessLevel
.
off
(
'
change
'
)
.
on
(
'
change
'
,
function
()
{
var
selectedVal
=
parseInt
(
$repoAccessLevel
.
val
(),
10
);
...
...
app/assets/javascripts/pipelines/components/async_button.vue
View file @
94255cdf
<
script
>
/* eslint-disable no-alert
, vue/require-default-prop
*/
/* eslint-disable no-alert */
import
eventHub
from
'
../event_hub
'
;
import
loadingIcon
from
'
../../vue_shared/components/loading_icon.vue
'
;
...
...
@@ -10,7 +10,6 @@
directives
:
{
tooltip
,
},
components
:
{
loadingIcon
,
icon
,
...
...
@@ -37,7 +36,6 @@
required
:
true
,
},
},
data
()
{
return
{
isLoading
:
false
,
...
...
app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
View file @
94255cdf
...
...
@@ -62,7 +62,8 @@
:class=
"
{
'left-connector': index === 0
&&
(!isFirstColumn || hasTriggeredBy)
}"
:id="jobId(job)">
:id="jobId(job)"
>
<div
class=
"curve"
></div>
...
...
app/assets/javascripts/pipelines/components/header_component.vue
View file @
94255cdf
...
...
@@ -19,7 +19,6 @@
required
:
true
,
},
},
data
()
{
return
{
actions
:
this
.
getActions
(),
...
...
app/assets/javascripts/project_find_file.js
View file @
94255cdf
...
...
@@ -85,7 +85,7 @@ export default class ProjectFindFile {
.
catch
(()
=>
flash
(
__
(
'
An error occurred while loading filenames
'
)));
}
// render result
// render result
renderList
(
filePaths
,
searchText
)
{
var
blobItemUrl
,
filePath
,
html
,
i
,
j
,
len
,
matches
,
results
;
this
.
element
.
find
(
"
.tree-table > tbody
"
).
empty
();
...
...
app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue
View file @
94255cdf
...
...
@@ -12,6 +12,7 @@
mixins
:
[
issuableMixin
,
],
props
:
{
isLocked
:
{
required
:
true
,
...
...
@@ -31,6 +32,7 @@
},
},
},
computed
:
{
lockIcon
()
{
return
this
.
isLocked
?
'
lock
'
:
'
lock-open
'
;
...
...
app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue
View file @
94255cdf
...
...
@@ -20,11 +20,9 @@ export default {
store
:
new
Store
(),
};
},
created
()
{
eventHub
.
$on
(
'
toggleSubscription
'
,
this
.
onToggleSubscription
);
},
beforeDestroy
()
{
eventHub
.
$off
(
'
toggleSubscription
'
,
this
.
onToggleSubscription
);
},
...
...
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
View file @
94255cdf
...
...
@@ -80,6 +80,7 @@
>
<ci-icon
:status=
"status"
/>
</a>
<div
class=
"media-body"
>
Pipeline
<a
...
...
app/assets/javascripts/vue_shared/components/issue/issue_warning.vue
View file @
94255cdf
...
...
@@ -5,7 +5,6 @@
components
:
{
icon
,
},
props
:
{
isLocked
:
{
type
:
Boolean
,
...
...
app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue
View file @
94255cdf
...
...
@@ -18,7 +18,7 @@
<
template
>
<button
type=
"button"
class=
"btn btn-blank gutter-toggle"
class=
"btn btn-blank gutter-toggle
btn-sidebar-action
"
@
click=
"toggle"
>
<i
...
...
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