summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42GitLab Bot2021-08-191-1/+0
* Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42GitLab Bot2021-07-201-1/+1
* Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43GitLab Bot2021-04-201-46/+11
* Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40GitLab Bot2021-03-161-51/+31
* Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42GitLab Bot2021-02-181-2/+2
* Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42Robert Speicher2021-01-201-2/+2
* Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42GitLab Bot2020-12-171-22/+112
* Add latest changes from gitlab-org/gitlab@13-0-stable-eeGitLab Bot2020-05-201-2/+2
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-03-111-2/+2
* Fix "Resolve conflicts" button not appearing for some userssh-fix-resolve-button-not-availableStan Hu2019-06-111-1/+1
* Disable resolve conflicts for protected branchesPhil Hughes2019-01-071-9/+61
* Prettify all the thingsMike Greiling2018-11-201-15/+13
* Prettify vue_merge_request_widget modulesMike Greiling2018-10-101-14/+14
* Updates eslint vue plugin versionFilipa Lacerda2018-06-111-1/+1
* Rename btn-secondary to btn-defaultAnnabel Dunstone Gray2018-05-101-2/+2
* [skip ci] Convert btn-xs to btn-smClement Ho2018-04-121-2/+2
* Rename .btn-default to .btn-secondaryClement Ho2018-04-091-2/+2
* Update missing pathsfl-more-mr-widgetFilipa Lacerda2018-01-251-1/+1
* Moves more mr widget components into vue filesfl-mr-widget-refactorFilipa Lacerda2018-01-241-0/+61