| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Use `:empty_project` where possible throughout spec/librs-empty_project-lib | Robert Speicher | 2017-01-25 | 1 | -1/+1 |
| * | Add blob_ace_mode to conflict content response | Sean McGivern | 2016-10-13 | 1 | -0/+11 |
| * | Find match line headers by backtracking | Sean McGivern | 2016-08-12 | 1 | -0/+104 |
| * | Add more tests for conflicts | Sean McGivern | 2016-08-12 | 1 | -3/+3 |
| * | Clarify Conflict::File#sections method | Sean McGivern | 2016-08-12 | 1 | -11/+12 |
| * | Add blob_icon to conflict file JSON | Sean McGivern | 2016-08-12 | 1 | -0/+4 |
| * | Add blob_path to conflict file JSON | Sean McGivern | 2016-08-12 | 1 | -1/+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 | -3/+2 |
| * | Auto-highlight conflict when rich_text is called | Sean McGivern | 2016-08-12 | 1 | -5/+11 |
| * | Allow resolving conflicts in MR controller | Sean McGivern | 2016-08-12 | 1 | -0/+66 |
| * | Handle multiple merge conflict files in collection | Sean McGivern | 2016-08-12 | 1 | -8/+5 |
| * | Add backend for merge conflicts reading | Sean McGivern | 2016-08-12 | 1 | -0/+76 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |