Skip to content

Commit aa4ff0d

Browse files
authored
Merge branch 'main' into rv_add_component_caching
2 parents 9e93a5a + 2061126 commit aa4ff0d

File tree

5 files changed

+10
-3
lines changed

5 files changed

+10
-3
lines changed

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
view_component (4.0.0.rc1)
4+
view_component (4.0.0.rc2)
55
activesupport (>= 7.1.0, < 8.1)
66
concurrent-ruby (~> 1)
77
haml (~> 6)

docs/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ nav_order: 6
1010

1111
## main
1212

13+
* Add SerpApi to "Who uses ViewComponent" list
14+
15+
*Andy from SerpApi*
16+
17+
## 4.0.0.rc2
18+
1319
* Add `around_render` lifecyle method for wrapping component rendering in custom instrumentation, etc.
1420

1521
*Joel Hawksley*, *Blake Williams*

docs/_data/library.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version: 4.0.0.rc1
1+
version: 4.0.0.rc2

docs/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ Hundreds of people have [contributed](https://github.com/ViewComponent/view_comp
161161
* [Project Blacklight](http://projectblacklight.org/)
162162
* [QuickNode](https://www.quicknode.com/)
163163
* [Room AI](https://roomai.com/)
164+
* [SerpApi](https://www.serpapi.com/)
164165
* [SearchApi](https://www.searchapi.io/)
165166
* [Simundia](https://www.simundia.com/)
166167
* [Skroutz](https://engineering.skroutz.gr/blog/)

lib/view_component/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module VERSION
55
MAJOR = 4
66
MINOR = 0
77
PATCH = 0
8-
PRE = "rc1"
8+
PRE = "rc2"
99

1010
STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
1111
end

0 commit comments

Comments
 (0)