summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 11.0.0-rc6v11.0.0-rc6Mayra Cabrera2018-06-071-1/+1
|
* Merge branch '11-0-stable-prepare-rc6' into '11-0-stable'Mayra Cabrera2018-06-07585-2930/+11321
|\ | | | | | | | | Prepare 11.0 RC6 release See merge request gitlab-org/gitlab-ce!19527
| * Merge branch 'sh-fix-schema-migrations-seq-scans' into 'master'Douwe Maan2018-06-072-55/+103
| | | | | | | | | | Avoid sequential scans loading schema_migrations table when loading application settings See merge request gitlab-org/gitlab-ce!19541
| * Merge branch 'per-project-pipeline-iid' into 'master'Grzegorz Bizon2018-06-0723-28/+161
| | | | | | | | | | | | | | | | Add per-project pipeline id (Use `AtomicInternalId`) Closes #3691 See merge request gitlab-org/gitlab-ce!18558
| * Merge branch '2018-06-07-RC-cut' into 11-0-stable-prepare-rc6Filipa Lacerda2018-06-07568-2847/+11057
| |\ |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2018-06-07-RC-cut: (271 commits) Resolve "Introduce new navigation themes in GitLab 11.0" Fix styling of Remove Kubernetes cluster integration section Fix styling of delete user button in dropdown Update CHANGELOG.md for 10.8.4 Add changelog for bootstrap upgrade Log response body to production_json.log when a controller responds with a 422 status Resolve "Project homepage > Plus dropdown on mobile screens" Fix history icon misaligned Remove outline from switch/toggle buttons Fix typo Add EKS integration tutorial Fix alert-danger class colors for text and background Update/help integration screenshot Support LFS objects when creating a project by import Fix board dropdown being cropped update issue template to encourage collaboration and metrics changed a link into a button i18n Move GC/Repack to OptOut removed event listener for event that no longer exists Add a custom storage config instead of overwriting ...
| * Merge branch 'sh-log-422-responses' into 'master'2018-06-07-RC-cutSean McGivern2018-06-074-0/+69
| |\ | | | | | | | | | | | | Log response body to production_json.log when a controller responds with a 422 status See merge request gitlab-org/gitlab-ce!19473
| | * Log response body to production_json.log when a controller responds with a ↵Stan Hu2018-06-064-0/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 422 status We have a number of import errors occurring with 422 errors, and it's hard to determine why they are happening. This change will surface the errors in the log lines. Relates to #47365
| * | Merge branch 'update-net-ssh' into 'master'Grzegorz Bizon2018-06-073-19/+10
| |\ \ | | | | | | | | | | | | | | | | update net-ssh 4 -> 5, remove rbnacl, rbnacl-libsodium (not needed) See merge request gitlab-org/gitlab-ce!19412
| | * | update net-ssh 4 -> 5, remove rbnacl, rbnacl-libsodium (not needed)Pirate Praveen2018-06-063-19/+10
| | | |
| * | | Merge branch '43597-new-navigation-themes' into 'master'Phil Hughes2018-06-0713-122/+216
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Introduce new navigation themes in GitLab 11.0" Closes #43597 See merge request gitlab-org/gitlab-ce!19387
| | * | | Resolve "Introduce new navigation themes in GitLab 11.0"Annabel Gray2018-06-0713-122/+216
| |/ / /
| * | | Merge branch 'master' into 'master'Achilleas Pipinellis2018-06-071-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Fixed typo "all all" lines 25-26 (index.md) See merge request gitlab-org/gitlab-ce!19440
| | * | | Update index.md; typo "all all" lines 25-26Edwin Torres2018-06-051-1/+1
| | | | |
| * | | | Merge branch 'revert-e264046c' into 'master'Clement Ho2018-06-072-9/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'jivl-fix-labels-page' into 'master'" See merge request gitlab-org/gitlab-ce!19454
| | * | | | Revert "Merge branch 'jivl-fix-labels-page' into 'master'"Annabel Gray2018-06-052-9/+1
| | | | | | | | | | | | | | | | | | This reverts merge request !19383
| * | | | | Merge branch '47433-remove-integration-styling' into 'master'Clement Ho2018-06-071-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Kubernetes cluster information page > Advanced Settings > Fix styling of remove cluster section" Closes #47433 See merge request gitlab-org/gitlab-ce!19500
| | * | | | | Fix styling of Remove Kubernetes cluster integration section47433-remove-integration-stylingtauriedavis2018-06-061-2/+2
| | | | | | |
| * | | | | | Merge branch 'bootstrap-changelog' into 'master'Annabel Gray2018-06-071-0/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog for bootstrap upgrade See merge request gitlab-org/gitlab-ce!19503
| | * | | | | | Add changelog for bootstrap upgradeClement Ho2018-06-061-0/+5
| | | | | | | |
| * | | | | | | Merge branch 'jivl-fix-history-icon-misaligned' into 'master'Annabel Gray2018-06-061-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix history icon misaligned Closes #46679 See merge request gitlab-org/gitlab-ce!19493
| | * | | | | | | Fix history icon misalignedJose2018-06-061-0/+1
| | | | | | | | |
| * | | | | | | | Merge branch '47353-delete-user-dropdown' into 'master'Clement Ho2018-06-061-2/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Admin area > users dropdown" Closes #47353 See merge request gitlab-org/gitlab-ce!19505
| | * | | | | | | | Fix styling of delete user button in dropdownAnnabel Dunstone Gray2018-06-061-2/+2
| | |/ / / / / / /
| * | | | | | | | Update CHANGELOG.md for 10.8.4Filipa Lacerda2018-06-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Merge branch 'jivl-fix-alert-message-colors' into 'master'Clement Ho2018-06-061-0/+10
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alert-danger class colors for text and background Closes #46715 See merge request gitlab-org/gitlab-ce!19489
| | * | | | | | | | Fix alert-danger class colors for text and backgroundjivl-fix-alert-message-colorsJose2018-06-061-0/+10
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch '47362-members-tabs' into 'master'Clement Ho2018-06-061-4/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project > Settings > Members - The active tab doesn't work correctly" Closes #47362 See merge request gitlab-org/gitlab-ce!19463
| | * | | | | | | | Fix member tabsAnnabel Dunstone Gray2018-06-051-4/+4
| | | | | | | | | |
| * | | | | | | | | Merge branch '46698-project-homepage-plus-dropdown-on-mobile-screens' into ↵Clement Ho2018-06-062-1/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Project homepage > Plus dropdown on mobile screens" Closes #46698 See merge request gitlab-org/gitlab-ce!19417
| | * | | | | | | | | Resolve "Project homepage > Plus dropdown on mobile screens"Sam Beckham2018-06-062-1/+2
| |/ / / / / / / / /
| * | | | | | | | | Merge branch '47299-fix-board-overflow' into 'master'Clement Ho2018-06-061-3/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Projects dropdown within new issue action of Issue boards doesn't show up correctly" Closes #47299 See merge request gitlab-org/gitlab-ce!19432
| | * | | | | | | | | Fix board dropdown being croppedPaul Slaughter2018-06-061-3/+0
| | | | | | | | | | |
| * | | | | | | | | | Merge branch '47359-bs4-k8s-gke-error-colors' into 'master'Clement Ho2018-06-063-12/+18
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Kubernetes > Create form > Text color of error messages" Closes #47359 See merge request gitlab-org/gitlab-ce!19456
| | * | | | | | | | | use bootstrap 4 utilities for error statesDennis Tang2018-06-053-12/+18
| | | | | | | | | | |
| * | | | | | | | | | Merge branch '46833-sticky-polyfill' into 'master'Clement Ho2018-06-063-11/+25
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update sticky utils with polyfill Closes #46833 and #47130 See merge request gitlab-org/gitlab-ce!19324
| | * | | | | | | | | Add polyfill and comments to utils/stickyPaul Slaughter2018-06-053-11/+25
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'jivl-fix-switch-toggle-blue-halo' into 'master'Annabel Gray2018-06-061-0/+4
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove outline from switch/toggle buttons Closes #47270 See merge request gitlab-org/gitlab-ce!19491
| | * | | | | | | | | Remove outline from switch/toggle buttonsJose2018-06-061-0/+4
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'improve-eks-docs' into 'master'Marcia Ramos2018-06-061-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve EKS documentation Closes #47420 See merge request gitlab-org/gitlab-ce!19490
| | * | | | | | | | | Fix typoJoshua Lambert2018-06-061-1/+1
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'jl-add-eks-integration-docs' into 'master'Marcia Ramos2018-06-069-0/+141
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add EKS integration tutorial See merge request gitlab-org/gitlab-ce!19468
| | * | | | | | | | | Add EKS integration tutorialJoshua Lambert2018-06-069-0/+141
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'update/help-integration-screenshot' into 'master'Achilleas Pipinellis2018-06-063-7/+10
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update/help integration screenshot Closes #18979 See merge request gitlab-org/gitlab-ce!19433
| | * | | | | | | | | Update/help integration screenshotTuğçe Nur Taş2018-06-063-7/+10
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'fj-40401-support-import-lfs-objects' into 'master'Douwe Maan2018-06-0632-12/+1085
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support LFS objects when creating a project by import Closes #40401 See merge request gitlab-org/gitlab-ce!18871
| | * | | | | | | | Support LFS objects when creating a project by importFrancisco Javier López2018-06-0632-12/+1085
| |/ / / / / / / /
| * | | | | | | | Merge branch 'ide-merge-requests-components' into 'master'Filipa Lacerda2018-06-0626-98/+821
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show merge requests in IDE Closes #45184 See merge request gitlab-org/gitlab-ce!19318
| | * | | | | | | | changed a link into a buttonPhil Hughes2018-06-065-14/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n
| | * | | | | | | | removed event listener for event that no longer existsPhil Hughes2018-06-061-1/+0
| | | | | | | | | |
| | * | | | | | | | component specsPhil Hughes2018-06-065-2/+238
| | | | | | | | | |