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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '53778-remove-site-statistics' into 'master'	Sean McGivern	2018-11-30	2	-79/+0
\| \| \| \| \| \| \| \|	Remove Site Statistic Closes #53778 See merge request gitlab-org/gitlab-ce!23314
*	Fixed GitLab UI import	Phil Hughes	2018-11-30	2	-2/+5
\| \| \| \|	Fixed failing eslint
*	Merge branch '_acet-fix-unable-to-reply-resolved-nondiff-discussion' into ↵	Phil Hughes	2018-11-30	2	-6/+12
\| \| \| \| \| \| \| \| \| \|	'master' Allow commenting to resolved non-diff discussions Closes #54330 See merge request gitlab-org/gitlab-ce!23279
*	Merge branch '54282-tooltip-stuck' into 'master'	Phil Hughes	2018-11-30	1	-4/+4
\| \| \| \| \| \| \| \|	Fixes stuck tooltip on stop env button Closes #53571 and #54282 See merge request gitlab-org/gitlab-ce!23244
*	Merge branch 'sh-fix-hash-filename-handling' into 'master'	Douglas Barbosa Alexandre	2018-11-30	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|	Fix handling of filenames with hash characters in tree view Closes #54473 See merge request gitlab-org/gitlab-ce!23368 (cherry picked from commit 5d82035f623fd910c010c30b97112c46218430d4) e8da70e6 Fix handling of filenames with hash characters in tree view
*	Merge branch 'image-diff-size-fix' into 'master'	Filipa Lacerda	2018-11-30	4	-35/+12
\| \| \| \| \| \| \| \| \| \| \|	Fixed the dimensions of image diffs Closes #54236 See merge request gitlab-org/gitlab-ce!23195 (cherry picked from commit 117fb4487361aa86f6c1bf8e52e30d5e8e2c6630) db56c32c Fixed the dimensions of image diffs
*	Merge branch 'fix-not-render-emoji' into 'master'	Mike Greiling	2018-11-30	1	-4/+7
\| \| \| \| \| \| \| \| \| \|	Fix not render emoji in filter dropdown See merge request gitlab-org/gitlab-ce!23112 (cherry picked from commit 8dd89f03061aa646bcda5055fa96376fb9e30759) 428b220a Fix not render emoji in filter dropdown 59e5bad1 Fix spec to catch not rendering emoji
*	Merge branch 'if-53347_fix_impersonation_tokens' into 'master'	Stan Hu	2018-11-30	5	-17/+23
\| \| \| \| \| \| \| \| \|	Display impersonation token value only after creation See merge request gitlab-org/gitlab-ce!22916 (cherry picked from commit 1d16530501b18528b1955251aa33a26b81f53161) f3cd24a9 Display impersonation token value only after creation
*	Merge branch 'security-fix-uri-xss-applications-11-5' into 'security-11-5'	Steve Azzopardi	2018-11-26	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	[11.5] Resolve "Reflected XSS in OAuth Authorize window due to redirect_uri allowing arbitrary protocols" See merge request gitlab/gitlabhq!2658
\| *	Resolve reflected XSS in Ouath authorize window	James Lopez	2018-11-26	1	-1/+1
\| \|
* \|	Merge branch 'security-email-change-notification-11-5' into 'security-11-5'	Steve Azzopardi	2018-11-26	2	-0/+22
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	[11.5] Resolve: "Provide email notification when a user changes their email address" See merge request gitlab/gitlabhq!2602
\| * \|	Provide email notification on email updates	James Lopez	2018-11-12	2	-0/+22
\| \| \|
* \| \|	[11.5] Fixed ability to comment on and edit/delete comments on locked or ↵	Chantal Rollison	2018-11-26	7	-2/+23
\| \|/ \|/\| \| \| \| \|	confidential issues
* \|	Update code to use API scope on PAT auth	James Lopez	2018-11-23	11	-30/+52
\| \|
* \|	Merge branch ↵	Steve Azzopardi	2018-11-23	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'security-11-5-xss-in-markdown-following-unrecognized-html-element' into 'security-11-5' [11.5] XSS in markdown following unrecognized HTML element See merge request gitlab/gitlabhq!2631
\| * \|	Sanitize output of SpacedLinkFilter	Brett Walker	2018-11-16	1	-1/+1
\| \| \|
* \| \|	Merge branch 'security-mermaid-xss-11-5' into 'security-11-5'	Steve Azzopardi	2018-11-23	1	-0/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[11.5] Fix XSS in mermaid diagrams See merge request gitlab/gitlabhq!2641
\| * \| \|	Configure mermaid to not render HTML content in diagrams	Winnie Hellmann	2018-11-19	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit f2e9f22f7d3d84abeea5ba2918ee5ffcc55f2dad)
* \| \| \|	Merge branch 'security-bvl-exposure-in-commits-list-11-5' into 'security-11-5'	Steve Azzopardi	2018-11-23	1	-53/+41
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[11.5] Don't expose confidential information in commit message list See merge request gitlab/gitlabhq!2642
\| * \| \| \|	Don't use fragment cache on commit page	Bob Van Landuyt	2018-11-19	1	-53/+41
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes sure the user viewing the commit does not get to see anything they're not allowed to see
\| * \| \|	Merge branch 'security-11-5-2717-xss-username-autocomplete' into 'security-11-5'	Steve Azzopardi	2018-11-18	1	-4/+11
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	[11.5] Escape user fullname while rendering autocomplete template to prevent XSS See merge request gitlab/gitlabhq!2606
\| \| * \|	Fix user name autocomplete XSS when name contains HTML	Kushal Pandya	2018-11-12	1	-4/+11
\| \| \|/
* \| \|	Merge branch 'security-issue_51301-11-5' into 'security-11-5'	Steve Azzopardi	2018-11-23	3	-6/+32
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[11.5] Resolve: Promoting a milestone is missing an authorization check See merge request gitlab/gitlabhq!2619
\| * \| \|	Fix milestone promotion authorization	Felipe Artur	2018-11-14	3	-6/+32
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Promoting milestone was missing an authorization check, guest users were being able to promote project milestones to group milestones.
* \| \|	Merge branch 'security-2736-prometheus-ssrf-11-5' into 'security-11-5'	Steve Azzopardi	2018-11-23	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[11.5] Do not follow redirects in prometheus service See merge request gitlab/gitlabhq!2623
\| * \| \|	No redirects in prometheus service	rpereira2	2018-11-14	1	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \|	Do not allow redirects in the prometheus service to prevent SSRFs.
* \| \|	Merge branch 'security-private-group-11-5' into 'security-11-5'	Steve Azzopardi	2018-11-23	1	-0/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[11.5] Fixed read name of private groups See merge request gitlab/gitlabhq!2590
\| * \| \|	Fixed read name of private groups	Chantal Rollison	2018-11-06	1	-0/+10
\| \|/ /
* \| \|	Merge branch 'image-discussion-ff-fix' into 'master'	Filipa Lacerda	2018-11-19	3	-13/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed image discussion styling Closes #54110 See merge request gitlab-org/gitlab-ce!23127 (cherry picked from commit ef1a158773c7cfbf681df6ed7f3514963ad8ca1b) 718c66f6 Fixed image discussion styling
* \| \|	Merge branch 'osw-remove-comment-on-any-diff-line-ff' into 'master'	Douwe Maan	2018-11-19	1	-6/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove 'comment_on_any_diff_line' feature flag Closes #54034 See merge request gitlab-org/gitlab-ce!23093 (cherry picked from commit b7cedd91e5ec07461b25f3920ae6cf2b00f3d84e) 6c796702 Remove 'comment_on_any_diff_line' feature flag
* \| \|	Merge branch 'security-11-5-2717-xss-username-autocomplete' into 'security-11-5'	Steve Azzopardi	2018-11-18	1	-4/+11
\| \|/ \|/\| \| \| \| \| \| \|	[11.5] Escape user fullname while rendering autocomplete template to prevent XSS See merge request gitlab/gitlabhq!2606
* \|	Merge branch 'ignore-environment-validation-failure' into 'master'	Kamil Trzciński	2018-11-15	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore environment validation failure See merge request gitlab-org/gitlab-ce!23100 (cherry picked from commit 0f25d2b33fbee7161f0ecf26a6d853533808beec) ea695ab7 Ignore environment validation failure a2a2a8f0 Add changelog 00842f95 User persisted?
* \|	Merge branch '53882-extra-container-diff-version' into 'master'	Fatih Acet	2018-11-15	1	-2/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix version system note Closes #53882 See merge request gitlab-org/gitlab-ce!23030 (cherry picked from commit d645df8220669b7ccb889349d412bf527d621fc4) f25e6aa2 Fix version system note d0f8e279 Remove box on diff tab system note 0c4170b8 Add back margin on discussion system notes 5e66292d Tweak vertical line to line up with system notes and comment avatars
* \|	Merge branch 'mr-expand-all-collapsed-files' into 'master'	Filipa Lacerda	2018-11-15	1	-3/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix collapsed files not fully fully expanding Closes #53866 See merge request gitlab-org/gitlab-ce!23019 (cherry picked from commit 63b4b4b2688fa4f068772026536b2250bce39070) 8e265bc3 Fix collapsed files not fully fully expanding
* \|	Merge branch 'fix-deployment-metrics-in-mr-widget' into 'master'	Kamil Trzciński	2018-11-15	2	-4/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid returning deployment metrics url to MR widget when the deployment is not successful Closes #53870 See merge request gitlab-org/gitlab-ce!23010 (cherry picked from commit 7674a8f477c90c1c8c9a969e7d80ea1ec9e72cd9) e270fcc8 Fix deployment metrics in MR widget 15431054 Add spec for deployment metrics 2d6570f0 Do not remove the existing permission check 09e693c6 Add changelog d8c24ac1 Remove unrelated changes
* \|	Merge branch '53636-fix-rendering-of-any-user-filter' into 'master'11-5-stable-prepare-rc9	Clement Ho	2018-11-14	1	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable updating appearance of filter tokens for special values Closes #53636 See merge request gitlab-org/gitlab-ce!22865
* \|	Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master'	Douwe Maan	2018-11-14	8	-25/+71
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Comment on any expanded diff line on MRs (with feature-flag) Closes #13950 See merge request gitlab-org/gitlab-ce!22914
* \|	Merge branch '53918-snippet-commit-comments' into 'master'	Fatih Acet	2018-11-14	2	-4/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix styling of snippet and commit discussion comments Closes #53918 See merge request gitlab-org/gitlab-ce!23035
* \|	Merge branch 'discussion-fixes-2' into 'master'	Fatih Acet	2018-11-14	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix vertical line alignment in discussion & diff border-radius Closes #53975 See merge request gitlab-org/gitlab-ce!23075
* \|	Merge branch 'dark-theme-comments' into 'master'	Fatih Acet	2018-11-14	1	-0/+4
\| \| \| \| \| \| \| \| \| \|	Add white background to commit diff comments See merge request gitlab-org/gitlab-ce!23078
* \|	Merge branch 'dm-commit-email-select-options' into 'master'	Stan Hu	2018-11-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug causing not all emails to show up in commit email selectbox Closes #54045 See merge request gitlab-org/gitlab-ce!23079
* \|	Merge branch ↵	Phil Hughes	2018-11-14	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'54002-activity-feed-missing-padding-in-event-note-when-a-branch-is-deleted' into 'master' Resolve "Activity Feed - Missing padding in event note when a branch is deleted" Closes #54002 See merge request gitlab-org/gitlab-ce!23038
* \|	Merge branch '53780-commit-discussion-ui' into 'master'11-5-stable-prepare-rc8	Fatih Acet	2018-11-13	5	-22/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken UI on commit discussions Closes #53780 See merge request gitlab-org/gitlab-ce!22952
* \|	Merge branch 'archive-builds-documentation' into 'master'	Achilleas Pipinellis	2018-11-13	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation for archive builds Closes #53534 See merge request gitlab-org/gitlab-ce!22909
* \|	Merge branch 'rs-revert-api' into 'master'	Nick Thomas	2018-11-13	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add revert to commits API Closes gitlab-org/release/framework#48 See merge request gitlab-org/gitlab-ce!22919
* \|	Merge branch 'align-vertical-discussion-line' into 'master'	Fatih Acet	2018-11-13	1	-3/+3
\| \| \| \| \| \| \| \| \| \|	Align all avatars and system notes in discussion See merge request gitlab-org/gitlab-ce!22994
* \|	Merge branch '_acet-discussion-redesign-fixes' into 'master'	Annabel Dunstone Gray	2018-11-13	1	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Border radius fixes for redesigned discussions Closes #53880 and #53767 See merge request gitlab-org/gitlab-ce!23006
* \|	Merge branch 'enable-image-comments-for-renamed-files' into 'master'	Filipa Lacerda	2018-11-13	1	-2/+5
\| \| \| \| \| \| \| \| \| \|	Fixed image commenting on moved files See merge request gitlab-org/gitlab-ce!23023
* \|	Merge branch '53888-missing-favicon' into 'master'	Phil Hughes	2018-11-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds back missing CI favicon Closes #53888 See merge request gitlab-org/gitlab-ce!23002
* \|	Merge branch '53972-fix-fill-shards' into 'master'	Stan Hu	2018-11-13	1	-6/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a race condition in the shard population logic Closes #53972 See merge request gitlab-org/gitlab-ce!23028