| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Move line code generation into Gitlab::Gitconflict-resolution-refactor | Alejandro Rodríguez | 2017-10-12 | 1 | -12/+1 |
| | | | | | Having a distinct class just for that was a bit overkill | ||||
| * | Create a Gitlab::Git submodule for conlict-related files | Alejandro Rodríguez | 2017-10-12 | 1 | -2/+5 |
| | | | | | Rename classes to (hopefully) clearer names while we're doing that. | ||||
| * | Refactor conflict resolution to contain git ops within Gitlab::Git | Alejandro Rodríguez | 2017-10-12 | 1 | -65/+19 |
| | | | | | | This prepares the codebase for a Gitaly migration. See https://gitlab.com/gitlab-org/gitaly/issues/553 | ||||
| * | Move Gitlab::Diff::LineCode to module Gitlab::Git | Alejandro Rodríguez | 2017-10-12 | 1 | -1/+1 |
| | | |||||
| * | Include new URL helpers retroactively into includers of Gitlab::Routingdm-fix-project-path-helpers-production | Douwe Maan | 2017-07-07 | 1 | -1/+1 |
| | | |||||
| * | Create and use project path helpers that only need a project, no namespace | Douwe Maan | 2017-07-05 | 1 | -8/+5 |
| | | |||||
| * | Enable and autocorrect the CustomErrorClass cop | Sean McGivern | 2017-03-01 | 1 | -2/+1 |
| | | |||||
| * | Fix code for cops | Douwe Maan | 2017-02-23 | 1 | -5/+6 |
| | | |||||
| * | Enable Style/ConditionalAssignment | Douwe Maan | 2017-02-23 | 1 | -3/+3 |
| | | |||||
| * | Add blob_ace_mode to conflict content response | Sean McGivern | 2016-10-13 | 1 | -0/+5 |
| | | |||||
| * | Simplify conflict file JSON creation | Sean McGivern | 2016-10-13 | 1 | -7/+15 |
| | | |||||
| * | Allow setting content for resolutions | Sean McGivern | 2016-10-13 | 1 | -8/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | When reading conflicts: 1. Add a `type` field. `text` works as before, and has `sections`; `text-editor` is a file with ambiguous conflict markers that can only be resolved in an editor. 2. Add a `content_path` field pointing to a JSON representation of the file's content for a single file. 3. Hitting `content_path` returns a similar datastructure to the `file`, but without the `content_path` and `sections` fields, and with a `content` field containing the full contents of the file (with conflict markers). When writing conflicts: 1. Instead of `sections` being at the top level, they are now in a `files` array. This matches the read format better. 2. The `files` array contains file hashes, each of which must contain: a. `new_path` b. `old_path` c. EITHER `sections` (which works as before) or `content` (with the full content of the resolved file). | ||||
| * | Handle case where conflicts aren't on disk yet | Sean McGivern | 2016-08-25 | 1 | -0/+11 |
| | | |||||
| * | Fix bug where conflict view would have one too many context sections | Douwe Maan | 2016-08-12 | 1 | -2/+4 |
| | | |||||
| * | Find match line headers by backtracking | Sean McGivern | 2016-08-12 | 1 | -11/+24 |
| | | | | | | This is more efficient for large files than performing a regex match on every single line. | ||||
| * | Move resolving code to ResolveService | Sean McGivern | 2016-08-12 | 1 | -8/+0 |
| | | |||||
| * | Clarify Conflict::File#sections method | Sean McGivern | 2016-08-12 | 1 | -3/+19 |
| | | |||||
| * | Don't allow resolving invalid conflicts | Sean McGivern | 2016-08-12 | 1 | -2/+2 |
| | | | | | | | | | | | An MR can only be resolved in the UI if: - It has conflicts. - It has valid diff_refs (in other words, it supports new diff notes). - It has no conflicts with one side missing. - It has no conflicts in binary files. - It has no conflicts in files too large to display. - It has no conflicts containing invalid conflict markers. | ||||
| * | Add blob_icon to conflict file JSON | Sean McGivern | 2016-08-12 | 1 | -2/+4 |
| | | |||||
| * | Add blob_path to conflict file JSON | Sean McGivern | 2016-08-12 | 1 | -3/+9 |
| | | |||||
| * | Use same resolution format on FE and BE | Sean McGivern | 2016-08-12 | 1 | -2/+2 |
| | | |||||
| * | Fix specs | Sean McGivern | 2016-08-12 | 1 | -11/+7 |
| | | | | | | | | | - Add match line header to expected result for `File#sections`. - Lowercase CSS colours. - Remove unused `diff_refs` keyword argument. - Rename `parent` -> `parent_file`, to be more explicit. - Skip an iteration when highlighting. | ||||
| * | Fix match line headers at start / end of file | Sean McGivern | 2016-08-12 | 1 | -16/+33 |
| | | |||||
| * | Highlight files based on merged file | Sean McGivern | 2016-08-12 | 1 | -2/+5 |
| | | |||||
| * | Add match line headers | Sean McGivern | 2016-08-12 | 1 | -1/+8 |
| | | |||||
| * | Handle conflict resolution errors in controller | Sean McGivern | 2016-08-12 | 1 | -5/+5 |
| | | |||||
| * | Auto-highlight conflict when rich_text is called | Sean McGivern | 2016-08-12 | 1 | -8/+5 |
| | | |||||
| * | Allow resolving conflicts in MR controller | Sean McGivern | 2016-08-12 | 1 | -1/+43 |
| | | |||||
| * | Handle multiple merge conflict files in collection | Sean McGivern | 2016-08-12 | 1 | -8/+10 |
| | | |||||
| * | Add backend for merge conflicts reading | Sean McGivern | 2016-08-12 | 1 | -0/+91 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |