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.

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

Bump sidekiq from 6.5.8 to 6.5.9 #2423

Open
wants to merge 52 commits into
base: crazynewworld
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
33bbf83
In basic UI, bring 2-column view to the center
Hanage999 May 26, 2019
f1d2ea7
Fix multi-column layout that cannot scroll to the leftmost column whe…
Hanage999 May 26, 2019
388880c
fix conflict in settings.yml
Hanage999 Dec 15, 2018
579fa90
enable Japanese(kuromoji) analyzer
Hanage999 Mar 8, 2018
84b45dc
Followed changes in the default variables.scss
Hanage999 Apr 13, 2018
0b669d1
Increase ElasticSearch results
Hanage999 Apr 14, 2018
dabfa23
follow mastodon/app/javascript/styles/mastodon/variables.scss at master
Hanage999 Apr 21, 2018
7d1b36c
Revert "Increase ElasticSearch results"
Hanage999 Apr 23, 2018
882851c
change background of login/sign-up screen
Hanage999 Apr 23, 2018
34cc6f6
adjusted transparent background
Hanage999 May 13, 2018
84bb834
change background image
Hanage999 May 14, 2018
1ab5666
adjust background image size
Hanage999 May 14, 2018
5c308d9
add background images
Hanage999 May 29, 2018
39fedfd
Re-organize crazynewworld theme
Hanage999 Jul 16, 2018
9190dec
set background of profile boxes transparent
Hanage999 Jul 30, 2018
7f29e84
made .endorsements-widget and .card__bar transparent
Hanage999 Aug 19, 2018
59fb1e4
make about/more page transparent
Hanage999 Aug 23, 2018
951b0c5
hide 'more' at footer of public pages
Hanage999 Aug 24, 2018
522aac6
change color of horizontal lines in admin pages
Hanage999 Sep 30, 2018
63166cc
add report-uri directive
Hanage999 Oct 21, 2018
e1b0e87
adjusted background of status-card
Hanage999 Oct 31, 2018
905dce3
make directory page transparent
Hanage999 Dec 8, 2018
9646a16
add 'crazynewworld-blue' theme
Hanage999 Jan 4, 2019
20efe03
adjust color of background-blue.jpg
Hanage999 Jan 4, 2019
1c7dba1
adjust public tag timeline CSS
Hanage999 Jan 18, 2019
2f9c5b0
make hero card in new landing page transparent
Hanage999 Mar 24, 2019
5c5ae76
make new profile column design in web UI transparent
Hanage999 Mar 26, 2019
f47dc67
adjust background color of verified account header in webUI
Hanage999 Mar 27, 2019
71ba24b
make new single-column UI transparent
Hanage999 May 26, 2019
f5acd5d
Fix 3-columns layout
Hanage999 May 26, 2019
86ec858
Revert "Fix 3-columns layout"
Hanage999 May 31, 2019
b8c440c
Revert "Fix multi-column layout that cannot scroll to the leftmost co…
Hanage999 May 31, 2019
c9d7875
Revert "In basic UI, bring 2-column view to the center"
Hanage999 May 31, 2019
38f70b6
Fix color of navigation links in simple UI
Hanage999 Jun 1, 2019
15fee21
Add themes (default layout + transparency)
Hanage999 Jun 2, 2019
8ddc853
In 2-column layout, fix color of tab links on mouse hover
Hanage999 Jun 2, 2019
f5fcce4
make tabs-bar darker
Hanage999 Jun 9, 2019
92dab18
tweak compose panel appearance
Hanage999 Jun 9, 2019
c10341b
Adjust background of trends view
Hanage999 Aug 10, 2019
0116f4b
Refactor custom scss
Hanage999 Aug 11, 2019
a90d010
Change CSP to allow tesseract.js
Hanage999 Aug 16, 2019
80f9a8f
Tweak color transparency in settings view and about:more
Hanage999 Oct 16, 2019
d7e7645
Modify the background of admin announcements
Hanage999 Jan 24, 2020
6d56864
Adjust background of announcements panel
Hanage999 Jan 26, 2020
404e2ea
Make directory page transparent
Hanage999 Aug 14, 2020
45c788f
Increase MAX_ITEMS
Hanage999 Sep 11, 2020
45f89f5
Avoid CSP error regarding the style-src-attr directive
Hanage999 Oct 27, 2022
0bc67b4
Change Crazynewworld theme to fit the new layout of posts
Hanage999 Oct 27, 2022
054adbe
Revert "Avoid CSP error regarding the style-src-attr directive"
Hanage999 Nov 5, 2022
b0bcfb3
Avoid CSP error regarding the style-src-attr directive
Hanage999 Nov 5, 2022
88f4402
Disable media_proxy throttling
Hanage999 Dec 28, 2022
fec9a24
Bump sidekiq from 6.5.8 to 6.5.9
dependabot[bot] May 26, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ GEM
activerecord (>= 4.0.0)
railties (>= 4.0.0)
semantic_range (3.0.0)
sidekiq (6.5.8)
sidekiq (6.5.9)
connection_pool (>= 2.2.5, < 3)
rack (~> 2.0)
redis (>= 4.5.0, < 5)
Expand Down
57 changes: 39 additions & 18 deletions app/chewy/statuses_index.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,52 @@
class StatusesIndex < Chewy::Index
include FormattingHelper

