summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 12.0.0v12.0.0GitLab Release Tools Bot2019-06-221-1/+1
|
* Update CHANGELOG.md for 12.0.0GitLab Release Tools Bot2019-06-22287-1433/+310
| | | [ci skip]
* Merge branch '12-0-stable-prepare-rc22' into '12-0-stable'Marin Jankovski2019-06-202-6/+23
|\ | | | | | | | | Prepare 12.0.0-rc22 release See merge request gitlab-org/gitlab-ce!29901
| * Merge branch 'docs/edit-zoom-call-link-content' into 'master'12-0-stable-prepare-rc22Achilleas Pipinellis2019-06-201-2/+9
| | | | | | | | | | | | | | | | | | Edit new Zoom call link content See merge request gitlab-org/gitlab-ce!29878 (cherry picked from commit 265fc7bc336f061570bab5bd7483b2f86b12ce7f) 52252430 Edit new Zoom call link content
| * Merge branch 'docs/existing-knative-edit' into 'master'Achilleas Pipinellis2019-06-201-4/+14
|/ | | | | | | | | Add version text and edit section See merge request gitlab-org/gitlab-ce!29875 (cherry picked from commit e0125d7bc006d5ccbad9db5258d403071ced674d) 5239f88d Add version text and edit section
* Merge branch '12-0-stable-prepare-rc22' into '12-0-stable'Robert Speicher2019-06-1919-54/+136
|\ | | | | | | | | Prepare 12.0.0-rc22 release See merge request gitlab-org/gitlab-ce!29865
| * Merge branch 'link_zoom_call_issue-docs' into 'master'Achilleas Pipinellis2019-06-192-0/+6
| | | | | | | | | | | | | | | | | | Add zoom call section in issue data page See merge request gitlab-org/gitlab-ce!29815 (cherry picked from commit 366d0eb2018c652eb03e48f6b921e705d1789455) 693e01ab Add zoom call section in issue data page
| * Merge branch '63417-add-missing-class' into 'master'Kamil Trzciński2019-06-193-3/+8
| | | | | | | | | | | | | | | | | | | | | | Adds missing class in collapsible sections Closes #63417 See merge request gitlab-org/gitlab-ce!29804 (cherry picked from commit 22755a4aa2d2884629ef9050227ef461574d9d94) d3a1468b Adds missing class
| * Merge branch 'docs/12-0-upgrade' into 'master'Achilleas Pipinellis2019-06-191-0/+21
| | | | | | | | | | | | | | | | | | Docs: Added source upgrade guides for 12.0.0 See merge request gitlab-org/gitlab-ce!29795 (cherry picked from commit 66425a93f44d3d52add7e317e5067ad7c953010b) e2aaa602 Added source upgrade guides for 12.0.0
| * Merge branch '11449-qa-fixes-for-sast-ds-docs' into 'master'Achilleas Pipinellis2019-06-192-8/+7
| | | | | | | | | | | | | | | | | | Fix typos, grammar and wording for SAST and DS report JSON docs See merge request gitlab-org/gitlab-ce!29744 (cherry picked from commit 892b68db5c7fd92e048fbe3c7448e8cc219e4c39) 01f39725 Fix typos and bad wording for SAST and DS docs
| * Merge branch 'ac-usage-quotas-docs' into 'master'Achilleas Pipinellis2019-06-194-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | Document Usage Quotas group settings page Closes #63022 See merge request gitlab-org/gitlab-ce!29599 (cherry picked from commit d5829bef982ee5ac6fc2c44b9bcdc5328b0866f7) a4f1263c Document Pipeline quota -> Usage Quotas rename 3a5db39b Document group storage usage quota
| * Merge branch 'zj-feature-flag-default-on-catfile-cache' into 'master'Douwe Maan2019-06-197-39/+84
|/ | | | | | | | | | | | Feature flag default on catfile cache Closes gitaly#1712 See merge request gitlab-org/gitlab-ce!29556 (cherry picked from commit 14d46afd9b3ee7482fa8be7bc6782b19e960ce45) 968674e4 Move Gitaly feature flag logic to Feature::Gitaly 4dfaaf40 Turn on Cat-File cache by default
* Merge branch '12-1-auto-deploy-0010836' into 12-0-stableRobert Speicher2019-06-1915-13/+163
|\
| * Merge branch 'sh-pipeline-typo-docs' into 'master'Marcia Ramos2019-06-191-1/+2
| | | | | | | | | | | | | | | | | | | | Fix typo in doc/user/project/pipelines/settings.md See merge request gitlab-org/gitlab-ce!29851 (cherry picked from commit 9df475eb368d81d90022b646fe9d7c0944d854f1) 52a0750a Fix typo in doc/user/project/pipelines/settings.md 37276349 Apply suggestion to doc/user/project/pipelines/settings.md
| * Merge branch 'revert-concurrent-pipeline-schedule-creation' into 'master'Kamil Trzciński2019-06-183-1/+49
| | | | | | | | | | | | | | | | | | Revert concurrent pipeline creation for pipeline schedules See merge request gitlab-org/gitlab-ce!29794 (cherry picked from commit ba952d53c5782e49b59ba3e5dd89c2c1eca02c80) 36b30cf1 Revert concurrent pipeline schedule creation
| * Merge branch '59023-fix-web-ide-creating-branches-off-new-commits' into 'master'Phil Hughes2019-06-187-10/+92
| | | | | | | | | | | | | | | | | | Fix IDE commit to use start_ref See merge request gitlab-org/gitlab-ce!29769 (cherry picked from commit c4efc7b53aad3be5109c4256f3438f908e180c20) 894ad6f6 Fix IDE commit to use start_ref
| * Merge branch 'backport-report_approver-migration-to-ce' into 'master'Yorick Peterse2019-06-182-0/+14
| | | | | | | | | | | | | | | | | | Backport approval MR rules report_type migration to CE See merge request gitlab-org/gitlab-ce!29766 (cherry picked from commit 53036a5bc6dcdc120ce828e3366be8b4486f9a6a) 5d76e091 Backport approval MR rules report_type migration to CE
| * Merge branch 'gitaly-version-v1.47.0' into 'master'Yorick Peterse2019-06-182-1/+6
| | | | | | | | | | | | | | | | | | | | Upgrade Gitaly to v1.47.0 See merge request gitlab-org/gitlab-ce!29789 (cherry picked from commit 1de4ebc7eed1b6fe25feb5a5306b83b15ced6ab2) 7144f715 Update Gitaly version to v1.47.0 3efb1520 Add changelog entry
| * Restore Jira tables in db/schema.rbYorick Peterse2019-06-171-0/+20
| | | | | | | | | | Cherry-picking the schema backport commits led to these changes being thrown away, without this being clear.
| * Merge branch 'merge-schema-backport-to-auto-deploy' into ↵Yorick Peterse2019-06-17108-3455/+4696
| |\ | | | | | | | | | | | | | | | | | | '12-1-auto-deploy-0010836' Merge database schema backport into the auto deploy branch See merge request gitlab-org/gitlab-ce!29773
| | * Run CI migrations since 11.11.0Yorick Peterse2019-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * Backport the EE schema and migrations to CEYorick Peterse2019-06-17105-3449/+4659
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * Allow custom names for concurrent foreign keysYorick Peterse2019-06-172-5/+36
| |/ | | | | | | | | This is necessary for backporting the EE schema to ensure backported foreign keys use the same key names.
| * Merge branch 'master-i18n' into 'master'Bob Van Landuyt2019-06-1745-71/+1556
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Master i18n See merge request gitlab-org/gitlab-ce!29723 (cherry picked from commit 305455cf9bda14a373f874ccec8c3d6416fb9e5e) a1dcb7d3 New translations gitlab.pot (Albanian) 8db4ba3e New translations gitlab.pot (Punjabi) c61fad94 New translations gitlab.pot (Italian) 34bf8941 New translations gitlab.pot (Japanese) 7d3419a0 New translations gitlab.pot (Korean) 49f57a69 New translations gitlab.pot (Mongolian) 34765378 New translations gitlab.pot (Norwegian Bokmal) 0e7a6679 New translations gitlab.pot (Polish) da83606f New translations gitlab.pot (Portuguese) baa8d077 New translations gitlab.pot (Portuguese, Brazilian) 2fd714bc New translations gitlab.pot (Romanian) 13e4fc39 New translations gitlab.pot (Hungarian) 68e85259 New translations gitlab.pot (Russian) be746bfa New translations gitlab.pot (Serbian (Cyrillic)) b0357577 New translations gitlab.pot (Serbian (Latin)) 892b407a New translations gitlab.pot (Slovak) 5290c636 New translations gitlab.pot (Spanish) a13e58c6 New translations gitlab.pot (Swahili) d7cb5911 New translations gitlab.pot (Swedish) a458871c New translations gitlab.pot (Turkish) 2cf187a9 New translations gitlab.pot (Ukrainian) d95c03ab New translations gitlab.pot (Indonesian) 196b7d5f New translations gitlab.pot (Hindi) eabd6864 New translations gitlab.pot (Arabic) 194d74a2 New translations gitlab.pot (Czech) e3237345 New translations gitlab.pot (Bengali) e5fec117 New translations gitlab.pot (Bengali, India) c55ab12e New translations gitlab.pot (Bulgarian) f355bdb5 New translations gitlab.pot (Catalan) 54f64291 New translations gitlab.pot (Chinese Simplified) 93d28530 New translations gitlab.pot (Chinese Traditional) 83d9265b New translations gitlab.pot (Chinese Traditional, Hong Kong) 4f1ef2d0 New translations gitlab.pot (Croatian) a201b464 New translations gitlab.pot (Danish) 0c49b3f8 New translations gitlab.pot (Hebrew) 9b2dadf7 New translations gitlab.pot (Dutch) 5cb639e2 New translations gitlab.pot (Esperanto) 872ca22c New translations gitlab.pot (Estonian) 4e51c327 New translations gitlab.pot (Filipino) 9e2c3477 New translations gitlab.pot (French) c5550010 New translations gitlab.pot (Galician) a7b4e2fa New translations gitlab.pot (Georgian) 9a02e9b3 New translations gitlab.pot (German) e26abe82 New translations gitlab.pot (Greek) 54ccdd45 New translations gitlab.pot (Welsh) 30fa8cbb New translations gitlab.pot (Ukrainian)
* | Merge branch 'config-application-differences' into 'master'Lin Jen-Shin2019-06-181-0/+30
|\ \ | | | | | | | | | | | | Backport EE changes to config/application.rb See merge request gitlab-org/gitlab-ce!29557
| * | Backport EE changes to config/application.rbconfig-application-differencesYorick Peterse2019-06-171-0/+30
| | | | | | | | | | | | | | | | | | This backports the EE changes made to this config file to CE. EE specific bits do not need an `if Gitlab.ee?`, as everything will work transparently when using CE.
* | | Merge branch 'ashmckenzie/add-created-at-index-to-events' into 'master'Thong Kuah2019-06-182-0/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add index to events and audit_events tables Closes gitlab-com/Product#309 See merge request gitlab-org/gitlab-ce!29194
| * | | Add index to events and audit_events tablesashmckenzie/add-created-at-index-to-eventsAsh McKenzie2019-06-182-0/+27
| | | | | | | | | | | | | | | | Index on created_at, author_id
* | | | Merge branch 'bw-update-graphql-docs' into 'master'Evan Read2019-06-181-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update GraphQL document to mention that epics are supported See merge request gitlab-org/gitlab-ce!29777
| * | | | Mention that epics are supported in GraphqlQLbw-update-graphql-docsBrett Walker2019-06-171-1/+1
| | | | |
* | | | | Merge branch 'docs/add-note-git-clone-path' into 'master'Evan Read2019-06-181-0/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add note about nested variables for GIT_CLONE_PATH See merge request gitlab-org/gitlab-ce!29590
| * | | | | Add note about nested variables for GIT_CLONE_PATHSteve Azzopardi2019-06-181-0/+18
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variable $GIT_CLONE_PATH does not support nested variables, it will only expand the variables once, not more. reference https://gitlab.com/gitlab-org/gitlab-runner/issues/4319
* | | | | Merge branch 'qa-ml-push-test-requires-admin' into 'master'Mark Lapierre2019-06-184-61/+95
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [QA] Test push limit with admin user Closes gitlab-org/quality/staging#37 See merge request gitlab-org/gitlab-ce!29036
| * | | | | Test push limit with admin userMark Lapierre2019-06-184-61/+95
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses `:requires_admin` metadata to specify that a test needs an admin user. Sets the push file size limit test to require an admin user. With an admin access token set as the env var GITLAB_QA_ADMIN_ACCESS_TOKEN, the push size limit test now only uses the API and CLI
* | | | | Merge branch 'qa-create-merge-request-tests' into 'master'Mark Lapierre2019-06-185-48/+61
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing an old quarantined test Closes gitlab-org/quality/staging#50 See merge request gitlab-org/gitlab-ce!28643
| * | | | | Fixing trailing whitespace and other linter errorsqa-create-merge-request-testsTomislav Nikic2019-06-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing a single trailing whitespace issue. Fixing no new line at the end of the file.
| * | | | | Created a refreshed create merge request suiteTomislav Nikic2019-06-175-49/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created a refreshed test suite using api to improve speed. This was done by adding qa tags to the merge request view.
* | | | | | Merge branch ↵Thong Kuah2019-06-1810-11/+71
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | | | | Allow switching clusters between managed/unmanagedTiger2019-06-1810-11/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any resources created while the cluster was managed will be untouched, allowing users to set/unset this flag as they please.
* | | | | | | Merge branch 'readonly_k8s_integration' into 'master'Thong Kuah2019-06-1828-319/+132
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Kubernetes service templates readonly See merge request gitlab-org/gitlab-ce!29044
| * | | | | | | Make KubernetesService readonlyJames Fargher2019-06-1828-319/+132
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge branch 'migrate_k8s_service_integration' into 'master'Thong Kuah2019-06-175-6/+300
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Kubernetes service integration templates to clusters See merge request gitlab-org/gitlab-ce!28534
| * | | | | | | When an instance cluster already exists migrate disabledmigrate_k8s_service_integrationJames Fargher2019-05-302-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assume that if an instance level cluster already exists, then the KubernetesService was not being used, but allow the admin to re-enable it if required
| * | | | | | | Allow a user defined namespace on non-gitlab managed clustersJames Fargher2019-05-302-6/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since they are not GitLab managed we wont make assumptions about the namespaces used
| * | | | | | | Migrate Kubernetes service integration templates to clustersJames Fargher2019-05-303-0/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The migration uses active record model stubs so that field encryption can be more easily used.
* | | | | | | | Merge branch 'merge-train-docs-change' into 'master'Mike Lewis2019-06-171-9/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Updated docs for Merge Trains See merge request gitlab-org/gitlab-ce!29771
| * | | | | | | Updated docs with suggested changesmerge-train-docs-changeDarby Frey2019-06-171-6/+2
| | | | | | | |
| * | | | | | | Updated docs for Merge TrainsDarby Frey2019-06-171-5/+3
| | | | | | | |
* | | | | | | | Merge branch '63079-exclude-k8s-namespaces-with-no-service-account-token' ↵Thong Kuah2019-06-174-4/+100
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Don't use Kubernetes namespaces with no token See merge request gitlab-org/gitlab-ce!29643
| * | | | | | | | Don't use Kubernetes namespaces with no token63079-exclude-k8s-namespaces-with-no-service-account-tokenTiger2019-06-175-5/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever we are selecting a namespace to use for a deployment or to query a cluster we want to exclude Kubernetes namespace records that don't have a token set as they will not have the required permissions. However when configuring clusters, we want to use the original namespace record even if it has no token, as a namespace has to be unique on a cluster.