summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fix-webpack-chunk-namingClement Ho2017-12-2190-1089/+1995
|\
| * Resolve "Decouple multi-file editor from file list"Tim Zallmann2017-12-2168-936/+1768
| * Restore missing language code in datetime_utility.jsWinnie Hellmann2017-12-211-5/+13
| * Merge branch '40063-markdown-editor-improvements' into 'master'Filipa Lacerda2017-12-212-4/+6
| |\
| | * Add spec for previewing a note40063-markdown-editor-improvementsAnnabel Dunstone Gray2017-12-201-1/+2
| | * Hide & show toolbar on MR pageAnnabel Dunstone Gray2017-12-181-3/+3
| | * Hide toolbar in markdown preview modeAnnabel Dunstone Gray2017-12-181-1/+2
| * | Merge branch 'jivl-replace-d3-v3-v4' into 'master'Mike Greiling2017-12-206-61/+105
| |\ \
| | * | added minChunks to the common_d3 bundlejivl-replace-d3-v3-v4Jose Ivan Vargas2017-12-182-7/+1
| | * | cleaned up date_time_formattersJose Ivan Vargas2017-12-181-17/+8
| | * | Restored the timeScaleFormat for the prometheus dashboardJose Ivan Vargas2017-12-182-6/+41
| | * | Refactored d3 modules to instead of having a common_d3 dir, to use the micro ...Jose Ivan Vargas2017-12-187-121/+73
| | * | corrected functionality from the stat_contributors_graphJose Ivan Vargas2017-12-183-10/+25
| | * | fixed specs and the non-rendering stat_graph_contributors_graphJose Ivan Vargas2017-12-182-7/+6
| | * | optimized d3 v4 with a custom made bundleJose Ivan Vargas2017-12-186-6/+46
| | * | Modified contributors graph to use d3 v4Jose Ivan Vargas2017-12-182-24/+38
| | * | Update d3 to v4 and migrated the prometheus dashboardJose Ivan Vargas2017-12-183-43/+47
| | |/
| * | Merge branch 'master' into layout-nav-es-modulelayout-nav-es-moduleFilipa Lacerda2017-12-2011-41/+70
| |\ \
| | * \ Merge branch '41186-sidebar-too-much-vertical-scroll' into 'master'Phil Hughes2017-12-201-16/+8
| | |\ \
| | | * | Remove transitionend event from GL dropdownPhil Hughes2017-12-191-16/+8
| | | |/
| | * | Fix onion-skin re-entering stateClement Ho2017-12-191-0/+1
| | * | Remove related links in MR widget when empty stateClement Ho2017-12-194-14/+38
| | * | Show inline edit button for issuesClement Ho2017-12-193-9/+2
| | * | Fix shortcut links on help pageClement Ho2017-12-192-2/+21
| | |/
| * | Changed layout_nav to ES modulePhil Hughes2017-12-192-42/+33
| |/
* | update dispatcher to allow for dynamic imports until webpack plugin is updatedfix-webpack-chunk-namingMike Greiling2017-12-202-1/+6
|/
* Merge branch 'ph-es-notes-module' into 'master'Filipa Lacerda2017-12-185-8/+14
|\
| * Merge branch 'master' into 'ph-es-notes-module'ph-es-notes-modulePhil Hughes2017-12-1812-417/+435
| |\
| * | Export and use Notes ES modulePhil Hughes2017-12-155-8/+14
* | | Merge branch 'osw-isolate-mr-widget-exposed-attributes' into 'master'Sean McGivern2017-12-181-1/+1
|\ \ \
| * | | Stop sending milestone and labels data over the wire for MR widgetosw-isolate-mr-widget-exposed-attributesOswaldo Ferreira2017-12-151-1/+1
* | | | Translate date ranges on contributors pageWinnie Hellmann2017-12-181-8/+13
* | | | Move dateTickFormat to separate moduleWinnie Hellmann2017-12-182-17/+42
* | | | Add right padding to contributors graphWinnie Hellmann2017-12-181-1/+4
* | | | Translate contributors graph x-axisWinnie Hellmann2017-12-181-2/+24
* | | | Add createDateTimeFormat to format dates based on localeWinnie Hellmann2017-12-181-3/+12
| |_|/ |/| |
* | | Merge branch 'ph-even-more-es-modules' into 'master'Filipa Lacerda2017-12-189-363/+358
|\ \ \
| * | | Exported JS classes as modulesph-even-more-es-modulesPhil Hughes2017-12-159-363/+358
| | |/ | |/|
* | | Merge branch '38019-hide-runner-token' into 'master'Clement Ho2017-12-153-41/+54
|\ \ \
| * | | Hide runner token in CI/CD settings page38019-hide-runner-tokenEric Eastwood2017-12-153-41/+54
| |/ /
* | | Merge branch '38239-update-toggle-design' into 'master'Filipa Lacerda2017-12-151-13/+23
|\ \ \ | |/ / |/| |
| * | Use icons instead of string labels for togglesKushal Pandya2017-12-151-13/+23
* | | Merge branch 'ph-more-es-modules' into 'master'Filipa Lacerda2017-12-159-492/+463
|\ \ \
| * | | Export JS classes as modulesph-more-es-modulesPhil Hughes2017-12-159-492/+463
* | | | Merge branch '38541-cancel-alignment' into 'master'Filipa Lacerda2017-12-151-6/+13
|\ \ \ \ | |/ / / |/| | |
| * | | fix button alignment on MWPS component38541-cancel-alignmentSimon Knox2017-12-111-6/+13
* | | | Converted JS modules into exported modulesph-es-modulesPhil Hughes2017-12-146-97/+65
* | | | Merge branch '38869-datetime' into 'master'Tim Zallmann2017-12-1419-133/+152
|\ \ \ \
| * | | | Fixes after review38869-datetimeFilipa Lacerda2017-12-131-3/+1
| * | | | Merge branch 'master' into 38869-datetimeFilipa Lacerda2017-12-1331-792/+855
| |\ \ \ \