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
91b2182b
Commit
91b2182b
authored
6 years ago
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Converted pipeline_schedules bundles into automatic webpack entries
#41341
parent
02d9f54f
Changes
16
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
21 additions
and
19 deletions
+21
-19
app/assets/javascripts/pages/projects/pipeline_schedules/create/index.js
...scripts/pages/projects/pipeline_schedules/create/index.js
+3
-0
app/assets/javascripts/pages/projects/pipeline_schedules/edit/index.js
...vascripts/pages/projects/pipeline_schedules/edit/index.js
+3
-0
app/assets/javascripts/pages/projects/pipeline_schedules/index/index.js
...ascripts/pages/projects/pipeline_schedules/index/index.js
+1
-1
app/assets/javascripts/pages/projects/pipeline_schedules/new/index.js
...avascripts/pages/projects/pipeline_schedules/new/index.js
+3
-0
app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue
...ne_schedules/shared/components/interval_pattern_input.vue
+0
-0
app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/pipeline_schedules_callout.vue
...chedules/shared/components/pipeline_schedules_callout.vue
+1
-1
app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/target_branch_dropdown.js
...ine_schedules/shared/components/target_branch_dropdown.js
+0
-0
app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/timezone_dropdown.js
...pipeline_schedules/shared/components/timezone_dropdown.js
+0
-0
app/assets/javascripts/pages/projects/pipeline_schedules/shared/icons/intro_illustration.svg
...ts/pipeline_schedules/shared/icons/intro_illustration.svg
+0
-0
app/assets/javascripts/pages/projects/pipeline_schedules/shared/init_form.js
...pts/pages/projects/pipeline_schedules/shared/init_form.js
+5
-5
app/assets/javascripts/pages/projects/pipeline_schedules/update/index.js
...scripts/pages/projects/pipeline_schedules/update/index.js
+3
-0
app/views/projects/pipeline_schedules/_form.html.haml
app/views/projects/pipeline_schedules/_form.html.haml
+0
-4
app/views/projects/pipeline_schedules/index.html.haml
app/views/projects/pipeline_schedules/index.html.haml
+0
-4
config/webpack.config.js
config/webpack.config.js
+0
-2
spec/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input_spec.js
...chedules/shared/components/interval_pattern_input_spec.js
+1
-1
spec/javascripts/pages/projects/pipeline_schedules/shared/components/pipeline_schedule_callout_spec.js
...dules/shared/components/pipeline_schedule_callout_spec.js
+1
-1
No files found.
app/assets/javascripts/pages/projects/pipeline_schedules/create/index.js
0 → 100644
View file @
91b2182b
import
initForm
from
'
../shared/init_form
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
initForm
);
This diff is collapsed.
Click to expand it.
app/assets/javascripts/pages/projects/pipeline_schedules/edit/index.js
0 → 100644
View file @
91b2182b
import
initForm
from
'
../shared/init_form
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
initForm
);
This diff is collapsed.
Click to expand it.
app/assets/javascripts/p
ipeline_schedules/pipeline_schedules_index_bundle
.js
→
app/assets/javascripts/p
ages/projects/pipeline_schedules/index/index
.js
View file @
91b2182b
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
PipelineSchedulesCallout
from
'
./components/pipeline_schedules_callout.vue
'
;
import
PipelineSchedulesCallout
from
'
.
./shared
/components/pipeline_schedules_callout.vue
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
new
Vue
({
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
new
Vue
({
el
:
'
#pipeline-schedules-callout
'
,
el
:
'
#pipeline-schedules-callout
'
,
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/pages/projects/pipeline_schedules/new/index.js
0 → 100644
View file @
91b2182b
import
initForm
from
'
../shared/init_form
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
initForm
);
This diff is collapsed.
Click to expand it.
app/assets/javascripts/p
ipeline_schedules
/components/interval_pattern_input.vue
→
app/assets/javascripts/p
ages/projects/pipeline_schedules/shared
/components/interval_pattern_input.vue
View file @
91b2182b
File moved
This diff is collapsed.
Click to expand it.
app/assets/javascripts/p
ipeline_schedules
/components/pipeline_schedules_callout.vue
→
app/assets/javascripts/p
ages/projects/pipeline_schedules/shared
/components/pipeline_schedules_callout.vue
View file @
91b2182b
<
script
>
<
script
>
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
Cookies
from
'
js-cookie
'
;
import
Cookies
from
'
js-cookie
'
;
import
Translate
from
'
../../vue_shared/translate
'
;
import
Translate
from
'
../../
../../../
vue_shared/translate
'
;
import
illustrationSvg
from
'
../icons/intro_illustration.svg
'
;
import
illustrationSvg
from
'
../icons/intro_illustration.svg
'
;
Vue
.
use
(
Translate
);
Vue
.
use
(
Translate
);
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/p
ipeline_schedules
/components/target_branch_dropdown.js
→
app/assets/javascripts/p
ages/projects/pipeline_schedules/shared
/components/target_branch_dropdown.js
View file @
91b2182b
File moved
This diff is collapsed.
Click to expand it.
app/assets/javascripts/p
ipeline_schedules
/components/timezone_dropdown.js
→
app/assets/javascripts/p
ages/projects/pipeline_schedules/shared
/components/timezone_dropdown.js
View file @
91b2182b
File moved
This diff is collapsed.
Click to expand it.
app/assets/javascripts/p
ipeline_schedules
/icons/intro_illustration.svg
→
app/assets/javascripts/p
ages/projects/pipeline_schedules/shared
/icons/intro_illustration.svg
View file @
91b2182b
File moved
This diff is collapsed.
Click to expand it.
app/assets/javascripts/p
ipeline_schedules/pipeline_schedule_form_bundle
.js
→
app/assets/javascripts/p
ages/projects/pipeline_schedules/shared/init_form
.js
View file @
91b2182b
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
Translate
from
'
../vue_shared/translate
'
;
import
Translate
from
'
../
../../../
vue_shared/translate
'
;
import
GlFieldErrors
from
'
../gl_field_errors
'
;
import
GlFieldErrors
from
'
../
../../../
gl_field_errors
'
;
import
intervalPatternInput
from
'
./components/interval_pattern_input.vue
'
;
import
intervalPatternInput
from
'
./components/interval_pattern_input.vue
'
;
import
TimezoneDropdown
from
'
./components/timezone_dropdown
'
;
import
TimezoneDropdown
from
'
./components/timezone_dropdown
'
;
import
TargetBranchDropdown
from
'
./components/target_branch_dropdown
'
;
import
TargetBranchDropdown
from
'
./components/target_branch_dropdown
'
;
import
setupNativeFormVariableList
from
'
../ci_variable_list/native_form_variable_list
'
;
import
setupNativeFormVariableList
from
'
../
../../../
ci_variable_list/native_form_variable_list
'
;
Vue
.
use
(
Translate
);
Vue
.
use
(
Translate
);
...
@@ -27,7 +27,7 @@ function initIntervalPatternInput() {
...
@@ -27,7 +27,7 @@ function initIntervalPatternInput() {
});
});
}
}
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
export
default
()
=>
{
/* Most of the form is written in haml, but for fields with more complex behaviors,
/* Most of the form is written in haml, but for fields with more complex behaviors,
* you should mount individual Vue components here. If at some point components need
* you should mount individual Vue components here. If at some point components need
* to share state, it may make sense to refactor the whole form to Vue */
* to share state, it may make sense to refactor the whole form to Vue */
...
@@ -46,4 +46,4 @@ document.addEventListener('DOMContentLoaded', () => {
...
@@ -46,4 +46,4 @@ document.addEventListener('DOMContentLoaded', () => {
container
:
$
(
'
.js-ci-variable-list-section
'
),
container
:
$
(
'
.js-ci-variable-list-section
'
),
formField
:
'
schedule
'
,
formField
:
'
schedule
'
,
});
});
}
)
;
};
This diff is collapsed.
Click to expand it.
app/assets/javascripts/pages/projects/pipeline_schedules/update/index.js
0 → 100644
View file @
91b2182b
import
initForm
from
'
../shared/init_form
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
initForm
);
This diff is collapsed.
Click to expand it.
app/views/projects/pipeline_schedules/_form.html.haml
View file @
91b2182b
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
'common_vue'
=
webpack_bundle_tag
'schedule_form'
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@schedule
],
as: :schedule
,
html:
{
id:
"new-pipeline-schedule-form"
,
class:
"form-horizontal js-pipeline-schedule-form"
}
do
|
f
|
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@schedule
],
as: :schedule
,
html:
{
id:
"new-pipeline-schedule-form"
,
class:
"form-horizontal js-pipeline-schedule-form"
}
do
|
f
|
=
form_errors
(
@schedule
)
=
form_errors
(
@schedule
)
.form-group
.form-group
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/pipeline_schedules/index.html.haml
View file @
91b2182b
-
breadcrumb_title
_
(
"Schedules"
)
-
breadcrumb_title
_
(
"Schedules"
)
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
'common_vue'
=
webpack_bundle_tag
'schedules_index'
-
@no_container
=
true
-
@no_container
=
true
-
page_title
_
(
"Pipeline Schedules"
)
-
page_title
_
(
"Pipeline Schedules"
)
...
...
This diff is collapsed.
Click to expand it.
config/webpack.config.js
View file @
91b2182b
...
@@ -90,8 +90,6 @@ var config = {
...
@@ -90,8 +90,6 @@ var config = {
registry_list
:
'
./registry/index.js
'
,
registry_list
:
'
./registry/index.js
'
,
ide
:
'
./ide/index.js
'
,
ide
:
'
./ide/index.js
'
,
sidebar
:
'
./sidebar/sidebar_bundle.js
'
,
sidebar
:
'
./sidebar/sidebar_bundle.js
'
,
schedule_form
:
'
./pipeline_schedules/pipeline_schedule_form_bundle.js
'
,
schedules_index
:
'
./pipeline_schedules/pipeline_schedules_index_bundle.js
'
,
snippet
:
'
./snippet/snippet_bundle.js
'
,
snippet
:
'
./snippet/snippet_bundle.js
'
,
sketch_viewer
:
'
./blob/sketch_viewer.js
'
,
sketch_viewer
:
'
./blob/sketch_viewer.js
'
,
stl_viewer
:
'
./blob/stl_viewer.js
'
,
stl_viewer
:
'
./blob/stl_viewer.js
'
,
...
...
This diff is collapsed.
Click to expand it.
spec/javascripts/p
ipeline_schedule
s/interval_pattern_input_spec.js
→
spec/javascripts/p
ages/projects/pipeline_schedules/shared/component
s/interval_pattern_input_spec.js
View file @
91b2182b
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
Translate
from
'
~/vue_shared/translate
'
;
import
Translate
from
'
~/vue_shared/translate
'
;
import
IntervalPatternInput
from
'
~/p
ipeline_schedules
/components/interval_pattern_input.vue
'
;
import
IntervalPatternInput
from
'
~/p
ages/projects/pipeline_schedules/shared
/components/interval_pattern_input.vue
'
;
Vue
.
use
(
Translate
);
Vue
.
use
(
Translate
);
...
...
This diff is collapsed.
Click to expand it.
spec/javascripts/p
ipeline_schedule
s/pipeline_schedule_callout_spec.js
→
spec/javascripts/p
ages/projects/pipeline_schedules/shared/component
s/pipeline_schedule_callout_spec.js
View file @
91b2182b
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
Cookies
from
'
js-cookie
'
;
import
Cookies
from
'
js-cookie
'
;
import
PipelineSchedulesCallout
from
'
~/p
ipeline_schedules
/components/pipeline_schedules_callout.vue
'
;
import
PipelineSchedulesCallout
from
'
~/p
ages/projects/pipeline_schedules/shared
/components/pipeline_schedules_callout.vue
'
;
const
PipelineSchedulesCalloutComponent
=
Vue
.
extend
(
PipelineSchedulesCallout
);
const
PipelineSchedulesCalloutComponent
=
Vue
.
extend
(
PipelineSchedulesCallout
);
const
cookieKey
=
'
pipeline_schedules_callout_dismissed
'
;
const
cookieKey
=
'
pipeline_schedules_callout_dismissed
'
;
...
...
This diff is collapsed.
Click to expand it.
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