delta/gitlab/gitlab-ce.git, branch ce-update-branch-client-preparation gitlab.com: gitlab-org/gitlab-ce.git Move git calls for `Repository#update_branch` inside Gitlab::Git 2018-06-25T23:49:55+00:00 Alejandro Rodríguez alejorro70@gmail.com 2018-06-25T23:49:55+00:00 c6ff7bfaecf537c7f0f3bf70a26b3b544a90205e This prepares this code for migration to Gitaly. 
This prepares this code for migration to Gitaly.
Merge branch 'jivl-update-gitlab-svg-package' into 'master' 2018-06-25T17:18:05+00:00 Tim Zallmann tzallmann@gitlab.com 2018-06-25T17:18:05+00:00 dd949b0be4b2187d01a05ea1ce32abc295077897 Bumps gitlab-svg library version See merge request gitlab-org/gitlab-ce!20153 
Bumps gitlab-svg library version

See merge request gitlab-org/gitlab-ce!20153
 Merge branch 'fix-inconsistent-cancel-button' into 'master' 2018-06-25T16:52:40+00:00 Clement Ho clemmakesapps@gmail.com 2018-06-25T16:52:40+00:00 3755d828fb1401d0bc272cc93a64a1c546e1fc3c Change button text to more specific "Discard draft" Closes #47475 See merge request gitlab-org/gitlab-ce!20140 
Change button text to more specific "Discard draft"

Closes #47475

See merge request gitlab-org/gitlab-ce!20140
 Merge remote-tracking branch 'dev/master' 2018-06-25T16:19:29+00:00 Alessio Caiazza acaiazza@gitlab.com 2018-06-25T16:19:29+00:00 6dd181da163a6479afa695b72f9c99a1e437a7a2 






Merge branch 'security-html_escape_branch_name' into 'master'
2018-06-25T16:17:24+00:00

Alessio Caiazza
acaiazza@gitlab.com

2018-06-25T16:17:24+00:00

43e7e0806b0f5d24a9363d322995dffa01666cf1

[master] HTML escape branch name in project graphs page

See merge request gitlab/gitlabhq!2408




[master] HTML escape branch name in project graphs page

See merge request gitlab/gitlabhq!2408






Merge branch 'security-rd-do-not-show-internal-info-in-public-feed' into 'master'
2018-06-25T16:17:09+00:00

Alessio Caiazza
acaiazza@gitlab.com

2018-06-25T16:17:09+00:00

c7d809698386baa202ca6b2f4f94bcc64f06225c

[master] Don't show internal info in public feed

See merge request gitlab/gitlabhq!2395




[master] Don't show internal info in public feed

See merge request gitlab/gitlabhq!2395






Merge branch 'security-html_escape_usernames' into 'master'
2018-06-25T16:16:45+00:00

Alessio Caiazza
acaiazza@gitlab.com

2018-06-25T16:16:45+00:00

8d18f219feae2907a2f6f5041ea816395de19fb2

[master] HTML escape the name of the user in ProjectsHelper#link_to_member

See merge request gitlab/gitlabhq!2401




[master] HTML escape the name of the user in ProjectsHelper#link_to_member

See merge request gitlab/gitlabhq!2401






Merge branch 'security-2682-fix-xss-for-markdown-toc' into 'master'
2018-06-25T16:15:41+00:00

Alessio Caiazza
acaiazza@gitlab.com

2018-06-25T16:15:41+00:00

9d6499a57812cd27014afe9663339f89927c3b82

[master] Fix xss for Markdown elements where [[_TOC_]] is enabled

See merge request gitlab/gitlabhq!2400




[master] Fix xss for Markdown elements where [[_TOC_]] is enabled

See merge request gitlab/gitlabhq!2400






Merge branch 'security-fj-bumping-sanitize-gem' into 'master'
2018-06-25T16:13:53+00:00

Alessio Caiazza
acaiazza@gitlab.com

2018-06-25T16:13:53+00:00

70c02bf3bce18d39a4fae85bb927334391cd2a5e

[master] Update sanitize gem to 4.6.5 to fix HTML injection vulnerability

See merge request gitlab/gitlabhq!2399




[master] Update sanitize gem to 4.6.5 to fix HTML injection vulnerability

See merge request gitlab/gitlabhq!2399






Merge branch '45933-webide-fade-uneditable-area' into 'master'
2018-06-25T15:43:25+00:00

Phil Hughes
me@iamphill.com

2018-06-25T15:43:25+00:00

da8b8fe33bb6fe6bd017ea4182d7fb4f5888914c

Resolve "Guide users towards editing capabilities in review mode of Web IDE"

Closes #45933

See merge request gitlab-org/gitlab-ce!20008




Resolve "Guide users towards editing capabilities in review mode of Web IDE"

Closes #45933

See merge request gitlab-org/gitlab-ce!20008