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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixes issue with close button not working on MRfix-mr-close-button	Phil Hughes	2016-03-18	1	-2/+2
\| \| \| \|	Closes #14383
*	Merge branch 'fix-group-members-ui' into 'master'	Dmitriy Zaporozhets	2016-03-18	1	-0/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add side padding to content-list if inside panel Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #14367, #14349 See merge request !3273
\| *	Add side padding to content-list if inside panelfix-group-members-ui	Dmitriy Zaporozhets	2016-03-17	1	-0/+4
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'fix-issue-14338' into 'master'	Achilleas Pipinellis	2016-03-18	5	-5/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use relative links in `doc`, fix broken generated HTML links Links like (doc/web_hooks/web_hooks.md) work in the GitLab source code web interface, but the HTML generator produces broken links in the `doc` subdirectories: http://doc.gitlab.com/ce/hooks/doc/web_hooks/web_hooks.html instead of the right one http://doc.gitlab.com/ce/web_hooks/web_hooks.html in http://doc.gitlab.com/ce/hooks/custom_hooks.html. Fixes #14338 See merge request !3261
\| * \|	Use relative links in `doc`, fix broken generated HTML links	Anatoly Borodin	2016-03-17	5	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Links like (doc/web_hooks/web_hooks.md) work in the GitLab source code web interface, but the HTML generator produces broken links in the `doc` subdirectories: http://doc.gitlab.com/ce/hooks/doc/web_hooks/web_hooks.html instead of the right one http://doc.gitlab.com/ce/web_hooks/web_hooks.html in http://doc.gitlab.com/ce/hooks/custom_hooks.html. Fixes #14338 [ci skip] Signed-off-by: Anatoly Borodin <anatoly.borodin@gmail.com>
* \| \|	Merge branch 'ci-duplication' into 'master'	Achilleas Pipinellis	2016-03-18	1	-36/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove CI duplication. See merge request !3290
\| * \| \|	Remove CI duplication.ci-duplication	Sytse Sijbrandij	2016-03-17	1	-36/+1
\|/ / /
* \| \|	Merge branch 'improve-award-emoji-spinach-tests' into 'master'	Robert Speicher	2016-03-18	2	-4/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve award emoji test reliability by checking that the emoji is displayed before the search field is focused See merge request !3288
\| * \| \|	Improve award emoji test reliability by checking that the emoji is displayed	Stan Hu	2016-03-17	2	-4/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	before the search field is focused
* \| \| \|	Merge branch 'issue_14374' into 'master'	Robert Speicher	2016-03-18	1	-3/+4
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check push permissions only when pushing directly to target branch. Fixes #14374 See merge request !3280
\| * \| \|	Check push permissions only when pushing directly to target branch.issue_14374	Rubén Dávila	2016-03-17	1	-3/+4
\| \| \| \|
* \| \| \|	Merge branch 'fix_dropdown_getting_cut_off_in_page' into 'master'	Jacob Schatz	2016-03-17	1	-0/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug causing dropdown to get cut off in project page closes #14336 ### Before ![Screen_Shot_2016-03-16_at_11.30.40_PM](/uploads/9f8dd10f0627cdfbd49d7127b233b105/Screen_Shot_2016-03-16_at_11.30.40_PM.png) ![Screen_Shot_2016-03-16_at_11.30.53_PM](/uploads/6dfe64d68867d158a11be7e74cbd1520/Screen_Shot_2016-03-16_at_11.30.53_PM.png) ### After ![Screen_Shot_2016-03-16_at_11.30.14_PM](/uploads/2b87cc17522e8a425a97a78b36982873/Screen_Shot_2016-03-16_at_11.30.14_PM.png) See merge request !3257
\| * \| \| \|	fix bug causing dropdown to get cut off in project pagefix_dropdown_getting_cut_off_in_page	Arinde Eniola	2016-03-16	1	-0/+7
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'fix_issue_mr_page_inconsistency' into 'master'	Jacob Schatz	2016-03-17	2	-13/+15
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix inconsistency in the header of issue and merge request pages closes #13550 # For Issue Page ### Before ![Screen_Shot_2016-03-17_at_8.46.59_PM](/uploads/ede7f2b98395362ae87e6258cc10520a/Screen_Shot_2016-03-17_at_8.46.59_PM.png) ### After ![Screen_Shot_2016-03-17_at_8.48.56_PM](/uploads/da7adf17cb397ddc0677a6a5e8033b8e/Screen_Shot_2016-03-17_at_8.48.56_PM.png) # For Merge request Page ### Before ![Screen_Shot_2016-03-17_at_8.45.45_PM](/uploads/10137827c05c8166a0aa429687e50d1b/Screen_Shot_2016-03-17_at_8.45.45_PM.png) ### After ![Screen_Shot_2016-03-17_at_8.45.01_PM](/uploads/92151c03cfe29b71090a1e0ad31abd6e/Screen_Shot_2016-03-17_at_8.45.01_PM.png) See merge request !3279
\| * \| \| \|	Fix inconsistency in the header of issue and merge request pages	Arinde Eniola	2016-03-17	2	-13/+15
\| \| \| \| \|
* \| \| \| \|	Merge branch 'download-dropdown-alignment' into 'master'	Jacob Schatz	2016-03-17	2	-1/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed alignment of download dropdown With the new dropdown CSS - some dropdowns might look a bit odd ## Previously ![Screen_Shot_2016-03-16_at_11.46.04](/uploads/c1a8fc95ed4410de35d7bd5caedf28f5/Screen_Shot_2016-03-16_at_11.46.04.png) ## Now ![Screen_Shot_2016-03-16_at_11.45.26](/uploads/998637fe0872b2e826a8c17d183499dc/Screen_Shot_2016-03-16_at_11.45.26.png) See merge request !3245
\| * \| \| \| \|	Fixed alignment of download dropdowndownload-dropdown-alignment	Phil Hughes	2016-03-16	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With the new dropdown CSS - some dropdowns might look a bit odd
* \| \| \| \| \|	Merge branch 'filter-spacing' into 'master'	Jacob Schatz	2016-03-17	1	-14/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed filter spacing Closes #14350 ![Screen_Shot_2016-03-17_at_10.21.33](/uploads/5b8f39134cc90ce1dd6565f665a39838/Screen_Shot_2016-03-17_at_10.21.33.png) See merge request !3267
\| * \| \| \| \| \|	Fixed filter spacingfilter-spacing	Phil Hughes	2016-03-17	1	-14/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #14350
* \| \| \| \| \| \|	Merge branch 'git-2-7-4' into 'master'	Robert Speicher	2016-03-17	3	-6/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Git version requirement to 2.7.4 [ci skip] See merge request !3281
\| * \ \ \ \ \ \	Merge branch 'master' into git-2-7-4	Douwe Maan	2016-03-17	25	-156/+452
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'edited-text' into 'master'	Robert Speicher	2016-03-17	6	-18/+29
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edited timeago text on comments Unified the 'edited text' to be the same in descriptions and comments Closes #5538 See merge request !3063
\| * \| \| \| \| \| \| \|	Added skip_js commentedited-text	Phil Hughes	2016-03-16	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \|	Fixed failing rubocop test	Phil Hughes	2016-03-10	1	-5/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixed issue with timeago not firing	Phil Hughes	2016-03-10	5	-7/+24
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Single if statement	Phil Hughes	2016-03-10	1	-5/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixed ruby issues from feedback	Phil Hughes	2016-03-10	5	-28/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed failing tests
\| * \| \| \| \| \| \| \|	Edited timeago text on comments	Phil Hughes	2016-03-10	6	-24/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unified the 'edited text' to be the same in descriptions and comments Closes #5538
* \| \| \| \| \| \| \| \|	Merge branch 'blue-links-fix' into 'master'	Jacob Schatz	2016-03-17	1	-4/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert color for links inside gray areas Before ![Screen_Shot_2016-03-17_at_12.23.17_PM](/uploads/55e518721d83c3bfc42edba3e97ec44d/Screen_Shot_2016-03-17_at_12.23.17_PM.png) After ![Screen_Shot_2016-03-17_at_12.23.03_PM](/uploads/08fbf8e9139e4eadf191102cffd29617/Screen_Shot_2016-03-17_at_12.23.03_PM.png) Reverts !3147 See merge request !3276
\| * \| \| \| \| \| \| \| \|	Revert link color from blueblue-links-fix	Alfredo Sumaran	2016-03-17	1	-4/+0
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'hide-builds-feature' into 'master'	Robert Speicher	2016-03-17	4	-63/+76
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide builds from Project's settings when the feature is disabled Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/13944 See merge request !3220
\| * \| \| \| \| \| \| \| \|	Hide builds from Project's settings when the feature is disabledhide-builds-feature	Kamil Trzcinski	2016-03-15	4	-63/+76
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'caching-project-avatars' into 'master'	Robert Speicher	2016-03-17	5	-13/+120
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache project avatars stored in Git Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/14363 See merge request !3272
\| * \| \| \| \| \| \| \| \| \|	Cache project avatars stored in Git	Yorick Peterse	2016-03-17	5	-13/+120
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The avatar logic has been moved from Project to Repository as this makes caching easier. The logic itself in turn has been changed so that the logo file names are cached in Redis. This cache is flushed upon pushing a commit but _only_ if: 1. The commit was pushed to the default branch 2. The commit actually changes any of the logo files If no branch or commit is given the cache is flushed anyway, this ensures that calling Repository#expire_cache without any arguments still flushes the avatar cache (e.g. this is used when removing a project). Fixes gitlab-org/gitlab-ce#14363
* \| \| \| \| \| \| \| \| \|	Merge branch 'artem-forks/gitlab-ce-nginx-rel-url'	Jacob Vosmaer	2016-03-17	10	-58/+227
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Lets have CSS and logo inline	Artem Sidorenko	2016-03-11	8	-56/+208
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This would work independenty from location and configuration https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/662#note_3973448
\| * \| \| \| \| \| \| \| \|	Do not serve anything via nginx as we have workhorse	Artem Sidorenko	2016-03-11	2	-2/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise this might 'hide' problems https://github.com/gitlabhq/gitlabhq/issues/10053#issuecomment-188919319
\| \| \| \| \| * \| \| \| \|	Bump Git version requirement to 2.7.4	Douwe Maan	2016-03-17	3	-6/+9
\| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'dropdown-preselect-value' into 'master'	Robert Speicher	2016-03-17	2	-4/+21
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pre-selects values on issue and merge request dropdown Closes #14290 See merge request !3233
\| * \| \| \| \| \| \| \|	Moved code to single line if	Phil Hughes	2016-03-17	1	-4/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Removed label/milestone helper methodsdropdown-preselect-value	Phil Hughes	2016-03-16	2	-20/+10
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixed failing tests	Phil Hughes	2016-03-16	1	-1/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Pre-selects values on issue and merge request dropdown	Phil Hughes	2016-03-16	2	-4/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #14290
* \| \| \| \| \| \| \| \|	Merge branch 'glalonde-triggerbuild' into 'master'	Kamil Trzciński	2016-03-17	3	-1/+25
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjusted behavior so canceled builds tagged as allowed to fail do not fail build ## What does this MR do? This diff changes the 'Allowed to fail' flag to also ignore canceled builds, whereas before, canceled builds could fail the suite even if they were marked as 'Allowed to fail' dupe of !3258 to force a build ## Are there points in the code the reviewer needs to double check? no ## Why was this MR needed? Unexpected behavior as a user ## What are the relevant issue numbers? ## Screenshots (if relevant) ![whatisgoingon](/uploads/fcd7c8f3d8454bc730d7fd41eff59b31/whatisgoingon.png) See merge request !3271
\| * \| \| \| \| \| \| \|	added changelog entry	Geoffrey Lalonde	2016-03-17	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	adjusted behavior so canceled builds tagged as allowed to fail do not fail build	Geoffrey Lalonde	2016-03-17	2	-1/+24
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'rm_duplicate_cache_ci_docs' into 'master'	Achilleas Pipinellis	2016-03-17	1	-62/+48
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge duplicate cache entry in CI docs See merge request !3208
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into rm_duplicate_cache_ci_docs	Achilleas Pipinellis	2016-03-17	212	-4709/+2860
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge duplicate cache entry in CI docsrm_duplicate_cache_ci_docs	Achilleas Pipinellis	2016-03-14	1	-60/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \|	Merge branch 'patch/refactor-post-receive' into 'master'	Douwe Maan	2016-03-17	2	-27/+79
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PostReceive refactor Back-ported PostReceive refactor made for https://gitlab.com/gitlab-org/gitlab-ee/issues/367 in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/267 See merge request !3264