Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump rails from 7.1.3.4 to 7.2.1 #5747

Merged
merged 3 commits into from
Aug 30, 2024
Merged

Bump rails from 7.1.3.4 to 7.2.1 #5747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bdbd325
Bump rails from 7.1.3.4 to 7.2.1
dependabot[bot] Aug 26, 2024
cc80122
Update rails
jorg-vr Aug 29, 2024
e73d312
Fix sass deprecation
jorg-vr Aug 29, 2024
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
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,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', '~> 7.1.3'
gem 'rails', '~> 7.2.1'
# Use mysql as the database for Active Record
gem 'mysql2', '~> 0.5.6'
# Use Puma as the app server
Expand Down
133 changes: 65 additions & 68 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,80 +1,76 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (7.1.3.4)
actionpack (= 7.1.3.4)
activesupport (= 7.1.3.4)
actioncable (7.2.1)
actionpack (= 7.2.1)
activesupport (= 7.2.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.1.3.4)
actionpack (= 7.1.3.4)
activejob (= 7.1.3.4)
activerecord (= 7.1.3.4)
activestorage (= 7.1.3.4)
activesupport (= 7.1.3.4)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.1.3.4)
actionpack (= 7.1.3.4)
actionview (= 7.1.3.4)
activejob (= 7.1.3.4)
activesupport (= 7.1.3.4)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
actionmailbox (7.2.1)
actionpack (= 7.2.1)
activejob (= 7.2.1)
activerecord (= 7.2.1)
activestorage (= 7.2.1)
activesupport (= 7.2.1)
mail (>= 2.8.0)
actionmailer (7.2.1)
actionpack (= 7.2.1)
actionview (= 7.2.1)
activejob (= 7.2.1)
activesupport (= 7.2.1)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (7.1.3.4)
actionview (= 7.1.3.4)
activesupport (= 7.1.3.4)
actionpack (7.2.1)
actionview (= 7.2.1)
activesupport (= 7.2.1)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack (>= 2.2.4, < 3.2)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.3.4)
actionpack (= 7.1.3.4)
activerecord (= 7.1.3.4)
activestorage (= 7.1.3.4)
activesupport (= 7.1.3.4)
useragent (~> 0.16)
actiontext (7.2.1)
actionpack (= 7.2.1)
activerecord (= 7.2.1)
activestorage (= 7.2.1)
activesupport (= 7.2.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.1.3.4)
activesupport (= 7.1.3.4)
actionview (7.2.1)
activesupport (= 7.2.1)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.1.3.4)
activesupport (= 7.1.3.4)
activejob (7.2.1)
activesupport (= 7.2.1)
globalid (>= 0.3.6)
activemodel (7.1.3.4)
activesupport (= 7.1.3.4)
activerecord (7.1.3.4)
activemodel (= 7.1.3.4)
activesupport (= 7.1.3.4)
activemodel (7.2.1)
activesupport (= 7.2.1)
activerecord (7.2.1)
activemodel (= 7.2.1)
activesupport (= 7.2.1)
timeout (>= 0.4.0)
activestorage (7.1.3.4)
actionpack (= 7.1.3.4)
activejob (= 7.1.3.4)
activerecord (= 7.1.3.4)
activesupport (= 7.1.3.4)
activestorage (7.2.1)
actionpack (= 7.2.1)
activejob (= 7.2.1)
activerecord (= 7.2.1)
activesupport (= 7.2.1)
marcel (~> 1.0)
activesupport (7.1.3.4)
activesupport (7.2.1)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
aes_key_wrap (1.1.0)
Expand Down Expand Up @@ -297,7 +293,6 @@ GEM
bigdecimal (~> 3.1)
mustermann (3.0.0)
ruby2_keywords (~> 0.0.1)
mutex_m (0.2.0)
mysql2 (0.5.6)
net-http (0.4.1)
uri
Expand Down Expand Up @@ -396,20 +391,20 @@ GEM
rackup (1.0.0)
rack (< 3)
webrick
rails (7.1.3.4)
actioncable (= 7.1.3.4)
actionmailbox (= 7.1.3.4)
actionmailer (= 7.1.3.4)
actionpack (= 7.1.3.4)
actiontext (= 7.1.3.4)
actionview (= 7.1.3.4)
activejob (= 7.1.3.4)
activemodel (= 7.1.3.4)
activerecord (= 7.1.3.4)
activestorage (= 7.1.3.4)
activesupport (= 7.1.3.4)
rails (7.2.1)
actioncable (= 7.2.1)
actionmailbox (= 7.2.1)
actionmailer (= 7.2.1)
actionpack (= 7.2.1)
actiontext (= 7.2.1)
actionview (= 7.2.1)
activejob (= 7.2.1)
activemodel (= 7.2.1)
activerecord (= 7.2.1)
activestorage (= 7.2.1)
activesupport (= 7.2.1)
bundler (>= 1.15.0)
railties (= 7.1.3.4)
railties (= 7.2.1)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
Expand All @@ -424,10 +419,10 @@ GEM
rails-i18n (7.0.9)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
railties (7.1.3.4)
actionpack (= 7.1.3.4)
activesupport (= 7.1.3.4)
irb
railties (7.2.1)
actionpack (= 7.2.1)
activesupport (= 7.2.1)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0, >= 1.2.2)
Expand Down Expand Up @@ -483,6 +478,7 @@ GEM
logger
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
securerandom (0.3.1)
selenium-webdriver (4.23.0)
base64 (~> 0.2)
logger (~> 1.4)
Expand Down Expand Up @@ -534,6 +530,7 @@ GEM
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
uri (0.13.0)
useragent (0.16.10)
validate_url (1.0.15)
activemodel (>= 3.0.0)
public_suffix
Expand Down Expand Up @@ -625,7 +622,7 @@ DEPENDENCIES
puma (~> 6.4.2)
pundit (~> 2.3.2)
rack-mini-profiler (~> 3.3.1)
rails (~> 7.1.3)
rails (~> 7.2.1)
rails-controller-testing (~> 1.0.5)
rails-i18n (~> 7.0.9)
rb-readline (~> 0.5.5)
Expand Down
6 changes: 3 additions & 3 deletions app/assets/stylesheets/components.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@
}

.col-form-label {
text-align: right;
font-weight: bold;

@include media-breakpoint-down(sm) {
text-align: left;
}

text-align: right;
font-weight: bold;
}

h1 small,
Expand Down
43 changes: 21 additions & 22 deletions app/assets/stylesheets/components/action-card.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,8 @@
border-color 145ms ease,
background-color 145ms ease;
box-shadow: none;

.card-subtitle {
margin-bottom: 0.125rem;
height: 48px;

h4 {
width: 100%;
line-height: 20px;
min-height: 24px;

small {
font-size: 65%;
}
}

.card-title-icon {
margin-right: 1rem;
}
}
background: var(--clickable-card-color);
color: var(--on-clickable-card-color);

--clickable-card-color: var(--d-primary);
--on-clickable-card-color: var(--d-on-primary);
Expand All @@ -40,9 +23,6 @@
--on-clickable-card-color: var(--d-on-success);
}

background: var(--clickable-card-color);
color: var(--on-clickable-card-color);

small {
color: var(--on-clickable-card-color);
}
Expand Down Expand Up @@ -72,4 +52,23 @@
opacity: 0.38;
pointer-events: none;
}

.card-subtitle {
margin-bottom: 0.125rem;
height: 48px;

h4 {
width: 100%;
line-height: 20px;
min-height: 24px;

small {
font-size: 65%;
}
}

.card-title-icon {
margin-right: 1rem;
}
}
}
12 changes: 6 additions & 6 deletions app/assets/stylesheets/components/btn.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
border-color 145ms ease,
background-color 145ms ease;

// define the default button colors
// makes it easier to combine with other classes such as d-btn-danger, d-btn-success, etc.
--d-btn-color: var(--d-primary);
--d-btn-color-rgb: var(--d-primary-rgb);
--d-on-btn-color: var(--d-on-primary);

&.with-icon {
padding-left: 16px;
padding-right: 24px;
Expand Down Expand Up @@ -50,12 +56,6 @@
pointer-events: auto;
cursor: default;
}

// define the default button colors
// makes it easier to combine with other classes such as d-btn-danger, d-btn-success, etc.
--d-btn-color: var(--d-primary);
--d-btn-color-rgb: var(--d-primary-rgb);
--d-on-btn-color: var(--d-on-primary);
}

.btn.btn-filled,
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/components/code_listing.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,11 +373,11 @@
/* stylelint-enable selector-class-pattern */

.annotation-meta-icon {
margin-left: 4px;

&::before {
vertical-align: bottom;
}

margin-left: 4px;
}

.annotation-warning::before {
Expand Down
7 changes: 3 additions & 4 deletions app/assets/stylesheets/components/stepper.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,14 @@
@include shadow-z2;

background-color: var(--d-surface);
border: none;
border-radius: var(--d-border-radius-base);
padding: 0;

@include media-breakpoint-up(sm) {
margin-left: 45px;
}

border: none;
border-radius: var(--d-border-radius-base);
padding: 0;

&.panel-body-transparent {
background-color: transparent;

Expand Down
Loading