Commits · 8849db5b7762287fb84d8af879414e35537962e1 · nexedi / gitlab-ce

23 Nov, 2018 2 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-23 · 8849db5b
  GitLab Bot authored Nov 23, 2018
  
  8849db5b
- Merge branch 'rails5-env-deprecated' into 'master' · a1c08c12
  Sean McGivern authored Nov 23, 2018
```
Rails5: env is deprecated and will be removed from Rails 5.1

Closes #54384

See merge request gitlab-org/gitlab-ce!22626
```
  a1c08c12
22 Nov, 2018 38 commits
- Merge branch '8536_fix_license_management_doc_link-docs' into 'master' · bafd0a37
  Philippe Lafoucrière authored Nov 22, 2018
```
Fix link in license management documentation

Closes #8536

See merge request gitlab-org/gitlab-ee!8553
```
  bafd0a37
- Merge branch 'ce-to-ee-2018-11-22' into 'master' · 4648220b
  🤖 GitLab Bot 🤖 authored Nov 22, 2018
```
CE upstream - 2018-11-22 19:21 UTC

See merge request gitlab-org/gitlab-ee!8559
```
  4648220b
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-22 · 9d75d01f
  GitLab Bot authored Nov 22, 2018
  
  9d75d01f
- Merge branch 'ce-to-ee-2018-11-22' into 'master' · ee5be26d
  Douglas Barbosa Alexandre authored Nov 22, 2018
```
CE upstream - 2018-11-22 16:22 UTC

Closes gitlab-ce#53019 and gitlab-ce#48816

See merge request gitlab-org/gitlab-ee!8558
```
  ee5be26d
- Merge branch 'dm-batch-loader-sidekiq' into 'master' · a033faa2
  Stan Hu authored Nov 22, 2018
```
Clear BatchLoader context between Sidekiq jobs

Closes #53079

See merge request gitlab-org/gitlab-ce!23308
```
  a033faa2
- Fixed conflicts in migrations · b7d98cc2
  Jan Provaznik authored Nov 22, 2018
  
  b7d98cc2
- fixed gitlab-ci conflict · 21ebb2dd
  Jan Provaznik authored Nov 22, 2018
  
  21ebb2dd
- Clear BatchLoader context between Sidekiq jobs · 1b8a7918
  Douwe Maan authored Nov 22, 2018
  
  1b8a7918
- Merge branch 'update-gitlab-runner-helm-chart-version' into 'master' · 0a42c7cb
  Kamil Trzciński authored Nov 22, 2018
```
Update Runner Chart to 0.1.38

See merge request gitlab-org/gitlab-ce!23304
```
  0a42c7cb
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-22 · 58e6ad9d
  GitLab Bot authored Nov 22, 2018
```
# Conflicts:
#	.gitlab-ci.yml
#	db/migrate/20161007073613_create_user_activities.rb
#	db/post_migrate/20161128170531_drop_user_activities_table.rb

[ci skip]
```
  58e6ad9d
- Merge branch 'gt-include-wildcard-for-gitlab-assets-compile-only-parameter' into 'master' · 27e35703
  Rémy Coutable authored Nov 22, 2018
```
Include wildcard for `gitlab:assets:compile` only parameter

See merge request gitlab-org/gitlab-ce!23305
```
  27e35703
- Merge branch 'patch-32' into 'master' · ba9eeea4
  Stan Hu authored Nov 22, 2018
```
Documentation: Correct blocked SMTP ports for GKE

See merge request gitlab-org/gitlab-ce!23275
```
  ba9eeea4
- Merge branch '48534-autocomplete-spec' into 'master' · 7286c012
  Kamil Trzciński authored Nov 22, 2018
```
Add specs for entities autocomplete

Closes #48534

See merge request gitlab-org/gitlab-ce!23250
```
  7286c012
- Add CHANGELOG entry · b86d6ebf
  Tomasz Maczukin authored Nov 22, 2018
  
  b86d6ebf
- Merge branch '349-qa-add-params-for-qa-variables' into 'master' · ac973f18
  Rémy Coutable authored Nov 22, 2018
```
More env vars for group & project names in QA

See merge request gitlab-org/gitlab-ce!23303
```
  ac973f18
- Update used version of Runner Helm Chart to 0.1.38 · 2d2d6cb5
  Tomasz Maczukin authored Nov 22, 2018
  
  2d2d6cb5
- Include wildcard for `gitlab:assets:compile` only parameter · 8ed21de4
  George Tsiolis authored Nov 22, 2018
  
  8ed21de4
- Merge branch 'ce-to-ee-2018-11-22' into 'master' · 579a7f8d
  Steve Azzopardi authored Nov 22, 2018
