Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into sh-headless-chrome-support | Mike Greiling | 2017-10-31 | 262 | -3666/+4751 |
|\ | |||||
| * | Merge branch 'feature/migrate-find-wiki-page-to-gitaly' into 'master' | Sean McGivern | 2017-10-31 | 4 | -25/+110 |
| |\ | |||||
| | * | Migrate Gitlab::Git::Wiki#page to Gitalyfeature/migrate-find-wiki-page-to-gitaly | Ahmad Sherif | 2017-10-31 | 4 | -25/+110 |
| * | | Merge branch 'dm-ldap-identity-normalize-dn' into 'master' | Sean McGivern | 2017-10-31 | 9 | -12/+35 |
| |\ \ | |||||
| | * | | Normalize LDAP DN when looking up identity | Douwe Maan | 2017-10-31 | 9 | -12/+35 |
| * | | | Merge branch '39580-bump-carrierwave-to-1-2-1' into 'master' | Rémy Coutable | 2017-10-31 | 3 | -3/+8 |
| |\ \ \ | |||||
| | * | | | Bump carrierwave to 1.2.1 | Takuya Noguchi | 2017-10-30 | 3 | -3/+8 |
| * | | | | Merge branch 'multi-file-editor-vuex' into 'master' | Filipa Lacerda | 2017-10-31 | 63 | -2447/+1826 |
| |\ \ \ \ | |||||
| | * | | | | fixed up upload feature after master mergemulti-file-editor-vuex | Phil Hughes | 2017-10-31 | 7 | -46/+64 |
| | * | | | | Merge branch 'master' into multi-file-editor-vuex | Phil Hughes | 2017-10-31 | 21 | -264/+283 |
| | |\ \ \ \ | |||||
| | * | | | | | get branch name from the DOM | Phil Hughes | 2017-10-31 | 2 | -2/+4 |
| | * | | | | | Merge branch 'master' into multi-file-editor-vuex | Phil Hughes | 2017-10-31 | 66 | -750/+695 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | spec fixes | Phil Hughes | 2017-10-31 | 3 | -2/+7 |
| | * | | | | | | spec fixes | Phil Hughes | 2017-10-30 | 7 | -13/+19 |
| | * | | | | | | addressed feedback from review | Phil Hughes | 2017-10-30 | 19 | -74/+93 |
| | * | | | | | | Merge branch 'master' into multi-file-editor-vuex | Phil Hughes | 2017-10-30 | 132 | -524/+2018 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | updated karma specs | Phil Hughes | 2017-10-27 | 27 | -1030/+612 |
| | * | | | | | | | reset hash when changing files | Phil Hughes | 2017-10-26 | 2 | -2/+3 |
| | * | | | | | | | various different performance improvements | Phil Hughes | 2017-10-26 | 10 | -37/+24 |
| | * | | | | | | | fixed render_error not being hooked up correctly | Phil Hughes | 2017-10-26 | 5 | -34/+9 |
| | * | | | | | | | fixed some state bugs with the tabs | Phil Hughes | 2017-10-26 | 10 | -38/+53 |
| | * | | | | | | | correctly activate the next tab when closing a tab | Phil Hughes | 2017-10-26 | 3 | -3/+28 |
| | * | | | | | | | moved new file/directory into new store | Phil Hughes | 2017-10-26 | 19 | -692/+176 |
| | * | | | | | | | [WIP] Move multi-file editor store to Vuex | Phil Hughes | 2017-10-26 | 33 | -584/+910 |
| * | | | | | | | | Merge branch 'zj/gitlab-ce-zj-ruby-2.3.5' into 'master' | Sean McGivern | 2017-10-31 | 4 | -6/+11 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Be able to bundle gems with newer rubieszj/gitlab-ce-zj-ruby-2.3.5 | Zeger-Jan van de Weg | 2017-10-31 | 1 | -1/+1 |
| | * | | | | | | | | Upgrade Ruby to 2.3.5 | Zeger-Jan van de Weg | 2017-10-31 | 4 | -5/+10 |
| * | | | | | | | | | Merge branch 'docs/improve-maintenance' into 'master' | Stan Hu | 2017-10-31 | 1 | -13/+18 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Improve the maintenance policy page | Rémy Coutable | 2017-10-31 | 1 | -13/+18 |
| * | | | | | | | | | | Merge branch '23206-load-participants-async' into 'master' | Phil Hughes | 2017-10-31 | 45 | -205/+911 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Load participants async | Eric Eastwood | 2017-10-31 | 45 | -205/+911 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge branch 'fix/import-issue-assignees' into 'master' | Sean McGivern | 2017-10-31 | 7 | -1/+27 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | add changelog | James Lopez | 2017-10-31 | 1 | -0/+5 |
| | * | | | | | | | | | fix spec failure | James Lopez | 2017-10-31 | 1 | -0/+3 |
| | * | | | | | | | | | fix specsfix/import-issue-assignees | James Lopez | 2017-10-31 | 3 | -7/+10 |
| | * | | | | | | | | | fix missing issue assignees | James Lopez | 2017-10-31 | 4 | -1/+16 |
| | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch '39509-fix-wiki-create-sidebar-overlap' into 'master' | Annabel Dunstone Gray | 2017-10-31 | 2 | -5/+6 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fix overlap of right-sidebar and wiki create page form39509-fix-wiki-create-sidebar-overlap | Eric Eastwood | 2017-10-31 | 2 | -5/+6 |
| * | | | | | | | | | | Merge branch '31454-missing-project-id-pipeline-hook-data' into 'master' | Rémy Coutable | 2017-10-31 | 3 | -0/+16 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Adds project_id to pipeline hook data | Jacopo | 2017-10-30 | 3 | -0/+16 |
| * | | | | | | | | | | | Merge branch 'issue_38777' into 'master' | Sean McGivern | 2017-10-31 | 10 | -13/+230 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Allow promoting project milestones to group milestones | Felipe Artur | 2017-10-31 | 10 | -13/+230 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge branch 'feature/migrate-wiki-delete-page-to-gitaly' into 'master' | Sean McGivern | 2017-10-31 | 7 | -28/+69 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Migrate Gitlab::Git::Wiki#delete_page to Gitaly | Ahmad Sherif | 2017-10-31 | 7 | -28/+69 |
| * | | | | | | | | | | | Merge branch '39561-seed_fu-fails-to-load-gitlab-test' into 'master' | Sean McGivern | 2017-10-31 | 4 | -3/+114 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Handle large values on `MergeRequestDiffCommit` dates39561-seed_fu-fails-to-load-gitlab-test | Alejandro Rodríguez | 2017-10-30 | 4 | -3/+114 |
| * | | | | | | | | | | | | Merge branch 'patch-29' into 'master' | Stan Hu | 2017-10-31 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fix example typo. | Lawrence | 2017-10-31 | 1 | -1/+1 |
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch '38869-issue' into 'master' | Phil Hughes | 2017-10-31 | 7 | -53/+40 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Enable eslint | Filipa Lacerda | 2017-10-31 | 1 | -14/+11 |