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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add Secret support for Snippets13235-secret-snippets	Ash McKenzie	2019-09-11	28	-57/+360
\| \| \| \| \| \|	Snippets can now be created as type Secret which are non-searched Snippets that can accessed publicly if the correct secret_word is known.
*	Add new Secret visibility level	Ash McKenzie	2019-09-11	4	-7/+165
\| \| \| \| \| \| \|	Add Secret to the list of available visibility levels. Secret is essentially Public except you need to know the correct secret_word in order to access.
*	Merge branch '65988-optimize-snippet-listings' into 'master'	Thong Kuah	2019-09-11	23	-162/+262
\|\ \| \| \| \| \| \| \| \|	Optimize queries for snippet listings See merge request gitlab-org/gitlab-ce!32576
\| *	Add controller concern for paginated collections65988-optimize-snippet-listings	Markus Koller	2019-09-10	14	-133/+145
\| \| \| \| \| \| \| \| \| \| \| \|	We had similar code in a few places to redirect to the last page if the given page number is out of range. This unifies the handling in a new controller concern and adds usage of it in all snippet listings.
\| *	Optimize queries for snippet listings	Markus Koller	2019-09-10	13	-30/+118
\| \| \| \| \| \| \| \| \| \|	- Avoid N+1 queries for authors and comment counts - Avoid an additional snippet existence query
* \|	Merge branch 'williamchia-master-patch-44268' into 'master'	Evan Read	2019-09-11	1	-3/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add instructions for defining stages See merge request gitlab-org/gitlab-ce!32896
\| * \|	Add instructions for defining stages	William Chia	2019-09-11	1	-3/+7
\|/ /
* \|	Merge branch 'geo-docker-reg-replication-docs' into 'master'	Evan Read	2019-09-11	2	-12/+102
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Geo: Docker Registry replication documentation (4/4) Closes gitlab-ee#2870 See merge request gitlab-org/gitlab-ce!31196
\| * \|	Geo: Docker Registry replication documentation (4/4)	Valery Sizov	2019-09-11	2	-12/+102
\|/ /
* \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Robert Speicher	2019-09-10	3	-1/+13
\|\ \
\| * \	Merge branch 'security-12-3-bump-pages' into 'master'	GitLab Release Tools Bot	2019-09-11	2	-1/+6
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set max-age and secure flag for pages auth cookies See merge request gitlab/gitlabhq!3378
\| \| * \|	Upgrade pages to 1.8.1	Vladimir Shushlin	2019-09-09	2	-1/+6
\| \| \| \|
\| * \| \|	Update CHANGELOG.md for 12.2.5	GitLab Release Tools Bot	2019-09-10	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch 'ac-fix-graphiql-csp' into 'master'	Mayra Cabrera	2019-09-11	3	-3/+23
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix graphql-explorer CSP violation See merge request gitlab-org/gitlab-ce!32882
\| * \| \| \|	Fix CSP failure patching graphiql view	Alessio Caiazza	2019-09-11	3	-3/+23
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Backporting https://github.com/rmosolgo/graphiql-rails/pull/71
* \| \| \|	Merge branch '66023-public-private-fork-counts' into 'master'	Stan Hu	2019-09-11	5	-18/+67
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Forks count do not match after searching" Closes #66023 See merge request gitlab-org/gitlab-ce!31930
\| * \| \| \|	Fix N+1s queries	Douglas Barbosa Alexandre	2019-09-10	2	-2/+7
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'origin/master' into ↵	Douglas Barbosa Alexandre	2019-09-10	146	-609/+1593
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	camilstaps/gitlab-ce-new-66023-public-private-fork-counts
\| * \| \| \| \|	Apply suggestion to app/views/projects/forks/index.html.haml	Stan Hu	2019-09-10	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Make Rubocop happy	Douglas Barbosa Alexandre	2019-09-09	2	-1/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Remove N+1 queries	Douglas Barbosa Alexandre	2019-09-09	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'origin/master' into ↵	Douglas Barbosa Alexandre	2019-09-09	247	-1531/+5487
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	camilstaps/gitlab-ce-new-66023-public-private-fork-counts
\| * \| \| \| \| \|	Remove "n private forks you have no access to"	Camil Staps	2019-09-06	2	-7/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix public/private/internal fork counts	Camil Staps	2019-09-06	3	-14/+64
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'docs-followup-31087' into 'master'	Evan Read	2019-09-10	1	-17/+45
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix markdown to improve rendering of markdown doc Closes #65090 See merge request gitlab-org/gitlab-ce!32744
\| * \| \| \| \| \| \|	Fix markdown to improve rendering of markdown doc	Marcel Amirault	2019-09-10	1	-17/+45
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'qa/tn/new_test/file_locking' into 'master'	Mark Lapierre	2019-09-10	11	-2/+95
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport for EE 15582 See merge request gitlab-org/gitlab-ce!32814
\| * \| \| \| \| \| \|	Backport for EE 15582	Tomislav Nikic	2019-09-10	11	-2/+95
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a back-port for all CE related files.
* \| \| \| \| \| \|	Merge branch 'issue-64738' into 'master'52758-save-collapsed-board-lists-to-the-back-end	Mayra Cabrera	2019-09-10	3	-1/+14
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent archived projects from showing up in global search See merge request gitlab-org/gitlab-ce!31498
\| * \| \| \| \| \| \|	Prevent archived projects from showing up in global search	David Palubin	2019-09-10	3	-1/+14
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'review-app-optimizations' into 'master'	Stan Hu	2019-09-10	2	-91/+156
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refine the review-app custom variables See merge request gitlab-org/gitlab-ce!32783
\| * \| \| \| \| \| \|	Refine the review-app config variablesreview-app-optimizations	Kyle Wiebers	2019-09-10	2	-91/+156
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add base-config.yaml to define non-environment variable config for review app deploy. Define resource requests and limits for all used apps
* \| \| \| \| \| \| \|	Merge branch 'edit-delete-vuln-dismissal-toast-notication-vue-global' into ↵	Paul Slaughter	2019-09-10	2	-0/+32
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Backport global toast notification changes See merge request gitlab-org/gitlab-ce!32810
\| * \| \| \| \| \| \|	Add global toast module	Fernando Arias	2019-09-10	2	-0/+32
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why? https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15015#note_210891978
* \| \| \| \| \| \|	Merge branch 'winh-vue-resource-sidebar-service-again' into 'master'	Paul Slaughter	2019-09-10	9	-73/+57
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove vue resource from sidebar service See merge request gitlab-org/gitlab-ce!32630
\| * \| \| \| \| \| \|	Remove vue resource from sidebar service	Winnie Hellmann	2019-09-10	9	-73/+57
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32400
* \| \| \| \| \| \|	Merge branch '34338-details-element' into 'master'	Annabel Dunstone Gray	2019-09-10	2	-0/+17
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add padding to details element in markdown Closes #34338 See merge request gitlab-org/gitlab-ce!32716
\| * \| \| \| \| \| \|	Add padding to details element in markdown34338-details-element	Jarek Ostrowski	2019-09-09	2	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add MR to changelog entry Adjust to give margin bottom to details instead of last-child Remove trailing whitespace
* \| \| \| \| \| \| \|	Merge branch 'phikai-master-patch-55126' into 'master'	Achilleas Pipinellis	2019-09-10	1	-0/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add local network requests information for example web hooks receiver See merge request gitlab-org/gitlab-ce!32892
\| * \| \| \| \| \| \| \|	Add local network requests information for example web hooks receiver	Kai Armstrong	2019-09-10	1	-0/+3
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'remove-old-ignore-column' into 'master'	Peter Leitzen	2019-09-10	5	-20/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove some old `ignore_column` in AR models [CE] See merge request gitlab-org/gitlab-ce!31001
\| * \| \| \| \| \| \| \|	Remove ignore_column occurence in CE coderemove-old-ignore-column	Dmitriy Zaporozhets	2019-09-10	5	-20/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch 'add-review-app-cleanup' into 'master'	Rémy Coutable	2019-09-10	2	-1/+29
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add review-cleanup-failed-deployment to prepare See merge request gitlab-org/gitlab-ce!32839
\| * \| \| \| \| \| \| \| \|	Add review-cleanup-failed-deployment to prepareadd-review-app-cleanup	Kyle Wiebers	2019-09-10	2	-1/+29
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add in a job to purge previous release in Review App
* \| \| \| \| \| \| \| \|	Merge branch '64122-documentation-lacks-how-to-enable-project-snippets' into ↵	Marcia Ramos	2019-09-10	3	-0/+12
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Documentation lacks how to enable Project snippets" See merge request gitlab-org/gitlab-ce!32391
\| * \| \| \| \| \| \| \| \|	Resolve "Documentation lacks how to enable Project snippets"	🙈 jacopo beschi 🙉	2019-09-10	3	-0/+12
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '64251-redis-set-cache-mark-2' into 'master'	Stan Hu	2019-09-10	7	-3/+237
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-introduce the Redis set cache for branch and tag names - but don't enable it yet See merge request gitlab-org/gitlab-ce!32412
\| * \| \| \| \| \| \| \| \|	Don't use the redis set cache yet	Nick Thomas	2019-09-10	3	-50/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For zero-downtime deployed in a mixed code environment between 12.2 and 12.3, the branch and tag name cache is incorrectly invalidated - a push to an old machine will not clear the redis set version of the cache on the new machine. This commit ensures that, in 12.3, both set and non-set versions of the cache are invalidated, but does not write or consult the set version of the cache. . In 12.4, it will be safe to switch branch and tag names to the redis set cache both it and the legacy cache will be invalidated appropriately in such a mixed code environment. This delays the full implementation of the feature by one release, but in the absence of a credible feature-flagging strategy, and amidst an abundance of caution about the effects of too-eager cache expiration, I believe this is the best approach available to us.
\| * \| \| \| \| \| \| \| \|	Redis set cache docs and minor cleanup	Nick Thomas	2019-09-10	2	-7/+19
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Revert "Revert "Cache branch and tag names as Redis sets""	Nick Thomas	2019-09-10	7	-17/+254
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit c6ccc07f48c7c1f9da43ecd82015500a4340544d.