summaryrefslogtreecommitdiff
path: root/changelogs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sh-fix-source-project-nplus-one' into 'master'47213-epics-page-styling-is-brokenSean McGivern2018-06-041-0/+5
|\ | | | | | | | | Fix N+1 with source_projects in merge requests API See merge request gitlab-org/gitlab-ce!19346
| * Fix N+1 with source projects in merge requests APIsh-fix-source-project-nplus-oneStan Hu2018-06-031-0/+5
| | | | | | | | | | Now that we are checking `MergeRequest#for_fork?`, we also need the source project preloaded for a merge request.
* | Merge branch 'bvl-bump-gitlab-shell-7-1-3' into 'master'Douwe Maan2018-06-041-0/+5
|\ \ | | | | | | | | | | | | Bump gitlab-shell to 7.1.3 See merge request gitlab-org/gitlab-ce!19358
| * | Bump gitlab-shell to 7.1.3bvl-bump-gitlab-shell-7-1-3Bob Van Landuyt2018-06-041-0/+5
| | | | | | | | | | | | | | | | | | | | | This includes the change that prints the @username of a user instead of the full name. https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/204
* | | Merge branch 'sh-fix-secrets-not-working' into 'master'Douwe Maan2018-06-041-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix attr_encryption key settings Closes #47166 See merge request gitlab-org/gitlab-ce!19341
| * | | Fix attr_encryption key settingsStan Hu2018-06-021-0/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attr_encrypted does different things with `key` depending on what mode you are using: 1. In `:per_attribute_iv_and_salt` mode, it generates a hash with the salt: https://github.com/attr-encrypted/encryptor/blob/c3a62c4a9e74686dd95e0548f9dc2a361fdc95d1/lib/encryptor.rb#L77. There is no need to truncate the key to 32 bytes here. 2. In `:per_attribute_iv` mode, it sets the key directly to the password, so truncation to 32 bytes is necessary. Closes #47166
* | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-06-041-0/+5
|\ \ \ | | |/ | |/|
| * | Update selenium-webdriver to 3.12.0Takuya Noguchi2018-06-041-0/+5
| |/
* | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-06-0211-0/+56
|\ \ | |/
| * Merge branch 'sh-bump-omniauth-gitlab' into 'master'Robert Speicher2018-06-011-0/+5
| |\ | | | | | | | | | | | | Bump omniauth-gitlab to 1.0.3 See merge request gitlab-org/gitlab-ce!19319
| | * Bump omniauth-gitlab to 1.0.3Stan Hu2018-06-011-0/+5
| | | | | | | | | | | | | | | | | | This version of the gem uses API v4 by default: https://github.com/linchus/omniauth-gitlab/commit/fd13de9f251fdaa72ba0195bda47cd2cb8731084
| * | Adds "the" to the new label page to correct the sentence.Sam Beckham2018-06-011-0/+5
| |/
| * Merge branch '47113-modal-header-styling-is-broken' into 'master'Filipa Lacerda2018-06-011-0/+5
| |\ | | | | | | | | | | | | | | | | | | Resolve "Modal header styling is broken" Closes #47113 See merge request gitlab-org/gitlab-ce!19312
| | * Adds the changelog entry for the modal header fixsamdbeckham2018-06-011-0/+5
| | |
| * | Resolve "Update `updated_at` on an issue/mr on every issue/mr changes"🙈 jacopo beschi 🙉2018-06-011-0/+5
| | |
| * | Make http_io honor HTTP(S)_PROXY environment.NLR2018-06-011-0/+5
| | |
| * | ReactiveCaching#clear_reactive_cache! should clear the not keep the cache aliveTiago Botelho2018-06-011-0/+6
| |/
| * Add validation to webhook and service URLs to ensure they are not blocked ↵Francisco Javier López2018-06-011-0/+5
| | | | | | | | because of SSRF
| * Merge branch '46019-add-missing-migration' into 'master'Yorick Peterse2018-06-011-0/+5
| |\ | | | | | | | | | | | | | | | | | | Resolve "ActiveRecord::RecordInvalid: Validation failed: Build timeout needs to be at least 10 minutes" Closes #46019 See merge request gitlab-org/gitlab-ce!18775
| | * Add CHANGELOG entry46019-add-missing-migrationTomasz Maczukin2018-05-221-0/+5
| | |
| * | Merge branch 'add-moneky-patch-for-using-stream-upload-with-carrierwave' ↵Kamil Trzciński2018-06-011-0/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add a monkey patch of https://github.com/carrierwaveuploader/carrierwave/pull/2314 See merge request gitlab-org/gitlab-ce!19102
| | * | Add changelogShinya Maeda2018-05-281-0/+5
| | | |
| * | | Merge branch '46487-add-support-for-jupyter-in-gitlab-via-kubernetes' into ↵Dmitriy Zaporozhets2018-06-011-0/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Add support for Jupyter in GitLab via Kubernetes" Closes #46487 See merge request gitlab-org/gitlab-ce!19019
| | * \ \ Merge remote-tracking branch 'origin/master' into ↵Dmitriy Zaporozhets2018-05-302-0/+10
| | |\ \ \ | | | | | | | | | | | | | | | | | | 46487-add-support-for-jupyter-in-gitlab-via-kubernetes
| | * | | | Add changelog for jupyter cluster app featureDmitriy Zaporozhets2018-05-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Merge branch '47046-use-sortable-from-npm' into 'master'Phil Hughes2018-06-011-0/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use NPM provided version of SortableJS Closes #47046 See merge request gitlab-org/gitlab-ce!19274
| | * | | | | Add changelog entryKushal Pandya2018-05-311-0/+5
| | | | | | |
* | | | | | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-06-0125-21/+106
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Update 404 and 403 pagesPaul Slaughter2018-05-311-0/+5
| | | | | | |
| * | | | | | Merge branch 'rails5-active-sup-subscriber' into 'master'Rémy Coutable2018-05-311-0/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make ActiveRecordSubscriber rails 5 compatible Closes #44702 See merge request gitlab-org/gitlab-ce!19276
| | * | | | | | Make ActiveRecordSubscriber rails 5 compatibleJarka Kadlecová2018-05-311-0/+5
| | | | | | | |
| * | | | | | | Add merge requests list endpoint for groupsFelipe Artur2018-05-311-0/+5
| | | | | | | |
| * | | | | | | Merge branch '46552-fixes-redundant-message-for-failure-reasons' into 'master'Grzegorz Bizon2018-05-311-0/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes redudant script failure message Closes #46552 and #44271 See merge request gitlab-org/gitlab-ce!19138
| | * | | | | | | Removes redundant error message for script failuresMayra Cabrera2018-05-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Script failure message was redundant so it was removed. Also 'check your job log' message was removed from all the error messages. Closes #44271
| * | | | | | | | Merge branch '41587-osw-mr-metrics-migration-take-two' into 'master'Grzegorz Bizon2018-05-311-0/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take two for MR metrics population background migration See merge request gitlab-org/gitlab-ce!19097
| | * | | | | | | | Take two for MR metrics population background migrationOswaldo Ferreira2018-05-301-0/+5
| | | | | | | | | |
| * | | | | | | | | Export assigned issues in iCalendar feedImre Farkas2018-05-311-0/+5
| | | | | | | | | |
| * | | | | | | | | Merge branch 'sh-fix-issue-api-perf-n-plus-one' into 'master'Nick Thomas2018-05-311-0/+5
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminate cached N+1 queries for projects in Issue API See merge request gitlab-org/gitlab-ce!19269
| | * | | | | | | | Eliminate cached N+1 queries for projects in Issue APIStan Hu2018-05-311-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In CE, every `Issue` entity is also a `ProjectEntity`, which calls `entity&.project.try(:id)` to show the project ID. In an API request with 100 issues, this would hit the Rails statement cache 100 times for the same project and cause unnecessary overhead as related models would also be loaded. In EE, we call `Issue#supports_weight?` for each issue, which then calls `project&.feature_available?(:issue_weights)`. If the project is not preloaded, this incurs additional overhead, as each individual Project object has to be queried. This can lead to a significant performance hit. In loading the CE project with 100 issues, this contributed to at least 22% of the load time. See https://gitlab.com/gitlab-org/gitlab-ce/issues/47031 for why testing this is a bit tricky.
| * | | | | | | | | Merge branch 'rails5-fix-46230' into 'master'Rémy Coutable2018-05-311-0/+5
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use strings as properties key in kubernetes service spec. See merge request gitlab-org/gitlab-ce!19265
| | * | | | | | | | | Use strings as properties key in kubernetes service spec.Jasper Maes2018-05-301-0/+5
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Resolve "Remove links from Web IDE unexpectedly navigate you to a different ↵Sam Beckham2018-05-311-0/+5
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | page"
| * | | | | | | | Merge branch '46903-osw-fix-permitted-params-filtering-on-merge-scheduling' ↵Sean McGivern2018-05-311-0/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Adjust permitted params filtering on merge scheduling Closes #46903 See merge request gitlab-org/gitlab-ce!19255
| | * | | | | | | | Adjust permitted params filtering on merge scheduling46903-osw-fix-permitted-params-filtering-on-merge-schedulingOswaldo Ferreira2018-05-301-0/+5
| | |/ / / / / / /
| * | | | | | | | Merge branch 'fj-36819-remove-v3-api' into 'master'Douwe Maan2018-05-311-0/+5
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removal of API v3 from the codebase Closes #36819 See merge request gitlab-org/gitlab-ce!18970
| | * | | | | | | Removed API endpoint and specsfj-36819-remove-v3-apiFrancisco Javier López2018-05-301-0/+5
| | |/ / / / / /
| * | | | | | | Update CHANGELOG.md for 10.8.3Mayra Cabrera2018-05-305-26/+0
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Merge branch 'fix-nbsp-after-sign-in-with-google' into 'master'Filipa Lacerda2018-05-301-0/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix &nbsp; after sign-in with Google button Closes #45551 See merge request gitlab-org/gitlab-ce!19249
| | * | | | | | | Fix &nbsp; after sign-in with Google buttonfix-nbsp-after-sign-in-with-googleKamil Trzciński2018-05-301-0/+5
| | | | | | | | |
| * | | | | | | | Merge branch '46999-line-profiling-modal-width' into 'master'Clement Ho2018-05-301-0/+5
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Line profiling modal width Closes #46999 See merge request gitlab-org/gitlab-ce!19253