Skip to content
Open

Rails 7 #1915

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
8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ ruby File.read(".ruby-version").strip
source "https://rubygems.org"

# Choo choo 🚝 (only include the Rails gems we need)
gem "actionpack", "~> 6.0"
gem "actionview", "~> 6.0"
gem "activesupport", "~> 6.0"
gem "railties", "~> 6.0"
gem "actionpack", "~> 7.0"
gem "actionview", "~> 7.0"
gem "activesupport", "~> 7.0"
gem "railties", "~> 7.0"
gem "sprockets-rails"

# Use Puma as the app server
Expand Down
46 changes: 23 additions & 23 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
GEM
remote: https://rubygems.org/
specs:
actionpack (6.1.5.1)
actionview (= 6.1.5.1)
activesupport (= 6.1.5.1)
rack (~> 2.0, >= 2.0.9)
actionpack (7.0.4.2)
actionview (= 7.0.4.2)
activesupport (= 7.0.4.2)
rack (~> 2.0, >= 2.2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (6.1.5.1)
activesupport (= 6.1.5.1)
actionview (7.0.4.2)
activesupport (= 7.0.4.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activemodel (6.1.5.1)
activesupport (= 6.1.5.1)
activesupport (6.1.5.1)
activemodel (7.0.4.2)
activesupport (= 7.0.4.2)
activesupport (7.0.4.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
bindex (0.8.1)
Expand Down Expand Up @@ -49,7 +48,7 @@ GEM
dotenv-rails (2.8.1)
dotenv (= 2.8.1)
railties (>= 3.2)
erubi (1.10.0)
erubi (1.12.0)
escape_utils (1.2.1)
execjs (2.8.1)
ffi (1.15.3)
Expand All @@ -59,7 +58,7 @@ GEM
graphql-client (0.18.0)
activesupport (>= 3.0)
graphql
i18n (1.10.0)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
listen (3.5.1)
rb-fsevent (~> 0.10, >= 0.10.3)
Expand All @@ -75,7 +74,7 @@ GEM
method_source (1.0.0)
mini_mime (1.1.0)
mini_portile2 (2.8.1)
minitest (5.15.0)
minitest (5.17.0)
nio4r (2.5.8)
nokogiri (1.14.1)
mini_portile2 (~> 2.8.0)
Expand All @@ -95,12 +94,13 @@ GEM
nokogiri (>= 1.6)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
railties (6.1.5.1)
actionpack (= 6.1.5.1)
activesupport (= 6.1.5.1)
railties (7.0.4.2)
actionpack (= 7.0.4.2)
activesupport (= 7.0.4.2)
method_source
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
rake (13.0.6)
rb-fsevent (0.11.0)
rb-inotify (0.10.1)
Expand Down Expand Up @@ -149,27 +149,27 @@ GEM
stringex (2.8.5)
thor (1.2.1)
tilt (2.0.10)
tzinfo (2.0.4)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
web-console (4.1.0)
web-console (4.2.0)
actionview (>= 6.0.0)
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
websocket (1.2.9)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.5.4)
zeitwerk (2.6.7)

PLATFORMS
ruby

DEPENDENCIES
actionpack (~> 6.0)
actionview (~> 6.0)
activesupport (~> 6.0)
actionpack (~> 7.0)
actionview (~> 7.0)
activesupport (~> 7.0)
bugsnag
buildkite-test_collector
byebug
Expand All @@ -184,7 +184,7 @@ DEPENDENCIES
lograge
pry
puma
railties (~> 6.0)
railties (~> 7.0)
redcarpet
rouge (= 3.3.0)
rspec-rails
Expand Down
2 changes: 1 addition & 1 deletion config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
module Docs
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
config.load_defaults 5.2
config.load_defaults 7.0

# Settings in config/environments/* take precedence over those specified here.
# Application configuration can go into files in config/initializers
Expand Down
2 changes: 2 additions & 0 deletions config/initializers/data_variables.rb
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
require "data_variables"

DataVariables.set