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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Sometimes you don't see the forrest because of all the trees, set now the ↵36496-badges-should-not-be-huge	Tim Zallmann	2017-08-18	1	-0/+3
\| \| \| \|	preloading sizes to specific lazy class
*	Merge branch 'issue_35580' into 'master'	Rémy Coutable	2017-08-17	4	-24/+139
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix project import to group when there are project milestones Closes #35580 See merge request !13482
\| *	Fix project import to group when there are project milestones	Felipe Artur	2017-08-17	4	-24/+139
\|/
*	Merge branch 'dev.non-referable-inspect' into 'master'	Sean McGivern	2017-08-17	2	-9/+5
\|\ \| \| \| \| \| \| \| \|	expose Referable#non_referable_inspect See merge request !13613
\| *	expose Referable#non_referable_inspectdev.non-referable-inspect	http://jneen.net/	2017-08-16	2	-9/+5
\| \|
* \|	Merge branch 'zj-fix-fe-posting-value' into 'master'	Kamil Trzciński	2017-08-17	4	-3/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix project templates and add docs Closes #36492 See merge request !13563
\| * \|	Document project templates and link to it	Zeger-Jan van de Weg	2017-08-17	3	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The link pointed to the wrong page, this is corrected by both writing the documentation and linking to that instead. (internal) Reference: https://gitlab.slack.com/archives/C0NFPSFA8/p1502791719000238
\| * \|	Frontend to send template name instead of on/off	Zeger-Jan van de Weg	2017-08-17	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The params were not getting a value other than `project_templates:"on"` so the backend wasn't sure what template to use. Fixes gitlab-org/gitlab-ce#36492
* \| \|	Merge branch 'fixed-collapsed-sidebar-fly-out-not-showing' into 'master'	Tim Zallmann	2017-08-17	1	-2/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed collapsed sidebar not showing fly-out menu See merge request !13622
\| * \| \|	Fixed collapsed sidebar not showing fly-out menu	Phil Hughes	2017-08-17	1	-2/+5
\| \|/ /
* \| \|	Merge branch 'zj-upgrade-grape' into 'master'	Douwe Maan	2017-08-17	8	-21/+23
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade grape to 1.0 Closes #36588 See merge request !13609
\| * \| \|	Upgrade grape to 1.0	Zeger-Jan van de Weg	2017-08-16	8	-21/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Main feature was the deprication of the Hashie stuff, so the access by calling keys as method is gone now.
* \| \| \|	Merge branch 'help-page-spec-fix' into 'master'	Rémy Coutable	2017-08-17	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix help page version image spec Closes #36592 See merge request !13605
\| * \| \| \|	Fix help page version image spechelp-page-spec-fix	Phil Hughes	2017-08-16	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-milestone-sidebar' into 'master'	Phil Hughes	2017-08-17	2	-2/+2
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix milestone sidebar collapse button Closes #36453 See merge request !13620
\| * \| \| \|	Fix milestone sidebar collapse buttonfix-milestone-sidebar	Clement Ho	2017-08-16	2	-2/+2
\| \|/ / /
* \| \| \|	Merge branch 'bvl-docs-add-reserved-names-to-docs' into 'master'	Achilleas Pipinellis	2017-08-17	4	-6/+122
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Add reserved names to docs See merge request !13583
\| * \| \|	Add reserved names to docsbvl-docs-add-reserved-names-to-docs	Bob Van Landuyt	2017-08-16	4	-6/+122
\| \| \| \|
* \| \| \|	Merge branch 'dm-gpg-signature-performance' into 'master'	Robert Speicher	2017-08-16	12	-104/+160
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only create commit GPG signature when necessary See merge request !13561
\| * \| \| \|	Only create commit GPG signature when necessarydm-gpg-signature-performance	Douwe Maan	2017-08-16	12	-104/+160
\| \| \| \| \|
* \| \| \| \|	Merge branch '36450_second_touch_up' into 'master'	Clement Ho	2017-08-16	2	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change 'This issue is not confidential' to 'Not confidential' See merge request !13607
\| * \| \| \| \|	change to 'Not confidential'36450_second_touch_up	Regis	2017-08-16	2	-2/+2
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'repo-fixes-flex-solution1' into 'master'	Jacob Schatz	2017-08-16	2	-18/+32
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Repo editor with flex layout See merge request !13571
\| * \| \| \| \|	Repo editor with flex layout	Eric Eastwood	2017-08-16	2	-18/+32
\|/ / / / /
* \| \| \| \|	Merge branch 'commits-list-page-limit' into 'master'	Tim Zallmann	2017-08-16	2	-1/+6
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix commit list request appending 40 to offset Closes #36569 and #36563 See merge request !13603
\| * \| \| \|	Fix commit list request appending 40 to offset	Phil Hughes	2017-08-16	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #36569
* \| \| \| \|	Merge branch 'charlock-holmes-0.7.5' into 'master'	Douwe Maan	2017-08-16	2	-3/+3
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use charlock_holmes 0.7.5 See merge request !13602
\| * \| \| \|	Use charlock_holmes 0.7.5	Jacob Vosmaer	2017-08-16	2	-3/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs/database-development' into 'master'	Rémy Coutable	2017-08-16	7	-1/+220
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add more database development related docs See merge request !13466
\| * \| \| \| \|	Document not using database hash indexes	Yorick Peterse	2017-08-16	2	-0/+21
\| \| \| \| \| \|
\| * \| \| \| \|	Document how to handle different DB (versions)	Yorick Peterse	2017-08-16	2	-0/+27
\| \| \| \| \| \|
\| * \| \| \| \|	State that comma separated data is serialised data	Yorick Peterse	2017-08-16	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Comma separated values really are a form of serialised data so we should clarify that we shouldn't store such data in the DB.
\| * \| \| \| \|	Add more database development related docs	Yorick Peterse	2017-08-16	4	-0/+170
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'icon-sidebar-expanded-margin' into 'master'	Clement Ho	2017-08-16	1	-2/+4
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes icon sidebar expanding causing a jump in padding Closes #36456 See merge request !13568
\| * \| \| \| \|	Fixes icon sidebar expanding causing a jump in paddingicon-sidebar-expanded-margin	Phil Hughes	2017-08-15	1	-2/+4
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #36456
* \| \| \| \|	Merge branch ↵	Phil Hughes	2017-08-16	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'36442-images-in-issue-descriptions-no-longer-scale-to-the-width-of-their-container' into 'master' Resolve "Images in issue descriptions no longer scale to the width of their container" Closes #36442 See merge request !13586
\| * \| \| \| \|	Set Description Image to max-width 100%36442-images-in-issue-descriptions-no-longer-scale-to-the-width-of-their-container	Tim Zallmann	2017-08-16	1	-0/+1
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'winh-navcontrols-dropdown-style' into 'master'	Clement Ho	2017-08-16	2	-1/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sort by dropdown style consistent See merge request !13253
\| * \| \| \| \|	Make sort by dropdown style consistent	Winnie Hellmann	2017-08-16	2	-1/+3
\|/ / / / /
* \| \| \| \|	Merge branch 'jej/document-pick-into-backports' into 'master'	Sean McGivern	2017-08-16	1	-6/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document "Pick into Backports" label in PROCESS.md See merge request !13565
\| * \| \| \| \|	Document "Pick into Backports" label processjej/document-pick-into-backports	James Edwards-Jones	2017-08-10	1	-6/+10
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'bvl-circuitbreaker-settings-to-avoid-failures' into 'master'	Rémy Coutable	2017-08-16	4	-13/+58
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Circuitbreaker settings to avoid spec-failures Closes #36324 See merge request !13519
\| * \| \| \| \| \|	Use better higher threshold settings for storage access in tests	Bob Van Landuyt	2017-08-16	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`failure_count_threshold`: We should never need this, but we don't want to block access in tests because of this. `failure_wait_time`: Setting it to 0 now allows each storage attempt `storage_timeout`: Try a bit longer to access storage on CI in case the slow machines take a bit longer to spin up the process to perfom the check
\| * \| \| \| \| \|	Allow a `failure_wait_time` of 0 for storage access	Bob Van Landuyt	2017-08-16	3	-13/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows testing every storage attempt after a failure. Which could be useful for tests
* \| \| \| \| \| \|	Merge branch '36430-edit-milestone-link' into 'master'	Grzegorz Bizon	2017-08-16	3	-4/+29
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix edit milestone path from group milestones list Closes #36430 See merge request !13581
\| * \| \| \| \| \|	Fix edit milestone path from group milestones list	Jarka Kadlecova	2017-08-16	3	-4/+29
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'dispatcher-race-condition-fix' into 'master'	Tim Zallmann	2017-08-16	8	-14/+20
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix race condition with dispatcher.js See merge request !13377
\| * \| \| \| \| \| \|	Fix race condition with dispatcher.jsdispatcher-race-condition-fix	Phil Hughes	2017-08-15	8	-14/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The dispatcher was trying to create a new instance of a class that is loaded in a file after main.js which would cause the filtered search to not work on issues. This would only happen on the first load when the JS is not cached. If the JS is cached, then everything will be fine.
* \| \| \| \| \| \| \|	Merge branch 'safari-overscroll-sticky-fix' into 'master'	Tim Zallmann	2017-08-16	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes sticky class being removed when over-scrolling in Safari Closes #36457 See merge request !13556
\| * \| \| \| \| \| \| \|	Fixes sticky class being removed when over-scrolling in Safarisafari-overscroll-sticky-fix	Phil Hughes	2017-08-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #36457