summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* configure webpack to watch for new auto-entries instead of restarting webpack...fix-webpack-dynamic-entriesMike Greiling2018-02-272-7/+26
* move node config to bottomMike Greiling2018-02-261-6/+7
* convert config.entry into an functionMike Greiling2018-02-261-22/+29
* update webpack-dev-server to include fix for DynamicEntryPlugin supportMike Greiling2018-02-262-4/+4
* Merge branch 'sh-fix-issue-43631' into 'master'Stan Hu2018-02-272-4/+4
|\
| * Adjust the API issues move spec to use project ID 0Stan Hu2018-02-262-4/+4
* | Merge branch '43532-error-on-admin-applications-prometheus-template' into 'ma...Stan Hu2018-02-265-26/+77
|\ \ | |/ |/|
| * Resolve "Error 500 on route "/admin/application_settings/services/1882/edit" ...Mayra Cabrera2018-02-265-26/+77
|/
* Merge branch 'dispatcher-switch' into 'master'Jacob Schatz2018-02-2615-196/+91
|\
| * Refactor wildcard dispatcher importsClement Ho2018-02-2615-196/+91
|/
* Merge branch '4536-move-ee-specific-javascripts-files-to' into 'master'Clement Ho2018-02-2699-112/+110
|\
| * Move EE-specific JavaScript files to ee/app/assets/javascriptsRémy Coutable2018-02-2699-112/+110
|/
* Merge branch 'refactor/move-board-new-issue-vue-component' into 'master'Filipa Lacerda2018-02-265-41/+61
|\
| * Move BoardNewIssue vue componentGeorge Tsiolis2018-02-085-41/+61
* | Merge branch 'blob-webpack-bundle-remove-tags' into 'master'Clement Ho2018-02-262-4/+0
|\ \
| * | Remove webpack bundle tags for blobJacob Schatz2018-02-262-4/+0
|/ /
* | 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
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |