Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into 4536-move-ee-specific-javascripts-files-to4536-move-ee-specific-javascripts-files-to | Clement Ho | 2018-02-26 | 420 | -2013/+7160 |
|\ | |||||
| * | Merge branch 'feature/migrate-recursive-tree-entries-fetching' into 'master' | Robert Speicher | 2018-02-26 | 7 | -31/+29 |
| |\ | |||||
| | * | Migrate recursive tree entries fetching to Gitaly | Ahmad Sherif | 2018-02-26 | 7 | -31/+29 |
| * | | Merge branch 'jprovazn-subgroup-labels' into 'master' | Sean McGivern | 2018-02-26 | 5 | -36/+116 |
| |\ \ | |||||
| | * | | Allow to find labels in ancestor groups and better group support in label ser... | Jan Provaznik | 2018-02-26 | 5 | -36/+116 |
| |/ / | |||||
| * | | Merge branch 'issue-edit-shortcut' into 'master' | Filipa Lacerda | 2018-02-26 | 3 | -4/+20 |
| |\ \ | |||||
| | * | | Fixed issue edit shortcut not workingissue-edit-shortcut | Phil Hughes | 2018-02-26 | 3 | -4/+20 |
| * | | | Merge branch 'kp-ce-port-5013-fix-multiple-assignee-avatar-alignment' into 'm... | Clement Ho | 2018-02-26 | 1 | -1/+11 |
| |\ \ \ | |||||
| | * | | | Fix assignee avatar and notes icon alignmentkp-ce-port-5013-fix-multiple-assignee-avatar-alignment | Kushal Pandya | 2018-02-23 | 1 | -1/+11 |
| * | | | | Merge branch 'suppress-squash-warnings' into 'master' | Douwe Maan | 2018-02-26 | 2 | -1/+15 |
| |\ \ \ \ | |||||
| | * | | | | Suppress whitespace warnings in squash error messagessuppress-squash-warnings | Sean McGivern | 2018-02-26 | 2 | -1/+15 |
| * | | | | | Merge branch '41255-refactoring-of-blob-link-methods-in-blob_helper' into 'ma... | Douwe Maan | 2018-02-26 | 6 | -75/+88 |
| |\ \ \ \ \ | |||||
| | * | | | | | refactor methods inline41255-refactoring-of-blob-link-methods-in-blob_helper | James Lopez | 2018-02-23 | 3 | -8/+8 |
| | * | | | | | inline methods | James Lopez | 2018-02-23 | 2 | -25/+9 |
| | * | | | | | fix fork button issue | James Lopez | 2018-02-23 | 1 | -1/+1 |
| | * | | | | | refactor code based on feedback | James Lopez | 2018-02-23 | 1 | -25/+26 |
| | * | | | | | refactor code based on feedback | James Lopez | 2018-02-23 | 4 | -18/+18 |
| | * | | | | | refactor blob link methods | James Lopez | 2018-02-23 | 1 | -10/+11 |
| | * | | | | | fix static analysis | James Lopez | 2018-02-23 | 1 | -1/+1 |
| | * | | | | | fix specs | James Lopez | 2018-02-23 | 1 | -3/+7 |
| | * | | | | | fix specs | James Lopez | 2018-02-23 | 1 | -5/+6 |
| | * | | | | | fix specs | James Lopez | 2018-02-23 | 1 | -1/+1 |
| | * | | | | | more refactoring | James Lopez | 2018-02-23 | 1 | -17/+15 |
| | * | | | | | some initial refactoring | James Lopez | 2018-02-23 | 4 | -17/+25 |
| | * | | | | | refactor modify_file_link | James Lopez | 2018-02-23 | 1 | -5/+18 |
| | * | | | | | fix spec | James Lopez | 2018-02-23 | 1 | -3/+3 |
| | * | | | | | fix specs | James Lopez | 2018-02-23 | 1 | -1/+1 |
| | * | | | | | some more refactoring | James Lopez | 2018-02-23 | 2 | -6/+10 |
| | * | | | | | fix specs | James Lopez | 2018-02-23 | 1 | -4/+4 |
| | * | | | | | refactor methods further (in helper) | James Lopez | 2018-02-23 | 1 | -7/+20 |
| | * | | | | | a bit more refactoring | James Lopez | 2018-02-23 | 1 | -25/+3 |
| | * | | | | | initial refactor | James Lopez | 2018-02-23 | 1 | -14/+22 |
| * | | | | | | Merge branch 'gitaly-docs' into 'master' | Rémy Coutable | 2018-02-26 | 1 | -7/+17 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | Clarify when disabling Gitaly makes sense | Jacob Vosmaer (GitLab) | 2018-02-26 | 1 | -7/+17 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'patch-28' into 'master' | Sean McGivern | 2018-02-26 | 1 | -1/+1 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Correcting documentation about project hooks settings | Thomas Dudouet | 2018-02-23 | 1 | -1/+1 |
| * | | | | | Merge branch 'dm-waitable-worker' into 'master' | Sean McGivern | 2018-02-26 | 5 | -114/+145 |
| |\ \ \ \ \ | |||||
| | * | | | | | Allow bulk_perform_and_wait wait timeout to be overridden | Douwe Maan | 2018-02-26 | 1 | -2/+2 |
| | * | | | | | Extract WaitableWorker out of AuthorizedProjectsWorker | Douwe Maan | 2018-02-26 | 5 | -114/+145 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Merge branch 'get-rid-of-hardcoded-path-or-names-in-factories' into 'master' | Nick Thomas | 2018-02-26 | 2 | -10/+10 |
| |\ \ \ \ \ | |||||
| | * | | | | | Get rid of hard-coded user/project/group names that could clash with DB seque... | Rémy Coutable | 2018-02-26 | 2 | -10/+10 |
| * | | | | | | Merge branch 'jprovazn-issuable-data' into 'master' | Filipa Lacerda | 2018-02-26 | 3 | -18/+18 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Don't convert issuable_initial_data into JSONjprovazn-issuable-data | Jan Provaznik | 2018-02-26 | 3 | -18/+18 |
| * | | | | | | Merge branch '43598-fix-duplicate-label-load-failure' into 'master' | Phil Hughes | 2018-02-26 | 2 | -1/+6 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Add changelog entry | Kushal Pandya | 2018-02-26 | 1 | -0/+5 |
| | * | | | | | | Use imported `DropdownUtils` | Kushal Pandya | 2018-02-26 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'mk/fix-error-code-for-repo-does-not-exist' into 'master' | Douwe Maan | 2018-02-26 | 5 | -5/+23 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Respond 404 when repo does not existmk/fix-error-code-for-repo-does-not-exist | Michael Kozono | 2018-02-24 | 5 | -5/+23 |
| * | | | | | | | | Merge branch 'grpc-unavailable-restart' into 'master' | Douwe Maan | 2018-02-26 | 7 | -131/+250 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failed | Jacob Vosmaer (GitLab) | 2018-02-26 | 7 | -131/+250 |
| |/ / / / / / / |