summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
* | | | | | Merge branch 'bvl-dont-ignore-gitlab-pot-compat-check' into 'master'Yorick Peterse2019-01-041-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't ingore the `gitlab.pot` in ee_compat_check See merge request gitlab-org/gitlab-ce!24151
| * | | | | | Don't ingore the `gitlab.pot` in ee_compat_checkBob Van Landuyt2019-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there are new strings in CE, they need to be added to EE manually. As the `locale/gitlab.pot` file can't be merged automatically during the upstream merge.
* | | | | | | Merge branch 'contacted_at' into 'master'Stan Hu2019-01-045-2/+62
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Guarantee visually correct order of runners on the "Admin Area > Runners" page Closes #49791 See merge request gitlab-org/gitlab-ce!21627
| * | | | | | | Take contacted_at value from the DB when it is about to be displayed in the ↵Alexander Kutelev2019-01-045-2/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Web interface with sorting enabled.
* | | | | | | | Merge branch 'docs-releases-api' into 'master'Marcia Ramos2019-01-045-10/+545
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation for Release page MVC Closes #41766 See merge request gitlab-org/gitlab-ce!23901
| * | | | | | | | Documentation for Release page MVCFilipa Lacerda - 🎄🎄 OOO - Back on January 7th - 🎄🎄2019-01-045-10/+545
|/ / / / / / / /
* | | | | | | | Merge branch 'ac-releases-api-with-assets' into 'master'Kamil Trzciński2019-01-0419-4/+447
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Support asset links creation in `POST /projects/:id/release` See merge request gitlab-org/gitlab-ce!24056
| * | | | | | | Change release links table ID to bigserialac-releases-api-with-assetsShinya Maeda2019-01-042-2/+2
| | | | | | | |
| * | | | | | | Use AR releation "count" methodShinya Maeda2019-01-041-1/+1
| | | | | | | |
| * | | | | | | Add sequence to release link factoryShinya Maeda2019-01-041-2/+2
| | | | | | | |
| * | | | | | | Add frozen_string_literal: trueShinya Maeda2019-01-043-0/+6
| | | | | | | |
| * | | | | | | Add unique constraint to release and urlShinya Maeda2019-01-048-110/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix coding style Improve coding style Decouple UPDATE and DELETE operations of asset links Rename links_attributes to assets:links Rename exposed param and updated spec
| * | | | | | | Add spec for duplicate link name creationShinya Maeda2019-01-042-23/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spec for mysql unique validation failure
| * | | | | | | Add spec for Releases::Source and Link modelsShinya Maeda2019-01-046-3/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Releases::Source and Releases::Link are covered by tests
| * | | | | | | Update safe model attributes for import/exportShinya Maeda2019-01-041-0/+7
| | | | | | | |
| * | | | | | | Support CURD operation for release asset linksShinya Maeda2019-01-0415-3/+371
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add Releases::Links model - Expose it in release API - Add integration tests
* | | | | | | | Merge branch 'link-new-openshift-template' into 'master'Achilleas Pipinellis2019-01-041-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark references to openshift template as deprecated See merge request gitlab-org/gitlab-ce!24092
| * | | | | | | | Mark references to openshift template as deprecatedBalasankar "Balu" C2019-01-041-0/+6
|/ / / / / / / /
* | | | | | | | Merge branch 'leipert-forward-gitlab-svgs' into 'master'Clement Ho2019-01-042-5/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Update @gitlab/svgs to latest version See merge request gitlab-org/gitlab-ce!24148
| * | | | | | | Update @gitlab/svgs to latest versionLukas Eipert2019-01-042-5/+5
| | | | | | | |
View Lorry Controller Status