summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update maven template with correct linktrizzi-master-patch-43016Tim Rizzi2019-06-041-2/+2
|
* Update CHANGELOG.md for 11.10.6GitLab Release Tools Bot2019-06-043-10/+17
| | | [ci skip]
* Merge branch 'winh-issue-boards-setIssueDetail' into 'master'Clement Ho2019-06-044-3/+18
|\ | | | | | | | | Extract setIssueDetail() into issue boards store See merge request gitlab-org/gitlab-ce!29071
| * Extract setIssueDetail() into issue boards storeWinnie Hellmann2019-06-044-3/+18
|/
* Merge branch 'pb-update-gitaly-1-45-0' into 'master'Bob Van Landuyt2019-06-042-1/+6
|\ | | | | | | | | 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-042-1/+6
| |
* | Merge branch 'ce-fix-vue-spec-warning' into 'master'Fatih Acet2019-06-042-11/+0
|\ \ | | | | | | | | | | | | Fix warning in spec from committing unused mutation See merge request gitlab-org/gitlab-ce!28815
| * | Fix warning in spec from committing unused mutationce-fix-vue-spec-warningSimon Knox2019-05-292-11/+0
| | |
* | | Merge branch '57037-fix-mr-checkboxes-mobile-alignment' into 'master'Fatih Acet2019-06-043-48/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-303-48/+7
| | | | | | | | | | | | | | | | | | | | It does this by removing the `.accept-control` class which was only causing problems.
* | | | Merge branch 'winh-issue-boards-applyFilter' into 'master'Phil Hughes2019-06-043-18/+54
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Extract toggleFilter() into issue boards store See merge request gitlab-org/gitlab-ce!29083
| * | | | Extract toggleFilter() into issue boards storeWinnie Hellmann2019-06-043-18/+54
|/ / / /
* | | | Merge branch 'bvl-design-diff-notes-ce' into 'master'Douwe Maan2019-06-045-12/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Adjustments related to DiffNotes on diffs outside of a project's main repository See merge request gitlab-org/gitlab-ce!29023
| * | | | Get `repository` from noteable in DiffNotesBob Van Landuyt2019-06-031-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Getting the `repository` directly from the noteable in DiffNotes allows us to use a different repository when the DiffNote is not on a project repository. It is only the first step in decoupling the DiffNote from a project's main repository.
| * | | | Make `resolvable_types` a class methodBob Van Landuyt2019-06-035-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | | This turns Notable::RESOLVABLE_TYPES into a `Notable.resolvable_types`. That allows us to override it in EE.
* | | | | Merge branch 'mr-widget-merge-error' into 'master'Filipa Lacerda2019-06-047-13/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rendering of merge request in merge request widget Closes #40246 See merge request gitlab-org/gitlab-ce!28238
| * | | | | Update rendering of merge request in merge request widgetPhil Hughes2019-06-047-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/40246
* | | | | | Merge branch 'increase-move-issue-dropdown-height' into 'master'Filipa Lacerda2019-06-042-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-032-1/+6
| |/ / / / /
* | | | | | Merge branch 'ac-graphql-wikisize' into 'master'Nick Thomas2019-06-043-1/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose wiki_size on GraphQL API See merge request gitlab-org/gitlab-ce!29123
| * | | | | | Expose wiki_size on GraphQL APIAlessio Caiazza2019-06-043-1/+8
|/ / / / / /
* | | | | | Merge branch 'jej/add-feature-flag-roll-out-issue-template' into 'master'Marin Jankovski2019-06-041-0/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds issue template for feature flag roll out See merge request gitlab-org/gitlab-ce!28751
| * | | | | | Adds issue template for feature flag roll outjej/add-feature-flag-roll-out-issue-templateJames Edwards-Jones2019-06-041-0/+43
| | | | | | |
* | | | | | | Merge branch '10685-remove-feature-flag-ce' into 'master'Nick Thomas2019-06-045-7/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove `approval_rules` feature flag and remove obsolete approvals implementation See merge request gitlab-org/gitlab-ce!28979
| * | | | | | | Remove spec feature stubbing10685-remove-feature-flag-ceMark Chao2019-06-043-4/+0
| | | | | | | |
| * | | | | | | Update doc on approvalMark Chao2019-06-041-1/+1
| | | | | | | |
| * | | | | | | FE: Remove legacy approval feature in MR filesPaul Slaughter2019-06-041-2/+0
| | | | | | | |
* | | | | | | | 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