summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into refactor-environments-folderrefactor-environments-folderClement Ho2018-02-26125-379/+343
|\
| * Merge branch 'sh-fix-issue-43631' into 'master'Stan Hu2018-02-272-4/+4
| |\ | | | | | | | | | | | | | | | | | | Adjust the API issues move spec to use project ID 0 Closes #43631 See merge request gitlab-org/gitlab-ce!17381
| | * Adjust the API issues move spec to use project ID 0Stan Hu2018-02-262-4/+4
| | | | | | | | | | | | Closes #43631
| * | Merge branch '43532-error-on-admin-applications-prometheus-template' into ↵Stan Hu2018-02-265-26/+77
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | 'master' Resolve "Error 500 on route "/admin/application_settings/services/1882/edit" -> edit Prometheus Service Template" Closes #43532 See merge request gitlab-org/gitlab-ce!17377
| | * Resolve "Error 500 on route "/admin/application_settings/services/1882/edit" ↵Mayra Cabrera2018-02-265-26/+77
| |/ | | | | | | -> edit Prometheus Service Template"
| * Merge branch 'dispatcher-switch' into 'master'Jacob Schatz2018-02-2615-196/+91
| |\ | | | | | | | | | | | | Refactor wildcard dispatcher imports See merge request gitlab-org/gitlab-ce!17297
| | * 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/javascripts See merge request gitlab-org/gitlab-ce!17272
| | * 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 component See merge request gitlab-org/gitlab-ce!16947
| | * Move BoardNewIssue vue componentGeorge Tsiolis2018-02-085-41/+61
| | |
* | | Remove environments folder webpack entry pointClement Ho2018-02-264-5/+5
|/ /
* | Merge branch 'blob-webpack-bundle-remove-tags' into 'master'Clement Ho2018-02-262-4/+0
|\ \ | | | | | | | | | | | | Remove webpack bundle tags for blob See merge request gitlab-org/gitlab-ce!17331
| * | 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 Gitaly See merge request gitlab-org/gitlab-ce!17191
| * | 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 service See merge request gitlab-org/gitlab-ce!17209
| * | | Allow to find labels in ancestor groups and better group support in label ↵Jan Provaznik2018-02-265-36/+116
|/ / / | | | | | | | | | service
* | | Merge branch 'issue-edit-shortcut' into 'master'Filipa Lacerda2018-02-263-4/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue edit shortcut not working Closes #43560 See merge request gitlab-org/gitlab-ce!17360
| * | | Fixed issue edit shortcut not workingissue-edit-shortcutPhil Hughes2018-02-263-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was caused by the element getting cached on the class before the Vue app has finished rendering. Closes #43560
* | | | Merge branch 'kp-ce-port-5013-fix-multiple-assignee-avatar-alignment' into ↵Clement Ho2018-02-261-1/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' CE: Fix multiple assignees avatar alignment in issues list See merge request gitlab-org/gitlab-ce!17308
| * | | | 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 messages Closes gitlab-ee#3639 See merge request gitlab-org/gitlab-ce!17317
| * | | | | Suppress whitespace warnings in squash error messagessuppress-squash-warningsSean McGivern2018-02-262-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | These are obscuring the real error, which is confusing for everyone.
* | | | | | Merge branch '41255-refactoring-of-blob-link-methods-in-blob_helper' into ↵Douwe Maan2018-02-266-75/+88
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Refactoring of blob link methods in blob_helper" Closes #41255 See merge request gitlab-org/gitlab-ce!16851
| * | | | | | 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 sense Closes #43551 See merge request gitlab-org/gitlab-ce!17357
| * | | | | | 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 settings See merge request gitlab-org/gitlab-ce!17332
| * | | | | Correcting documentation about project hooks settingsThomas Dudouet2018-02-231-1/+1
| | | | | |
* | | | | | Merge branch 'dm-waitable-worker' into 'master'Sean McGivern2018-02-265-114/+145
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract WaitableWorker out of AuthorizedProjectsWorker See merge request gitlab-org/gitlab-ce!17356
View Lorry Controller Status