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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch ↵	Douwe Maan	2018-03-28	2	-3/+29
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'44392-resolve-projects-creation-silently-failing-on-after-create-error' into 'master' Resolve "For new created projects permissions are not inherited from group level" Closes #44692 See merge request gitlab-org/gitlab-ce!18013
\| *	When a Service templates are invalid newly created projects will have them ↵	Tiago Botelho	2018-03-28	2	-7/+23
\| \| \| \| \| \| \| \|	inactive
\| *	Project creation does not fail silently on DB related changes	Tiago Botelho	2018-03-27	1	-0/+10
\| \|
* \|	Merge branch 'expose-commits-mr-api' into 'master'	Rémy Coutable	2018-03-28	1	-0/+29
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	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/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- 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	-0/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-6/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-6/+8
\| \| \| \| \|
* \| \| \| \|	Merge branch 'zj-remote-repo-exists' into 'master'	Sean McGivern	2018-03-28	2	-1/+15
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-1/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \| \|	Merge branch 'bvl-no-permanent-redirect' into 'master'	Douwe Maan	2018-03-28	8	-307/+105
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't create permanent redirect when renaming a namespace See merge request gitlab-org/gitlab-ce!17521
\| * \| \| \| \| \|	New migration helper for finding custom indexes	Bob Van Landuyt	2018-03-28	1	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will use the same query as `\di` to find an index on postgresql.
\| * \| \| \| \| \|	Remove permanent redirects	Bob Van Landuyt	2018-03-28	7	-307/+76
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \|	Merge branch '33803-drop-json-support-in-project-milestone' into 'master'	Rémy Coutable	2018-03-28	1	-2/+11
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Drop JSON support from Projects::MilestonesController#show Closes #33803 See merge request gitlab-org/gitlab-ce!17977
\| * \| \| \| \|	Drop JSON response in Project Milestone along with avoiding error	Takuya Noguchi	2018-03-25	1	-2/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '43794-fix-domain-verification-validation-errors' into 'master'	Grzegorz Bizon	2018-03-28	1	-0/+19
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "ActiveRecord::RecordInvalid: Validation failed: Certificate misses intermediates" Closes #43794 See merge request gitlab-org/gitlab-ce!17992
\| * \| \| \| \|	Allow pages domain verification to run on invalid domains	Nick Thomas	2018-03-26	1	-0/+19
\| \| \| \| \| \|
* \| \| \| \| \|	Revert "Merge branch 'workhorse-gitaly-mandatory' into 'master'"	Sean McGivern	2018-03-28	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !18002
* \| \| \| \| \|	Merge branch 'tc-sh-fix-issue-5461-ce' into 'master'	Rémy Coutable	2018-03-28	1	-0/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean the test path after each spec run See merge request gitlab-org/gitlab-ce!18035
\| * \| \| \| \| \|	Clean the test path after each spec run	Stan Hu	2018-03-28	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	FactoryBot's build_stubbed ignores the current database sequence of the projects table and starts at ID 1000. If more than 1000 projects are created during a test run, leftover repositories can cause spec failures. For example, a spec that expects an empty repository may fail since there may be existing content. Closes #5461
* \| \| \| \| \| \|	Merge branch 'dz-improve-app-settings-2' into 'master'	Filipa Lacerda	2018-03-28	1	-4/+26
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Redesign application settings to match project settings (part 2) See merge request gitlab-org/gitlab-ce!18019
\| * \| \| \| \| \| \|	Fix admin settings specdz-improve-app-settings-2	Dmitriy Zaporozhets	2018-03-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Move ci/cd, influx and prometheus app settings to expandable sections	Dmitriy Zaporozhets	2018-03-27	1	-4/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Remove some easy cases of 'path_to_repo' use	Jacob Vosmaer (GitLab)	2018-03-28	3	-26/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'ide-wordwrap' into 'master'	Tim Zallmann	2018-03-28	1	-24/+16
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable word wrap in IDE Closes #44303 See merge request gitlab-org/gitlab-ce!17994
\| * \| \| \| \| \| \| \|	Enable word wrap in IDE	Phil Hughes	2018-03-27	1	-24/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #44303
* \| \| \| \| \| \| \| \|	Merge branch 'dm-refs-contains-sha-encoding' into 'master'	Sean McGivern	2018-03-28	1	-1/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '44712-update-asciidoctor-from-1.5.3-to-1.5.6.2' into 'master'	Douwe Maan	2018-03-28	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update asciidoctor to 1.5.6.2 and asciidoctor-plantuml to 0.0.8 Closes #44712 See merge request gitlab-org/gitlab-ce!18022
\| * \| \| \| \| \| \| \| \| \|	Update asciidoctor to 1.5.6.2	Takuya Noguchi	2018-03-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '43603-ci-lint-support' into 'master'	Kamil Trzciński	2018-03-28	3	-18/+146
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "/ci/lint should support include keyword in config file" Closes #43603 See merge request gitlab-org/gitlab-ce!17729
\| * \| \| \| \| \| \| \| \| \| \|	Build ci/lint page	Mayra Cabrera	2018-03-26	1	-15/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Includes new image from gitlab-svgs - Updates dependency for svgs
\| * \| \| \| \| \| \| \| \| \| \|	Make ci/lint page context aware:	Mayra Cabrera	2018-03-26	3	-3/+134
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- 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	5	-69/+500
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-69/+500
\| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'update-unresolved-discussions-vue-component' into 'master'	Clement Ho	2018-03-27	4	-13/+29
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add i18n and update specs for ShaMismatch vue component See merge request gitlab-org/gitlab-ce!17870
\| * \| \| \| \| \| \| \| \| \| \|	Add i18n and update specs for ShaMismatch vue component	George Tsiolis	2018-03-27	4	-13/+29
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	[FIX] Fixed bug in dropdown selector when selecting the same selection again	bitsapien	2018-03-27	2	-1/+27
\| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'reduce-query-count-for-mergerequestscontroller-show' into 'master'	Douwe Maan	2018-03-27	1	-0/+11
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix N+1 in `MergeRequest#merge_request_diff_for` See merge request gitlab-org/gitlab-ce!17908
\| * \| \| \| \| \| \| \| \| \| \|	Fix N+1 in `MergeRequest#merge_request_diff_for`reduce-query-count-for-mergerequestscontroller-show	Sean McGivern	2018-03-21	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, this would issue a query for each unique `diff_refs_or_sha` passed. This was because we didn't want to load other MR diffs into memory, as they had some very large columns. Now they are actually very small, and it's more efficient to just load them all at once and do the finding in Ruby.
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jej/add-protected-branch-policy' into 'master'	Nick Thomas	2018-03-27	7	-3/+221
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add protected branch policy See merge request gitlab-org/gitlab-ce!17982
\| * \| \| \| \| \| \| \| \| \| \|	Revert exploratory branch restriction policyjej/add-protected-branch-policy	James Edwards-Jones	2018-03-26	1	-44/+6
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	API uses ProtectedBranchPolicy for destroy/create	James Edwards-Jones	2018-03-26	1	-3/+31
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	ProtectedBranchPolicy used from Controller for destroy/update	James Edwards-Jones	2018-03-26	4	-0/+78
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	DestroyService for protected tags/branches used from controller	James Edwards-Jones	2018-03-26	4	-1/+91
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Branch unprotection restriction starting point	James Edwards-Jones	2018-03-26	1	-0/+60
\| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explored Policy framework to create something I can use as a starting point.
* \| \| \| \| \| \| \| \| \| \|	'Assigned Issues' and 'Assigned Merge Requests' as dashboard user choices	Elias Werberich	2018-03-27	2	-1/+27
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Make all workhorse gitaly calls opt-out	Jacob Vosmaer (GitLab)	2018-03-27	1	-4/+4
\| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'test-hook-logs-xss' into 'master'	Douwe Maan	2018-03-27	1	-0/+21
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a test to make sure there's no XSS for hook logs See merge request gitlab-org/gitlab-ce!18005