summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 'patch-66'patch-66Achilleas Pipinellis2019-06-04143-787/+1393
|\ | | | | | | # Conflicts: # doc/administration/high_availability/gitaly.md
| * Merge branch 'trizzi-master-patch-86505' into 'master'Dmitriy Zaporozhets2019-06-041-59/+15
| |\ | | | | | | | | | | | | Update maven.gitlab-ci.yml for GitLab Package See merge request gitlab-org/gitlab-ce!28796
| | * Clarify error message and image in ymltrizzi-master-patch-86505Tim Rizzi2019-06-031-3/+4
| | |
| | * Update yml file comments re: deployTim Rizzi2019-05-301-4/+4
| | |
| | * Update instructions and uncomment out deployTim Rizzi2019-05-301-13/+13
| | |
| | * Simplify deploy script and comment out for CETim Rizzi2019-05-301-11/+16
| | |
| | * Update maven.gitlab-ci.yml for GitLab PackageTim Rizzi2019-05-271-59/+9
| | |
| * | Merge branch 'patch-67' into 'master'Achilleas Pipinellis2019-06-042-77/+29
| |\ \ | | | | | | | | | | | | | | | | Combine Running Gitaly on its own server details See merge request gitlab-org/gitlab-ce!29094
| | * | Combine Running Gitaly on its own server detailsBen Bodenmiller2019-06-042-77/+29
| |/ /
| * | Merge branch 'cancel-auto-merge-when-merge-request-is-closed' into 'master'Grzegorz Bizon2019-06-043-0/+18
| |\ \ | | | | | | | | | | | | | | | | 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-043-0/+18
| | | | | | | | | | | | | | | | We should cancel auto merge when merge request is closed.
| * | | Merge branch ↵Grzegorz Bizon2019-06-0426-298/+616
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| | * | | Move file one folder level up to avoid namespace conflict58941-use-gitlab-serverless-with-existing-knative-installationJoão Cunha2019-06-035-119/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clusters::Cluster::KnativeServicesFinder becomes Clusters::KnativeServicesFinder This is to avoid loading race condition between: ``` module Clusters class Cluster < ApplicationRecord ``` and ``` module Clusters class Cluster ```
| | * | | Adapt functions to work for external KnativeJoão Cunha2019-05-2926-298/+617
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge branch 'introduce-auto-merge-process-worker' into 'master'Thong Kuah2019-06-048-35/+93
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Introduce sidekiq worker for auto merge process See merge request gitlab-org/gitlab-ce!28780
| | * | | | Introduce sidekiq worker for auto merge processintroduce-auto-merge-process-workerShinya Maeda2019-06-048-35/+93
| | | |/ / | | |/| | | | | | | | | | | | | | | | | As we have a central domain for auto merge process today, we should use a single worker for any auto merge process.
| * | | | Merge branch '61960-translatable-strings-in-issue-closure-emails' into 'master'Rémy Coutable2019-06-047-10/+28
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract strings to gettext Closes #61960 See merge request gitlab-org/gitlab-ce!28489
| | * | | | Change s_() calls to _() callsMichał Zając2019-06-047-10/+28
| |/ / / / | | | | | | | | | | | | | | | There are no namespaces in the strings so we don't need those
| * | | | Merge branch 'qa-de-quarantine-e2e-test' into 'master'Rémy Coutable2019-06-041-4/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | De-quarantine e2e test for issue suggestions Closes gitlab-org/quality/staging#53 See merge request gitlab-org/gitlab-ce!29046
| | * | | | Update e2e test with more explicit methodsqa-de-quarantine-e2e-testWalmyr Lima2019-06-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This goes in accordance with https://bit.ly/2Z1RdjZ
| | * | | | De-quarantine e2e test for issue suggestionsWalmyr Lima2019-06-031-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to https://bit.ly/2JTPCcF Now that https://gitlab.com/gitlab-org/gitlab-ce/issues/60355 is closed we can de-quarantine this test.
| * | | | | Merge branch 'puma-fix' into 'master'Kamil Trzciński2019-06-042-1/+29
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore Puma empty worker stats See merge request gitlab-org/gitlab-ce!28932
| | * | | | | Ignore Puma empty worker statsJan Provaznik2019-06-042-1/+29
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases (during worker start) it's possible that Puma.stats returns an empty hash for worker's last status. In that case we just skip sampling of the worker until these stats are available.
| * | | | | Merge branch '62618-docs-feedback-unstage-page-needs-clarification' into ↵Achilleas Pipinellis2019-06-041-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Docs feedback: unstage page needs clarification" Closes #62618 See merge request gitlab-org/gitlab-ce!29113
| | * | | | | Update unstage doc to clarify reset62618-docs-feedback-unstage-page-needs-clarificationZeff Morgan2019-06-041-2/+2
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'docs/edit-phabricator-docs' into 'master'Achilleas Pipinellis2019-06-041-8/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes some Phabricator import docs problems See merge request gitlab-org/gitlab-ce!29114
| | * | | | | Fixes some Phabricator import docs problemsEvan Read2019-06-041-8/+5
| |/ / / / /
| * | | | | Merge branch ↵Kamil Trzciński2019-06-0411-150/+234
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-0311-150/+234
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Merge branch 'ce-fe-fix-ee-diff-profile-key-views' into 'master'Bob Van Landuyt2019-06-043-4/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve EE/CE differences in app/views/profiles/keys See merge request gitlab-org/gitlab-ce!28900
| | * | | | | | Resolved EE differences in app/views/profiles/keysce-fe-fix-ee-diff-profile-key-viewsPaul Slaughter2019-05-313-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **How?** It creates a base method `can_delete?` on Key which will always be true in CE and is overridden in EE. Added changelog entry
| * | | | | | | Merge branch 'adriel-expand-collapse-operation-settings' into 'master'Kushal Pandya2019-06-044-3/+12
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add expand/collapse button to operation settings Closes #61511 See merge request gitlab-org/gitlab-ce!28840
| | * | | | | | | Add expand/collapse buttonAdriel Santiago2019-06-044-3/+12
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Add ability to expand/collapse operation settings
| * | | | | | | Merge branch 'docs/ssot_admin_area_third_party_offers' into 'master'Evan Read2019-06-041-3/+20
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edited `Third Party Offers` for SSOT guidelines See merge request gitlab-org/gitlab-ce!29103
| | * | | | | | | Edited `Third Party Offers` for SSOT guidelinesRussell Dickenson2019-06-041-3/+20
| |/ / / / / / /
| * | | | | | | Merge branch '61640-set-font-size-on-html-not-body' into 'master'Mike Greiling2019-06-042-2/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use rems instead of px to set body font-size Closes #61640 See merge request gitlab-org/gitlab-ce!28544
| | * | | | | | | Use rems for body font-size to help accessibility61640-set-font-size-on-html-not-bodySam Bigelow2019-06-032-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use rems instead of px to set default font-size This allows users to change font sizes in their browser and it will affect the view in our application
| * | | | | | | | Merge branch 'docs-aws-elb-web-terminals' into 'master'Mike Lewis2019-06-041-0/+5
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Add documentation about AWS ELB not supporting web sockets See merge request gitlab-org/gitlab-ce!28030
| | * | | | | | | Add AWS ELB note about not supporting web socketsdocs-aws-elb-web-terminalsDrew Blessing2019-05-021-0/+5
| | | | | | | | |
| * | | | | | | | Merge branch 'docs-update-ci-quickstart-readme' into 'master'Evan Read2019-06-041-1/+9
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CI quickstart updates See merge request gitlab-org/gitlab-ce!24702
| | * | | | | | | | Add CI quickstart updatesCindy Pallares 🦉2019-06-041-1/+9
| |/ / / / / / / /
| * | | | | | | | Merge branch 'docs/admin_area_gitaly_servers' into 'master'Evan Read2019-06-041-1/+18
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the Admin Area's *Gitaly Servers* page See merge request gitlab-org/gitlab-ce!28987
| | * | | | | | | | Document the Admin Area's *Gitaly Servers* pageRussell Dickenson2019-06-041-1/+18
| |/ / / / / / / /
| * | | | | | | | Merge branch 'sh-fix-version-12-0' into 'master'Robert Speicher2019-06-041-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VERSION file should be 12.0, not 11.12 See merge request gitlab-org/gitlab-ce!29092
| | * | | | | | | | VERSION file should be 12.0, not 11.12Stan Hu2019-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was apparently causing Gitlab.version_info to return the wrong values, causing the wrong images to be loaded via CI_SERVER_VERSION.
| * | | | | | | | | Merge branch 'docs/ssot_sign_up_restrictions' into 'master'Evan Read2019-06-041-0/+16
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edited signup restrictions for SSOT guidelines See merge request gitlab-org/gitlab-ce!29049
| | * | | | | | | | | Edited signup restrictions for SSOT guidelinesRussell Dickenson2019-06-041-0/+16
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'docs/fix-doc-block' into 'master'Evan Read2019-06-031-3/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown parsing for doc page See merge request gitlab-org/gitlab-ce!29056
| | * | | | | | | | | Fix markdown parsing for doc pagedocs/fix-doc-blockSteve Azzopardi2019-06-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The lack of indentatioin is causing the markdown parser to get confused and formating it wrong.
| * | | | | | | | | | Merge branch 'nik-api-snippets-fix' into 'master'Evan Read2019-06-031-5/+5
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snippets API doc fixes: content->code; visibility is required See merge request gitlab-org/gitlab-ce!28571