summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 4536-move-ee-specific-javascripts-files-to4536-move-ee-specific-javascripts-files-toClement Ho2018-02-26420-2013/+7160
|\
| * Merge branch 'feature/migrate-recursive-tree-entries-fetching' into 'master'Robert Speicher2018-02-267-31/+29
| |\
| | * Migrate recursive tree entries fetching to GitalyAhmad Sherif2018-02-267-31/+29
| * | Merge branch 'jprovazn-subgroup-labels' into 'master'Sean McGivern2018-02-265-36/+116
| |\ \
| | * | Allow to find labels in ancestor groups and better group support in label ser...Jan Provaznik2018-02-265-36/+116
| |/ /
| * | Merge branch 'issue-edit-shortcut' into 'master'Filipa Lacerda2018-02-263-4/+20
| |\ \
| | * | Fixed issue edit shortcut not workingissue-edit-shortcutPhil Hughes2018-02-263-4/+20
| * | | Merge branch 'kp-ce-port-5013-fix-multiple-assignee-avatar-alignment' into 'm...Clement Ho2018-02-261-1/+11
| |\ \ \
| | * | | Fix assignee avatar and notes icon alignmentkp-ce-port-5013-fix-multiple-assignee-avatar-alignmentKushal Pandya2018-02-231-1/+11
| * | | | Merge branch 'suppress-squash-warnings' into 'master'Douwe Maan2018-02-262-1/+15
| |\ \ \ \
| | * | | | Suppress whitespace warnings in squash error messagessuppress-squash-warningsSean McGivern2018-02-262-1/+15
| * | | | | Merge branch '41255-refactoring-of-blob-link-methods-in-blob_helper' into 'ma...Douwe Maan2018-02-266-75/+88
| |\ \ \ \ \
| | * | | | | refactor methods inline41255-refactoring-of-blob-link-methods-in-blob_helperJames Lopez2018-02-233-8/+8
| | * | | | | inline methodsJames Lopez2018-02-232-25/+9
| | * | | | | fix fork button issueJames Lopez2018-02-231-1/+1
| | * | | | | refactor code based on feedbackJames Lopez2018-02-231-25/+26
| | * | | | | refactor code based on feedbackJames Lopez2018-02-234-18/+18
| | * | | | | refactor blob link methodsJames Lopez2018-02-231-10/+11
| | * | | | | fix static analysisJames Lopez2018-02-231-1/+1
| | * | | | | fix specsJames Lopez2018-02-231-3/+7
| | * | | | | fix specsJames Lopez2018-02-231-5/+6
| | * | | | | fix specsJames Lopez2018-02-231-1/+1
| | * | | | | more refactoringJames Lopez2018-02-231-17/+15
| | * | | | | some initial refactoringJames Lopez2018-02-234-17/+25
| | * | | | | refactor modify_file_linkJames Lopez2018-02-231-5/+18
| | * | | | | fix specJames Lopez2018-02-231-3/+3
| | * | | | | fix specsJames Lopez2018-02-231-1/+1
| | * | | | | some more refactoringJames Lopez2018-02-232-6/+10
| | * | | | | fix specsJames Lopez2018-02-231-4/+4
| | * | | | | refactor methods further (in helper)James Lopez2018-02-231-7/+20
| | * | | | | a bit more refactoringJames Lopez2018-02-231-25/+3
| | * | | | | initial refactorJames Lopez2018-02-231-14/+22
| * | | | | | Merge branch 'gitaly-docs' into 'master'Rémy Coutable2018-02-261-7/+17
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Clarify when disabling Gitaly makes senseJacob Vosmaer (GitLab)2018-02-261-7/+17
| |/ / / / /
| * | | | | Merge branch 'patch-28' into 'master'Sean McGivern2018-02-261-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Correcting documentation about project hooks settingsThomas Dudouet2018-02-231-1/+1
| * | | | | Merge branch 'dm-waitable-worker' into 'master'Sean McGivern2018-02-265-114/+145
| |\ \ \ \ \
| | * | | | | Allow bulk_perform_and_wait wait timeout to be overriddenDouwe Maan2018-02-261-2/+2
| | * | | | | Extract WaitableWorker out of AuthorizedProjectsWorkerDouwe Maan2018-02-265-114/+145
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'get-rid-of-hardcoded-path-or-names-in-factories' into 'master'Nick Thomas2018-02-262-10/+10
| |\ \ \ \ \
| | * | | | | Get rid of hard-coded user/project/group names that could clash with DB seque...Rémy Coutable2018-02-262-10/+10
| * | | | | | Merge branch 'jprovazn-issuable-data' into 'master'Filipa Lacerda2018-02-263-18/+18
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Don't convert issuable_initial_data into JSONjprovazn-issuable-dataJan Provaznik2018-02-263-18/+18
| * | | | | | Merge branch '43598-fix-duplicate-label-load-failure' into 'master'Phil Hughes2018-02-262-1/+6
| |\ \ \ \ \ \
| | * | | | | | Add changelog entryKushal Pandya2018-02-261-0/+5
| | * | | | | | Use imported `DropdownUtils`Kushal Pandya2018-02-261-1/+1
| * | | | | | | Merge branch 'mk/fix-error-code-for-repo-does-not-exist' into 'master'Douwe Maan2018-02-265-5/+23
| |\ \ \ \ \ \ \
| | * | | | | | | Respond 404 when repo does not existmk/fix-error-code-for-repo-does-not-existMichael Kozono2018-02-245-5/+23
| * | | | | | | | Merge branch 'grpc-unavailable-restart' into 'master'Douwe Maan2018-02-267-131/+250
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failedJacob Vosmaer (GitLab)2018-02-267-131/+250
| |/ / / / / / /