Skip to content

Commit 231d657

Browse files
authored
Merge pull request #2553 from cyberark/update-rails-6.1.5.1
Upgrade rails to 6.1.5.1
2 parents 29e5f35 + 0ed86c3 commit 231d657

File tree

3 files changed

+66
-62
lines changed

3 files changed

+66
-62
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1414
### Changed
1515
- Adds `CONJUR_USERS_IN_ROOT_POLICY_ONLY` environment variable to prevent users from being created outside the root policy.
1616

17+
### Security
18+
- Upgrade Rails to 6.12.5.1 to close CVE-2022-22577 and CVE-2022-27777
19+
[cyberark/conjur#2553](https://github.com/cyberark/conjur/pull/2553)
20+
1721
## [1.17.5] - 2022-04-07
1822

1923
### Changed

Gemfile.lock

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -8,60 +8,60 @@ PATH
88
GEM
99
remote: https://rubygems.org/
1010
specs:
11-
actioncable (6.1.4.7)
12-
actionpack (= 6.1.4.7)
13-
activesupport (= 6.1.4.7)
11+
actioncable (6.1.5.1)
12+
actionpack (= 6.1.5.1)
13+
activesupport (= 6.1.5.1)
1414
nio4r (~> 2.0)
1515
websocket-driver (>= 0.6.1)
16-
actionmailbox (6.1.4.7)
17-
actionpack (= 6.1.4.7)
18-
activejob (= 6.1.4.7)
19-
activerecord (= 6.1.4.7)
20-
activestorage (= 6.1.4.7)
21-
activesupport (= 6.1.4.7)
16+
actionmailbox (6.1.5.1)
17+
actionpack (= 6.1.5.1)
18+
activejob (= 6.1.5.1)
19+
activerecord (= 6.1.5.1)
20+
activestorage (= 6.1.5.1)
21+
activesupport (= 6.1.5.1)
2222
mail (>= 2.7.1)
23-
actionmailer (6.1.4.7)
24-
actionpack (= 6.1.4.7)
25-
actionview (= 6.1.4.7)
26-
activejob (= 6.1.4.7)
27-
activesupport (= 6.1.4.7)
23+
actionmailer (6.1.5.1)
24+
actionpack (= 6.1.5.1)
25+
actionview (= 6.1.5.1)
26+
activejob (= 6.1.5.1)
27+
activesupport (= 6.1.5.1)
2828
mail (~> 2.5, >= 2.5.4)
2929
rails-dom-testing (~> 2.0)
30-
actionpack (6.1.4.7)
31-
actionview (= 6.1.4.7)
32-
activesupport (= 6.1.4.7)
30+
actionpack (6.1.5.1)
31+
actionview (= 6.1.5.1)
32+
activesupport (= 6.1.5.1)
3333
rack (~> 2.0, >= 2.0.9)
3434
rack-test (>= 0.6.3)
3535
rails-dom-testing (~> 2.0)
3636
rails-html-sanitizer (~> 1.0, >= 1.2.0)
37-
actiontext (6.1.4.7)
38-
actionpack (= 6.1.4.7)
39-
activerecord (= 6.1.4.7)
40-
activestorage (= 6.1.4.7)
41-
activesupport (= 6.1.4.7)
37+
actiontext (6.1.5.1)
38+
actionpack (= 6.1.5.1)
39+
activerecord (= 6.1.5.1)
40+
activestorage (= 6.1.5.1)
41+
activesupport (= 6.1.5.1)
4242
nokogiri (>= 1.8.5)
43-
actionview (6.1.4.7)
44-
activesupport (= 6.1.4.7)
43+
actionview (6.1.5.1)
44+
activesupport (= 6.1.5.1)
4545
builder (~> 3.1)
4646
erubi (~> 1.4)
4747
rails-dom-testing (~> 2.0)
4848
rails-html-sanitizer (~> 1.1, >= 1.2.0)
49-
activejob (6.1.4.7)
50-
activesupport (= 6.1.4.7)
49+
activejob (6.1.5.1)
50+
activesupport (= 6.1.5.1)
5151
globalid (>= 0.3.6)
52-
activemodel (6.1.4.7)
53-
activesupport (= 6.1.4.7)
54-
activerecord (6.1.4.7)
55-
activemodel (= 6.1.4.7)
56-
activesupport (= 6.1.4.7)
57-
activestorage (6.1.4.7)
58-
actionpack (= 6.1.4.7)
59-
activejob (= 6.1.4.7)
60-
activerecord (= 6.1.4.7)
61-
activesupport (= 6.1.4.7)
62-
marcel (~> 1.0.0)
52+
activemodel (6.1.5.1)
53+
activesupport (= 6.1.5.1)
54+
activerecord (6.1.5.1)
55+
activemodel (= 6.1.5.1)
56+
activesupport (= 6.1.5.1)
57+
activestorage (6.1.5.1)
58+
actionpack (= 6.1.5.1)
59+
activejob (= 6.1.5.1)
60+
activerecord (= 6.1.5.1)
61+
activesupport (= 6.1.5.1)
62+
marcel (~> 1.0)
6363
mini_mime (>= 1.1.0)
64-
activesupport (6.1.4.7)
64+
activesupport (6.1.5.1)
6565
concurrent-ruby (~> 1.0, >= 1.0.2)
6666
i18n (>= 1.6, < 2)
6767
minitest (>= 5.1)
@@ -107,7 +107,7 @@ GEM
107107
rspec (>= 2.14, < 4)
108108
coderay (1.1.3)
109109
command_class (0.0.2)
110-
concurrent-ruby (1.1.9)
110+
concurrent-ruby (1.1.10)
111111
conjur-api (5.3.8.pre.194)
112112
activesupport (>= 4.2)
113113
addressable (~> 2.0)
@@ -252,7 +252,7 @@ GEM
252252
listen (3.7.0)
253253
rb-fsevent (~> 0.10, >= 0.10.3)
254254
rb-inotify (~> 0.9, >= 0.9.10)
255-
loofah (2.14.0)
255+
loofah (2.16.0)
256256
crass (~> 1.0.2)
257257
nokogiri (>= 1.5.9)
258258
mail (2.7.1)
@@ -311,20 +311,20 @@ GEM
311311
rack-rewrite (1.5.1)
312312
rack-test (1.1.0)
313313
rack (>= 1.0, < 3)
314-
rails (6.1.4.7)
315-
actioncable (= 6.1.4.7)
316-
actionmailbox (= 6.1.4.7)
317-
actionmailer (= 6.1.4.7)
318-
actionpack (= 6.1.4.7)
319-
actiontext (= 6.1.4.7)
320-
actionview (= 6.1.4.7)
321-
activejob (= 6.1.4.7)
322-
activemodel (= 6.1.4.7)
323-
activerecord (= 6.1.4.7)
324-
activestorage (= 6.1.4.7)
325-
activesupport (= 6.1.4.7)
314+
rails (6.1.5.1)
315+
actioncable (= 6.1.5.1)
316+
actionmailbox (= 6.1.5.1)
317+
actionmailer (= 6.1.5.1)
318+
actionpack (= 6.1.5.1)
319+
actiontext (= 6.1.5.1)
320+
actionview (= 6.1.5.1)
321+
activejob (= 6.1.5.1)
322+
activemodel (= 6.1.5.1)
323+
activerecord (= 6.1.5.1)
324+
activestorage (= 6.1.5.1)
325+
activesupport (= 6.1.5.1)
326326
bundler (>= 1.15.0)
327-
railties (= 6.1.4.7)
327+
railties (= 6.1.5.1)
328328
sprockets-rails (>= 2.0.0)
329329
rails-controller-testing (1.0.5)
330330
actionpack (>= 5.0.1.rc1)
@@ -341,11 +341,11 @@ GEM
341341
rails_layout (1.0.42)
342342
rails_serve_static_assets (0.0.5)
343343
rails_stdout_logging (0.0.5)
344-
railties (6.1.4.7)
345-
actionpack (= 6.1.4.7)
346-
activesupport (= 6.1.4.7)
344+
railties (6.1.5.1)
345+
actionpack (= 6.1.5.1)
346+
activesupport (= 6.1.5.1)
347347
method_source
348-
rake (>= 0.13)
348+
rake (>= 12.2)
349349
thor (~> 1.0)
350350
rainbow (3.0.0)
351351
rake (13.0.6)
@@ -538,4 +538,4 @@ DEPENDENCIES
538538
websocket
539539

540540
BUNDLED WITH
541-
2.2.31
541+
2.2.33

NOTICES.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Section 3: BSD-3-Clause
2424

2525
Section 4: MIT
2626

27-
>>> https://rubygems.org/gems/activesupport/versions/6.1.4.7
27+
>>> https://rubygems.org/gems/activesupport/versions/6.1.5.1
2828
>>> https://rubygems.org/gems/anyway_config/versions/2.2.3
2929
>>> https://rubygems.org/gems/base58/versions/0.2.3
3030
>>> https://rubygems.org/gems/bcrypt/versions/3.1.16
@@ -45,7 +45,7 @@ Section 4: MIT
4545
>>> https://rubygems.org/gems/nokogiri/versions/1.13.4
4646
>>> https://rubygems.org/gems/openid_connect/versions/1.3.0
4747
>>> https://rubygems.org/gems/rack-rewrite/versions/1.5.1
48-
>>> https://rubygems.org/gems/rails/versions/6.1.4.7
48+
>>> https://rubygems.org/gems/rails/versions/6.1.5.1
4949
>>> https://rubygems.org/gems/rake/versions/13.0.6
5050
>>> https://rubygems.org/gems/sequel/versions/5.51.0
5151
>>> https://rubygems.org/gems/sequel-pg_advisory_locking/versions/1.0.1
@@ -247,7 +247,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
247247

248248
MIT License is applicable to the following component(s).
249249

250-
>>> https://rubygems.org/gems/activesupport/versions/6.1.4.7
250+
>>> https://rubygems.org/gems/activesupport/versions/6.1.5.1
251251

252252
Copyright (c) 2005-2018 David Heinemeier Hansson
253253

@@ -748,7 +748,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
748748
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
749749
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
750750

751-
>>> https://rubygems.org/gems/rails/versions/6.1.4.7
751+
>>> https://rubygems.org/gems/rails/versions/6.1.5.1
752752

753753
Copyright (c) 2005-2018 David Heinemeier Hansson
754754

0 commit comments

Comments
 (0)