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
b87a5107
Commit
b87a5107
authored
Dec 01, 2021
by
Coung Ngo
Committed by
Miguel Rincon
Dec 01, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move JS milestones code to ~/milestones [RUN ALL RSPEC] [RUN AS-IF-FOSS]
parent
f64c4df1
Changes
23
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
30 additions
and
33 deletions
+30
-33
app/assets/javascripts/issuable_bulk_update_sidebar/issuable_bulk_update_sidebar.js
...uable_bulk_update_sidebar/issuable_bulk_update_sidebar.js
+1
-1
app/assets/javascripts/milestones/components/delete_milestone_modal.vue
...ascripts/milestones/components/delete_milestone_modal.vue
+0
-0
app/assets/javascripts/milestones/components/promote_milestone_modal.vue
...scripts/milestones/components/promote_milestone_modal.vue
+0
-0
app/assets/javascripts/milestones/delete_milestone_modal_init.js
...ets/javascripts/milestones/delete_milestone_modal_init.js
+0
-0
app/assets/javascripts/milestones/event_hub.js
app/assets/javascripts/milestones/event_hub.js
+0
-0
app/assets/javascripts/milestones/form.js
app/assets/javascripts/milestones/form.js
+2
-2
app/assets/javascripts/milestones/init_milestones_show.js
app/assets/javascripts/milestones/init_milestones_show.js
+1
-1
app/assets/javascripts/milestones/milestone.js
app/assets/javascripts/milestones/milestone.js
+3
-3
app/assets/javascripts/milestones/milestone_select.js
app/assets/javascripts/milestones/milestone_select.js
+2
-2
app/assets/javascripts/milestones/promote_milestone_modal_init.js
...ts/javascripts/milestones/promote_milestone_modal_init.js
+0
-0
app/assets/javascripts/pages/dashboard/milestones/show/index.js
...sets/javascripts/pages/dashboard/milestones/show/index.js
+1
-1
app/assets/javascripts/pages/groups/milestones/edit/index.js
app/assets/javascripts/pages/groups/milestones/edit/index.js
+1
-1
app/assets/javascripts/pages/groups/milestones/new/index.js
app/assets/javascripts/pages/groups/milestones/new/index.js
+1
-1
app/assets/javascripts/pages/groups/milestones/show/index.js
app/assets/javascripts/pages/groups/milestones/show/index.js
+2
-2
app/assets/javascripts/pages/milestones/shared/index.js
app/assets/javascripts/pages/milestones/shared/index.js
+0
-7
app/assets/javascripts/pages/projects/issues/form.js
app/assets/javascripts/pages/projects/issues/form.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
app/assets/javascripts/pages/projects/milestones/edit/index.js
...ssets/javascripts/pages/projects/milestones/edit/index.js
+1
-1
app/assets/javascripts/pages/projects/milestones/index/index.js
...sets/javascripts/pages/projects/milestones/index/index.js
+4
-2
app/assets/javascripts/pages/projects/milestones/new/index.js
...assets/javascripts/pages/projects/milestones/new/index.js
+1
-1
app/assets/javascripts/pages/projects/milestones/show/index.js
...ssets/javascripts/pages/projects/milestones/show/index.js
+5
-3
spec/frontend/milestones/components/delete_milestone_modal_spec.js
...tend/milestones/components/delete_milestone_modal_spec.js
+2
-2
spec/frontend/milestones/components/promote_milestone_modal_spec.js
...end/milestones/components/promote_milestone_modal_spec.js
+1
-1
No files found.
app/assets/javascripts/issuable_bulk_update_sidebar/issuable_bulk_update_sidebar.js
View file @
b87a5107
...
...
@@ -5,7 +5,7 @@ import { property } from 'lodash';
import
issueableEventHub
from
'
~/issues_list/eventhub
'
;
import
LabelsSelect
from
'
~/labels_select
'
;
import
MilestoneSelect
from
'
~/milestone_select
'
;
import
MilestoneSelect
from
'
~/milestone
s/milestone
_select
'
;
import
initIssueStatusSelect
from
'
./init_issue_status_select
'
;
import
IssuableBulkUpdateActions
from
'
./issuable_bulk_update_actions
'
;
import
subscriptionSelect
from
'
./subscription_select
'
;
...
...
app/assets/javascripts/
pages/milestones/shared
/components/delete_milestone_modal.vue
→
app/assets/javascripts/
milestones
/components/delete_milestone_modal.vue
View file @
b87a5107
File moved
app/assets/javascripts/
pages/milestones/shared
/components/promote_milestone_modal.vue
→
app/assets/javascripts/
milestones
/components/promote_milestone_modal.vue
View file @
b87a5107
File moved
app/assets/javascripts/
pages/milestones/shared
/delete_milestone_modal_init.js
→
app/assets/javascripts/
milestones
/delete_milestone_modal_init.js
View file @
b87a5107
File moved
app/assets/javascripts/
pages/milestones/shared
/event_hub.js
→
app/assets/javascripts/
milestones
/event_hub.js
View file @
b87a5107
File moved
app/assets/javascripts/
shared/
milestones/form.js
→
app/assets/javascripts/milestones/form.js
View file @
b87a5107
import
$
from
'
jquery
'
;
import
initDatePicker
from
'
~/behaviors/date_picker
'
;
import
GLForm
from
'
../..
/gl_form
'
;
import
ZenMode
from
'
../..
/zen_mode
'
;
import
GLForm
from
'
~
/gl_form
'
;
import
ZenMode
from
'
~
/zen_mode
'
;
export
default
(
initGFM
=
true
)
=>
{
new
ZenMode
();
// eslint-disable-line no-new
...
...
app/assets/javascripts/
pages/milestones/shared
/init_milestones_show.js
→
app/assets/javascripts/
milestones
/init_milestones_show.js
View file @
b87a5107
/* eslint-disable no-new */
import
Milestone
from
'
~/milestone
'
;
import
Milestone
from
'
~/milestone
s/milestone
'
;
import
Sidebar
from
'
~/right_sidebar
'
;
import
MountMilestoneSidebar
from
'
~/sidebar/mount_milestone_sidebar
'
;
...
...
app/assets/javascripts/milestone.js
→
app/assets/javascripts/milestone
s/milestone
.js
View file @
b87a5107
import
$
from
'
jquery
'
;
import
createFlash
from
'
.
/flash
'
;
import
axios
from
'
.
/lib/utils/axios_utils
'
;
import
{
__
}
from
'
.
/locale
'
;
import
createFlash
from
'
~
/flash
'
;
import
axios
from
'
~
/lib/utils/axios_utils
'
;
import
{
__
}
from
'
~
/locale
'
;
export
default
class
Milestone
{
constructor
()
{
...
...
app/assets/javascripts/milestone_select.js
→
app/assets/javascripts/milestone
s/milestone
_select.js
View file @
b87a5107
...
...
@@ -7,8 +7,8 @@ import Api from '~/api';
import
initDeprecatedJQueryDropdown
from
'
~/deprecated_jquery_dropdown
'
;
import
{
__
,
sprintf
}
from
'
~/locale
'
;
import
{
sortMilestonesByDueDate
}
from
'
~/milestones/milestone_utils
'
;
import
axios
from
'
.
/lib/utils/axios_utils
'
;
import
{
timeFor
,
parsePikadayDate
,
dateInWords
}
from
'
.
/lib/utils/datetime_utility
'
;
import
axios
from
'
~
/lib/utils/axios_utils
'
;
import
{
timeFor
,
parsePikadayDate
,
dateInWords
}
from
'
~
/lib/utils/datetime_utility
'
;
export
default
class
MilestoneSelect
{
constructor
(
currentProject
,
els
,
options
=
{})
{
...
...
app/assets/javascripts/
pages/milestones/shared
/promote_milestone_modal_init.js
→
app/assets/javascripts/
milestones
/promote_milestone_modal_init.js
View file @
b87a5107
File moved
app/assets/javascripts/pages/dashboard/milestones/show/index.js
View file @
b87a5107
import
Milestone
from
'
~/milestone
'
;
import
Milestone
from
'
~/milestone
s/milestone
'
;
import
Sidebar
from
'
~/right_sidebar
'
;
import
MountMilestoneSidebar
from
'
~/sidebar/mount_milestone_sidebar
'
;
...
...
app/assets/javascripts/pages/groups/milestones/edit/index.js
View file @
b87a5107
import
initForm
from
'
~/
shared/
milestones/form
'
;
import
initForm
from
'
~/milestones/form
'
;
initForm
();
app/assets/javascripts/pages/groups/milestones/new/index.js
View file @
b87a5107
import
initForm
from
'
~/
shared/
milestones/form
'
;
import
initForm
from
'
~/milestones/form
'
;
initForm
();
app/assets/javascripts/pages/groups/milestones/show/index.js
View file @
b87a5107
import
initDeleteMilestoneModal
from
'
~/
pages/milestones/shared
/delete_milestone_modal_init
'
;
import
initMilestonesShow
from
'
~/
pages/milestones/shared
/init_milestones_show
'
;
import
initDeleteMilestoneModal
from
'
~/
milestones
/delete_milestone_modal_init
'
;
import
initMilestonesShow
from
'
~/
milestones
/init_milestones_show
'
;
initMilestonesShow
();
initDeleteMilestoneModal
();
app/assets/javascripts/pages/milestones/shared/index.js
deleted
100644 → 0
View file @
f64c4df1
import
initDeleteMilestoneModal
from
'
./delete_milestone_modal_init
'
;
import
initPromoteMilestoneModal
from
'
./promote_milestone_modal_init
'
;
export
default
()
=>
{
initDeleteMilestoneModal
();
initPromoteMilestoneModal
();
};
app/assets/javascripts/pages/projects/issues/form.js
View file @
b87a5107
...
...
@@ -7,7 +7,7 @@ import GLForm from '~/gl_form';
import
initSuggestions
from
'
~/issuable_suggestions
'
;
import
initIssuableTypeSelector
from
'
~/issuable_type_selector
'
;
import
LabelsSelect
from
'
~/labels_select
'
;
import
MilestoneSelect
from
'
~/milestone_select
'
;
import
MilestoneSelect
from
'
~/milestone
s/milestone
_select
'
;
import
IssuableTemplateSelectors
from
'
~/templates/issuable_template_selectors
'
;
export
default
()
=>
{
...
...
app/assets/javascripts/pages/projects/merge_requests/init_merge_request.js
View file @
b87a5107
...
...
@@ -6,7 +6,7 @@ import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation';
import
Diff
from
'
~/diff
'
;
import
GLForm
from
'
~/gl_form
'
;
import
LabelsSelect
from
'
~/labels_select
'
;
import
MilestoneSelect
from
'
~/milestone_select
'
;
import
MilestoneSelect
from
'
~/milestone
s/milestone
_select
'
;
import
IssuableTemplateSelectors
from
'
~/templates/issuable_template_selectors
'
;
export
default
()
=>
{
...
...
app/assets/javascripts/pages/projects/milestones/edit/index.js
View file @
b87a5107
import
initForm
from
'
~/
shared/
milestones/form
'
;
import
initForm
from
'
~/milestones/form
'
;
initForm
();
app/assets/javascripts/pages/projects/milestones/index/index.js
View file @
b87a5107
import
milestones
from
'
~/pages/milestones/shared
'
;
import
initDeleteMilestoneModal
from
'
~/milestones/delete_milestone_modal_init
'
;
import
initPromoteMilestoneModal
from
'
~/milestones/promote_milestone_modal_init
'
;
milestones
();
initDeleteMilestoneModal
();
initPromoteMilestoneModal
();
app/assets/javascripts/pages/projects/milestones/new/index.js
View file @
b87a5107
import
initForm
from
'
~/
shared/
milestones/form
'
;
import
initForm
from
'
~/milestones/form
'
;
initForm
();
app/assets/javascripts/pages/projects/milestones/show/index.js
View file @
b87a5107
import
milestones
from
'
~/pages/milestones/shared
'
;
import
initMilestonesShow
from
'
~/pages/milestones/shared/init_milestones_show
'
;
import
initMilestonesShow
from
'
~/milestones/init_milestones_show
'
;
import
initDeleteMilestoneModal
from
'
~/milestones/delete_milestone_modal_init
'
;
import
initPromoteMilestoneModal
from
'
~/milestones/promote_milestone_modal_init
'
;
initMilestonesShow
();
milestones
();
initDeleteMilestoneModal
();
initPromoteMilestoneModal
();
spec/frontend/
pages/milestones/shared
/components/delete_milestone_modal_spec.js
→
spec/frontend/
milestones
/components/delete_milestone_modal_spec.js
View file @
b87a5107
...
...
@@ -3,8 +3,8 @@ import { TEST_HOST } from 'helpers/test_constants';
import
mountComponent
from
'
helpers/vue_mount_component_helper
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
{
redirectTo
}
from
'
~/lib/utils/url_utility
'
;
import
deleteMilestoneModal
from
'
~/
pages/milestones/shared
/components/delete_milestone_modal.vue
'
;
import
eventHub
from
'
~/
pages/milestones/shared
/event_hub
'
;
import
deleteMilestoneModal
from
'
~/
milestones
/components/delete_milestone_modal.vue
'
;
import
eventHub
from
'
~/
milestones
/event_hub
'
;
jest
.
mock
(
'
~/lib/utils/url_utility
'
,
()
=>
({
...
jest
.
requireActual
(
'
~/lib/utils/url_utility
'
),
...
...
spec/frontend/
pages/milestones/shared
/components/promote_milestone_modal_spec.js
→
spec/frontend/
milestones
/components/promote_milestone_modal_spec.js
View file @
b87a5107
...
...
@@ -6,7 +6,7 @@ import waitForPromises from 'helpers/wait_for_promises';
import
createFlash
from
'
~/flash
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
*
as
urlUtils
from
'
~/lib/utils/url_utility
'
;
import
PromoteMilestoneModal
from
'
~/
pages/milestones/shared
/components/promote_milestone_modal.vue
'
;
import
PromoteMilestoneModal
from
'
~/
milestones
/components/promote_milestone_modal.vue
'
;
jest
.
mock
(
'
~/lib/utils/url_utility
'
);
jest
.
mock
(
'
~/flash
'
);
...
...
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