Age | Commit message (Expand) | Author |
---|---|---|
2017-10-13 | Refactor conflict resolution to contain git ops within Gitlab::Git | Alejandro Rodríguez |
2017-07-27 | Use described_class when possible | Rémy Coutable |
2017-07-27 | Remove superfluous lib: true, type: redis, service: true, models: true, servi... | Rémy Coutable |
2017-06-21 | Enable Style/DotPosition Rubocop :cop: | Grzegorz Bizon |
2017-03-15 | Allow resolving conflicts with non-ASCII chars | Sean McGivern |
2016-09-07 | Fix merge conflict size limit | Sean McGivern |
2016-08-25 | Handle non-UTF-8 conflicts gracefully | Sean McGivern |
2016-08-12 | Raise errors for large and binary files | Sean McGivern |
2016-08-12 | Handle multiple merge conflict files in collection | Sean McGivern |
2016-08-12 | Add backend for merge conflicts reading | Sean McGivern |