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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Replace dashes with underscoresdocs-comm-article-end-to-end-testing	Marcia Ramos	2019-02-15	3	-1/+1
\|
*	Remove shadow from image	Marcia Ramos	2019-02-15	1	-1/+1
\|
*	Update article's date	Marcia Ramos	2019-02-15	1	-1/+1
\|
*	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Marcia Ramos	2019-02-15	10673	-141997/+817176
\|\ \| \| \| \| \| \|	docs-comm-article-end-to-end-testing
\| *	Merge branch '55206-discussion-text-alignment' into 'master'	Annabel Dunstone Gray	2019-02-15	2	-25/+35
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correctly align resolved discussion text Closes #55206 See merge request gitlab-org/gitlab-ce!25001
\| \| *	Prevent line breaks in note timestamp55206-discussion-text-alignment	Mark Florian	2019-02-15	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \|	For better readability.
\| \| *	Allow wrapping of note headline	Mark Florian	2019-02-14	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This prevents a horizontal scrollbar from appearing in Firefox in certain situations. See the [merge request][1] for more details and discussion. [1]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25001#note_141208011
\| \| *	Correctly align resolved discussion text	Mark Florian	2019-02-12	2	-24/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The header of the `NoteableDiscussion` component is really a media object[1], but it didn't have the right DOM or styling to correctly achieve it. This change wraps all the children of the media object (except the floated image) in a dedicated `.timeline-content` element, which is styled to establish its own block formatting context[2]. This ensures all of its children sit left-aligned to the right edge of the float. In short, the DOM used to look like this: .discussion-header .timeline-icon note-header note-edited-text and now it looks like this: .discussion-header .timeline-icon .timeline-content (with own formatting context) note-header note-edited-text This is also now more consistent with the DOM of `NoteableNote`, in that `.timeline-icon` and `.timeline-content` seem to want to be siblings. [1]: http://www.stubbornella.org/content/2010/06/25/the-media-object-saves-hundreds-of-lines-of-code/ [2]: https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Block_formatting_context
\| * \|	Merge branch 'bump-gitaly-version-1.20.1' into 'master'	Nick Thomas	2019-02-15	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Gitaly to v1.20.0 Closes #53473 See merge request gitlab-org/gitlab-ce!25259
\| \| * \|	Bump Gitaly to v1.20.0	Paul Okstad	2019-02-15	1	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes gRPC dialing to UNIX domain sockets. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53473
\| * \|	Merge branch 'import-go-to-project-cta-nibble-backend' into 'master'	Lin Jen-Shin	2019-02-15	56	-210/+1912
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BE Improve the GitHub and Gitea import feature table interface See merge request gitlab-org/gitlab-ce!24606
\| \| * \	Merge branch 'import-go-to-project-cta-nibble-frontend' into ↵import-go-to-project-cta-nibble-backend	Phil Hughes	2019-02-14	31	-89/+1485
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'import-go-to-project-cta-nibble-backend' FE Improve the GitHub and Gitea import feature table interface See merge request gitlab-org/gitlab-ce!24608
\| \| \| * \|	Improve the GitHub and Gitea import feature table interfaceimport-go-to-project-cta-nibble-frontend	Luke Bennett	2019-02-13	31	-89/+1485
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These are frontend changes. Use Vue for the import feature UI for "githubish" providers (GitHub and Gitea). Add "Go to project" button after a successful import. Use CI-style status icons and improve spacing of the table and its component. Adds ETag polling to the github and gitea import jobs endpoint.
\| \| * \|	Improve the GitHub and Gitea import feature table interface	Luke Bennett	2019-02-13	26	-121/+427
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These are backend changes. Use Vue for the import feature UI for "githubish" providers (GitHub and Gitea). Add "Go to project" button after a successful import. Use CI-style status icons and improve spacing of the table and its component. Adds ETag polling to the github and gitea import jobs endpoint.
\| * \| \|	Merge branch '57690-encrypted-columns-are-lost' into 'master'	Marcia Ramos	2019-02-15	1	-4/+23
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document what features are broken when db_key_base is lost Closes #57690 See merge request gitlab-org/gitlab-ce!25289
\| \| * \| \|	Document what features are broken when db_key_base is lost	Nick Thomas	2019-02-15	1	-4/+23
\| \| \| \| \|
\| * \| \| \|	Merge branch 'docs-webhook-ssl-troubleshooting' into 'master'	Marcia Ramos	2019-02-15	1	-0/+9
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add troubleshooting steps for "local issuer certificate" error See merge request gitlab-org/gitlab-ce!25287
\| \| * \| \| \|	Add troubleshooting steps for "local issuer certificate" error	DeAndre Harris	2019-02-15	1	-0/+9
\| \|/ / / /
\| * \| \| \|	Merge branch '9251-skip_whitelisted_vulnerabilities-ce' into 'master'	Kamil Trzciński	2019-02-15	1	-5/+18
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport fixtures update for Container Scanning See merge request gitlab-org/gitlab-ce!25183
\| \| * \| \| \|	Backport fixture update	Olivier Gonzalez	2019-02-15	1	-5/+18
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sync fixture with EE.
\| * \| \| \|	Merge branch '56937-edit-knative-domain-after-it-has-been-deployed' into ↵	Kamil Trzciński	2019-02-15	10	-72/+38
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Guarantee functions are not lost after Knative update See merge request gitlab-org/gitlab-ce!25067
\| \| * \| \| \|	Rename scope to imply :installed and :updated result	João Cunha	2019-02-15	10	-72/+38
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Adds to specs the case where apps are also updated - Rename scope calls on Gitlab::UsageData and Clusters::Cluster - Removes a duplicated spec
\| * \| \| \|	Merge branch '57671-fix_merge_request_base_pipeline' into 'master'	Grzegorz Bizon	2019-02-15	3	-2/+8
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Base pipeline must be from target branch Closes #57671 See merge request gitlab-org/gitlab-ce!25226
\| \| * \| \| \|	Base pipeline must be from target branch	Olivier Gonzalez	2019-02-15	3	-2/+8
\| \|/ / / /
\| * \| \| \|	Merge branch 'sh-example-policy-debugging-docs' into 'master'	Marcia Ramos	2019-02-15	1	-1/+45
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document how to debug declarative policies See merge request gitlab-org/gitlab-ce!25234
\| \| * \| \| \|	Document how to debug declarative policies	Stan Hu	2019-02-14	1	-1/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This helped me troubleshoot https://gitlab.com/gitlab-org/gitlab-ee/issues/9727#note_141202527.
\| * \| \| \| \|	Merge branch 'jl-update-ff-process-docs' into 'master'	Marin Jankovski	2019-02-15	1	-1/+13
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add guidance for the initial state of a feature flag See merge request gitlab-org/gitlab-ce!24829
\| \| * \| \| \| \|	Fix grammar in feature flags section, add link to docsjl-update-ff-process-docs	Joshua Lambert	2019-02-14	1	-5/+7
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Clarify feature flag status in PROCESS.md	Marin Jankovski	2019-02-12	1	-1/+11
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'docs/refactor-api-landing-page' into 'master'	Achilleas Pipinellis	2019-02-15	7	-111/+150
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor of API landing page See merge request gitlab-org/gitlab-ce!25076
\| \| * \| \| \| \| \|	Refactor of API landing page	Evan Read	2019-02-15	7	-111/+150
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Breaks up into more sections. - Also minor fixes to pages within sections.
\| * \| \| \| \| \|	Merge branch ↵	Marcia Ramos	2019-02-15	1	-5/+6
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'36263-the-award-emoji-api-has-an-incorrect-description-of-the-id-parameter' into 'master' Clarify IDs in the award emoji API Closes #36263 See merge request gitlab-org/gitlab-ce!25215
\| \| * \| \| \| \| \|	API: Clarify the award emoji docs	Robert Schilling	2019-02-13	1	-5/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch '56485-implement-graphql-mergerequestsresolver' into 'master'	James Lopez	2019-02-15	14	-22/+240
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Implement GraphQL MergeRequestsResolver" Closes #56485 See merge request gitlab-org/gitlab-ce!24805
\| \| * \| \| \| \| \| \|	Use a block and move setup to example directly56485-implement-graphql-mergerequestsresolver	Lin Jen-Shin	2019-02-14	2	-4/+2
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Instead of returning all or nothing, return whichever passed	Lin Jen-Shin	2019-02-14	3	-13/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And add tests
\| \| * \| \| \| \| \| \|	Implement singular iid for IssuesResolver and ProjectType	Lin Jen-Shin	2019-02-14	4	-4/+16
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Allow authorize on array of objects for GraphQL	Lin Jen-Shin	2019-02-14	4	-5/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And add tests
\| \| * \| \| \| \| \| \|	Add tests for BaseResolver and update accordingly	Lin Jen-Shin	2019-02-14	3	-9/+59
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add field mergeRequests for project in GraphQL	Lin Jen-Shin	2019-02-14	7	-12/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And fix the tests so that it won't run into circular paths.
\| * \| \| \| \| \| \| \|	Merge branch 'ce-1979-fe-multiple-approval-rules' into 'master'	Phil Hughes	2019-02-15	5	-1/+11
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Port of Multiple merge request approval rules See merge request gitlab-org/gitlab-ce!25193
\| \| * \| \| \| \| \| \| \|	CE Port of Multiple merge request approval rules	Paul Slaughter	2019-02-13	5	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9001
\| * \| \| \| \| \| \| \| \|	Merge branch '57692-fix-rendering-of-none-any' into 'master'	Phil Hughes	2019-02-15	2	-1/+12
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Search bar rendering `none` and `any` as users" Closes #57692 See merge request gitlab-org/gitlab-ce!25235
\| \| * \| \| \| \| \| \| \|	Fix rendering of user token special values	Heinrich Lee Yu	2019-02-14	2	-1/+12
\| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include capitalized `none` and `any` as special values
\| * \| \| \| \| \| \| \|	Merge branch '49502-gpg-signature-api-endpoint' into 'master'	Douwe Maan	2019-02-15	6	-0/+110
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Provide an API endpoint to get the GPG signature of a commit Closes #49502 See merge request gitlab-org/gitlab-ce!25032
\| \| * \| \| \| \| \| \| \|	Add API docs for commit's GPG signature endpoint49502-gpg-signature-api-endpoint	Balasankar "Balu" C	2019-02-14	3	-0/+49
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Add specs for commit's GPG signature API endpoint	Balasankar "Balu" C	2019-02-14	1	-0/+38
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Add API endpoint to get a commit's GPG signature	Balasankar "Balu" C	2019-02-14	2	-0/+23
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-board-user-assigns' into 'master'	Douglas Barbosa Alexandre	2019-02-14	4	-1/+79
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 403 errors when adding an assignee list in project boards Closes gitlab-ee#9727 See merge request gitlab-org/gitlab-ce!25263
\| \| * \| \| \| \| \| \| \| \|	Fix 403 errors when adding an assignee list in project boards	Stan Hu	2019-02-14	4	-1/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to a bug in `BoardPolicy`, users were getting back a 403 error when trying to assign users to an assignee list and seeing "Something went wrong while fetching assignees list". For some reason, the declarative policy runtime was ignoring the ternary condition. To work around the issue, we make the project board an explicit condition check. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/9727