update to rails 8.2
This commit is contained in:
parent
7117cb13d8
commit
7f9502fdfb
11 changed files with 92 additions and 94 deletions
8
Gemfile
8
Gemfile
|
|
@ -7,7 +7,7 @@ gem 'net-http'
|
|||
|
||||
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
|
||||
# gem 'rails', '~> 6.0'
|
||||
gem 'rails', '~> 7.1'
|
||||
gem 'rails', '~> 7.2'
|
||||
|
||||
gem 'bootsnap'
|
||||
# gem 'webpacker'
|
||||
|
|
@ -24,8 +24,8 @@ gem 'mini_magick'
|
|||
gem 'puma', '~> 6.6.0'
|
||||
|
||||
# Use SCSS for stylesheets
|
||||
#gem 'sass-rails', '~> 6.0.0'
|
||||
gem 'dartsass-rails', '~> 0.5.1'
|
||||
# gem 'sass-rails', '~> 6.0.0'
|
||||
# gem 'dartsass-rails'
|
||||
# TODO: ruby sass is decprecated
|
||||
|
||||
# Use Uglifier as compressor for JavaScript assets
|
||||
|
|
@ -112,8 +112,8 @@ end
|
|||
|
||||
# Zurb Foundation
|
||||
# https://github.com/zurb/foundation-rails
|
||||
gem 'foundation-rails', '~> 6.9.0.0'
|
||||
gem 'autoprefixer-rails'
|
||||
gem 'foundation-rails', '~> 6.9.0.0'
|
||||
|
||||
# Pagination
|
||||
gem 'will_paginate'
|
||||
|
|
|
|||
41
Gemfile.lock
41
Gemfile.lock
|
|
@ -116,9 +116,6 @@ GEM
|
|||
connection_pool (2.5.0)
|
||||
content_disposition (1.0.0)
|
||||
crass (1.0.6)
|
||||
dartsass-rails (0.5.1)
|
||||
railties (>= 6.0.0)
|
||||
sass-embedded (~> 1.63)
|
||||
date (3.4.1)
|
||||
debug (1.10.0)
|
||||
irb (~> 1.10)
|
||||
|
|
@ -161,9 +158,6 @@ GEM
|
|||
sprockets-es6
|
||||
globalid (1.2.1)
|
||||
activesupport (>= 6.1)
|
||||
google-protobuf (4.29.3-x86_64-linux)
|
||||
bigdecimal
|
||||
rake (>= 13)
|
||||
gravtastic (3.2.6)
|
||||
guard (2.19.1)
|
||||
formatador (>= 0.2.4)
|
||||
|
|
@ -201,7 +195,7 @@ GEM
|
|||
rails-dom-testing (>= 1, < 3)
|
||||
railties (>= 4.2.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
json (2.10.1)
|
||||
json (2.10.2)
|
||||
json-jwt (1.16.7)
|
||||
activesupport (>= 4.2)
|
||||
aes_key_wrap
|
||||
|
|
@ -213,7 +207,7 @@ GEM
|
|||
listen (3.9.0)
|
||||
rb-fsevent (~> 0.10, >= 0.10.3)
|
||||
rb-inotify (~> 0.9, >= 0.9.10)
|
||||
logger (1.6.5)
|
||||
logger (1.6.6)
|
||||
loofah (2.24.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.12.0)
|
||||
|
|
@ -226,11 +220,11 @@ GEM
|
|||
marcel (1.0.4)
|
||||
matrix (0.4.2)
|
||||
method_source (1.1.0)
|
||||
mini_magick (5.1.2)
|
||||
mini_magick (5.2.0)
|
||||
benchmark
|
||||
logger
|
||||
mini_mime (1.1.5)
|
||||
minitest (5.25.4)
|
||||
minitest (5.25.5)
|
||||
minitest-rails (7.2.0)
|
||||
minitest (~> 5.20)
|
||||
railties (>= 7.2.0, < 8.0.0)
|
||||
|
|
@ -253,12 +247,12 @@ GEM
|
|||
net-smtp (0.5.1)
|
||||
net-protocol
|
||||
nio4r (2.7.4)
|
||||
nokogiri (1.18.2-x86_64-linux-gnu)
|
||||
nokogiri (1.18.3-x86_64-linux-gnu)
|
||||
racc (~> 1.4)
|
||||
notiffany (0.1.3)
|
||||
nenv (~> 0.1)
|
||||
shellany (~> 0.0)
|
||||
omniauth (2.1.2)
|
||||
omniauth (2.1.3)
|
||||
hashie (>= 3.4.6)
|
||||
rack (>= 2.2.3)
|
||||
rack-protection
|
||||
|
|
@ -301,7 +295,7 @@ GEM
|
|||
puma (6.6.0)
|
||||
nio4r (~> 2.0)
|
||||
racc (1.8.1)
|
||||
rack (3.1.9)
|
||||
rack (3.1.12)
|
||||
rack-oauth2 (2.2.1)
|
||||
activesupport
|
||||
attr_required
|
||||
|
|
@ -371,11 +365,11 @@ GEM
|
|||
responders (3.1.1)
|
||||
actionpack (>= 5.2)
|
||||
railties (>= 5.2)
|
||||
rexml (3.4.0)
|
||||
rexml (3.4.1)
|
||||
rouge (4.5.1)
|
||||
ruby-graphviz (1.2.5)
|
||||
rexml
|
||||
ruby-lsp (0.23.10)
|
||||
ruby-lsp (0.23.11)
|
||||
language_server-protocol (~> 3.17.0)
|
||||
prism (>= 1.2, < 2.0)
|
||||
rbs (>= 3, < 4)
|
||||
|
|
@ -385,15 +379,13 @@ GEM
|
|||
ffi (~> 1.12)
|
||||
logger
|
||||
rubyzip (2.4.1)
|
||||
rufo (0.18.0)
|
||||
sass-embedded (1.83.4-x86_64-linux-gnu)
|
||||
google-protobuf (~> 4.29)
|
||||
rufo (0.18.1)
|
||||
sassc (2.4.0)
|
||||
ffi (~> 1.9)
|
||||
sdoc (2.6.1)
|
||||
rdoc (>= 5.0)
|
||||
securerandom (0.4.1)
|
||||
selenium-webdriver (4.28.0)
|
||||
selenium-webdriver (4.29.1)
|
||||
base64 (~> 0.2)
|
||||
logger (~> 1.4)
|
||||
rexml (~> 3.2, >= 3.2.5)
|
||||
|
|
@ -410,7 +402,7 @@ GEM
|
|||
actionpack (>= 3.1)
|
||||
railties (>= 3.1)
|
||||
slim (>= 3.0, < 6.0, != 5.0.0)
|
||||
sorbet-runtime (0.5.11820)
|
||||
sorbet-runtime (0.5.11930)
|
||||
spring (2.1.1)
|
||||
spring-watcher-listen (2.0.1)
|
||||
listen (>= 2.7, < 4.0)
|
||||
|
|
@ -426,7 +418,7 @@ GEM
|
|||
actionpack (>= 6.1)
|
||||
activesupport (>= 6.1)
|
||||
sprockets (>= 3.0.0)
|
||||
stringio (3.1.2)
|
||||
stringio (3.1.5)
|
||||
swd (2.0.3)
|
||||
activesupport (>= 3)
|
||||
attr_required (>= 0.0.5)
|
||||
|
|
@ -443,7 +435,7 @@ GEM
|
|||
concurrent-ruby (~> 1.0)
|
||||
uglifier (4.2.1)
|
||||
execjs (>= 0.3.0, < 3)
|
||||
uri (1.0.2)
|
||||
uri (1.0.3)
|
||||
useragent (0.16.11)
|
||||
validate_url (1.0.15)
|
||||
activemodel (>= 3.0.0)
|
||||
|
|
@ -464,7 +456,7 @@ GEM
|
|||
will_paginate (>= 3.0.3)
|
||||
xpath (3.2.0)
|
||||
nokogiri (~> 1.8)
|
||||
zeitwerk (2.7.1)
|
||||
zeitwerk (2.7.2)
|
||||
|
||||
PLATFORMS
|
||||
x86_64-linux
|
||||
|
|
@ -478,7 +470,6 @@ DEPENDENCIES
|
|||
bzip2-ffi
|
||||
cancancan
|
||||
capybara
|
||||
dartsass-rails (~> 0.5.1)
|
||||
debug
|
||||
devise
|
||||
factory_bot_rails
|
||||
|
|
@ -502,7 +493,7 @@ DEPENDENCIES
|
|||
pg
|
||||
pg_search
|
||||
puma (~> 6.6.0)
|
||||
rails (~> 7.1)
|
||||
rails (~> 7.2)
|
||||
rails-erd
|
||||
rails-healthcheck
|
||||
ruby-lsp
|
||||
|
|
|
|||
1
app/assets/javascripts/fslightbox.js
Normal file
1
app/assets/javascripts/fslightbox.js
Normal file
File diff suppressed because one or more lines are too long
|
|
@ -9,12 +9,8 @@
|
|||
* compiled file, but it's generally better to create a new file per style scope.
|
||||
*
|
||||
*= require_self
|
||||
//= require foundation_and_overrides
|
||||
|
||||
*= require foundation_and_overrides
|
||||
*= require font-awesome
|
||||
*= require my_styles
|
||||
*/
|
||||
|
||||
@import "jquery.fancybox.min";
|
||||
|
||||
@import "foundation_and_overrides";
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
|
||||
<title><%= content_for?(:title) ? yield(:title) : "Untitled" %></title>
|
||||
|
||||
<%= stylesheet_link_tag "application" %>
|
||||
<%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
|
||||
<%= csrf_meta_tags %>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<%= yield %>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -9,7 +9,7 @@ html
|
|||
/ TODO: make the keywords reflect the virtual host (e.g. Debian)
|
||||
= stylesheet_link_tag "application", media: "all"
|
||||
/ = javascript_include_tag "vendor/modernizr"
|
||||
= javascript_include_tag "application"
|
||||
= javascript_include_tag "application", "data-turbolinks-track" => true
|
||||
= csrf_meta_tags
|
||||
|
||||
body
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ Rails.application.configure do
|
|||
|
||||
config.action_mailer.smtp_settings = {
|
||||
# TODO: make configurable through ENV variables
|
||||
address: 'dokku1.workaround.org',
|
||||
address: 'dokku2.workaround.org',
|
||||
port: 25,
|
||||
enable_starttls_auto: false
|
||||
}
|
||||
|
|
|
|||
|
|
@ -78,4 +78,6 @@ Rails.application.configure do
|
|||
# config.action_view.raise_on_missing_translations = true
|
||||
|
||||
config.base_url = ENV['DEBSHOTS_BASE_URL'] || 'http://localhost:3000'
|
||||
# Raise error when a before_action's only/except options reference missing actions.
|
||||
config.action_controller.raise_on_missing_callback_actions = true
|
||||
end
|
||||
|
|
|
|||
|
|
@ -2,17 +2,23 @@
|
|||
<html>
|
||||
<head>
|
||||
<title>The page you were looking for doesn't exist (404)</title>
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1">
|
||||
<style>
|
||||
body {
|
||||
.rails-default-error-page {
|
||||
background-color: #EFEFEF;
|
||||
color: #2E2F30;
|
||||
text-align: center;
|
||||
font-family: arial, sans-serif;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
div.dialog {
|
||||
width: 25em;
|
||||
margin: 4em auto 0 auto;
|
||||
.rails-default-error-page div.dialog {
|
||||
width: 95%;
|
||||
max-width: 33em;
|
||||
margin: 4em auto 0;
|
||||
}
|
||||
|
||||
.rails-default-error-page div.dialog > div {
|
||||
border: 1px solid #CCC;
|
||||
border-right-color: #999;
|
||||
border-left-color: #999;
|
||||
|
|
@ -21,33 +27,34 @@
|
|||
border-top-left-radius: 9px;
|
||||
border-top-right-radius: 9px;
|
||||
background-color: white;
|
||||
padding: 7px 4em 0 4em;
|
||||
padding: 7px 12% 0;
|
||||
box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
|
||||
}
|
||||
|
||||
h1 {
|
||||
.rails-default-error-page h1 {
|
||||
font-size: 100%;
|
||||
color: #730E15;
|
||||
line-height: 1.5em;
|
||||
}
|
||||
|
||||
body > p {
|
||||
width: 33em;
|
||||
margin: 0 auto 1em;
|
||||
padding: 1em 0;
|
||||
.rails-default-error-page div.dialog > p {
|
||||
margin: 0 0 1em;
|
||||
padding: 1em;
|
||||
background-color: #F7F7F7;
|
||||
border: 1px solid #CCC;
|
||||
border-right-color: #999;
|
||||
border-left-color: #999;
|
||||
border-bottom-color: #999;
|
||||
border-bottom-left-radius: 4px;
|
||||
border-bottom-right-radius: 4px;
|
||||
border-top-color: #DADADA;
|
||||
color: #666;
|
||||
box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
|
||||
box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<body class="rails-default-error-page">
|
||||
<!-- This file lives in public/404.html -->
|
||||
<div class="dialog">
|
||||
<h1>The page you were looking for doesn't exist.</h1>
|
||||
|
|
|
|||
|
|
@ -2,17 +2,23 @@
|
|||
<html>
|
||||
<head>
|
||||
<title>The change you wanted was rejected (422)</title>
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1">
|
||||
<style>
|
||||
body {
|
||||
.rails-default-error-page {
|
||||
background-color: #EFEFEF;
|
||||
color: #2E2F30;
|
||||
text-align: center;
|
||||
font-family: arial, sans-serif;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
div.dialog {
|
||||
width: 25em;
|
||||
margin: 4em auto 0 auto;
|
||||
.rails-default-error-page div.dialog {
|
||||
width: 95%;
|
||||
max-width: 33em;
|
||||
margin: 4em auto 0;
|
||||
}
|
||||
|
||||
.rails-default-error-page div.dialog > div {
|
||||
border: 1px solid #CCC;
|
||||
border-right-color: #999;
|
||||
border-left-color: #999;
|
||||
|
|
@ -21,37 +27,41 @@
|
|||
border-top-left-radius: 9px;
|
||||
border-top-right-radius: 9px;
|
||||
background-color: white;
|
||||
padding: 7px 4em 0 4em;
|
||||
padding: 7px 12% 0;
|
||||
box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
|
||||
}
|
||||
|
||||
h1 {
|
||||
.rails-default-error-page h1 {
|
||||
font-size: 100%;
|
||||
color: #730E15;
|
||||
line-height: 1.5em;
|
||||
}
|
||||
|
||||
body > p {
|
||||
width: 33em;
|
||||
margin: 0 auto 1em;
|
||||
padding: 1em 0;
|
||||
.rails-default-error-page div.dialog > p {
|
||||
margin: 0 0 1em;
|
||||
padding: 1em;
|
||||
background-color: #F7F7F7;
|
||||
border: 1px solid #CCC;
|
||||
border-right-color: #999;
|
||||
border-left-color: #999;
|
||||
border-bottom-color: #999;
|
||||
border-bottom-left-radius: 4px;
|
||||
border-bottom-right-radius: 4px;
|
||||
border-top-color: #DADADA;
|
||||
color: #666;
|
||||
box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
|
||||
box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<body class="rails-default-error-page">
|
||||
<!-- This file lives in public/422.html -->
|
||||
<div class="dialog">
|
||||
<h1>The change you wanted was rejected.</h1>
|
||||
<p>Maybe you tried to change something you didn't have access to.</p>
|
||||
<div>
|
||||
<h1>The change you wanted was rejected.</h1>
|
||||
<p>Maybe you tried to change something you didn't have access to.</p>
|
||||
</div>
|
||||
<p>If you are the application owner check the logs for more information.</p>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -2,17 +2,23 @@
|
|||
<html>
|
||||
<head>
|
||||
<title>We're sorry, but something went wrong (500)</title>
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1">
|
||||
<style>
|
||||
body {
|
||||
.rails-default-error-page {
|
||||
background-color: #EFEFEF;
|
||||
color: #2E2F30;
|
||||
text-align: center;
|
||||
font-family: arial, sans-serif;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
div.dialog {
|
||||
width: 25em;
|
||||
margin: 4em auto 0 auto;
|
||||
.rails-default-error-page div.dialog {
|
||||
width: 95%;
|
||||
max-width: 33em;
|
||||
margin: 4em auto 0;
|
||||
}
|
||||
|
||||
.rails-default-error-page div.dialog > div {
|
||||
border: 1px solid #CCC;
|
||||
border-right-color: #999;
|
||||
border-left-color: #999;
|
||||
|
|
@ -21,36 +27,40 @@
|
|||
border-top-left-radius: 9px;
|
||||
border-top-right-radius: 9px;
|
||||
background-color: white;
|
||||
padding: 7px 4em 0 4em;
|
||||
padding: 7px 12% 0;
|
||||
box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
|
||||
}
|
||||
|
||||
h1 {
|
||||
.rails-default-error-page h1 {
|
||||
font-size: 100%;
|
||||
color: #730E15;
|
||||
line-height: 1.5em;
|
||||
}
|
||||
|
||||
body > p {
|
||||
width: 33em;
|
||||
margin: 0 auto 1em;
|
||||
padding: 1em 0;
|
||||
.rails-default-error-page div.dialog > p {
|
||||
margin: 0 0 1em;
|
||||
padding: 1em;
|
||||
background-color: #F7F7F7;
|
||||
border: 1px solid #CCC;
|
||||
border-right-color: #999;
|
||||
border-left-color: #999;
|
||||
border-bottom-color: #999;
|
||||
border-bottom-left-radius: 4px;
|
||||
border-bottom-right-radius: 4px;
|
||||
border-top-color: #DADADA;
|
||||
color: #666;
|
||||
box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
|
||||
box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<body class="rails-default-error-page">
|
||||
<!-- This file lives in public/500.html -->
|
||||
<div class="dialog">
|
||||
<h1>We're sorry, but something went wrong.</h1>
|
||||
<div>
|
||||
<h1>We're sorry, but something went wrong.</h1>
|
||||
</div>
|
||||
<p>If you are the application owner check the logs for more information.</p>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue