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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'ce-5606-issues-and-mr-autocomplete-in-epics' into 'master'	Robert Speicher	2019-01-08	1	-9/+15
\|\ \| \| \| \| \| \| \| \|	CE backport of gitlab-ee!8936 See merge request gitlab-org/gitlab-ce!23976
\| *	CE backport for `reference` in gfm_autocompletece-5606-issues-and-mr-autocomplete-in-epics	Heinrich Lee Yu	2019-01-07	1	-9/+15
\| \| \| \| \| \| \| \|	Currently not used by any CE code
* \|	Add threshold lines in metrics graph	Adriel Santiago	2019-01-07	2	-4/+13
\| \|
* \|	Merge branch '8535-add-mr-comment-on-ctrl-enter' into 'master'	Phil Hughes	2019-01-07	1	-2/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Ctrl+Enter immediately adds MR comment" See merge request gitlab-org/gitlab-ce!24053
\| * \|	Added handleKeySubmit method to match EE8535-add-mr-comment-on-ctrl-enter	Natalia Tepluhina	2019-01-07	1	-2/+5
\| \| \|
* \| \|	Merge branch '55721-externalization-for-pipeline-tags' into 'master'	Fatih Acet	2019-01-07	1	-11/+23
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Externalization for pipeline tags Closes #55721 See merge request gitlab-org/gitlab-ce!24028
\| * \| \|	Correctly externalize pipeline tags55721-externalization-for-pipeline-tags	Lukas Eipert	2019-01-04	1	-11/+23
\| \| \| \|
* \| \| \|	Merge branch ↵	Fatih Acet	2019-01-07	3	-26/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'53796-discard-draft-comment-button-to-easy-to-accidentally-hit-on-mobile' into 'master' Resolve "Discard draft comment button to easy to accidentally hit on mobile" Closes #53796 See merge request gitlab-org/gitlab-ce!24185
\| * \| \| \|	Cancel button for diff notes	Constance Okoghenun	2019-01-07	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added "cancel" comment button for inline diff notes for commits
\| * \| \| \|	Removed discard comment button	Constance Okoghenun	2019-01-07	3	-28/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed the button and associated tests form notes on Issues and Merge request page.
* \| \| \| \|	Merge branch '54311-fix-board-add-label' into 'master'	Kushal Pandya	2019-01-07	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix error when creating labels in a new issue in the boards page Closes #54311 See merge request gitlab-org/gitlab-ce!24039
\| * \ \ \ \	Merge branch 'master' into 54311-fix-board-add-label	rubenmoya	2019-01-05	31	-104/+410
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| * \| \| \| \|	Add assignableLabelsEndpoint to issue after createing it	rubenmoya	2018-12-26	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '54981-extended-user-centric-tooltips-add-missing-cases' into ↵	Kushal Pandya	2019-01-07	1	-8/+25
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Extended user centric tooltips: Add missing cases" Closes #54981 See merge request gitlab-org/gitlab-ce!24132
\| * \| \| \| \|	Dryed code in commit_item by adding another computed prop	Tim Zallmann	2019-01-07	1	-9/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Added User Popovers to Commit Items and Member Lists	Tim Zallmann	2019-01-04	1	-1/+19
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch ↵	Filipa Lacerda	2019-01-07	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'54142-pages-in-project-s-permission-should-be-named-pages-access-control' into 'master' Resolve "Pages in project's permissions settings should be named Pages access control" Closes #54142 See merge request gitlab-org/gitlab-ce!23146
\| * \| \| \| \| \|	Make the Pages permission setting more clear54142-pages-in-project-s-permission-should-be-named-pages-access-control	Achilleas Pipinellis	2018-12-28	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'ee1979-user-avatar-list-component' into 'master'	Kushal Pandya	2019-01-07	1	-0/+83
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create shared user-avatar-list component See merge request gitlab-org/gitlab-ce!24139
\| * \| \| \| \| \|	Create shared user-avatar-list componentee1979-user-avatar-list-component	Paul Slaughter	2019-01-04	1	-0/+83
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why? We need a component that can expand / collapse a list of avatars for approval rules table. See issue https://gitlab.com/gitlab-org/gitlab-ee/issues/1979
* \| \| \| \| \|	Merge branch 'suggestion-dashes' into 'master'	Kushal Pandya	2019-01-07	2	-4/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes diff sugestions removing dashes from diff Closes #55634 See merge request gitlab-org/gitlab-ce!23994
\| * \| \| \| \| \|	Fixes diff sugestions removing dashes from diff	Phil Hughes	2018-12-21	2	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55634
* \| \| \| \| \| \|	Merge branch 'fl-releases-fix-author' into 'master'	Kushal Pandya	2019-01-07	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes if case to render author info in releases See merge request gitlab-org/gitlab-ce!23989
\| * \| \| \| \| \|	Fixes if case to render author info in releasesfl-releases-fix-author	Filipa Lacerda	2018-12-21	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Require Knative to be installed only on an RBAC kubernetes cluster	Chris Baumbauer	2019-01-04	3	-1/+27
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch 'ee1979-gl-modal-vuex' into 'master'	Kushal Pandya	2019-01-04	6	-0/+122
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create shared gl-modal-vuex component and module See merge request gitlab-org/gitlab-ce!24140
\| * \| \| \| \| \|	Create shared gl-modal-vuex component and moduleee1979-gl-modal-vuex	Paul Slaughter	2019-01-03	6	-0/+122
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why? It is significantly easier to manage the visibility of the modal in Vuex. The module contains the state and mutations to manage this. The component wraps GlModal and syncs the visibility with the module.
* \| \| \| \| \|	Merge branch 'ce-revert-revert-gold-trial-mrs' into 'master'	Kamil Trzciński	2019-01-04	7	-37/+62
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bring back reverted Gold Trial MR (CE backport) See merge request gitlab-org/gitlab-ce!23621
\| * \| \| \| \|	Port GitLab.com gold trial callout changes to CEce-revert-revert-gold-trial-mrs	Luke Bennett	2019-01-03	7	-37/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8731
* \| \| \| \| \|	Merge branch '27861-add-markdown-editing-buttons-to-the-file-editor' into ↵	Fatih Acet	2019-01-03	3	-37/+154
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Add markdown editing buttons to the file editor" Closes #27861 See merge request gitlab-org/gitlab-ce!23480
\| * \| \| \| \| \|	Add markdown buttons to file editor27861-add-markdown-editing-buttons-to-the-file-editor	Sam Bigelow	2019-01-02	3	-37/+154
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, we have markdown files in many places (e.g. comments, new issues, etc.). This Merge Request detects if the file being edited is a markdown file and adds markdown buttons and their functionality to the single file editor (Not the web IDE)
* \| \| \| \| \| \|	Merge branch 'tz-user-popover-follow-up' into 'master'	Clement Ho	2019-01-03	1	-0/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added Comment to user avatar Image, Changed Fixtures to created ones, added shadow color See merge request gitlab-org/gitlab-ce!23768
\| * \| \| \| \| \| \|	Comment user avatar Image, Changed Fixtures, added new shadow colortz-user-popover-follow-up	Tim Zallmann	2018-12-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Needed to reorder css variables Neede to reorder vars again Added Changelog
* \| \| \| \| \| \| \|	Merge branch '54386-integrate-mobile-css-framework-into-specific-frameworks' ↵	Annabel Dunstone Gray	2019-01-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Integrate mobile CSS framework into specific frameworks Closes #54386 See merge request gitlab-org/gitlab-ce!23301
\| * \| \| \| \| \| \|	Replace aside:not(.right-sidebar) with display properties	Takuya Noguchi	2018-12-12	1	-1/+1
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \| \| \| \| \| \|	Merge branch 'ce-1979-fe-settings-empty' into 'master'	Kushal Pandya	2019-01-03	1	-2/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Port of "(Part 1) FE multiple approval rules settings - empty state" See merge request gitlab-org/gitlab-ce!24087
\| * \| \| \| \| \| \|	Update callout component to receive slotce-1979-fe-settings-empty	Paul Slaughter	2019-01-02	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why? - This is needed to add buttons to the callout
* \| \| \| \| \| \| \|	Collapsible Comments Test for Issues	Ramya Authappan	2019-01-03	2	-3/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '55266-fix-incorrect-due-date-parsing' into 'master'	Clement Ho	2019-01-02	1	-2/+7
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use `parsePikadayDate` to parse due date string Closes #55266 See merge request gitlab-org/gitlab-ce!24045
\| * \| \| \| \| \| \|	Use `parsePikadayDate` to parse due date string	Kushal Pandya	2018-12-27	1	-2/+7
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch ↵	Kushal Pandya	2019-01-02	2	-2/+19
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'54206-show-the-activity-filter-dropdown-in-discussion-tab-only' into 'master' Resolve "Show the activity filter dropdown in discussion tab only, show all discussions always in changes tab" Closes #54206 See merge request gitlab-org/gitlab-ce!24082
\| * \| \| \| \| \| \|	Made discussion filters only visible in merge request discussions tab	Constance Okoghenun	2019-01-02	2	-2/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Discussion filters will be hidden on Commits, Pipelines, and Changes tabs on merge requests page. This does not affect its behavior on issues page
* \| \| \| \| \| \| \|	Resolve "User activity is stuck loading when there is none"	Martin Wortschack	2019-01-02	1	-6/+9
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	John Jarvis	2019-01-01	1	-7/+10
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'security-54377-label-milestone-name-xss' into 'master'	John Jarvis	2019-01-01	1	-7/+10
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[master] Escape label and milestone titles to prevent XSS in GFM autocomplete See merge request gitlab/gitlabhq!2693
\| \| * \| \| \| \| \| \| \|	Escape label and milestone titles to prevent XSS	Kushal Pandya	2018-12-20	1	-7/+10
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Fix commit SHA not showing in merge request compare dropdown	Stan Hu	2018-12-31	1	-1/+1
\| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17011 in GitLab 11.1 refactored the merge request diff comparison functionality but omitted the commit SHA due to a change in the API (truncated_commit_sha -> short_commit_sha). Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55822
* \| \| \| \| \| \| \| \|	Resolve "Status emoji should not update awards section on issue page"	Brandon Labuschagne	2018-12-31	1	-2/+1
\| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fj-fix-lfs-image-comments-diffs' into 'master'	Douwe Maan	2018-12-28	1	-1/+7
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug commenting LFS images and displaying LFS files Closes #43783 See merge request gitlab-org/gitlab-ce!23812
\| * \| \| \| \| \| \|	Fixing image lfs bug and also displaying text lfs	Francisco Javier López	2018-12-27	1	-1/+7
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit, introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23812, fixes a problem creating a displaying image diff notes when the image is stored in LFS. The main problem was that `Gitlab::Diff::File` was returning an invalid valid in `text?` for this kind of files. It also fixes a rendering problem with other LFS files, like text ones. They LFS pointer shouldn't be shown when LFS is enabled for the project, but they were.