Skip to content

Commit

Permalink
Merge pull request #1174 from dradis/bump-rails-6.1.7.6
Browse files Browse the repository at this point in the history 
Bump rails to 6.1.7.6
  • Loading branch information
@caitmich
caitmich authored Aug 28, 2023
2 parents 4fd6a7b + f983db3 commit 7064d95
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 76 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[v#.#.#] ([month] [YYYY])
- Tylium: Consolidate sidebars
- Upgraded gems:
- font-awesome-sass, nokogiri, puma, rails, sanitize
- font-awesome-sass, nokogiri, puma, rails, sanitize, selenium-webdriver
- Bugs fixes:
- QA: Enable @mentions and formatting toolbar for comments in QA show views
- [entity]:
Expand Down
7 changes: 3 additions & 4 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby '3.1.2'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.1.7.4'
gem 'rails', '~> 6.1.7.6'

# Use SCSS for stylesheets
gem 'sass-rails', '~> 6.0'
Expand Down Expand Up @@ -190,12 +190,11 @@ end
group :test do
gem 'database_cleaner'
gem 'factory_bot_rails'
gem 'capybara', '>= 3.26'
gem 'capybara', '~> 3.35.1'
gem 'guard-rspec', require: false
gem 'selenium-webdriver'
gem 'selenium-webdriver', '~> 4.11'
gem 'shoulda-matchers', '~> 3.1'
gem 'timecop'
gem 'webdrivers'

# Required by capybara
gem 'matrix'
Expand Down
135 changes: 66 additions & 69 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,60 +22,60 @@ GEM
remote: https://rubygems.org/
specs:
RedCloth (4.3.2)
actioncable (6.1.7.4)
actionpack (= 6.1.7.4)
activesupport (= 6.1.7.4)
actioncable (6.1.7.6)
actionpack (= 6.1.7.6)
activesupport (= 6.1.7.6)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.7.4)
actionpack (= 6.1.7.4)
activejob (= 6.1.7.4)
activerecord (= 6.1.7.4)
activestorage (= 6.1.7.4)
activesupport (= 6.1.7.4)
actionmailbox (6.1.7.6)
actionpack (= 6.1.7.6)
activejob (= 6.1.7.6)
activerecord (= 6.1.7.6)
activestorage (= 6.1.7.6)
activesupport (= 6.1.7.6)
mail (>= 2.7.1)
actionmailer (6.1.7.4)
actionpack (= 6.1.7.4)
actionview (= 6.1.7.4)
activejob (= 6.1.7.4)
activesupport (= 6.1.7.4)
actionmailer (6.1.7.6)
actionpack (= 6.1.7.6)
actionview (= 6.1.7.6)
activejob (= 6.1.7.6)
activesupport (= 6.1.7.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.7.4)
actionview (= 6.1.7.4)
activesupport (= 6.1.7.4)
actionpack (6.1.7.6)
actionview (= 6.1.7.6)
activesupport (= 6.1.7.6)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.7.4)
actionpack (= 6.1.7.4)
activerecord (= 6.1.7.4)
activestorage (= 6.1.7.4)
activesupport (= 6.1.7.4)
actiontext (6.1.7.6)
actionpack (= 6.1.7.6)
activerecord (= 6.1.7.6)
activestorage (= 6.1.7.6)
activesupport (= 6.1.7.6)
nokogiri (>= 1.8.5)
actionview (6.1.7.4)
activesupport (= 6.1.7.4)
actionview (6.1.7.6)
activesupport (= 6.1.7.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.1.7.4)
activesupport (= 6.1.7.4)
activejob (6.1.7.6)
activesupport (= 6.1.7.6)
globalid (>= 0.3.6)
activemodel (6.1.7.4)
activesupport (= 6.1.7.4)
activerecord (6.1.7.4)
activemodel (= 6.1.7.4)
activesupport (= 6.1.7.4)
activestorage (6.1.7.4)
actionpack (= 6.1.7.4)
activejob (= 6.1.7.4)
activerecord (= 6.1.7.4)
activesupport (= 6.1.7.4)
activemodel (6.1.7.6)
activesupport (= 6.1.7.6)
activerecord (6.1.7.6)
activemodel (= 6.1.7.6)
activesupport (= 6.1.7.6)
activestorage (6.1.7.6)
actionpack (= 6.1.7.6)
activejob (= 6.1.7.6)
activerecord (= 6.1.7.6)
activesupport (= 6.1.7.6)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (6.1.7.4)
activesupport (6.1.7.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand Down Expand Up @@ -112,7 +112,6 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
childprocess (3.0.0)
chronic (0.10.2)
coderay (1.1.2)
coffee-rails (5.0.0)
Expand Down Expand Up @@ -338,33 +337,34 @@ GEM
rack
rack-test (2.1.0)
rack (>= 1.3)
rails (6.1.7.4)
actioncable (= 6.1.7.4)
actionmailbox (= 6.1.7.4)
actionmailer (= 6.1.7.4)
actionpack (= 6.1.7.4)
actiontext (= 6.1.7.4)
actionview (= 6.1.7.4)
activejob (= 6.1.7.4)
activemodel (= 6.1.7.4)
activerecord (= 6.1.7.4)
activestorage (= 6.1.7.4)
activesupport (= 6.1.7.4)
rails (6.1.7.6)
actioncable (= 6.1.7.6)
actionmailbox (= 6.1.7.6)
actionmailer (= 6.1.7.6)
actionpack (= 6.1.7.6)
actiontext (= 6.1.7.6)
actionview (= 6.1.7.6)
activejob (= 6.1.7.6)
activemodel (= 6.1.7.6)
activerecord (= 6.1.7.6)
activestorage (= 6.1.7.6)
activesupport (= 6.1.7.6)
bundler (>= 1.15.0)
railties (= 6.1.7.4)
railties (= 6.1.7.6)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.4)
loofah (~> 2.19, >= 2.19.1)
rails_autolink (1.1.8)
actionview (> 3.1)
activesupport (> 3.1)
railties (> 3.1)
railties (6.1.7.4)
actionpack (= 6.1.7.4)
activesupport (= 6.1.7.4)
railties (6.1.7.6)
actionpack (= 6.1.7.6)
activesupport (= 6.1.7.6)
method_source
rake (>= 12.2)
thor (~> 1.0)
Expand Down Expand Up @@ -449,9 +449,10 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
selenium-webdriver (4.11.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
shellany (0.0.1)
shoulda-matchers (3.1.3)
activesupport (>= 4.0.0)
Expand Down Expand Up @@ -498,18 +499,15 @@ GEM
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
webdrivers (4.2.0)
nokogiri (~> 1.6)
rubyzip (>= 1.3.0)
selenium-webdriver (>= 3.0, < 4.0)
websocket-driver (0.7.5)
websocket (1.2.9)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
whenever (1.0.0)
chronic (>= 0.6.3)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.8)
zeitwerk (2.6.11)

