Skip to content

Commit e656cc9

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/main' into 5222-remove-superuser-ability-to-edit
# Conflicts: # app/views/admin/organizations/edit.html.erb # spec/requests/admin/organizations_requests_spec.rb
2 parents b4f144b + 794ef20 commit e656cc9

File tree

118 files changed

+1505
-688
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+1505
-688
lines changed

.cloud66/manifest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
rails:
22
configuration:
3-
ruby_version: 3.2.2
3+
ruby_version: 3.4.3

.rubocop.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@ inherit_gem:
1010
inherit_from:
1111
.rubocop_todo.yml
1212

13-
require:
14-
- rubocop-rails
13+
plugins:
1514
- rubocop-performance
16-
- standard
1715
- standard-rails
1816
- standard-performance
1917

18+
require:
19+
- rubocop-rails
20+
- standard
21+
2022
AllCops:
2123
Exclude:
2224
- "vendor/**/*"

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.2
1+
3.4.3

Gemfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ gem "pg", "~> 1.5.9"
1414
# Web server.
1515
gem "puma"
1616
# Rails web framework.
17-
gem "rails", "~> 8.0.1"
17+
gem "rails", "~> 8.0.2"
1818

1919
###### MODELS / DATABASE #######
2020

@@ -106,7 +106,7 @@ gem 'bootsnap', require: false
106106
# Technically they don't need to be in this Gemfile at all, but we are pinning them to
107107
# specific versions for compatibility reasons.
108108
gem "nokogiri", ">= 1.10.4"
109-
gem "sprockets", "~> 4.2.1"
109+
gem "sprockets", "~> 4.2.2"
110110

111111
group :production, :staging do
112112
# Reduce the noise of logs and include custom fields to it for easier access
@@ -144,14 +144,14 @@ group :development, :test do
144144
# Debugger which supports rdbg and Shopify Ruby LSP VSCode extension
145145
gem "debug", ">= 1.0.0"
146146
# RSpec behavioral testing framework for Rails.
147-
gem "rspec-rails", "~> 7.1.0"
147+
gem "rspec-rails", "~> 8.0.0"
148148
# Static analysis / linter.
149149
gem "rubocop"
150150
# Rails add-on for static analysis.
151151
gem 'rubocop-performance'
152152
gem "rubocop-rails", "~> 2.25.1"
153153
# More concise test ("should") matchers
154-
gem "shoulda-matchers", "~> 6.4"
154+
gem "shoulda-matchers", "~> 6.5"
155155
# Default rules for Rubocop.
156156
gem "standard", "~> 1.40"
157157
gem "standard-rails"
@@ -201,7 +201,7 @@ group :test do
201201
# Show code coverage.
202202
gem 'simplecov'
203203
# Mock HTTP requests and ensure they are not called during tests.
204-
gem "webmock", "~> 3.24"
204+
gem "webmock", "~> 3.25"
205205
# Interface capybara to chrome headless
206206
gem "cuprite"
207207
# Read PDF files for tests

0 commit comments

Comments
 (0)