Skip to content

Commit

Permalink
Merge branch 'main' into inline-template-examples
Browse files Browse the repository at this point in the history
  • Loading branch information
joelhawksley committed Jul 3, 2023
2 parents 85b8477 + a35641e commit 1aa90a5
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
5 changes: 1 addition & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
view_component (3.2.0)
view_component (3.3.0)
activesupport (>= 5.2.0, < 8.0)
concurrent-ruby (~> 1.0)
method_source (~> 1.0)
Expand Down Expand Up @@ -327,9 +327,6 @@ DEPENDENCIES
jbuilder (~> 2)
m (~> 1)
minitest (~> 5.18)
net-imap
net-pop
net-smtp
pry (~> 0.13)
puma (~> 6)
rails (~> 7.0.0)
Expand Down
2 changes: 2 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ nav_order: 5

## main

## 3.3.0

* Include InlineTemplate by default in Base. **Note:** It's no longer necessary to include `ViewComponent::InlineTemplate` to use inline templates.

*Joel Hawksley*
Expand Down
2 changes: 1 addition & 1 deletion docs/_data/library.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version: 3.2.0
version: 3.3.0
2 changes: 1 addition & 1 deletion lib/view_component/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
module ViewComponent
module VERSION
MAJOR = 3
MINOR = 2
MINOR = 3
PATCH = 0
PRE = nil

Expand Down

0 comments on commit 1aa90a5

Please sign in to comment.