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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Only enforce the first line because that's wherefix-trace-seeking	Lin Jen-Shin	2017-04-13	1	-17/+24
\| \| \| \|	the data could be corrupted.
*	Seek at most with BUFFER_SIZE, replace broken bytes	Lin Jen-Shin	2017-04-13	3	-3/+15
\| \| \| \|	with ? for Ansi2html
*	Seek for previous line in case it would never show	Lin Jen-Shin	2017-04-13	2	-13/+32
\| \| \| \| \| \| \| \|	the first line, which is bad. This also means that it would read more than LIMIT_SIZE, but that might be ok because it's merely more than one line. Well, if someone has a long line, that would be another story.
*	Add changelog entry	Lin Jen-Shin	2017-04-13	1	-0/+4
\|
*	After Trace#limit, we seek to the next line in case	Lin Jen-Shin	2017-04-13	4	-3/+32
\| \| \| \|	of breaking ANSI sequence or Unicode
*	Merge branch 'poll-test-fix' into 'master'	Filipa Lacerda	2017-04-12	1	-36/+57
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fixed random failures with Poll spec Closes #30824 See merge request !10654
\| *	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 'fix_spaces_in_label_title' into 'master'	Sean McGivern	2017-04-12	3	-0/+26
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove heading and trailing spaces from label's color and title See merge request !10603
\| * \|	Remove heading and trailing spaces from label's color and title	blackst0ne	2017-04-12	3	-0/+26
\| \| \|
* \| \|	Merge branch 'contributing-ci-templates' into 'master'	Rémy Coutable	2017-04-12	2	-1/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include CONTRIBUTING.md file when importing .gitlab-ci.yml templates See merge request !10653
\| * \| \|	Include CONTRIBUTING.md file when importing .gitlab-ci.yml templatescontributing-ci-templates	Adam Niedzielski	2017-04-12	2	-1/+6
\| \| \| \|
* \| \| \|	Merge branch 'improve-testing-documentation' into 'master'	Robert Speicher	2017-04-12	2	-99/+375
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve the testing documentation Closes #29499 and #29623 See merge request !10161
\| * \| \| \|	Improve the testing documentationimprove-testing-documentation	Rémy Coutable	2017-04-12	1	-23/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Fix link again	Rémy Coutable	2017-04-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Fix path to migrations	Rémy Coutable	2017-04-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Fix wrong link	Rémy Coutable	2017-04-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Re-organize testing doc, and add RSpec structure doc	Rémy Coutable	2017-04-10	2	-89/+165
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Document GitLab QA	Rémy Coutable	2017-04-10	1	-3/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Improve testing documentation with Robert's feedback	Rémy Coutable	2017-04-10	2	-37/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Firs pass at improving the testing documentation	Rémy Coutable	2017-04-10	2	-31/+194
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'user-activity-scroll-bar' into 'master'	Annabel Dunstone Gray	2017-04-12	2	-1/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set user contribution calendar `overflow-x: scroll` more precisely Closes #30738 See merge request !10636
\| * \| \| \| \|	Let browser set overflow-x scroll on user activity calendar.user-activity-scroll-bar	Bryce Johnson	2017-04-11	2	-1/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '29056-backport-ee-cleanup-database-file' into 'master'	Douwe Maan	2017-04-12	17	-20/+75
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	removes redundant code from database.rb Closes #29056 See merge request !10583
\| * \| \| \| \| \|	removes redundant code from database.rb29056-backport-ee-cleanup-database-file	Tiago Botelho	2017-04-11	17	-20/+75
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'improve-discussions-feature-attempt-1' into 'master'	Douwe Maan	2017-04-12	5	-94/+78
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve discussion_comments_spec perf See merge request !10648
\| * \| \| \| \| \| \|	Separate examples for each otherimprove-discussions-feature-attempt-1	Luke "Jared" Bennett	2017-04-12	5	-64/+66
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Collapse similar sibling scenarios	Luke "Jared" Bennett	2017-04-12	1	-41/+12
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use empty_project for resources that are independent of the repo	Luke "Jared" Bennett	2017-04-12	1	-7/+18
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'patch-8' into 'master'	Rémy Coutable	2017-04-12	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix grammar See merge request !10639
\| * \| \| \| \| \| \| \|	Fix grammar	Ismail S	2017-04-11	1	-2/+2
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '27755-update-pipelines-documentation' into 'master' 30843-move-about-gitlab-com-installation-instructions-to-documentation	Sean Packham (GitLab)	2017-04-12	1	-0/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Update Pipelines documentation" Closes #27755 See merge request !10600
\| * \| \| \| \| \| \| \|	Replace pipelines image in docs27755-update-pipelines-documentation	Achilleas Pipinellis	2017-04-10	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	Merge branch 'zj-fix-coverage-bug' into 'master'	Kamil Trzciński	2017-04-12	4	-10/+24
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return nil as coverage instead of a File object See merge request !10633
\| * \| \| \| \| \| \| \| \|	Return nil as coverage instead of a File objectzj-fix-coverage-bug	Z.J. van de Weg	2017-04-12	4	-10/+24
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Given a valid pipeline job, and a regex which wouldn't match to a jobs trace, the stream of the trace would return the File object. This was not the case when it matched a value, as that would have been return from the block. Now the `extract_coverage` method returns `nil` if no match was found.
* \| \| \| \| \| \| \| \|	Merge branch 'zj-improve-template' into 'master'	Sean McGivern	2017-04-12	1	-0/+8
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Let uses hide verbose output by default See merge request !10650
\| * \| \| \| \| \| \| \| \|	Let uses hide verbose output by default	Z.J. van de Weg	2017-04-12	1	-0/+8
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	Merge branch 'fix/gb/qa/fix-outdated-admin-area-link-title' into 'master'	Rémy Coutable	2017-04-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix outdated 'Admin area' link label in GitLab QA Closes gitlab-qa#41 See merge request !10646
\| * \| \| \| \| \| \| \|	Fix outdated 'Admin area' link label in GitLab QA	Grzegorz Bizon	2017-04-12	1	-1/+1
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \|