Commits · da4f0d32ba05b5bddd30452da49961c521a3cb47 · nexedi / gitlab-ce

29 Nov, 2018 4 commits

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 36 commits
- 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
- 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 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
- Add instance-level maven endpoint for download · d2f55f9a
  Dmitriy Zaporozhets authored Nov 07, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d2f55f9a
- Geo: Synchronize repository and registry removal · 0a2f474e
  Valery Sizov authored Nov 16, 2018
```
Moving registry deletion into the job that deletes
the files and project record
```
  0a2f474e
- 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
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-28 · 4b4e7b49
  GitLab Bot authored Nov 28, 2018
```
# Conflicts:
#	.gitlab-ci.yml
#	app/controllers/projects/imports_controller.rb
#	app/workers/stuck_import_jobs_worker.rb
#	lib/gitlab/import_export/import_export.yml
#	locale/gitlab.pot
#	spec/factories/projects.rb
#	spec/models/project_spec.rb

[ci skip]
```
  4b4e7b49
- 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 'ce-to-ee-2018-11-28' into 'master' · d7ce1b1d
  Phil Hughes authored Nov 28, 2018
```
CE upstream - 2018-11-28 10:21 UTC

Closes gitlab-ce#51506, gitlab-ce#41776, and gitlab-ce#50812

See merge request gitlab-org/gitlab-ee!8618
```
  d7ce1b1d
- Merge branch 'ee-50341-cleanup-useless-project-import-attributes' into 'master' · e7cfbaf9
  Douwe Maan authored Nov 28, 2018
```
Removes all the irrelevant import related code and columns

See merge request gitlab-org/gitlab-ee!8370
```
  e7cfbaf9
- 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