Skip to content

Commit

Permalink
updating apprisals - rails 5.2.1 & 5.2.3
Browse files Browse the repository at this point in the history
gemspec rule for rubyzip compatability with ruby versions less than 2.4
gemfile update via appraisal
rm terms_manifest.js from spec/dummy manifest.js
Rails 6 Sprockets error in travis
updating assets.rb & manifest.js for new sprockets
  • Loading branch information
masonhensley committed Jan 22, 2020
1 parent 81f6eb9 commit f8f4e72
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 19 deletions.
4 changes: 4 additions & 0 deletions app/assets/config/manifest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
//= link policy_manager/application.css
//= link policy_manager/application.js
//= link_tree ../stylesheets .css
//= link_tree ../javascripts .js
2 changes: 1 addition & 1 deletion gdpr_rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |s|
s.add_dependency "redcarpet"
s.add_dependency "will_paginate"
s.add_dependency "aasm"
s.add_dependency "rubyzip", ">= 1.0.0"
s.add_dependency "rubyzip", ">= 1.0.0", "< 2"
s.add_dependency "groupdate", "4.0.0"
s.add_dependency "chartkick", ">= 3.2.0"
#s.add_dependency "kaminari"
Expand Down
12 changes: 6 additions & 6 deletions gemfiles/rails_5.2.1.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ PATH
aasm
chartkick (>= 3.2.0)
groupdate (= 4.0.0)
rails (>= 5.1.4, <= 6)
rails (>= 5.1.4, < 7)
redcarpet
rubyzip (>= 1.0.0)
rubyzip (>= 1.0.0, < 2)
will_paginate

GEM
Expand Down Expand Up @@ -72,7 +72,7 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (>= 2.0, < 4.0)
chartkick (3.2.1)
chartkick (3.3.1)
climate_control (0.2.0)
coderay (1.1.2)
concurrent-ruby (1.1.5)
Expand Down Expand Up @@ -182,7 +182,7 @@ GEM
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.2)
rubyzip (1.2.4)
rubyzip (1.3.0)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
Expand Down Expand Up @@ -210,7 +210,7 @@ GEM
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
will_paginate (3.1.8)
will_paginate (3.2.1)
xpath (3.2.0)
nokogiri (~> 1.8)

Expand All @@ -236,4 +236,4 @@ DEPENDENCIES
sqlite3 (= 1.4.1)

BUNDLED WITH
1.16.6
2.0.2
12 changes: 6 additions & 6 deletions gemfiles/rails_5.2.3.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ PATH
aasm
chartkick (>= 3.2.0)
groupdate (= 4.0.0)
rails (>= 5.1.4, <= 6)
rails (>= 5.1.4, < 7)
redcarpet
rubyzip (>= 1.0.0)
rubyzip (>= 1.0.0, < 2)
will_paginate

GEM
Expand Down Expand Up @@ -72,7 +72,7 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (>= 2.0, < 4.0)
chartkick (3.2.1)
chartkick (3.3.1)
climate_control (0.2.0)
coderay (1.1.2)
concurrent-ruby (1.1.5)
Expand Down Expand Up @@ -182,7 +182,7 @@ GEM
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.2)
rubyzip (1.2.4)
rubyzip (1.3.0)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
Expand Down Expand Up @@ -210,7 +210,7 @@ GEM
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
will_paginate (3.1.8)
will_paginate (3.2.1)
xpath (3.2.0)
nokogiri (~> 1.8)

Expand All @@ -236,4 +236,4 @@ DEPENDENCIES
sqlite3 (= 1.4.1)

BUNDLED WITH
1.16.6
2.0.2
6 changes: 3 additions & 3 deletions gemfiles/rails_6.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PATH
groupdate (= 4.0.0)
rails (>= 5.1.4, < 7)
redcarpet
rubyzip (>= 1.0.0)
rubyzip (>= 1.0.0, < 2)
will_paginate

GEM
Expand Down Expand Up @@ -197,7 +197,7 @@ GEM
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.2)
rubyzip (2.0.0)
rubyzip (1.3.0)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
Expand Down Expand Up @@ -252,4 +252,4 @@ DEPENDENCIES
sqlite3 (= 1.4.1)

BUNDLED WITH
1.17.3
2.0.2
1 change: 0 additions & 1 deletion spec/dummy/app/assets/config/manifest.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
//= link_tree ../images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
//= link terms_manifest.js
6 changes: 4 additions & 2 deletions spec/dummy/config/initializers/assets.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
# Be sure to restart your server when you modify this file.

# Version of your assets, change this if you want to expire all your assets.
Rails.application.config.assets.version = '1.0'
Rails.application.config.assets.version = "1.0"

# Add additional assets to the asset load path.
# Rails.application.config.assets.paths << Emoji.images_path
# Add Yarn node_modules folder to the asset load path.
Rails.application.config.assets.paths << Rails.root.join('node_modules')
Rails.application.config.assets.paths << Rails.root.join("node_modules")

# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in the app/assets
# folder are already added.
# Rails.application.config.assets.precompile += %w( admin.js admin.css )

Rails.application.config.assets.precompile += %w( policy_manager/application.css policy_manager/application.js )

0 comments on commit f8f4e72

Please sign in to comment.