Commits · 11-1-stable-salsa · Salsa / GitLab Salsa Edition

11 Aug, 2018 2 commits

Fix LFS uploads not working with git-lfs 2.5.0 · f1b07979

Stan Hu authored Jul 31, 2018 and

Bastian Blank committed Aug 11, 2018

git-lfs 2.5.0 now sets the Content-Type header instead of hard-coding it to
application/octet-stream: https://github.com/git-lfs/git-lfs/pull/3137

To avoid this issue, we explicitly tell the client to use
application/octet-stream.

Closes #49752

(cherry picked from commit c5645a67)

f1b07979

Merge tag 'v11.1.4' into 11-1-stable-salsa · 46af0db6
Bastian Blank authored Aug 11, 2018
```
Version v11.1.4
```
46af0db6

30 Jul, 2018 5 commits
- Update VERSION to 11.1.4 · 63daf37a
  GitLab Release Tools Bot authored Jul 30, 2018
  
  63daf37a
- Update CHANGELOG.md for 11.1.4 · 162a2d7b
  GitLab Release Tools Bot authored Jul 30, 2018
```
[ci skip]
```
  162a2d7b
- Merge branch '11-1-stable-patch-4' into '11-1-stable' · 9ed2b83f
  Jose Ivan Vargas authored Jul 30, 2018
```
Prepare 11.1.4 release

See merge request gitlab-org/gitlab-ce!20907
```
  9ed2b83f
- Merge branch 'docs/zj-remove-fs-shard-check' into 'master' · dcfa612d
  Stan Hu authored Jul 30, 2018
```
Remove references to FS Shard check from the docs

Closes #49725

See merge request gitlab-org/gitlab-ce!20897
```
  dcfa612d
- Revert "Merge branch '11-1-3-stable-fixes-mr-refactor-regressions' into '11-1-stable-patch-3'" · a695151d
  Alessio Caiazza authored Jul 30, 2018
```
This reverts commit 0cf82355, reversing
changes made to 923b2613.
```
  a695151d
27 Jul, 2018 11 commits
- Update VERSION to 11.1.3 · 55ede3d2
  GitLab Release Tools Bot authored Jul 27, 2018
  
  55ede3d2
- Update CHANGELOG.md for 11.1.3 · 069890b8
  GitLab Release Tools Bot authored Jul 27, 2018
```
[ci skip]
```
  069890b8
- Merge branch '11-1-3-stable-fixes-mr-refactor-regressions' into '11-1-stable-patch-3' · 0cf82355
  Felipe Artur authored Jul 27, 2018
```
MR refactor fixes for 11.1.3

See merge request gitlab-org/gitlab-ce!20878
```
  0cf82355
- Merge branch 'feature/add-docs-to-disable-listener' into 'master' · 923b2613
  Achilleas Pipinellis authored Jul 24, 2018
```
Add docs to disable proxy listener

See merge request gitlab-org/gitlab-ce!19734
```
  923b2613
- Merge branch '4525-fix-project-indexes' into 'master' · d2022111
  Yorick Peterse authored Jul 18, 2018
```
Improve projects indexes

See merge request gitlab-org/gitlab-ce!20377
```
  d2022111
- Merge branch 'revert-aeb3df17' into 'master' · 5fab5af1
  Achilleas Pipinellis authored Jul 24, 2018
```
Revert "Merge branch '2211-add-option-to-change-clone-path-docs' into 'master'"

See merge request gitlab-org/gitlab-ce!20633
```
  5fab5af1
- Merge branch 'project-dropdown-list-overflow' into 'master' · e8adef90
  Phil Hughes authored Jul 20, 2018
```
Don't overflow project/group dropdown results

Closes #49382 and #49379

See merge request gitlab-org/gitlab-ce!20704
```
  e8adef90
- Merge branch 'ide-edit-json-files' into 'master' · ead0424b
  Tim Zallmann authored Jul 26, 2018
```
Fixed IDE not opening JSON files

See merge request gitlab-org/gitlab-ce!20798
```
  ead0424b
- Merge branch 'zj-backup-timeout' into 'master' · 2d0fe451
  Rémy Coutable authored Jul 24, 2018
```
Remove timeouts for long running requests

See merge request gitlab-org/gitlab-ce!20810
```
  2d0fe451
- Merge branch 'gitlab-qa-reset-local-store' into 'master' · 5d390d66
  Rémy Coutable authored Jul 26, 2018
```
Reset local storage between qa tests

Closes gitlab-qa#303

See merge request gitlab-org/gitlab-ce!20844
```
  5d390d66
- Merge tag 'v11.1.2' into 11-1-stable-salsa · 50bae62c
  Bastian Blank authored Jul 27, 2018
```
Version v11.1.2
```
  50bae62c
26 Jul, 2018 2 commits
- Update VERSION to 11.1.2 · 35936b0b
  GitLab Release Tools Bot authored Jul 26, 2018
  
  35936b0b
- Update CHANGELOG.md for 11.1.2 · 0040326b
  GitLab Release Tools Bot authored Jul 26, 2018
```
[ci skip]
```
  0040326b
25 Jul, 2018 1 commit
- Merge branch 'sh-revert-markdown-changes' into 'master' · a9a2c0df
  Robert Speicher authored Jul 24, 2018
