| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix Merge Conflicts app to make it work with Vue 2 | Alfredo Sumaran | 2016-11-10 | 2 | -22/+0 |
| * | VueJSMigration: Remove parallel-conflict-line component. | Fatih Acet | 2016-11-10 | 1 | -1/+10 |
| * | VueJS migration, replace {{{ with v-html | Fatih Acet | 2016-11-10 | 2 | -5/+3 |
| * | Fix discard message | Alfredo Sumaran | 2016-10-13 | 1 | -1/+1 |
| * | Improve components for PhantomJs compatibility | Alfredo Sumaran | 2016-10-13 | 4 | -2/+37 |
| * | Replace loading text with spinner | Alfredo Sumaran | 2016-10-13 | 1 | -1/+2 |
| * | Replace textarea with Ace editor | Alfredo Sumaran | 2016-10-13 | 1 | -1/+1 |
| * | Implement editor to manually resolve merge conflicts | Alfredo Sumaran | 2016-10-13 | 1 | -0/+6 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |