Skip to content

Bump wicked from 1.3.3 to 1.3.4 #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dependabot-preview wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Bump wicked from 1.3.3 to 1.3.4 #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
90c20f7
Codeclimate - Ignore lib files (#150)
Duxy1996 Sep 4, 2019
8f4546f
RestoredObject - View - Removed sort sentence (#151)
Duxy1996 Sep 4, 2019
ea0e40d
Codeclimate - Updated .codecliamte file with more ignored files (#152)
Duxy1996 Sep 4, 2019
97dbc7b
[Security] Bump nokogiri from 1.10.3 to 1.10.4 (#141)
dependabot-preview[bot] Sep 4, 2019
3da7f91
Travis - Updated Travis CI to Rails 2.4.0 (#153)
Duxy1996 Sep 4, 2019
82a68da
Bump devise from 4.6.2 to 4.7.1 (#155)
dependabot-preview[bot] Sep 9, 2019
09ebd30
Bump devise-i18n from 1.8.0 to 1.8.1 (#138)
dependabot-preview[bot] Sep 9, 2019
d5d4b92
Bump bcrypt from `011b67b` to `2875dbf` (#145)
dependabot-preview[bot] Sep 9, 2019
2bf3c18
Bump wicked from 1.3.3 to 1.3.4
dependabot-preview[bot] Sep 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .codeclimate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 1 addition & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,5 @@ before_install:
env:
- DB=postgresql

before_script:
- rails db:create
- rails db:migrate

rvm:
- 2.3.3
- 2.5.0
16 changes: 8 additions & 8 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/codahale/bcrypt-ruby.git
revision: 011b67ba550457dab5d6084128888f08476f278a
revision: 2875dbf4359ef9ce88775f4aae67aaa011f930fa
specs:
bcrypt (3.1.13)

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -258,7 +258,7 @@ GEM
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
wicked (1.3.3)
wicked (1.3.4)
railties (>= 3.0.7)
xpath (3.2.0)
nokogiri (~> 1.8)
Expand Down
2 changes: 1 addition & 1 deletion app/views/restored_objects/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

<div class="container">
<div class="card-columns">
<% @objects.sort[3..-1].each_with_index do |obj, index| %>
<% @objects.each_with_index do |obj, index| %>
<div class="card">
<%= link_to image_tag(obj.featured_image, class:'card-img-top'), obj %>
<div class="card-body">
Expand Down