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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'expose-commits-mr-api' into 'master'	Rémy Coutable	2018-03-28	1	-0/+14
\|\ \| \| \| \| \| \| \| \|	Allow merge requests related to a commit to be found via API See merge request gitlab-org/gitlab-ce!18004
\| *	Allow merge requests related to a commit to be found via API	Mark Fletcher	2018-03-26	1	-0/+14
\| \| \| \| \| \| \| \| \| \|	- Original work for the web interface here: - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13713
* \|	Merge branch '44649-reference-parsing-conflicting-with-auto-linking' into ↵	Douwe Maan	2018-03-28	1	-2/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Reference parsing conflicting with auto-linking" Closes #44649 See merge request gitlab-org/gitlab-ce!18045
\| * \|	Fix auto-linking with escaped HTML entities	Sean McGivern	2018-03-28	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We displayed the correct text as the link text (without double-encoding), but didn't do the same for the actual link target, so any link containing an ampersand would break when auto-linked.
* \| \|	Merge branch 'fix-workhorse-test' into 'master'	Sean McGivern	2018-03-28	1	-4/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make all workhorse gitaly calls opt-out, take 2 See merge request gitlab-org/gitlab-ce!18043
\| * \| \|	Make all workhorse gitaly calls opt-out, take 2	Jacob Vosmaer	2018-03-28	1	-4/+4
\| \|/ /
* \| \|	Merge branch 'zj-remote-repo-exists' into 'master'	Sean McGivern	2018-03-28	3	-2/+21
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test if remote repository exists before cloning Closes #43929 and gitaly#1084 See merge request gitlab-org/gitlab-ce!18017
\| * \| \|	Test if remote repository exists before cloning	Zeger-Jan van de Weg	2018-03-27	3	-2/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a repository does not exist on a remote, Gitaly won't be able to clone it. This is correct behaviour, but from the clients perspective a change in behaviour. This change implements the client side changes that allows Gitaly to execute a `git ls-remote <remote-url> HEAD`. This way the client has no need to shell out to Git. In the situation where multiple Gitalies are available, one is chosen at random. This commit closes https://gitlab.com/gitlab-org/gitlab-ce/issues/43929, while its also a part of https://gitlab.com/gitlab-org/gitaly/issues/1084
* \| \| \|	Add the RedirectRoute#path index setup_postgresql	Bob Van Landuyt	2018-03-28	1	-0/+2
\| \| \| \|
* \| \| \|	New migration helper for finding custom indexes	Bob Van Landuyt	2018-03-28	1	-4/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will use the same query as `\di` to find an index on postgresql.
* \| \| \|	Don't run ReworkRedirectRoutesIndexes during setup	Bob Van Landuyt	2018-03-28	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since the `permanent` column is not there anymore, we don't need to create these indexes.
* \| \| \|	Remove permanent redirects	Bob Van Landuyt	2018-03-28	2	-25/+5
\| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Removes permanent redirects, this means that redirects will only be possible as long as the old route isn't taken by a new project/group.
* \| \|	Revert "Merge branch 'workhorse-gitaly-mandatory' into 'master'"	Sean McGivern	2018-03-28	1	-4/+4
\| \| \| \| \| \| \| \| \|	This reverts merge request !18002
* \| \|	Remove some easy cases of 'path_to_repo' use	Jacob Vosmaer (GitLab)	2018-03-28	2	-3/+1
\| \| \|
* \| \|	Merge branch 'dm-refs-contains-sha-encoding' into 'master'	Sean McGivern	2018-03-28	1	-1/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix listing commit branch/tags that contain special characters Closes #43212 See merge request gitlab-org/gitlab-ce!18023
\| * \| \|	Fix listing commit branch/tags that contain special charactersdm-refs-contains-sha-encoding	Douwe Maan	2018-03-27	1	-1/+2
\| \| \| \|
* \| \| \|	Merge branch '43603-ci-lint-support' into 'master'	Kamil Trzciński	2018-03-28	2	-5/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "/ci/lint should support include keyword in config file" Closes #43603 See merge request gitlab-org/gitlab-ce!17729
\| * \| \| \|	Changes ci/lints controller to use authorize before action	Mayra Cabrera	2018-03-26	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also includes a comment on Ci::Config regarding that's going to be override by EE
\| * \| \| \|	Make ci/lint page context aware:	Mayra Cabrera	2018-03-26	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Create ci/lints controller inside project/ - Move js pages to be inside projects/ - Copy view ci/lint view to be inside project folder - Remove ci/lint view and js files Closes #43603
* \| \| \| \|	Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master'	Kamil Trzciński	2018-03-28	1	-8/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	LFS direct upload port to CE Closes #44548 See merge request gitlab-org/gitlab-ce!17752
\| * \| \| \| \|	Port LFS direct_upload from EEac/lfs-direct-upload-ee-to-ce	Alessio Caiazza	2018-03-27	1	-8/+0
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'jej/add-protected-branch-policy' into 'master'	Nick Thomas	2018-03-27	1	-1/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add protected branch policy See merge request gitlab-org/gitlab-ce!17982
\| * \| \| \| \|	API uses ProtectedBranchPolicy for destroy/create	James Edwards-Jones	2018-03-26	1	-1/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Make all workhorse gitaly calls opt-out	Jacob Vosmaer (GitLab)	2018-03-27	1	-4/+4
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge branch '40781-os-to-ce' into 'master'	Sean McGivern	2018-03-27	13	-17/+289
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bring Object Storage to CE Closes #4171, #4163, #3370, #2841, and #29203 See merge request gitlab-org/gitlab-ce!17358
\| * \| \| \| \|	Backport EE changes	Micaël Bergeron	2018-03-22	1	-0/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'origin/master' into 40781-os-to-ce	Micaël Bergeron	2018-03-22	56	-161/+732
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Fix http_io to make it return path is nil	Shinya Maeda	2018-03-22	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Backport ee-40781-os-to-ce	Micaël Bergeron	2018-03-22	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch '40781-os-to-ce' of gitlab.com:gitlab-org/gitlab-ce into ↵	Micaël Bergeron	2018-03-09	1	-23/+0
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ce-40781-os-to-ce
\| \| * \| \| \| \| \|	apply feedback	Micaël Bergeron	2018-03-09	1	-23/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add proxy_download to perform proxied sending of all files	Micaël Bergeron	2018-03-09	6	-16/+16
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into 40781-os-to-ce	Micaël Bergeron	2018-03-08	171	-2611/+4481
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	[cherry-pick] '4862-verify-file-checksums'	Sean McGivern	2018-03-08	6	-0/+179
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See merge request gitlab-org/gitlab-ee!4753
\| * \| \| \| \| \| \|	fix some broken specs	Micaël Bergeron	2018-03-06	1	-1/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	removed EE specific code from the port	Micaël Bergeron	2018-03-01	1	-0/+183
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	another round of fixes	Micaël Bergeron	2018-03-01	3	-0/+86
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into ↵object-storage-ee-to-ce-backport	Kamil Trzciński	2018-02-28	90	-446/+1256
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	object-storage-ee-to-ce-backport
\| * \ \ \ \ \ \ \	Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into ↵	Kamil Trzciński	2018-02-28	94	-428/+1340
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	object-storage-ee-to-ce-backport
\| * \ \ \ \ \ \ \ \	Merge commit '8af23def1d6' into object-storage-ee-to-ce-backport	Kamil Trzciński	2018-02-28	202	-1078/+3016
\| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Revert "Merge branch '3867-port-to-ce' into 'master'"	Kamil Trzciński	2018-02-28	8	-22/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 54a575f1bbba44573ab92dc58a4242f1ee734c5d, reversing changes made to c63af942e5baf7849a94fa99da8494bcba28e3f8.
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'feature/sm/artifacts-trace-ee' into 'master'	Kamil Trzciński	2018-02-28	1	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	EE: Trace as artifacts (FileStorage and ObjectStorage) Closes #4171 See merge request gitlab-org/gitlab-ee!4258
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'use-send-url-for-incompatible-runners' into 'master'	Grzegorz Bizon	2018-02-28	3	-3/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support SendURL for performing indirect download of artifacts if clients does… See merge request gitlab-org/gitlab-ee!4401
\| * \| \| \| \| \| \| \| \| \|	Merge branch '4163-move-uploads-to-object-storage' into 'master'	Sean McGivern	2018-02-28	10	-20/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move uploads to object storage Closes #4163 See merge request gitlab-org/gitlab-ee!3867
\| * \| \| \| \| \| \| \| \| \|	Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into ↵	Kamil Trzciński	2018-02-28	139	-1011/+2863
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	object-storage-ee-to-ce-backport
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'zj-multiple-artifacts-ee' into 'master'	Grzegorz Bizon	2018-02-28	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Multiple artifacts ee See merge request gitlab-org/gitlab-ee!3276
\| * \| \| \| \| \| \| \| \| \| \|	Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into ↵	Kamil Trzciński	2018-02-28	288	-2151/+6093
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	object-storage-ee-to-ce-backport
\| * \ \ \ \ \ \ \ \ \ \ \	Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into ↵	Kamil Trzciński	2018-02-28	176	-1329/+3656
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	object-storage-ee-to-ce-backport
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into ↵	Kamil Trzciński	2018-02-28	183	-1767/+5243
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	object-storage-ee-to-ce-backport
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'zj-fix-resolver-issue' into 'master'	Kamil Trzciński	2018-02-28	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Switch out resolver to mitigate SocketError See merge request !2809