Commits · 579a7f8dab7c6507913fb5e8a66e874823a4b04f · nexedi / gitlab-ce

22 Nov, 2018 34 commits
- 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 '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 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
- 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
- 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
- Resolve conflict in PHILOSOPHY.md · 137be19e
  Steve Azzopardi authored Nov 22, 2018
```
Resolve conflicts for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8551
```
  137be19e
- Resolve conflicts in CHANGELOG.md · d915aa64
  Steve Azzopardi authored Nov 22, 2018
```
Resolve conflicts for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8551
```
  d915aa64
- Merge branch 'docs/fix-shibboleth-markdown' into 'master' · 2e3dab38
  Achilleas Pipinellis authored Nov 22, 2018
```
Fix markdown to render correctly

See merge request gitlab-org/gitlab-ce!23221
```
  2e3dab38
- Merge branch 'docs/delete-broken-link' into 'master' · 02c27171
  Achilleas Pipinellis authored Nov 22, 2018
```
Remove broken link that 404s and has no alternative

See merge request gitlab-org/gitlab-ce!23295
```
  02c27171
- Merge branch '46950-systemcheck-use-gem-ruby-instead-of-hardcoding-ruby-version' into 'master' · cd7f2d35
  Douwe Maan authored Nov 22, 2018
```
SystemCheck: Use a more reliable way to detect current Ruby version

Closes #46950

See merge request gitlab-org/gitlab-ce!23291
```
  cd7f2d35
- Merge branch '1012-add-timestamp' into 'master' · 1c1a43fe
  Douwe Maan authored Nov 22, 2018
```
Fill timestamp for Approver bulk insertion

See merge request gitlab-org/gitlab-ee!8543
```
  1c1a43fe
- Merge branch 'revert-fd6e3781' into 'master' · 2bc4a17d
  Sean McGivern authored Nov 22, 2018
```
Revert "Merge branch 'revert-e2aa2177' into 'master'"

Closes #54267

See merge request gitlab-org/gitlab-ce!23237
```
  2bc4a17d
- Merge branch '47986-rubocop-safe-params' into 'master' · f0630090
  Rémy Coutable authored Nov 22, 2018
```
Add cop prohibiting params argument in url_for

Closes #47986

See merge request gitlab-org/gitlab-ce!23115
```
  f0630090
- Merge branch '3777-promote-to-epic' into 'master' · 74346cdb
  Rémy Coutable authored Nov 22, 2018
```
Promote an issue to an epic

Closes #3777

See merge request gitlab-org/gitlab-ee!8051
```
  74346cdb
- Fixes conflicts in locale/gitlab.pot · 668e3f91
  Filipa Lacerda authored Nov 22, 2018
  
  668e3f91
- Add cop prohibiting params argument in url_for · 186b2143
  Jarka Košanová authored Nov 15, 2018
  
  186b2143
- Improve specs and system note service · ca786c4f
  Jarka Košanová authored Nov 13, 2018
  
  ca786c4f
- Merge branch 'patch-32' into 'master' · 0e182280
  Grzegorz Bizon authored Nov 22, 2018
```
Fix typo in scheduled pipelines

See merge request gitlab-org/gitlab-ce!23218
```
  0e182280
- Fix typo in scheduled pipelines · 6353a45b
  Davy Defaud authored Nov 22, 2018
  
  6353a45b
- Pass GITLAB_REF_SLUG to the Omnibus triggers · b57c1fa7
  Rémy Coutable authored Nov 21, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  b57c1fa7
- Merge branch 'patch-32' into 'master' · 9a1952bf
  Achilleas Pipinellis authored Nov 22, 2018
```
Update discord_notifications.md

See merge request gitlab-org/gitlab-ce!23292
```
  9a1952bf
- Merge branch '5609-switch-from-cbc-to-gcm-for-geo-logout-tokens' into 'master' · 5e68eeb8
  Stan Hu authored Nov 22, 2018
```
Switch from CBC to GCM for Geo logout tokens

Closes #5609

See merge request gitlab-org/gitlab-ee!8518
```
  5e68eeb8
- Merge branch 'docs-move-issue-fix' into 'master' · b031e096
  Evan Read authored Nov 22, 2018
```
Docs: fix API move issue curl command

See merge request gitlab-org/gitlab-ce!23290
```
  b031e096
- Docs: fix API move issue curl command · 39e4ad13
  Cynthia Ng authored Nov 22, 2018
  
  39e4ad13
- Merge branch '53596-mention-required-file-extension-yaml-include-docs' into 'master' · 11c6596c
  Evan Read authored Nov 22, 2018
```
Update docs for include to mention required file extension

Closes #53596

See merge request gitlab-org/gitlab-ce!23048
```
  11c6596c
- Remove broken link that 404s and has no alternative · 1be37478
  Evan Read authored Nov 22, 2018
  
  1be37478
21 Nov, 2018 6 commits
- Merge branch '54201-update-rack-to-2.0.6' into 'master' · 8e11f1fa
  Douglas Barbosa Alexandre authored Nov 21, 2018
```
Update rack to 2.0.6

Closes #54201

See merge request gitlab-org/gitlab-ce!23171
```
  8e11f1fa
- Merge branch 'docs-fix-links-3-ee' into 'master' · b15f2ed6
  Evan Read authored Nov 21, 2018
```
Docs: Cleaning up various links (CE to EE Port)

See merge request gitlab-org/gitlab-ee!8462
```
  b15f2ed6
- Docs: Cleaning up various links (CE to EE Port) · 8140584b
  Marcel Amirault authored Nov 21, 2018
  
  8140584b
- Add CHANGELOG entry · 97cb810a
  Douglas Barbosa Alexandre authored Nov 20, 2018
  
  97cb810a
- Switch from CBC to GCM for Geo logout tokens · 6950c11f
  Douglas Barbosa Alexandre authored Nov 20, 2018
```
The AES-256-GCM cipher is the current best practice for symmetric
encryption. It also allows us to protect with authentication the
content of the return_to and validate everything on the Geo primary
node, otherwise, we can open a security hole.
```
  6950c11f
- Merge branch 'docs-fix-links-3' into 'master' · 7e158317
  Evan Read authored Nov 21, 2018
```
Docs: Cleaning up various links

See merge request gitlab-org/gitlab-ce!23110
```
  7e158317