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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '30349-create-users-build-service' into 'master'	Rémy Coutable	2017-04-14	2	-66/+67
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Implement Users::BuildService Closes #30349 See merge request !10675
\| *	Refactor build_service_spec	George Andrinopoulos	2017-04-13	1	-4/+2
\| \|
\| *	Implement Users::BuildService	geoandri	2017-04-13	2	-66/+69
\| \|
* \|	Merge branch 'branch-versions' into 'master'	Rémy Coutable	2017-04-14	3	-52/+45
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expand components version specification format to allow branches Closes gitaly#183 See merge request !10610
\| * \|	Expand components version specification format to allow branchesbranch-versions	Alejandro Rodríguez	2017-04-13	3	-52/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently we specify versions for Gitlab-Shell, Workhorse and Gitaly using version strings, to which we prepend 'v' and assume are tags. These changes allow branches or tags with other name formats to be specified by prepending '=' to the version string (á la govendor). We also simplify the process to reset to the given version (now a branch or tag): Right now there's a check to supposedly try to avoid fetching from the remote the version if it already exist locally. But the previous logic already clones if the directory doesn't exist or fetches if it does, so this check is pointless. We can safely assume the version exists once we get to the reset stage.
* \| \|	Merge branch 'sh-improve-logging-for-bad-creations' into 'master'	Robert Speicher	2017-04-14	1	-0/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve error messages when a record is unable to be created for a project See merge request !10696
\| * \| \|	Improve error messages when a record is unable to be created for a project	Stan Hu	2017-04-13	1	-0/+14
\| \| \| \|
* \| \| \|	Merge branch '30907-allow-to-enable-rspec-profile-for-a-given-branch' into ↵	Robert Speicher	2017-04-13	1	-2/+8
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Allow to enable `rspec_profiling` for a branch on the CI Closes #30907 See merge request !10680
\| * \| \|	Allow to enable `rspec_profiling` for a branch on the CI30907-allow-to-enable-rspec-profile-for-a-given-branch	Rémy Coutable	2017-04-13	1	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`rspec_profiling` will be enabled if the branch name includes `rspec-profile`. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'fix-appending-state-to-issuable-references' into 'master'	Robert Speicher	2017-04-13	1	-11/+32
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix appending state to issuable references Closes #30874 See merge request !10683
\| * \| \| \|	Fix appending state to issuable referencesfix-appending-state-to-issuable-references	Adam Niedzielski	2017-04-13	1	-11/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #30874. Ignore nodes with no children. Append directly to the node instead of the last child of the node to avoid inheriting formatting from the last child
* \| \| \| \|	Merge branch 'fix-trace-seeking-readline' into 'master'	Kamil Trzciński	2017-04-13	3	-6/+34
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	After Trace#limit, we seek to the next line in case Closes #30796 See merge request !10681
\| * \| \| \| \|	Update tests for the fact that we would skip one linefix-trace-seeking-readline	Lin Jen-Shin	2017-04-13	1	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	After Trace#limit, we seek to the next line in case	Lin Jen-Shin	2017-04-13	3	-3/+31
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	of breaking ANSI sequence or Unicode
* \| \| \| \|	Merge branch 'fix/gb/fix-registry-for-uppercased-project-paths' into 'master'	Kamil Trzciński	2017-04-13	2	-5/+31
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix registry for projects with uppercases in path Closes #30880 See merge request !10674
\| * \| \| \| \|	Sanitize container repository path in model classfix/gb/fix-registry-for-uppercased-project-paths	Grzegorz Bizon	2017-04-13	1	-2/+12
\| \| \| \| \| \|
\| * \| \| \| \|	Fix registry for projects with uppercases in path	Grzegorz Bizon	2017-04-13	1	-3/+19
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch '30622-resolve-note-loading-icon-gone' into 'master'	Filipa Lacerda	2017-04-13	1	-0/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Resolve note loading icon gone" Closes #30622 See merge request !10628
\| * \| \| \| \|	Fix resolve spinner and add test	Luke "Jared" Bennett	2017-04-11	1	-0/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '30188-handle-remove-branch-failure' into 'master'	Filipa Lacerda	2017-04-13	2	-0/+51
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix js error in MR remove branch failure handler Closes #30188 See merge request !10304
\| * \| \| \| \|	tests for success and failure of deleting branch from MR page30188-handle-remove-branch-failure	Simon Knox	2017-04-13	2	-0/+51
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'remove-iife-cycle-analytics-bundle' into 'master' 26510-should-project-updated-time-actually-be-the-last-activity-time	Filipa Lacerda	2017-04-13	1	-75/+73
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove IIFEs from files in cycle_analytics_bundle.js See merge request !10613
\| * \| \| \| \|	Remove IIFEs from files in cycle_analytics_bundle.jsremove-iife-cycle-analytics-bundle	Alfredo Sumaran	2017-04-10	1	-75/+73
\| \| \| \| \| \|
* \| \| \| \| \|	Revert "Fix registry for projects with uppercases in path"	Grzegorz Bizon	2017-04-13	1	-19/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 22726942fe0b6c11c20de070cc9784de12ca2ce6.
* \| \| \| \| \|	Fix registry for projects with uppercases in path	Grzegorz Bizon	2017-04-13	1	-3/+19
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	Merge branch 'zero-downtime-migrations' into 'master'	Douwe Maan	2017-04-12	3	-0/+467
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prepare for zero downtime migrations See merge request !9976
\| * \| \| \|	Prepare for zero downtime migrationszero-downtime-migrations	Yorick Peterse	2017-04-12	3	-0/+467
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Starting with GitLab 9.1.0 we will no longer allow downtime migrations unless absolutely necessary. This commit updates the various developer guides and adds code that is necessary to make zero downtime migrations less painful.
* \| \| \| \|	Reset New branch button when issue state changes	💃 Winnie 💃	2017-04-12	1	-85/+109
\| \| \| \| \|
* \| \| \| \|	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	1	-0/+16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+16
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '29056-backport-ee-cleanup-database-file' into 'master'	Douwe Maan	2017-04-12	2	-4/+48
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-4/+48
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	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 'zj-fix-coverage-bug' into 'master'	Kamil Trzciński	2017-04-12	2	-7/+19
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-7/+19
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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-api-fix-build-events' into 'master'	Rémy Coutable	2017-04-12	1	-4/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-4/+9
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'siemens/gitlab-ce-fix/subgroup-hide-button' into 'master'	Rémy Coutable	2017-04-12	1	-1/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide new subgroup button if user has no permission to create one Closes #30139 See merge request !10627
\| * \| \| \| \|	Move permission to create subgroup into GroupPolicy	Dmitriy Zaporozhets	2017-04-11	2	-23/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+22
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'gitaly-testing' into 'master'	Rémy Coutable	2017-04-12	7	-93/+138
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	7	-93/+138
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '30457-expire-note-destroy' into 'master'	Sean McGivern	2017-04-12	1	-1/+11
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dm-outdated-diff-link' into 'master'	Sean McGivern	2017-04-11	4	-3/+87
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link to outdated diff in older MR version from outdated diff discussion Closes #27865 See merge request !10572