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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Document multi-project variable precedencemc/doc/variable-precedence-docs	Matija Čupić	2019-07-30	1	-0/+5
\|
*	Merge branch 'fix-update-templates-rake' into 'master'	Jan Provaznik	2019-07-30	4	-20/+83
\|\ \| \| \| \| \| \| \| \|	Fix broken update_project_templates rake task See merge request gitlab-org/gitlab-ce!31174
\| *	Fix broken update_project_templates rake task	Hordur Freyr Yngvason	2019-07-30	4	-20/+83
\|/ \| \| \| \| \|	This rake task had been broken for a while. This fixes the breakages, adds a test to help avoid future breakages, and adds a few ergonomic improvements to the task itself.
*	Merge branch 'fix-secpick' into 'master'	Stan Hu	2019-07-30	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Fix secpick pushing to stable branch See merge request gitlab-org/gitlab-ce!31275
\| *	Fix secpick pushing to stable branchfix-secpick	Thong Kuah	2019-07-30	1	-1/+1
\| \|
* \|	Merge branch 'docs-fix-broken-internal-links' into 'master'	Marcia Ramos	2019-07-30	3	-3/+3
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Fix broken internal links in docs Closes #65318 See merge request gitlab-org/gitlab-ce!31280
\| *	Fix broken internal links in docsdocs-fix-broken-internal-links	Sean McGivern	2019-07-30	3	-3/+3
\| \|
* \|	Merge branch 'remove-line-profile-from-performance-bar' into 'master'	Lin Jen-Shin	2019-07-30	15	-177/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove line profiler from performance bar See merge request gitlab-org/gitlab-ce!31098
\| * \|	Remove line profiler from performance bar	Sean McGivern	2019-07-30	15	-177/+7
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. The output isn't great. It can be hard to find hotspots and, even when you do find them, to find why those are hotspots. 2. It uses some jQuery-specific frontend code which we can remove now that we don't have this any more. 3. It's only possible to profile the initial request, not any subsequent AJAX requests.
* \|	Merge branch 'qa-use-tiller-2.14.2-for-review-apps' into 'master'	Lin Jen-Shin	2019-07-30	1	-7/+1
\|\ \ \| \|/ \|/\| \| \| \| \|	Use the Helm `--atomic` flag when deploying Review Apps See merge request gitlab-org/gitlab-ce!31238
\| *	Use the --atomic flag when deploying Review Appsqa-use-tiller-2.14.2-for-review-apps	Rémy Coutable	2019-07-30	1	-7/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'qa-create-elasticsearch' into 'master'	Mark Lapierre	2019-07-30	8	-6/+64
\|\ \ \| \|/ \|/\| \| \| \| \|	CE backport for changes in EE MR 14646 See merge request gitlab-org/gitlab-ce!30932
\| *	Getting on par with EE	Tomislav Nikic	2019-07-30	8	-6/+64
\|/ \| \| \| \| \|	This commit covers all the files that where changed in the identically named branch on EE that is creating an elasticsearch test case.
*	Merge branch 'sh-ignore-git-errors-delete-project' into 'master'	Ash McKenzie	2019-07-30	3	-3/+32
\|\ \| \| \| \| \| \| \| \|	Ignore Gitaly errors if cache flushing fails on project destruction See merge request gitlab-org/gitlab-ce!31164
\| *	Ignore Gitaly errors if cache flushing fails on project destruction	Stan Hu	2019-07-29	3	-3/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	We should just ignore these errors and move along with the deletion since the repositories are going to be trashed anyway. Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31164
* \|	Merge branch 'Jenkins_Integration_Mktg_Docs_Page_Update_20190729' into 'master'	Evan Read	2019-07-30	1	-0/+3
\|\ \ \| \|/ \|/\| \| \| \| \|	Update jenkins.md - add CTA to about.gitlab page See merge request gitlab-org/gitlab-ce!31259
\| *	Update jenkins.md - add CTA to about.gitlab page	Agnes Oetama	2019-07-30	1	-0/+3
\|/
*	Merge branch 'docs-ci-examples-fix-typo' into 'master'	Evan Read	2019-07-30	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	documentation: fix a typo in ci/examples See merge request gitlab-org/gitlab-ce!31250
\| *	Doc: ci: examples: fix typo Envoy	Romain Aviolat	2019-07-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	This commit fixes a typo in the ci/examples documentation
* \|	Merge branch 'docs-ssot-gitlab-basics-1' into 'master'	Evan Read	2019-07-30	11	-310/+396
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Raise /gitlab-basics to SSoT Docs standards Closes #65153 See merge request gitlab-org/gitlab-ce!31172
\| * \|	First pass to bring /gitlab-basics to SSoT standards	Marcel Amirault	2019-07-30	11	-310/+396
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes duplicated information, and combines sections and files together when they are duplicated or highly related. Also adds intros to all pages and sections missing intros, and troubleshooting sections to pages that may need them in the future. Links more to other docs, and clarifies language when abosolutely necessary, and adds angle brackets to sample parameters.
* \|	Merge branch 'qa-mattermost-spec-retry' into 'master'	Sanad Liaquat	2019-07-30	1	-4/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add retry on exception to mattermost login spec See merge request gitlab-org/gitlab-ce!31243
\| * \|	Add retry on exception to mattermost loginqa-mattermost-spec-retry	Desiree Chevalier	2019-07-29	1	-4/+6
\| \| \|
* \| \|	Merge branch 'manual-sorting-12-2' into 'master'	Evan Read	2019-07-30	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct manual sort introduction release See merge request gitlab-org/gitlab-ce!31135
\| * \| \|	Correct manual sort introduction releasemanual-sorting-12-2	Sean McGivern	2019-07-25	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'docs-dependency-scanning-gradle' into 'master'	Evan Read	2019-07-30	1	-5/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add gradle to not-yet-supported list Closes gitlab-ee#12393 See merge request gitlab-org/gitlab-ce!31228
\| * \| \| \|	Add gradle to not-yet-supported list	Marcel Amirault	2019-07-30	1	-5/+6
\|/ / / /
* \| \| \|	Merge branch 'codyw-docs-visbility-levels' into 'master'	Evan Read	2019-07-30	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update visibility level docs See merge request gitlab-org/gitlab-ce!31258
\| * \| \| \|	Update visibility level doccodyw-docs-visbility-levels	Cody West	2019-07-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding parenthetical about guest users not being able to view private projects.
* \| \| \| \|	Merge branch 'determinstic_dns_specs' into 'master'	Douglas Barbosa Alexandre	2019-07-30	7	-13/+43
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Have deterministic DNS for specs See merge request gitlab-org/gitlab-ce!31086
\| * \| \| \| \|	Stub DNS to return IPv4 addressdeterminstic_dns_specs	Thong Kuah	2019-07-29	2	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise certain machines return IPv6 first, which is non-deterministic
\| * \| \| \| \|	Explicitly reject non http(s) schemes	Thong Kuah	2019-07-29	2	-2/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rather than relying on NoMethodError deep inside faraday
\| * \| \| \| \|	Write out sham_rack gem	Thong Kuah	2019-07-29	4	-12/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This means we have one less Net::HTTP monkeypatch. sham_rack cannot handle IPv6 addresses which means it breaks Net::HTTP connections because it monkey-patches Net::HTTP
* \| \| \| \| \|	Merge branch 'docs-OAuth2-scopes' into 'master'	Evan Read	2019-07-30	1	-6/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add requesting particular OAuth2 scopes details Closes #65200 See merge request gitlab-org/gitlab-ce!31215
\| * \| \| \| \| \|	Add requesting particular OAuth2 scopes detailsdocs-OAuth2-scopes	Ben Bodenmiller	2019-07-27	1	-6/+12
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'mc/doc/document-codeclimate-security-best-practice-docs' into ↵	Evan Read	2019-07-29	1	-0/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Document Code Quality potential security flaw Closes #37980 See merge request gitlab-org/gitlab-ce!31197
\| * \| \| \| \| \| \|	Document Code Quality potential security flawmc/doc/document-codeclimate-security-best-practice-docs	Matija Čupić	2019-07-29	1	-0/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'docs-troubleshoot-scim' into 'master'	Evan Read	2019-07-29	1	-10/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds troubleshooting guidance to SAML SCIM setup docs See merge request gitlab-org/gitlab-ce!28921
\| * \| \| \| \| \| \| \|	Adds troubleshooting guidance to SAML SCIM setup docs	DeAndre Harris	2019-07-29	1	-10/+4
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'sh-update-rouge-3.7.0' into 'master'	Thong Kuah	2019-07-29	4	-4/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update rouge to v3.7.0 Closes #64625 See merge request gitlab-org/gitlab-ce!31254
\| * \| \| \| \| \| \| \|	Update rouge to v3.7.0	Stan Hu	2019-07-29	4	-4/+9
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds support for a number of new languages (e.g. Ada) and fixes a number of lexers: https://github.com/rouge-ruby/rouge/compare/v3.5.1..v3.7.0 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64625
* \| \| \| \| \| \| \|	Merge branch 'docs/ssot_repository' into 'master'	Evan Read	2019-07-29	6	-69/+151
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes to Repository docs for SSOT epic See merge request gitlab-org/gitlab-ce!31075
\| * \| \| \| \| \| \| \|	Changes to Repository docs for SSOT epic	Russell Dickenson	2019-07-29	6	-69/+151
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Content about Repository was edited to comply with docs standards. This is part of a SSOT epic. - Added standard elements to each file. - Moved content on Branches, and Compare, to the Branches file. - Added a brief introduction piece to the GPG content. - Lightly edited all content to improve clarity.
* \| \| \| \| \| \| \|	Merge branch ↵	Robert Speicher	2019-07-29	14	-2/+196
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'63547-add-system-notes-for-when-a-zoom-call-was-added-removed-from-an-issue' into 'master' Resolve "Add system notes for when a zoom call was added/removed from an issue" Closes #63547 See merge request gitlab-org/gitlab-ce!30857
\| * \| \| \| \| \| \| \|	Add system notes for when a zoom call was added/removed from an issue63547-add-system-notes-for-when-a-zoom-call-was-added-removed-from-an-issue	Jacopo	2019-07-29	14	-2/+196
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a zoom link added / removed system note when a zoom link is being added / removed to the issue description.
* \| \| \| \| \| \| \| \|	Merge branch 'reorganize-metrics-dashboard' into 'master'	Thong Kuah	2019-07-29	14	-246/+238
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reorganize metrics dashboard See merge request gitlab-org/gitlab-ce!31006
\| * \| \| \| \| \| \| \| \|	Move BaseService to Services directory	Sarah Yasonik	2019-07-29	14	-246/+238
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In preparation for embedding specific metrics in issues https://gitlab.com/gitlab-org/gitlab-ce/issues/62971, this commit moves the BaseService for metrics dashboards to a new services subdirectory. This is purely for the sake of organization and maintainability.
* \| \| \| \| \| \| \| \|	Merge branch '56100-make-quick-action-commands-applied-banner-more-useful' ↵	Mayra Cabrera	2019-07-29	22	-151/+917
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Make quick action "commands applied" banner more useful" Closes #56100 See merge request gitlab-org/gitlab-ce!26672
\| * \| \| \| \| \| \| \| \|	Make quick action "commands applied" banner more useful	🙈 jacopo beschi 🙉	2019-07-29	22	-151/+917
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extends the quick actions "commands applied" banner to show the quick action preview text, but with everything in past tense.
* \| \| \| \| \| \| \| \|	Merge branch ↵	Mayra Cabrera	2019-07-29	3	-6/+13
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'64180-membersfinder-contains-slow-database-query-with-or-conditions' into 'master' Resolve "MembersFinder contains slow database query with OR conditions" Closes #64180 See merge request gitlab-org/gitlab-ce!30451