delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	WIP: convert HAML buttons to Vue buttonsexperiement/convert-buttons-to-vue	Denys Mishunov	2019-07-01	2	-5/+15
\| \| \| \|	Juts one view is affected in this commit as a PoC
*	Merge branch 'grantyoung-52703-project-archive-compare-qa' into 'master'	Mark Lapierre	2019-07-01	8	-23/+151
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Add e2e test comparing archives of identically named user projects Closes #52703 See merge request gitlab-org/gitlab-ce!29937
\| *	First pass at new automated QA API test for #52703	Grant Young	2019-07-01	8	-23/+151
\|/ \| \| \| \| \|	Checks that archives of two different user projects with the same name aren't the same via checksum. I.E. a user can't download the archive of another's project by mistake. To enable the test some enhancements were made. Namely updating the client module to handle more than one API instance and the creation a custom rest call method that downloads to tmp.
*	Merge branch 'docs-fix-vue-wrapper-link' into 'master'	Evan Read	2019-07-01	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Docs: minor fix to link format See merge request gitlab-org/gitlab-ce!30098
\| *	Docs: minor fix to link format	czmj	2019-07-01	1	-1/+1
\|/
*	Merge branch 'add-notes-style' into 'master'	Evan Read	2019-07-01	1	-1/+18
\|\ \| \| \| \| \| \| \| \|	Update styleguide.md to add Notes usage guidelines See merge request gitlab-org/gitlab-ce!29429
\| *	Update styleguide.md to add Notes usage guidelines	Mike Lewis	2019-07-01	1	-1/+18
\|/
*	Merge branch 'add-clusters-to-deployment' into 'master'	Lin Jen-Shin	2019-07-01	11	-25/+138
\|\ \| \| \| \| \| \| \| \|	Add clusters association to deployment See merge request gitlab-org/gitlab-ce!29960
\| *	Use #cluster for prometheus_adapteradd-clusters-to-deployment	Thong Kuah	2019-06-27	3	-1/+81
\| \| \| \| \| \| \| \| \| \|	We still fallback to environment.deployment_platform until we can backfill
\| *	Drop fallback to deployment platform	Thong Kuah	2019-06-27	2	-21/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All deployments should have already their cluster_id filled in on creation. Legacy deployments will not be retried as:- * Ci::Build#retry calls `Ci::RetryBuildService` * Ci::Pipeline#retry calls `Ci::RetryPipelineService` which also calls `Ci::RetryBuildService` * `Ci::RetryBuildService` will clone a build to retry It is also impossibly to backfill Deployment#cluster_id from Project#deployment_platform correctly as clusters could have been deleted, added or altered in the intervening time.
\| *	Use deployment's cluster for kubernetes prereq	Thong Kuah	2019-06-27	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \|	A deployment will have a cluster associated on creation if there is one. Otherwise fallback to deployment_platform for legacy deployments.
\| *	Populate cluster_id when creating a deployment	Thong Kuah	2019-06-27	3	-4/+16
\| \|
\| *	Add cluster_id to deployments table as an FK	Thong Kuah	2019-06-27	5	-1/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We nullify when cluster is deleted as we want to keep the deployment record around. Add cluster as an optional association We will have only cluster for deployments where the build deploys to a kubernetes cluster
* \|	Merge branch 'docs-webhooks-spacing' into 'master'	Evan Read	2019-07-01	1	-25/+25
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Fix spacing in code blocks in webhook raketask doc See merge request gitlab-org/gitlab-ce!30208
\| * \|	Docs: Fix spacing in code blocks in webhook raketask doc	Marcel Amirault	2019-07-01	1	-25/+25
\|/ /
* \|	Merge branch 'docs-lint-rule-md004' into 'master'	Evan Read	2019-07-01	16	-256/+267
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Enforce consistent prefix for bullet lists See merge request gitlab-org/gitlab-ce!30206
\| * \|	Enforce consistent prefix for bullet lists	Marcel Amirault	2019-07-01	16	-256/+267
\|/ / \| \| \| \| \| \|	Adjusts asterisks to hyphens in assorted docs to allow lint rule to pass
* \|	Merge branch 'small-s-in-elasticsearch' into 'master'	Evan Read	2019-07-01	5	-10/+15
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in docs about Elasticsearch See merge request gitlab-org/gitlab-ce!30162
\| * \|	Fix typo in docs about Elasticsearch	Takuya Noguchi	2019-06-28	5	-10/+15
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \| \|	Merge branch 'docs/refactor-2fa' into 'master'	Evan Read	2019-07-01	5	-68/+82
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor the 2FA docs See merge request gitlab-org/gitlab-ce!30087
\| * \| \|	Refactor the 2FA docsdocs/refactor-2fa	Achilleas Pipinellis	2019-06-28	5	-68/+82
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Remove outdated images - Add info on browser support - Mention that U2F works with SoloKeys
* \| \|	Merge branch 'docs/health_check' into 'master'	Evan Read	2019-07-01	1	-21/+30
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62080 Closes #62080 See merge request gitlab-org/gitlab-ce!30148
\| * \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62080	Russell Dickenson	2019-07-01	1	-21/+30
\|/ / /
* \| \|	Merge branch '63913-quarantine-schema-check' into 'master'	Thong Kuah	2019-07-01	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Quarantine schema_version_check because tests after it failed See merge request gitlab-org/gitlab-ce!30198
\| * \| \|	Quarantine schema_version_check because tests after it failed	Lin Jen-Shin	2019-07-01	1	-1/+1
\|/ / /
* \| \|	Merge branch '63463-follow-up-from-insights-is-now-ga-docs' into 'master'	Achilleas Pipinellis	2019-06-29	3	-4/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a link in the docs to the epic that defined the Insights feature Closes #63463 See merge request gitlab-org/gitlab-ce!30181
\| * \| \|	Add a link in the docs to the epic that defined the Insights feature63463-follow-up-from-insights-is-now-ga-docs	Rémy Coutable	2019-06-28	3	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'rs-config-settings' into 'master'	Lin Jen-Shin	2019-06-29	1	-8/+136
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Copy Settings initializer from EE See merge request gitlab-org/gitlab-ce!30140
\| * \| \| \|	Move mirror settings to their own EE blockrs-config-settings	Robert Speicher	2019-06-28	1	-3/+6
\| \| \| \| \|
\| * \| \| \|	Copy Settings initializer from EE	Robert Speicher	2019-06-27	1	-8/+133
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This brings parity between the two versions.
* \| \| \| \|	Merge branch 'check-min-schema-migrate' into 'master'	Robert Speicher	2019-06-28	6	-1/+99
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure we are on a supported version before migrating See merge request gitlab-org/gitlab-ce!29882
\| * \| \| \| \|	Fix extra newline left by conflict resolutioncheck-min-schema-migrate	DJ Mountney	2019-06-28	1	-1/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into 'check-min-schema-migrate'	DJ Mountney	2019-06-28	506	-2936/+7520
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # lib/gitlab/database.rb
\| * \| \| \| \| \|	Update comments and docs around min schema version	DJ Mountney	2019-06-25	3	-2/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed some spelling Dropped rake task description for a prefix only task Added note on skipping the check to the postgres debugging dev doc
\| * \| \| \| \| \|	Add the frozen literal to the correct file	DJ Mountney	2019-06-25	2	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Drop the source upgrade change	DJ Mountney	2019-06-25	3	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We no longer need to point people away from using db:migrate
\| * \| \| \| \| \|	Add an flag for skipping the schema version check	DJ Mountney	2019-06-25	5	-9/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If you chose to use the rollback migration feature on your current version for example, you should still have a way to migrate, being that you are still on a supported migration path.
\| * \| \| \| \| \|	Fix db:migrate for fresh installs	DJ Mountney	2019-06-25	1	-1/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Move min schema version check to db:migrate	DJ Mountney	2019-06-25	6	-6/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rather than have it checked only as part of gitlab:db:configure, we will instead have it as a pre-req for every db:migrate command
\| * \| \| \| \| \|	Check supported version when migrating	DJ Mountney	2019-06-25	5	-1/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set the mininum supported migration version to be the schema version as of 11.11.0, and errors you if that is not detected during gitlab:db:configure
* \| \| \| \| \| \|	Merge branch 'mh/collapsible-boards' into 'master'	Mike Greiling	2019-06-28	8	-84/+168
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow collapsing all issue boards Closes #40630 See merge request gitlab-org/gitlab-ce!29955
\| * \| \| \| \| \| \|	Allow collapsing all issue boards	Martin Hanzel	2019-06-28	8	-84/+168
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All issue boards can now be collapsed via a button, re-ordered by dragging the header, and the vertical collapsed header style was reworked.
* \| \| \| \| \| \|	Merge branch '63874-use-process-cpu-time-instead-of-thread-for-cpu-metrics' ↵	Stan Hu	2019-06-28	2	-13/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Use PROCESS_CPUTIME_ID for cpu time metrics Closes #63874 See merge request gitlab-org/gitlab-ce!30166
\| * \| \| \| \| \| \|	Fix spec definitions63874-use-process-cpu-time-instead-of-thread-for-cpu-metrics	Aleksei Lipniagov	2019-06-28	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use PROCESS_CPUTIME_ID for cpu time metrics	Aleksei Lipniagov	2019-06-28	1	-11/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To measure ruby cpu time, we should use PROCESS_CPUTIME_ID instead of THREAD_CPUTIME_ID in our environments.
* \| \| \| \| \| \| \|	Merge branch 'vue-i18n-js-boards-directory' into 'master'	Mike Greiling	2019-06-28	11	-57/+138
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Vue-i18n: autofix for 'app/assetsjavascripts/boards' dir See merge request gitlab-org/gitlab-ce!29877
\| * \| \| \| \| \| \| \|	Vue-i18n: javascripts/boards directory	Ezekiel Kigbo	2019-06-28	11	-57/+138
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i18n linting for .vue files under the app/javascripts/boards directory
* \| \| \| \| \| \| \|	Merge branch 'leipert-absolute-scss-paths' into 'master'	Mike Greiling	2019-06-28	11	-186/+100
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use absolute paths for SCSS imports See merge request gitlab-org/gitlab-ce!30161
\| * \| \| \| \| \| \|	Fix modal related tests	Paul Gascou-Vaillancourt	2019-06-28	2	-25/+12
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix selector in karma spec	Lukas Eipert	2019-06-28	1	-1/+1
\| \| \| \| \| \| \| \|