Skip to content

Commit e9fb160

Browse files
committed
Bump version to kb21.2-lts
1 parent 9b1ca4b commit e9fb160

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

app/javascript/mastodon/actions/importer/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ export function importFetchedStatus(status, options = {}) {
5050
return importFetchedStatuses([status], options);
5151
}
5252

53-
export function importFetchedStatuses(statuses) {
53+
export function importFetchedStatuses(statuses, options = {}) {
5454
return (dispatch, getState) => {
5555
const accounts = [];
5656
const normalStatuses = [];
5757
const polls = [];
5858
const filters = [];
5959

60-
function processStatus(status, options = undefined) {
61-
pushUnique(normalStatuses, normalizeStatus(status, getState().getIn(['statuses', status.id]), options));
60+
function processStatus(status, processOptions = {}) {
61+
pushUnique(normalStatuses, normalizeStatus(status, getState().getIn(['statuses', status.id]), { ...options, ...processOptions }));
6262
pushUnique(accounts, status.account);
6363

6464
if (status.filtered) {

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ services:
5959
web:
6060
# You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
6161
build: .
62-
image: kmyblue:21.1-lts
62+
image: kmyblue:21.2-lts
6363
restart: always
6464
env_file: .env.production
6565
command: bundle exec puma -C config/puma.rb
@@ -83,7 +83,7 @@ services:
8383
build:
8484
dockerfile: ./streaming/Dockerfile
8585
context: .
86-
image: kmyblue-streaming:21.1-lts
86+
image: kmyblue-streaming:21.2-lts
8787
restart: always
8888
env_file: .env.production
8989
command: node ./streaming/index.js
@@ -101,7 +101,7 @@ services:
101101

102102
sidekiq:
103103
build: .
104-
image: kmyblue:21.1-lts
104+
image: kmyblue:21.2-lts
105105
restart: always
106106
env_file: .env.production
107107
command: bundle exec sidekiq

lib/mastodon/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def kmyblue_major
1313
end
1414

1515
def kmyblue_minor
16-
1
16+
2
1717
end
1818

1919
def kmyblue_flag

0 commit comments

Comments
 (0)