summaryrefslogtreecommitdiff
path: root/changelogs
Commit message (Collapse)AuthorAgeFilesLines
* Make sure all pipelines would go to pending once39884-fix-pipeline-transition-with-single-manual-actionLin Jen-Shin2017-11-091-0/+6
| | | | | | | | | | | | Without this fix, pipeline could go from skipped to running directly, bypassing the transition for: [:created, :pending] => :running And this is responsible for setting up started_at. Without this fix, started_at would never be set. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/39884
* Merge branch 'fix-issues-api-list-performance' into 'master'Stan Hu2017-11-081-0/+5
|\ | | | | | | | | | | | | Fail when issuable_meta_data is called on an unlimited collection Closes #39845 See merge request gitlab-org/gitlab-ce!15249
| * Fail when issuable_meta_data is called on an unlimited collectionfix-issues-api-list-performanceSean McGivern2017-11-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This method can be called with an array, or a relation: 1. Arrays always have a limited amount of values, so that's fine. 2. If the relation does not have a limit value applied, then we will load every single object in that collection, and prevent N+1 queries for the metadata for that. But that's wrong, because we should never call this without an explicit limit set. So we raise in that case, and this commit will see which specs fail. The only failing specs here were the issues API specs, and the specs for IssuableMetadata itself, and both have been addressed.
* | Merge branch 'dm-notes-for-commit-id' into 'master'Rémy Coutable2017-11-081-0/+6
|\ \ | | | | | | | | | | | | | | | | | | Use Commit#notes and Note.for_commit_id when possible to make sure we use all indexes available to us Closes #34509 See merge request gitlab-org/gitlab-ce!15253
| * | Use Commit#notes and Note.for_commit_id when possible to make sure we use ↵dm-notes-for-commit-idDouwe Maan2017-11-081-0/+6
| |/ | | | | | | all the indexes available to us
* | Resolve "Merge request widget - CI information has different margins"Filipa Lacerda2017-11-081-0/+6
| |
* | Merge branch 'feature-change-signout-route' into 'master'Douwe Maan2017-11-081-0/+5
|\ \ | | | | | | | | | | | | | | | | | | Change Sign Out route from a DELETE to a GET Closes #39708 See merge request gitlab-org/gitlab-ce!15231
| * | Change Sign Out route from a DELETE to a GETJoe Marty2017-11-061-0/+5
| | | | | | | | | | | | Closes #39708
* | | Merge branch 'tc-delete-merged-protected-tags-fix' into 'master'Douwe Maan2017-11-081-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | When deleting merged branches, ignore protected tags Closes #39732 See merge request gitlab-org/gitlab-ce!15252
| * | | When deleting merged branches, ignore protected tagstc-delete-merged-protected-tags-fixToon Claes2017-11-071-0/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In gitlab-org/gitlab-ce!13251 wildcard Protected Branches were handled properly when deleting all merged branches. But this fix wasn't that good. It also checked branch names against Protected Tags. That's not correct. This change will **only** check if there is a Protected Branch matching the merged branch, and ignores Protected Tags. Closes gitlab-org/gitlab-ce#39732.
* | | Merge branch 'bvl-free-paths' into 'master'Douwe Maan2017-11-081-0/+5
|\ \ \ | | | | | | | | | | | | | | | | Free some reserved group routes See merge request gitlab-org/gitlab-ce!15052
| * | | Add helper methods to redirect legacy pathsBob Van Landuyt2017-11-071-0/+5
| | | |
* | | | Add changelogJacob Schatz2017-11-071-0/+5
| | | |
* | | | Merge branch '37824-many-branches-lock-server' into 'master'Annabel Dunstone Gray2017-11-071-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project with many branches can lock server running "git branch --contains XXX" Closes #37824 See merge request gitlab-org/gitlab-ce!14812
| * | | | added changelog entryBrett Walker2017-10-191-0/+6
| | | | |
* | | | | Merge branch 'add-ingress-to-cluster-applications' into 'master'Kamil Trzciński2017-11-071-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add Ingress to cluster applications section See merge request gitlab-org/gitlab-ce!15185
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2017-11-071-5/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | add-ingress-to-cluster-applications
| * | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵Kamil Trzcinski2017-11-075-0/+25
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into add-ingress-to-cluster-applications
| * \ \ \ \ \ Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsKamil Trzcinski2017-11-077-0/+36
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsEric Eastwood2017-11-0616-0/+83
| |\ \ \ \ \ \ \
| * | | | | | | | Add changelog for Ingress in Cluster applicationsEric Eastwood2017-11-061-0/+5
| | | | | | | | |
* | | | | | | | | Improve GitLab Import rake task to work with Hashed Storage and SubgroupsJames Lopez2017-11-071-0/+5
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge branch '38464-k8s-apps' into 'master'Kamil Trzciński2017-11-071-0/+6
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Add support for k8s cluster applications - Helm tiller installation See merge request gitlab-org/gitlab-ce!14908
| * | | | | | | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-085-0/+25
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-077-0/+36
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'master' into 38464-k8s-appsEric Eastwood2017-11-0616-0/+83
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: db/schema.rb
| * | | | | | | Merge branch '36629-35958-add-cluster-application-section' into '38464-k8s-apps'Kamil Trzciński2017-11-061-0/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add applications section to GKE clusters page See merge request gitlab-org/gitlab-ce!15064
| | * \ \ \ \ \ \ Merge remote-tracking branch 'origin/refactor-clusters' into ↵Kamil Trzcinski2017-11-0627-102/+34
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36629-35958-add-cluster-application-section
| | * | | | | | | | Add applications section to GKE clusters pageEric Eastwood2017-11-031-0/+6
| | | | | | | | | |
* | | | | | | | | | Merge branch '39798-revert-gear-animation' into 'master'Clement Ho2017-11-071-5/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert Auto DevOps gear animation Closes #39798 See merge request gitlab-org/gitlab-ce!15232
| * | | | | | | | | Revert Autodevops gear animation39798-revert-gear-animationEric Eastwood2017-11-061-5/+0
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39798
* | | | | | | | | Merge branch '39878-commit-pipeline-reads-wrong-key' into 'master'Tim Zallmann2017-11-071-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix commit pipeline showing wrong status Closes #39878 See merge request gitlab-org/gitlab-ce!15238
| * | | | | | | | | Fix commit pipeline showing wrong status39878-commit-pipeline-reads-wrong-keyFilipa Lacerda2017-11-071-0/+5
| | | | | | | | | |
* | | | | | | | | | Merge branch '38394-smarter-interval' into 'master'Filipa Lacerda2017-11-071-0/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't re-run smart interval callback if there is already one in progress Closes #38394 See merge request gitlab-org/gitlab-ce!15032
| * | | | | | | | | | fix MR ref in changelog38394-smarter-intervalSimon Knox2017-11-081-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2017-11-0718-0/+94
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38394-smarter-interval
| * | | | | | | | | | | update changelogSimon Knox2017-11-071-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2017-11-06259-868/+428
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | 38394-smarter-interval
| * | | | | | | | | | | add changelog and specSimon Knox2017-10-271-0/+5
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix/import-export-arguments' into 'master'Douwe Maan2017-11-071-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix arguments error on Import/Export fetch_ref method Closes #39541 See merge request gitlab-org/gitlab-ce!15241
| * | | | | | | | | | | | added changelogJames Lopez2017-11-071-0/+5
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix-mysql-grant-check' into 'master'Rémy Coutable2017-11-071-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix TRIGGER checks for MySQL Closes #38372 See merge request gitlab-org/gitlab-ce!15226
| * | | | | | | | | | | Fix TRIGGER checks for MySQLfix-mysql-grant-checkYorick Peterse2017-11-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures we can check if the user has TRIGGER permissions without querying restricted tables. Thanks to Steve Norman (https://gitlab.com/stevenorman) for helping out with this merge request. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/38372
* | | | | | | | | | | | Merge branch '39649-change-default-size-for-gke-cluster-creation' into 'master'Kamil Trzciński2017-11-071-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Change default size for GKE cluster creation" Closes #39649 See merge request gitlab-org/gitlab-ce!15220
| * | | | | | | | | | | Resolve conflictsbikebilly2017-11-0716-0/+84
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Add changelogbikebilly2017-11-061-0/+5
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch ↵Rémy Coutable2017-11-071-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39791-when-reopening-an-issue-the-mattermost-notification-has-no-context-to-the-issue' into 'master' Resolve "When reopening an issue the Mattermost Notification has no context to the issue" Closes #39791 See merge request gitlab-org/gitlab-ce!15218
| * | | | | | | | | | | Fix issue reopen Mattermost / Slack message39791-when-reopening-an-issue-the-mattermost-notification-has-no-context-to-the-issueSean McGivern2017-11-061-0/+5
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an issue is reopened, the action is 'reopen', but the state is 'opened' (as we don't have a separate 'reopened' state any more). Because we checked the action in one method and the state in another, this lead to a weird case where the mesage neither linked to the issue, nor contained an attachment with its details. Just checking the action is fine, as it's the most granular.
* | | | | | | | | | | Merge branch ↵Douwe Maan2017-11-071-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37442-api-branches-id-repository-branches-is-calling-gitaly-n-1-times-per-request' into 'master' Fetch the merged branches at once in the `/projects/:id/repository/branches` endpoint See merge request gitlab-org/gitlab-ce!15215
| * | | | | | | | | | | Improve performance of the /projects/:id/repository/branches API endpointRémy Coutable2017-11-061-0/+5
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mitigate a N+1 requests to Gitaly problem. Still one left. Signed-off-by: Rémy Coutable <remy@rymai.me>