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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Document Code Quality potential security flawmc/doc/document-codeclimate-security-best-practice-docs	Matija Čupić	2019-07-29	1	-0/+6
\|
*	Merge branch 'frozen_string_spec_factories' into 'master'	Michael Kozono	2019-07-26	118	-0/+236
\|\ \| \| \| \| \| \| \| \|	Add frozen_string_literal to spec/factories See merge request gitlab-org/gitlab-ce!31129
\| *	Add frozen_string_literal to spec/factoriesfrozen_string_spec_factories	Thong Kuah	2019-07-26	118	-0/+236
\| \| \| \| \| \| \| \| \| \|	Using the sed script from https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
* \|	Merge branch '59325-units-are-not-shown-on-the-performance-dashboard-2' into ↵65188-this-is-my-test-issue-for-usability-testing	Mayra Cabrera	2019-07-26	4	-29/+47
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' fix: updates labels to include units in metrics Closes #59325 See merge request gitlab-org/gitlab-ce!30330
\| * \|	Updates label value to include units in metrics	Laura Montemayor	2019-07-26	4	-29/+47
\|/ / \| \| \| \| \| \| \| \| \| \|	This MR updates the y_label values and the label values in common_metrics and cluster_metrics to append the units of measurement to the labels.
* \|	Merge branch '64972-fix-unicorn-workers-metric' into 'master'61080-missing-borders-between-settings-items	Kamil Trzciński	2019-07-26	3	-28/+78
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix pid discovery for Unicorn in PidProvider See merge request gitlab-org/gitlab-ce!31056
\| * \|	Fix pid discovery for Unicorn in PidProvider	Aleksei Lipniagov	2019-07-26	3	-28/+78
\|/ /
* \|	Merge branch 'remove-nested-groups-checks' into 'master'	Lin Jen-Shin	2019-07-26	125	-712/+404
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove code related to object hierarchy and MySQL Closes #65056 and #65055 See merge request gitlab-org/gitlab-ce!31095
\| * \|	Remove code related to object hierarchy in MySQLremove-nested-groups-checks	Heinrich Lee Yu	2019-07-25	125	-712/+404
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These are not required because MySQL is not supported anymore
* \| \|	Merge branch 'mc/feature/find-all-artifacts-for-sha' into 'master'	Robert Speicher	2019-07-26	10	-69/+136
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Find build by sha from ref Closes #64534 and #45697 See merge request gitlab-org/gitlab-ce!30843
\| * \| \|	Extract common spec elements to shared_examplesmc/feature/find-all-artifacts-for-sha	Matija Čupić	2019-07-26	2	-92/+71
\| \| \| \|
\| * \| \|	Rename latest_successful to be more explicit	Matija Čupić	2019-07-26	7	-28/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Reword Project#latest_successful_build_for to Project#latest_successful_build_for_ref * Reword Ci::Pipeline#latest_successful_for to Ci::Pipeline#latest_successful_build_for_ref
\| * \| \|	Add specs for latest_successful methods for SHAs	Matija Čupić	2019-07-23	2	-0/+68
\| \| \| \|
\| * \| \|	Find build by sha from ref	Matija Čupić	2019-07-23	4	-5/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds ability to find builds by sha when only specifying a ref.
* \| \| \|	Merge branch 'remove_deployment_metrics_deployment_platform_fallback' into ↵	Kamil Trzciński	2019-07-26	4	-27/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Remove fallback to deployment_platform_cluster in `DeploymentMetrics` See merge request gitlab-org/gitlab-ce!31126
\| * \| \| \|	Removes potentially incorrect, and slow fallbackremove_deployment_metrics_deployment_platform_fallback	Thong Kuah	2019-07-25	4	-27/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deployment_platform is relatively expensive and calling this after the fact means that this may not be the cluster that was deployed to. Correspondingly reduce the leeway given in the related N+1 spec
* \| \| \| \|	Merge branch '12425-filters-for-dependency-scanning-to-dl' into 'master'	Kamil Trzciński	2019-07-26	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add severity for vulnerabilities See merge request gitlab-org/gitlab-ce!31146
\| * \| \| \| \|	Add severity for vulnerabilities	Tetiana Chupryna	2019-07-26	1	-2/+2
\|/ / / / /
* \| \| \| \|	Merge branch 'ce-mw-productivity-analytics-mr-table' into 'master'	Fatih Acet	2019-07-26	2	-0/+17
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(CE Port) Add MR table component for Productivity Analytics See merge request gitlab-org/gitlab-ce!30975
\| * \| \| \| \|	(CE Port) Add MR table component for Productivity Analytics	Martin Wortschack	2019-07-26	2	-0/+17
\|/ / / / /
* \| \| \| \|	Merge branch 'dm-submodule-links-nil' into 'master'	Nick Thomas	2019-07-26	5	-3/+75
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix error rendering submodules in MR diffs when there is no .gitmodules See merge request gitlab-org/gitlab-ce!31162
\| * \| \| \| \|	Fix error rendering submodules in MR diffs when there is no .gitmodulesdm-submodule-links-nil	Douwe Maan	2019-07-26	5	-3/+75
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Without this change, we get a NoMethodError on nil
* \| \| \| \| \|	Merge branch 'pl-flat_map-ce' into 'master'	Lin Jen-Shin	2019-07-26	9	-16/+14
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prefer `flat_map` over `map` + `flatten` See merge request gitlab-org/gitlab-ce!31144
\| * \| \| \| \| \|	Prefer `flat_map` over `map` + `flatten`	Peter Leitzen	2019-07-26	9	-16/+14
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Convert several occurrences of `map` + `flatten` to `flat_map` where applicable.
* \| \| \| \| \|	Merge branch 'docs-label-filtering' into 'master'	Sean McGivern	2019-07-26	2	-0/+170
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add development documentation on label filtering Closes #49651 See merge request gitlab-org/gitlab-ce!30741
\| * \| \| \| \| \|	Add development documentation on label filteringdocs-label-filtering	Sean McGivern	2019-07-25	2	-0/+170
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This topic comes up periodically, and we've investigated several options for changing the way we filter labels. Unfortunately, we have yet to find an option that is strictly better than the current state.
* \| \| \| \| \| \|	Merge branch 'renovate/gitlab-ui-5.x' into 'master'	Fatih Acet	2019-07-26	12	-20/+22
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update dependency @gitlab/ui to ^5.9.0 See merge request gitlab-org/gitlab-ce!31153
\| * \| \| \| \| \| \|	Karma: Fix css selector for loading icon	Lukas 'Eipi' Eipert	2019-07-26	12	-20/+22
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The GitLab UI update changed the spinner selector from `spinner` to `gl-spinner`, so we need to update it, so that our tests won't fail.
* \| \| \| \| \| \|	Merge branch 'extract_auto_deploy_into_base_image' into 'master'	Dmitriy Zaporozhets	2019-07-26	3	-376/+53
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract Auto DevOps deploy functions in a base image Closes #50286 See merge request gitlab-org/gitlab-ce!30404
\| * \| \| \| \| \| \|	Extract deploy functions in a base imageextract_auto_deploy_into_base_image	Thong Kuah	2019-07-25	3	-376/+53
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/cluster-integration/auto-deploy-image
* \| \| \| \| \| \|	Merge branch 'delete-designs-v2' into 'master'	Andreas Brandl	2019-07-26	3	-0/+33
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds event enum column to DesignsVersions join table See merge request gitlab-org/gitlab-ce!30745
\| * \| \| \| \| \| \|	Adds event enum column to DesignsVersions join tabledelete-designs-v2	Alex Kalderimis	2019-07-24	3	-0/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also adds index to support scopes and queries This supports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14656
* \| \| \| \| \| \| \|	Merge branch 'mh/editor-indents' into 'master'	Kushal Pandya	2019-07-26	16	-39/+1287
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support indentation in the markdown editor Closes #25070 See merge request gitlab-org/gitlab-ce!28914
\| * \| \| \| \| \| \| \|	Add UndoStack class - a custom undo/redo engine	Martin Hanzel	2019-07-26	16	-39/+1287
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It will be hooked up to the markdown editor later
* \| \| \| \| \| \| \|	Merge branch 'if-64257-warden_set_user_fix' into 'master'	James Lopez	2019-07-26	7	-15/+53
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure Warden triggers after_authentication callback See merge request gitlab-org/gitlab-ce!31138
\| * \| \| \| \| \| \| \|	Ensure Warden triggers after_authentication callback	Imre Farkas	2019-07-26	7	-15/+53
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By not triggering the callback: - ActiveSession lookup keys are not cleaned - Devise also misses its hook related to session cleanup
* \| \| \| \| \| \| \|	Merge branch 'qa-sl-nightly-117-stablize-editing-scope-label-spec-ce' into ↵	Ramya Authappan	2019-07-26	1	-1/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' CE port of "Stablize editing scope label spec - retry if dropdown is not visible" See merge request gitlab-org/gitlab-ce!31145
\| * \| \| \| \| \| \| \|	Retry if dropdown is not visibleqa-sl-nightly-117-stablize-editing-scope-label-spec-ce	Sanad Liaquat	2019-07-25	1	-1/+4
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '63568-access-email-notifications-custom-email' into 'master'	Lin Jen-Shin	2019-07-26	7	-22/+45
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Respect alt email when sending group access notifications See merge request gitlab-org/gitlab-ce!31089
\| * \| \| \| \| \| \| \|	Respect alt email when sending group access notifications63568-access-email-notifications-custom-email	Mario de la Ossa	2019-07-25	7	-22/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When sending access granted/rejected emails we should also respect custom emails set for groups/sub-groups
* \| \| \| \| \| \| \| \|	Merge branch 'tr-embed-metrics-feature-test' into 'master'	Thong Kuah	2019-07-26	2	-0/+68
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feature test for gfm embedding metrics See merge request gitlab-org/gitlab-ce!30621
\| * \| \| \| \| \| \| \| \|	Feature test for gfm embedding metrics	Tristan Read	2019-07-26	2	-0/+68
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'ab-dbreview-prep' into 'master'	Evan Read	2019-07-26	1	-0/+11
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add points how to prepare for database reviews Closes #65126 See merge request gitlab-org/gitlab-ce!31158
\| * \| \| \| \| \| \| \|	Add points how to prepare for database reviewsab-dbreview-prep	Andreas Brandl	2019-07-25	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65126. Came up in the database office hours call on 2019-07-25.
* \| \| \| \| \| \| \| \|	Merge branch '20190708_CI_Docspage_Edits' into 'master'	Evan Read	2019-07-26	3	-0/+16
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CI Docs update for Marketing See merge request gitlab-org/gitlab-ce!30440
\| * \| \| \| \| \| \| \| \|	Update README.md - add CTA to watch Mastering CI/CD webcast and 5 teams that ↵	Agnes Oetama	2019-07-26	3	-0/+16
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	made the switch to GitLab CI/CD article
* \| \| \| \| \| \| \| \|	Merge branch 'docs-support-annotation-template' into 'master'	Evan Read	2019-07-26	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs for template field in prometheus alerts See merge request gitlab-org/gitlab-ce!30900
\| * \| \| \| \| \| \| \| \|	Add docs for template field in prometheus alerts	Sarah Yasonik	2019-07-26	1	-1/+2
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'docs-troubleshooting-for-merge-train' into 'master'	Evan Read	2019-07-25	4	-20/+85
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Troubleshooting section for Merge Train documentation Closes #64948 See merge request gitlab-org/gitlab-ce!31033
\| * \| \| \| \| \| \| \| \|	Add trouble shooting for Merge Train	Shinya Maeda	2019-07-25	4	-20/+85
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add trouble shooting sections