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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix a typo in Admin: intergration -> integrationfix-typo-in-admin-intergration	Vincent AUBERT	2018-11-14	30	-30/+30
\| \| \| \| \|	Signed-off-by: Vincent AUBERT <vincentaubert88@gmail.com> Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'patch-31' into 'master'	Rémy Coutable	2018-11-14	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Update comment in Auto-DevOps.gitlab-ci.yml See merge request gitlab-org/gitlab-ce!23013
\| *	Update Auto-DevOps.gitlab-ci.yml	Tripple Moon	2018-11-13	1	-1/+1
\| \| \| \| \| \|	Typo in comment INCREMENTAL_ROLLOUT_TYPE => INCREMENTAL_ROLLOUT_MODE
* \|	Merge branch 'add-documentation-for-git-operations-stack-trace' into 'master'	Douwe Maan	2018-11-14	1	-0/+15
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Adds documentation of git trace when git push/pull times out See merge request gitlab-org/gitlab-ce!23016
\| * \|	Adds comma after "timings" in git troubleshooting documentation	Tiago Botelho	2018-11-14	1	-1/+1
\| \| \|
\| * \|	Adds documentation of git trace when git push/pull times outadd-documentation-for-git-operations-stack-trace	Tiago Botelho	2018-11-13	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds a detailed explanation on what the user can expect to see in case a git pull or push operation times out on their local machines
* \| \|	Merge branch '52940-fix-internal-email-pattern-not-respected' into 'master'	Douwe Maan	2018-11-14	3	-7/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a bug where internal email pattern wasn't respected Closes #52940 See merge request gitlab-org/gitlab-ce!22516
\| * \| \|	Fix a bug where internal email pattern wasn't respected52940-fix-internal-email-pattern-not-respected	Rémy Coutable	2018-11-13	3	-7/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'patch-31' into 'master'fix-missing-prometheus-manage-button	Achilleas Pipinellis	2018-11-14	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update events.md. See merge request gitlab-org/gitlab-ce!23021
\| * \| \| \|	Update events.md.	Viktor	2018-11-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"?" instead of "&" in request examples
* \| \| \| \|	Merge branch 'add-prometheus-external-docs' into 'master'	Achilleas Pipinellis	2018-11-14	1	-37/+84
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs for setting up external Prometheus Closes #40949 and #37255 See merge request gitlab-org/gitlab-ce!22831
\| * \| \| \| \|	Properly indent codeblocks	Achilleas Pipinellis	2018-11-14	1	-29/+32
\| \| \| \| \| \|
\| * \| \| \| \|	Incorporate feedbackadd-prometheus-external-docs	Joshua Lambert	2018-11-13	1	-11/+14
\| \| \| \| \| \|
\| * \| \| \| \|	Add additional documentation for external Prometheus server	Joshua Lambert	2018-11-13	1	-9/+46
\| \| \| \| \| \|
\| * \| \| \| \|	WIP update	Joshua Lambert	2018-11-06	1	-36/+40
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '53972-fix-fill-shards' into 'master'	Stan Hu	2018-11-13	2	-6/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a race condition in the shard population logic Closes #53972 See merge request gitlab-org/gitlab-ce!23028
\| * \| \| \| \| \|	Fix a race condition intermittently breaking GitLab startup	Nick Thomas	2018-11-13	2	-6/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sh-bump-ruby-2.5.3' into 'master'	Rémy Coutable	2018-11-13	4	-11/+18
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade to Ruby 2.5.3 Closes #41825 See merge request gitlab-org/gitlab-ce!22555
\| * \| \| \| \| \| \|	Upgrade to Ruby 2.5.3sh-bump-ruby-2.5.3	Stan Hu	2018-11-13	4	-11/+18
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Attempt to update google-protobuf for migration-paths Because the one we were using aren't compatible with Ruby 2.5.3, and it'll be troublesome to switch Ruby. Upgrading google-protobuf will be much easier. All of them will need to be updated for Ruby 2.5.3 We remove oj because we don't really need it and it doesn't compile on 2.5.3 with that version. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/41825
* \| \| \| \| \| \|	Merge branch 'enable-image-comments-for-renamed-files' into 'master'	Filipa Lacerda	2018-11-13	2	-2/+25
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed image commenting on moved files See merge request gitlab-org/gitlab-ce!23023
\| * \| \| \| \| \| \|	Fixed image commenting on moved files	Phil Hughes	2018-11-13	2	-2/+25
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '53780-commit-discussion-ui' into 'master'	Fatih Acet	2018-11-13	5	-22/+40
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken UI on commit discussions Closes #53780 See merge request gitlab-org/gitlab-ce!22952
\| * \| \| \| \| \| \|	Fix broken UI on commit discussions	Annabel Dunstone Gray	2018-11-13	5	-22/+40
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2018-11-13	1	-6/+20
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'53812-review-apps-check-whether-release-exists-before-attempting-stop_review' into 'master' Ensure we abort the cleanup if release is empty Closes #53812 See merge request gitlab-org/gitlab-ce!22992
\| * \| \| \| \| \| \|	Ensure we abort the cleanup if release is empty	Rémy Coutable	2018-11-13	1	-6/+20
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch '_acet-discussion-redesign-fixes' into 'master'	Annabel Dunstone Gray	2018-11-13	1	-4/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Border radius fixes for redesigned discussions Closes #53880 and #53767 See merge request gitlab-org/gitlab-ce!23006
\| * \| \| \| \| \| \|	Border radius fixes for redesigned discussions_acet-discussion-redesign-fixes	Fatih Acet	2018-11-13	1	-4/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '51259-tooltip' into 'master'	Phil Hughes	2018-11-13	1	-24/+21
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates ci header component with gitlab-ui See merge request gitlab-org/gitlab-ce!23000
\| * \| \| \| \| \| \| \|	Updates ci header component with gitlab-ui51259-tooltip	Filipa Lacerda	2018-11-13	1	-24/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It reuses loading button instead of creating a new loading button It uses the new gitlab-ui components
* \| \| \| \| \| \| \| \|	Merge branch 'docs-jivl-update-monitoring-urls' into 'master'	Clement Ho	2018-11-13	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update URL for the grafana instance of sitespeed See merge request gitlab-org/gitlab-ce!23001
\| * \| \| \| \| \| \| \| \|	Update URL for the grafana instance of sitespeeddocs-jivl-update-monitoring-urls	Jose Vargas	2018-11-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs/update-prepend-documentation' into 'master'	Achilleas Pipinellis	2018-11-13	1	-29/+124
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update docs to put prepend as the last line Closes #53919 See merge request gitlab-org/gitlab-ce!23017
\| * \| \| \| \| \| \| \| \| \|	Update docs to put prepend as the last linedocs/update-prepend-documentation	Yorick Peterse	2018-11-13	1	-29/+124
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This updates the documentation for adding EE specific features to clarify that `prepend` should be on the last line, and how to deal with code that depends on class methods redefined in EE. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/53919
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'winh-frontend-testing-categories-docs' into 'master'	Tim Zallmann	2018-11-13	1	-42/+236
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation about frontend test categories to frontend guide See merge request gitlab-org/gitlab-ce!21344
\| * \| \| \| \| \| \| \| \| \| \|	Make it explicit that we are referencing official Vue guidelines	Winnie Hellmann	2018-11-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Replace "need not" with "don't"	Winnie Hellmann	2018-11-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix heading levels	Winnie Hellmann	2018-10-26	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove section about types of tests	Winnie Hellmann	2018-10-26	1	-14/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove section about Karma tests	Winnie Hellmann	2018-10-26	1	-24/+5
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove section about RSpec tests	Winnie Hellmann	2018-10-26	1	-42/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Describe categories of frontend testing in testing guidelines	Winnie Hellmann	2018-10-26	1	-0/+268
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs-document_new_reports_syntax-ce' into 'master'winh-before-frontend-testing-categories-docs	Achilleas Pipinellis	2018-11-13	5	-64/+318
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document new report types See merge request gitlab-org/gitlab-ce!22828
\| * \| \| \| \| \| \| \| \| \| \| \|	Document new report types	Olivier Gonzalez	2018-11-13	5	-64/+318
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'qa-auto-assign-codeowner-spec' into 'master'	Grzegorz Bizon	2018-11-13	3	-4/+16
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update merge request page object and selectors See merge request gitlab-org/gitlab-ce!22939
\| * \| \| \| \| \| \| \| \| \| \|	Update merge request page object and selectorsqa-auto-assign-codeowner-spec	Mark Lapierre	2018-11-09	3	-4/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These are changes from EE that are also relevant to CE from: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8372
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs-eks-updates' into 'master'	Achilleas Pipinellis	2018-11-13	2	-23/+94
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update eks guide to include admin token creation. See merge request gitlab-org/gitlab-ce!22926
\| * \| \| \| \| \| \| \| \| \| \| \|	Update eks guide to include admin token creation.	Daniel Gruesso	2018-11-13	2	-23/+94
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'refactor-reference-regexes-and-identity-scopes' into 'master'	Robert Speicher	2018-11-13	5	-17/+30
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor reference regexes and identity scopes See merge request gitlab-org/gitlab-ce!22987
\| * \| \| \| \| \| \| \| \| \| \|	Move Identity.uniqueness_scope to a modulerefactor-reference-regexes-and-identity-scopes	Yorick Peterse	2018-11-12	2	-6/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moving this method to a separate module looks a bit odd, but it allows for EE to extend the method without also having to redefine a variety of validation rules.
\| * \| \| \| \| \| \| \| \| \| \|	Turn reference regex constants into methods	Yorick Peterse	2018-11-12	3	-11/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`Mentionable::ReferenceRegexes` used to define the following two constants: 1. DEFAULT_PATTERN 2. EXTERNAL_PATTERN These two constants were built using some of the class methods that reside in this same module. In EE we redefine one of these methods by using `prepend` at the start of the `ReferenceRegexes` module. This poses a problem: we can not move the `prepend` to the end of the file, because the constants later on depend on it. To resolve this problem, this commit turns these constants into class methods that memoize their results. This allows EE to redefine the appropriate methods before these two class methods are used, in turn allowing us to move the `prepend` to the end of the file. See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8198 for more information.