root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
69,647 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

300 Commits

Author SHA1 Message Date
Clement Ho 9167989f3e Merge branch 'master' into refactor-commit-show 2018-02-26 20:03:21 -06:00
Clement Ho 2400c7bf4c Remove diff notes webpack entry point 2018-02-26 16:00:52 -06:00
Clement Ho 7729a0ecc0 Refactor wildcard dispatcher imports 2018-02-26 20:01:05 +00:00
Rémy Coutable d434c62a83 Move EE-specific JavaScript files to ee/app/assets/javascripts 2018-02-26 19:43:34 +00:00
Jacob Schatz a061525407 Remove webpack bundle tags for blob 2018-02-26 17:27:42 +00:00
Jacob Schatz a90a22a774 Merge branch 'master' into 'boards-bundle-refactor' 
# Conflicts:
#   config/webpack.config.js
 2018-02-23 20:36:28 +00:00
Jacob Schatz 296a4e6825 Merge branch 'project-deploy-keys-bundle-tag-refactor' into 'master' 
Refactored webpack bundle tag for deploy keys

See merge request gitlab-org/gitlab-ce!17324
 2018-02-23 20:07:02 +00:00
Mike Greiling f5b8417faa
move webpack bundles we intend to keep below the list of bundles we're refactoring to reduce conflicts 2018-02-23 12:35:41 -06:00
Mike Greiling b817fb5cad
remove issue_show webpack bundle in favor of pages/projects/issues/show/index.js 2018-02-23 11:58:24 -06:00
Constance Okoghenun 544558b23a Refactored webpack bundle tag for deploy keys 2018-02-23 18:26:40 +01:00
Clement Ho bb5cf94afd Backport of Webpack auto include for EE imports 2018-02-22 13:15:15 +00:00
Constance Okoghenun 11c1fc1fae Resolved conflicts with master 2018-02-21 22:23:58 +01:00
Jacob Schatz bd8290d93e Rest of Dispatcher Refactor 2018-02-21 20:22:56 +00:00
Riccardo Padovani 99b96a7b5f #28481: Display time tracking totals on milestone page 2018-02-21 17:20:56 +00:00
Jacob Schatz ddf0d0c9d1 Merge branch 'refactor-jobs-show-haml' into 'master' 
Add dispatcher imports for job details bundle

See merge request gitlab-org/gitlab-ce!17157
 2018-02-20 21:30:11 +00:00
Constance Okoghenun 84016f8335 Resolved conflicts with master 2018-02-20 21:33:09 +01:00
Mike Greiling b48f7ec3b1 Remove "notes" bundle from webpack config 2018-02-20 20:01:18 +00:00
Jacob Schatz 520f407250 Merge branch 'dispatcher-mr-haml' into 'master' 
Add dispatcher imports for bundles used in merge request show path

See merge request gitlab-org/gitlab-ce!17163
 2018-02-20 19:51:42 +00:00
Mike Greiling 15a4773e06
remove common_d3 bundle 2018-02-19 16:56:23 -06:00
Mike Greiling fb38bc3fae
remove graphs_show webpack bundle 2018-02-19 16:56:10 -06:00
Jacob Schatz 834f455b43 Chart.html.haml refactor 2018-02-19 20:43:10 +00:00
Clement Ho 3b17bba14c Merge branch 'master' into dispatcher-mr-haml 2018-02-19 10:20:31 -06:00
Clement Ho 6b824cc2b0 Merge branch 'master' into 'refactor-jobs-show-haml' 
# Conflicts:
#   app/assets/javascripts/dispatcher.js
 2018-02-16 20:13:55 +00:00
Constance Okoghenun 6b63e11db6 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into boards-bundle-refactor 2018-02-16 19:26:01 +01:00
Phil Hughes 5bb6124ce7
Backport webpack.config.js changes from EE 2018-02-16 17:50:33 +00:00
Clement Ho 3f6d3dc11a Merge branch 'master' into dispatcher-mr-haml 2018-02-16 10:16:48 -06:00
Phil Hughes 0433ce3827 Merge branch 'prometheus-bundle-tag-refactor' into 'master' 
Removed prometheus_metrics webpack bundle tag

