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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3809ce-docker_image_replication	Valery Sizov	2019-08-01	9	-3/+57
\| \| \| \|	Introducing Docker Registry replication
*	Merge branch 'qa-ml-fix-file-size-test' into 'master'	Walmyr	2019-08-01	1	-6/+28
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix push file size test Closes gitlab-org/quality/nightly#113 See merge request gitlab-org/gitlab-ce!31321
\| *	Fix push file size testqa-ml-fix-file-size-test	Mark Lapierre	2019-07-31	1	-6/+28
\| \| \| \| \| \| \| \|	And remove it from quarantine
* \|	Merge branch 'ticket_126158_vlad' into 'master'	Tom Atkins	2019-08-01	1	-2/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Portray better use of types of variables in .gitlab-ci.yml See merge request gitlab-org/gitlab-ce!31232
\| * \|	Portray better use of types of variables in .gitlab-ci.yml	Vlad Stoianovici	2019-08-01	1	-2/+5
\|/ /
* \|	Merge branch 'qa-ml-add-package-and-qa-always' into 'master'	Rémy Coutable	2019-08-01	1	-4/+16
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add a new `package-and-qa-always` job See merge request gitlab-org/gitlab-ce!31270
\| * \|	Implement review suggestions	Mark Lapierre	2019-08-01	1	-4/+16
\|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Make package-and-qa manual so the default `on_success` doesn't need to be set on package-and-qa-always. Remove unnecessary `except: []`
* \|	Merge branch 'double-slash-64592' into 'master'	Kamil Trzciński	2019-08-01	4	-11/+35
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent Double Slash in Review Apps Path Closes #64592 See merge request gitlab-org/gitlab-ce!31212
\| * \|	Use Array.join rather than URI.join	Jason Goodman	2019-08-01	4	-11/+35
\|/ / \| \| \| \| \| \|	Add spec for cases where URI.join does not work as expected
* \|	Merge branch '62178-remove-manual-sorting-feature-flag' into 'master'	Sean McGivern	2019-08-01	4	-10/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove the manual sorting feature flag See merge request gitlab-org/gitlab-ce!30131
\| * \|	Remove manual_sorting flag from FE62178-remove-manual-sorting-feature-flag	Rajat Jain	2019-07-31	1	-1/+1
\| \| \|
\| * \|	Remove backend use of manual_sorting feature flag	Brett Walker	2019-07-31	3	-9/+1
\| \| \|
* \| \|	Merge branch 'sh-backtrace-clean-sidekiq' into 'master'	Sean McGivern	2019-08-01	1	-0/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add additional paths to clean from backtrace See merge request gitlab-org/gitlab-ce!31363
\| * \| \|	Add additional paths to clean from backtracesh-backtrace-clean-sidekiq	Stan Hu	2019-07-31	1	-0/+3
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	`Gitlab::Profiler` can also be used to profile Sidekiq jobs. Add some call traces that can be omitted from the backtrace.
* \| \|	Merge branch 'sh-fix-infite-loop-peek-bar' into 'master'	Sean McGivern	2019-08-01	2	-5/+13
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix SystemStackError when Peek bar is active with Rugged calls Closes #65404 See merge request gitlab-org/gitlab-ce!31357
\| * \| \|	Fix SystemStackError when Peek bar is active with Rugged callssh-fix-infite-loop-peek-bar	Stan Hu	2019-07-31	2	-5/+13
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Peek attempts to serialize results with `to_json`, which calls `ActiveSupport::JSON`. If an object is passed to `to_json` that contains instance variables, `ActiveSupport` will attempt to recursively traverse all variables. The problem is that we can get into an infinite loop if the instance references to an instance that references to something else that points back to the same instance. To avoid this mess, we just call `to_s` on the object. It appears only `Gitlab::Git::Repository` and `::Repository` are the culprits here. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65404
* \| \|	Merge branch '65003-remove-wait_for_review_app_to_be_accessible-step' into ↵	Lin Jen-Shin	2019-08-01	2	-27/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Remove the wait_for_review_app_to_be_accessible step from review-deploy Closes #65003 See merge request gitlab-org/gitlab-ce!31296
\| * \| \|	Remove the wait_for_review_app_to_be_accessible step from review-deploy65003-remove-wait_for_review_app_to_be_accessible-step	Rémy Coutable	2019-07-30	2	-27/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'docs-gitaly-secrets-mismatch-harishsr' into 'master'	Achilleas Pipinellis	2019-08-01	1	-0/+91
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Troubleshooting steps when there are different Gitaly node secrets See merge request gitlab-org/gitlab-ce!30977
\| * \| \| \|	Troubleshooting steps when there are different Gitaly node secrets	Harish Ramachandran	2019-08-01	1	-0/+91
\|/ / / /
* \| \| \|	Merge branch 'mnguyen4-master-patch-95950' into 'master'	Achilleas Pipinellis	2019-08-01	1	-0/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Link to Seismic Shift Whitepaper to /dast/ landing page See merge request gitlab-org/gitlab-ce!30868
\| * \| \| \|	Update note section with CTA to whitepapermnguyen4-master-patch-95950	Matt Nguyen	2019-07-17	1	-0/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' into 'master'	Achilleas Pipinellis	2019-08-01	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update the python example regex to work with --coverage See merge request gitlab-org/gitlab-ce!31018
\| * \| \| \| \|	The python regex fails if you add branch coverage to the report (different ↵	Paul Becotte	2019-07-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	number of digit blocks). Don't think there's any downside in handling any number of digit blocks so long as it starts with TOTAL and ends with a percentage.
* \| \| \| \| \|	Merge branch 'docs/improve-ldap-documentation' into 'master'	Achilleas Pipinellis	2019-08-01	2	-73/+103
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	General improvements to LDAP docs Closes gitlab-ee#7219 See merge request gitlab-org/gitlab-ce!30880
\| * \| \| \| \| \|	General improvements to LDAP docs	Evan Read	2019-08-01	2	-73/+103
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'qa-quarantine-github-oauth-test' into 'master'	Ramya Authappan	2019-08-01	1	-1/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Quarantine flaky e2e test See merge request gitlab-org/gitlab-ce!31364
\| * \| \| \| \| \|	Quarantine flaky e2e testqa-quarantine-github-oauth-test	Mark Lapierre	2019-08-01	1	-1/+2
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'ce-mw-productivity-analytics-filter-bar' into 'master'	Kushal Pandya	2019-08-01	1	-2/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(CE Port) Add filters for Productivity Analytics See merge request gitlab-org/gitlab-ce!31097
\| * \| \| \| \| \|	(CE Port) Add filters for Productivity Analytics	Martin Wortschack	2019-08-01	1	-2/+3
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'snowplow-ee-to-ce' into 'master'	Mike Greiling	2019-08-01	4	-48/+240
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implements a js library for tracking using snowplow See merge request gitlab-org/gitlab-ce!31160
\| * \| \| \| \| \|	Adds new tracking interface for snowplow	Jeremy Jackson	2019-08-01	4	-48/+240
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will ultimately replace the stats.js that exists in EE.
* \| \| \| \| \|	Merge branch ↵	Evan Read	2019-08-01	1	-27/+40
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'12398-compile-a-list-of-created-data-types-which-ones-are-replicated-verified-and-tested-docs' into 'master' Geo - Update list of unreplicated/unverified data types See merge request gitlab-org/gitlab-ce!31261
\| * \| \| \| \| \|	Update list of unreplicated/unverified data types12398-compile-a-list-of-created-data-types-which-ones-are-replicated-verified-and-tested-docs	Douglas Barbosa Alexandre	2019-07-31	1	-27/+40
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'fix_broken_help_controller_spec' into 'master'	Stan Hu	2019-08-01	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken spec from file rename See merge request gitlab-org/gitlab-ce!31360
\| * \| \| \| \| \|	Fix broken spec from file rename	Thong Kuah	2019-08-01	1	-1/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	b36323f3d26131405925bf86742b2b4acd786230
* \| \| \| \| \|	Merge branch 'docs-private-registry' into 'master'	Evan Read	2019-08-01	1	-0/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add note about private container registry See merge request gitlab-org/gitlab-ce!31267
\| * \| \| \| \| \|	Add note about private container registry	Alexander Tanayno	2019-08-01	1	-0/+6
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'docs-fix-copy-config-command-puma' into 'master'	Evan Read	2019-08-01	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix copy config command for Puma See merge request gitlab-org/gitlab-ce!31314
\| * \| \| \| \| \|	Fix copy config command for Pumadocs-fix-copy-config-command-puma	Anton Smith	2019-07-30	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'docs-yarn-error-npm' into 'master'	Evan Read	2019-08-01	1	-0/+30
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add error message to npm registry doc Closes #61109 See merge request gitlab-org/gitlab-ce!31271
\| * \| \| \| \| \| \|	Add error message troubleshooting to npm registry doc	Marcel Amirault	2019-08-01	1	-0/+30
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add contributed error message and possible solution to npm registry doc, added to a new troubleshooting section added to the end of the doc.
* \| \| \| \| \| \|	Merge branch 'patch-30' into 'master'	Evan Read	2019-08-01	1	-3/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Jobs: use curl --location to follow redirects See merge request gitlab-org/gitlab-ce!31244
\| * \| \| \| \| \| \|	Jobs: use curl --location to follow redirects	Damian Nowak	2019-07-29	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Required to fetch artifacts/logs if AWS is used as the storage backend.
* \| \| \| \| \| \| \|	Merge branch 'docs-code-block-style-8' into 'master'	Evan Read	2019-08-01	7	-473/+477
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix whitespace in ci docs See merge request gitlab-org/gitlab-ce!30655
\| * \| \| \| \| \| \| \|	Fix whitespace in ci docs	Marcel Amirault	2019-08-01	7	-473/+477
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Many code blocks are 4spaced, and they render in GitLab without coloring as a result, even though they are fenced with a language label. If in a list, other items will render as being in a code block too, even if not meant to. This fixes all these issues for most docs in /ci, and cleans up other minor whitespace issues too.
* \| \| \| \| \| \| \|	Merge branch '65363-add-feature-remove' into 'master'	Stan Hu	2019-08-01	2	-0/+23
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Feature.remove Closes #65363 See merge request gitlab-org/gitlab-ce!31315
\| * \| \| \| \| \| \| \|	Add new Feature.remove method65363-add-feature-remove	Ash McKenzie	2019-08-01	2	-0/+23
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'docs-labels-update' into 'master'	Evan Read	2019-07-31	22	-52/+131
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update label documentation Closes #60160 See merge request gitlab-org/gitlab-ce!31093
\| * \| \| \| \| \| \| \|	Update label documentation	Marcel Amirault	2019-07-31	22	-52/+131
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update label documentation with newer screenshots, cut long lines, and touch up the text, especially the delete label section. Also adds new screenshots for clarity