Commits · e9d0bd8e909d077567b3ce3f9629b1602c731b37 · nexedi / gitlab-ce

29 Nov, 2018 9 commits
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee · e9d0bd8e
  Steve Azzopardi authored Nov 29, 2018
  
  e9d0bd8e
- Merge branch 'security-fix-pat-web-access-ee' into 'master' · 083e20e7
  Cindy Pallares authored Nov 28, 2018
```
[master] EE Resolve "Personal access token with only `read_user` scope can be used to authenticate any web request"

See merge request gitlab/gitlab-ee!726
```
  083e20e7
- Merge branch 'security-358-operations-page-visible-to-reporters' into 'master' · 2bac4bb6
  Cindy Pallares authored Nov 28, 2018
```
[master] Operations settings page visible to reporter users

See merge request gitlab/gitlab-ee!724
```
  2bac4bb6
- Merge branch 'security-mr-approvers-xss' into 'master' · 53116de2
  Cindy Pallares authored Nov 28, 2018
```
[master] Fixed XSS in merge request approvers

Closes #353

See merge request gitlab/gitlab-ee!662
```
  53116de2
- Merge branch 'security-357-tracing-stored-xss' into 'master' · 61ea1427
  Cindy Pallares authored Nov 28, 2018
```
[master] Stored XSS in Operation Page

See merge request gitlab/gitlab-ee!722
```
  61ea1427
- Merge branch 'security-authorize-boards' into 'master' · da4f0d32
  Cindy Pallares authored Nov 28, 2018
```
[master] Authorize user when listing board resources

Closes gitlabhq#2738

See merge request gitlab/gitlab-ee!721
```
  da4f0d32
- Merge branch 'security-issue_7696' into 'master' · 025233bd
  Cindy Pallares authored Nov 28, 2018
```
[master] Resolve: Guest can set weight of a new issue

See merge request gitlab/gitlab-ee!720
```
  025233bd
- Merge branch 'security-IDOR-note-drafts-publish' into 'master' · a3b55a73
  Cindy Pallares authored Nov 28, 2018
```
[master] Fix IDOR at /drafts/publish/

Closes #356

See merge request gitlab/gitlab-ee!710
```
  a3b55a73
- Merge branch 'security-guest-comments-ee' into 'master' · d042f0ff
  Cindy Pallares authored Nov 28, 2018
```
[master ee] Fixed ability to comment on and edit/delete comments on locked or confidential issues

See merge request gitlab/gitlab-ee!739
```
  d042f0ff
28 Nov, 2018 31 commits
- Merge branch 'security-358-operations-page-visible-to-reporters' into 'master' · 883b511b
  Cindy Pallares authored Nov 28, 2018
```
[master] Operations settings page visible to reporter users

See merge request gitlab/gitlab-ee!724
```
  883b511b
- [master] Operations settings page visible to reporter users · 4cfa0b8a
  Reuben Pereira authored Nov 28, 2018
  
  4cfa0b8a
- Merge branch 'ce-to-ee-2018-11-28' into 'master' · 38ba246b
  Stan Hu authored Nov 28, 2018
```
CE upstream - 2018-11-28 18:21 UTC

See merge request gitlab-org/gitlab-ee!8628
```
  38ba246b
- Merge branch 'security-fix-pat-web-access-ee' into 'master' · c270ade7
  Cindy Pallares authored Nov 28, 2018
```
[master] EE Resolve "Personal access token with only `read_user` scope can be used to authenticate any web request"

See merge request gitlab/gitlab-ee!726
```
  c270ade7
- Merge branch 'security-mr-approvers-xss' into 'master' · 824db287
  Cindy Pallares authored Nov 28, 2018
```
[master] Fixed XSS in merge request approvers

Closes #353

See merge request gitlab/gitlab-ee!662
```
  824db287
- Merge branch 'security-357-tracing-stored-xss' into 'master' · 6d0c6141
  Cindy Pallares authored Nov 28, 2018
