diff --git a/.codeclimate.yml b/.codeclimate.yml index 8a39dff..17c7963 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -3,4 +3,10 @@ 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" +- "public/js/MTLLoader.js" +- "public/js/EffectComposer.js" - "db" 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 diff --git a/Gemfile.lock b/Gemfile.lock index 07cf239..43e3c08 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) @@ -99,13 +99,13 @@ 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) + devise-i18n (1.8.1) devise (>= 4.6) erubi (1.8.0) execjs (2.7.0) @@ -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) @@ -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) @@ -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) 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 + 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 %>