summaryrefslogtreecommitdiff
path: root/config/webpack.config.js
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 'refactor-commit-show'refactor-commit-showPhil Hughes2018-02-271-4/+0
|\ | | | | | | # Conflicts: # config/webpack.config.js
| * Merge branch 'refactor-pipelines-list' into 'master'Phil Hughes2018-02-271-2/+0
| |\ | | | | | | | | | | | | Remove commit_pipelines webpack entry point See merge request gitlab-org/gitlab-ce!17379
| | * Merge branch 'master' into refactor-pipelines-listrefactor-pipelines-listClement Ho2018-02-261-8/+3
| | |\
| | * | Remove commit_pipelines webpack entry pointClement Ho2018-02-261-2/+0
| | | |
| * | | Merge branch 'master' into refactor-environments-folderrefactor-environments-folderClement Ho2018-02-261-8/+3
| |\ \ \ | | | |/ | | |/|
| * | | Remove environments folder webpack entry pointClement Ho2018-02-261-2/+0
| | |/ | |/|
* | | Merge branch 'master' into refactor-commit-showClement Ho2018-02-261-8/+3
|\ \ \ | | |/ | |/|
| * | Refactor wildcard dispatcher importsClement Ho2018-02-261-8/+2
| | |
| * | Move EE-specific JavaScript files to ee/app/assets/javascriptsRémy Coutable2018-02-261-0/+1
| |/
* | Remove diff notes webpack entry pointClement Ho2018-02-261-2/+0
|/
* Remove webpack bundle tags for blobJacob Schatz2018-02-261-1/+0
|
* Merge branch 'master' into 'boards-bundle-refactor'Jacob Schatz2018-02-231-15/+18
|\ | | | | | | # Conflicts: # config/webpack.config.js
| * Merge branch 'project-deploy-keys-bundle-tag-refactor' into 'master'Jacob Schatz2018-02-231-1/+0
| |\ | | | | | | | | | | | | Refactored webpack bundle tag for deploy keys See merge request gitlab-org/gitlab-ce!17324
| | * Refactored webpack bundle tag for deploy keysproject-deploy-keys-bundle-tag-refactorConstance Okoghenun2018-02-231-1/+0
| | |
| * | move webpack bundles we intend to keep below the list of bundles we're ↵reduce-webpack-merge-conflictsMike Greiling2018-02-231-8/+10
| | | | | | | | | | | | refactoring to reduce conflicts
| * | remove issue_show webpack bundle in favor of pages/projects/issues/show/index.jsremove-issues-showMike Greiling2018-02-231-2/+0
| |/
| * Backport of Webpack auto include for EE importsClement Ho2018-02-221-6/+8
| |
* | Resolved conflicts with masterConstance Okoghenun2018-02-211-22/+1
|\ \ | |/
| * Rest of Dispatcher RefactorJacob Schatz2018-02-211-2/+0
| |
| * #28481: Display time tracking totals on milestone pageRiccardo Padovani2018-02-211-1/+1
| |
| * Merge branch 'refactor-jobs-show-haml' into 'master'Jacob Schatz2018-02-201-2/+0
| |\ | | | | | | | | | | | | Add dispatcher imports for job details bundle See merge request gitlab-org/gitlab-ce!17157
| | * Merge branch 'master' into 'refactor-jobs-show-haml'Clement Ho2018-02-161-4/+0
| | |\ | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js
| | * | Add dispatcher imports for job details bundleClement Ho2018-02-151-3/+1
| | | |
| * | | Remove "notes" bundle from webpack configMike Greiling2018-02-201-2/+0
| | | |
| * | | Merge branch 'dispatcher-mr-haml' into 'master'Jacob Schatz2018-02-201-1/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Add dispatcher imports for bundles used in merge request show path See merge request gitlab-org/gitlab-ce!17163
| | * \ \ Merge branch 'master' into dispatcher-mr-hamlClement Ho2018-02-191-2/+2
| | |\ \ \
| | * \ \ \ Merge branch 'master' into dispatcher-mr-hamlClement Ho2018-02-161-4/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Add dispatcher imports for bundles used in merge request show pathClement Ho2018-02-151-2/+1
| | | |_|/ | | |/| |
| * | | | remove common_d3 bundleMike Greiling2018-02-191-12/+0
| | | | |
| * | | | remove graphs_show webpack bundleMike Greiling2018-02-191-2/+0
| | | | |
* | | | | Resolved conflicts with masterConstance Okoghenun2018-02-201-5/+2
|\ \ \ \ \ | |/ / / /
| * | | | Chart.html.haml refactorJacob Schatz2018-02-191-3/+0
| | |_|/ | |/| |
| * | | Backport webpack.config.js changes from EEee-webpack-backportPhil Hughes2018-02-161-2/+2
| | |/ | |/|
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Constance Okoghenun2018-02-161-8/+1
|\ \ \ | |/ / | | | | | | boards-bundle-refactor
| * | Merge branch 'prometheus-bundle-tag-refactor' into 'master'Phil Hughes2018-02-161-1/+0
| |\ \ | | | | | | | | | | | | | | | | Removed prometheus_metrics webpack bundle tag See merge request gitlab-org/gitlab-ce!17175
| | * | Removed prometheus_metrics webpack bundle tagprometheus-bundle-tag-refactorConstance Okoghenun2018-02-161-1/+0
| | | |
| * | | Merge branch 'pipeline-chart-bundle' into 'master'Filipa Lacerda2018-02-161-3/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | Updated pipelines charts to use dynamic webpack bundle See merge request gitlab-org/gitlab-ce!17153
| | * | Updated pipelines charts to use dynamic webpack bundlepipeline-chart-bundlePhil Hughes2018-02-151-3/+1
| | | | | | | | | | | | | | | | #41341
| * | | Remove Webpack bundle tag for users:showConstance Okoghenun2018-02-151-1/+0
| | |/ | |/|
| * | Merge branch 'project-integrations-form-dispatcher-refactor' into 'master'Fatih Acet2018-02-151-1/+0
| |\ \ | | |/ | |/| | | | | | | Removed integrations webpack bundle tag See merge request gitlab-org/gitlab-ce!17147
| | * Removed integrations webpack bundle tagproject-integrations-form-dispatcher-refactorConstance Okoghenun2018-02-151-1/+0
| | |
| * | Converted pipeline_schedules bundles into automatic webpack entriespipeline-schedule-webpackPhil Hughes2018-02-151-2/+0
| |/ | | | | | | #41341
* | Refactored use of boards/boards_bundle.js, created a dipatcher importConstance Okoghenun2018-02-151-1/+0
|/
* Addressed mr observationsjivl-update-katexJose Ivan Vargas2018-02-121-2/+0
|
* Merge branch 'master' into jivl-update-katexJose Ivan Vargas2018-02-051-11/+58
|\
| * prevent dynamic chunks from being duplicated by the dispatcher until it is ↵Mike Greiling2018-02-011-2/+13
| | | | | | | | completely refactored
| * generate webpack entry points for pages directory automaticallyMike Greiling2018-02-011-0/+12
| |
| * Merge branch 'groups-webpack-bundle' into 'master'Filipa Lacerda2018-01-241-3/+0
| |\ | | | | | | | | | | | | Added dispatcher imports for groups webpack bundle See merge request gitlab-org/gitlab-ce!16644
| | * Added dispatcher imports for groups webpack bundlePhil Hughes2018-01-231-5/+2
| | |
| * | correctly imports performance barPhil Hughes2018-01-241-3/+2
| |/