Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PATH
specs:
view_component (3.21.0)
activesupport (>= 5.2.0, < 8.1)
concurrent-ruby (~> 1.0)
concurrent-ruby (= 1.3.4)
method_source (~> 1.0)

GEM
Expand Down
4 changes: 4 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ nav_order: 5

## main

* Remove JS and CSS docs as they proved difficult to maintain and lacked consensus.

*Joel Hawksley*

* Do not prefix release tags with `v`, per recommendation from @bkuhlmann.

*Joel Hawksley*
Expand Down
168 changes: 0 additions & 168 deletions docs/guide/javascript_and_css.md

This file was deleted.

4 changes: 2 additions & 2 deletions test/sandbox/test/rendering_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ def test_render_inline_allocations
MyComponent.ensure_compiled

allocations = (Rails.version.to_f >= 8.0) ?
{"3.5.0" => 117, "3.4.1" => 117, "3.3.6" => 129} :
{"3.3.6" => 120, "3.3.0" => 120, "3.2.6" => 118, "3.1.6" => 118, "3.0.7" => 127}
{"3.5.0" => 117, "3.4.1" => 117, "3.3.7" => 129} :
{"3.3.7" => 120, "3.3.0" => 120, "3.2.6" => 118, "3.1.6" => 118, "3.0.7" => 127}

assert_allocations(**allocations) do
render_inline(MyComponent.new)
Expand Down
2 changes: 1 addition & 1 deletion view_component.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Gem::Specification.new do |spec|

spec.add_runtime_dependency "activesupport", [">= 5.2.0", "< 8.1"]
spec.add_runtime_dependency "method_source", "~> 1.0"
spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
spec.add_runtime_dependency "concurrent-ruby", "1.3.4" # lock version that supports Rails 6.1
spec.add_development_dependency "allocation_stats", "~> 0.1.5"
spec.add_development_dependency "appraisal", "~> 2.4"
spec.add_development_dependency "benchmark-ips", "~> 2.13.0"
Expand Down
Loading