Advertisement
stronk7

Untitled

Dec 18th, 2019
168
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 9.36 KB | None | 0 0
  1. $ git checkout master && git fetch git://github.com/andrewnicols/moodle.git MDL-67449-master && git merge --no-ff FETCH_HEAD
  2. Already on 'master'
  3. Your branch is up to date with 'origin/master'.
  4. From git://github.com/andrewnicols/moodle
  5. * branch MDL-67449-master -> FETCH_HEAD
  6. Merge made by the 'recursive' strategy.
  7. Gruntfile.js | 306 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------
  8. GruntfileComponents.js | 168 ++++++++++++++++++++++++++++++++++++++++++++++++
  9. babel-plugin-add-module-to-define.js | 67 ++-----------------
  10. 3 files changed, 402 insertions(+), 139 deletions(-)
  11. create mode 100644 GruntfileComponents.js
  12.  
  13.  
  14.  
  15.  
  16. $ git grunt amd
  17. Running "eslint:amd" (eslint) task
  18.  
  19. Running "babel:dist" (babel) task
  20. Browserslist: caniuse-lite is outdated. Please run next command `npm update`
  21.  
  22. Done.
  23.  
  24.  
  25.  
  26. $ git status
  27. On branch master
  28. Your branch is ahead of 'origin/master' by 2 commits.
  29. (use "git push" to publish your local commits)
  30.  
  31. Changes not staged for commit:
  32. (use "git add/rm <file>..." to update what will be committed)
  33. (use "git restore <file>..." to discard changes in working directory)
  34. deleted: lib/amd/build/adapter.min.js
  35. deleted: lib/amd/build/adapter.min.js.map
  36. deleted: lib/amd/build/addblockmodal.min.js
  37. deleted: lib/amd/build/addblockmodal.min.js.map
  38. deleted: lib/amd/build/ajax.min.js
  39. deleted: lib/amd/build/ajax.min.js.map
  40. deleted: lib/amd/build/auto_rows.min.js
  41. deleted: lib/amd/build/auto_rows.min.js.map
  42. deleted: lib/amd/build/autoscroll.min.js
  43. deleted: lib/amd/build/autoscroll.min.js.map
  44. deleted: lib/amd/build/backoff_timer.min.js
  45. deleted: lib/amd/build/backoff_timer.min.js.map
  46. deleted: lib/amd/build/chart_axis.min.js
  47. deleted: lib/amd/build/chart_axis.min.js.map
  48. deleted: lib/amd/build/chart_bar.min.js
  49. deleted: lib/amd/build/chart_bar.min.js.map
  50. deleted: lib/amd/build/chart_base.min.js
  51. deleted: lib/amd/build/chart_base.min.js.map
  52. deleted: lib/amd/build/chart_builder.min.js
  53. deleted: lib/amd/build/chart_builder.min.js.map
  54. deleted: lib/amd/build/chart_line.min.js
  55. deleted: lib/amd/build/chart_line.min.js.map
  56. deleted: lib/amd/build/chart_output.min.js
  57. deleted: lib/amd/build/chart_output.min.js.map
  58. deleted: lib/amd/build/chart_output_base.min.js
  59. deleted: lib/amd/build/chart_output_base.min.js.map
  60. deleted: lib/amd/build/chart_output_chartjs.min.js
  61. deleted: lib/amd/build/chart_output_chartjs.min.js.map
  62. deleted: lib/amd/build/chart_output_htmltable.min.js
  63. deleted: lib/amd/build/chart_output_htmltable.min.js.map
  64. deleted: lib/amd/build/chart_pie.min.js
  65. deleted: lib/amd/build/chart_pie.min.js.map
  66. deleted: lib/amd/build/chart_series.min.js
  67. deleted: lib/amd/build/chart_series.min.js.map
  68. deleted: lib/amd/build/chartjs-lazy.min.js
  69. deleted: lib/amd/build/chartjs-lazy.min.js.map
  70. deleted: lib/amd/build/chartjs.min.js
  71. deleted: lib/amd/build/chartjs.min.js.map
  72. deleted: lib/amd/build/checkbox-toggleall.min.js
  73. deleted: lib/amd/build/checkbox-toggleall.min.js.map
  74. deleted: lib/amd/build/config.min.js
  75. deleted: lib/amd/build/config.min.js.map
  76. deleted: lib/amd/build/custom_interaction_events.min.js
  77. deleted: lib/amd/build/custom_interaction_events.min.js.map
  78. deleted: lib/amd/build/dragdrop.min.js
  79. deleted: lib/amd/build/dragdrop.min.js.map
  80. deleted: lib/amd/build/drawer.min.js
  81. deleted: lib/amd/build/drawer.min.js.map
  82. deleted: lib/amd/build/drawer_events.min.js
  83. deleted: lib/amd/build/drawer_events.min.js.map
  84. deleted: lib/amd/build/emoji/auto_complete.min.js
  85. deleted: lib/amd/build/emoji/auto_complete.min.js.map
  86. deleted: lib/amd/build/emoji/data.min.js
  87. deleted: lib/amd/build/emoji/data.min.js.map
  88. deleted: lib/amd/build/emoji/picker.min.js
  89. deleted: lib/amd/build/emoji/picker.min.js.map
  90. deleted: lib/amd/build/event.min.js
  91. deleted: lib/amd/build/event.min.js.map
  92. deleted: lib/amd/build/first.min.js
  93. deleted: lib/amd/build/first.min.js.map
  94. deleted: lib/amd/build/form-autocomplete.min.js
  95. deleted: lib/amd/build/form-autocomplete.min.js.map
  96. deleted: lib/amd/build/form-cohort-selector.min.js
  97. deleted: lib/amd/build/form-cohort-selector.min.js.map
  98. deleted: lib/amd/build/form-course-selector.min.js
  99. deleted: lib/amd/build/form-course-selector.min.js.map
  100. deleted: lib/amd/build/fragment.min.js
  101. deleted: lib/amd/build/fragment.min.js.map
  102. deleted: lib/amd/build/icon_system.min.js
  103. deleted: lib/amd/build/icon_system.min.js.map
  104. deleted: lib/amd/build/icon_system_fontawesome.min.js
  105. deleted: lib/amd/build/icon_system_fontawesome.min.js.map
  106. deleted: lib/amd/build/icon_system_standard.min.js
  107. deleted: lib/amd/build/icon_system_standard.min.js.map
  108. deleted: lib/amd/build/inplace_editable.min.js
  109. deleted: lib/amd/build/inplace_editable.min.js.map
  110. deleted: lib/amd/build/key_codes.min.js
  111. deleted: lib/amd/build/key_codes.min.js.map
  112. deleted: lib/amd/build/loadingicon.min.js
  113. deleted: lib/amd/build/loadingicon.min.js.map
  114. deleted: lib/amd/build/local/aria/focuslock.min.js
  115. deleted: lib/amd/build/local/aria/focuslock.min.js.map
  116. deleted: lib/amd/build/localstorage.min.js
  117. deleted: lib/amd/build/localstorage.min.js.map
  118. deleted: lib/amd/build/log.min.js
  119. deleted: lib/amd/build/log.min.js.map
  120. deleted: lib/amd/build/loglevel.min.js
  121. deleted: lib/amd/build/loglevel.min.js.map
  122. deleted: lib/amd/build/modal.min.js
  123. deleted: lib/amd/build/modal.min.js.map
  124. deleted: lib/amd/build/modal_backdrop.min.js
  125. deleted: lib/amd/build/modal_backdrop.min.js.map
  126. deleted: lib/amd/build/modal_cancel.min.js
  127. deleted: lib/amd/build/modal_cancel.min.js.map
  128. deleted: lib/amd/build/modal_events.min.js
  129. deleted: lib/amd/build/modal_events.min.js.map
  130. deleted: lib/amd/build/modal_factory.min.js
  131. deleted: lib/amd/build/modal_factory.min.js.map
  132. deleted: lib/amd/build/modal_registry.min.js
  133. deleted: lib/amd/build/modal_registry.min.js.map
  134. deleted: lib/amd/build/modal_save_cancel.min.js
  135. deleted: lib/amd/build/modal_save_cancel.min.js.map
  136. deleted: lib/amd/build/mustache.min.js
  137. deleted: lib/amd/build/mustache.min.js.map
  138. deleted: lib/amd/build/network.min.js
  139. deleted: lib/amd/build/network.min.js.map
  140. deleted: lib/amd/build/notification.min.js
  141. deleted: lib/amd/build/notification.min.js.map
  142. deleted: lib/amd/build/page_global.min.js
  143. deleted: lib/amd/build/page_global.min.js.map
  144. deleted: lib/amd/build/paged_content.min.js
  145. deleted: lib/amd/build/paged_content.min.js.map
  146. deleted: lib/amd/build/paged_content_events.min.js
  147. deleted: lib/amd/build/paged_content_events.min.js.map
  148. deleted: lib/amd/build/paged_content_factory.min.js
  149. deleted: lib/amd/build/paged_content_factory.min.js.map
  150. deleted: lib/amd/build/paged_content_pages.min.js
  151. deleted: lib/amd/build/paged_content_pages.min.js.map
  152. deleted: lib/amd/build/paged_content_paging_bar.min.js
  153. deleted: lib/amd/build/paged_content_paging_bar.min.js.map
  154. deleted: lib/amd/build/paged_content_paging_bar_limit_selector.min.js
  155. deleted: lib/amd/build/paged_content_paging_bar_limit_selector.min.js.map
  156. deleted: lib/amd/build/paged_content_paging_dropdown.min.js
  157. deleted: lib/amd/build/paged_content_paging_dropdown.min.js.map
  158. deleted: lib/amd/build/pending.min.js
  159. deleted: lib/amd/build/pending.min.js.map
  160. deleted: lib/amd/build/permissionmanager.min.js
  161. deleted: lib/amd/build/permissionmanager.min.js.map
  162. deleted: lib/amd/build/popover_region_controller.min.js
  163. deleted: lib/amd/build/popover_region_controller.min.js.map
  164. deleted: lib/amd/build/popper.min.js
  165. deleted: lib/amd/build/popper.min.js.map
  166. deleted: lib/amd/build/pubsub.min.js
  167. deleted: lib/amd/build/pubsub.min.js.map
  168. deleted: lib/amd/build/search-input.min.js
  169. deleted: lib/amd/build/search-input.min.js.map
  170. deleted: lib/amd/build/sessionstorage.min.js
  171. deleted: lib/amd/build/sessionstorage.min.js.map
  172. deleted: lib/amd/build/showhidesettings.min.js
  173. deleted: lib/amd/build/showhidesettings.min.js.map
  174. deleted: lib/amd/build/sortable_list.min.js
  175. deleted: lib/amd/build/sortable_list.min.js.map
  176. deleted: lib/amd/build/storagewrapper.min.js
  177. deleted: lib/amd/build/storagewrapper.min.js.map
  178. deleted: lib/amd/build/str.min.js
  179. deleted: lib/amd/build/str.min.js.map
  180. deleted: lib/amd/build/tag.min.js
  181. deleted: lib/amd/build/tag.min.js.map
  182. deleted: lib/amd/build/templates.min.js
  183. deleted: lib/amd/build/templates.min.js.map
  184. deleted: lib/amd/build/toast.min.js
  185. deleted: lib/amd/build/toast.min.js.map
  186. deleted: lib/amd/build/tooltip.min.js
  187. deleted: lib/amd/build/tooltip.min.js.map
  188. deleted: lib/amd/build/tree.min.js
  189. deleted: lib/amd/build/tree.min.js.map
  190. deleted: lib/amd/build/truncate.min.js
  191. deleted: lib/amd/build/truncate.min.js.map
  192. deleted: lib/amd/build/url.min.js
  193. deleted: lib/amd/build/url.min.js.map
  194. deleted: lib/amd/build/user_date.min.js
  195. deleted: lib/amd/build/user_date.min.js.map
  196. deleted: lib/amd/build/utils.min.js
  197. deleted: lib/amd/build/utils.min.js.map
  198. deleted: lib/amd/build/yui.min.js
  199. deleted: lib/amd/build/yui.min.js.map
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement