summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Delete conflicting orphaned routesmk-delete-orphaned-routes-before-validationMichael Kozono2018-01-043-0/+79
* Merge branch 'jivl-activate-repo-cookie-preferences' into 'master'Tim Zallmann2018-01-0412-2/+86
|\
| * Added multi editor setting on the profile preferences pageJose Ivan Vargas2018-01-0412-2/+86
|/
* Merge branch '41396-ee_compat_check-and-security-fix-development' into 'master'Rémy Coutable2018-01-041-0/+1
|\
| * Do not run ee_compat_check on security branches41396-ee_compat_check-and-security-fix-developmentAlessio Caiazza2018-01-041-0/+1
* | Merge branch 'mdelaossa/gitlab-ce-31995-project-limit-default-fix'Dmitriy Zaporozhets2018-01-045-6/+63
|\ \
| * | User#projects_limit remove DB default and added NOT NULL constraintMario de la Ossa2017-12-305-6/+63
* | | Merge branch 'prettier-fixes' into 'master'Tim Zallmann2018-01-042-5/+5
|\ \ \
| * | | Moves prettier to dev dependencyprettier-fixesJacob Schatz2018-01-042-5/+5
| | |/ | |/|
* | | Merge branch 'jramsay-41590-add-readme-case' into 'master'Douwe Maan2018-01-042-1/+6
|\ \ \
| * | | Remove downcase from special path helperJames Ramsay2018-01-042-1/+6
* | | | Merge branch 'conditionally-eager-load-event-target-authors' into 'master'Douwe Maan2018-01-044-1/+40
|\ \ \ \
| * | | | Eager load event target authors whenever possibleconditionally-eager-load-event-target-authorsYorick Peterse2018-01-044-1/+40
* | | | | Merge branch 'rc/rename-db-seed-fu-job' into 'master'Stan Hu2018-01-041-5/+5
|\ \ \ \ \
| * | | | | Rename db:seed_fu-{pg,mysql} to gitlab:setup-{pg,mysql}Rémy Coutable2018-01-041-5/+5
* | | | | | Merge branch '41468-error-500-trying-to-view-a-merge-request-json-undefined-m...Douwe Maan2018-01-043-8/+53
|\ \ \ \ \ \
| * | | | | | Fix error when viewing diffs without blobs41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclassSean McGivern2018-01-043-8/+53
* | | | | | | Merge branch 'docs-update-kubernetes-documentation' into 'master'Kamil Trzciński2018-01-043-2/+5
|\ \ \ \ \ \ \
| * | | | | | | Update Kubernetes service documentationdocs-update-kubernetes-documentationMayra Cabrera2018-01-033-2/+5
* | | | | | | | Merge branch '3377-use-artifacts-tests-from-ee' into 'master'Rémy Coutable2018-01-041-13/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | Just use the tests from EE3377-use-artifacts-tests-from-eeLin Jen-Shin2017-12-261-13/+34
* | | | | | | | | Merge branch '41480-require-custom-cops' into 'master'Rémy Coutable2018-01-042-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Require our own custom cops; Remove missing cops41480-require-custom-copsLin Jen-Shin2017-12-262-3/+3
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ce-gitaly-remote-mirror-prep' into 'master'Dmitriy Zaporozhets2018-01-045-100/+212
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move git operations for UpdateRemoteMirrorService into Gitlab::Gitce-gitaly-remote-mirror-prepAlejandro Rodríguez2018-01-031-0/+75
| * | | | | | | | | Move delete_remote_branches from Gitlab::Shell to Gitlab::Git::RepositoryAlejandro Rodríguez2018-01-034-48/+81
| * | | | | | | | | Move push_remote_branches from Gitlab::Shell to Gitlab::Git::RepositoryAlejandro Rodríguez2018-01-034-52/+56
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mk-no-op-delete-conflicting-redirects' into 'master'Douwe Maan2018-01-045-88/+17
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Make DeleteConflictingRedirectRoutes no-opmk-no-op-delete-conflicting-redirectsMichael Kozono2018-01-035-88/+17
* | | | | | | | | Merge branch '40533-groups-tree-updates' into 'master'Filipa Lacerda2018-01-0417-157/+334
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Make tooltip placement bottom by default as per design guidelines40533-groups-tree-updatesKushal Pandya2018-01-043-2/+4
| * | | | | | | | Fix groups list icon, timestamp alignment and row heightKushal Pandya2018-01-041-3/+24
| * | | | | | | | Update test to remove carent icon checkKushal Pandya2018-01-021-8/+0
| * | | | | | | | Update styles to fix SVG caret alignmentKushal Pandya2017-12-281-1/+7
| * | | | | | | | Update selector to test SVG icon nameKushal Pandya2017-12-281-7/+3
| * | | | | | | | Use SVG sprite iconsKushal Pandya2017-12-281-5/+10
| * | | | | | | | Use ItemStatValue component for project star countKushal Pandya2017-12-261-5/+5
| * | | | | | | | Make `title` optionalKushal Pandya2017-12-261-1/+2
| * | | | | | | | Add changelog entryKushal Pandya2017-12-261-0/+6
| * | | | | | | | Update selector to test SVG icon name, cleanup testsKushal Pandya2017-12-262-45/+18
| * | | | | | | | Update icon names, add `updated_at` prop to mock objectsKushal Pandya2017-12-261-3/+19
| * | | | | | | | Update styles to show `updatedAt`Kushal Pandya2017-12-261-9/+34
| * | | | | | | | Use ItemStatsValue Component, add `updatedAt` info for projectsKushal Pandya2017-12-261-51/+37
| * | | | | | | | ItemStatsValue ComponentKushal Pandya2017-12-262-0/+148
| * | | | | | | | Update avatar size to be 24pxKushal Pandya2017-12-261-3/+5
| * | | | | | | | Update icon name to use from SVG spriteKushal Pandya2017-12-261-3/+3
| * | | | | | | | Use SVG sprite iconsKushal Pandya2017-12-262-17/+14
| * | | | | | | | Add `updatedAt` prop for ProjectsKushal Pandya2017-12-261-0/+1
| * | | | | | | | Reduce font size for 24px identiconKushal Pandya2017-12-261-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'sh-validate-path-project-import' into 'master'Yorick Peterse2018-01-043-10/+25
|\ \ \ \ \ \ \ \
View Lorry Controller Status