summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/components/states
Commit message (Expand)AuthorAgeFilesLines
* Fix broken testfl-vue-mr-widgetFilipa Lacerda2018-01-291-2/+2
* Move mr_widget_merged into a vue fileFilipa Lacerda2018-01-262-139/+192
* Adds missing i18nFilipa Lacerda2018-01-261-2/+2
* Moves components into vue files:fl-mr-widget-componentsFilipa Lacerda2018-01-254-202/+252
* Update missing pathsfl-more-mr-widgetFilipa Lacerda2018-01-253-3/+3
* Merge branch 'master' into fl-more-mr-widgetFilipa Lacerda2018-01-256-100/+132
|\
| * Moves more mr widget components into vue filesfl-mr-widget-refactorFilipa Lacerda2018-01-246-100/+132
* | Moves status icon into a vue file and adds testsFilipa Lacerda2018-01-2419-46/+52
|/
* 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-192-26/+31
|\ \ | |/
| * Fix conflict with ee iconmr-widget-vueFilipa Lacerda2018-01-181-1/+1
| * Move archived component to vue fileFilipa Lacerda2018-01-182-26/+31
* | Move mr_widget_auto_merge_failed component into a vue fileFilipa Lacerda2018-01-182-47/+52
|/
* 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 more eslint rulesFilipa Lacerda2018-01-081-1/+3
* [ci skip] Fix more eslint rulesFilipa Lacerda2018-01-061-9/+11
* Backport 'Rebase' feature from EE to CEjprovazn-rebaseJan Provaznik2018-01-051-0/+133
* Merge branch 'osw-introduce-merge-request-statistics' into 'master'Sean McGivern2018-01-042-6/+6
|\
| * Cache merged and closed events data in merge_request_metrics tableOswaldo Ferreira2018-01-022-6/+6
* | Switch vue_merge_request_widget to AxiosEric Eastwood2018-01-024-27/+27
|/
* fix button alignment on MWPS component38541-cancel-alignmentSimon Knox2017-12-111-6/+13
* Change default disabled merge request widget message to "Merge is not allowed...39188-change-default-disabled-merge-messageEric Eastwood2017-10-271-2/+3
* karma spec fixesPhil Hughes2017-10-101-3/+2
* Flash is now a ES6 modulePhil Hughes2017-10-104-5/+4
* Allow merge when no pipeline success38389-allow-merge-without-successEric Eastwood2017-10-051-7/+2
* Merge branch '37229-mr-widget-status-icon' into 'master'Jacob Schatz2017-10-051-8/+24
|\
| * 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-032-6/+6
|\ \
| * | Fixes merge request widget date tooltip inconsistenciesPhil Hughes2017-09-292-6/+6
| |/
* | Port semi-linear merge strategy to CE (mostly FE)Eric Eastwood2017-09-291-1/+1
* | Add period to multi-sentence rebase locally messageEric Eastwood2017-09-281-1/+1
* | Use js- classes instead of Vue refs in tests for some perfEric Eastwood2017-09-262-14/+10
* | Port fast-forward MR widget states from EEEric Eastwood2017-09-192-19/+39
|/
* Change all instances of btn-sm to btn-small to keep things consistentJedidiah2017-09-192-3/+3
* Fix MR widget with external CI services/integrations33287-fix-mr-widget-errors-with-external-servicesEric Eastwood2017-09-181-5/+13
* Fix MR ready to merge buttons/controls at mobile breakpoint37259-some-mr-ready-mobile-fixesEric Eastwood2017-09-131-3/+3
* Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-071-2/+2
* clean up merge request widget UISimon Knox2017-08-0718-411/+479
* Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"winh-revert-6ac777a7592533d9c7b3682b2b9ca8caccca3f4dwinh2017-06-211-10/+0
* Adjust position and wording for related issues in merge requestsWinnie Hellmann2017-06-191-0/+10
* Merge branch '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-a...Fatih Acet2017-05-261-2/+6
|\
| * Upgrade Remove Source Branch checkbox UX.Bryce Johnson2017-05-221-2/+6
* | MR widget styling fixes32657-fix-mr-widget-styleskushalpandya2017-05-221-1/+1
|/
* Refine MR widget styling for buttons and info textKushal Pandya2017-05-191-1/+1
View Lorry Controller Status