Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-06-18Merge branch ↵Thong Kuah
'60617-allow-switching-from-gitlab-managed-to-unmanaged-clusters' into 'master' Allow switching clusters between managed/unmanaged Closes #60617 See merge request gitlab-org/gitlab-ce!29322
2019-06-18Merge branch 'readonly_k8s_integration' into 'master'Thong Kuah
Make Kubernetes service templates readonly See merge request gitlab-org/gitlab-ce!29044
2019-06-18Make KubernetesService readonlyJames Fargher
We are deprecating this service in favor of instance wide clusters. Therefore we removed some code that is not anymore needed for a readonly cluster and also we added some flags to allow for this deprecation. These flags are to be removed in the next release when we finally completelly remove KubernetesService.
2019-06-18Merge branch 'migrate_k8s_service_integration' into 'master'Thong Kuah
Migrate Kubernetes service integration templates to clusters See merge request gitlab-org/gitlab-ce!28534
2019-06-18Mention that epics are supported in GraphqlQLBrett Walker
2019-06-18Add index to events and audit_events tablesAsh McKenzie
Index on created_at, author_id
2019-06-18Merge branch 'merge-train-docs-change' into 'master'Mike Lewis
Updated docs for Merge Trains See merge request gitlab-org/gitlab-ce!29771
2019-06-18Allow switching clusters between managed/unmanagedTiger
Any resources created while the cluster was managed will be untouched, allowing users to set/unset this flag as they please.
2019-06-18Merge branch '63079-exclude-k8s-namespaces-with-no-service-account-token' ↵Thong Kuah
into 'master' Don't use Kubernetes namespaces with no token See merge request gitlab-org/gitlab-ce!29643
2019-06-18Merge branch 'issue-62685-new' into 'master'Andreas Brandl
Add index on invite-email to members See merge request gitlab-org/gitlab-ce!29768
2019-06-18Merge branch 'qa-saml-group-git-http-access-test-ce' into 'master'Dan Davison
CE port of "Add test for git http operations for SSO enforced SAML group" See merge request gitlab-org/gitlab-ce!29550
2019-06-18Merge branch 'qa-ml-validate-after-visit-in-block' into 'master'Dan Davison
[CE] Validate page after visit in block See merge request gitlab-org/gitlab-ce!29524
2019-06-18Merge branch '56737-commits-and-mr-events-on-jira-api' into 'master'Stan Hu
Expose currently supported events properly on services API Closes #56737 See merge request gitlab-org/gitlab-ce!29736
2019-06-18Merge branch '55362-refresh-blank-service-account-token' into 'master'Thong Kuah
Refresh service_account_token for kubernetes_namespaces See merge request gitlab-org/gitlab-ce!29657
2019-06-18Merge branch 'patch-70' into 'master'Evan Read
note that todos are not affected by GitLab Notification Email settings See merge request gitlab-org/gitlab-ce!29539
2019-06-18note that todos are not affected by GitLab Notification Email settingsBen Bodenmiller
2019-06-18Updated docs with suggested changesDarby Frey
2019-06-18Merge branch 'hashed-storage-enabled-default' into 'master'Douglas Barbosa Alexandre
Hashed Storage is enabled by default on new installations See merge request gitlab-org/gitlab-ce!29586
2019-06-18Merge branch 'review-toolbar-data-addition-ce-backport' into 'master'Filipa Lacerda
Toolbar backport changes for CE See merge request gitlab-org/gitlab-ce!29758
2019-06-17Merge branch ↵Mike Greiling
'ce-backport-11435-mr-search-by-approvers-doesn-t-use-reserved-values-for-none-and-any' into 'master' Backport fix MR search by approvers See merge request gitlab-org/gitlab-ce!29621
2019-06-17Backport fix MR search by approversJustin Boyson
2019-06-17Restore Jira tables in db/schema.rbYorick Peterse
Cherry-picking the schema backport commits led to these changes being thrown away, without this being clear.
2019-06-17Merge branch 'merge-schema-backport-to-auto-deploy' into ↵Yorick Peterse
'12-1-auto-deploy-0010836' Merge database schema backport into the auto deploy branch See merge request gitlab-org/gitlab-ce!29773
2019-06-17Merge branch 'ce-12116-indexing-wikis-on-main' into 'master'Mayra Cabrera
Backport docs for "Automatically index wikis in elasticsearch" See merge request gitlab-org/gitlab-ce!29612
2019-06-17Backport docs for "Automatically index wikis in elasticsearch"Nick Thomas
2019-06-17Merge branch 'visual-review-apps-fix-dropdown' into 'master'Mike Greiling
Move Dropdown to Stick to MR View App Button Closes gitlab-ee#12184 See merge request gitlab-org/gitlab-ce!29767
2019-06-17Run CI migrations since 11.11.0Yorick Peterse
One can not upgrade straigt from 9.3 to 12.0, due to the schema changes being backported. Instead, one must first upgrade to 11.11.X. Omnibus already enforces this, and our online upgrade guidelines also cover this. By changing the CI config we don't have to adjust the backport migration to handle a migration path that one can not take.
2019-06-17Backport the EE schema and migrations to CEYorick Peterse
This backports all EE schema changes to CE, including EE migrations, ensuring both use the same schema. == Updated tests A spec related to ghost and support bot users had to be modified to make it pass. The spec in question assumes that the "support_bot" column exists when defining the spec. In the single codebase setup this is not the case, as the column is backported in a later migration. Any attempt to use a different schema version or use of "around" blocks to conditionally disable specs won't help, as reverting the backport migration would also drop the "support_bot" column. Removing the "support_bot" tests entirely appears to be the only solution. We also need to update some foreign key tests now that we have backported the EE columns. Fortunately, these changes are very minor. == Backporting migrations This commit moves EE specific migrations (except those for the Geo tracking database) and related files to CE, and also removes any traces of the ee/db directory. Some migrations had to be modified or removed, as they no longer work with the schema being backported. These migrations were all quite old, so we opted for removing them where modifying them would take too much time and effort. Some old migrations were modified in EE, while also existing in CE. In these cases we took the EE code, and in one case removed them entirely. It's not worth spending time trying to merge these changes somehow as we plan to remove old migrations around the release of 12.0, see https://gitlab.com/gitlab-org/gitlab-ce/issues/59177 for more details.
2019-06-17Allow custom names for concurrent foreign keysYorick Peterse
This is necessary for backporting the EE schema to ensure backported foreign keys use the same key names.
2019-06-17Hashed Storage is enabled by default on new installationsGabriel Mazetto
updated documentation for Geo
2019-06-17Merge branch 'review-toolbar-docs' into 'master'Mike Lewis
Visual Review Toolbar Docs See merge request gitlab-org/gitlab-ce!29641
2019-06-17Updated docs for Merge TrainsDarby Frey
2019-06-17Update changelog MRyguo
2019-06-17Move Dropdown to Stick to MR View App ButtonAndrew Fontaine
The dropdown of changed pages in the review app should be attached to the view app button. This moves it to the correct place. The Review App button is to the right of both of those.
2019-06-17Add index on invite-email to membersyguo
2019-06-17Persist tmp snippet uploadsOswaldo Ferreira
It persist temporary personal snippets under user/:id namespaces temporarily while creating a upload record to track it. If an user gets removed while it's still a tmp upload, it also gets removed. If the tmp upload is sent, the upload gets moved to personal_snippets/:id as before. The upload record also gets updated to the new model type as well.
2019-06-17Merge branch 'zj-disable-hooks-testing' into 'master'Bob Van Landuyt
Disable hooks by setting an ENV var See merge request gitlab-org/gitlab-ce!29672
2019-06-17Merge branch 'generate-spans-for-sections' into 'master'Sean McGivern
Add collapsible sections to job log See merge request gitlab-org/gitlab-ce!28642
2019-06-17Merge branch 'mj/remove-old-password' into 'master'Marin Jankovski
Remove no longer valid password See merge request gitlab-org/gitlab-ce!29751
2019-06-17Merge branch 'backport-schema-changes' into 'master'Robert Speicher
Backport the EE schema to CE Closes gitlab-ee#9686 See merge request gitlab-org/gitlab-ce!26940
2019-06-17Remove unused lineFabio Pitino
2019-06-17Fix that typosarahghp
2019-06-17Add link, badgesarahghp
2019-06-17Merge branch 'ce-11981-show-merge-train-position' into 'master'Filipa Lacerda
CE backport for gitlab-org/gitlab-ee!14064: Add merge train position indicator See merge request gitlab-org/gitlab-ce!29561
2019-06-17Merge branch 'patch-29' into 'master'Nick Thomas
read_repository scope can be used for API See merge request gitlab-org/gitlab-ce!29663
2019-06-17Merge branch 'jej/prototype-ip-enforcement-per-group' into 'master'Douwe Maan
CE port of IP address restriction for groups See merge request gitlab-org/gitlab-ce!29467
2019-06-17CE port of IP address restriction for groupsImre Farkas
2019-06-17Merge branch 'docs-qa-ml-fix-list-rendering' into 'master'Rémy Coutable
Fix list rendering on docs site See merge request gitlab-org/gitlab-ce!29738
2019-06-17Extract shared examples for duplicate sections and nonFabio Pitino
2019-06-17Run CI migrations since 11.11.0Yorick Peterse
One can not upgrade straigt from 9.3 to 12.0, due to the schema changes being backported. Instead, one must first upgrade to 11.11.X. Omnibus already enforces this, and our online upgrade guidelines also cover this. By changing the CI config we don't have to adjust the backport migration to handle a migration path that one can not take.