See merge request gitlab-org/gitlab-ce!17175
 2018-02-16 14:39:14 +00:00
Constance Okoghenun 523f1f7cf4 Removed prometheus_metrics webpack bundle tag 2018-02-16 12:38:50 +01:00
Filipa Lacerda e5ecd9b196 Merge branch 'pipeline-chart-bundle' into 'master' 
Updated pipelines charts to use dynamic webpack bundle

See merge request gitlab-org/gitlab-ce!17153
 2018-02-16 11:08:07 +00:00
Constance Okoghenun a68a2306e4 Remove Webpack bundle tag for users:show 2018-02-15 23:07:04 +00:00
Clement Ho 1c2d283d50 Add dispatcher imports for bundles used in merge request show path 2018-02-15 16:50:20 -06:00
Clement Ho 27a6d65c61 Add dispatcher imports for job details bundle 2018-02-15 13:44:55 -06:00
Fatih Acet efdde042a3 Merge branch 'project-integrations-form-dispatcher-refactor' into 'master' 
Removed integrations webpack bundle tag

See merge request gitlab-org/gitlab-ce!17147
 2018-02-15 18:23:16 +00:00
Phil Hughes c312d2b9ff
Updated pipelines charts to use dynamic webpack bundle 
#41341
 2018-02-15 16:26:44 +00:00
Constance Okoghenun c16e6d591f Removed integrations webpack bundle tag 2018-02-15 13:12:47 +01:00
Constance Okoghenun 0af391d2f4 Refactored use of boards/boards_bundle.js, created a dipatcher import 2018-02-15 12:26:38 +01:00
Phil Hughes 91b2182bc0
Converted pipeline_schedules bundles into automatic webpack entries 
#41341
 2018-02-15 09:15:57 +00:00
Jose Ivan Vargas 954bfb5db5 Addressed mr observations 2018-02-12 15:59:32 -06:00
Jose Ivan Vargas 46ae03628d Merge branch 'master' into jivl-update-katex 2018-02-05 15:16:41 -06:00
Mike Greiling 8ebe2f7ae6
prevent dynamic chunks from being duplicated by the dispatcher until it is completely refactored 2018-02-01 20:50:16 -06:00
Mike Greiling 900124810c
generate webpack entry points for pages directory automatically 2018-02-01 14:28:36 -06:00
Filipa Lacerda 09da89e634 Merge branch 'groups-webpack-bundle' into 'master' 
Added dispatcher imports for groups webpack bundle

See merge request gitlab-org/gitlab-ce!16644
 2018-01-24 12:11:28 +00:00
Phil Hughes aaf03c0c48
correctly imports performance bar 2018-01-24 08:45:07 +00:00
Phil Hughes bba9e7275c
Added dispatcher imports for groups webpack bundle 2018-01-23 10:02:43 +00:00
Tim Zallmann e79db43d2c WebIDE: Fix Commit bugs 2018-01-19 09:38:34 +00:00
Phil Hughes b69d7ac3c9
Added dispatcher imports for some project routes 2018-01-16 16:45:33 +00:00
Winnie Hellmann 6d1548f869 Fix Webpack config for ConcatenatedModule 2018-01-04 22:22:01 +01:00
Winnie Hellmann 46464e5fa3 Make webpack fail for missing exports 2017-12-22 11:10:22 +00:00
Jacob Schatz baa6438b96 Merge branch 'diff-worker-js-fix' into 'master' 
Fixed diff_worker not compiling correctly

Closes #41182

See merge request gitlab-org/gitlab-ce!15966
 2017-12-21 18:27:56 +00:00
Jose Ivan Vargas 2f0335e197 Removed the remains of katex from vendor assets and load everything via webpack 2017-12-21 12:08:32 -06:00