Commits · e122e14ac6a25c7813ca888a97bd4a3298e78d9d · nexedi / gitlab-ce

29 Nov, 2018 10 commits
- Merge branch 'security-guest-comments' into 'master' · e122e14a
  Cindy Pallares authored Nov 28, 2018
```
[master]Fixed ability to comment on and edit/delete comments on locked or confidential issues

See merge request gitlab/gitlabhq!2612
```
  e122e14a
- Merge branch 'security-pages-toctou-race' into 'master' · ffd1c4cd
  Cindy Pallares authored Nov 28, 2018
```
[master] [pages] Possible symlink time of check to time of use race condition

Closes #2742

See merge request gitlab/gitlabhq!2638
```
  ffd1c4cd
- Merge branch 'security-xss-in-markdown-following-unrecognized-html-element' into 'master' · b5b475c2
  Cindy Pallares authored Nov 28, 2018
```
[master] XSS in markdown following unrecognized HTML element

Closes #2732

See merge request gitlab/gitlabhq!2599
```
  b5b475c2
- Merge branch 'security-mermaid-xss' into 'master' · c4bb0a11
  Cindy Pallares authored Nov 28, 2018
```
[master] Fix XSS in mermaid diagrams

See merge request gitlab/gitlabhq!2597
```
  c4bb0a11
- Merge branch 'security-bvl-exposure-in-commits-list' into 'master' · e3a5ce58
  Cindy Pallares authored Nov 28, 2018
```
[master] Don't expose confidential information in commit message list

See merge request gitlab/gitlabhq!2626
```
  e3a5ce58
- Merge branch 'security-issue_51301' into 'master' · 17f83726
  Cindy Pallares authored Nov 28, 2018
```
[master] Resolve: Promoting a milestone is missing an authorization check

See merge request gitlab/gitlabhq!2598
```
  17f83726
- Merge branch 'security-2736-prometheus-ssrf' into 'master' · 94ab2d5f
  Cindy Pallares authored Nov 28, 2018
```
[master] Do not follow redirects in prometheus service

See merge request gitlab/gitlabhq!2617
```
  94ab2d5f
- Merge branch 'security-stored-xss-for-environments' into 'master' · 4bc6f2e3
  Cindy Pallares authored Nov 28, 2018
```
[master] Stored XSS for Environments

Closes #2727

See merge request gitlab/gitlabhq!2594
```
  4bc6f2e3
- Merge branch 'security-private-group' into 'master' · 1be0174b
  Cindy Pallares authored Nov 28, 2018
```
[master] Fixed read private group names

See merge request gitlab/gitlabhq!2589
```
  1be0174b
- Merge branch 'security-182-update-workhorse' into 'master' · 3881285c
  Cindy Pallares authored Nov 28, 2018
```
[Master] Redact sensitive information on gitlab-workhorse log

See merge request gitlab/gitlabhq!2584
```
  3881285c
28 Nov, 2018 30 commits
- Merge branch 'gt-externalize-app-views-snippets' into 'master' · 335434ca
  Fatih Acet authored Nov 28, 2018
```
Externalize strings from `/app/views/snippets`

See merge request gitlab-org/gitlab-ce!23351
```
  335434ca
- Merge branch 'tc-improve-add-reference-cop' into 'master' · 529aca35
  Andreas Brandl authored Nov 28, 2018
```
Make add_reference cop accept a hash for :index

See merge request gitlab-org/gitlab-ce!23375
```
  529aca35
- Merge branch 'sh-bump-workhorse-7.2.1' into 'master' · c31fd5a2
  Nick Thomas authored Nov 28, 2018
```
Bump GitLab Workhorse to 7.2.1

See merge request gitlab-org/gitlab-ce!23424
```
  c31fd5a2
- Merge branch 'docs/better-alignment-of-tables' into 'master' · b8e5acb2
  Achilleas Pipinellis authored Nov 28, 2018
```
Force better alignment in tables

See merge request gitlab-org/gitlab-ce!23393
```
  b8e5acb2
- Merge branch 'include-new-link-in-breadcrumb' into 'master' · 63344c0e
  Clement Ho authored Nov 28, 2018
```
Include new and edit links in breadcrumb for project milestones, group milestones, and labels

Closes #43998

See merge request gitlab-org/gitlab-ce!18515
```
  63344c0e
- Include new and edit links in breadcrumb for project milestones, group milestones, and labels · 0e75378b
  George Tsiolis authored Nov 28, 2018
  
  0e75378b
- Merge branch 'jramsay/improve-resolve-conflicts-docs' into 'master' · 88254cd3
  Achilleas Pipinellis authored Nov 28, 2018
```
Improve detail of resolve conflict docs

See merge request gitlab-org/gitlab-ce!22927
```
  88254cd3
- Merge branch 'unicorn-monkey-patch' into 'master' · 62488fe2
  Stan Hu authored Nov 28, 2018
```
Add monkey patch to unicorn to fix eof? problem

See merge request gitlab-org/gitlab-ce!23385
```
  62488fe2
- Bump GitLab Workhorse to 7.2.1 · 476080bc
  Stan Hu authored Nov 28, 2018
```
https://gitlab.com/gitlab-org/gitlab-workhorse/blob/master/CHANGELOG
```
  476080bc
- Merge branch '38495-calendar-activities-in-timezone' into 'master' · 75eb0416
  Rémy Coutable authored Nov 28, 2018
```
Show user contributions in correct timezone within user profile

Closes #38495

See merge request gitlab-org/gitlab-ce!23419
```
  75eb0416
- Show user contributions in correct timezone within user profile · 8183c919
  Kushal Pandya authored Nov 28, 2018
  
  8183c919
- Merge branch 'jarv/add-qa-cookies' into 'master' · f912e3b1
  Rémy Coutable authored Nov 28, 2018
```
Adds QA_COOKIES option to gitlab-qa

See merge request gitlab-org/gitlab-ce!23416
```
  f912e3b1
- Add monkey patch to unicorn to fix eof? problem · dc962788
  Kamil Trzciński authored Nov 27, 2018
```
Rack with Unicorn is unable to handle chunked requests due to private `eof?` method.
This exposes `eof?` not changing `rack` behavior.

Issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/8539
```
  dc962788
- Merge branch 'remove-deployment-status-hack-from-backend' into 'master' · 56da2308
  Rémy Coutable authored Nov 28, 2018
```
Return real deployment status to frontend

Closes #53578

See merge request gitlab-org/gitlab-ce!23270
```
  56da2308
- Return real deployment status to frontend · 81b45046
  Shinya Maeda authored Nov 28, 2018
  
  81b45046
- Merge branch '50839-webide-mr-dropdown-filter' into 'master' · f63ede5d
  Phil Hughes authored Nov 28, 2018
```
Resolve "Bug - Web Based IDE - The "Merge" Requests Selection displays Merge Requests from other projects"

Closes #50839

See merge request gitlab-org/gitlab-ce!23400
```
  f63ede5d
- Resolve "Bug - Web Based IDE - The "Merge" Requests Selection displays Merge... · 95c795de
  Paul Slaughter authored Nov 28, 2018
```
Resolve "Bug - Web Based IDE - The "Merge" Requests Selection displays Merge Requests from other projects"
```
  95c795de
- Improve detail of resolve conflict docs · 1b7ecba0
  James Ramsay authored Nov 08, 2018
  
  1b7ecba0
- Merge branch '54571-runner-tags' into 'master' · 6fd5ba3b
  Kushal Pandya authored Nov 28, 2018
```
Adds margin between tags when job is stuck

Closes #54571

See merge request gitlab-org/gitlab-ce!23407
```
  6fd5ba3b
- Adds QA_COOKIES option to gitlab-qa · 8cfefefa
  John Jarvis authored Nov 28, 2018
  
  8cfefefa
- Merge branch 'zj-object-pool-path' into 'master' · c43af897
  Nick Thomas authored Nov 28, 2018
```
Rename Repository table to PoolRepository

See merge request gitlab-org/gitlab-ce!23236
```
  c43af897
- Merge branch '51061-readme-url-n-1-rpc-call-resolved' into 'master' · ae563565
  Douwe Maan authored Nov 28, 2018
```
Resolves N+1 RPC call for Project#readme_url

Closes #51061

See merge request gitlab-org/gitlab-ce!23357
```
  ae563565
- Merge branch 'check-if-fetched-data-does-is-complete' into 'master' · 06d1db85
  Kamil Trzciński authored Nov 28, 2018
```
Validate chunk size when persist

See merge request gitlab-org/gitlab-ce!23341
```
  06d1db85
- Validate chunk size when persist · 7743828d
  Shinya Maeda authored Nov 28, 2018
  
  7743828d
- Adds bottom margin to the environment info block · eb7c16de
  Filipa Lacerda authored Nov 28, 2018
  
  eb7c16de
- Resolves N+1 RPC call for Project#readme_url · 329a890f
  Tiago Botelho authored Nov 26, 2018
```
Caches repository.path into Repository#readme_path
```
  329a890f
- Merge branch 'docs/remove-defunct-global-var-reset' into 'master' · 0f800a5c
  Grzegorz Bizon authored Nov 28, 2018
```
[docs] Stop documenting defunct global variables reset

Closes gitlab-runner#3320

See merge request gitlab-org/gitlab-ce!21447
```
  0f800a5c
- Merge branch '50341-cleanup-useless-project-import-attributes' into 'master' · 5e3076f2
  Douwe Maan authored Nov 28, 2018
```
Removes all the irrelevant code and columns that were migrated from the Project…

See merge request gitlab-org/gitlab-ce!21497
```
  5e3076f2
- Merge branch 'docs/6236-add_security_checks_to_workflow' into 'master' · 57d98273
  Sean McGivern authored Nov 28, 2018
```
Left shift security in our workflow

See merge request gitlab-org/gitlab-ce!23132
```
  57d98273
- Left shift security in our workflow · cbfd6ace
  Philippe Lafoucrière authored Nov 28, 2018
  
  cbfd6ace