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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix spacing below edit note formedit-form-alignment	Phil Hughes	2016-03-18	4	-8/+16
\| \| \| \|	Also changed to allow the CSS to decide what should be hidden when editting
*	Merge branch 'fix-mr-close-button' into 'master'	Jacob Schatz	2016-03-18	2	-2/+10
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fixes issue with close button not working on MR Closes #14383 See merge request !3295
\| *	Added test	Phil Hughes	2016-03-18	1	-0/+8
\| \|
\| *	Fixes issue with close button not working on MRfix-mr-close-button	Phil Hughes	2016-03-18	1	-2/+2
\| \| \| \| \| \| \| \|	Closes #14383
* \|	Merge branch 'improved-issue-sidebar' into 'master'	Jacob Schatz	2016-03-18	5	-89/+145
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improved issue sidebar Updated the spacing throughout the sidebar so that it fits better on smaller screens. Also adds a more participants button to show any other participants after the first row. Closes #13353 See merge request !3097
\| * \|	Removed global JS varimproved-issue-sidebar	Phil Hughes	2016-03-18	2	-6/+7
\| \| \|
\| * \|	Reused some variables	Phil Hughes	2016-03-18	2	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \|	Set global JS variable to sync view up
\| * \|	Links to user on collapsed issue sidebar	Phil Hughes	2016-03-18	2	-1/+5
\| \| \|
\| * \|	Fixed issue when user doesnt exist	Phil Hughes	2016-03-18	2	-11/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Fixed button hover color
\| * \|	Fixed tooltip issue for participants	Phil Hughes	2016-03-18	1	-1/+1
\| \| \|
\| * \|	Improved issue sidebar	Phil Hughes	2016-03-18	5	-88/+145
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Updated the spacing throughout the sidebar so that it fits better on smaller screens Added more participants button Closes #13353
* \|	Merge branch 'docs_select_version_to_install' into 'master'	Achilleas Pipinellis	2016-03-18	4	-0/+36
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add note in upgrade guide to choose the correct version tag Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3448 @rspeicher I'm assigning to you since as a release manager you should know better. Let's keep it in this guide for now and then start copying it in the future ones. See merge request !2284
\| * \|	Add note in rest of update guides	Achilleas Pipinellis	2016-03-18	3	-0/+27
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Merge branch 'master' into docs_select_version_to_install	Achilleas Pipinellis	2016-03-18	1704	-17227/+72648
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Merge branch 'fix-mr-source-sha' into 'master'	Douwe Maan	2016-03-18	4	-1/+36
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix MergeRequest#source_sha when there is no diff Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14170 ### Overview This MR fixes an unhandled Exception when visiting the page of an open Merge Request without diff. ### Description `MergeRequest#source_sha` is expected to return the sha of the source branch last commit. But when an open Merge Request has no diff (e.g. all commits have already been merged to the target branch), `merge_request.source_sha` incorrectly returns `nil`. This was without consequences before – but since !2217 was merged (a few days ago), it makes `Gitlab::Git::Commit.between` raise an "Unexpected nil argument" exception. This can be reproduced when visiting the http://localhost:3000/gitlab-org/gitlab-test/merge_requests/2 page on a fresh local Gitlab setup. This MR fixes the crash, by making sure that `source_sha` returns a correct result even when there is no diff available. I also added tests. @DouweM I believe you wrote most of this code in the first place ; does this looks correct to you, or is there a better way to resolve this issue maybe? See merge request !3135
\| * \| \|	Fix MergeRequest#source_sha when there is no diff	Pierre de La Morinerie	2016-03-16	4	-1/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`MergeRequest#source_sha` is expected to return the sha of the source branch last commit. But when a open Merge Request has no diff (e.g. all commits have already been merged to the target branch), `merge_request.source_sha` incorrectly returns `nil`. This was un-noticed before – but now that !2217 has been merged, it makes `Gitlab::Git::Commit.between` raise an "Unexpected nil argument" exception. This fixes the crash, by making sure that `source_sha` returns a correct result even when there is no diff available.
\| * \| \|	Add tests for MergeRequest#source_sha	Pierre de La Morinerie	2016-03-16	1	-0/+18
\| \| \| \|
* \| \| \|	Merge branch 'issue-fade-load' into 'master'	Jacob Schatz	2016-03-18	6	-64/+113
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changing filter dropdowns shows loading Instead of doing a full refresh of the page - i've modified the filterResults method on the Issues object to work for this form as well ![issues](/uploads/3335f09f7df88b6d419de7fd3d6857d2/issues.gif) Closes #14359 See merge request !3237
\| * \| \| \|	Another CS style fixissue-fade-load	Phil Hughes	2016-03-18	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Fixed some CS styling issues	Phil Hughes	2016-03-18	4	-74/+85
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed bug where wouldn't work on MR index
\| * \| \| \|	Fixed issue with dashboard issues not reloading	Phil Hughes	2016-03-18	4	-6/+17
\| \| \| \| \|
\| * \| \| \|	Changing filter dropdowns shows loading	Phil Hughes	2016-03-18	5	-15/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of doing a full refresh of the page - i've modified the filterResults method on the Issues object to work for this form as well
* \| \| \| \|	Merge branch 'confidential-issues' into 'master'	Douwe Maan	2016-03-18	53	-74/+867
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add confidential issues Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3678 More information: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/227 See merge request !3282
\| * \| \| \| \|	Update CHANGELOGconfidential-issues	Douglas Barbosa Alexandre	2016-03-17	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Restrict access to confidential issues on activity feed	Douglas Barbosa Alexandre	2016-03-17	5	-5/+43
\| \| \| \| \| \|
\| * \| \| \| \|	Add eye-slash icon to confidential issues	Douglas Barbosa Alexandre	2016-03-17	5	-0/+9
\| \| \| \| \| \|
\| * \| \| \| \|	Restrict access for confidential issues on milestone view	Douglas Barbosa Alexandre	2016-03-17	10	-32/+140
\| \| \| \| \| \|
\| * \| \| \| \|	Fix issues count on project view	Douglas Barbosa Alexandre	2016-03-17	2	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Restrict access to confidential issues on search results	Douglas Barbosa Alexandre	2016-03-17	6	-9/+166
\| \| \| \| \| \|
\| * \| \| \| \|	Restrict access to confidential issues through API	Douglas Barbosa Alexandre	2016-03-17	2	-3/+112
\| \| \| \| \| \|
\| * \| \| \| \|	Restrict access for confidential issues on autocomplete	Douglas Barbosa Alexandre	2016-03-17	3	-6/+81
\| \| \| \| \| \|
\| * \| \| \| \|	Restrict access to references for confidential issues	Douglas Barbosa Alexandre	2016-03-17	10	-5/+102
\| \| \| \| \| \|
\| * \| \| \| \|	Restrict access to confidential issues	Douglas Barbosa Alexandre	2016-03-17	6	-10/+192
\| \| \| \| \| \|
\| * \| \| \| \|	Add an option to user make an issue confidential	Douglas Barbosa Alexandre	2016-03-17	2	-1/+10
\| \| \| \| \| \|
\| * \| \| \| \|	Add a confidential flag to issues	Douglas Barbosa Alexandre	2016-03-17	2	-1/+9
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'hide-large-diffs' into 'master'	Jacob Vosmaer	2016-03-18	5	-13/+35
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show a notice for diffs that are empty/too large This builds upon https://gitlab.com/gitlab-org/gitlab_git/merge_requests/72 but will fail until said MR has been merged. Fixes gitlab-org/gitlab-ce#13912, gitlab-org/gitlab-ce#13644, gitlab-org/gitlab-ce#13557, gitlab-org/gitlab-ce#13267, gitlab-org/gitlab-ce#3906 See merge request !3185
\| * \| \| \| \| \|	Show a notice for diffs that are too largehide-large-diffs	Yorick Peterse	2016-03-18	5	-13/+35
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This builds on the changes introduced in https://gitlab.com/gitlab-org/gitlab_git/merge_requests/72 and results in merge requests with large diffs (e.g. due to them containing minified CSS) loading much faster.
* \| \| \| \| \|	Fix CHANGELOG by moving 8.5.5 items to 8.6	Rémy Coutable	2016-03-18	1	-2/+2
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'improve-diff-ui' into 'master'	Jacob Schatz	2016-03-18	1	-1/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add space to separate different files in diff I propose to add some visual separation between files in diff. Originally this separation was removed in 8.0 because of different UI layout. Now when we have white layout back I think it will be better to add some space between files. - - - Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3275
\| * \| \| \| \|	Add space to separate different files in diffimprove-diff-ui	Dmitriy Zaporozhets	2016-03-17	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'project-cache-worker-without-diverging' into 'master'	Jacob Vosmaer	2016-03-18	2	-18/+30
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed diverging commit count calculation from Repository#build_cache Using a repository with 1000 branches the old `Repository#build_cache` method would take around 180 seconds to complete. Without calculating the diverging commit counts this method "only" takes around 60 seconds. See commit 28cc2413eb5ddf920ce0b5eed803121f8b884754 for more details. This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14058 cc @rspeicher See merge request !3274
\| * \| \| \| \| \|	Added tests for Repository#build_cacheproject-cache-worker-without-diverging	Yorick Peterse	2016-03-17	1	-0/+30
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Don't rebuild diverging commit count caches	Yorick Peterse	2016-03-17	1	-6/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When calling Repository#build_cache we _don't_ want to build the diverging commit count cache as doing so can be _very_ slow for repositories with lots of branches. Because these caches are built whenever needed (= when actually viewing the list of branches in the web UI) we can safely remove this code from Repository#build_cache.
\| * \| \| \| \| \|	Removed Repository#rebuild_cache	Yorick Peterse	2016-03-17	1	-12/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This method is not used or tested anywhere.
* \| \| \| \| \| \|	Merge branch 'optimistic-todos' into 'master'	Jacob Schatz	2016-03-18	7	-9/+90
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds small AJAX optimistic functionality to todos. Fixes #13656 <br/> A good first step and boring solution. <br/> Will make ajax call to remove each issue. <br/> If issue is last in group of issues will refresh page. <br/> If issues remain in group will remove row with JS. <br/> Adds loading spinner to button and disables. <br/> ![todos-optimistic](/uploads/c6aec4a688e5125d4df55a2a3a55d4d7/todos-optimistic.gif) <br/> cc @dzaporozhets @JobV @dbalexandre See merge request !2946
\| * \| \| \| \| \| \|	Fixed failing testsoptimistic-todos	Phil Hughes	2016-03-17	1	-1/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Mark all as done through AJAX	Phil Hughes	2016-03-17	4	-8/+35
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Removed the flash success message	Phil Hughes	2016-03-17	5	-41/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes the group if empty
\| * \| \| \| \| \| \|	Remove `Flash` from todos when finished	Jacob Schatz	2016-03-17	1	-1/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Adds small AJAX optimistic functionality to todos.	Jacob Schatz	2016-03-17	6	-5/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #13656 A good first step and boring solution.