summaryrefslogtreecommitdiff
path: root/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'winh-remove-sushi' into 'master'Winnie Hellmann2019-03-261-1/+1
* Revert "Merge branch 'winh-remove-sushi' into 'master'"Filipa Lacerda2019-03-221-1/+1
* Remove .raw from JavaScript fixture file namesWinnie Hellmann2019-03-211-1/+1
* Merge branch '56970-fix-mr-stuck-loading-on-error' into 'master'Phil Hughes2019-03-151-1/+19
|\
| * Update merge status timeout to 0Paul Slaughter2019-03-141-1/+19
* | Added changelog entryNatalia Tepluhina2019-03-131-9/+112
|/
* Added a condition on squash message displayNatalia Tepluhina2019-03-071-3/+17
* Resolve "Override squash commit message"Natalia Tepluhina2019-02-071-51/+102
* Resolve "When merging an MR, the squash checkbox isn't always supported"Natalia Tepluhina2019-01-151-7/+59
* Prettify all spec filesMike Greiling2018-10-171-33/+64
* enable jasmine/new-line-before-expectJohann Hubert Sonntagbauer2018-10-171-0/+39
* fix illegal references to "this" in module contextMike Greiling2018-04-231-3/+5
* convert remaining instances of import * to use spyOnDependencyMike Greiling2018-04-231-5/+4
* Move ReadyToMerge vue componentGeorge Tsiolis2018-03-301-4/+4
* Dont show remove source branch checkbox when user cannot remove the branchPhil Hughes2018-03-081-8/+4
* Backport to match EE icons42225-mr-iconsFilipa Lacerda2018-01-191-4/+4
* 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-0/+45
* Switch vue_merge_request_widget to AxiosEric Eastwood2018-01-021-6/+7
* Change default disabled merge request widget message to "Merge is not allowed...39188-change-default-disabled-merge-messageEric Eastwood2017-10-271-0/+46
* Allow merge when no pipeline success38389-allow-merge-without-successEric Eastwood2017-10-051-31/+9
* Merge branch '37229-mr-widget-status-icon' into 'master'Jacob Schatz2017-10-051-11/+60
|\
| * improve merge request widget status icon UXSimon Knox2017-09-201-11/+60
* | Use js- classes instead of Vue refs in tests for some perfEric Eastwood2017-09-261-4/+4
* | Port fast-forward MR widget states from EEEric Eastwood2017-09-191-30/+50
|/
* Change all instances of btn-sm to btn-small to keep things consistentJedidiah2017-09-191-1/+1
* Fix MR widget with external CI services/integrations33287-fix-mr-widget-errors-with-external-servicesEric Eastwood2017-09-181-5/+53
* clean up merge request widget UISimon Knox2017-08-071-1/+1
* Don't use getElementById in specs.Bryce Johnson2017-05-221-2/+2
* Upgrade Remove Source Branch checkbox UX.Bryce Johnson2017-05-221-2/+35
* Refine MR widget styling for buttons and info textKushal Pandya2017-05-191-1/+1
* Merge request widget redesignFatih Acet2017-05-091-0/+389