summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '64243-design-management-docs' into 'master'Marcia Ramos2019-07-244-0/+66
|\ | | | | | | | | PerhAdd documentation for Design Management feature See merge request gitlab-org/gitlab-ce!30448
| * Add documentation for Design Management feature64243-design-management-docsLuke Duncalfe2019-07-194-0/+66
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/64243
* | Merge branch 'docs/add-go-test-guidelines' into 'master'Marcia Ramos2019-07-241-0/+39
|\ \ | | | | | | | | | | | | Add Go test guidelines See merge request gitlab-org/gitlab-ce!29159
| * | Add Go test guidelinesSteve Azzopardi2019-07-241-0/+39
|/ /
* | Merge branch 'docs/cross-link-kaniko' into 'master'Marcia Ramos2019-07-243-13/+35
|\ \ | | | | | | | | | | | | | | | | | | Improve GitLab and Docker configuration docs Closes #31379 See merge request gitlab-org/gitlab-ce!30498
| * | Cross link to kaniko docsEvan Read2019-07-243-13/+35
|/ / | | | | | | | | Also make security warning more visible and improves instructions.
* | Merge branch 'sh-add-rugged-to-peek' into 'master'Sean McGivern2019-07-2421-14/+185
|\ \ | | | | | | | | | | | | Add Rugged calls to performance bar See merge request gitlab-org/gitlab-ce!30983
| * | Update performance bar documentationStan Hu2019-07-246-3/+5
| | |
| * | Hide Rugged data if it doesn't existStan Hu2019-07-232-0/+6
| | |
| * | Add Rugged calls to performance barStan Hu2019-07-2315-11/+174
| | | | | | | | | | | | | | | | | | This will help diagnose the source of excessive I/O from Rugged calls. To implement this, we need to obtain the full list of arguments sent to each request method.
* | | Merge branch '12250-mvc-security-navigation-section-group' into 'master'Fatih Acet2019-07-241-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Add "security" top-level item to group sidebar See merge request gitlab-org/gitlab-ce!30604
| * | | Add "security" top-nevel item to group sidebar12250-mvc-security-navigation-section-groupDave Pisek2019-07-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This commits moves the second-level navigation item 'Security Dashboard' into a top-level item. The rendering of the actual item is EE specific.
* | | | Merge branch '12250-mvc-security-navigation-section-project' into 'master'Fatih Acet2019-07-241-4/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add "Security & Compliance" as top-level item to the project sidebar See merge request gitlab-org/gitlab-ce!30564
| * | | | Add "security" as nav-item to project sidebar12250-mvc-security-navigation-section-projectDave Pisek2019-07-241-4/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the security dashboard and dependency list into it's own top-level navigation item named 'Securty & Compliance', within the project's sidebar. This should only affect EE, since the template changes only touch partials that get conditionally rendered and only exist in EE.
* | | | Merge branch '11090-export-design-management-lfs-data' into 'master'James Lopez2019-07-249-36/+231
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add support for exporting repository type data for LFS objects See merge request gitlab-org/gitlab-ce!30830
| * | | | LFS export records repository_type dataLuke Duncalfe2019-07-249-36/+231
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A project can have the same `LfsObject` linked with up to three `LfsObjectsProject` records. Each of these records would be for a different repository, recorded in the `repository_type` property. The different repositories at time of writing are "project", "wiki", and "design". See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13894 This change exports the list of `repository_type`s as a JSON mapping of oid => repository_types, which are imported to recreate the correct `LfsObjectsProject` records. https://gitlab.com/gitlab-org/gitlab-ee/issues/11090
* | | | Merge branch 'alhashash1-12-1-stable-patch-67177' into 'master'Stan Hu2019-07-241-4/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect web server selection parameter in init.d script Closes #64802 and #65008 See merge request gitlab-org/gitlab-ce!31076
| * | | | Fix incorrect web server parameter in init.d scriptMohammad Alhashash2019-07-241-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Environment variable USE_WEB_SERVER should have the value of the selected webserver when calling bin/web startup script. Fixes #65008
* | | | | Merge branch 'bw-enable-default-manual-sorting' into 'master'Sean McGivern2019-07-243-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Default manual_sorting feature flag to on See merge request gitlab-org/gitlab-ce!30788
| * | | | | Default manual_sorting feature flag to onbw-enable-default-manual-sortingBrett Walker2019-07-163-3/+3
| | | | | |
* | | | | | Merge branch 'qa-ml-knapsack-package-and-qa' into 'master'Rémy Coutable2019-07-241-0/+46
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use knapsack to parallelize E2E tests run via package-and-qa See merge request gitlab-org/gitlab-ce!30886
| * | | | | | Use a single knapsack fileMark Lapierre2019-07-241-0/+46
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There should be no difference between jobs in package-and-qa. Review apps should also be similar but there might be differences if the runners have different resources.
* | | | | | Update CHANGELOG.md for 12.1.1GitLab Release Tools Bot2019-07-241-0/+4
| | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'qa-staging-61-fix-ee-project-templates-spec-ce' into 'master'Sanad Liaquat2019-07-241-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port of EE branch qa-staging-61-fix-ee-project-templates-spec See merge request gitlab-org/gitlab-ce!30835
| * | | | | | CE port of EE branch qa-staging-61-fix-ee-project-templates-specqa-staging-61-fix-ee-project-templates-spec-ceSanad Liaquat2019-07-171-0/+4
| | | | | | |
* | | | | | | Merge branch ↵Kushal Pandya2019-07-244-26/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '11639-improve-discovery-and-navigation-for-gitlab-package-features-ce' into 'master' Improving packages navigation in project sidebar [CE Backport] See merge request gitlab-org/gitlab-ce!30256
| * | | | | | | Improving packages navigation in project sidebar11639-improve-discovery-and-navigation-for-gitlab-package-features-ceNick Kipling2019-07-234-26/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed Registry from sidebar Created new Packages top level item Added Container Registry into packages Updated tests to support new layout
* | | | | | | | Merge branch '64996-fix-review-app-debugging' into 'master'Lin Jen-Shin2019-07-241-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Review App debugging sometimes fail because multiple Unicorn pods exist" Closes #64996 See merge request gitlab-org/gitlab-ce!31058
| * | | | | | | Fix Review App debugging64996-fix-review-app-debuggingRémy Coutable2019-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'pl-spec_flat_map-ce' into 'master'Grzegorz Bizon2019-07-2410-20/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefer `flat_map` over `map` + `flatten` in specs See merge request gitlab-org/gitlab-ce!31052
| * | | | | | | | Prefer `flat_map` over `map` + `flatten` in specsPeter Leitzen2019-07-2410-20/+19
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although `flat_map` is equivalent to `map` + `flatten(1)` (note the level 1) we can apply this same refactoring to all cases.
* | | | | | | | Merge branch 'ce-xanf-add-admin-area-links' into 'master'Ash McKenzie2019-07-245-43/+85
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add interactive links in the Admin Area overview" See merge request gitlab-org/gitlab-ce!29306
| * | | | | | | | Add links in admin area overviewce-xanf-add-admin-area-linksIllya Klymov2019-07-245-43/+85
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces new `feature_entry` helper for dashboard. This helper reduces code duplication when listing available features and relevant links to configuration sections
* | | | | | | | Merge branch 'renovate/gitlab-ui-5.x' into 'master'Kushal Pandya2019-07-242-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to ^5.7.1 See merge request gitlab-org/gitlab-ce!31026
| * | | | | | | | Update dependency @gitlab/ui to ^5.7.1Lukas Eipert2019-07-222-5/+5
| | | | | | | | |
* | | | | | | | | Merge branch 'docs-correct-omitted-word' into 'master'Evan Read2019-07-241-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct an omitted word See merge request gitlab-org/gitlab-ce!31083
| * | | | | | | | | Correct omitted wordotuhs_d2019-07-241-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'docs-set-service-variables-tip' into 'master'Evan Read2019-07-242-0/+13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add notes to the docs about setting service variables for users wanting to do so from the UI See merge request gitlab-org/gitlab-ce!30863
| * | | | | | | | | | Add notes to the docs about setting service variables for users wanting to ↵Elliot Rushton2019-07-242-0/+13
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do so from the UI
* | | | | | | | | | Merge branch 'fix-danger-gemfile-warning' into 'master'Thong Kuah2019-07-241-2/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix duplicated suggestion in Danger gem warning See merge request gitlab-org/gitlab-ce!31088
| * | | | | | | | | Fix duplicated suggestion in Danger gem warningfix-danger-gemfile-warningTiger2019-07-241-2/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'docs-group-instance-clusters-ga' into 'master'Evan Read2019-07-242-2/+0
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Remove beta from group and instance clusters See merge request gitlab-org/gitlab-ce!31059
| * | | | | | | | Remove beta from group and instance clustersDaniel Gruesso2019-07-242-2/+0
|/ / / / / / / /
* | | | | | | | Merge branch 'jivanvl-add-chart-empty-state' into 'master'Clement Ho2019-07-248-8/+144
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add empty chart component Closes #60947 See merge request gitlab-org/gitlab-ce!30682
| * | | | | | | | Add empty chart componentJose Ivan Vargas2019-07-248-8/+144
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merge request adds an empty chart component which will load in case of queries not having data to display, this will override the current logic, which hides all the graphs that have no data to show
* | | | | | | | Merge branch '64016-unix-shell-scripting-style-guide' into 'master'Evan Read2019-07-242-0/+118
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GitLab Unix shell scripting style guide to docs See merge request gitlab-org/gitlab-ce!30271
| * | | | | | | | Add GitLab Unix shell scripting style guide to docsVictor Zagorodny2019-07-242-0/+118
|/ / / / / / / /
* | | | | | | | Merge branch '65019-job-templates-dind-tls-fix' into 'master'Thong Kuah2019-07-246-0/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set DOCKER_TLS_CERTDIR in CI job templates See merge request gitlab-org/gitlab-ce!31080
| * | | | | | | | Set DOCKER_TLS_CERTDIR in CI job templates65019-job-templates-dind-tls-fixTiger2019-07-246-0/+12
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/65019
* | | | | | | | Merge branch '65019-auto-devops-dind-tls-fix' into 'master'Thong Kuah2019-07-242-0/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Set DOCKER_TLS_CERTDIR in Auto Dev-Ops CI template See merge request gitlab-org/gitlab-ce!31078