Commits · fe84cc33b06dc5bcb0896ca7a3e3378d5aa97aeb · nexedi / gitlab-ce

23 Nov, 2018 28 commits
- Merge branch 'refactor-landing-page-ee' into 'master' · fe84cc33
  Achilleas Pipinellis authored Nov 23, 2018
```
Refactor landing page EE

See merge request gitlab-org/gitlab-ee!8523
```
  fe84cc33
- Refactor landing page EE · 8d9add63
  Evan Read authored Nov 23, 2018
  
  8d9add63
- Merge branch 'add-additional-requirements-to-security-dashboard' into 'master' · 7a5d0d19
  Achilleas Pipinellis authored Nov 23, 2018
```
Add additional requirements to Security Dashboard

See merge request gitlab-org/gitlab-ee!8494
```
  7a5d0d19
- Add additional requirements to Security Dashboard · bfd2b2bb
  Fabio Busatto authored Nov 23, 2018
  
  bfd2b2bb
- Merge branch 'remove_research_proposal' into 'master' · 53664193
  Phil Hughes authored Nov 23, 2018
```
Delete Research proposal.md

See merge request gitlab-org/gitlab-ee!8570
```
  53664193
- Merge branch 'ce-to-ee-2018-11-23' into 'master' · 784a2efa
  Steve Azzopardi authored Nov 23, 2018
```
CE upstream - 2018-11-23 13:21 UTC

See merge request gitlab-org/gitlab-ee!8569
```
  784a2efa
- Delete Research proposal.md · a895e7ad
  Sarah O'Donnell authored Nov 23, 2018
  
  a895e7ad
- Fixes conflicts for locale/gitlab.pot · aab56454
  Filipa Lacerda authored Nov 23, 2018
  
  aab56454
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-23 · 42fc2cdf
  GitLab Bot authored Nov 23, 2018
```
# Conflicts:
#	locale/gitlab.pot

[ci skip]
```
  42fc2cdf
- Merge branch '53326-improve-issues-empty-state' into 'master' · 1c2bca90
  Sean McGivern authored Nov 23, 2018
```
Resolve "Improve issues list empty state when a filter is selected"

Closes #53326

See merge request gitlab-org/gitlab-ce!22775
```
  1c2bca90
- Merge branch 'jprovazn-locale-fix' into 'master' · 3b601b82
  Grzegorz Bizon authored Nov 23, 2018
```
Explicitly set locale fallbacks

Closes #54274

See merge request gitlab-org/gitlab-ce!23271
```
  3b601b82
- Merge branch 'rails5-deprecation-render-nothing' into 'master' · 3a12a848
  Rémy Coutable authored Nov 23, 2018
```
Rails5 deprecation: :nothing option is deprecated, Use head method to respond with empty response body.

See merge request gitlab-org/gitlab-ce!23311
```
  3a12a848
- Merge branch 'ce-to-ee-2018-11-23' into 'master' · f1c10b7f
  🤖 GitLab Bot 🤖 authored Nov 23, 2018
```
CE upstream - 2018-11-23 12:21 UTC

See merge request gitlab-org/gitlab-ee!8566
```
  f1c10b7f
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-23 · f5330303
  GitLab Bot authored Nov 23, 2018
  
  f5330303
- Merge branch '54391-tag' into 'master' · ac7d842c
  Phil Hughes authored Nov 23, 2018
```
Correctly styles tags in jobs sidebar

Closes #54391

See merge request gitlab-org/gitlab-ce!23319
```
  ac7d842c
- Merge branch 'ce-to-ee-2018-11-23' into 'master' · 4b4ce114
  🤖 GitLab Bot 🤖 authored Nov 23, 2018
```
CE upstream - 2018-11-23 11:21 UTC

See merge request gitlab-org/gitlab-ee!8565
```
  4b4ce114
- Correctly styles tags in jobs sidebar · 1564c86a
  Filipa Lacerda authored Nov 23, 2018
```
The tags were using the `label` class
instead of `bagde` which is the new BS class
```
  1564c86a
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-23 · 89660909
  GitLab Bot authored Nov 23, 2018
  
  89660909
- Merge branch '1979-move-mr-approval-settings' into 'master' · fc44adfa
  Filipa Lacerda authored Nov 23, 2018
```
Move merge request approval settings

See merge request gitlab-org/gitlab-ee!8493
```
  fc44adfa
- render :nothing option is deprecated, Use head method to respond with empty response body. · 6ffdab63
  Jasper Maes authored Nov 22, 2018
  
  6ffdab63
- Merge branch '_acet-fix-unable-to-reply-resolved-nondiff-discussion' into 'master' · ab0828cf
  Phil Hughes authored Nov 23, 2018
```
Allow commenting to resolved non-diff discussions

Closes #54330

See merge request gitlab-org/gitlab-ce!23279
```
  ab0828cf
- Merge branch 'ce-to-ee-2018-11-23' into 'master' · ae5a61ad
  🤖 GitLab Bot 🤖 authored Nov 23, 2018
```
CE upstream - 2018-11-23 08:21 UTC

See merge request gitlab-org/gitlab-ee!8564
```
  ae5a61ad
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-23 · dbe56972
  GitLab Bot authored Nov 23, 2018
  
  dbe56972
- Merge branch 'rails5-ee-deprecation-render-nothing' into 'master' · 842b7baf
  Rémy Coutable authored Nov 23, 2018
```
Rails5 deprecation: render :nothing option is deprecated, Use head method to respond with empty response body.

See merge request gitlab-org/gitlab-ee!8560
```
  842b7baf
- Merge branch 'ce-backport-3777-promote-to-epic' into 'master' · 99757d96
  Rémy Coutable authored Nov 23, 2018
```
Add support for custom highlighting slash commands via warning flags

See merge request gitlab-org/gitlab-ce!23277
```
  99757d96
- Merge branch 'ce-to-ee-2018-11-23' into 'master' · f4c13856
  🤖 GitLab Bot 🤖 authored Nov 23, 2018
```
CE upstream - 2018-11-23 07:26 UTC

See merge request gitlab-org/gitlab-ee!8563
```
  f4c13856
- 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 12 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
- render :nothing option is deprecated, Use head method to respond with empty response body. · 273c5c12
  Jasper Maes authored Nov 22, 2018
  
  273c5c12
- 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