From 90c20f76d5b91e8edde24476630af2fbed29ddbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Dur=C3=A1n=20Roca?= Date: Wed, 4 Sep 2019 18:34:43 +0200 Subject: [PATCH 01/10] Codeclimate - Ignore lib files (#150) Ignored ThreeJS loaders and helpers which are used in the 3D viewer --- .codeclimate.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.codeclimate.yml b/.codeclimate.yml index 8a39dff..10f74ac 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -3,4 +3,8 @@ exclude_patterns: - "public/js/PLYLoader.js" - "public/js/STLLoader.js" - "public/js/three.min.js" +- "public/js/OBJLoader.js" +- "public/js/OBJLoader2.js" +- "public/js/LoaderSupport.js" +- "public/js/OutlinePass.js" - "db" From 8f4546f02bdda3e4793f7030e0c70d9305491f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Dur=C3=A1n=20Roca?= Date: Wed, 4 Sep 2019 18:56:41 +0200 Subject: [PATCH 02/10] RestoredObject - View - Removed sort sentence (#151) --- app/views/restored_objects/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/restored_objects/index.html.erb b/app/views/restored_objects/index.html.erb index d565077..bf6c7e5 100644 --- a/app/views/restored_objects/index.html.erb +++ b/app/views/restored_objects/index.html.erb @@ -52,7 +52,7 @@
- <% @objects.sort[3..-1].each_with_index do |obj, index| %> + <% @objects.each_with_index do |obj, index| %>
<%= link_to image_tag(obj.featured_image, class:'card-img-top'), obj %>
From ea0e40d263da60fb72243b7d037316c73365b7c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Dur=C3=A1n=20Roca?= Date: Wed, 4 Sep 2019 19:04:45 +0200 Subject: [PATCH 03/10] Codeclimate - Updated .codecliamte file with more ignored files (#152) --- .codeclimate.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.codeclimate.yml b/.codeclimate.yml index 10f74ac..17c7963 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -7,4 +7,6 @@ exclude_patterns: - "public/js/OBJLoader2.js" - "public/js/LoaderSupport.js" - "public/js/OutlinePass.js" +- "public/js/MTLLoader.js" +- "public/js/EffectComposer.js" - "db" From 97dbc7bdfee803a8e19300d4f155b4541110807e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2019 19:07:48 +0200 Subject: [PATCH 04/10] [Security] Bump nokogiri from 1.10.3 to 1.10.4 (#141) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.3 to 1.10.4. **This update includes a security fix.** - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.3...v1.10.4) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 07cf239..052e5a9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -154,9 +154,9 @@ GEM minitest (5.11.3) multi_json (1.13.1) nio4r (2.4.0) - nokogiri (1.10.3) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) - nokogiri (1.10.3-x86-mingw32) + nokogiri (1.10.4-x86-mingw32) mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) pg (1.1.4) From 3da7f9157e203658371903d9511fa73859acfe7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Dur=C3=A1n=20Roca?= Date: Wed, 4 Sep 2019 19:56:54 +0200 Subject: [PATCH 05/10] Travis - Updated Travis CI to Rails 2.4.0 (#153) * Travis - Updated Travis CI to Rails 2.4.0 * Travis - Updated Travis CI to Rails 2.4.4 * Travis - Updated Travis CI to Rails 2.5.0 * Travis - Post build scripts removed --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3da92c0..2904984 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,5 @@ before_install: env: - DB=postgresql -before_script: - - rails db:create - - rails db:migrate - rvm: - - 2.3.3 + - 2.5.0 From 82a68da9b2408f4720ec11ceb5382327f774283f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2019 19:12:50 +0200 Subject: [PATCH 06/10] Bump devise from 4.6.2 to 4.7.1 (#155) Bumps [devise](https://github.com/plataformatec/devise) from 4.6.2 to 4.7.1. - [Release notes](https://github.com/plataformatec/devise/releases) - [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/devise/compare/v4.6.2...v4.7.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 052e5a9..1a320b4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,10 +99,10 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.1.5) crass (1.0.4) - devise (4.6.2) + devise (4.7.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 6.0) + railties (>= 4.1.0) responders warden (~> 1.2.3) devise-i18n (1.8.0) @@ -187,7 +187,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) + rails-html-sanitizer (1.2.0) loofah (~> 2.2, >= 2.2.2) railties (5.2.3) actionpack (= 5.2.3) From 09ebd30e5858dcebe527b5cbe147763e76010680 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2019 19:24:10 +0200 Subject: [PATCH 07/10] Bump devise-i18n from 1.8.0 to 1.8.1 (#138) Bumps [devise-i18n](https://github.com/tigrish/devise-i18n) from 1.8.0 to 1.8.1. - [Release notes](https://github.com/tigrish/devise-i18n/releases) - [Changelog](https://github.com/tigrish/devise-i18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/tigrish/devise-i18n/compare/v1.8.0...v1.8.1) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1a320b4..14d075e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -105,7 +105,7 @@ GEM railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-i18n (1.8.0) + devise-i18n (1.8.1) devise (>= 4.6) erubi (1.8.0) execjs (2.7.0) From d5d4b926c9d85a4f31d9515adde447d6a8d30fa7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2019 19:24:38 +0200 Subject: [PATCH 08/10] Bump bcrypt from `011b67b` to `2875dbf` (#145) Bumps [bcrypt](https://github.com/codahale/bcrypt-ruby) from `011b67b` to `2875dbf`. - [Release notes](https://github.com/codahale/bcrypt-ruby/releases) - [Commits](https://github.com/codahale/bcrypt-ruby/compare/011b67ba550457dab5d6084128888f08476f278a...2875dbf4359ef9ce88775f4aae67aaa011f930fa) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 14d075e..adead94 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/codahale/bcrypt-ruby.git - revision: 011b67ba550457dab5d6084128888f08476f278a + revision: 2875dbf4359ef9ce88775f4aae67aaa011f930fa specs: bcrypt (3.1.13) From 78fd7a907a1bc5550f3a2ad3cb6d8328076c8158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Dur=C3=A1n=20Roca?= Date: Wed, 18 Sep 2019 17:06:12 +0200 Subject: [PATCH 09/10] INDEX - Nil check needed. If there is not a featured museum in the bda it was crashing. (#159) --- app/views/home/index.html.erb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 94c08b0..2ca5192 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -18,6 +18,7 @@
+<% if @featured_museum != nil %> <%= link_to @featured_museum, class: "no-decoration" do %>
+<% end %>
@@ -132,4 +134,4 @@ function render() { document.addEventListener("turbolinks:load", function() { render(); }); - \ No newline at end of file + From 38e9c37935cc33bb27cdf5eaf6e6753317216a16 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2019 05:17:07 +0000 Subject: [PATCH 10/10] Bump uglifier from 4.1.20 to 4.2.0 Bumps [uglifier](https://github.com/lautis/uglifier) from 4.1.20 to 4.2.0. - [Release notes](https://github.com/lautis/uglifier/releases) - [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md) - [Commits](https://github.com/lautis/uglifier/commits) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index adead94..43e3c08 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -246,7 +246,7 @@ GEM thread_safe (~> 0.1) tzinfo-data (1.2019.2) tzinfo (>= 1.0.0) - uglifier (4.1.20) + uglifier (4.2.0) execjs (>= 0.3.0, < 3) warden (1.2.8) rack (>= 2.0.6)