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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Keep label on issue when movingccr/maintain_labels	Chantal Rollison	2018-06-26	3	-4/+30
\|
*	Merge branch 'blackst0ne-rails5-fix-data-store-spec' into 'master'	Kamil Trzciński	2018-06-22	2	-8/+5
\|\ \| \| \| \| \| \| \| \|	[Rails5] Fix "'-1' is not a valid data_store" See merge request gitlab-org/gitlab-ce!19917
\| *	[Rails5] Fix "'-1' is not a valid data_store"blackst0ne-rails5-fix-data-store-spec	blackst0ne	2018-06-16	2	-8/+5
\| \| \| \| \| \| \| \|	Part of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19882
* \|	Merge branch 'patch-29' into 'master'	Kamil Trzciński	2018-06-22	1	-26/+26
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update lfs_administration.md with language edits See merge request gitlab-org/gitlab-ce!19950
\| * \|	Update lfs_administration.md with language edits	Marcel Amirault	2018-06-18	1	-26/+26
\| \| \|
* \| \|	Merge branch ↵	Kamil Trzciński	2018-06-22	1	-13/+82
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'docs/sm/trouble-shooting-guid-for-timeout-of-background-upload' into 'master' Add troubleshooting guide for lfs uploading timeouts See merge request gitlab-org/gitlab-ce!19949
\| * \|	Add troubleshooring guid for lfs uploading timeoutsdocs/sm/trouble-shooting-guid-for-timeout-of-background-upload	Shinya Maeda	2018-06-18	1	-13/+82
\| \| \|
* \| \|	Merge branch 'zj-find-ref-name' into 'master'	Douwe Maan	2018-06-22	1	-11/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	FindRefName RPC now mandatory Closes gitaly#221 See merge request gitlab-org/gitlab-ce!20090
\| * \| \|	FindRefName RPC now mandatoryzj-find-ref-name	Zeger-Jan van de Weg	2018-06-22	1	-11/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Has never been in OPT_OUT, dispite being ages old. The time where feature flags are still set by env vars. Closes https://gitlab.com/gitlab-org/gitaly/issues/221
* \| \| \|	Merge branch 'docs-add-inline-badges-autodevops' into 'master'	Achilleas Pipinellis	2018-06-22	1	-6/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: add inline badges to Auto DevOps features list See merge request gitlab-org/gitlab-ce!20096
\| * \| \| \|	add inline badges to auto devops feature listdocs-add-inline-badges-autodevops	Marcia Ramos	2018-06-22	1	-6/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch 'update-large-tables-cop' into 'master'	Grzegorz Bizon	2018-06-22	2	-2/+33
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disallow methods that copy data on large tables See merge request gitlab-org/gitlab-ce!20021
\| * \| \| \| \|	Add more large tables to copupdate-large-tables-cop	Sean McGivern	2018-06-22	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These are all over 20 GB on GitLab.com. merge_request_diff_commits is several hundred gigabytes in size.
\| * \| \| \| \|	Disallow methods that copy data on large tables	Sean McGivern	2018-06-19	2	-1/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	{change_column_type,rename_column}_concurrently both copy data from one column to another during a migration, which should not be done on GitLab.com. Instead, we should use background migrations.
* \| \| \| \| \|	Merge branch 'bjk/48176_ruby_gc' into 'master'	Yorick Peterse	2018-06-22	4	-13/+34
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix ruby sampler metrics See merge request gitlab-org/gitlab-ce!20039
\| * \| \| \| \| \|	Cleanup ruby sampler metricsbjk/48176_ruby_gc	Ben Kochie	2018-06-22	4	-13/+34
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Use a simple counter for sampler duration instead of a histogram. * Use a counter to collect GC time. * Remove unused objects metric. * Cleanup metric names to match Prometheus conventions. * Prefix generic GC stats with `gc_stat`. * Include worker label on memory and file descriptor metrics.
* \| \| \| \| \|	Merge branch 'zj-repository-size' into 'master'	Douwe Maan	2018-06-22	1	-15/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Repository size is Gitaly only Closes gitaly#393 See merge request gitlab-org/gitlab-ce!20089
\| * \| \| \| \| \|	Repository size is Gitaly onlyzj-repository-size	Zeger-Jan van de Weg	2018-06-22	1	-15/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/393
* \| \| \| \| \| \|	Merge branch 'unify-filter_issues_spec.rb' into 'master'	Nick Thomas	2018-06-22	1	-2/+34
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unify spec/features/issues/filtered_search/filter_issues_spec.rb See merge request gitlab-org/gitlab-ce!20070
\| * \| \| \| \| \| \|	Bring changes from EEunify-filter_issues_spec.rb	Lin Jen-Shin	2018-06-21	1	-2/+34
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'docs-request-cache' into 'master'	Sean McGivern	2018-06-22	2	-36/+42
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs for RequestCache Closes #48094 See merge request gitlab-org/gitlab-ce!20064
\| * \| \| \| \| \| \|	Add docs for RequestCache, moved from comments	Lin Jen-Shin	2018-06-22	2	-36/+42
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'docs-squash-merge-heading' into 'master'	Marcia Ramos	2018-06-22	1	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update squash_and_merge.md to fix link and description See merge request gitlab-org/gitlab-ce!20093
\| * \| \| \| \| \| \| \|	Update squash_and_merge.md to fix link and description	Marcel Amirault	2018-06-22	1	-3/+3
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit b5ea33397eb8d2c874662026b0e36aed7c41dbbc)
* \| \| \| \| \| \| \|	Merge branch 'docs/api-runners-ip' into 'master'	Marcia Ramos	2018-06-22	1	-0/+12
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add ip_address to json examples in Runner API docs Closes #47973 See merge request gitlab-org/gitlab-ce!20092
\| * \| \| \| \| \| \|	Add ip_address to json examples in Runner API docs	Achilleas Pipinellis	2018-06-22	1	-0/+12
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'zj-ls-files-mandatory' into 'master'	Douwe Maan	2018-06-22	1	-34/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Git ls files is Gitaly only now Closes #47893 and gitaly#327 See merge request gitlab-org/gitlab-ce!20088
\| * \| \| \| \| \|	Git ls files is Gitaly only now	Zeger-Jan van de Weg	2018-06-22	1	-34/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved to the front on the line through: https://gitlab.com/gitlab-org/gitlab-ce/issues/47893 Closes: https://gitlab.com/gitlab-org/gitlab-ce/issues/47893 Closes: https://gitlab.com/gitlab-org/gitaly/issues/327
* \| \| \| \| \| \|	Merge branch 'unify-redis_shared_examples.rb' into 'master'	Sean McGivern	2018-06-22	1	-1/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unify spec/support/redis/redis_shared_examples.rb See merge request gitlab-org/gitlab-ce!20074
\| * \| \| \| \| \| \|	Bring changes from EEunify-redis_shared_examples.rb	Lin Jen-Shin	2018-06-21	1	-1/+8
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'docs/autodevops-k8s' into 'master'	Marcia Ramos	2018-06-22	30	-159/+308
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document end to end flow for Kubernetes and Auto DevOps Closes #44455 See merge request gitlab-org/gitlab-ce!19699
\| * \| \| \| \| \| \|	Add paragraph for self-hosted instancesdocs/autodevops-k8s	Achilleas Pipinellis	2018-06-22	1	-1/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Edits to quick_start_guide.md	Mike Lewis	2018-06-21	1	-61/+51
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Document end to end flow for Kubernetes and Auto DevOps	Achilleas Pipinellis	2018-06-21	30	-159/+313
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'blackst0ne-fix-protect-from-forgery-in-application-controller' ↵	Douwe Maan	2018-06-22	6	-5/+10
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' [Rails5] Force the `protect_from_forgery` callback run first Closes #48204 See merge request gitlab-org/gitlab-ce!20055
\| * \| \| \| \| \| \| \|	[Rails5] Force the `protect_from_forgery` callback run firstblackst0ne-fix-protect-from-forgery-in-application-controller	blackst0ne	2018-06-21	6	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since Rails 5.0 the `protect_from_forgery` callback doesn't run first by default anymore. [1] Instead it gets inserted into callbacks chain where callbacks get called in order. This commit forces the callback to run first. [1]: https://github.com/rails/rails/commit/39794037817703575c35a75f1961b01b83791191
* \| \| \| \| \| \| \| \|	Merge branch 'unify-object_storage_spec.rb' into 'master'	Douwe Maan	2018-06-22	1	-0/+12
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unify object_storage_spec.rb with EE See merge request gitlab-org/gitlab-ce!20069
\| * \| \| \| \| \| \| \| \|	Bring this test from EEunify-object_storage_spec.rb	Lin Jen-Shin	2018-06-21	1	-0/+12
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'unify-container_registry_authentication_service_spec.rb' into ↵	Grzegorz Bizon	2018-06-22	1	-0/+13
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Unify spec/services/auth/container_registry_authentication_service_spec.rb See merge request gitlab-org/gitlab-ce!20071
\| * \| \| \| \| \| \| \| \|	Bring changes from EEunify-container_registry_authentication_service_spec.rb	Lin Jen-Shin	2018-06-21	1	-0/+13
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'unify-destroy_service_spec.rb' into 'master'	Robert Speicher	2018-06-21	1	-2/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use expect_next_instance_of to replace expect_any_instance_of See merge request gitlab-org/gitlab-ce!20072
\| * \| \| \| \| \| \| \| \|	Use expect_next_instance_of to replace expect_any_instance_ofunify-destroy_service_spec.rb	Lin Jen-Shin	2018-06-21	1	-2/+6
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'sh-add-recaptcha-all-logins' into 'master'	Robert Speicher	2018-06-21	5	-6/+88
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show a reCAPTCHA on signin page if custom header is set Closes #48184 See merge request gitlab-org/gitlab-ce!20076
\| * \| \| \| \| \| \| \| \|	Show a reCAPTCHA on signin page if custom header is set	Stan Hu	2018-06-21	5	-6/+88
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will only be displayed if `X-GitLab-Show-Login-Captcha` is set as an HTTP header.
* \| \| \| \| \| \| \| \| \|	Merge branch 'retroactive-changelogs' into 'master'	Clement Ho	2018-06-21	2	-0/+10
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Retroactively add changelogs See merge request gitlab-org/gitlab-ce!20079
\| * \| \| \| \| \| \| \| \| \|	Retroactively add changelogs	gfyoung	2018-06-21	2	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For community contributions, changelogs should be added to the MR.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-webpack-node-env' into 'master'	Clement Ho	2018-06-21	2	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable webpack nodeEnv optimization See merge request gitlab-org/gitlab-ce!20075
\| * \| \| \| \| \| \| \| \| \|	disable nodeEnv within karma configfix-webpack-node-env fix-foo-test	Mike Greiling	2018-06-21	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	enable accidentally-disabled nodeEnv optimization	Mike Greiling	2018-06-21	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-diff-comment-alignment' into 'master'	Mike Greiling	2018-06-21	2	-5/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix diff comment alignment for parallel code additions Closes #47861 See merge request gitlab-org/gitlab-ce!20006