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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Make httpclient respect system SSL configurationsh-fix-httpclient-ssl	Stan Hu	2019-07-15	2	-0/+23
\| \| \| \| \| \| \| \| \| \| \| \|	By default, httpclient (and hence anything that uses rack-oauth2) ignores the system-wide SSL certificate configuration in favor of its own `cacert.pem`. This makes it impossible to use custom certificates without patching that file. Until https://github.com/nahi/httpclient/pull/386 is merged, we work around this limitation by forcing the `HTTPClient` SSL store to use the default system configuration. Closes https://gitlab.com/charts/gitlab/issues/1436
*	Merge branch 'georgekoltsov/63955-fix-import-with-source-branch-deleted' ↵	Robert Speicher	2019-07-15	5	-11/+35
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Always return MR diff_refs if importing See merge request gitlab-org/gitlab-ce!30630
\| *	Add commit_id to AttributeCleaner::ALLOWED_REFERENCESgeorgekoltsov/63955-fix-import-with-source-branch-deleted	George Koltsov	2019-07-15	5	-10/+16
\| \|
\| *	Add changelog entry	George Koltsov	2019-07-11	1	-0/+5
\| \|
\| *	Add MergeRequest#diff_refs spec	George Koltsov	2019-07-11	1	-6/+17
\| \|
\| *	Always return MR diff_refs if importing	George Koltsov	2019-07-11	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change fixes a bug that prevents projects being imported when there are diff notes present in merge requests. Solves https://gitlab.com/gitlab-org/gitlab-ce/issues/63955
* \|	Merge branch 'fix-comment-race-condition' into 'master'	Mike Greiling	2019-07-15	2	-2/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix race condition with polling when saving notes Closes gitlab-ee#12472 See merge request gitlab-org/gitlab-ce!30724
\| * \|	Fix race condition with polling when saving notesfix-comment-race-condition	Heinrich Lee Yu	2019-07-15	2	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	eTagPoll may not be initialized yet when we save a note. Polling is initialized only after discussions are loaded
* \| \|	Merge branch 'sh-reorder-application-settings' into 'master'	Robert Speicher	2019-07-15	1	-44/+44
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reorder application settings in db/schema.rb to match EE See merge request gitlab-org/gitlab-ce!30715
\| * \| \|	Reorder application settings in db/schema.rb to match EEsh-reorder-application-settings	Stan Hu	2019-07-14	1	-44/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes the CE and EE tables consistent and ensures changes in the schema for the CE version don't cause conflicts with EE.
* \| \| \|	Merge branch '64266-quick-help-hyperlinks' into 'master'	Annabel Dunstone Gray	2019-07-15	2	-1/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure quick help links have the same color Closes #64266 See merge request gitlab-org/gitlab-ce!30478
\| * \| \| \|	Ensure all quick help links have the same color	Prashanth Chandra	2019-07-15	2	-1/+7
\|/ / / /
* \| \| \|	Merge branch 'pl-incident-issue-alert-payload-docs' into 'master'	Achilleas Pipinellis	2019-07-15	1	-1/+11
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs on how alert attributes are used See merge request gitlab-org/gitlab-ce!30736
\| * \| \| \|	Add docs on how alert attributes are used	Peter Leitzen	2019-07-15	1	-1/+11
\|/ / / /
* \| \| \|	Merge branch 'docs/fix-product-tier-badges' into 'master'	Marcia Ramos	2019-07-15	6	-7/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Convert more product badges to round brackets See merge request gitlab-org/gitlab-ce!30719
\| * \| \| \|	Convert more product badges to round brackets	Evan Read	2019-07-15	6	-7/+7
\|/ / / /
* \| \| \|	Merge branch 'add-geo-database-ugprade-docs' into 'master'	Achilleas Pipinellis	2019-07-15	1	-0/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add note to GEO documentation about database upgrade See merge request gitlab-org/gitlab-ce!30647
\| * \| \| \|	Add note to GEO documentation about database upgrade	Ian Baum	2019-07-15	1	-0/+10
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Point to the omnibus documentation for how to upgrade the cluster * Document how to disable the upgrade procedure
* \| \| \|	Merge branch 'caneldem-dependency-scanning-docs' into 'master'	Achilleas Pipinellis	2019-07-15	1	-0/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update dependency scanning to add new variable See merge request gitlab-org/gitlab-ce!30528
\| * \| \| \|	Update dependency scanning to add new variable	Can Eldem	2019-07-15	1	-0/+1
\|/ / / /
* \| \| \|	Merge branch 'ce-mw-onboarding-popover-width' into 'master'	Tim Zallmann	2019-07-15	1	-0/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(CE Port) Set max width for onboarding popover See merge request gitlab-org/gitlab-ce!30619
\| * \| \| \|	(CE Port) Set max width for onboarding popover	Martin Wortschack	2019-07-15	1	-0/+1
\|/ / / /
* \| \| \|	Merge branch '63694-tls-opts-for-helm-wait' into 'master'	Sean McGivern	2019-07-15	4	-23/+30
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitLab Managed App ensure helm version uses tls opts Closes #63694 See merge request gitlab-org/gitlab-ce!30654
\| * \| \| \|	GitLab Managed App ensure helm version uses tls opts63694-tls-opts-for-helm-wait	Dylan Griffith	2019-07-15	4	-23/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The TLS opts were missing from helm version command which meant that it was just perpetually failing and hence wasting 30s of time waiting for a command to be successful that was never going to be successful. This never actually caused any errors because this loop will happily just fail 30 times without breaking the overall script but it was just a waste of installation time so now installing apps should be ~30s faster.
* \| \| \| \|	Merge branch 'mh/boards-filter-bar' into 'master'	Phil Hughes	2019-07-15	4	-29/+38
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display boards filter bar on mobile Closes #45864 See merge request gitlab-org/gitlab-ce!30120
\| * \| \| \| \|	Display boards filter bar on mobile	Martin Hanzel	2019-07-15	4	-29/+38
\|/ / / / /
* \| \| \| \|	Merge branch 'pages-refactor-ssl-documentation' into 'master'	Achilleas Pipinellis	2019-07-15	29	-338/+456
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Pages - refactor "Custom domain / SSL" documentation Closes #47585, #60612, #44606, and #63753 See merge request gitlab-org/gitlab-ce!30363
\| * \| \| \| \|	Move document to new location, split in 3	Marcia Ramos	2019-07-15	29	-338/+456
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Move steps to new doc - Move all concepts to different docs
* \| \| \| \|	Merge branch 'rs-namespace-feature' into 'master'	Sean McGivern	2019-07-15	1	-0/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Namespace#feature_available no-op Closes #60908 See merge request gitlab-org/gitlab-ce!30641
\| * \| \| \| \|	Add Namespace#feature_available no-oprs-namespace-feature	Robert Speicher	2019-07-12	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This gets overridden in `EE::Namespace` and allows us to do things like always treat Epics as "disabled" in Core using the same checks we'd use elsewhere.
* \| \| \| \| \|	Merge branch '64499-add-size-96-to-avatar-sizes-in-avatar-scss' into 'master'	Kushal Pandya	2019-07-15	1	-0/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add size 96 to avatar sizes in avatar.scss" Closes #64499 See merge request gitlab-org/gitlab-ce!30671
\| * \| \| \| \| \|	Add size 96 to avatar sizes in avatar.scss64499-add-size-96-to-avatar-sizes-in-avatar-scss	Ammar Alakkad	2019-07-12	1	-0/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'docs/gb/serverless-function-dockerfile-runtime' into 'master'	Evan Read	2019-07-15	1	-13/+22
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a note about implicit Dockerfile serverless runtime See merge request gitlab-org/gitlab-ce!30672
\| * \| \| \| \| \| \|	Add a note about implicit Dockerfile serverless runtime	Grzegorz Bizon	2019-07-15	1	-13/+22
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'expand-acronym' into 'master'	Achilleas Pipinellis	2019-07-15	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	expand (CD) acronym See merge request gitlab-org/gitlab-ce!30646
\| * \| \| \| \| \| \|	expand (CD) acronym	mokha	2019-07-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	> Do not use acronyms when you can avoid it as you can't assume people > know what you are talking about. Example: instead of MR, write merge > request. - https://about.gitlab.com/handbook/communication/#writing-style-guidelines
* \| \| \| \| \| \| \|	Merge branch 'patch-46' into 'master'	Evan Read	2019-07-15	1	-0/+36
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add example of ENV variables for image and services. See merge request gitlab-org/gitlab-ce!27320
\| * \| \| \| \| \| \| \|	Fixed wrong placement of "variables:" statement in yml file.	Thad Guidry	2019-07-15	1	-0/+36
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Verified snippet works with 11.10.1
* \| \| \| \| \| \| \|	Merge branch 'issue/55953-docs' into 'master'	Achilleas Pipinellis	2019-07-15	52	-274/+273
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename "discussions" to "threads" in docs See merge request gitlab-org/gitlab-ce!30037
\| * \| \| \| \| \| \| \|	Rename "discussions" to "threads" in docs	Michel Engelen	2019-07-15	52	-274/+273
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'sh-filter-geo-output' into 'master'	Ash McKenzie	2019-07-15	1	-1/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Filter Geo proxied data from api_json.log See merge request gitlab-org/gitlab-ce!30687
\| * \| \| \| \| \| \| \|	Filter Geo proxied data from api_json.logsh-filter-geo-output	Stan Hu	2019-07-14	1	-1/+2
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently the base64-encoded value of the push-to-secondary data is saved in `api_json.log`, and this can easily be hundreds of megabytes. We should filter this from the logs.
* \| \| \| \| \| \| \|	Merge branch 'docs-code-block-style-7' into 'master'	Evan Read	2019-07-15	17	-920/+930
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix whitespace in user and misc docs See merge request gitlab-org/gitlab-ce!30605
\| * \| \| \| \| \| \| \|	Fix whitespace in user, and misc, docs	Marcel Amirault	2019-07-15	17	-920/+930
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 woll render as being in a code block too, even if not meant to. This fixes all these issues, and cleans up minor whitespace issues in /user, /security, /ssh and /migrate_ci_to_ce docs.
* \| \| \| \| \| \| \|	Merge branch 'AddMoreFileExtentionsTo-file_type_icon_class' into 'master'	Lin Jen-Shin	2019-07-15	2	-9/+32
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add more file extentions to file type icon class See merge request gitlab-org/gitlab-ce!30316
\| * \| \| \| \| \| \|	Add more file extentions to file type icon class	Peter Dave Hello	2019-07-15	2	-9/+32
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'remove-obsolete-chaos-routes' into 'master'	Lin Jen-Shin	2019-07-15	1	-7/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove obsolete chaos routes See merge request gitlab-org/gitlab-ce!30706
\| * \| \| \| \| \| \|	Remove obsolete chaos routesremove-obsolete-chaos-routes	Luke Bennett	2019-07-13	1	-7/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'docs-markdown-lint-update' into 'master'	Evan Read	2019-07-15	2	-4/+21
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update markdown lint style and option files See merge request gitlab-org/gitlab-ce!30595
\| * \| \| \| \| \| \| \|	Update markdown lint style and option files	Marcel Amirault	2019-07-15	2	-4/+21
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add commented lines explaining the file, and including rules that should pass already, and commented out rules that can be added in the future, for reference.