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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Force to recreate all diffs on importrecreate-all-diffs-on-import	Kamil Trzciński	2019-03-26	3	-43/+56
\| \| \| \| \| \|	If for whatever reason we fail to import MR data, subsequent run will fail as we try to insert duplicate data. Instead of trying to recover, lets delete all and retry again.
*	Merge branch '10568-wells-css' into 'master'	Phil Hughes	2019-03-26	1	-0/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Removes EE differences for wells.scss Closes gitlab-ee#10568 See merge request gitlab-org/gitlab-ce!26585
\| *	Removes EE differences for wells.scss	Filipa Lacerda	2019-03-21	1	-0/+4
\| \|
* \|	Merge branch 'docs-mergerequests-link' into 'master'	Rémy Coutable	2019-03-26	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Fix redirected link to be more direct Closes #58620 See merge request gitlab-org/gitlab-ce!26081
\| * \|	Docs: Fix redirected link to be more direct	Marcel Amirault	2019-03-26	1	-1/+1
\|/ /
* \|	Merge branch '51988-install-group-runner-on-group-cluster' into 'master'	Fatih Acet	2019-03-26	10	-29/+58
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support installing Group runner on group-level cluster Closes #51988 See merge request gitlab-org/gitlab-ce!26260
\| * \|	Allow runners to be installed on group clusters	Tiger Watson	2019-03-26	10	-29/+58
\|/ / \| \| \| \| \| \| \| \|	A runner installed on a cluster will now use the cluster's `cluster_type` as its `runner_type`.
* \|	Merge branch '59352-fix-mr-discussion-expansion' into 'master'	Phil Hughes	2019-03-26	3	-25/+44
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expand resolved discussion when linking to a comment in the discussion Closes #59352 See merge request gitlab-org/gitlab-ce!26483
\| * \|	Expand discussion when opening link to comment	Heinrich Lee Yu	2019-03-26	3	-25/+44
\| \| \| \| \| \| \| \| \| \| \| \|	Makes discussion expansion depend on `discussion.expanded`
* \| \|	Merge branch ↵	Sean McGivern	2019-03-26	7	-31/+165
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'58805-allow-incomplete-commit-data-to-be-fetched-from-collection' into 'master' Enrich commits with full data in CommitCollection Closes #58805 See merge request gitlab-org/gitlab-ce!26445
\| * \| \|	Add changelog entry	Luke Duncalfe	2019-03-26	1	-0/+5
\| \| \| \|
\| * \| \|	Handle blank projects in CommitCollection#enrich!	Luke Duncalfe	2019-03-22	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A project is needed in order to fetch data from gitaly. Projects can be absent from commits in certain rare situations (like when viewing a MR of a deleted fork). In these cases, assume that the enriched data is not needed. See this comment: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26144#note_152191106 "It's led to a dilemma about where to "fix" this in code. I'm going to fix it by allowing CommitCollection#enrich! to just return unenriched commits when a project is missing, essentially "silently failing". I hope this is the right decision. It's going with the assumption that calls in these situations in the future are not needing the full data. The alternative would be to allow CommitCollection#enrich! to still error, but handle it in the methods that call #enrich!, however that might lead to brittleness in future when working with project-less MRs."
\| * \| \|	Scope out merge commits in MergeRequest spec	Luke Duncalfe	2019-03-22	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously the code for excluding merge commits from the commit collection (CommitCollection#without_merge_commits) was not working when the commits had come from a merge request. Now that this has been fixed, these tests fails. They should always have been written to exclude merge commits when comparing.
\| * \| \|	Enrich commits with full data in CommitCollection	Luke Duncalfe	2019-03-22	6	-29/+154
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow incomplete commit records to load their full data from gitaly. Commits can be based on a Hash of data retrieved from PostgreSQL, and this data can be intentionally incomplete in order to save space. A new method #gitaly? has been added to Gitlab::Git::Commit, which returns true if the underlying data source of the Commit is a Gitaly::GitCommit. CommitCollection now has a method #enrich which replaces non-gitaly commits in place with commits from gitaly. CommitCollection#without_merge_commits has been updated to call this method, as in order to determine a merge commit we need to have parent data. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/58805
* \| \| \|	Merge branch 'qa-fix-load-test-urls-file-format' into 'master'	Ramya Authappan	2019-03-26	3	-11/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix url property format in urls.yml file See merge request gitlab-org/gitlab-ce!26484
\| * \| \| \|	Fix url property format and use conn. pool	Sanad Liaquat	2019-03-26	3	-11/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also update arrivalRate to a max of 100
* \| \| \| \|	Merge branch 'sh-clear-pipeline-status-cache-upon-destroy' into 'master'	Grzegorz Bizon	2019-03-26	3	-2/+20
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clear pipeline status cache after destruction of pipeline Closes #59453 See merge request gitlab-org/gitlab-ce!26575
\| * \| \| \| \|	Clear pipeline status cache after destruction of pipeline	Stan Hu	2019-03-26	3	-2/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`project.pipeline_status.has_status?` is cached, which can lead to Error 500s in the UI if the this condition is used to check whether a pipeline exists for a commit. We now expire the cache to ensure that the information is consistent. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59453
* \| \| \| \| \|	Merge branch '54916-extended-tooltip-for-merge-request-links' into 'master'	Phil Hughes	2019-03-26	18	-13/+438
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Extended tooltip for merge request links" Closes #54916 See merge request gitlab-org/gitlab-ce!25221
\| * \| \| \| \| \|	Add merge request popover with details	Sam Bigelow	2019-03-21	18	-13/+438
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Show pipeline status, title, MR Status and project path - Popover attached to gitlab flavored markdown everywhere, including: + MR/Issue Title + MR/Issue description + MR/Issue comments + Rendered markdown files
* \| \| \| \| \| \|	Merge branch ↵	Phil Hughes	2019-03-26	2	-32/+30
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'jivl-replace-environments-dropdown-with-gitlab-ui-dropdown-master' into 'master' Replace environments dropdown with gitlab ui dropdown See merge request gitlab-org/gitlab-ce!26386
\| * \| \| \| \| \| \|	Change environments dropdown to use gitlab-ui	Jose Vargas	2019-03-21	2	-32/+30
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '10648-milestone-css' into 'master'	Phil Hughes	2019-03-26	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes EE differences for milestone.scss See merge request gitlab-org/gitlab-ce!26558
\| * \| \| \| \| \| \| \|	Removes EE differences for milestone.scss	Filipa Lacerda	2019-03-25	1	-0/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'tz-gl-stylelint' into 'master'	Kushal Pandya	2019-03-26	9	-32/+776
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stylelints for duplicate selectors and using BS4 classes See merge request gitlab-org/gitlab-ce!26409
\| * \| \| \| \| \| \| \| \|	First iteration of GitLab own Stylelints	Tim Zallmann	2019-03-26	9	-32/+776
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DRYed the code Changed new rules to warnings Manual prettified and added stylelint rules
* \| \| \| \| \| \| \| \|	Merge branch 'docs-add-existing-cluster-fixup' into 'master'	Evan Read	2019-03-26	1	-47/+30
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Improve add existing cluster section See merge request gitlab-org/gitlab-ce!26266
\| * \| \| \| \| \| \| \|	Docs: Fixup duplicated sections	Thong Kuah	2019-03-26	1	-47/+30
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We are mentioning the commands needed to obtain these fields twice. Merge them into the single place. - For API URL we only had the command at the bottom so move this up. - For CA certificate, we already have the command at the top of the section - For Token, we already have an similar command at the top of the section
* \| \| \| \| \| \| \|	Merge branch '52366-improved-group-lists-ui-spinners' into 'master'	Fatih Acet	2019-03-26	7	-11/+16
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update spinners in group list component Closes #52366 See merge request gitlab-org/gitlab-ce!26572
\| * \| \| \| \| \| \| \|	Update spinners in group list component	Dennis Tang	2019-03-26	7	-11/+16
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'mg-update-reviewer-suggestions' into 'master'	Douglas Barbosa Alexandre	2019-03-26	1	-1/+17
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update frontend-specific files in reviewer roulette See merge request gitlab-org/gitlab-ce!26566
\| * \| \| \| \| \| \| \|	Apply suggestion to lib/gitlab/danger/helper.rb	Mike Greiling	2019-03-25	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update frontend-specific files in reviewer roulette	Mike Greiling	2019-03-25	1	-1/+17
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'MaxWinterstein-unify-copy-comit-sha' into 'master'	Fatih Acet	2019-03-26	3	-2/+8
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unify behaviour of 'Copy commit SHA to clipboard' on job view Closes #58343 See merge request gitlab-org/gitlab-ce!25829
\| * \| \| \| \| \| \| \|	Unify behaviour of 'Copy commit SHA to clipboard'	Max Winterstein	2019-03-09	3	-2/+8
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 11.9.1	GitLab Release Tools Bot	2019-03-25	8	-37/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	Merge branch 'refactor-create-merge-request-e2e-test-suite' into 'master'	Mark Lapierre	2019-03-25	1	-26/+30
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor create merge request test suite See merge request gitlab-org/gitlab-ce!26499
\| * \| \| \| \| \| \| \|	Move simplest test to the top and more complex to the bottom	Walmyr	2019-03-25	1	-26/+30
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also, make both `it` statments part of the same `describe`. Finally, remove duplication of strings by defining variables and re-using them.
* \| \| \| \| \| \| \|	Merge branch 'docs-update-ssot-security-requirements' into 'master'	Marcia Ramos	2019-03-25	1	-11/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add ssot link to security reviews documentation See merge request gitlab-org/gitlab-ce!26291
\| * \| \| \| \| \| \| \|	Add ssot link to security reviews documentation	James Ritchey	2019-03-25	1	-11/+6
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'ce-1974-update-user-name-upon-ldap-sync' into 'master'	Douwe Maan	2019-03-25	3	-14/+16
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport 'Update user name upon LDAP sync' from EE See merge request gitlab-org/gitlab-ce!26432
\| * \| \| \| \| \| \| \|	Backport 'Update user name upon LDAP sync' from EE	Rémy Coutable	2019-03-25	3	-14/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'ce-mw-update-gl-search-box' into 'master'	Phil Hughes	2019-03-25	2	-5/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(CE port) Replace GlSearchBox with GlSearchBoxByType Closes gitlab-ee#10637 See merge request gitlab-org/gitlab-ce!26548
\| * \| \| \| \| \| \| \| \|	(CE port) Replace GlSearchBox with GlSearchBoxByType	Martin Wortschack	2019-03-25	2	-5/+5
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '56954-improve-knative-after-installing-tiller' into 'master'	Sean McGivern	2019-03-25	5	-1/+49
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improvements for Knative installation Closes #56954 See merge request gitlab-org/gitlab-ce!26339
\| * \| \| \| \| \| \| \| \|	Improvements for Knative installation	Mayra Cabrera	2019-03-25	5	-1/+49
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Displays Knative domain field automatically after Helm is successfully installed. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56954
* \| \| \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2019-03-25	1	-2/+44
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'ce-6543-extract-ee-specific-files-lines-for-some-discussion-tests' into 'master' Resolve CE/EE differences in MergeRequestPresenter spec See merge request gitlab-org/gitlab-ce!26546
\| * \| \| \| \| \| \| \| \|	Resolve CE/EE differences in MergeRequestPresenter spec	Sean McGivern	2019-03-25	1	-2/+44
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'winh-eslint-config-danger' into 'master'	Mike Greiling	2019-03-25	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mark .eslintrc.yml as frontend change for Danger See merge request gitlab-org/gitlab-ce!26549
\| * \| \| \| \| \| \| \| \|	Mark .eslintrc.yml as frontend change for Danger	Winnie Hellmann	2019-03-25	1	-1/+1
\| \|/ / / / / / / /