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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed random failures with Poll specpoll-test-fix	Phil Hughes	2017-04-12	1	-36/+57
\| \| \| \| \| \| \| \| \| \| \|	Correctly waits for requests to finish before testing anything. Previously it was waiting for a set amount of time which could possibly cause failures dependant on how quickly these execute Stops any polling requests once done so that the error callback doesn't get called with a 404 Closes #30824
*	Merge branch 'zj-api-fix-build-events' into 'master'	Rémy Coutable	2017-04-12	4	-9/+24
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Api fix build events rename to Job events Closes #30412 See merge request !10586
\| *	Fix API not accepting job_events for webhookszj-api-fix-build-events	Z.J. van de Weg	2017-04-12	4	-9/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When renaming, the argument on the projects hook API was forgotten. Now one could successfully set it again. The fix is a little ugly stylewise, but needed as the underlying model still refers to it as build_events. This commit is to fix it, later we should migrate the data to a new column. The edit on the spec file makes sure it passes now, and will fail when we migrate the column.
* \|	Merge branch 'grpc-1.2.2' into 'master'	Sean McGivern	2017-04-12	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use gRPC 1.2.2 Closes #30766 See merge request !10589
\| * \|	Use gRPC 1.2.2	Jacob Vosmaer	2017-04-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes LoadError after local compilation. https://github.com/grpc/grpc/issues/9998
* \| \|	Merge branch 'siemens/gitlab-ce-fix/subgroup-hide-button' into 'master'	Rémy Coutable	2017-04-12	4	-2/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide new subgroup button if user has no permission to create one Closes #30139 See merge request !10627
\| * \| \|	Update changelog with MR idsiemens/gitlab-ce-fix/subgroup-hide-button	Dmitriy Zaporozhets	2017-04-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Move permission to create subgroup into GroupPolicy	Dmitriy Zaporozhets	2017-04-11	6	-28/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	fix(subgroups): add verification of group creation capability to subgroup UI	Fabio Huser	2017-03-30	3	-1/+27
\| \| \| \|
* \| \| \|	Merge branch 'gitaly-testing' into 'master'	Rémy Coutable	2017-04-12	12	-143/+197
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Setup and run a Gitaly server for testing if GitalyClient is enabled See merge request !10298
\| * \| \| \|	Setup and run a Gitaly server for testing if GitalyClient is enabledgitaly-testing	Alejandro Rodríguez	2017-04-11	12	-143/+197
\| \| \| \| \|
* \| \| \| \|	Merge branch '30457-expire-note-destroy' into 'master'	Sean McGivern	2017-04-12	3	-1/+16
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix issue's note cache expiration after delete Closes #30457 See merge request !10461
\| * \| \| \|	Fix issue's note cache expiration after delete	mhasbini	2017-04-11	3	-1/+16
\| \| \| \| \|
* \| \| \| \|	Merge branch 'bb_save_trace' into 'master'	Sean McGivern	2017-04-12	3	-6/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[BB Importer] Save the error trace and the whole raw document See merge request !9604
\| * \| \| \| \|	[BB Importer] Save the error trace and the whole raw documentbb_save_trace	Valery Sizov	2017-04-11	3	-6/+9
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'docs-topic-auth' into 'master'	Marcia Ramos	2017-04-12	2	-1/+47
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation topic: Authentication Closes #30744 See merge request !10608
\| * \ \ \ \ \	fix conflictdocs-topic-auth	Marcia Ramos	2017-04-11	59	-215/+829
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	typo	Marcia Ramos	2017-04-10	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix typo	Marcia Ramos	2017-04-10	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix links	Marcia Ramos	2017-04-10	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	add topic: authentication	Marcia Ramos	2017-04-10	2	-2/+48
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'dm-outdated-diff-link' into 'master'	Sean McGivern	2017-04-11	25	-82/+226
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link to outdated diff in older MR version from outdated diff discussion Closes #27865 See merge request !10572
\| * \| \| \| \| \| \| \|	Statisfy Robertcop and Seancopdm-outdated-diff-link	Douwe Maan	2017-04-11	2	-10/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add specs	Douwe Maan	2017-04-10	5	-2/+98
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix specs	Douwe Maan	2017-04-09	3	-5/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Some code tweaks	Douwe Maan	2017-04-08	8	-18/+21
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix views after rebase	Douwe Maan	2017-04-08	2	-3/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix find_by_diff_refs	Douwe Maan	2017-04-08	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix specs and make tweaks	Douwe Maan	2017-04-08	7	-39/+50
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Change discussion headline to 'a now outdated portion of the diff'	Douwe Maan	2017-04-08	1	-4/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add link to diff header too	Douwe Maan	2017-04-08	2	-14/+16
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Cache MR diffs by diff refs	Douwe Maan	2017-04-08	2	-1/+11
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Link to outdated diff in older MR version from outdated diff discussion	Douwe Maan	2017-04-08	15	-39/+63
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '28017-separate-ce-params-on-api' into 'master'	Douwe Maan	2017-04-11	8	-30/+122
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "API: Separate CE params to avoid wrong conflict resolutions" Closes #28017 See merge request !10484
\| * \| \| \| \| \| \| \| \|	Add share_with_group_lock to CE optional params block28017-separate-ce-params-on-api	Oswaldo Ferreira	2017-04-10	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Separate CE params on Grape API	Oswaldo Ferreira	2017-04-10	8	-30/+121
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'removed-notebooklab-absolute-paths' into 'master'	Jacob Schatz	2017-04-11	1	-215/+32
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed notebooklab code including file paths See merge request !10629
\| * \| \| \| \| \| \| \| \| \|	Fixed notebooklab code including file pathsremoved-notebooklab-absolute-paths	Phil Hughes	2017-04-11	1	-215/+32
\| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'update-doc-installation-and-upgrade' into 'master'	Robert Speicher	2017-04-11	2	-7/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update installation and upgrading guides [ci skip] See merge request !10621
\| * \| \| \| \| \| \| \| \| \|	Update documents according to:update-doc-installation-and-upgrade	Lin Jen-Shin	2017-04-11	2	-7/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#step-1-update-the-installation-from-source-guide In step 1 and step 2
* \| \| \| \| \| \| \| \| \| \|	Merge branch '30636-fix-blame-edit-blob-without-repo-permissions' into 'master'	Annabel Dunstone Gray	2017-04-11	2	-7/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix "Edit" button on blame page without repo permissions Closes #30636 See merge request !10598
\| * \| \| \| \| \| \| \| \| \| \|	Fix edit button on blame page without repo perms30636-fix-blame-edit-blob-without-repo-permissions	Eric Eastwood	2017-04-10	2	-7/+7
\| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Without repo permissions, pressing the "Edit" button on the blame page will now prompt to Fork/Cancel. Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30636
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'update-licenses.csv' into 'master'	Robert Speicher	2017-04-11	1	-146/+322
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update licenses.csv [ci skip] See merge request !10620
\| * \| \| \| \| \| \| \| \| \|	Update licenses.csv via:update-licenses.csv	Lin Jen-Shin	2017-04-11	1	-146/+322
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	license_finder report --format=csv --save=vendor/licenses.csv
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'gitlab-update_templates' into 'master'	Robert Speicher	2017-04-11	14	-70/+68
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update templates See merge request !10619
\| * \| \| \| \| \| \| \| \| \| \|	Update templates via:gitlab-update_templates	Lin Jen-Shin	2017-04-11	14	-70/+68
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rake gitlab:update_templates
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'new-git-index' into 'master'	Marcia Ramos	2017-04-11	2	-4/+64
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New git index See merge request !10349
\| * \| \| \| \| \| \| \| \| \|	Axil's reviewnew-git-index	Marcia Ramos	2017-04-11	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	remove unnecessary line	Marcia Ramos	2017-04-11	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into new-git-index	Marcia Ramos	2017-04-11	1402	-10462/+80811
\| \|\ \ \ \ \ \ \ \ \ \