Resolve Merge conflicts in editor (!6374) · Merge requests · GitLab.org / GitLab FOSS

An error occurred while fetching this tab.

Merged Alfredo Sumaran requested to merge merge-conflicts-editor-2 into master 8 years ago

Oct 17, 2016
- Provide better error message to the user · 28dbfd5c
  Alfredo Sumaran authored 8 years ago
  
  28dbfd5c
- Merge branch 'master' into merge-conflicts-editor-2 · a975e4cb
  Alfredo Sumaran authored 8 years ago
  
  a975e4cb
- Merge branch 'master' into merge-conflicts-editor-2 · 86dcb79b
  Sean McGivern authored 8 years ago
  
  86dcb79b
Oct 13, 2016
- Update CHANGELOG · 26e327ea
  Alfredo Sumaran authored 8 years ago
  
  26e327ea
- Add syntax highlighting to files · f5de2ce3
  Alfredo Sumaran authored 8 years ago
  
  f5de2ce3
- Add blob_ace_mode to conflict content response · 3764fd4b
  Sean McGivern authored 8 years ago
  
  3764fd4b
- Fix discard message · cdd0dd50
  Alfredo Sumaran authored 8 years ago
  
  cdd0dd50
- Update CHANGELOG · edd30976
  Alfredo Sumaran authored 8 years ago
  
  edd30976
- Use plain JS to get elements and data and values · 6141816c
  Alfredo Sumaran authored 8 years ago
  
  6141816c
- Remove unused files · 8fd7a594
  Alfredo Sumaran authored 8 years ago
  
  8fd7a594
- Fix column limit on mysql · cc874d91
  Alfredo Sumaran authored 8 years ago
  
  cc874d91
- Add more tests to check conflicts resolution · 54bfe707
  Alfredo Sumaran authored 8 years ago
  
  54bfe707
- Improve components for PhantomJs compatibility · c4142cf9
  Alfredo Sumaran authored 8 years ago
  
  c4142cf9
- Use .some instead of .find for phantomjs compatibility · 4f76ff0e
  Alfredo Sumaran authored 8 years ago
  
  4f76ff0e
- Improve diff view switching and components · f947972d
  Alfredo Sumaran authored 8 years ago
  
  f947972d
- Do not show Diff view switcher if all files are can be only resolved with an editor · cebad0fb
  Alfredo Sumaran authored 8 years ago
  
  cebad0fb
- Ability to resolve conflicts for files with `text-editor` as conflict type · 197ac5eb
  Alfredo Sumaran authored 8 years ago
  
  197ac5eb
- Refactor JS code · a8ac9089
  Alfredo Sumaran authored 8 years ago
  
  - Use a store base object to manage application state. - Add a service to handle ajax requests. - Load code only when needed
  a8ac9089
- Fix editor spec · e84f959a
  Sean McGivern authored 8 years ago
  
  e84f959a
- Add tests to check if files are resolved with Edit Inline mode · 4178ddee
  Alfredo Sumaran authored 8 years ago
  
  4178ddee
- check if files is set before counting · 12ca1608
  Alfredo Sumaran authored 8 years ago
  
  12ca1608
- Replace loading text with spinner · 0402a183
  Alfredo Sumaran authored 8 years ago
  
  0402a183
- Style for resolve conflicts form · 02bfb0ff
  Alfredo Sumaran authored 8 years ago
  
  02bfb0ff
- Styles for discard alert · 17830296
  Alfredo Sumaran authored 8 years ago
  
  17830296
- Replace textarea with Ace editor · a3eb39a1
  Alfredo Sumaran authored 8 years ago
  
  a3eb39a1
- Implement editor to manually resolve merge conflicts · 26f658de
  Alfredo Sumaran authored 8 years ago
  
  26f658de
- We now support resolving conflicts with ambiguous markers · 6af52d7d
  Douwe Maan authored 8 years ago
  
  6af52d7d
- Simplify conflict file JSON creation · 4743d194
  Sean McGivern authored 8 years ago
  
  4743d194
- Add JSON Schema · 7529bbae
  Sean McGivern authored 8 years ago
  
  7529bbae
- Fix resolve service specs · 98dd958d
  Sean McGivern authored 8 years ago
  
  98dd958d
- Fix MR model spec · 082be091
  Sean McGivern authored 8 years ago
  
  082be091
- Fix specs · 241cca01
  Sean McGivern authored 8 years ago
  
  241cca01
- Make RuboCop happy · 9727366b
  Sean McGivern authored 8 years ago
  
  9727366b
- Allow setting content for resolutions · 3f71c43e
  Sean McGivern authored 8 years ago
  
  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).
  3f71c43e
- Add instrumentation to conflict classes · 5c525933
  Sean McGivern authored 8 years ago
  
  5c525933

Resolve Merge conflicts in editor

What does this MR do?

Are there points in the code the reviewer needs to double check?

Why was this MR needed?

Screenshots (if relevant)

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

Activity

Resolve Merge conflicts in editor

What does this MR do?

Are there points in the code the reviewer needs to double check?

Why was this MR needed?

Screenshots (if relevant)

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

Merge request reports

Activity