Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc42 | GitLab Bot | 2021-04-20 | 1 | -16/+0 |
* | Removes merge conflicts vue code from globalnamespace | Filipa Lacerda | 2018-06-13 | 1 | -18/+11 |
* | Convert merge_conflict_service.js to axios | Phil Hughes | 2018-01-30 | 1 | -11/+3 |
* | Remove .es6 from file extensions (!9241) | winniehell | 2017-03-05 | 1 | -0/+31 |