summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Fix broken testfl-vue-mr-widgetFilipa Lacerda2018-01-291-2/+2
* [ci skip] Merge branch 'master' into fl-vue-mr-widgetFilipa Lacerda2018-01-2910-252/+228
|\
| * normalize headers correctlyPhil Hughes2018-01-293-13/+5
| * fixed dashboard projects not being filterablePhil Hughes2018-01-291-1/+1
| * Converted filterable_list to axiosPhil Hughes2018-01-292-25/+20
| * Converted due_date_select to axiosPhil Hughes2018-01-291-27/+21
| * Converted dropzone_input to axiosPhil Hughes2018-01-291-18/+15
| * Converted create_merge_request_dropdown to axiosPhil Hughes2018-01-291-80/+67
| * converted compare_autocomplete to axiosPhil Hughes2018-01-291-7/+8
| * Convered compare.js to axiosPhil Hughes2018-01-291-26/+21
| * Merge branch 'generalize-js-toggle-buttons' into 'master'Filipa Lacerda2018-01-263-63/+78
| |\
| | * Generalize toggle_buttons.jsgeneralize-js-toggle-buttonsEric Eastwood2018-01-263-63/+78
* | | Move mr_widget_merged into a vue fileFilipa Lacerda2018-01-263-140/+193
|/ /
* | Merge branch 'fl-mr-widget-components' into 'master'Phil Hughes2018-01-265-204/+254
|\ \
| * | Adds missing i18nFilipa Lacerda2018-01-261-2/+2
| * | Merge branch 'master' into fl-mr-widget-componentsFilipa Lacerda2018-01-255-14/+23
| |\ \ | | |/
| * | Moves components into vue files:fl-mr-widget-componentsFilipa Lacerda2018-01-255-204/+254
* | | Merge branch 'winh-check-axios-restore' into 'master'Filipa Lacerda2018-01-261-0/+8
|\ \ \ | |_|/ |/| |
| * | Make sure that axios adapater is restored after mockingwinh-check-axios-restoreWinnie Hellmann2018-01-251-0/+8
* | | Merge branch 'katex-throwOnError' into 'master'Filipa Lacerda2018-01-251-1/+1
|\ \ \
| * | | Disable throwOnError in KaTeX to reveal user where is the problemJakub Jirutka2018-01-241-1/+1
* | | | Merge branch '40028-special-characters-on-issuable-templates' into 'master'Rémy Coutable2018-01-251-1/+1
|\ \ \ \
| * | | | Handle special characters on API request of issuable templatesTakuya Noguchi2018-01-251-1/+1
| |/ / /
* | | | Merge branch 'update-secret-values-to-support-dynamic-elements' into 'master'Filipa Lacerda2018-01-253-12/+21
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update secret_values to support dynamic elements within parentupdate-secret-values-to-support-dynamic-elementsEric Eastwood2018-01-243-12/+21
| |/ /
* | | Merge branch 'qa-deploy-key-scenario' into 'master'Grzegorz Bizon2018-01-251-2/+2
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/master' into qa-deploy-key-scenarioLin Jen-Shin2018-01-2451-163/+299
| |\ \ \ | | |/ /
| * | | Also test if the fingerprint is correctLin Jen-Shin2018-01-221-2/+2
| * | | Merge branch 'qa-deploy-key-factory-product' into qa-deploy-key-scenarioLin Jen-Shin2018-01-221-0/+1
| |\ \ \
* | \ \ \ Merge branch 'fl-more-mr-widget' into 'master'Phil Hughes2018-01-2523-84/+111
|\ \ \ \ \
| * | | | | Update missing pathsfl-more-mr-widgetFilipa Lacerda2018-01-253-3/+3
| * | | | | Merge branch 'master' into fl-more-mr-widgetFilipa Lacerda2018-01-257-103/+135
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Moves status icon into a vue file and adds testsFilipa Lacerda2018-01-2423-84/+111
| | |_|_|/ | |/| | |
* | | | | Merge branch 'winh-delete-milestone-modal' into 'master'Phil Hughes2018-01-259-3/+217
|\ \ \ \ \
| * | | | | Add modal for deleting a milestonewinh-delete-milestone-modalWinnie Hellmann2018-01-259-3/+217
| | |/ / / | |/| | |
* | | | | Merge branch '42285-not-found-status-icon' into 'master'Phil Hughes2018-01-251-4/+4
|\ \ \ \ \
| * | | | | Uses sprite icon to render verified commit badge and uniforms css colors42285-not-found-status-iconFilipa Lacerda2018-01-241-4/+4
| | |/ / / | |/| | |
* | | | | Merge branch '42220-add-pending-empty-state' into 'master'Tim Zallmann2018-01-252-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Adds correct illustration for pending state42220-add-pending-empty-stateFilipa Lacerda2018-01-232-1/+2
* | | | | Merge branch 'fl-mr-widget-refactor' into 'master'Phil Hughes2018-01-257-103/+135
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Moves more mr widget components into vue filesfl-mr-widget-refactorFilipa Lacerda2018-01-247-103/+135
* | | | | Merge branch 'groups-webpack-bundle' into 'master'Filipa Lacerda2018-01-246-5/+18
|\ \ \ \ \
| * | | | | fixed paginationgroups-webpack-bundlePhil Hughes2018-01-231-3/+1
| * | | | | Added dispatcher imports for groups webpack bundlePhil Hughes2018-01-235-2/+17
* | | | | | Merge branch 'ph-even-more-dispatcher-imports' into 'master'Filipa Lacerda2018-01-243-17/+11
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | added missing importsPhil Hughes2018-01-241-0/+4
| * | | | | Added imports for dispatcher routesPhil Hughes2018-01-242-17/+7
* | | | | | Merge branch 'qa-deploy-key-factory-product' into 'master'Grzegorz Bizon2018-01-241-0/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Add .qa-project-deploy-keys to locate itqa-deploy-key-factory-productLin Jen-Shin2018-01-201-0/+1
* | | | | | Merge branch '32546-cannot-copy-paste-on-ios' into 'master'Phil Hughes2018-01-241-0/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
View Lorry Controller Status