| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/master' into pipeline-emailspipeline-emails | Lin Jen-Shin | 2016-10-18 | 88 | -860/+2072 |
| |\ | |||||
| | * | Merge branch 'merge-conflicts-editor-2' into 'master' | Jacob Schatz | 2016-10-18 | 44 | -586/+1560 |
| | |\ | |||||
| | | * | Provide better error message to the usermerge-conflicts-editor-2 | Alfredo Sumaran | 2016-10-17 | 1 | -1/+1 |
| | | * | Merge branch 'master' into merge-conflicts-editor-2 | Alfredo Sumaran | 2016-10-17 | 21 | -150/+317 |
| | | |\ | |||||
| | | * \ | Merge branch 'master' into merge-conflicts-editor-2 | Sean McGivern | 2016-10-17 | 246 | -1531/+3847 |
| | | |\ \ | |||||
| | | * | | | Update CHANGELOG | Alfredo Sumaran | 2016-10-13 | 1 | -1/+0 |
| | | * | | | Add syntax highlighting to files | Alfredo Sumaran | 2016-10-13 | 1 | -0/+1 |
| | | * | | | Add blob_ace_mode to conflict content response | Sean McGivern | 2016-10-13 | 3 | -0/+17 |
| | | * | | | Fix discard message | Alfredo Sumaran | 2016-10-13 | 1 | -1/+1 |
| | | * | | | Update CHANGELOG | Alfredo Sumaran | 2016-10-13 | 1 | -0/+2 |
| | | * | | | Use plain JS to get elements and data and values | Alfredo Sumaran | 2016-10-13 | 1 | -5/+5 |
| | | * | | | Remove unused files | Alfredo Sumaran | 2016-10-13 | 2 | -550/+0 |
| | | * | | | Fix column limit on mysql | Alfredo Sumaran | 2016-10-13 | 1 | -1/+1 |
| | | * | | | Add more tests to check conflicts resolution | Alfredo Sumaran | 2016-10-13 | 4 | -51/+101 |
| | | * | | | Improve components for PhantomJs compatibility | Alfredo Sumaran | 2016-10-13 | 17 | -76/+140 |
| | | * | | | Use .some instead of .find for phantomjs compatibility | Alfredo Sumaran | 2016-10-13 | 1 | -9/+1 |
| | | * | | | Improve diff view switching and components | Alfredo Sumaran | 2016-10-13 | 6 | -61/+54 |
| | | * | | | Do not show Diff view switcher if all files are can be only resolved with an ... | Alfredo Sumaran | 2016-10-13 | 3 | -2/+15 |
| | | * | | | Ability to resolve conflicts for files with `text-editor` as conflict type | Alfredo Sumaran | 2016-10-13 | 7 | -159/+213 |
| | | * | | | Refactor JS code | Alfredo Sumaran | 2016-10-13 | 10 | -11/+545 |
| | | * | | | Fix editor spec | Sean McGivern | 2016-10-13 | 1 | -0/+1 |
| | | * | | | Add tests to check if files are resolved with Edit Inline mode | Alfredo Sumaran | 2016-10-13 | 1 | -0/+26 |
| | | * | | | check if files is set before counting | Alfredo Sumaran | 2016-10-13 | 1 | -0/+4 |
| | | * | | | Replace loading text with spinner | Alfredo Sumaran | 2016-10-13 | 2 | -3/+4 |
| | | * | | | Style for resolve conflicts form | Alfredo Sumaran | 2016-10-13 | 2 | -10/+21 |
| | | * | | | Styles for discard alert | Alfredo Sumaran | 2016-10-13 | 3 | -6/+18 |
| | | * | | | Replace textarea with Ace editor | Alfredo Sumaran | 2016-10-13 | 4 | -8/+30 |
| | | * | | | Implement editor to manually resolve merge conflicts | Alfredo Sumaran | 2016-10-13 | 11 | -73/+300 |
| | | * | | | We now support resolving conflicts with ambiguous markers | Douwe Maan | 2016-10-13 | 1 | -1/+0 |
| | | * | | | Simplify conflict file JSON creation | Sean McGivern | 2016-10-13 | 1 | -7/+15 |
| | | * | | | Add JSON Schema | Sean McGivern | 2016-10-13 | 2 | -0/+141 |
| | | * | | | Fix resolve service specs | Sean McGivern | 2016-10-13 | 1 | -2/+2 |
| | | * | | | Fix MR model spec | Sean McGivern | 2016-10-13 | 1 | -6/+6 |
| | | * | | | Fix specs | Sean McGivern | 2016-10-13 | 2 | -4/+4 |
| | | * | | | Make RuboCop happy | Sean McGivern | 2016-10-13 | 1 | -1/+0 |
| | | * | | | Allow setting content for resolutions | Sean McGivern | 2016-10-13 | 11 | -42/+395 |
| | | * | | | Add instrumentation to conflict classes | Sean McGivern | 2016-10-13 | 1 | -0/+1 |
| | * | | | | Merge branch 'fix-username-validator-endpoint' into 'master' | Stan Hu | 2016-10-17 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | | * | | | | Update endpoint to username validator | Alfredo Sumaran | 2016-10-17 | 1 | -1/+1 |
| | * | | | | | Merge branch '21395-standarize-markdown-headlines' into 'master' | Annabel Dunstone Gray | 2016-10-17 | 3 | -24/+17 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | | * | | | | change border color to variable | tauriedavis | 2016-10-17 | 2 | -4/+4 |
| | | * | | | | Apply better hierarchy to markdown headers and issue/mr titles21395-standarize-markdown-headlines | tauriedavis | 2016-10-17 | 3 | -21/+14 |
| | * | | | | | Merge branch '23358-expand-hide-pipeline-btn-text-doesn-t-match' into 'master' | Fatih Acet | 2016-10-17 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Swapped button text manipulation outcomes for the toggle query | Luke Bennett | 2016-10-17 | 1 | -1/+1 |
| | | | |_|_|/ | | |/| | | | |||||
| | * | | | | | Merge branch 'dz-rename-user-routes' into 'master' | Robert Speicher | 2016-10-17 | 17 | -98/+116 |
| | |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | | * | | | | Add todo for deprecated user routes and more information about deprecation to...dz-rename-user-routes | Dmitriy Zaporozhets | 2016-10-17 | 2 | -1/+3 |
| | | * | | | | Add user routing rename to CHANGELOG | Dmitriy Zaporozhets | 2016-10-13 | 1 | -0/+1 |
| | | * | | | | Remove /u/ prefix from user pages in documentation | Dmitriy Zaporozhets | 2016-10-13 | 13 | -87/+87 |
| | | * | | | | Update users routing spec | Dmitriy Zaporozhets | 2016-10-13 | 2 | -6/+18 |
| | | * | | | | Rename users routing from /u/:username to /users/:username for consistency wi... | Dmitriy Zaporozhets | 2016-10-12 | 1 | -4/+8 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |