diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-03 21:09:31 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-03 21:09:31 +0000 |
| commit | e173695d9b82004006cb5096d3fd8bb6c77069f5 (patch) | |
| tree | 427d76ae2e6e43bbd99cbca5166e8809dbb17038 /lib/carrier_wave_string_file.rb | |
| parent | 782f2505315c3c66e524f3365827fce341527eb1 (diff) | |
| download | gitlab-ce-e173695d9b82004006cb5096d3fd8bb6c77069f5.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/carrier_wave_string_file.rb')
| -rw-r--r-- | lib/carrier_wave_string_file.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/carrier_wave_string_file.rb b/lib/carrier_wave_string_file.rb index c9a64d9e631..fca247dc4c6 100644 --- a/lib/carrier_wave_string_file.rb +++ b/lib/carrier_wave_string_file.rb @@ -1,7 +1,11 @@ # frozen_string_literal: true class CarrierWaveStringFile < StringIO - def original_filename - "" + attr_reader :original_filename + + def initialize(data, original_filename = "") + super(data) + + @original_filename = original_filename end end |