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 rubocop-performance from 1.17.1 to 1.18.0 #2420

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
f5cd97a
In basic UI, bring 2-column view to the center
Hanage999 May 26, 2019
1d84fec
Fix multi-column layout that cannot scroll to the leftmost column whe…
Hanage999 May 26, 2019
a5b000b
fix conflict in settings.yml
Hanage999 Dec 15, 2018
2cec159
enable Japanese(kuromoji) analyzer
Hanage999 Mar 8, 2018
ca8e341
Followed changes in the default variables.scss
Hanage999 Apr 13, 2018
106cbae
Increase ElasticSearch results
Hanage999 Apr 14, 2018
fa4ce40
follow mastodon/app/javascript/styles/mastodon/variables.scss at master
Hanage999 Apr 21, 2018
19c58bc
Revert "Increase ElasticSearch results"
Hanage999 Apr 23, 2018
922fdca
change background of login/sign-up screen
Hanage999 Apr 23, 2018
459fcca
adjusted transparent background
Hanage999 May 13, 2018
ca66c82
change background image
Hanage999 May 14, 2018
ea414d0
adjust background image size
Hanage999 May 14, 2018
5390cfe
add background images
Hanage999 May 29, 2018
066b967
Re-organize crazynewworld theme
Hanage999 Jul 16, 2018
47d73f2
set background of profile boxes transparent
Hanage999 Jul 30, 2018
889250d
made .endorsements-widget and .card__bar transparent
Hanage999 Aug 19, 2018
d77def5
make about/more page transparent
Hanage999 Aug 23, 2018
c65e8f0
hide 'more' at footer of public pages
Hanage999 Aug 24, 2018
d31c4a2
change color of horizontal lines in admin pages
Hanage999 Sep 30, 2018
abac45f
add report-uri directive
Hanage999 Oct 21, 2018
561fbbc
adjusted background of status-card
Hanage999 Oct 31, 2018
b3277d2
make directory page transparent
Hanage999 Dec 8, 2018
392ddc9
add 'crazynewworld-blue' theme
Hanage999 Jan 4, 2019
170608f
adjust color of background-blue.jpg
Hanage999 Jan 4, 2019
45f26bd
adjust public tag timeline CSS
Hanage999 Jan 18, 2019
d322a04
make hero card in new landing page transparent
Hanage999 Mar 24, 2019
5f2aa42
make new profile column design in web UI transparent
Hanage999 Mar 26, 2019
bcea51e
adjust background color of verified account header in webUI
Hanage999 Mar 27, 2019
956716a
make new single-column UI transparent
Hanage999 May 26, 2019
326a4fb
Fix 3-columns layout
Hanage999 May 26, 2019
9792a82
Revert "Fix 3-columns layout"
Hanage999 May 31, 2019
55328b9
Revert "Fix multi-column layout that cannot scroll to the leftmost co…
Hanage999 May 31, 2019
c2f0b77
Revert "In basic UI, bring 2-column view to the center"
Hanage999 May 31, 2019
7f8d229
Fix color of navigation links in simple UI
Hanage999 Jun 1, 2019
ce3359c
Add themes (default layout + transparency)
Hanage999 Jun 2, 2019
70b6830
In 2-column layout, fix color of tab links on mouse hover
Hanage999 Jun 2, 2019
fd3e3c5
make tabs-bar darker
Hanage999 Jun 9, 2019
37ae624
tweak compose panel appearance
Hanage999 Jun 9, 2019
f10f728
Adjust background of trends view
Hanage999 Aug 10, 2019
d8144f7
Refactor custom scss
Hanage999 Aug 11, 2019
4750f82
Change CSP to allow tesseract.js
Hanage999 Aug 16, 2019
0d2fb26
Tweak color transparency in settings view and about:more
Hanage999 Oct 16, 2019
6cfc163
Modify the background of admin announcements
Hanage999 Jan 24, 2020
ac4d1f0
Adjust background of announcements panel
Hanage999 Jan 26, 2020
9264579
Make directory page transparent
Hanage999 Aug 14, 2020
ef97db2
Increase MAX_ITEMS
Hanage999 Sep 11, 2020
750f8a9
Avoid CSP error regarding the style-src-attr directive
Hanage999 Oct 27, 2022
c6f00af
Change Crazynewworld theme to fit the new layout of posts
Hanage999 Oct 27, 2022
f7a633b
Revert "Avoid CSP error regarding the style-src-attr directive"
Hanage999 Nov 5, 2022
97c014f
Avoid CSP error regarding the style-src-attr directive
Hanage999 Nov 5, 2022
af5b057
Disable media_proxy throttling
Hanage999 Dec 28, 2022
2ffa626
Bump rubocop-performance from 1.17.1 to 1.18.0
dependabot[bot] May 22, 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
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -613,11 +613,11 @@ GEM
rubocop-ast (>= 1.28.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.28.0)
rubocop-ast (1.28.1)
parser (>= 3.2.1.0)
rubocop-capybara (2.18.0)
rubocop (~> 1.41)
rubocop-performance (1.17.1)
rubocop-performance (1.18.0)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-rails (2.19.1)
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;
}

}