| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/master' into pipeline-emailspipeline-emails | Lin Jen-Shin | 2016-10-18 | 16 | -74/+706 |
| |\ | |||||
| | * | Merge branch 'merge-conflicts-editor-2' into 'master' | Jacob Schatz | 2016-10-18 | 7 | -41/+574 |
| | |\ | |||||
| | | * | Merge branch 'master' into merge-conflicts-editor-2 | Alfredo Sumaran | 2016-10-17 | 7 | -27/+72 |
| | | |\ | |||||
| | | * \ | Merge branch 'master' into merge-conflicts-editor-2 | Sean McGivern | 2016-10-17 | 37 | -129/+682 |
| | | |\ \ | |||||
| | | * | | | Add blob_ace_mode to conflict content response | Sean McGivern | 2016-10-13 | 2 | -0/+12 |
| | | * | | | Add more tests to check conflicts resolution | Alfredo Sumaran | 2016-10-13 | 2 | -49/+97 |
| | | * | | | Improve diff view switching and components | Alfredo Sumaran | 2016-10-13 | 1 | -5/+5 |
| | | * | | | Ability to resolve conflicts for files with `text-editor` as conflict type | Alfredo Sumaran | 2016-10-13 | 1 | -1/+37 |
| | | * | | | Refactor JS code | Alfredo Sumaran | 2016-10-13 | 1 | -2/+2 |
| | | * | | | 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 |
| | | * | | | We now support resolving conflicts with ambiguous markers | Douwe Maan | 2016-10-13 | 1 | -1/+0 |
| | | * | | | 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 | 1 | -2/+2 |
| | | * | | | Make RuboCop happy | Sean McGivern | 2016-10-13 | 1 | -1/+0 |
| | | * | | | Allow setting content for resolutions | Sean McGivern | 2016-10-13 | 2 | -18/+289 |
| | * | | | | Merge branch 'dz-rename-user-routes' into 'master' | Robert Speicher | 2016-10-17 | 2 | -6/+18 |
| | |\ \ \ \ | |||||
| | | * | | | | Update users routing spec | Dmitriy Zaporozhets | 2016-10-13 | 2 | -6/+18 |
| | * | | | | | Fixed find file keyboard navigationfind-file-enter-fix | Phil Hughes | 2016-10-17 | 1 | -0/+42 |
| | | |_|_|/ | |/| | | | |||||
| | * | | | | Merge branch 'fix-pipeline-metrics-failure' into 'master' dz-check-if-green23430-accept-full-linkedin-url-on-gitlab-profile-page | Douwe Maan | 2016-10-17 | 1 | -2/+2 |
| | |\ \ \ \ | |||||
| | | * | | | | Fix broken specs on MySQL after https://gitlab.com/gitlab-org/gitlab-ce/merge...fix-pipeline-metrics-failure | Kamil Trzcinski | 2016-10-17 | 1 | -2/+2 |
| | * | | | | | Fix Test Env (proper error handling when gitlab-shell is not clonned) | Valery Sizov | 2016-10-17 | 1 | -1/+3 |
| | |/ / / / | |||||
| | * | | | | Merge branch 'add-pipeline-metrics-worker' into 'master' | Kamil Trzciński | 2016-10-17 | 2 | -18/+55 |
| | |\ \ \ \ | |||||
| | | * | | | | Improve spec for pipeline metrics workeradd-pipeline-metrics-worker | Kamil Trzcinski | 2016-10-17 | 2 | -18/+55 |
| | | | |_|/ | | |/| | | |||||
| | * | | | | Merge branch 'ebraminio/gitlab-ce-master' into 'master' | Robert Speicher | 2016-10-17 | 4 | -8/+14 |
| | |\ \ \ \ | | |/ / / | |/| | | | |||||
| | | * | | | Add RTL support to markdown renderer | Ebrahim Byagowi | 2016-10-16 | 4 | -8/+14 |
| * | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emails | Lin Jen-Shin | 2016-10-17 | 26 | -65/+494 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Fix broken rspec in compare text | Stan Hu | 2016-10-16 | 1 | -1/+1 |
| | * | | | | Fix broken Spinach tests caused by changes in !6550 | Stan Hu | 2016-10-16 | 1 | -1/+1 |
| | * | | | | Merge branch 'fix-merge-request-diff-spinach-failures' into 'master' | Dmitriy Zaporozhets | 2016-10-16 | 1 | -0/+1 |
| | |\ \ \ \ | | |/ / / | |/| | | | |||||
| | | * | | | Fix Spinach merge request diff failures | Stan Hu | 2016-10-15 | 1 | -0/+1 |
| | * | | | | Fix 404 when group path has dot in the namedz-fix-group-with-dot | Dmitriy Zaporozhets | 2016-10-16 | 1 | -0/+6 |
| | |/ / / | |||||
| | * | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce | Jacob Schatz | 2016-10-15 | 1 | -2/+3 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch 'dz-handle-unmatched-routes' into 'master' | Dmitriy Zaporozhets | 2016-10-15 | 1 | -2/+3 |
| | | |\ \ \ | |||||
| | | | * | | | Revert "Update git over http test to match new routing"dz-handle-unmatched-routes | Dmitriy Zaporozhets | 2016-10-15 | 1 | -2/+3 |
| | * | | | | | Don't use member properties in users_spec, and remove loading ref. | Bryce Johnson | 2016-10-15 | 1 | -5/+2 |
| | * | | | | | Back off the array spreading, bc poltergeist freaks out. | Bryce Johnson | 2016-10-15 | 1 | -3/+3 |
| | * | | | | | Update filled in field for two_factor auth to use id. | Bryce Johnson | 2016-10-15 | 1 | -1/+1 |
| | * | | | | | Fix nesting on sessions/new. | Bryce Johnson | 2016-10-15 | 1 | -1/+1 |
| | * | | | | | Click first Sign In in login_helper. | Bryce Johnson | 2016-10-15 | 1 | -3/+1 |
| | * | | | | | Add tests for gl_field_errors. | Bryce Johnson | 2016-10-15 | 2 | -0/+126 |
| | * | | | | | Shush rubocop. | Bryce Johnson | 2016-10-15 | 1 | -2/+2 |
| | * | | | | | Get tests passing. | Bryce Johnson | 2016-10-15 | 2 | -5/+8 |
| | * | | | | | Make UX upgrades to SignIn/Register views. | Bryce Johnson | 2016-10-15 | 4 | -15/+41 |
| | |/ / / / | |||||
| | * | | | | Merge branch '23167-min-row-height' into 'master' | Fatih Acet | 2016-10-14 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | | * | | | | Replace generic table with | Annabel Dunstone Gray | 2016-10-10 | 1 | -1/+1 |
| | * | | | | | Merge branch 'mr-tabs-affix' into 'master' | Fatih Acet | 2016-10-14 | 1 | -0/+1 |
| | |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | | * | | | | Don't run affix tabs in test envmr-tabs-affix | Phil Hughes | 2016-10-10 | 1 | -33/+0 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |