Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/conflict
AgeCommit message (Expand)Author
2020-07-20Add latest changes from gitlab-org/gitlab@13-2-stable-eeGitLab Bot
2020-02-04Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2020-01-27Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2019-12-19Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2019-12-17Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2019-07-26Add frozen_string_literal to spec/lib (part 1)Thong Kuah
2018-10-13Remove dependencies on LinguistZeger-Jan van de Weg
2018-10-02Remove Gitlab::Git::Repository#rugged and Gollum codeAlejandro Rodríguez
2018-08-28Include rich_text in diff cache keysSean McGivern
2018-06-01Add "deny disk access" Gitaly feature (tripswitch)Jacob Vosmaer (GitLab)
2018-03-08Cache `#can_be_resolved_in_ui?` git operationsAlejandro Rodríguez
2017-11-17Fix conflict highlightingSean McGivern
2017-10-13Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez
2017-10-13Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez
2017-07-27Use described_class when possibleRémy Coutable
2017-07-27Remove superfluous lib: true, type: redis, service: true, models: true, servi...Rémy Coutable
2017-06-21Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon
2017-05-12Fix conflict resolution from corrupted upstreamSean McGivern
2017-03-15Allow resolving conflicts with non-ASCII charsSean McGivern
2017-02-24Use Namespace#full_path instead of #path where appropriateDouwe Maan
2017-02-23Revert "Prefer leading style for Style/DotPosition"Douwe Maan
2017-02-23Enable Style/WordArrayDouwe Maan
2017-02-23Prefer leading style for Style/DotPositionDouwe Maan
2017-01-25Use `:empty_project` where possible throughout spec/libRobert Speicher
2016-10-13Add blob_ace_mode to conflict content responseSean McGivern
2016-09-07Fix merge conflict size limitSean McGivern
2016-08-25Handle non-UTF-8 conflicts gracefullySean McGivern
2016-08-12Find match line headers by backtrackingSean McGivern
2016-08-12Add more tests for conflictsSean McGivern
2016-08-12Clarify Conflict::File#sections methodSean McGivern
2016-08-12Add blob_icon to conflict file JSONSean McGivern
2016-08-12Add blob_path to conflict file JSONSean McGivern
2016-08-12Use same resolution format on FE and BESean McGivern
2016-08-12Fix specsSean McGivern
2016-08-12Raise errors for large and binary filesSean McGivern
2016-08-12Auto-highlight conflict when rich_text is calledSean McGivern
2016-08-12Allow resolving conflicts in MR controllerSean McGivern
2016-08-12Handle multiple merge conflict files in collectionSean McGivern
2016-08-12Add backend for merge conflicts readingSean McGivern
    generated by cgit v1.2.3 (git 2.25.1) at 2024-07-19 02:43:02 +0300