summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget
Commit message (Expand)AuthorAgeFilesLines
* Backport of mr_widget_author.vue EE changesPhil Hughes2018-02-021-1/+21
* Merge branch 'fl-mr-widget-1' into 'master'Phil Hughes2018-02-026-143/+189
|\
| * Fixes after reviewfl-mr-widget-1Filipa Lacerda2018-02-011-10/+16
| * Merge branch 'master' into fl-mr-widget-1Filipa Lacerda2018-02-014-39/+46
| |\
| * | Transform `a` tag with button role into a `button`Filipa Lacerda2018-02-011-4/+6
| * | Moves widget header into a vue fileFilipa Lacerda2018-02-014-120/+142
| * | Moves merge help into a vue componentFilipa Lacerda2018-01-314-25/+41
* | | Moves more mr widget components into vue filesfl-mr-widget-2Filipa Lacerda2018-02-017-58/+78
| |/ |/|
* | Fix broken testfl-mr-widgetFilipa Lacerda2018-01-312-3/+3
* | Move mr widget related links into a vue fileFilipa Lacerda2018-01-304-40/+47
|/
* Merge branch 'fl-vue-mr-widget' into 'master'Phil Hughes2018-01-293-140/+193
|\
| * Fix broken testfl-vue-mr-widgetFilipa Lacerda2018-01-291-2/+2
| * Move mr_widget_merged into a vue fileFilipa Lacerda2018-01-263-140/+193
* | Disable MR check out button when source branch is deletedJacopo2018-01-291-0/+1
|/
* Adds missing i18nFilipa Lacerda2018-01-261-2/+2
* Moves components into vue files:fl-mr-widget-componentsFilipa Lacerda2018-01-255-204/+254
* 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 more mr widget components into vue filesfl-mr-widget-refactorFilipa Lacerda2018-01-247-103/+135
* | Moves status icon into a vue file and adds testsFilipa Lacerda2018-01-2423-84/+111
|/
* Merge branch 'master' into vue-mr-widget-stateFilipa Lacerda2018-01-2210-10/+10
|\
| * Backport to match EE icons42225-mr-iconsFilipa Lacerda2018-01-1911-11/+11
* | Update icon to match EEvue-mr-widget-stateFilipa Lacerda2018-01-191-1/+1
* | Merge branch 'master' into vue-mr-widget-stateFilipa Lacerda2018-01-194-28/+33
|\ \ | |/
| * Merge branch 'mr-widget-vue' into 'master'Phil Hughes2018-01-194-27/+35
| |\
| | * Fix conflict with ee iconmr-widget-vueFilipa Lacerda2018-01-181-1/+1
| | * Move archived component to vue fileFilipa Lacerda2018-01-184-27/+35
| * | Merge branch 'dispatcher-projects' into 'master'Filipa Lacerda2018-01-181-1/+1
| |\ \ | | |/ | |/|
| | * Added dispatcher imports for some project routesPhil Hughes2018-01-161-1/+1
* | | Move mr_widget_auto_merge_failed component into a vue fileFilipa Lacerda2018-01-184-48/+56
|/ /
* | Resolve "Closed issue label in todo's styling is difficult to read"Simon Knox2018-01-171-1/+1
|/
* Fixed merge request status badge not updating after mergingmr-status-box-updatePhil Hughes2018-01-151-5/+4
* Fix broken specsFilipa Lacerda2018-01-091-3/+2
* Fix more eslint rulesFilipa Lacerda2018-01-081-1/+3
* [ci skip] Fix more eslint rulesFilipa Lacerda2018-01-062-10/+14
* Merge branch 'master' into 34312-eslint-vue-pluginFilipa Lacerda2018-01-057-0/+154
|\
| * Backport 'Rebase' feature from EE to CEjprovazn-rebaseJan Provaznik2018-01-057-0/+154
* | [ci skip] Fix more rulesFilipa Lacerda2018-01-051-16/+21
|/
* Merge branch 'osw-introduce-merge-request-statistics' into 'master'Sean McGivern2018-01-043-30/+28
|\
| * Fixes spec failures due to not returning metrics for MRs other than closed/me...Oswaldo Ferreira2018-01-021-0/+4
| * Cache merged and closed events data in merge_request_metrics tableOswaldo Ferreira2018-01-023-30/+24
* | Switch vue_merge_request_widget to AxiosEric Eastwood2018-01-028-68/+58
|/
* Replaced the remaining code-fork iconsjivl-general-icons-2Jose Ivan Vargas2017-12-191-2/+2
* Replaced some fork icons instances and fixed the Icon component on the MR WidgetJose Ivan Vargas2017-12-191-7/+7
* replaced download icon for the sprite based oneJose Ivan Vargas2017-12-191-2/+5
* Remove related links in MR widget when empty stateClement Ho2017-12-194-14/+38
* 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
* | 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
| |/
View Lorry Controller Status