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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'patch-31' into 'master'	Achilleas Pipinellis	2018-12-14	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Fixed link in doc/ci/yaml/README.md See merge request gitlab-org/gitlab-ce!23433
\| *	Fixed link in doc/ci/yaml/README.md	Philipp Hasper	2018-11-29	1	-1/+1
\| \|
* \|	Merge branch 'docs/ci-yaml-only-except-complex' into 'master'	Achilleas Pipinellis	2018-12-14	1	-44/+54
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Refactor the only and except complex section See merge request gitlab-org/gitlab-ce!23792
\| * \|	Refactor the only and except complex section	Achilleas Pipinellis	2018-12-13	1	-44/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Split up refs and kubernetes to their own section - Use only and except in all headings explicitly - Document the boolean logic of only and except
* \| \|	Docs: Let's Encrypt certificate for GitLab Pages	Marcia Ramos	2018-12-14	3	-15/+172
\| \| \|
* \| \|	Removed rails 5 documentation	Jan Provaznik	2018-12-14	2	-28/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because we removed rails 4 support, this document is not needed anymore.
* \| \|	Merge branch 'doc-prettier-vscode-settings' into 'master'	Filipa Lacerda	2018-12-14	1	-0/+35
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update prettier.md with VSCode Settings section See merge request gitlab-org/gitlab-ce!23810
\| * \| \|	Update prettier.md with VSCode Settings section	Paul Slaughter	2018-12-14	1	-0/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why? This is a recurring issue that new team members keep running into.
* \| \| \|	Merge branch 'patch-13' into 'master'	Achilleas Pipinellis	2018-12-14	1	-8/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	doc/ci/yaml: improve wording to explain better deep vs recursive merging See merge request gitlab-org/gitlab-ce!22542
\| * \| \| \|	ci/yaml: remove "recursion" mention if merging is not recursive	Elan Ruusamäe	2018-12-10	1	-8/+8
\| \| \| \| \|
* \| \| \| \|	Serverless Doc Updates	Daniel Gruesso	2018-12-14	6	-68/+163
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs-add-proofreader-dplanella' into 'master'	Achilleas Pipinellis	2018-12-14	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add dplanella as Catalan proofreader See merge request gitlab-org/gitlab-ce!23827
\| * \| \| \| \|	Add dplanella as Catalan proofreader	David Planella	2018-12-14	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'patch-35' into 'master'	Achilleas Pipinellis	2018-12-14	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs add empty space to render list See merge request gitlab-org/gitlab-ce!23756
\| * \| \| \| \| \|	Fix missing empty space that makes rendered gitlab documentation page ↵	Enrique Alvarez	2018-12-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	missing list. Different output between gitlab internal .md reader and docs.gitlab.com rendered documentation.
* \| \| \| \| \| \|	Docs: Align CE and EE k8s doc to match	Marcel Amirault	2018-12-14	1	-39/+47
\| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Update Filesystem Benchmarking to be more strict	Drew Blessing	2018-12-13	1	-9/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'docs-fix-base64-examples' into 'master'	Achilleas Pipinellis	2018-12-13	2	-3/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix base64 example to use universal option Closes #55218 See merge request gitlab-org/gitlab-ce!23787
\| * \| \| \| \| \|	Fix base64 example to use universal option	Thong Kuah	2018-12-13	2	-3/+3
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`-D` is OSX speific and is invalid on Linux, etc Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/55218
* \| \| \| \| \|	Merge branch 'revert-accidental-master-push' into 'master'	Achilleas Pipinellis	2018-12-13	1	-19/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Document gitaly network architecture" See merge request gitlab-org/gitlab-ce!23743
\| * \| \| \| \| \|	Revert "Document gitaly network architecture"	Jacob Vosmaer	2018-12-11	1	-19/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit cc7353523bc1d19054769d7a0a61b0cb7f6ce4e3. I pushed this commit to master accidentally. Oops!
* \| \| \| \| \| \|	Fix documentation for automatic merging	Yorick Peterse	2018-12-13	1	-11/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The strategy name and interval was incorrect, and the link back to the developer documentation was in the wrong place.
* \| \| \| \| \| \|	Add List-Id to notification emails	Olivier Crête	2018-12-13	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'zj-backup-restore-object-pools' into 'master'	Douwe Maan	2018-12-13	1	-0/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restore Object Pools when restoring an object pool Closes gitaly#1355 See merge request gitlab-org/gitlab-ce!23682
\| * \| \| \| \| \|	Restore Object Pools when restoring an object pool	Zeger-Jan van de Weg	2018-12-13	1	-0/+1
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pool repositories are persisted in the database, and when the DB is restored, the data need to be restored on disk. This is done by resetting the state machine and rescheduling the object pool creation. This is not an exact replica of the state like at the time of the creation of the backup. However, the data is consistent again. Dumping isn't required as internally GitLab uses git bundles which bundle all refs and include all objects in the bundle that they require, reduplicating as more repositories get backed up. This does require more data to be stored. Fixes https://gitlab.com/gitlab-org/gitaly/issues/1355
* \| \| \| \| \|	Merge branch 'nurtch' into 'master'54259-uploads-docs-gives-incorrect-configuration-options	Mike Lewis	2018-12-12	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Nurtch link See merge request gitlab-org/gitlab-ce!23668
\| * \| \| \| \| \|	changed 'at our [doc]' to 'in our [doc]'	Mike Lewis	2018-12-12	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Meaningful anchor text	Marcia Ramos	2018-12-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ref https://docs.gitlab.com/ee/development/documentation/styleguide.html#lin ks
\| * \| \| \| \| \|	Replace full URL with relative path	Marcia Ramos	2018-12-12	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Nurtch link	Sid Sijbrandij	2018-12-07	1	-1/+1
\| \|/ / / / /
* \| \| \| \| \|	Update best_practices.md	Sam Bigelow	2018-12-12	1	-3/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Document how to run rspec tests	Sam Bigelow	2018-12-12	1	-0/+10
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	Merge branch 'database-deprecation-warnings' into 'master'	Robert Speicher	2018-12-12	5	-20/+20
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve various database deprecation warnings See merge request gitlab-org/gitlab-ce!23772
\| * \| \| \| \|	Fix ActiveRecord::Migration deprecations	Yorick Peterse	2018-12-12	5	-20/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extending from ActiveRecord::Migration is deprecated, but was still used in a bunch of places.
* \| \| \| \| \|	Ensure everyone reads https://gitlab.com/charts/gitlab/merge_requests/599/diffs	Sid Sijbrandij	2018-12-12	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Ensure everyone reads https://gitlab.com/charts/gitlab/merge_requests/599/diffs	Sid Sijbrandij	2018-12-12	1	-0/+1
\|/ / / / /
* \| \| \| \|	Merge branch 'docs/update-automatic-merge-documentation' into 'master'	Marcia Ramos	2018-12-12	1	-83/+177
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update automatic merging documentation See merge request gitlab-org/gitlab-ce!23689
\| * \| \| \| \|	Update automatic merging documentation	Yorick Peterse	2018-12-11	1	-83/+177
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We're moving from merging + reverting to only merging with the `ours` strategy, removing the need for merge requests or reverting conflicts. For more details, refer to Merge Train merge request https://gitlab.com/gitlab-org/merge-train/merge_requests/6.
* \| \| \| \| \|	Merge branch 'patch-35' into 'master'	Marcia Ramos	2018-12-12	1	-1/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Add spaces before code snippets in vuex.md See merge request gitlab-org/gitlab-ce!23737
\| * \| \| \| \| \|	Add spaces before code snippets	Sylhare	2018-12-11	1	-1/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'patch-35' into 'master'	Achilleas Pipinellis	2018-12-12	1	-3/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation: Content corrections for reCAPTCHA docs See merge request gitlab-org/gitlab-ce!23667
\| * \| \| \| \| \| \|	Update recaptcha docs for clarity	James Anderson	2018-12-07	1	-3/+3
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Specified that reCAPTCHA v2 keys must be used * Updated the URL for application settings * Some small rewording
* \| \| \| \| \| \|	Merge branch 'docs-add-fork-mr-clarification' into 'master'	Achilleas Pipinellis	2018-12-12	1	-0/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add information about how merge requests related to forks are processed See merge request gitlab-org/gitlab-ce!23764
\| * \| \| \| \| \| \|	add information about how merge requests related to forks are processed	Alexander Tanayno	2018-12-12	1	-0/+4
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	the added note describes code from https://gitlab.com/gitlab-org/gitlab-ee/blob/master/lib/gitlab/import_export/merge_request_parser.rb#L15
* \| \| \| \| \| \|	Merge branch 'tatkins-installation-method-docs' into 'master'	Achilleas Pipinellis	2018-12-12	4	-67/+93
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs to help choose the best GitLab installation method Closes #54308 See merge request gitlab-org/gitlab-ce!23254
\| * \| \| \| \| \| \|	'of installing' -> 'for installing'	Mike Lewis	2018-12-07	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Clarify the installation methods	Achilleas Pipinellis	2018-12-06	1	-34/+40
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into ↵	Achilleas Pipinellis	2018-12-05	29	-242/+729
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tatkins-installation-method-docs
\| * \| \| \| \| \| \| \|	Make k8s trade-offs less intimidating	Achilleas Pipinellis	2018-12-04	1	-5/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Reword note about familiarity with k8s	Achilleas Pipinellis	2018-12-03	4	-48/+39
\| \| \| \| \| \| \| \| \|