PLATFORMS
arm64-darwin
Expand All @@ -528,7 +526,7 @@ DEPENDENCIES
bundler-audit
byebug
cancancan (~> 1.10)
capybara (>= 3.26)
capybara (~> 3.35.1)
coffee-rails (~> 5.0)
database_cleaner
differ (~> 0.1.2)
Expand Down Expand Up @@ -586,7 +584,7 @@ DEPENDENCIES
pg
puma (~> 5.6.7)
rack-mini-profiler (~> 2.0)
rails (~> 6.1.7.4)
rails (~> 6.1.7.6)
rails-html-sanitizer (~> 1.4.4)
record_tag_helper
rerun
Expand All @@ -599,7 +597,7 @@ DEPENDENCIES
rubyzip (>= 1.2.2)
sanitize (= 6.0.2)
sass-rails (~> 6.0)
selenium-webdriver
selenium-webdriver (~> 4.11)
shoulda-matchers (~> 3.1)
simple_form
sinatra (~> 2.2.3)
Expand All @@ -613,7 +611,6 @@ DEPENDENCIES
unicorn (= 6.1.0)
warden (~> 1.2.3)
web-console (>= 4.1.0)
webdrivers
whenever

RUBY VERSION
Expand Down
3 changes: 1 addition & 2 deletions spec/rails_helper.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@

Capybara.server = :puma, { Silent: true }
Capybara.javascript_driver = :chrome

Webdrivers::Chromedriver.required_version = '114.0.5735.90'
Selenium::WebDriver.logger

RSpec.configure do |config|
# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
Expand Down

0 comments on commit 7064d95

Please sign in to comment.