Commits · 290f932daa2de2830a524a4c96df0e60cbaf18ed · Léo-Paul Géneau / gitlab-ce

07 Nov, 2017 2 commits

Merge branch 'security-9-5-36099-api-responses-missing-x-content' into 'security-9-5' · 290f932d

Douwe Maan authored Nov 03, 2017

(backport) Include X-Content-Type-Options (XCTO) header into API responses

See merge request gitlab/gitlabhq!2216

(cherry picked from commit 5fcb214f8527b3d58be1a833a596d01b1bf6119e)

40c6c9f4 Include X-Content-Type-Options (XCTO) header into API responses

290f932d

Merge branch 'ssrf-protections-round-2-9-5' into 'security-9-5' · fe419949

Douwe Maan authored Nov 07, 2017

eplace SSRF resolver with Addrinfo.getaddrinfo to include alternative localhost versions (9-5)

See merge request gitlab/gitlabhq!2221

(cherry picked from commit 53cc25eb3d45c782b5085524a8976f034ef18781)

96555882 Replace SSRF resolver with Addrinfo.getaddrinfo to include alternative localhost versions

fe419949

16 Oct, 2017 2 commits
- Update VERSION to 9.5.9 · 19893b0a
  Jarka Kadlecova authored Oct 16, 2017
  
  19893b0a
- Update CHANGELOG.md for 9.5.9 · e9788c92
  Jarka Kadlecova authored Oct 16, 2017
```
[ci skip]
```
  e9788c92
14 Oct, 2017 5 commits
- Merge branch '3435-backport-9-5' into 'security-9-5' · a2eec9fb
  Stan Hu authored Oct 14, 2017
```
3435 backport for 9.5

See merge request gitlab/gitlabhq!2207
```
  a2eec9fb
- Merge branch 'security-9-5' into 3435-backport-9-5 · 4d1d4151
  Stan Hu authored Oct 14, 2017
  
  4d1d4151
- Merge branch 'acey-flakes' into 'master' · 099928ad
  Rémy Coutable authored Sep 19, 2017
```
fix transient user_edits_files_spec failures

See merge request gitlab-org/gitlab-ce!14324
```
  099928ad
- Merge remote-tracking branch 'origin/security-9-5' into 3435-backport-9-5 · 9d42830f
  Stan Hu authored Oct 14, 2017
  
  9d42830f
- Fix conflicts in Gemfile.lock · 693285ef
  Brian Neel authored Oct 14, 2017
  
  693285ef
13 Oct, 2017 1 commit
- remove spec for non-existent endpoint · fc451b7d
  micael.bergeron authored Oct 13, 2017
  
  fc451b7d
12 Oct, 2017 7 commits
- Remove redundant spec · df7e1592
  Robert Speicher authored Oct 10, 2017
  
  df7e1592
- Merge branch 'port-ee-3435' into 'security-10-0' · 0ff8a550
  Robert Speicher authored Sep 27, 2017
```
[10.0 CE] Prevent "Related Issues" from leaking confidential issues

See merge request gitlab/gitlabhq!2193
```
  0ff8a550
- Merge branch '38126-security-username-change-9-5' into 'security-9-5' · c1fbd36f
  Douwe Maan authored Sep 27, 2017
```
Move project repositories between namespaces when renaming users (9.5)

See merge request gitlab/gitlabhq!2202
```
  c1fbd36f
- Merge branch 'winh-search-bar-xss-9.5' into 'security-9-5' · ae3d80e8
  Phil Hughes authored Sep 26, 2017
```
Escape user name in filtered search bar

See merge request gitlab/gitlabhq!2195
```
  ae3d80e8
- Merge branch 'rs-sanitize-unicode-in-protocol-9-5' into 'security-9-5' · a3b68de7
  Douwe Maan authored Sep 28, 2017
```
[9.5] Prevent a persistent XSS in user-provided markup

See merge request gitlab/gitlabhq!2203
```
  a3b68de7
- Merge branch '37759-also-treat-newlines-as-separator' into 'master' · 28152b40
  Kamil Trzciński authored Sep 14, 2017
```
Treat newlines as separators for pipeline emails service

Closes #37759

See merge request gitlab-org/gitlab-ce!14250
```
  28152b40
- Merge branch 'fix-arbitrary-redirect-vulnerability' into 'security-10-0' · 6b4f2810
  Robert Speicher authored Sep 27, 2017
```
Fix arbitrary redirect location vulnerability

See merge request gitlab/gitlabhq!2192
```
  6b4f2810
10 Oct, 2017 1 commit
- Merge branch 'fix-arbitrary-redirect-vulnerability' into 'security-10-0' · dc6b679b
  Robert Speicher authored Sep 27, 2017
```
Fix arbitrary redirect location vulnerability

See merge request gitlab/gitlabhq!2192
```
  dc6b679b
04 Oct, 2017 3 commits
- Update VERSION to 9.5.8 · 3f4b55f5
  Jose Ivan Vargas authored Oct 04, 2017
  
  3f4b55f5
- Update CHANGELOG.md for 9.5.8 · c5d1017c
  Jose Ivan Vargas authored Oct 04, 2017
```
[ci skip]
```
  c5d1017c
