summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/
* | Merge branch 'master' into 38869-datetimeFilipa Lacerda2017-12-112-1/+4
|\ \
| * | updated importsurl-utility-es-modulePhil Hughes2017-12-111-2/+2
| * | use exported methods instead of gl.utilsPhil Hughes2017-12-081-1/+2
| |/
| * Fix loading branches list on cherry pick modal after merge.acet-fix-branches-list-on-cherry-pick-modal-after-mergeFatih Acet2017-12-041-0/+2
* | Export date utility functions as ES6 modulesFilipa Lacerda2017-12-072-3/+4
|/
* Fix missing MR widget status icons40283-fix-missing-mr-widget-status-iconsEric Eastwood2017-11-221-1/+1
* Backport spec changes from EE remove approvals in empty statece-backport-39009-fix-approvals-showing-up-in-empty-mr-widgetEric Eastwood2017-11-131-1/+1
* Export text utils as ES6 modulesFilipa Lacerda2017-11-131-2/+2
* Resolve "Merge request widget - CI information has different margins"Filipa Lacerda2017-11-084-92/+109
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 38394-smarter-i...Simon Knox2017-11-063-9/+10
|\
| * Merge branch 'icons-ci-icons' into 'master'Filipa Lacerda2017-11-021-6/+6
| |\
| | * Fixing IconsTim Zallmann2017-10-301-6/+6
| * | Load participants asyncEric Eastwood2017-10-311-1/+1
| |/
| * Change default disabled merge request widget message to "Merge is not allowed...39188-change-default-disabled-merge-messageEric Eastwood2017-10-271-2/+3
* | remove global export from SmartIntervalSimon Knox2017-10-311-2/+3
* | don't re-run smart interval callback if there is already one in progressSimon Knox2017-10-241-2/+2
|/
View Lorry Controller Status