Commits · 7ea641b6d0882fc782a7eb493daf8b66d076924b · jt-gitlab / GitLab Community Edition · GitLab

Snippets Groups Projects

Do not update/delete: Banner broadcast message test data

Do not update/delete: Notification broadcast message test data

Oct 13, 2016
- Add blob_ace_mode to conflict content response · 3764fd4b
  Sean McGivern authored 8 years ago
  
  3764fd4b
- Simplify conflict file JSON creation · 4743d194
  Sean McGivern authored 8 years ago
  
  4743d194
- Allow setting content for resolutions · 3f71c43e
  Sean McGivern authored 8 years ago
  3f71c43e
Sep 07, 2016
- Fix merge conflict size limit · 24424d93
  Sean McGivern authored 8 years ago
  
  24424d93
Aug 25, 2016
- Handle case where conflicts aren't on disk yet · 4a3d1a58
  Sean McGivern authored 8 years ago
  
  4a3d1a58
- Handle non-UTF-8 conflicts gracefully · 44eb3197
  Sean McGivern authored 8 years ago
  44eb3197
Aug 12, 2016
- Fix bug where conflict view would have one too many context sections · 254dbad8
  Douwe Maan authored 8 years ago
  
  254dbad8
- Find match line headers by backtracking · 4952a24f
  Sean McGivern authored 8 years ago
  4952a24f
- Add more tests for conflicts · ce7eb4e4
  Sean McGivern authored 8 years ago
  
  ce7eb4e4
- Move resolving code to ResolveService · ba327e69
  Sean McGivern authored 8 years ago
  
  ba327e69
- Clarify Conflict::File#sections method · ac9229a3
  Sean McGivern authored 8 years ago
  
  ac9229a3
- Don't allow resolving invalid conflicts · 427e7246
  Sean McGivern authored 8 years ago
  427e7246
- Add blob_icon to conflict file JSON · 52eb523c
  Sean McGivern authored 8 years ago
  
  52eb523c
- Add blob_path to conflict file JSON · e50e88b8
  Sean McGivern authored 8 years ago
  
  e50e88b8
- Use same resolution format on FE and BE · 3b84cfdc
  Sean McGivern authored 8 years ago
  
  3b84cfdc
- Fix specs · 261d47bc
  Sean McGivern authored 8 years ago
  261d47bc
- Fix match line headers at start / end of file · 6f3501fe
  Sean McGivern authored 8 years ago
  
  6f3501fe
- Handle case where one side deleted the file · f3cf40b8
  Sean McGivern authored 8 years ago
  
  f3cf40b8
- Highlight files based on merged file · 10cf933f
  Sean McGivern authored 8 years ago
  
  10cf933f
- Remove unneeded raise · 4d8b0293
  Sean McGivern authored 8 years ago
  
  4d8b0293
- Add match line headers · f0bbfe7a
  Sean McGivern authored 8 years ago
  
  f0bbfe7a
- Raise errors for large and binary files · 18398152
  Sean McGivern authored 8 years ago
  
  18398152
- Handle conflict resolution errors in controller · f2f84469
  Sean McGivern authored 8 years ago
  
  f2f84469
- Fix MR conflict resolution commits · 97ceadee
  Sean McGivern authored 8 years ago
  
  97ceadee
- Auto-highlight conflict when rich_text is called · 7af277f6
  Sean McGivern authored 8 years ago
  
  7af277f6
- Fix merge conflict reading for new diffs · 28ef06c5
  Sean McGivern authored 8 years ago
  
  28ef06c5
- Allow resolving conflicts in MR controller · 14a4b17d
  Sean McGivern authored 8 years ago
  
  14a4b17d
- Handle multiple merge conflict files in collection · a1c79612
  Sean McGivern authored 8 years ago
  
  a1c79612
- Add backend for merge conflicts reading · df2ed097
  Sean McGivern authored 8 years ago
  
  df2ed097