summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | Explain what `view` doesThong Kuah2018-10-081-0/+3
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have an explanation for `explain` (by way of examples) but nothing to say what view does.
* | | | | | | | | | | | | | | | | Merge branch 'update_extends_docs' into 'master'Achilleas Pipinellis2018-10-081-4/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update explanation about the `extends` feature See merge request gitlab-org/gitlab-ce!22043
| * | | | | | | | | | | | | | | | | Update explanation about the `extends` featureRonald van Zon2018-10-081-4/+12
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'docs-docker-auth-config-port' into 'master'Achilleas Pipinellis2018-10-081-13/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add note about hostname *and* port needing to match for `DOCKER_AUTH_CONFIG` See merge request gitlab-org/gitlab-ce!22064
| * | | | | | | | | | | | | | | | | Add note that hostname:port need to match for `DOCKER_AUTH_CONFIG`Drew Blessing2018-10-051-13/+19
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'docs/fix-link-to-deploy-boards' into 'master'Achilleas Pipinellis2018-10-081-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link to EE-only doc and fix lint issues See merge request gitlab-org/gitlab-ce!22178
| * | | | | | | | | | | | | | | | | | Fix link to EE-only doc and fix lint issuesEvan Read2018-10-081-4/+4
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'docs/fix-link-to-mr-template' into 'master'Achilleas Pipinellis2018-10-081-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link to MR-template and other improvements See merge request gitlab-org/gitlab-ce!22179
| * | | | | | | | | | | | | | | | | | Fix link to MR-template and other improvementsEvan Read2018-10-081-5/+5
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'patch/gpg-doc' into 'master'Achilleas Pipinellis2018-10-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix indentation in GPG documentation See merge request gitlab-org/gitlab-ce!22132
| * | | | | | | | | | | | | | | | | | Fix indentation in GPG documentationFranklin Yu2018-10-051-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'more-frozen-string-enable-lib' into 'master'Rémy Coutable2018-10-08103-5/+217
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable more frozen string in lib/**/*.rb See merge request gitlab-org/gitlab-ce!22174
| * | | | | | | | | | | | | | | | | | Enable more frozen string in lib/**/*.rbgfyoung2018-10-06103-5/+217
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables frozen for the following: * lib/*.rb * lib/banzai/**/*.rb * lib/bitbucket/**/*.rb * lib/constraints/**/*.rb * lib/container_registry/**/*.rb * lib/declarative_policy/**/*.rb Partially addresses #47424.
* | | | | | | | | | | | | | | | | | Merge branch 'rails5-mysql-schedule-build' into 'master'Douwe Maan2018-10-084-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails 5: fix mysql milliseconds problems in scheduled build specs See merge request gitlab-org/gitlab-ce!22170
| * | | | | | | | | | | | | | | | | | Rails 5: fix mysql milliseconds problems in scheduled build specsJasper Maes2018-10-064-3/+8
| | |_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'update-templates-11-4' into 'master'Kamil Trzciński2018-10-084-3/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update templates for 11.4 See merge request gitlab-org/gitlab-ce!22188
| * | | | | | | | | | | | | | | | | | Update templates for 11.4Jan Provaznik2018-10-084-3/+14
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'increase-event-retention-prune-old-events-worker' into 'master'Douwe Maan2018-10-084-12/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prune events older than 2 years instead of 12 months See merge request gitlab-org/gitlab-ce!22145
| * | | | | | | | | | | | | | | | | | Updated docs to reflect new 2 year periodJeremy Watson2018-10-061-1/+1
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Updated code comments for clarity based on 2 yearsJeremy Watson2018-10-061-3/+2
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Added changelogJeremy Watson2018-10-061-0/+5
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Added new test and updated all event idsJeremy Watson2018-10-051-3/+8
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Renamed test eventsJeremy Watson2018-10-051-2/+3
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Updated existing spec for new 2 year timeframeJeremy Watson2018-10-051-3/+3
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | prune older than 2 years instead of 12 monthsJeremy Watson2018-10-051-1/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'sh-remove-duplicate-logging' into 'master'Douwe Maan2018-10-081-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate Sentry logging for GRPC exceptions See merge request gitlab-org/gitlab-ce!22187
| * | | | | | | | | | | | | | | | | | | Remove duplicate Sentry logging for GRPC messagesStan Hu2018-10-071-1/+0
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Raven.capture_exception is already called by log_exception.
* | | | | | | | | | | | | | | | | | | Merge branch 'update-licenses-11-4' into 'master'Sean McGivern2018-10-081-185/+222
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update licenses for 11.4 See merge request gitlab-org/gitlab-ce!22189
| * | | | | | | | | | | | | | | | | | | Updated licenses for 11.4Jan Provaznik2018-10-081-185/+222
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'backport-ce-to-ee-spec-fix' into 'master'Rémy Coutable2018-10-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issues controller N+1 failure See merge request gitlab-org/gitlab-ce!22141
| * | | | | | | | | | | | | | | | | | | Fix issues controller N+1 failureSean McGivern2018-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE needs :request_store to cache license queries - otherwise we will blow past the query limit just with `SELECT * FROM licenses` over and over.
* | | | | | | | | | | | | | | | | | | | Merge branch 'patch-29' into 'master'Kamil Trzciński2018-10-081-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates Laravel.gitlab-ci.yml template See merge request gitlab-org/gitlab-ce!22167
| * | | | | | | | | | | | | | | | | | | Updates Laravel.gitlab-ci.yml templatePaul Giberson2018-10-061-3/+6
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates to add gnupgp (required for node setup) Upgrades node install to version 8
* | | | | | | | | | | | | | | | | | | Merge branch 'zj-render-log-artifacts' into 'master'Kamil Trzciński2018-10-082-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render log artifact files in GitLab See merge request gitlab-org/gitlab-ce!22112
| * | | | | | | | | | | | | | | | | | Render log artifact files in GitLabZeger-Jan van de Weg2018-10-082-1/+6
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'bw-fix-checking-disabled-services' into 'master'51761-create-new-project-auto-populate-project-slug-string-to-project-name-if-name-is-empty34758-split-create-gcp-controllerStan Hu2018-10-062-11/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check disabled_services when finding a service See merge request gitlab-org/gitlab-ce!22172
| * | | | | | | | | | | | | | | | | | Check disabled_services when finding a serviceBrett Walker2018-10-062-11/+31
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch '52242-ui-ux-bug-in-change-group-path' into 'master'Douglas Barbosa Alexandre2018-10-063-2/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix invalid parent path on group settings page Closes #52242 See merge request gitlab-org/gitlab-ce!22142
| * | | | | | | | | | | | | | | | | | | Fix invalid parent path on group settings pageDmitriy Zaporozhets2018-10-063-2/+23
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'ce-1984-frontend-for-batch-comments' into 'master'Tim Zallmann2018-10-0615-50/+123
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport CE changes for: [Frontend only] Batch comments on merge requests See merge request gitlab-org/gitlab-ce!22158
| * | | | | | | | | | | | | | | | | | Backport CE changes for: [Frontend only] Batch comments on merge requestsAndré Luís2018-10-0615-50/+123
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'add-button-to-insert-table-in-markdown' into 'master'Clement Ho2018-10-065-2/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add button to insert table in markdown editor See merge request gitlab-org/gitlab-ce!18480
| * | | | | | | | | | | | | | | | | Add button to insert table in markdown editorGeorge Tsiolis2018-10-065-2/+40
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'gitaly-0.125.0' into 'master'Stan Hu2018-10-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Gitaly to v0.125.0 See merge request gitlab-org/gitlab-ce!22168
| * | | | | | | | | | | | | | | | | Update GITALY_SERVER_VERSIONJames Lopez2018-10-061-1/+1
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'backport-ce-to-ee-merge' into 'master'Stan Hu2018-10-062-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of CE upstream - 2018-10-05 12:21 UTC See merge request gitlab-org/gitlab-ce!22154
| * | | | | | | | | | | | | | | | Fix CE to EE merge (backport)Kamil Trzciński2018-10-052-6/+7
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'update-operations-metrics-empty-state' into 'master'Mike Greiling2018-10-062-9/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update operations metrics empty state See merge request gitlab-org/gitlab-ce!21974
| * | | | | | | | | | | | | | | | | Update operations metrics empty stateGeorge Tsiolis2018-10-062-9/+14
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'osw-fix-lfs-images-not-rendering' into 'master'Douglas Barbosa Alexandre2018-10-0510-7/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix LFS uploaded images not being rendered Closes #50617 See merge request gitlab-org/gitlab-ce!22092