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
6e6bdb78
Commit
6e6bdb78
authored
Dec 08, 2021
by
Coung Ngo
Committed by
Jacques Erasmus
Dec 08, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move JS code into ~/issuable and ~/issues
parent
e0de4474
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
19 additions
and
22 deletions
+19
-22
app/assets/javascripts/issuable/issuable_template_selector.js
...assets/javascripts/issuable/issuable_template_selector.js
+1
-5
app/assets/javascripts/issuable/issuable_template_selectors.js
...ssets/javascripts/issuable/issuable_template_selectors.js
+3
-2
app/assets/javascripts/issues/issue.js
app/assets/javascripts/issues/issue.js
+6
-6
app/assets/javascripts/issues/manual_ordering.js
app/assets/javascripts/issues/manual_ordering.js
+0
-0
app/assets/javascripts/issues/show/components/fields/description_template.vue
...ts/issues/show/components/fields/description_template.vue
+1
-1
app/assets/javascripts/issues_list/components/issuables_list_app.vue
...javascripts/issues_list/components/issuables_list_app.vue
+1
-1
app/assets/javascripts/pages/dashboard/issues/index.js
app/assets/javascripts/pages/dashboard/issues/index.js
+1
-1
app/assets/javascripts/pages/groups/issues/index.js
app/assets/javascripts/pages/groups/issues/index.js
+1
-1
app/assets/javascripts/pages/projects/issues/form.js
app/assets/javascripts/pages/projects/issues/form.js
+1
-1
app/assets/javascripts/pages/projects/issues/index/index.js
app/assets/javascripts/pages/projects/issues/index/index.js
+1
-1
app/assets/javascripts/pages/projects/issues/show.js
app/assets/javascripts/pages/projects/issues/show.js
+1
-1
app/assets/javascripts/pages/projects/merge_requests/init_merge_request.js
...ripts/pages/projects/merge_requests/init_merge_request.js
+1
-1
spec/frontend/issues/issue_spec.js
spec/frontend/issues/issue_spec.js
+1
-1
No files found.
app/assets/javascripts/
templates
/issuable_template_selector.js
→
app/assets/javascripts/
issuable
/issuable_template_selector.js
View file @
6e6bdb78
/* eslint-disable no-useless-return */
import
$
from
'
jquery
'
;
import
TemplateSelector
from
'
~/blob/template_selector
'
;
import
{
__
}
from
'
~/locale
'
;
import
Api
from
'
../api
'
;
import
TemplateSelector
from
'
../blob/template_selector
'
;
export
default
class
IssuableTemplateSelector
extends
TemplateSelector
{
constructor
(...
args
)
{
...
...
@@ -109,7 +107,5 @@ export default class IssuableTemplateSelector extends TemplateSelector {
}
else
{
this
.
setEditorContent
(
this
.
currentTemplate
,
{
skipFocus
:
false
});
}
return
;
}
}
app/assets/javascripts/
templates
/issuable_template_selectors.js
→
app/assets/javascripts/
issuable
/issuable_template_selectors.js
View file @
6e6bdb78
/* eslint-disable no-new, class-methods-use-this */
import
$
from
'
jquery
'
;
import
IssuableTemplateSelector
from
'
./issuable_template_selector
'
;
...
...
@@ -10,6 +8,8 @@ export default class IssuableTemplateSelectors {
this
.
$dropdowns
.
each
((
i
,
dropdown
)
=>
{
const
$dropdown
=
$
(
dropdown
);
// eslint-disable-next-line no-new
new
IssuableTemplateSelector
({
pattern
:
/
(\.
md
)
/
,
data
:
$dropdown
.
data
(
'
data
'
),
...
...
@@ -21,6 +21,7 @@ export default class IssuableTemplateSelectors {
});
}
// eslint-disable-next-line class-methods-use-this
initEditor
()
{
const
editor
=
$
(
'
.markdown-area
'
);
// Proxy ace-editor's .setValue to jQuery's .val
...
...
app/assets/javascripts/issue.js
→
app/assets/javascripts/issue
s/issue
.js
View file @
6e6bdb78
import
$
from
'
jquery
'
;
import
{
joinPaths
}
from
'
~/lib/utils/url_utility
'
;
import
CreateMergeRequestDropdown
from
'
.
/create_merge_request_dropdown
'
;
import
createFlash
from
'
.
/flash
'
;
import
{
EVENT_ISSUABLE_VUE_APP_CHANGE
}
from
'
.
/issuable/constants
'
;
import
axios
from
'
.
/lib/utils/axios_utils
'
;
import
{
addDelimiter
}
from
'
.
/lib/utils/text_utility
'
;
import
{
__
}
from
'
.
/locale
'
;
import
CreateMergeRequestDropdown
from
'
~
/create_merge_request_dropdown
'
;
import
createFlash
from
'
~
/flash
'
;
import
{
EVENT_ISSUABLE_VUE_APP_CHANGE
}
from
'
~
/issuable/constants
'
;
import
axios
from
'
~
/lib/utils/axios_utils
'
;
import
{
addDelimiter
}
from
'
~
/lib/utils/text_utility
'
;
import
{
__
}
from
'
~
/locale
'
;
export
default
class
Issue
{
constructor
()
{
...
...
app/assets/javascripts/manual_ordering.js
→
app/assets/javascripts/
issues/
manual_ordering.js
View file @
6e6bdb78
File moved
app/assets/javascripts/issues/show/components/fields/description_template.vue
View file @
6e6bdb78
<
script
>
import
{
GlIcon
}
from
'
@gitlab/ui
'
;
import
$
from
'
jquery
'
;
import
IssuableTemplateSelectors
from
'
~/
templates
/issuable_template_selectors
'
;
import
IssuableTemplateSelectors
from
'
~/
issuable
/issuable_template_selectors
'
;
export
default
{
components
:
{
...
...
app/assets/javascripts/issues_list/components/issuables_list_app.vue
View file @
6e6bdb78
...
...
@@ -11,7 +11,7 @@ import axios from '~/lib/utils/axios_utils';
import
{
scrollToElement
,
historyPushState
}
from
'
~/lib/utils/common_utils
'
;
import
{
setUrlParams
,
queryToObject
,
getParameterByName
}
from
'
~/lib/utils/url_utility
'
;
import
{
__
}
from
'
~/locale
'
;
import
initManualOrdering
from
'
~/manual_ordering
'
;
import
initManualOrdering
from
'
~/
issues/
manual_ordering
'
;
import
FilteredSearchBar
from
'
~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue
'
;
import
{
sortOrderMap
,
...
...
app/assets/javascripts/pages/dashboard/issues/index.js
View file @
6e6bdb78
import
IssuableFilteredSearchTokenKeys
from
'
~/filtered_search/issuable_filtered_search_token_keys
'
;
import
initManualOrdering
from
'
~/manual_ordering
'
;
import
initManualOrdering
from
'
~/
issues/
manual_ordering
'
;
import
{
FILTERED_SEARCH
}
from
'
~/filtered_search/constants
'
;
import
initFilteredSearch
from
'
~/pages/search/init_filtered_search
'
;
import
projectSelect
from
'
~/project_select
'
;
...
...
app/assets/javascripts/pages/groups/issues/index.js
View file @
6e6bdb78
import
IssuableFilteredSearchTokenKeys
from
'
ee_else_ce/filtered_search/issuable_filtered_search_token_keys
'
;
import
issuableInitBulkUpdateSidebar
from
'
~/issuable/bulk_update_sidebar/issuable_init_bulk_update_sidebar
'
;
import
{
mountIssuablesListApp
,
mountIssuesListApp
}
from
'
~/issues_list
'
;
import
initManualOrdering
from
'
~/manual_ordering
'
;
import
initManualOrdering
from
'
~/
issues/
manual_ordering
'
;
import
{
FILTERED_SEARCH
}
from
'
~/filtered_search/constants
'
;
import
initFilteredSearch
from
'
~/pages/search/init_filtered_search
'
;
import
projectSelect
from
'
~/project_select
'
;
...
...
app/assets/javascripts/pages/projects/issues/form.js
View file @
6e6bdb78
...
...
@@ -8,7 +8,7 @@ import initSuggestions from '~/issues/suggestions';
import
initIssuableTypeSelector
from
'
~/issues/type_selector
'
;
import
LabelsSelect
from
'
~/labels/labels_select
'
;
import
MilestoneSelect
from
'
~/milestones/milestone_select
'
;
import
IssuableTemplateSelectors
from
'
~/
templates
/issuable_template_selectors
'
;
import
IssuableTemplateSelectors
from
'
~/
issuable
/issuable_template_selectors
'
;
export
default
()
=>
{
new
ShortcutsNavigation
();
...
...
app/assets/javascripts/pages/projects/issues/index/index.js
View file @
6e6bdb78
...
...
@@ -4,7 +4,7 @@ import initCsvImportExportButtons from '~/issuable/init_csv_import_export_button
import
initIssuableByEmail
from
'
~/issuable/init_issuable_by_email
'
;
import
IssuableIndex
from
'
~/issuable/issuable_index
'
;
import
{
mountIssuablesListApp
,
mountIssuesListApp
,
mountJiraIssuesListApp
}
from
'
~/issues_list
'
;
import
initManualOrdering
from
'
~/manual_ordering
'
;
import
initManualOrdering
from
'
~/
issues/
manual_ordering
'
;
import
{
FILTERED_SEARCH
}
from
'
~/filtered_search/constants
'
;
import
{
ISSUABLE_INDEX
}
from
'
~/issuable/constants
'
;
import
initFilteredSearch
from
'
~/pages/search/init_filtered_search
'
;
...
...
app/assets/javascripts/pages/projects/issues/show.js
View file @
6e6bdb78
...
...
@@ -2,7 +2,7 @@ import loadAwardsHandler from '~/awards_handler';
import
ShortcutsIssuable
from
'
~/behaviors/shortcuts/shortcuts_issuable
'
;
import
initIssuableSidebar
from
'
~/issuable/init_issuable_sidebar
'
;
import
{
IssuableType
}
from
'
~/vue_shared/issuable/show/constants
'
;
import
Issue
from
'
~/issue
'
;
import
Issue
from
'
~/issue
s/issue
'
;
import
{
initIncidentApp
,
initIncidentHeaderActions
}
from
'
~/issues/show/incident
'
;
import
{
initIssuableApp
,
initIssueHeaderActions
}
from
'
~/issues/show/issue
'
;
import
{
parseIssuableData
}
from
'
~/issues/show/utils/parse_data
'
;
...
...
app/assets/javascripts/pages/projects/merge_requests/init_merge_request.js
View file @
6e6bdb78
...
...
@@ -7,7 +7,7 @@ import Diff from '~/diff';
import
GLForm
from
'
~/gl_form
'
;
import
LabelsSelect
from
'
~/labels/labels_select
'
;
import
MilestoneSelect
from
'
~/milestones/milestone_select
'
;
import
IssuableTemplateSelectors
from
'
~/
templates
/issuable_template_selectors
'
;
import
IssuableTemplateSelectors
from
'
~/
issuable
/issuable_template_selectors
'
;
export
default
()
=>
{
new
Diff
();
...
...
spec/frontend/issue_spec.js
→
spec/frontend/issue
s/issue
_spec.js
View file @
6e6bdb78
import
{
getByText
}
from
'
@testing-library/dom
'
;
import
MockAdapter
from
'
axios-mock-adapter
'
;
import
{
EVENT_ISSUABLE_VUE_APP_CHANGE
}
from
'
~/issuable/constants
'
;
import
Issue
from
'
~/issue
'
;
import
Issue
from
'
~/issue
s/issue
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
describe
(
'
Issue
'
,
()
=>
{
...
...
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