| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Use GrapeDSL for commitszj-grapify-commits | Z.J. van de Weg | 2016-10-18 | 1 | -60/+69 |
| * | Merge branch 'issue_19734_2' into 'master' | Sean McGivern | 2016-10-18 | 21 | -174/+398 |
| |\ | |||||
| | * | Merge branch 'master' into issue_19734_2 | Phil Hughes | 2016-10-18 | 53 | -634/+1635 |
| | |\ | |||||
| | * | | Add visibility level to project repositoryissue_19734_2 | Felipe Artur | 2016-10-17 | 21 | -174/+398 |
| * | | | Merge branch 'looser-time-in-specs' into 'master' | Douwe Maan | 2016-10-18 | 8 | -14/+27 |
| |\ \ \ | |_|/ |/| | | |||||
| | * | | Add a be_like_time matcher and use it in specs | Nick Thomas | 2016-10-17 | 8 | -14/+27 |
| * | | | Merge branch 'adam-fix-mr-diff-symlink-file-conversion' into 'master' | Sean McGivern | 2016-10-18 | 3 | -5/+10 |
| |\ \ \ | |||||
| | * | | | Fix the diff in the merge request view when converting a symlink to a regular...adam-fix-mr-diff-symlink-file-conversion | Adam Niedzielski | 2016-10-17 | 3 | -5/+10 |
| * | | | | Merge branch 'faster_toggle_award_url_helper_method' into 'master' | Yorick Peterse | 2016-10-18 | 2 | -3/+7 |
| |\ \ \ \ | |||||
| | * | | | | Execute specific named route method from toggle_award_url helper methodfaster_toggle_award_url_helper_method | Paco Guzman | 2016-10-18 | 2 | -3/+7 |
| * | | | | | Merge branch 'fix/build-erase-race-condition' into 'master' | Kamil Trzciński | 2016-10-18 | 3 | -15/+40 |
| |\ \ \ \ \ | |/ / / / |/| | | | | |||||
| | * | | | | Fix Changelog entry for fix to CI artifacts erase | Grzegorz Bizon | 2016-10-18 | 1 | -1/+0 |
| | * | | | | Add Changelog entry to fix for removing artifactsfix/build-erase-race-condition | Grzegorz Bizon | 2016-10-17 | 1 | -0/+2 |
| | * | | | | Avoid race condition when expiring artifacts | Grzegorz Bizon | 2016-10-17 | 2 | -15/+39 |
| * | | | | | 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 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |