summaryrefslogtreecommitdiff
path: root/changelogs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '28996-create-mvc-ui-in-haml' into 'master'Filipa Lacerda2019-06-051-0/+5
|\ | | | | | | | | Add Let's Encrypt option in Pages domain new/edit Haml form See merge request gitlab-org/gitlab-ce!26438
| * Add auto SSL toggle to Pages domain settings page28996-create-mvc-ui-in-hamlNathan Friend2019-06-031-0/+5
| | | | | | | | | | | | | | | | This commit adds an auto SSL toggle switch to the settings page of GitLab Pages domains. This toggle enable or disabled auto SSL management via Let's Encrypt. Toggling the button dynamically updates the form using client-side JavaScript. All changes are behind feature flags.
* | Avoid 500's when commit is not reachableOswaldo Ferreira2019-06-051-0/+5
| |
* | Merge branch 'bvl-use-global-ids-graphql' into 'master'Jan Provaznik2019-06-051-0/+5
|\ \ | | | | | | | | | | | | | | | | | | Use global IDs when exposing GraphQL resources Closes #62650 See merge request gitlab-org/gitlab-ce!29080
| * | Expose IDs in GraphQL as a GlobalIDBob Van Landuyt2019-06-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This exposes all fields named `id` as GlobalIDs so they can be used across our entire GraphQL implementation. When the objects loaded are `ApplicationRecord`s. We'll use our existing batchloading to find them. Otherwise, we'll fall back to the default implementation of `GlobalID`: Calling the `.find` method on the class.
* | | Merge branch '62713-fix-uninstalling-cluster-apps' into 'master'Douglas Barbosa Alexandre2019-06-051-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix connection to Tiller error while uninstalling Closes #62713 See merge request gitlab-org/gitlab-ce!29131
| * | | Fix connection to Tiller error while uninstalling62713-fix-uninstalling-cluster-appsThong Kuah2019-06-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both the `install-<app>` and `uninstall-<app>` pods loads the `values-content-configuration-<app>` configmap into the pod (see `#volume_specification`). This configmap contains the cert necessary to connect to Tiller. The cert though is only valid for 30 minutes. So this fixes the bug where the configmap when uninstalling should be updated as well.
* | | | Merge branch 'revert-git-depth-for-merge-request' into 'master'Kamil Trzciński2019-06-051-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert a default GIT_DEPTH for MR pipeline See merge request gitlab-org/gitlab-ce!28926
| * | | | Revert a default GIT_DEPTH for MR pipelinerevert-git-depth-for-merge-requestFabio Pitino2019-05-311-0/+5
| | | | |
* | | | | Add multiple extends supportWolphin2019-06-051-0/+5
| | | | |
* | | | | Merge branch '55253-activity-feed-ui-enhance-line-height' into 'master'Phil Hughes2019-06-051-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Activity feed UI: Enhance line-height" Closes #55253 See merge request gitlab-org/gitlab-ce!28856
| * | | | | Enhance line-height of Activity feed UI55253-activity-feed-ui-enhance-line-heightJacopo2019-05-311-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Enhances line-height of Activity feed UI to 20px.
* | | | | | Fix whitespace changes visibility when the related file was initially collapsedOndřej Budai2019-06-051-0/+5
| | | | | |
* | | | | | Merge branch 'ce-9578-adjust-opened-issues-count-and-completion-rate' into ↵Robert Speicher2019-06-041-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Port: EE adjust burndown chart opened issues count See merge request gitlab-org/gitlab-ce!28777
| * | | | | | Adjust burndown chart opened issues countce-9578-adjust-opened-issues-count-and-completion-rateAlexandru Croitor2019-06-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adjust opened issues count in the milestone burndown chart to match current opened issues in the milestone. * Fix completion rate calculation to include milestones only.
* | | | | | | Resolve "Charts with many overlapping series display incorrectly"Adriel Santiago2019-06-041-0/+5
| | | | | | |
* | | | | | | Merge branch 'bump-auto-devops-helm-2-14-0' into 'master'Mayra Cabrera2019-06-041-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Helm version in Auto-DevOps.gitlab-ci.yml See merge request gitlab-org/gitlab-ce!28527
| * | | | | | | Bump Helm version in Auto-DevOps.gitlab-ci.ymlbump-auto-devops-helm-2-14-0Thong Kuah2019-06-041-0/+5
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/helm/helm/releases/tag/v2.14.0 for upstream changelog
* | | | | | | Update CHANGELOG.md for 11.11.2GitLab Release Tools Bot2019-06-046-30/+0
| | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Update CHANGELOG.md for 11.10.6GitLab Release Tools Bot2019-06-042-10/+0
| | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'pb-update-gitaly-1-45-0' into 'master'Bob Van Landuyt2019-06-041-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GITALY_SERVER_VERSION to 1.45.0 See merge request gitlab-org/gitlab-ce!29109
| * | | | | | | Update GITALY_SERVER_VERSION to 1.45.0pb-update-gitaly-1-45-0Patrick Bajao2019-06-041-0/+5
| | | | | | | |
* | | | | | | | Merge branch '57037-fix-mr-checkboxes-mobile-alignment' into 'master'Fatih Acet2019-06-041-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MR checkboxes alignment on mobile Closes #57037 See merge request gitlab-org/gitlab-ce!28845
| * | | | | | | | Fix MR checkboxes alignment on mobile57037-fix-mr-checkboxes-mobile-alignmentPaul Slaughter2019-05-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It does this by removing the `.accept-control` class which was only causing problems.
* | | | | | | | | Merge branch 'increase-move-issue-dropdown-height' into 'master'Filipa Lacerda2019-06-041-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase height of move issue dropdown See merge request gitlab-org/gitlab-ce!29087
| * | | | | | | | | Increase height of move issue dropdownincrease-move-issue-dropdown-heightAnnabel Dunstone Gray2019-06-031-0/+5
| | | | | | | | | |
* | | | | | | | | | Expose wiki_size on GraphQL APIAlessio Caiazza2019-06-041-0/+5
| | | | | | | | | |
* | | | | | | | | | Merge branch 'cancel-auto-merge-when-merge-request-is-closed' into 'master'Grzegorz Bizon2019-06-041-0/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cancel auto merge when merge request is closed See merge request gitlab-org/gitlab-ce!28782
| * | | | | | | | | | Cancel auto merge when merge request is closedcancel-auto-merge-when-merge-request-is-closedShinya Maeda2019-06-041-0/+5
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | We should cancel auto merge when merge request is closed.
* | | | | | | | | | Merge branch ↵Grzegorz Bizon2019-06-041-0/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '58941-use-gitlab-serverless-with-existing-knative-installation' into 'master' Resolve "Use GitLab serverless with existing Knative installation" Closes #58941 See merge request gitlab-org/gitlab-ce!27173
| * | | | | | | | | Adapt functions to work for external KnativeJoão Cunha2019-05-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Kn services cache from Clusters::Application::Knative Knative function can exist even if user did not installed Knative via GitLab managed apps. -> Move responsibility of finding services into the Cluster -> Responsability is inside Clusters::Cluster::KnativeServiceFinder -> Projects::Serverless::FunctionsFinder now calls depends solely on a cluster to find the Kn services. -> Detect Knative by resource presence instead of service presence -> Mock knative_installed response temporarily for frontend to develop Display loader while `installed === 'checking'` Added frontend work to determine if Knative is installed Memoize with_reactive_cache(*args, &block) to avoid race conditions When calling with_reactive_cache more than once, it's possible that the second call will already have the value populated. Therefore, in cases where we need the sequential calls to have consistent results, we'd fall under a race condition. Check knative installation via Knative resource presence Only load pods if Knative is discovered Always return a response in FunctionsController#index - Always indicate if Knative is installed, not installed or checking - Always indicate the partial response for functions. Final response is guaranteed when knative_installed is either true | false. Adds specs for Clusters::Cluster#knative_services_finder Fix method name when calling on specs Add an explicit check for functions Added an explicit check to see if there are any functions available Fix Serverless feature spec - we don't find knative installation via database anymore, rather via Knative resource Display error message for request timeouts Display an error message if the request times out Adds feature specs for when functions exist Remove a test purposed hardcoded flag Add ability to partially load functions Added the ability to partially load functions on the frontend Add frontend unit tests Added tests for the new frontend additions Generate new translations Generated new frontend translations Address review comments Cleaned up the frontend unit test. Added computed prop for `isInstalled`. Move string to constant Simplify nil to array conversion Put knative_installed states in a frozen hash for better read Pluralize list of Knative states Quey services and pods filtering name This way we don't need to filter the namespace in memory. Also, the data we get from the network is much smaller. Simplify cache_key and fix bug - Simplifies the cache_key by removing namespace duplicate - Fixes a bug with reactive_cache memoization
* | | | | | | | | | Change s_() calls to _() callsMichał Zając2019-06-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no namespaces in the strings so we don't need those
* | | | | | | | | | Merge branch ↵Kamil Trzciński2019-06-041-0/+5
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'set-real-next-run-at-for-preventing-duplciate-pipeline-creations' into 'master' Make pipeline schedule worker resilient Closes gitlab-com/gl-infra/production#805 and #61955 See merge request gitlab-org/gitlab-ce!28407
| * | | | | | | | | Make pipeline schedule worker resilientset-real-next-run-at-for-preventing-duplciate-pipeline-creationsShinya Maeda2019-06-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, pipeline schedule worker is unstable because it's sometimes killed by excessive memory consumption. In order to improve the performance, we add the following fixes: 1. next_run_at is always real_next_run, which means the value always takes into account of worker's cron schedule 1. Remove exlusive lock. This is already covered by real_next_run change. 1. Use RunPipelineScheduleWorker for avoiding memory killer. Memory consumption is spread to the multiple sidekiq worker.
* | | | | | | | | | Fix project settings not being able to updateStan Hu2019-06-031-0/+5
| |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously import_url would always be present in the update parameters, which would cause the validation to fail. We now only include this parameter only if there is URL given. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62708
* | | | | | | | | Bump Gitaly version to 1.44.0Douwe Maan2019-06-032-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes sure Gitaly includes a fix to make rebase work again properly. Part of: https://gitlab.com/gitlab-org/gitlab-ce/issues/62353
* | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-06-032-0/+10
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'security-60143-address-xss-issue-master' into 'master'Robert Speicher2019-06-031-0/+5
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reject slug+uri concat if slug is deemed unsafe See merge request gitlab/gitlabhq!3108
| | * | | | | | | | | Reject slug+uri concat if slug is deemed unsafeKerri Miller2019-05-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First reported: https://gitlab.com/gitlab-org/gitlab-ce/issues/60143 When the page slug is "javascript:" and we attempt to link to a relative path (using `.` or `..`) the code will concatenate the slug and the uri. This MR adds a guard to that concat step that will return `nil` if the incoming slug matches against any of the "unsafe" slug regexes; currently this is only for the slug "javascript:" but can be extended if needed. Manually tested against a non-exhaustive list from OWASP of common javascript XSS exploits that have to to with mangling the "javascript:" method, and all are caught by this change or by existing code that ingests the user-specified slug.
| * | | | | | | | | | Merge branch 'security-58856-persistent-xss-in-note-objects' into 'master'Robert Speicher2019-06-031-0/+5
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Persistent XSS in note objects CE See merge request gitlab/gitlabhq!3075
| | * | | | | | | | | | Add changelog entrycharlieablett2019-04-231-0/+5
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'osw-sync-merge-ref-upon-mergeability-check' into 'master'Douwe Maan2019-06-031-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically update MR merge-ref along merge status Closes #58495 See merge request gitlab-org/gitlab-ce!28513
| * | | | | | | | | | | | Automatically update MR merge-ref along merge statusOswaldo Ferreira2019-05-311-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This couples the code that transitions the `MergeRequest#merge_status` and refs/merge-requests/:iid/merge ref update. In general, instead of directly telling `MergeToRefService` to update the merge ref, we should rely on `MergeabilityCheckService` to keep both the merge status and merge ref synced. Now, if the merge_status is `can_be_merged` it means the merge-ref is also updated to the latest. We've also updated the logic to be more systematic and less user-based.
* | | | | | | | | | | | | Merge branch '58269-separate-update-patch' into 'master'Mike Greiling2019-06-031-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not display Update app button when saving Knative domain name Closes #58269 See merge request gitlab-org/gitlab-ce!28904
| * | | | | | | | | | | | | Add changelog entryEnrique Alcantara2019-05-301-0/+5
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'update-gitlab-runner-helm-chart-to-0-5-2' into 'master'Kamil Trzciński2019-06-031-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Runner Helm Chart to 0.5.2/11.11.2 See merge request gitlab-org/gitlab-ce!29050
| * | | | | | | | | | | | | Update GitLab Runner Helm Chart to 0.5.2update-gitlab-runner-helm-chart-to-0-5-2Tomasz Maczukin2019-06-031-0/+5
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Added padding to time window dropdown in monitor dashboardDhiraj Bodicherla2019-06-031-0/+5
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge dev.gitlab.org master into GitLab.com masterYorick Peterse2019-06-038-0/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'security-jej/prevent-web-sign-in-bypass' into 'master'GitLab Release Tools Bot2019-06-031-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent password sign in restriction bypass See merge request gitlab/gitlabhq!2702