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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Assert SSH key was added before using itqa-ml-parallel-tests-fix-failures	Mark Lapierre	2019-07-25	6	-8/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The test would sometimes fail because it added an SSH key via the UI but tried to use it before the server had completed adding it. This also moves the code to delete the SSH key to an after hook so that it runs even if the test fails midway, e.g., if it fails during the push. It also adds an `element_text` method to wrap Capybara's `.text` in a method that we won't have to change later if we switch to a different framework. Finally, it adds an Assertions module that contains assertions we can use where `expect` is not appropriate (and wraps Capybara methods)
*	Retry creating sandbox on failure	Mark Lapierre	2019-07-24	1	-3/+9
\| \| \| \| \| \| \|	This is a workaround for a race condition where two processes can't get a sandbox group so they both try to create one, and one fails because the other finished first. With this change the process that fails to create a sandbox group tries to get it again.
*	Merge branch 'ce-xanf-add-admin-area-links' into 'master'	Ash McKenzie	2019-07-24	5	-43/+85
\|\ \| \| \| \| \| \| \| \|	Resolve "Add interactive links in the Admin Area overview" See merge request gitlab-org/gitlab-ce!29306
\| *	Add links in admin area overviewce-xanf-add-admin-area-links	Illya Klymov	2019-07-24	5	-43/+85
\| \| \| \| \| \| \| \| \| \| \| \|	Introduces new `feature_entry` helper for dashboard. This helper reduces code duplication when listing available features and relevant links to configuration sections
* \|	Merge branch 'renovate/gitlab-ui-5.x' into 'master'	Kushal Pandya	2019-07-24	2	-5/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update dependency @gitlab/ui to ^5.7.1 See merge request gitlab-org/gitlab-ce!31026
\| * \|	Update dependency @gitlab/ui to ^5.7.1	Lukas Eipert	2019-07-22	2	-5/+5
\| \| \|
* \| \|	Merge branch 'docs-correct-omitted-word' into 'master'	Evan Read	2019-07-24	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct an omitted word See merge request gitlab-org/gitlab-ce!31083
\| * \| \|	Correct omitted word	otuhs_d	2019-07-24	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'docs-set-service-variables-tip' into 'master'	Evan Read	2019-07-24	2	-0/+13
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add notes to the docs about setting service variables for users wanting to do so from the UI See merge request gitlab-org/gitlab-ce!30863
\| * \| \| \|	Add notes to the docs about setting service variables for users wanting to ↵	Elliot Rushton	2019-07-24	2	-0/+13
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	do so from the UI
* \| \| \|	Merge branch 'fix-danger-gemfile-warning' into 'master'	Thong Kuah	2019-07-24	1	-2/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix duplicated suggestion in Danger gem warning See merge request gitlab-org/gitlab-ce!31088
\| * \| \| \|	Fix duplicated suggestion in Danger gem warningfix-danger-gemfile-warning	Tiger	2019-07-24	1	-2/+1
\| \|/ / /
* \| \| \|	Merge branch 'docs-group-instance-clusters-ga' into 'master'	Evan Read	2019-07-24	2	-2/+0
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Remove beta from group and instance clusters See merge request gitlab-org/gitlab-ce!31059
\| * \| \|	Remove beta from group and instance clusters	Daniel Gruesso	2019-07-24	2	-2/+0
\|/ / /
* \| \|	Merge branch 'jivanvl-add-chart-empty-state' into 'master'	Clement Ho	2019-07-24	8	-8/+144
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add empty chart component Closes #60947 See merge request gitlab-org/gitlab-ce!30682
\| * \| \|	Add empty chart component	Jose Ivan Vargas	2019-07-24	8	-8/+144
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This merge request adds an empty chart component which will load in case of queries not having data to display, this will override the current logic, which hides all the graphs that have no data to show
* \| \|	Merge branch '64016-unix-shell-scripting-style-guide' into 'master'	Evan Read	2019-07-24	2	-0/+118
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add GitLab Unix shell scripting style guide to docs See merge request gitlab-org/gitlab-ce!30271
\| * \| \|	Add GitLab Unix shell scripting style guide to docs	Victor Zagorodny	2019-07-24	2	-0/+118
\|/ / /
* \| \|	Merge branch '65019-job-templates-dind-tls-fix' into 'master'	Thong Kuah	2019-07-24	6	-0/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set DOCKER_TLS_CERTDIR in CI job templates See merge request gitlab-org/gitlab-ce!31080
\| * \| \|	Set DOCKER_TLS_CERTDIR in CI job templates65019-job-templates-dind-tls-fix	Tiger	2019-07-24	6	-0/+12
\| \|/ / \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/65019
* \| \|	Merge branch '65019-auto-devops-dind-tls-fix' into 'master'	Thong Kuah	2019-07-24	2	-0/+7
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Set DOCKER_TLS_CERTDIR in Auto Dev-Ops CI template See merge request gitlab-org/gitlab-ce!31078
\| * \|	Set DOCKER_TLS_CERTDIR in Auto Dev-Ops CI template65019-auto-devops-dind-tls-fix	Tiger	2019-07-24	2	-0/+7
\|/ / \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/65019
* \|	Merge branch 'allow-all-users-to-see-history' into 'master'	Mayra Cabrera	2019-07-23	4	-1/+166
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #29528, by allowing all users to view history Closes #29528 See merge request gitlab-org/gitlab-ce!30470
\| * \|	Allowing all users to view history	Alex Kalderimis	2019-07-23	4	-1/+166
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This removes the create_wiki permission check from the history controller, allowing show and history to have the same level of permissions. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29528
* \|	Merge branch '63894-encapsulate-file-view-modes-with-constants' into 'master'	Paul Slaughter	2019-07-23	5	-15/+27
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Encapsulate file view modes with constants Closes #63894 See merge request gitlab-org/gitlab-ce!30737
\| * \|	Encapsulate file view modes with constants	Chris Toynbee	2019-07-23	5	-15/+27
\|/ /
* \|	Merge branch '52442-initial-mysql-support-removal' into 'master'	Robert Speicher	2019-07-23	63	-1695/+352
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove dead mysql code Closes #63191 See merge request gitlab-org/gitlab-ce!29608
\| * \|	Remove dead MySQL code	Nick Thomas	2019-07-23	63	-1695/+352
\| \| \| \| \| \| \| \| \| \| \| \|	None of this code can be reached any more, so it can all be removed
* \| \|	Merge branch 'sh-update-mermaid' into 'master'	Tim Zallmann	2019-07-23	5	-300/+1506
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Mermaid to v8.2.3 Closes #64601 See merge request gitlab-org/gitlab-ce!30985
\| * \| \|	Update Mermaid to v8.2.3sh-update-mermaid	Stan Hu	2019-07-23	5	-300/+1506
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes fill colors not working with Mermaid and pulls in a number of other fixes. * https://github.com/knsv/mermaid/blob/master/CHANGELOG.md * https://github.com/knsv/mermaid/#special-note-regarding-version-82 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64601
* \| \| \|	Merge branch '64101-override-helm-release-name' into 'master'	Thong Kuah	2019-07-23	3	-4/+11
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#64081 allow override of helm release name See merge request gitlab-org/gitlab-ce!30360
\| * \| \| \|	Rename changelog to correct issue number, be more explicit that we're ↵	James Keogh	2019-07-23	3	-4/+11
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	talking about Auto DevOps projects
* \| \| \|	Merge branch 'sh-remove-opclasses-patch' into 'master'	Mayra Cabrera	2019-07-23	4	-893/+682
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove PostgreSQL opclasses monkey patch Closes #64529 and #59673 See merge request gitlab-org/gitlab-ce!30709
\| * \| \| \|	Remove PostgreSQL opclasses monkey patchsh-remove-opclasses-patch	Stan Hu	2019-07-23	4	-893/+682
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is no longer needed with Rails 5.2. opclass is the attribute used per https://github.com/rails/rails/pull/19090/files. Now that we've removed the monkey patch and restored the Rails schema dumper, it appears Rails has dropped the inclusion of `using: :btree` as well (https://github.com/rails/rails/pull/27981). Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64529
* \| \| \|	Merge branch 'remove-unused-begin-rescue-block' into 'master'	Stan Hu	2019-07-23	1	-5/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speed up boot time See merge request gitlab-org/gitlab-ce!31072
\| * \| \| \|	Speed up boot time	Sergey Alekseev	2019-07-23	1	-5/+1
\| \| \|/ / \| \|/\| \| \| \| \| \|	by removing an unused `begin ... rescue ... end` block. The block is no longer necessary after moving the bootsnap gem to the :default group in eedf735574b9f6c7c6c843943dd946ce84238236.
* \| \| \|	Merge branch 'adjust-group-level-analytics-to-accept-multiple-project-ids' ↵	Stan Hu	2019-07-23	11	-43/+118
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Adjust group level analytics to accept multiple projects ids See merge request gitlab-org/gitlab-ce!30744
\| * \| \| \|	Change sql query	Małgorzata Ksionek	2019-07-23	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	Add code review remarksadjust-group-level-analytics-to-accept-multiple-project-ids	Małgorzata Ksionek	2019-07-23	11	-87/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add cr remarks Improve specs according to the review Fix schema Add cr remarks Fix naming Add cr remarks
\| * \| \| \|	Fix changelog merge request number	Małgorzata Ksionek	2019-07-23	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Add basic project extraction	Małgorzata Ksionek	2019-07-23	12	-89/+167
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To allow project filtering Prepare summary for accepting multiple groups Modify deploys group summary class Add filtering by project name in issues summary Fix rubocop offences Add changelog entry Change name to id in project filtering Fix rebase problem Add project extraction
* \| \| \| \|	Merge branch '44496-fqdn-validator' into 'master'	Mayra Cabrera	2019-07-23	3	-0/+172
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add validator for qualified domain array See merge request gitlab-org/gitlab-ce!31043
\| * \| \| \| \|	Add validator for qualidied domain array	Reuben Pereira	2019-07-23	3	-0/+172
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Validate that the entries contain no unicode, html tags and are not larger than 255 characters.
* \| \| \| \|	Merge branch 'GL-12412' into 'master'	Mayra Cabrera	2019-07-23	3	-0/+7
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add PIP_DEPENDENCY_PATH to dependency scanning template See merge request gitlab-org/gitlab-ce!30762
\| * \| \| \|	Add PIP_DEPENDENCY_PATH to dependency scanning template	mo khan	2019-07-23	3	-0/+7
\|/ / / /
* \| \| \|	Merge branch 'bvl-mark-remote-mirrors-as-failed-sooner' into 'master'	Robert Speicher	2019-07-23	3	-5/+19
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mark mirrors as failed 1 hour after they started See merge request gitlab-org/gitlab-ce!30999
\| * \| \| \|	Mark mirrors as failed 1 hour after they started	Bob Van Landuyt	2019-07-23	3	-5/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We call `Project#mark_stuck_remote_mirrors_as_failed!` from the `Git::BaseHooksService`. So that gets called every time we push tags or branches. Before this would only mark started mirrors as failed if they had been started 24 hours ago. A push would never take 24 hours, especially not when we run it so often. Lowering that threshold 1 hour should at least allow us to retry broken mirrors more often on pushes. The timeout for the initial push is set somewhat longer to accommodate for pushing large repos. Both numbers are currently picked arbitrarily.
* \| \| \| \|	Merge branch '12719-group-bulk-edit-merge-requests-change-milestone-ce' into ↵	Robert Speicher	2019-07-23	7	-31/+57
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' CE port for Group bulk edit merge requests See merge request gitlab-org/gitlab-ce!30569
\| * \| \| \| \|	CE port for Group bulk edit merge requests	Eugenia Grieff	2019-07-23	7	-31/+57
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add bulk update sidebar to merge requests template Add js to toggle sidebar Fix bulk update button in issues template Add specs for merge requests in bulk update service
* \| \| \| \|	Merge branch 'safe-archiving-for-traces' into 'master'	Kamil Trzciński	2019-07-23	16	-20/+214
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extra logging for new live trace architecture See merge request gitlab-org/gitlab-ce!30892