```
[master] Stored XSS in Operation Page

See merge request gitlab/gitlab-ee!722
```
  6d0c6141
- [master] Stored XSS in Operation Page · 5cca659d
  Reuben Pereira authored Nov 28, 2018
  
  5cca659d
- Merge branch 'security-authorize-boards' into 'master' · 6743ffd7
  Cindy Pallares authored Nov 28, 2018
```
[master] Authorize user when listing board resources

Closes gitlabhq#2738

See merge request gitlab/gitlab-ee!721
```
  6743ffd7
- Merge branch 'security-issue_7696' into 'master' · 9ad955fd
  Cindy Pallares authored Nov 28, 2018
```
[master] Resolve: Guest can set weight of a new issue

See merge request gitlab/gitlab-ee!720
```
  9ad955fd
- Merge branch 'security-IDOR-note-drafts-publish' into 'master' · 0dc6871f
  Cindy Pallares authored Nov 28, 2018
```
[master] Fix IDOR at /drafts/publish/

Closes #356

See merge request gitlab/gitlab-ee!710
```
  0dc6871f
- CE->EE: resolve conflicts in db/schema.rb · ec1982c5
  Nick Thomas authored Nov 28, 2018
  
  ec1982c5
- Merge branch 'docs/better-alignment-of-tables-ee' into 'master' · ded6c265
  Achilleas Pipinellis authored Nov 28, 2018
```
Force better alignment in tables

See merge request gitlab-org/gitlab-ee!8615
```
  ded6c265
- Merge branch 'security-guest-comments-ee' into 'master' · b22df50e
  Cindy Pallares authored Nov 28, 2018
```
[master ee] Fixed ability to comment on and edit/delete comments on locked or confidential issues

See merge request gitlab/gitlab-ee!739
```
  b22df50e
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-28 · 8e5137f1
  GitLab Bot authored Nov 28, 2018
```
# Conflicts:
#	db/schema.rb

[ci skip]
```
  8e5137f1
- Merge branch 'ce-to-ee-2018-11-28' into 'master' · 9c58409e
  Rémy Coutable authored Nov 28, 2018
```
CE upstream - 2018-11-28 12:21 UTC

Closes gitlab-runner#3320

See merge request gitlab-org/gitlab-ee!8621
```
  9c58409e
- 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
- Resolve locale/gitlab.pot · ac273ede
  Rémy Coutable authored Nov 28, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  ac273ede
- Merge branch '7769-instance-level-maven-endpoint' into 'master' · 6b6e8755
  Douglas Barbosa Alexandre authored Nov 28, 2018
```
Resolve "Instance level Maven endpoint"

Closes #7769

See merge request gitlab-org/gitlab-ee!8274
```
  6b6e8755
- Merge branch '7960-geo-address-the-update-delete-race' into 'master' · 1c969280
  Douglas Barbosa Alexandre authored Nov 28, 2018
```
Geo: Synchronize repository and registry removal

Closes #7960

See merge request gitlab-org/gitlab-ee!8480
```
  1c969280
- 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
- Resolve spec/models/project_spec.rb · 40be7b33
  Rémy Coutable authored Nov 28, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  40be7b33
- Resolve spec/factories/projects.rb · 88eba240
  Rémy Coutable authored Nov 28, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  88eba240
- Resolve lib/gitlab/import_export/import_export.yml · 03188f67
  Rémy Coutable authored Nov 28, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  03188f67
- Resolve app/workers/stuck_import_jobs_worker.rb · 7aca7df5
  Rémy Coutable authored Nov 28, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  7aca7df5
- Resolve app/controllers/projects/imports_controller.rb · 155788ab
  Rémy Coutable authored Nov 28, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  155788ab
- 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
- Resolve .gitlab-ci.yml · 8164723e
  Rémy Coutable authored Nov 28, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  8164723e