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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '59370-enable-cloud-run-on-gke' of ↵59370-enable-cloud-run-on-gke	Matt Kasa	2019-09-11	1	-1/+1
\|\ \| \| \| \| \| \|	gitlab.com:gitlab-org/gitlab-ce into 59370-enable-cloud-run-on-gke
\| *	Apply suggestion to doc/user/project/clusters/index.md	Matt Kasa	2019-09-09	1	-1/+1
\| \|
* \|	Add spec for application#status_states	Matt Kasa	2019-09-11	1	-0/+14
\| \|
* \|	Add spaces around blocks in google client spec	Matt Kasa	2019-09-11	1	-0/+3
\| \|
* \|	Refactor make_cluster_options and enable_addons! into one	Matt Kasa	2019-09-11	1	-14/+6
\| \|
* \|	Refactor cloud_run to more generic knative_pre_installed	Matt Kasa	2019-09-11	17	-60/+111
\|/
*	Add Cloud Run on GKE feature to cluster creation	Matt Kasa	2019-09-05	22	-70/+238
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Permits cloud_run parameter in ClustersController#create - Enables httpLoadBalancing, istioConfig, and cloudRunConfig in Gcp ProvisionService if cloud_run is enabled - Add `Enable Cloud Run on GKE` checkbox to cluster create page - Add `Enable Cloud Run on GKE` checkbox to cluster details - Default knative to installed for cloud_run clusters - Make knative not uninstallable for cloud_run clusters - Update project clusters docs with entry about Cloud Run - Update tests and add new test for cluster with cloud_run enabled - Add Cloud Run on GKE strings to translations - Add spec that will fail when google-api-client has been upgraded - Add concept of installed-via to applications frontend Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/59370
*	Add cloud_run column for Cloud Run on GKE	Matt Kasa	2019-09-05	3	-0/+24
\| \| \| \| \| \| \| \| \|	- Add cloud_run boolean column and index to cluster_providers_gcp table with default set to false - Add cloud_run scope to Clusters::Cluster - Update schema.rb with cloud_run migration Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/59370
*	Fix setting cluster application statuses	Matt Kasa	2019-09-05	5	-4/+10
\| \| \| \| \|	- Add status_states method to get list of states with their values - Change applications to set status to status_states values
*	Merge branch 'doc-update-database-load-balancing-log-docs' into 'master'	Evan Read	2019-09-05	2	-18/+15
\|\ \| \| \| \| \| \| \| \|	Update docs for database load balancing logs See merge request gitlab-org/gitlab-ce!32535
\| *	Update docs for database load balancing logs	Hordur Freyr Yngvason	2019-09-05	2	-18/+15
\|/ \| \| \| \| \|	The database load balancing docs had some mention of the logs that needed to be updated, and the logs doc had an absolute link to gitlab.com instead of a relative link to a markdown file.
*	Merge branch '66467-enable-error-tracking-only-user-can-read-sentry-logs' ↵	Clement Ho	2019-09-05	11	-14/+86
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Display `more information` docs link on error tracking page when users do not have permissions to enable that feature See merge request gitlab-org/gitlab-ce!32365
\| *	If user can't activate error tracking display a learn more button pointing	Maneschi Romain	2019-09-05	11	-14/+86
\|/ \| \| \|	to doc
*	Merge branch 'mc-refactors-rack-attack-requests-spec' into 'master'	Stan Hu	2019-09-05	2	-212/+231
\|\ \| \| \| \| \| \| \| \|	Refactors rack attack requests spec See merge request gitlab-org/gitlab-ce!32708
\| *	Refactors rack attack requests spec	Mayra Cabrera	2019-09-05	2	-212/+231
\|/ \| \| \| \| \|	* Creates a shared_examples files under shared_examples/requests * Moves web specs into the shared examples file * Moves let definitions to the block that uses them
*	Merge branch 'update-text-on-import-and-mirroring-forms' into 'master'	Stan Hu	2019-09-05	5	-0/+5
\|\ \| \| \| \| \| \| \| \|	Update text on project import and mirroring forms See merge request gitlab-org/gitlab-ce!32567
\| *	Update text on project import and mirroring forms	Adam Hegyi	2019-09-05	5	-0/+5
\|/
*	Merge branch 'fix-tmp-gitignore' into 'master'	Robert Speicher	2019-09-05	4	-3/+14
\|\ \| \| \| \| \| \| \| \|	Fix Git ignore rules for tmp/, shared/, and plugins/ See merge request gitlab-org/gitlab-ce!32589
\| *	Fix Git ignore for tmp/, shared/, and plugins/fix-tmp-gitignore	Yorick Peterse	2019-09-03	4	-3/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The old rules meant that any future changes to these directories would require the use of `git add -f` to be staged. This is problematic for the upcoming FOSS-only mirror of GitLab. Any changes to be synced to this mirror are staged using `git add --all .`, which due to the Git ignore rules would not add the tmp/ and shared/ directories. This then leads to various specs failing because they expect certain sub-directories of these directories to be available. This commit changes the rules so that we include the .gitkeep files, ignore other files, and completely ignore anything in tmp/test. This requires that the rules are specified in tmp/.gitignore and shared/.gitignore, instead of the top-level .gitignore, without this I could not get Git to include the .gitkeep files properly.
* \|	Merge branch 'group_level_jupyterhub' into 'master'	Robert Speicher	2019-09-05	7	-30/+87
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Group level JupyterHub See merge request gitlab-org/gitlab-ce!32512
\| * \|	Allow group install of JupyterHubgroup_level_jupyterhub	James Fargher	2019-09-05	5	-28/+49
\| \| \| \| \| \| \| \| \| \| \| \|	Removes limitations on cluster types that can install JupyterHub
\| * \|	Allow JupyterHub in group level UI	James Fargher	2019-09-05	2	-2/+38
\| \| \|
* \| \|	Merge branch 'instance-level-security-dashboard-ce' into 'master'	Mike Greiling	2019-09-05	1	-0/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds route for instance level security dashboard See merge request gitlab-org/gitlab-ce!32548
\| * \| \|	Adds route for instance level security dashboard	Mark Florian	2019-09-05	1	-0/+1
\|/ / /
* \| \|	Merge branch 'add-approval-status-field-lm-ce' into 'master'	Rémy Coutable	2019-09-05	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extend License Compliance entity for Pipelines and MR view See merge request gitlab-org/gitlab-ce!32709
\| * \| \|	Extend License Compliance entity for Pipelines and MR view	Can Eldem	2019-09-05	1	-2/+2
\|/ / /
* \| \|	Merge branch 'dag-setup-test-env' into 'master'	Rémy Coutable	2019-09-05	5	-7/+23
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DAG changes for setup-test-env and review-deploy See merge request gitlab-org/gitlab-ce!32366
\| * \| \|	Add DAG to setup-test-env jobs and review-cng-base to speed up pipelinedag-setup-test-env	Kyle Wiebers	2019-09-05	5	-7/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add needs for all jobs which require setup-test-env and move review-build-cng to additional stage review-prepare to decrease wait time for jobs in pipeline
* \| \| \|	Merge branch 'danger-review-pipeline' into 'master'	Rémy Coutable	2019-09-05	4	-3/+23
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Danger Roulette rules for pipeline files See merge request gitlab-org/gitlab-ce!32616
\| * \| \| \|	Add Danger Roulette rules for pipeline filesdanger-review-pipeline	Kyle Wiebers	2019-09-05	4	-3/+23
\| \| \| \| \|
* \| \| \| \|	Merge branch '67037-user-content-gitlab-static-net-brings-back-404-only' ↵	Sean McGivern	2019-09-05	3	-1/+21
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "user-content.gitlab-static.net brings back 404 only" See merge request gitlab-org/gitlab-ce!32703
\| * \| \| \| \|	Set asset_proxy_whitelist default to gitlab host67037-user-content-gitlab-static-net-brings-back-404-only	Brett Walker	2019-09-05	3	-1/+21
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'update-issue-template-for-permissions' into 'master'	Achilleas Pipinellis	2019-09-05	1	-2/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add note about updating permissions See merge request gitlab-org/gitlab-ce!32700
\| * \| \| \| \|	Add note about updating permissions	Tetiana Chupryna	2019-09-05	1	-2/+3
\|/ / / / /
* \| \| \| \|	Merge branch 'update_user_group_name' into 'master'	Achilleas Pipinellis	2019-09-05	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update user permission group name Closes #65975 See merge request gitlab-org/gitlab-ce!32321
\| * \| \| \| \|	Update user permission name	Nikita Potapenko	2019-08-28	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'issue-32741' into 'master'	Kamil Trzciński	2019-09-05	16	-12/+356
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Interruptible builds for redundant pipelines See merge request gitlab-org/gitlab-ce!23464
\| * \| \| \| \|	New interruptible attribute supported in YAML parsing.	Cédric Tabin	2019-09-05	16	-12/+356
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since it is not possible to dynamically detect if a job is automatically cancellable or not, a this new attribute is necessary. Moreover, it let the maintainer of the repo to adjust the behaviour of the auto cancellation feature to match exactly what he needs.
* \| \| \| \|	Merge branch 'docs-markdown-guidelines' into 'master'	Marcia Ramos	2019-09-05	2	-66/+39
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update doc guidelines with markdownlint info See merge request gitlab-org/gitlab-ce!32273
\| * \| \| \|	Adjust markdown linting guidelines	Marcel Amirault	2019-09-05	2	-66/+39
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move details of markdownlint mostly to the documentation index for a SSoT, and link apropriately
* \| \| \|	Merge branch 'ashmckenzie/provide_gl-type_to_gitlab_shell' into 'master'	Nick Thomas	2019-09-05	4	-29/+188
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract /internal/allowed API Actor logic out See merge request gitlab-org/gitlab-ce!31564
\| * \| \| \|	Extract /internal/allowed API Actor logic outashmckenzie/provide_gl-type_to_gitlab_shell	Ash McKenzie	2019-09-05	4	-29/+188
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Created new API::Support::GitAccessActor class to encapsulate some of the more edge logic, making the /internal/allowed route much cleaner.
* \| \| \| \|	Merge branch '10395-require-code-owner-approval-on-pushes' into 'master'	Nick Thomas	2019-09-05	7	-4/+51
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	EE->CE: Structure for "Require code owner approval on pushes" See merge request gitlab-org/gitlab-ce!32607
\| * \| \| \| \|	Add structure to support EE feature of COAR	Kerri Miller	2019-09-05	7	-4/+51
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These are the structural changes for supporting the EE feature of moving "code_owner_approval_required" state from existing on a project to being on the protected branches individually, allowing for CODEOWNER validation on push events.
* \| \| \| \|	Merge branch 'mh/wait-for-requests' into 'master'	Paul Slaughter	2019-09-05	4	-14/+113
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add helper to wait for axios requests in frontend tests Closes #60972 See merge request gitlab-org/gitlab-ce!30887
\| * \| \| \| \|	Add helpers to wait for axios requests	Martin Hanzel	2019-09-05	4	-14/+113
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add two methods to the axios_utils Jest mock: - `waitFor(url)`, which returns a Promise that resolves when the next request to `url` finishes. - `waitForAll()`, which returns a Promise that resolves when all pending requests finish.
* \| \| \| \|	Merge branch 'ce-xanf-migrate-clientside-spec-to-jest' into 'master'	Paul Slaughter	2019-09-05	2	-363/+318
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Migrate spec/javascripts/ide/components/preview/clientside_spec.js to Jest" See merge request gitlab-org/gitlab-ce!32294
\| * \| \| \| \|	Refactored spec to Jest for clientside_spec	Illya Klymov	2019-09-05	2	-363/+318
\|/ / / / /
* \| \| \| \|	Merge branch 'refactor_new_migration_helpers' into 'master'	Andreas Brandl	2019-09-05	2	-39/+46
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor new undo_cleanup_concurrent_column_rename migration helper See merge request gitlab-org/gitlab-ce!32343
\| * \| \| \| \|	Refactor new undo_* methods	Reuben Pereira	2019-09-05	2	-39/+46
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Move code for creating a new column from old into a function so that it can be reused. - Also add comments above the methods.