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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix link in rolling_out_changes_using_feature_flags.mdpatch-39	Peter Leitzen	2019-01-21	1	-1/+1
\|
*	Merge branch 'docs/default-rbac' into 'master'	Achilleas Pipinellis	2019-01-21	1	-2/+5
\|\ \| \| \| \| \| \| \| \|	Add note about default See merge request gitlab-org/gitlab-ce!24445
\| *	Add note about default	Evan Read	2019-01-17	1	-2/+5
\| \|
* \|	Merge branch 'update-errortracking-118-docs' into 'master'	Marcia Ramos	2019-01-21	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update release error tracking is available in to 11.8 See merge request gitlab-org/gitlab-ce!24528
\| * \|	Update release error tracking is available in to 11.8	Joshua Lambert	2019-01-21	1	-1/+1
\| \| \|
* \| \|	Merge branch 'docs/private-project-go-package' into 'master'	Achilleas Pipinellis	2019-01-21	1	-0/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add tip about Go packages Closes #56493 See merge request gitlab-org/gitlab-ce!24477
\| * \| \|	Add tip about Go packages	Evan Read	2019-01-21	1	-0/+14
\|/ / /
* \| \|	Merge branch 'docs/add-version-text-to-new-badge-style' into 'master'	Achilleas Pipinellis	2019-01-21	1	-35/+30
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Add version text and refactor file See merge request gitlab-org/gitlab-ce!24517
\| * \|	Add version text and refactor file	Evan Read	2019-01-21	1	-35/+30
\| \| \|
* \| \|	Merge branch ↵	Phil Hughes	2019-01-21	4	-5/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'56622-admin-settings-cannot-read-property-addeventlistener-of-null' into 'master' Resolve "Admin Settings: Cannot read property 'addEventListener' of null" Closes #56622 See merge request gitlab-org/gitlab-ce!24522
\| * \| \|	Resolve "Admin Settings: Cannot read property 'addEventListener' of null"	Martin Wortschack	2019-01-21	4	-5/+10
\|/ / /
* \| \|	Merge branch 'qa-nightly-59-fix-new-label-button-hit-miss' into 'master'	Fatih Acet	2019-01-21	3	-1/+17
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes "New label" button hit miss Closes gitlab-org/quality/nightly#59 See merge request gitlab-org/gitlab-ce!24487
\| * \| \|	Add qa element	Sanad Liaquat	2019-01-18	2	-2/+7
\| \| \| \|
\| * \| \|	Add comments explaining the wait	Sanad Liaquat	2019-01-18	1	-4/+5
\| \| \| \|
\| * \| \|	Wait for label svg to load	Sanad Liaquat	2019-01-18	2	-1/+11
\| \| \| \|
* \| \| \|	Merge branch 'sh-preload-associations-for-group-api' into 'master'	Douwe Maan	2019-01-21	3	-2/+25
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eliminate N+1 queries in /api/groups/:id Closes #49845 See merge request gitlab-org/gitlab-ce!24513
\| * \| \| \|	Eliminate N+1 queries in /api/groups/:id	Stan Hu	2019-01-19	3	-2/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15475/diffs, a significant amount of work went into eliminating N+1 queries in the /api/groups/:id/projects endpoint. We can reuse the `Entities::Project.prepare_relation` call on the projects. In a group with 2,573 projects on GitLab.com, this change significantly improves performance: * 18019 SQL queries down to 21 * Time spent in DB: 70 s down to 384 ms Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/49845
* \| \| \| \|	Merge branch 'revert-b479ddc7' into 'master'	Grzegorz Bizon	2019-01-21	2	-14/+14
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'qa-use-mr-iid-in-review-app-slug' into 'master'" See merge request gitlab-org/gitlab-ce!24521
\| * \| \| \| \|	Revert "Merge branch 'qa-use-mr-iid-in-review-app-slug' into 'master'"	Rémy Coutable	2019-01-21	2	-14/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24388
* \| \| \| \| \|	Merge branch '54401-search-project-tags-via-api' into 'master'	Rémy Coutable	2019-01-21	4	-2/+25
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Search project tags via API Closes #54401 See merge request gitlab-org/gitlab-ce!24385
\| * \| \| \| \|	Search project tags via API	Robert Schilling	2019-01-21	4	-2/+25
\|/ / / / /
* \| \| \| \|	Merge branch 'raise-on-unfiltered-params' into 'master'	Rémy Coutable	2019-01-21	7	-7/+28
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set ActionController raise_on_unfiltered_parameters to true See merge request gitlab-org/gitlab-ce!24443
\| * \| \| \| \|	Actually set raise_on_unfiltered_parameters to true	Jasper Maes	2019-01-16	7	-7/+28
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'sh-bump-katex-version-0.10.0' into 'master'	Kushal Pandya	2019-01-21	4	-14/+14
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump the katex package to 0.10.0 See merge request gitlab-org/gitlab-ce!24478
\| * \| \| \| \|	Update spec/features/markdown/math_spec.rb	Andrew Harmon	2019-01-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refer to https://github.com/KaTeX/KaTeX/pull/1700 for additional details.
\| * \| \| \| \|	Update yarn.lock	Andrew Harmon	2019-01-18	1	-11/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Update changelogs/unreleased/56507-sh-bump-katex-0.10.0.yml	Andrew Harmon	2019-01-18	1	-0/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Update package.json	Andrew Harmon	2019-01-18	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'docs-add-git-strategy-note' into 'master'	Evan Read	2019-01-20	1	-0/+5
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add a note that GIT_STRATEGY is not supported for k8s executor See merge request gitlab-org/gitlab-ce!23974
\| * \| \| \| \|	Add a note that GIT_STRATEGY is not supported for k8s executor	Alexander Tanayno	2019-01-18	1	-0/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '56213-remove-error_tracking-feature-flag' into 'master'	Kamil Trzciński	2019-01-19	9	-75/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Remove `error_tracking` feature flag" Closes #56213 See merge request gitlab-org/gitlab-ce!24306
\| * \| \| \| \| \|	Remove `error_tracking` feature flag	Peter Leitzen	2019-01-15	9	-75/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We introduced the feature flag `error_tracking` to test the Sentry MVC safely. After the successful test, we remove it again.
* \| \| \| \| \| \|	Merge branch '56389-remove-unwanted-suggestion-flash-margin' into 'master'	Annabel Dunstone Gray	2019-01-18	3	-2/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unwanted margin above suggested changes. Closes #56389 See merge request gitlab-org/gitlab-ce!24419
\| * \| \| \| \| \| \|	Remove unwanted margin above suggested changes.	Jacques Erasmus	2019-01-18	3	-2/+7
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'docs-fix-migrations-readme' into 'master'	Robert Speicher	2019-01-18	1	-16/+60
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improvements for spec migration readme See merge request gitlab-org/gitlab-ce!24440
\| * \| \| \| \| \| \|	Reorders migrations readme file	Mayra Cabrera	2019-01-17	1	-16/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The document is now split in two sections: - Testing an ActiveRecord migration - Testing an non-ActiveRecord migration Both sections have an example
* \| \| \| \| \| \| \|	Merge branch 'docs-patch-38' into 'master'	Kushal Pandya	2019-01-18	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update vuex.md - swap PUT/POST methods See merge request gitlab-org/gitlab-ce!24494
\| * \| \| \| \| \| \| \|	Update vuex.md - swap PUT/POST methods	Filipa Lacerda	2019-01-18	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'qa-fix-resource-attribute' into 'master'	Mark Lapierre	2019-01-18	6	-17/+62
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Resource attribute bug See merge request gitlab-org/gitlab-ce!24407
\| * \| \| \| \| \| \| \| \|	Update merge fork test	Mark Lapierre	2019-01-17	4	-6/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now that Resources don't share attributes, Fork doesn't have Project attributes. That caused the merge fork test to fail because it no longer had access to repository_http_location via Fork. Rather than give Fork Project attributes directly, we add a project attribute to Fork and populate it via the API at the end of the fabricate! method after the fork has been created via the UI. We also update the merge fork test to be slightly more concise and consistent with newer tests by using perform with proc coercion instead of act or perform with the full block syntax.
\| * \| \| \| \| \| \| \| \|	Fix Resource attribute bug	Mark Lapierre	2019-01-15	2	-11/+37
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow Resources to have the same attribute name but different attribute values
* \| \| \| \| \| \| \| \|	Merge branch 'sengelhard-fix-reference-to-label' into 'master'	Achilleas Pipinellis	2019-01-18	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update reference to ~Monitoring to be ~Monitor See merge request gitlab-org/gitlab-ce!24489
\| * \| \| \| \| \| \| \| \|	Update reference to ~Monitoring to be ~Monitor	Seth Engelhard	2019-01-18	1	-1/+1
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch ↵	Achilleas Pipinellis	2019-01-18	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'56254-follow-up-from-change-update-instructions-for-node-from-6-to-8' into 'master' Correct minimum yarn version in 11.6 -> 11.7 upgrade doc Closes #56254 See merge request gitlab-org/gitlab-ce!24495
\| * \| \| \| \| \| \| \| \|	Correct yarn version in 11.6 -> 11.7 upgrade doc	Lukas 'Eipi' Eipert	2019-01-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'osw-enforces-project-removal-with-past-failed-attempts' into ↵	Nick Thomas	2019-01-18	3	-5/+58
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Cleanup stale +deleted repo paths on project removal (adjusts project removal bug) Closes #46146 See merge request gitlab-org/gitlab-ce!24269
\| * \| \| \| \| \| \| \| \| \|	Cleanup stale +deleted repo paths on project removal	Oswaldo Ferreira	2019-01-18	3	-5/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. When removing projects, we can end-up leaving the +deleted repo path dirty and not successfully removing the non-deleted namespace (mv process is not atomic and can be killed without fully moving the path). 2. In order to solve that, we're adding a clean-up phase on ensure which will schedule possible staled +deleted path deletion. Note that we don't check the current state (if there is or not a repo) in order to schedule the deletion. That's intentional in order to leverage Gitlab::GitalyClient::NamespaceService#remove idempotency and ensure consistency.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'view-epic-permissions' into 'master'	Sean McGivern	2019-01-18	1	-3/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	View epic permissions See merge request gitlab-org/gitlab-ce!24483
\| * \| \| \| \| \| \| \| \| \|	Update permissions.md	Victor Wu	2019-01-18	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'api-nested-group-permission' into 'master'	Nick Thomas	2019-01-18	5	-1/+80
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return the maximum group access level in the projects API Closes #43684 See merge request gitlab-org/gitlab-ce!24403