summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add API topic templatedocs/new-verbs-section-styleguideEvan Read2019-01-071-0/+35
|
* Implement some review commentsEvan Read2019-01-071-43/+43
| | | | | | | Also: - Slight restructure. - Some Markdown improvements.
* Add new styleguide sections for verbsEvan Read2019-01-071-3/+31
| | | | Also fixes spelling, and makes the Markdown style more consistent.
* Merge branch 'docs/autodevops-buildpacks' into 'master'Evan Read2019-01-071-7/+30
|\ | | | | | | | | | | | | Clarify needed app files for Auto Build to work Closes #45279 See merge request gitlab-org/gitlab-ce!23980
| * Clarify needed app files for Auto Build to workdocs/autodevops-buildpacksAchilleas Pipinellis2019-01-041-7/+30
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/45279
* | Merge branch 'docs/fake-token-no-more' into 'master'Evan Read2019-01-0760-375/+374
|\ \ | | | | | | | | | | | | | | | | | | Do not use tokens that look like tokens in docs Closes #38064 See merge request gitlab-org/gitlab-ce!24044
| * | Replace look-alike token with '<your_access_token>'docs/fake-token-no-moreAchilleas Pipinellis2019-01-0460-375/+374
| |/ | | | | | | | | Replace all '9koXpg98eAheJpvBs5tK' occurrences with '<your_access_token>' in API docs.
* | Merge branch 'docs/no-doctoc' into 'master'Sid Sijbrandij2019-01-061-44/+1
|\ \ | | | | | | | | | | | | Remove unnecessary TOC from file See merge request gitlab-org/gitlab-ce!24175
| * | Remove unnecessary TOC from fileEvan Read2019-01-071-44/+1
|/ /
* | Merge branch 'move-settings-oprations-to-ce' into 'master'Kamil Trzciński2019-01-069-1/+138
|\ \ | | | | | | | | | | | | Move Settings Operations controller to CE See merge request gitlab-org/gitlab-ce!24147
| * | Move settings operations controller from EE to CEmove-settings-oprations-to-cePeter Leitzen2019-01-069-1/+138
|/ / | | | | | | | | This commit prepares the structure for the upcoming feature error tracking.
* | Merge branch 'kamil-refactor-ci-builds-v5' into 'master'Grzegorz Bizon2019-01-0637-234/+597
|\ \ | | | | | | | | | | | | Use BuildMetadata to store build configuration in JSONB form See merge request gitlab-org/gitlab-ce!21499
| * | Add config_options|variables to BuildMetadatakamil-refactor-ci-builds-v5Kamil Trzciński2019-01-0437-234/+597
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are data columns that store runtime configuration of build needed to execute it on runner and within pipeline. The definition of this data is that once used, and when no longer needed (due to retry capability) they can be freely removed. They use `jsonb` on PostgreSQL, and `text` on MySQL (due to lacking support for json datatype on old enough version).
* | | Merge branch '52446-hide-ado-project-banner-for-ci-file-or-ci-disabled' into ↵Kamil Trzciński2019-01-054-6/+115
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Hide Auto DevOps banner for projects with CI file or CI disabled Closes #52446 See merge request gitlab-org/gitlab-ce!24067
| * | | Hides ADO banner for certain projects52446-hide-ado-project-banner-for-ci-file-or-ci-disabledMayra Cabrera2019-01-044-6/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ADO banner is being hidden if: - Project has no CI configuration - Project has CI disabled Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52446
* | | | Merge branch 'sh-fix-multipart-uploads-failure' into 'master'Kamil Trzciński2019-01-052-7/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix multipart attachments not uploading Closes gitlab-ee#9035 See merge request gitlab-org/gitlab-ce!24170
| * | | | Fix multipart attachments not uploadingsh-fix-multipart-uploads-failureStan Hu2019-01-052-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mixing and matching the use of Rack::Request and ActionDispatch::Request in Rails 5 is bad, particularly if you have middleware that manipulates or accesses environment variables. `Gitlab::Middleware::Multipart` attempts to rewrite request parameters to the proper values (e.g. replacing `data_file` with `UploadedFile`). It does this by calling `Rack::Request#update_params`, which essentially updates `env['rack.request.form_hash']`. By changing to `ActionDispatch::Request`, the Go middleware was causing the request parameters to be stored inside `env['action_dispatch.request.request_parameters']`. Later calls to `Rack::Request#update_params` would not have any effect because it would attempt to update `env['rack.request.form_has']` instead of `env['action_dispatch.request.request_parameters']`. As a result, the controller still saw the old parameters. Since the Go middleware appears to be using `ActionDispatch::Request` for authorization methods, we can switch the multipart middleware to use it too. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/9035
* | | | | Merge branch '40473-api-support-for-kubernetes-integration' into 'master'Kamil Trzciński2019-01-055-0/+631
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API Support for Kubernetes integration Closes #40473 See merge request gitlab-org/gitlab-ce!23922
| * | | | | Include CRUD endpoints for Cluster API40473-api-support-for-kubernetes-integrationMayra Cabrera2019-01-045-0/+631
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the following initial CRUD endpoints for Clusters API: - GET list of clusters - GET specific cluster - POST add existing cluster (mimic of "Add cluster") - PUT update cluser - DELETE destroy cluster Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/40473
* | | | | Merge branch 'knative-rbac-check' into 'master'Kamil Trzciński2019-01-0512-3/+89
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Require Knative to be installed only on an RBAC kubernetes cluster See merge request gitlab-org/gitlab-ce!23807
| * | | | Require Knative to be installed only on an RBAC kubernetes clusterChris Baumbauer2019-01-0412-3/+89
| | | | |
* | | | | Merge branch 'mk/fix-broken-master-api-variables' into 'master'Stan Hu2019-01-051-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix broken master api_variables test See merge request gitlab-org/gitlab-ce!24165
| * | | | | Fix broken master api_variables testMichael Kozono2019-01-041-1/+3
| | | | | |
* | | | | | Update CHANGELOG.md for 11.6.3GitLab Release Tools Bot2019-01-042-5/+7
| | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch ↵Stan Hu2019-01-041-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '4553-geo-hashed-storage-migration-failure-does-not-log-to-sentry-or-geo-log-well-ee' into 'master' Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8926 See merge request gitlab-org/gitlab-ce!24129
| * | | | | | Track Sentry error when namespace cannot be moved4553-geo-hashed-storage-migration-failure-does-not-log-to-sentry-or-geo-log-well-eeValery Sizov2019-01-041-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8926
* | | | | | | Merge branch 'support-new-syntax-for-common-vulnerabilities' into 'master'Kamil Trzciński2019-01-0410-2386/+3987
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support new report syntax for common vulnerabilities (CE backport) See merge request gitlab-org/gitlab-ce!23962
| * | | | | | | Support new report syntax for common vulnerabilitiesKamil Trzciński2019-01-0410-2386/+3987
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR also removes other reports and uses one common set of fixtures for all test types.
* | | | | | | | Merge branch 'docs-serverless-yml-update' into 'master'Marcia Ramos2019-01-041-9/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update serverless extension to yml See merge request gitlab-org/gitlab-ce!24163
| * | | | | | | | Update serverless extension to ymldanielgruesso2019-01-041-9/+6
|/ / / / / / / /
* | | | | | | | Merge branch 'docs-fix-broken-link' into 'master'Mike Lewis2019-01-041-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes broken link See merge request gitlab-org/gitlab-ce!24161
| * | | | | | | | Fixes broken linkMarcia Ramos2019-01-041-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'deprecated-callback-false' into 'master'Robert Speicher2019-01-043-4/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix deprecation: returning false in Active Record and Active Model callbacks See merge request gitlab-org/gitlab-ce!24134
| * | | | | | | Fix deprecation: returning false in Active Record and Active Model callbacks ↵Jasper Maes2019-01-033-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | will not implicitly halt a callback chain
* | | | | | | | Merge branch 'docs/add-source-code-permissions' into 'master'Marcia Ramos2019-01-041-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add project code view permissions See merge request gitlab-org/gitlab-ce!24158
| * | | | | | | | Add project code view permissionsdocs/add-source-code-permissionsCindy Pallares 🦉2019-01-041-0/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'do-not-ignore-schema-conflicts' into 'master'Robert Speicher2019-01-041-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Don't ignore conflicts in db/schema.rb See merge request gitlab-org/gitlab-ce!24152
| * | | | | | | | Don't ignore conflicts in db/schema.rbdo-not-ignore-schema-conflictsYorick Peterse2019-01-041-1/+1
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not entirely clear to me why we were ignoring db/schema.rb in the first place, but this should not be done now that we merge CE into EE automatically. Doing so can lead to changes being thrown away in the event of a conflict, which can then lead to EE pipelines failing.
* | | | | | | | Merge branch 'feature/gb/expose-ci-api-url-variable' into 'master'Douwe Maan2019-01-048-2/+114
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose `CI_API_V4_URL` CI/CD variable Closes #54621 See merge request gitlab-org/gitlab-ce!23936
| * | | | | | | Improve readablity of CI_API_V4_URL related codeGrzegorz Bizon2019-01-043-5/+3
| | | | | | | |
| * | | | | | | Minor improvements to CI_API_V4_URL variable exposurefeature/gb/expose-ci-api-url-variableGrzegorz Bizon2019-01-033-3/+3
| | | | | | | |
| * | | | | | | Add new docs for CI_API_V4_URL CI/CD variableGrzegorz Bizon2019-01-031-1/+2
| | | | | | | |
| * | | | | | | Add changelog for new predefined CI/CD variableGrzegorz Bizon2019-01-031-0/+5
| | | | | | | |
| * | | | | | | Expose CI_API_V4_URL predefined CI/CD variableGrzegorz Bizon2019-01-032-1/+2
| | | | | | | |
| * | | | | | | Add API::Helpers::Version and expose API root URLGrzegorz Bizon2019-01-036-25/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commits adds a new class that is supposed to represent Grape API version, like `v3` or `v4`.
| * | | | | | | Expose method that returns GitLab API pathsGrzegorz Bizon2019-01-032-0/+44
| | | | | | | |
* | | | | | | | Merge branch 'docs-fix-only-except-default' into 'master'Marcia Ramos2019-01-041-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve documentation about only except default values Closes #55699 See merge request gitlab-org/gitlab-ce!24016
| * | | | | | | Improve documentation about only except default valuesdocs-fix-only-except-defaultShinya Maeda2018-12-241-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'include-templates' into 'master'Kamil Trzciński2019-01-0416-65/+468
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include templates Closes #53445 See merge request gitlab-org/gitlab-ce!23495
| * | | | | | | Allow to include templatesKamil Trzciński2019-01-0416-65/+468
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This rewrites a syntax to allow include of templates. This also normalises the syntax used by include: feature