```
CE upstream - 2018-11-22 14:21 UTC

See merge request gitlab-org/gitlab-ee!8557
```
  579a7f8d
- Merge branch 'mr-sticky-headers' into 'master' · d993f4b1
  Filipa Lacerda authored Nov 22, 2018
```
Made diff file headers sticky

Closes #48816

See merge request gitlab-org/gitlab-ce!23249
```
  d993f4b1
- Add specs for entities autocomplete · 9d602609
  Jarka Košanová authored Nov 19, 2018
  
  9d602609
- More env vars for group & project names in QA · 3ac92704
  Dylan Griffith authored Nov 22, 2018
```
This will help with https://gitlab.com/gitlab-org/gitlab-qa/issues/349
as we need to use much shorter project and group names for HTTPS to work
```
  3ac92704
- Merge branch 'jprovazn-versioned-migrations' into 'master' · 875a45a6
  Rémy Coutable authored Nov 22, 2018
```
Add rails version to all migrations

Closes #54098

See merge request gitlab-org/gitlab-ce!23057
```
  875a45a6
- Merge branch 'jprovazn-versioned-migrations-ee' into 'master' · bbc1a7c9
  Rémy Coutable authored Nov 22, 2018
```
[EE] Add rails version to all migrations

See merge request gitlab-org/gitlab-ee!8446
```
  bbc1a7c9
- [EE] Add rails version to all migrations · 76a6f555
  Jan Provaznik authored Nov 22, 2018
  
  76a6f555
- Fix conflicts for locale/gitlab.pot · 55dd4c4a
  Filipa Lacerda authored Nov 22, 2018
  
  55dd4c4a
- Merge branch 'mr-file-tree-commit' into 'master' · 19e9438d
  Filipa Lacerda authored Nov 22, 2018
```
Show toggle tree button on merge request commits

Closes #53019

See merge request gitlab-org/gitlab-ce!23238
```
  19e9438d
- Merge branch 'gt-limit-gitlab-assets-compile-job-to-branches' into 'master' · 1b3b7716
  Rémy Coutable authored Nov 22, 2018
```
Limit `gitlab:assets:compile` job to branches and tags

Closes #54361

See merge request gitlab-org/gitlab-ce!23302
```
  1b3b7716
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-22 · 31f42749
  GitLab Bot authored Nov 22, 2018
```
# Conflicts:
#	locale/gitlab.pot

[ci skip]
```
  31f42749
- Merge branch 'ee-gt-limit-gitlab-assets-compile-job-to-branches' into 'master' · 0d47652a
  Rémy Coutable authored Nov 22, 2018
```
Limit `gitlab:assets:compile` job to branches and tags

See merge request gitlab-org/gitlab-ee!8555
```
  0d47652a
- Merge branch 'ce-to-ee-2018-11-21' into 'master' · 24e7f042
  Steve Azzopardi authored Nov 22, 2018
```
CE upstream - 2018-11-21 20:21 UTC

Closes gitlab-ce#52699, gitlab-ce#53571, and gitlab-ce#51220

See merge request gitlab-org/gitlab-ee!8551
```
  24e7f042
- Merge branch 'fix-typos-occured' into 'master' · 7002752d
  Kushal Pandya authored Nov 22, 2018
```
Fix typos occured to occurred

See merge request gitlab-org/gitlab-ce!23105
```
  7002752d
- Limit `gitlab:assets:compile` job to branches · 4bdd6c0b
  George Tsiolis authored Nov 22, 2018
  
  4bdd6c0b
- Resolve missed conflicts in CHANGELOG.md · 716b90d5
  Steve Azzopardi authored Nov 22, 2018
```
Resolve conflicts for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8551
```
  716b90d5
- Limit `gitlab:assets:compile` job to branches · b31ef891
  George Tsiolis authored Nov 22, 2018
  
  b31ef891
- Merge branch '54293-fetch-assets-job-times-out-so-package-and-qa-jobs-can-t-complete' into 'master' · 85cc480f
  Rémy Coutable authored Nov 22, 2018
```
Resolve "`fetch-assets` job times out so `package-and-qa` jobs can't complete"

Closes #54293

See merge request gitlab-org/gitlab-ce!23267
```
  85cc480f
- Made diff file headers sticky · ce91c326
  Phil Hughes authored Nov 20, 2018
```
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48816
```
  ce91c326
- Resolve conflicts in doc/user/discussions/index.md · 775a2fcd
  Steve Azzopardi authored Nov 22, 2018
```
Resolve conflict for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8551
```
  775a2fcd
- Resolve conflict in doc/user/project/labels.md · 4acf6d5c
  Steve Azzopardi authored Nov 22, 2018
```
Resolve conflict for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8551
```
  4acf6d5c