summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* karma spec fixesPhil Hughes2017-10-101-3/+2
* Flash is now a ES6 modulePhil Hughes2017-10-106-9/+6
* Allow merge when no pipeline success38389-allow-merge-without-successEric Eastwood2017-10-052-7/+3
* Merge branch '37229-mr-widget-status-icon' into 'master'Jacob Schatz2017-10-051-8/+24
|\
| * Merge remote-tracking branch 'origin' into 37229-mr-widget-status-iconSimon Knox2017-10-032-6/+7
| |\
| * | improve merge request widget status icon UXSimon Knox2017-09-201-8/+24
* | | Merge branch '36742-hide-close-mr-button-on-merge' into 'master'Fatih Acet2017-10-041-0/+1
|\ \ \
| * | | Hide close MR button after merge without reloading pageJacopo2017-09-241-0/+1
| | |/ | |/|
* | | Use explicit boolean true attribute for show-disabled-button38417-use-explicit-boolean-vue-attributeEric Eastwood2017-10-0310-10/+10
* | | Merge branch 'mr-widget-merged-date-tooltip' into 'master'Filipa Lacerda2017-10-033-11/+25
|\ \ \
| * | | fixed specs when merged event was emptymr-widget-merged-date-tooltipPhil Hughes2017-09-291-4/+10
| * | | Fixes merge request widget date tooltip inconsistenciesPhil Hughes2017-09-293-10/+18
| |/ /
* | | Port semi-linear merge strategy to CE (mostly FE)Eric Eastwood2017-09-292-1/+2
* | | Add period to multi-sentence rebase locally messageEric Eastwood2017-09-281-1/+1
* | | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-262-6/+7
|\ \ \ | |/ /
| * | Merge branch '37220-es-modules' into 'master'Phil Hughes2017-09-212-6/+7
| |\ \ | | |/ | |/|
| | * Import modules instead of using the ones in global namespaceFilipa Lacerda2017-09-091-4/+5
| | * Use modules in common utilsFilipa Lacerda2017-09-091-2/+2
* | | Use js- classes instead of Vue refs in tests for some perfEric Eastwood2017-09-263-16/+11
* | | Port fast-forward MR widget states from EEEric Eastwood2017-09-194-19/+41
|/ /
* | Change all instances of btn-sm to btn-small to keep things consistentJedidiah2017-09-194-6/+6
* | Fix MR widget with external CI services/integrations33287-fix-mr-widget-errors-with-external-servicesEric Eastwood2017-09-184-9/+24
View Lorry Controller Status