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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Migrate queries and support importing to tableimport-multiple-queries	syasonik	2019-02-15	4	-43/+59
\|
*	Add import/export support for prometheus queries	syasonik	2019-02-15	3	-1/+15
\|
*	Add PrometheusQuery class and specs	syasonik	2019-02-15	4	-0/+79
\| \| \| \| \|	Adds a new PrometheusQuery model which references a PrometheusMetric. This is needed to support multiple queries per chart.
*	Create prometheus queries table	syasonik	2019-02-15	2	-1/+31
\|
*	Merge branch '56694-mark-group-level-labels-in-label-api-as-such' into 'master'	Rémy Coutable	2019-02-14	4	-9/+28
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Mark group-level labels in Label API as such. Closes #56694 See merge request gitlab-org/gitlab-ce!25219
\| *	Add docs and specs	Robert Schilling	2019-02-13	2	-9/+20
\| \|
\| *	API: Indicate if label is a project label	Robert Schilling	2019-02-13	2	-0/+8
\| \|
* \|	Merge branch '9721-cannot-scroll-forwards-in-time-for-roadmap-view-ce' into ↵	Phil Hughes	2019-02-14	2	-1/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' CE Port of fix for roadmap forward timeline scroll See merge request gitlab-org/gitlab-ce!25217
\| * \|	CE Port of fix for roadmap forward timeline scroll	Constance Okoghenun	2019-02-13	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|	EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9530
* \| \|	Merge branch 'bvl-multiple-codeowner-approval-rules-ce' into 'master'	Rémy Coutable	2019-02-14	1	-0/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a scope to preload emails on a user See merge request gitlab-org/gitlab-ce!25051
\| * \| \|	Add a scope to preload emails on a user	Bob Van Landuyt	2019-02-08	1	-0/+1
\| \| \| \|
* \| \| \|	Merge branch 'revert-6cbffb8a' into 'master'	Rémy Coutable	2019-02-14	7	-20/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch '50559-add-milestone-progress-to-api' into 'master'" See merge request gitlab-org/gitlab-ce!25229
\| * \| \| \|	Revert "Merge branch '50559-add-milestone-progress-to-api' into 'master'"	Stan Hu	2019-02-14	7	-20/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !25173
* \| \| \| \|	Merge branch '30299-fix-reply-polling-and-resolvable-status' into 'master'	Phil Hughes	2019-02-14	9	-32/+194
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix resolvable status for replies to comments See merge request gitlab-org/gitlab-ce!24950
\| * \| \| \| \|	Fix polling for replies to individual notes	Heinrich Lee Yu	2019-02-14	9	-32/+194
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sets `updated_at` so that the transformed note is returned together with the new reply
* \| \| \| \|	Merge branch '57544-web-ide-new-directory-dialog-shows-file-templates' into ↵	Phil Hughes	2019-02-14	3	-4/+24
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Web IDE new directory dialog shows file templates" Closes #57544 See merge request gitlab-org/gitlab-ce!25119
\| * \| \| \| \|	Dont show file template options for new directory	Sam Bigelow	2019-02-13	3	-4/+24
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch ↵	Stan Hu	2019-02-14	3	-1/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'57579-gitlab-project-import-fails-sidekiq-undefined-method-import_jid' into 'master' Resolve "Gitlab Project import fails: sidekiq undefined method import_jid" Closes #57579 See merge request gitlab-org/gitlab-ce!25239
\| * \| \| \| \| \|	Fix import_jid error on project import	James Lopez	2019-02-14	3	-1/+16
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'regression-commits-header-link' into 'master'	Phil Hughes	2019-02-14	2	-2/+7
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed link alignment See merge request gitlab-org/gitlab-ce!25162
\| * \| \| \| \| \|	Fixed link alignment	Natalia Tepluhina	2019-02-14	2	-2/+7
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'patch-43' into 'master'	Evan Read	2019-02-14	1	-2/+2
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix callback url See merge request gitlab-org/gitlab-ce!25195
\| * \| \| \| \|	Fix callback url	Dennis Jekubczyk	2019-02-13	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'qa-ml-quarantine-context' into 'master'	Sanad Liaquat	2019-02-14	2	-173/+226
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[QA] Skip contexts in quarantine See merge request gitlab-org/gitlab-ce!24942
\| * \| \| \| \| \|	Skip contexts in quarantine	Mark Lapierre	2019-02-14	2	-173/+226
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This avoids running before/after blocks for tests that are in quarantine
* \| \| \| \| \|	Merge branch 'docs/gitlab-flow' into 'master'	Evan Read	2019-02-13	1	-224/+234
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rewrite GitLab Flow doc See merge request gitlab-org/gitlab-ce!20951
\| * \| \| \| \| \|	Rewrite GitLab Flow doc	Stephen Wade	2019-02-13	1	-224/+234
\|/ / / / / /
* \| \| \| \| \|	Merge branch ↵	Robert Speicher	2019-02-13	2	-7/+18
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'57634-issue-when-viewing-a-document-with-footnotes-actionview-template-error-undefined-method-at_css-for-nil-nilclass' into 'master' Issue when viewing a document with footnotes Closes #57634 See merge request gitlab-org/gitlab-ce!25199
\| * \| \| \| \| \|	Properly handle multiple refs to same footnote	Brett Walker	2019-02-13	2	-7/+18
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'improve-review-apps-docs' into 'master'	Mek Stittri	2019-02-13	1	-2/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Docs] Improve the Review Apps documentation See merge request gitlab-org/gitlab-ce!25161
\| * \| \| \| \| \| \|	Improve the Review Apps documentation	Rémy Coutable	2019-02-12	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch '30299-fix-polling-for-transformed-notes' into 'master'	Douwe Maan	2019-02-13	4	-6/+15
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix polling for transformed individual notes See merge request gitlab-org/gitlab-ce!25084
\| * \| \| \| \| \| \| \|	Fix polling for transformed individual notes30299-fix-polling-for-transformed-notes	Heinrich Lee Yu	2019-02-13	4	-6/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sets `updated_at` so that the transformed note is returned together with the new reply
* \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-content-disposition-inline' into 'master'	Douglas Barbosa Alexandre	2019-02-13	2	-1/+18
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Content-Disposition hard-coded to attachments Closes #57660 See merge request gitlab-org/gitlab-ce!25214
\| * \| \| \| \| \| \| \|	Fix Content-Disposition hard-coded to attachments	Stan Hu	2019-02-13	2	-1/+18
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to a regression in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24919, Content-Disposition is hard-coded to `attachment` instead of `inline`. We now use the argument `disposition` to fix that problem. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57660
* \| \| \| \| \| \| \|	Merge branch '56087-danger-roulette' into 'master'	Rémy Coutable	2019-02-13	9	-45/+562
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewer roulette via Danger Closes #56087 See merge request gitlab-org/gitlab-ce!24938
\| * \| \| \| \| \| \| \|	Reviewer roulette via Danger56087-danger-roulette	Nick Thomas	2019-02-13	8	-51/+561
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make danger pick reviewers and maintainers at random, for feontend, backend, database, etc, changes, whenever files belonging to those teams get changed.
\| * \| \| \| \| \| \| \|	Move the ee? helper method into the helper	Nick Thomas	2019-02-13	2	-5/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move change category detection to a helper	Nick Thomas	2019-02-13	2	-12/+18
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '57160-merge-request-tabs-header-is-missing-bottom-border' into ↵	Annabel Dunstone Gray	2019-02-13	2	-5/+8
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Merge Request Tabs Header is missing bottom border" Closes #57160 See merge request gitlab-org/gitlab-ce!25198
\| * \| \| \| \| \| \| \|	Return border bottom on MR Tabs	Sam Bigelow	2019-02-13	2	-5/+8
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '57101-api-docs-for-hangouts-chat-service-incorrect' into 'master'	Rémy Coutable	2019-02-13	3	-5/+11
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Fix docs and parameters for hangouts-chat service Closes #57101 See merge request gitlab-org/gitlab-ce!25180
\| * \| \| \| \| \| \| \| \|	API: Fix docs and parameters for hangouts-chat service	Robert Schilling	2019-02-13	3	-5/+11
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '39676-wiki-api-problems-on-update-parameters-and-500-error' ↵	Rémy Coutable	2019-02-13	3	-17/+41
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Only require one parameter when updating a Wiki via the API Closes #39676 See merge request gitlab-org/gitlab-ce!25191
\| * \| \| \| \| \| \| \|	Only require one parameter when updating a Wiki via the API	Robert Schilling	2019-02-13	3	-17/+41
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '57589-update-workhorse' into 'master'	Stan Hu	2019-02-13	2	-1/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Workhorse to v8.3.1 Closes #57589 See merge request gitlab-org/gitlab-ce!25188
\| * \| \| \| \| \| \| \|	Update Workhorse to v8.3.1	Nick Thomas	2019-02-13	2	-1/+6
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch ↵	Phil Hughes	2019-02-13	3	-3/+94
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'57382-add-documentation-how-to-track-an-event-to-frontend-documentation' into 'master' Resolve "Add documentation "How to track an event" to Frontend documentation" Closes #57382 See merge request gitlab-org/gitlab-ce!24995
\| * \| \| \| \| \| \| \|	Add event tracking documentation	Martin Wortschack	2019-02-13	3	-3/+94
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add link to Event tracking in FE guides
* \| \| \| \| \| \| \|	Merge branch 'diff-fix-duplicate-key-error' into 'master'	Filipa Lacerda	2019-02-13	3	-9/+25
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed diff rendering causing a duplicate key warning Closes #56797 See merge request gitlab-org/gitlab-ce!24634