| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix Merge Conflicts app to make it work with Vue 2 | Alfredo Sumaran | 2016-11-10 | 1 | -1/+16 |
| * | VueJSMigration: Remove parallel-conflict-line component. | Fatih Acet | 2016-11-10 | 2 | -19/+1 |
| * | Migrate Vue v1 to v2. | Fatih Acet | 2016-11-10 | 1 | -1/+1 |
| * | disable ESLint for all JavaScript files | winniehell | 2016-10-26 | 4 | -0/+4 |
| * | Provide better error message to the usermerge-conflicts-editor-2 | Alfredo Sumaran | 2016-10-17 | 1 | -1/+1 |
| * | Add syntax highlighting to files | Alfredo Sumaran | 2016-10-13 | 1 | -0/+1 |
| * | Improve components for PhantomJs compatibility | Alfredo Sumaran | 2016-10-13 | 4 | -3/+52 |
| * | Ability to resolve conflicts for files with `text-editor` as conflict type | Alfredo Sumaran | 2016-10-13 | 1 | -19/+24 |
| * | Refactor JS code | Alfredo Sumaran | 2016-10-13 | 1 | -1/+4 |
| * | Replace textarea with Ace editor | Alfredo Sumaran | 2016-10-13 | 1 | -7/+20 |
| * | Implement editor to manually resolve merge conflicts | Alfredo Sumaran | 2016-10-13 | 1 | -0/+63 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |