From 9c1d1777dbd0c4820da045802d9cf7eaf943e9c1 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Wed, 10 Apr 2019 13:37:24 +0530 Subject: [PATCH] Bump onebox version - adds support for oneboxing google drive files - add styling for google drive onebox favicon --- Gemfile | 2 +- Gemfile.lock | 6 +++--- app/assets/stylesheets/common/base/onebox.scss | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index c73bd3f4cc5..4ab5a877019 100644 --- a/Gemfile +++ b/Gemfile @@ -44,7 +44,7 @@ gem 'redis-namespace' gem 'active_model_serializers', '~> 0.8.3' -gem 'onebox', '1.8.83' +gem 'onebox', '1.8.84' gem 'http_accept_language', '~>2.0.5', require: false diff --git a/Gemfile.lock b/Gemfile.lock index df5b35e532e..11462b90b02 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -214,7 +214,7 @@ GEM mocha (1.5.0) metaclass (~> 0.0.1) mock_redis (0.18.0) - moneta (1.1.0) + moneta (1.1.1) msgpack (1.2.6) multi_json (1.13.1) multi_xml (0.6.0) @@ -263,7 +263,7 @@ GEM omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack - onebox (1.8.83) + onebox (1.8.84) htmlentities (~> 4.3) moneta (~> 1.0) multi_json (~> 1.11) @@ -524,7 +524,7 @@ DEPENDENCIES omniauth-oauth2 omniauth-openid omniauth-twitter - onebox (= 1.8.83) + onebox (= 1.8.84) openid-redis-store parallel_tests pg diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss index f0f833a0a79..9a1e348b90a 100644 --- a/app/assets/stylesheets/common/base/onebox.scss +++ b/app/assets/stylesheets/common/base/onebox.scss @@ -118,6 +118,7 @@ aside.onebox { @include onebox-favicon("amazon", "amazon"); @include onebox-favicon("instagram", "instagram"); @include onebox-favicon("googledocs", "google_branding/logo_drive_48px"); + @include onebox-favicon("googledrive", "google_branding/logo_drive_48px"); .onebox-body { clear: both;