summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
Commit message (Expand)AuthorAgeFilesLines
* Add merge train support to MR merge button (CE)9186-implement-atmtwps-state-to-mr-widgetNathan Friend2019-06-111-27/+20
* Merge branch 'mr-widget-merge-error' into 'master'Filipa Lacerda2019-06-041-0/+1
|\
| * Update rendering of merge request in merge request widgetPhil Hughes2019-06-041-0/+1
* | Fix frontend tests related to autoMergeStrategyabstract-auto-mergeNathan Friend2019-06-031-6/+2
* | Abstract auto merge processesShinya Maeda2019-06-031-6/+10
|/
* Move EE differences for `ready_to_merge.vue`Natalia Tepluhina2019-04-241-9/+2
* Merge branch '56970-fix-mr-stuck-loading-on-error' into 'master'Phil Hughes2019-03-151-3/+7
|\
| * Update merge status timeout to 0Paul Slaughter2019-03-141-3/+7
* | Added changelog entryNatalia Tepluhina2019-03-131-35/+42
|/
* Added a condition on squash message displayNatalia Tepluhina2019-03-071-1/+1
* Resolve "Override squash commit message"Natalia Tepluhina2019-02-071-136/+142
* Merge branch '25569-changing-wording-to-delete-when-referring-to-removing-a-b...Filipa Lacerda2019-01-231-2/+2
|\
| * Use 'delete' instead of 'remove' for source branch25569-changing-wording-to-delete-when-referring-to-removing-a-branchSam Bigelow2019-01-221-2/+2
* | Merge branch 'mg-upgrade-prettier-again' into 'master'Clement Ho2019-01-151-3/+3
|\ \
| * | Upgrade prettier and reformat files as necessaryMike Greiling2019-01-141-3/+3
| |/
* | Resolve "When merging an MR, the squash checkbox isn't always supported"Natalia Tepluhina2019-01-151-13/+6
|/
* Prettify all the thingsMike Greiling2018-11-201-43/+27
* Prettify remaining files with differences in CE and EEMike Greiling2018-10-311-11/+21
* Rename squash before merge vue componentGeorge Tsiolis2018-09-211-1/+1
* QA: Fix failure in merge_merge_request_from_fork_spec.rbMark Lapierre2018-09-201-3/+3
* Backport mr widget changes from EEbackport-widget-changesAnnabel Dunstone Gray2018-07-121-1/+1
* Updates eslint vue plugin versionFilipa Lacerda2018-06-111-14/+14
* Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-291-5/+12
* Merge branch 'master' into bootstrap4Clement Ho2018-04-161-2/+2
* Move ReadyToMerge vue componentGeorge Tsiolis2018-03-301-0/+363