- Merge branch 'fork-btn-enabled-user-groups' into 'master' · 6c4bf7fb
  Filipa Lacerda authored Sep 29, 2017
```
Fix fork button being disabled for users who can fork to group

Closes #38462

See merge request gitlab-org/gitlab-ce!14551
```
  6c4bf7fb
03 Oct, 2017 3 commits
- Update VERSION to 9.5.7 · 51246098
  Jose Ivan Vargas authored Oct 03, 2017
  
  51246098
- Update CHANGELOG.md for 9.5.7 · 0c7c115b
  Jose Ivan Vargas authored Oct 03, 2017
```
[ci skip]
```
  0c7c115b
- Merge branch 'sh-import-repos-fix-9-5' into '9-5-stable' · 727f5fd5
  Robert Speicher authored Oct 03, 2017
```
Fix gitlab rake:import:repos task for 9.5.x

See merge request gitlab-org/gitlab-ce!14639
```
  727f5fd5
02 Oct, 2017 1 commit

Fix gitlab rake:import:repos task · 7ac4e2b2

Stan Hu authored Oct 02, 2017

This backports !14597 for the 9.5.x branch.

Because of a change in GitLab 9.5.4 to prevent users from assuming control of
a repository already on disk, the import task broke. Imports would fail with
the message, "There is already a repository with that name on disk".

This change skips the validation when the import is done from the
command-line.

Closes #37682

7ac4e2b2

29 Sep, 2017 2 commits
- Update VERSION to 9.5.6 · d62889dd
  Jose Ivan Vargas authored Sep 29, 2017
  
  d62889dd
- Update CHANGELOG.md for 9.5.6 · b65705b0
  Jose Ivan Vargas authored Sep 29, 2017
```
[ci skip]
```
  b65705b0
28 Sep, 2017 7 commits

Merge branch '38319-9-5-stable' into '9-5-stable-patch-6' · 3a429e0f
Jose Ivan Vargas Lopez authored Sep 28, 2017
```
Handle error when fetching ref for MR with deleted source branch

See merge request gitlab-org/gitlab-ce!14550
```
3a429e0f
Merge branch 'winh-upgrade-nokogiri' into 'master' · 7d4ad67b
Robert Speicher authored Sep 21, 2017
```
Upgrade Nokogiri because of CVE-2017-9050

See merge request gitlab-org/gitlab-ce!14427
```
7d4ad67b

Merge branch '37465-fix-line-resolve-all-green-checkmark-icon' into 'master' · bc8a5795

Annabel Dunstone Gray authored Sep 18, 2017

Update "x/x discussions resolved" checkmark icon to be green when all discussions resolved

Closes #37465

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

bc8a5795

Merge branch '33287-fix-mr-widget-errors-with-external-services' into 'master' · 9c57b3d7
Fatih Acet authored Sep 19, 2017
```
Fix MR widget with external CI services/integrations

Closes #33287

See merge request gitlab-org/gitlab-ce!13977
```
9c57b3d7

Merge branch '37259-some-mr-ready-mobile-fixes' into 'master' · 610e1b6e

Fatih Acet authored Sep 18, 2017

Fix MR widget with ready to merge buttons/controls at mobile breakpoint

Closes #37259

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

610e1b6e

Handle error when fetching ref for MR with deleted source branch · e38fcc8c

Sean McGivern authored Sep 28, 2017

If the ref doesn't exist, and the source branch is deleted, we can't get it back
easily. Previously, we ignored this error by shelling out, so replicate that
behaviour.

e38fcc8c

Merge branch 'rs-sanitize-unicode-in-protocol-9-5' into 'security-9-5' · 65d6dcdb
Douwe Maan authored Sep 28, 2017
```
[9.5] Prevent a persistent XSS in user-provided markup

See merge request gitlab/gitlabhq!2203
```
65d6dcdb

27 Sep, 2017 3 commits
- Merge branch '38126-security-username-change-9-5' into 'security-9-5' · f1de9aa2
  Douwe Maan authored Sep 27, 2017
```
Move project repositories between namespaces when renaming users (9.5)

See merge request gitlab/gitlabhq!2202
```
  f1de9aa2
- Prevent a persistent XSS in user-provided markup · 3d55b49a
  Robert Speicher authored Sep 25, 2017
```
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/38272
```
  3d55b49a
- Move project repositories between namespaces when renaming users · a8e04b32
  Gabriel Mazetto authored Sep 26, 2017
  
  a8e04b32
26 Sep, 2017 1 commit
- Merge branch 'winh-search-bar-xss-9.5' into 'security-9-5' · 31a79544
  Phil Hughes authored Sep 26, 2017
```
Escape user name in filtered search bar

See merge request gitlab/gitlabhq!2195
```
  31a79544
25 Sep, 2017 2 commits
- Merge branch 'winh-upgrade-nokogiri' into 'master' · 80ef42d6
  Robert Speicher authored Sep 21, 2017
```
Upgrade Nokogiri because of CVE-2017-9050

See merge request gitlab-org/gitlab-ce!14427
```
  80ef42d6
- Add changelog entry · 18eaac2f
  Winnie Hellmann authored Sep 25, 2017
  
  18eaac2f