From c0042fc0322f9fdd83cb3e03e73f1b3bcd8a4707 Mon Sep 17 00:00:00 2001 From: Jens Ulferts Date: Tue, 15 Jan 2019 14:49:21 +0100 Subject: [PATCH] bump fog-aws & cells --- Gemfile | 6 ++-- Gemfile.lock | 53 +++++++++++++++++++--------------- app/cells/views/table/show.erb | 2 +- 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/Gemfile b/Gemfile index d9e0f912542..538b98897b4 100644 --- a/Gemfile +++ b/Gemfile @@ -136,7 +136,7 @@ gem 'transactional_lock', git: 'https://github.com/finnlabs/transactional_lock.g gem 'prawn', '~> 2.2' gem 'prawn-table', '~> 0.2.2' -gem 'cells-erb', '~> 0.0.8' +gem 'cells-erb', '~> 0.1.0' gem 'cells-rails', '~> 0.0.9' gem 'meta-tags', '~> 2.6.0' @@ -167,9 +167,9 @@ gem 'nokogiri', '~> 1.10.0' gem 'carrierwave', '~> 1.3.1' gem 'fog-aws' -gem 'aws-sdk-core', '~> 3.20.2' +gem 'aws-sdk-core', '~> 3.45.0' # File upload via fog + screenshots on travis -gem 'aws-sdk-s3', '~> 1.9.1' +gem 'aws-sdk-s3', '~> 1.30.1' gem 'openproject-token', '~> 1.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index 6ea1669839e..bc1f0685aac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -262,22 +262,24 @@ GEM execjs awesome_nested_set (3.1.4) activerecord (>= 4.0.0, < 5.3) - aws-partitions (1.82.0) - aws-sdk-core (3.20.2) + aws-eventstream (1.0.1) + aws-partitions (1.131.0) + aws-sdk-core (3.45.0) + aws-eventstream (~> 1.0) aws-partitions (~> 1.0) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-kms (1.5.0) - aws-sdk-core (~> 3) + aws-sdk-kms (1.13.0) + aws-sdk-core (~> 3, >= 3.39.0) aws-sigv4 (~> 1.0) - aws-sdk-s3 (1.9.1) - aws-sdk-core (~> 3) + aws-sdk-s3 (1.30.1) + aws-sdk-core (~> 3, >= 3.39.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.0) aws-sdk-sns (1.1.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sigv4 (1.0.2) + aws-sigv4 (1.0.3) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) @@ -314,9 +316,9 @@ GEM declarative-option (< 0.2.0) tilt (>= 1.4, < 3) uber (< 0.2.0) - cells-erb (0.0.8) + cells-erb (0.1.0) cells (~> 4.0) - erbse (>= 0.0.2) + erbse (>= 0.1.1) cells-rails (0.0.9) actionpack (>= 3.0) cells (>= 4.1.6, < 5.0.0) @@ -389,11 +391,12 @@ GEM equalizer (0.0.11) equivalent-xml (0.6.0) nokogiri (>= 1.4.3) - erbse (0.0.2) + erbse (0.1.3) + temple erubi (1.8.0) escape_utils (1.2.1) eventmachine (1.2.5) - excon (0.52.0) + excon (0.62.0) execjs (2.7.0) factory_bot (4.11.1) activesupport (>= 3.0.0) @@ -405,21 +408,22 @@ GEM fastimage (2.1.5) ffi (1.9.25) flamegraph (0.9.5) - fog-aws (0.11.0) - fog-core (~> 1.38) - fog-json (~> 1.0) + fog-aws (3.3.0) + fog-core (~> 2.1) + fog-json (~> 1.1) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (1.42.0) + fog-core (2.1.2) builder - excon (~> 0.49) + excon (~> 0.58) formatador (~> 0.2) - fog-json (1.0.2) - fog-core (~> 1.0) - multi_json (~> 1.10) - fog-xml (0.1.2) + mime-types + fog-json (1.2.0) fog-core - nokogiri (~> 1.5, >= 1.5.11) + multi_json (~> 1.10) + fog-xml (0.1.3) + fog-core + nokogiri (>= 1.5.11, < 2.0.0) formatador (0.2.5) friendly_id (5.2.4) activerecord (>= 4.0.0) @@ -779,6 +783,7 @@ GEM httpclient (>= 2.4) sys-filesystem (1.1.9) ffi + temple (0.8.0) test-prof (0.7.3) thin (1.7.2) daemons (~> 1.0, >= 1.0.9) @@ -849,8 +854,8 @@ DEPENDENCIES airbrake (~> 7.4.0) autoprefixer-rails (~> 9.4.5) awesome_nested_set (~> 3.1.3) - aws-sdk-core (~> 3.20.2) - aws-sdk-s3 (~> 1.9.1) + aws-sdk-core (~> 3.45.0) + aws-sdk-s3 (~> 1.30.1) bcrypt (~> 3.1.6) bootsnap (~> 1.3.2) bourbon (~> 4.3.4) @@ -858,7 +863,7 @@ DEPENDENCIES capybara-screenshot (~> 1.0.17) capybara-select2! carrierwave (~> 1.3.1) - cells-erb (~> 0.0.8) + cells-erb (~> 0.1.0) cells-rails (~> 0.0.9) chromedriver-helper (~> 2.1.0) commonmarker (~> 0.17.9) diff --git a/app/cells/views/table/show.erb b/app/cells/views/table/show.erb index bee7f7298bb..38141a58de1 100644 --- a/app/cells/views/table/show.erb +++ b/app/cells/views/table/show.erb @@ -65,7 +65,7 @@ See doc/COPYRIGHT.rdoc for more details. <%= empty_row_message %> <% end %> - <% for row in rows -%> + <% for row in rows do -%> <%= render_row row %> <% end -%>