# settings index: { refresh_interval: '30s' }, analysis: {
# filter: {
# english_stop: {
# type: 'stop',
# stopwords: '_english_',
# },
# english_stemmer: {
# type: 'stemmer',
# language: 'english',
# },
# english_possessive_stemmer: {
# type: 'stemmer',
# language: 'possessive_english',
# },
# },
# analyzer: {
# content: {
# tokenizer: 'uax_url_email',
# filter: %w(
# english_possessive_stemmer
# lowercase
# asciifolding
# cjk_width
# english_stop
# english_stemmer
# ),
# },
# },
# }

Check failure on line 34 in app/chewy/statuses_index.rb

View workflow job for this annotation

GitHub Actions / lint

[Correctable] Layout/CommentIndentation: Incorrect indentation detected (column 0 instead of 2).

settings index: { refresh_interval: '30s' }, analysis: {
filter: {
english_stop: {
type: 'stop',
stopwords: '_english_',
},
english_stemmer: {
type: 'stemmer',
language: 'english',
},
english_possessive_stemmer: {
type: 'stemmer',
language: 'possessive_english',
tokenizer: {
kuromoji_user_dict: {
type: 'kuromoji_tokenizer',
user_dictionary: 'userdic.txt',
},
},
analyzer: {
content: {
tokenizer: 'uax_url_email',
type: 'custom',
tokenizer: 'kuromoji_user_dict',
filter: %w(
english_possessive_stemmer
lowercase
asciifolding
kuromoji_baseform
kuromoji_stemmer
cjk_width
english_stop
english_stemmer
lowercase
),
},
},
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/api/v2/search_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
class Api::V2::SearchController < Api::BaseController
include Authorization

RESULTS_LIMIT = 20
RESULTS_LIMIT = 50

before_action -> { authorize_if_got_token! :read, :'read:search' }
before_action :validate_search_params!
Expand Down
5 changes: 5 additions & 0 deletions app/javascript/styles/crazynewworld-blue.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@import 'crazynewworld/variables-blue';
@import 'application';
@import 'crazynewworld/compact';
@import 'crazynewworld/transparent_background';

4 changes: 4 additions & 0 deletions app/javascript/styles/crazynewworld.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@import 'crazynewworld/variables';
@import 'application';
@import 'crazynewworld/compact';
@import 'crazynewworld/transparent_background';
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 33 additions & 0 deletions app/javascript/styles/crazynewworld/compact.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/* 通知を一番左の列に組み込み */

@media screen and (min-width:741px) {

.drawer {
width: 25% !important;
height: 510px !important;
overflow: visible !important;
}

.column {
flex: auto !important;
}

.column:nth-child(3) {
position: fixed !important;
margin-top: 500px !important;
padding-left: 10px !important;
height: calc(100% - 500px) !important;
left: 0px !important;
width: 25% !important;
}

.column:nth-child(3) + div .mastodon-column-container {
height: auto !important;
}

div.column-icon.collapsable + div {
overflow: scroll !important;
}

}