```
Fix slow Markdown rendering

Closes #49409

See merge request gitlab-org/gitlab-ce!20820
```
  a9a2c0df
24 Jul, 2018 6 commits
- Merge branch 'security-11-1-48617-promoting-milestone' into 'security-11-1' · 41d61cba
  Alessio Caiazza authored Jul 23, 2018
```
[11.1] Escapes milestone title shown in flash message when promoting a milestone

See merge request gitlab/gitlabhq!2443
```
  41d61cba
- Merge branch 'security-ide-branch-name-xss-11-1' into 'security-11-1' · ae8a7797
  Felipe Artur Cardozo authored Jul 24, 2018
```
[11.1] Fixed XSS in branch name in Web IDE

See merge request gitlab/gitlabhq!2446
```
  ae8a7797
- Merge branch 'security-11-1-2690-fix-tooltip' into 'security-11-1' · fb9cc47c
  Alessio Caiazza authored Jul 23, 2018
```
[11.1] Escapes job name used in tooltips in vue components

See merge request gitlab/gitlabhq!2428
```
  fb9cc47c
- Merge branch 'security-fj-missing-csrf-system-hooks-11-1' into 'security-11-1' · fe8b17ff
  Felipe Artur Cardozo authored Jul 24, 2018
```
[11.1] Missing CSRF in System Hooks

See merge request gitlab/gitlabhq!2444
```
  fe8b17ff
- Merge branch 'security-event-counters-private-data-11-1' into 'security-11-1' · 44318222
  Felipe Artur Cardozo authored Jul 24, 2018
```
[11.1] Don't expose project names in various counters

See merge request gitlab/gitlabhq!2445
```
  44318222
- Merge branch 'tz-mr-refactor-mem-posting' into 'master' · d1f09ec7
  Fatih Acet authored Jul 23, 2018
```
Improving performance of posting a comment by reducing memory + CPU

See merge request gitlab-org/gitlab-ce!20779
```
  d1f09ec7
23 Jul, 2018 13 commits
- Merge branch 'tz-mr-refactor-memory-reduction' into 'master' · 82adca28
  Fatih Acet authored Jul 23, 2018
```
Reducing the memory footprint for the rendering

See merge request gitlab-org/gitlab-ce!20744
```
  82adca28
- Merge branch '48817-fix-mr-changes-discussion-navigation' into 'master' · 537a8b84
  Filipa Lacerda authored Jul 20, 2018
```
Resolve ""Jump to first/next unresolved discussion" jumps to resolved discussions"

Closes #48817 and #48602

See merge request gitlab-org/gitlab-ce!20434
```
  537a8b84
- Merge branch '_acet-fix-mr-autosave' into 'master' · 56c06588
  Tim Zallmann authored Jul 18, 2018
```
Fix autosave issues for MR discussions

Closes #48876 and #48877

See merge request gitlab-org/gitlab-ce!20569
```
  56c06588
- Merge branch '_acet-fix-expanding-context-lines' into 'master' · 8d4f7f39
  Tim Zallmann authored Jul 18, 2018
```
Fix rendering context lines on MR diffs

Closes #49242 and #49343

See merge request gitlab-org/gitlab-ce!20642
```
  8d4f7f39
- Merge branch '_acet-fix-outdated-discussions' into 'master' · 5307d05c
  Tim Zallmann authored Jul 18, 2018
```
Fix showing outdated discussions on Changes tab.

Closes #48167

See merge request gitlab-org/gitlab-ce!20445
```
  5307d05c
- Update VERSION to 11.1.1 · 94b93230
  GitLab Release Tools Bot authored Jul 23, 2018
  
  94b93230
- Update CHANGELOG.md for 11.1.1 · 6e60f3cf
  GitLab Release Tools Bot authored Jul 23, 2018
```
[ci skip]
```
  6e60f3cf
- SALSA: Ignore job requests for rate limit · 325a9b12
  Bastian Blank authored Jul 05, 2018 and Bastian Blank committed Jul 23, 2018
```
See https://gitlab.com/gitlab-org/gitlab-ce/issues/46951
```
  325a9b12
- SALSA: Don't send notifications for project moves within the debian group · e9aba16b
  Alexander Wirt authored Mar 23, 2018 and Bastian Blank committed Jul 23, 2018
  
  e9aba16b
- SALSA: Disallow group name change by non-admin · d1d1c3c9
  Bastian Blank authored Jan 09, 2018
  
  d1d1c3c9
- Merge remote-tracking branch 'origin/gitaly-0.111.2' into 11-1-stable-patch-1 · 7abb2f7f
  Alessio Caiazza authored Jul 23, 2018
  
  7abb2f7f
- Merge branch 'update-mr-img-docs' into 'master' · 752002b4
  Mike Lewis authored Jul 22, 2018
```
Update merge_request.png in docs

See merge request gitlab-org/gitlab-ce!20730
```
  752002b4
- Merge branch 'milestones-update-docs' into 'master' · 596e0ae5
  Mike Lewis authored Jul 22, 2018
```
Update docs milestones

See merge request gitlab-org/gitlab-ce!20731
```
  596e0ae5