| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add more tests to check conflicts resolution | Alfredo Sumaran | 2016-10-13 | 1 | -1/+3 |
| * | Improve components for PhantomJs compatibility | Alfredo Sumaran | 2016-10-13 | 1 | -3/+3 |
| * | Use .some instead of .find for phantomjs compatibility | Alfredo Sumaran | 2016-10-13 | 1 | -9/+1 |
| * | Do not show Diff view switcher if all files are can be only resolved with an ... | Alfredo Sumaran | 2016-10-13 | 1 | -0/+12 |
| * | Ability to resolve conflicts for files with `text-editor` as conflict type | Alfredo Sumaran | 2016-10-13 | 1 | -114/+126 |
| * | Refactor JS code | Alfredo Sumaran | 2016-10-13 | 1 | -0/+419 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |