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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'docs/minor-edit-of-unintall-apps-docs' into 'master'11-11-stable-prepare-rc5	Achilleas Pipinellis	2019-05-21	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|	Slight edit of text from earlier merge Closes #61447 See merge request gitlab-org/gitlab-ce!28511 (cherry picked from commit 890fe4ea3d594386cd8698ebb69b7188660a88eb) 208dc117 Slight edit of text from earlier merge
*	Merge branch 'update-docs-alert-bot' into 'master'	Achilleas Pipinellis	2019-05-21	1	-1/+1
\| \| \| \| \| \| \| \| \|	Add to docs sentence about alertbot opening issues See merge request gitlab-org/gitlab-ce!28503 (cherry picked from commit 5396b2a81aba6ed2bf85906a3256e171337b6df0) afcbebd9 Add to docs sentence about alertbot opening issues
*	Merge branch 'docs-play-all-manual-jobs-in-a-stage' into 'master'	Achilleas Pipinellis	2019-05-21	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds documentation for 'Play all manual' button See merge request gitlab-org/gitlab-ce!28502 (cherry picked from commit 7a9a65e5b4b105c54bc86d3686026ad6fc69175d) 32a99c6c Adds documentation for stage button 4ec9f042 Apply suggestion to doc/ci/pipelines.md 062844cc Apply suggestion to doc/ci/pipelines.md ecc7b72a Apply suggestion to doc/ci/pipelines.md c4bcf858 Apply suggestion to doc/ci/pipelines.md b0b16210 Apply suggestion to doc/ci/pipelines.md
*	Merge branch 'tr-update-group-security-dashboard-docs' into 'master'	Achilleas Pipinellis	2019-05-21	1	-0/+0
\| \| \| \| \| \| \| \| \|	Update group security dashboard docs - CE backport See merge request gitlab-org/gitlab-ce!28471 (cherry picked from commit d9877120e2c202ec1f3cee0e586f90b92e3eed85) 6afda6d6 Update group security dashboard screenshot
*	Merge branch 'docs/clarify-defaulting-behaviour-pipelines-for-mr' into 'master'	Achilleas Pipinellis	2019-05-21	1	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \|	Fix content to not contradict Closes #61270 See merge request gitlab-org/gitlab-ce!28456 (cherry picked from commit 0bf8204a266ad8e836c49247470a8360123fa503) ec3e0da8 Fix content to not contradict 19b05a42 Apply suggestion to doc/ci/merge_request_pipelines/index.md
*	Merge branch 'docs-instance_level_clusters' into 'master'	Evan Read	2019-05-21	3	-6/+31
\| \| \| \| \| \| \| \| \| \| \|	Initial instance level cluster docs See merge request gitlab-org/gitlab-ce!27873 (cherry picked from commit 961a5f72f7f043540bf6e391edc3789a519f58bd) 96cec8bf Initial instance level cluster docs a951adb6 Apply suggestion to doc/user/project/clusters/index.md 719b7a07 Apply suggestion to doc/user/group/clusters/index.md
*	Merge branch 'revert-c5a9bc17' into 'master'	Yorick Peterse	2019-05-20	1	-9/+4
\| \| \| \| \| \| \| \| \|	Revert "Merge branch '56850-add-new-unicorn-metrics' into 'master'" See merge request gitlab-org/gitlab-ce!28483 (cherry picked from commit c775e88c0ec0e9916227a410cc09e2bbca4a92ce) 2334b077 Revert "Merge branch '56850-add-new-unicorn-metrics' into 'master'"
*	Merge branch 'docs-sso-enforcement-ce' into 'master'	James Lopez	2019-05-20	1	-2/+10
\| \| \| \| \| \| \| \| \|	SSO enforcement docs details added from 11.11 See merge request gitlab-org/gitlab-ce!28394 (cherry picked from commit 64a17ba84128721d3d0138376eaf78030ab00a4c) 23cfce3e SSO enforcement docs details added from 11.11
*	Merge branch 'docs/single-docs-resync' into 'master'	Evan Read	2019-05-20	1	-2/+4
\| \| \| \| \| \| \| \| \|	Resync the docs that were submitted to EE instead of CE See merge request gitlab-org/gitlab-ce!28389 (cherry picked from commit 513b03917acc020f51b0fb2f8b4463a8b63a5e01) ed02e2f5 Resync the docs that were submitted to EE instead of CE
*	Merge branch 'rd-add-additional-notes-for-extra-ci-minutes-purchase-docs' ↵	Achilleas Pipinellis	2019-05-20	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \|	into 'master' Update CI minutes docs regarding transferring of minutes and billing See merge request gitlab-org/gitlab-ce!28293 (cherry picked from commit ac232949952559d8441e743219dc726aed552f3c) 6a2875e1 Update extra CI minutes docs
*	Merge branch ↵	Achilleas Pipinellis	2019-05-20	1	-1/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'61376-add-documentation-about-how-to-enable-puma-web-server-for-installations-from-source' into 'master' Add documentation about how to enable Puma web server for installations from source Closes #61376 See merge request gitlab-org/gitlab-ce!28235 (cherry picked from commit 5ec4052281da296f40d6eec90301cbf44c93f5c4) c06dfd9d Replace Unicorn with web server in the init.d script [ci skip] 95afca31 Add puma example for production [ci skip] f2c6bfbe Add using Puma section to install from source [ci skip] 5ebf0492 Add Puma web server support to init.d file aa7b053c Minor doc improvements to Puma instructions 29e49b45 Apply suggestion to doc/install/installation.md 6a691fa7 Apply suggestion to doc/install/installation.md
*	Merge branch 'docs/dependency-proxy-ce' into 'master'	Achilleas Pipinellis	2019-05-20	4	-0/+228
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation for dependency proxy feature See merge request gitlab-org/gitlab-ce!28096 (cherry picked from commit f4dfbb688d979a81abe26dd84af0ace875dabe5a) 516344b9 Add documentation for dependency proxy feature 084fee73 Merge branch 'master' into docs/dependency-proxy-ce 14b9e8a5 Copyedit Dependency Proxy docs 10811da0 Link dependency proxy to the group index page 900d40ab Add example of a namespaced Docker image d7e2b4a7 Add link to Puma for source installations 18e68c5e Merge branch 'master' into docs/dependency-proxy-ce ac62bff2 Add note about data retention and fix heading
*	Merge branch 'doc-jej/session-stored-globaly' into 'master'	Evan Read	2019-05-16	2	-0/+66
\| \| \| \| \| \| \| \| \|	Adds developer documentation for accessing session data in GitLab See merge request gitlab-org/gitlab-ce!27996 (cherry picked from commit fa33b5cede52688895ac063f239bc7084bd8bfc7) 35658e1d Document ways of accessing Session data in GitLab
*	Merge branch 'update-ci-minutes-doc' into 'master'	Achilleas Pipinellis	2019-05-14	1	-2/+1
\| \| \| \| \| \| \| \| \|	Update CI minutes docs to reflect this is available to all plans See merge request gitlab-org/gitlab-ce!28237 (cherry picked from commit 3f29c2b593f12259b79c682a84c513b68f20c7cb) fca1835b Update CI minutes docs
*	Merge branch 'docs/improve-installation-from-source' into 'master'	Evan Read	2019-05-14	1	-0/+30
\| \| \| \| \| \| \| \| \| \| \| \|	Improve installation from source Closes #47483, #61549, and #50937 See merge request gitlab-org/gitlab-ce!28201 (cherry picked from commit 0a7216ab6eccf5607d5c526c1deea235f0f7462e) fe83b461 Improve installation from source ae123b49 Minor improvements for installation doc
*	Merge branch 'docs-update-salesforce-documentation' into 'master'	Evan Read	2019-05-14	1	-4/+4
\| \| \| \| \| \| \| \| \| \|	Docs: Fix wording error in salesforce section See merge request gitlab-org/gitlab-ce!28190 (cherry picked from commit 74511b049743cf543694bb92a8acd7e7586e533d) a0ecc3ed Fix wording error 268defdf Fix wording in salesforce docs
*	Merge branch ↵	Evan Read	2019-05-14	3	-0/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'9228-geo-how-to-reconcile-differences-with-geo-checksum-mismatches-docs' into 'master' Document how to reconcile differences with Geo checksum mismatches Closes gitlab-ee#9228 See merge request gitlab-org/gitlab-ce!28183 (cherry picked from commit dbc0f8c1d3275b8c07102c68055e7c58c335ebb8) ecfadcfb Document how to reconcile differences with Geo checksum mismatches 8d3c42c3 Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md 71757a82 Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md e51488cb Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md 507cd1b9 Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md 97a3f165 Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md 450a3798 Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md 65b98874 Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md ea8e7bd8 Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md 7473d40e Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md 6b269518 Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md 6d4489e2 Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md dcc949a4 Apply suggestion to doc/administration/geo/disaster_recovery/background_verification.md 911fc185 Fix fenced code blocks
*	Resolve conflicts from masterjl-remove-k8s-components-mermaid-docs	Joshua Lambert	2019-05-08	1	-99/+65
\|
*	Docs nneul/gitlab ce patch 1	Ian Baum	2019-05-08	1	-0/+16
\|
*	Merge branch 'revert-0658ebf7' into 'master'	Achilleas Pipinellis	2019-05-08	1	-5/+2
\|\ \| \| \| \| \| \| \| \|	Revert "Merge branch 'fix-mermaid-chart-docs' into 'master'" See merge request gitlab-org/gitlab-ce!28193
\| *	Revert "Merge branch 'fix-mermaid-chart-docs' into 'master'"revert-0658ebf7	Stan Hu	2019-05-07	1	-5/+2
\| \| \| \| \| \|	This reverts merge request !28188
* \|	Add info to docs about mapping a ping to the category it belongs to.	Emilie Schario	2019-05-07	1	-0/+2
\|/
*	Merge branch 'fix-mermaid-chart-docs' into 'master'	Sid Sijbrandij	2019-05-07	1	-2/+5
\|\ \| \| \| \| \| \| \| \|	Load mermaid.min.js for now off-site See merge request gitlab-org/gitlab-ce!28188
\| *	Load mermaid.min.js for now off-site	Joshua Lambert	2019-05-07	1	-2/+5
\| \|
* \|	Document EE License Auto Import During Install	Robert Marshall	2019-05-07	3	-3/+35
\|/ \| \| \| \| \| \| \| \|	- Document how to properly configure `GITLAB_LICENSE_FILE` environment variable in source and omnibus installations. Resolves: https://gitlab.com/gitlab-org/gitlab-ee/issues/10808 Signed-off-by: Robert Marshall <rmarshall@gitlab.com>
*	docs: clarify LDAP cache time	Ben Bodenmiller	2019-05-07	1	-2/+2
\|
*	Merge branch 'docs-10k-ref-wip' into 'master'	Drew Blessing	2019-05-07	1	-1/+25
\|\ \| \| \| \| \| \| \| \|	Add the 10k ref architecture specs to HA docs See merge request gitlab-org/gitlab-ce!28149
\| *	Apply suggestion to doc/administration/high_availability/README.md	Drew Blessing	2019-05-07	1	-1/+1
\| \|
\| *	Add the WIP 10k ref architecture specs to HA docs	Drew Blessing	2019-05-06	1	-1/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	The 10,000 user reference architecture work is ongoing. However, we have done some preliminary investigation and testing and have an idea of what we think the environment might look like. In the interest of transparency, efficiency and iteration, let's get this out there.
* \|	Merge branch '56850-add-new-unicorn-metrics' into 'master'	Ash McKenzie	2019-05-07	1	-4/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add new Unicorn metrics" Closes #56850 See merge request gitlab-org/gitlab-ce!27474
\| * \|	Clarify wording in metrics documentation56850-add-new-unicorn-metrics	Ryan Cobb	2019-05-01	1	-2/+2
\| \| \|
\| * \|	Add back ruby_memory_bytes metric, limit duplication, clean up	Ryan Cobb	2019-04-29	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds back ruby_memory_bytes for backwards compatibility, limits code duplication, cleans up unused methods, and limits the unicorn worker sampling scope.
\| * \|	Update docs and calculate process start time via proc table	Ryan Cobb	2019-04-24	1	-5/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This updates monitor docs to reflect the new ruby and unicorn metrics as well as making it so we fetch process start time via the proc table instead of via CLOCK_BOOTTIME
* \| \|	Update component diagram, switch to mermaid	Joshua Lambert	2019-05-07	1	-2/+146
\| \| \|
* \| \|	Merge branch '54405-resolve-discussion-when-applying-a-suggested-change' ↵	Phil Hughes	2019-05-07	1	-6/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Resolve discussion when suggestion is applied" Closes #54405 See merge request gitlab-org/gitlab-ce!28160
\| * \| \|	Resolve discussion when suggestion is applied54405-resolve-discussion-when-applying-a-suggested-change	Paul Slaughter	2019-05-07	1	-6/+3
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Adds color and a tooltip to describe this new behavior - Does not resolve if discussion is already resolved - Adds an action `resolveDiscussion` to simplify `toggleResolveNote` - Updates docs https://gitlab.com/gitlab-org/gitlab-ce/issues/54405
* \| \|	Merge branch 'patch-35' into 'master'	Achilleas Pipinellis	2019-05-07	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix alert box formatting See merge request gitlab-org/gitlab-ce!28159
\| * \| \|	fix alert box formatting	Ben Bodenmiller	2019-05-07	1	-2/+2
\| \|/ /
* \| \|	Remove from providers with icon	Gosia Ksionek	2019-05-07	5	-0/+80
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove puts Remove puts
* \| \|	Merge branch 'patch-17' into 'master'	Bob Van Landuyt	2019-05-07	1	-5/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove note that multi-line suggestions are not yet available See merge request gitlab-org/gitlab-ce!28119
\| * \| \|	remove note that multi-line suggestions are not yet available	Simon Hardt	2019-05-06	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \|	(#53310 is now done)
* \| \| \|	Merge branch 'patch-17' into 'master'	Bob Van Landuyt	2019-05-07	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	doc/ci: include local: remove superfluous ":" See merge request gitlab-org/gitlab-ce!28112
\| * \| \| \|	include local: remove superfluous ":"	Elan Ruusamäe	2019-05-06	1	-2/+2
\| \|/ / /
* \| \| \|	Fix installation from source	Dmitriy Zaporozhets	2019-05-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Compiling git has a wrong symbol that leads into invalid command
* \| \| \|	Merge branch 'allow-replying-to-individual-notes-from-api' into 'master'	James Lopez	2019-05-07	1	-2/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow replying to an individual note in the API Closes #61392 See merge request gitlab-org/gitlab-ce!28120
\| * \| \| \|	Allow replying to an individual note in the APIallow-replying-to-individual-notes-from-api	Sean McGivern	2019-05-06	1	-2/+4
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If you can do this in the UI, you should be able to do it in the API. If a discussion is not a single note discussion, or it is replyable, you can reply to it.
* \| \| \|	Merge branch 'docs-destroy-the-mirrors' into 'master'	Evan Read	2019-05-07	2	-2/+4
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Correct repo mirror SSH key generation docs See merge request gitlab-org/gitlab-ce!27998
\| * \| \|	Correct repo mirror SSH key generation docsdocs-destroy-the-mirrors	Luke Bennett	2019-05-03	2	-2/+4
\| \| \| \|
* \| \| \|	Show health graphs on group-level	Peter Leitzen	2019-05-06	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tweak cluster helper and refactor its specs.
* \| \| \|	Implement support for CI variables of type file	Krasimir Angelov	2019-05-06	4	-25/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add env_var and file as supported types for CI variables. Variables of type file expose to users existing gitlab-runner behaviour - save variable value into a temp file and set the path to this file in an ENV var named after the variable key. Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/46806.