| Age | Commit message (Expand) | Author |
|---|---|---|
| 2019-06-12 | Fix "Resolve conflicts" button not appearing for some users | Stan Hu |
| 2019-01-07 | Disable resolve conflicts for protected branches | Phil Hughes |
| 2018-11-20 | Prettify all the things | Mike Greiling |
| 2018-10-10 | Prettify vue_merge_request_widget modules | Mike Greiling |
| 2018-06-11 | Updates eslint vue plugin version | Filipa Lacerda |
| 2018-05-10 | Rename btn-secondary to btn-default | Annabel Dunstone Gray |
| 2018-04-13 | [skip ci] Convert btn-xs to btn-sm | Clement Ho |
| 2018-04-09 | Rename .btn-default to .btn-secondary | Clement Ho |
| 2018-01-25 | Update missing paths | Filipa Lacerda |
| 2018-01-24 | Moves more mr widget components into vue files | Filipa Lacerda |
Welcome to mirror list, hosted at ThFree Co, Russian Federation.
 |
index : gitlab.com/gitlab-org/gitlab-foss.git | |
| Unnamed repository; edit this file 'description' to name the repository. | root |
| summaryrefslogtreecommitdiff |
path: root/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue