Skip to content

Commit

Permalink
Merge v2.9.0 into develop
Browse files Browse the repository at this point in the history
* commit 'c9eeb2e832b5b36a86028bbec7a353c32be510a7': (227 commits)
  Bump version to 2.9.0 (mastodon#11074)
  New Crowdin translations (mastodon#11075)
  New Crowdin translations (mastodon#11073)
  Fix ordering of keyboard access between CW field, textarea and emoji picker (mastodon#11066)
  List attachments in reply indicator and boost modal (mastodon#10997)
  New Crowdin translations (mastodon#11069)
  Bump version to 2.9.0rc2 (mastodon#11070)
  Do not expand toot when clicking on a poll option (mastodon#11067)
  Only show profile directory link when it's enabled (mastodon#11064)
  Add button to conveniently copy OAuth code (mastodon#11065)
  Fix border-bottom of active tab bars (mastodon#11068)
  New Crowdin translations (mastodon#11062)
  Change translations badge in README to Crowdin (mastodon#11054)
  New Crowdin translations (mastodon#11060)
  Fix Serbian pluralization rules requiring a "many" key (mastodon#11061)
  Update crowdin.yml
  i18n: Update Japanese translations (mastodon#11035)
  Update Crowdin configuration file
  Update Crowdin configuration file
  l10n: update Persian translations (fa.yml) (mastodon#11052)
  ...

# Conflicts:
#	CHANGELOG.md
#	app/javascript/mastodon/components/status.js
#	app/javascript/mastodon/locales/ja.json
#	app/javascript/styles/mastodon-light/diff.scss
#	db/schema.rb
#	lib/mastodon/version.rb
#	package.json
  • Loading branch information
mangatokyopg committed Jun 14, 2019
2 parents 9d406cb + c9eeb2e commit 0eda4dc
Show file tree
Hide file tree
Showing 479 changed files with 8,840 additions and 6,915 deletions.
4 changes: 2 additions & 2 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ plugins:
channel: eslint-5
rubocop:
enabled: true
channel: rubocop-0-54
scss-lint:
channel: rubocop-0-71
sass-lint:
enabled: true
exclude_patterns:
- spec/
Expand Down
10 changes: 10 additions & 0 deletions .dependabot/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 1

update_configs:
- package_manager: "ruby:bundler"
directory: "/"
update_schedule: "weekly"

- package_manager: "javascript"
directory: "/"
update_schedule: "weekly"
1 change: 1 addition & 0 deletions .env.production.sample
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ DB_NAME=postgres
DB_PASS=
DB_PORT=5432
# Optional ElasticSearch configuration
# You may also set ES_PREFIX to share the same cluster between multiple Mastodon servers (falls back to REDIS_NAMESPACE if not set)
# ES_ENABLED=true
# ES_HOST=es
# ES_PORT=9200
Expand Down
2 changes: 2 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
patreon: mastodon
open_collective: mastodon
6 changes: 6 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
require:
- rubocop-rails

AllCops:
TargetRubyVersion: 2.3
Exclude:
Expand Down Expand Up @@ -82,6 +85,9 @@ Rails/Exit:
- 'lib/mastodon/*'
- 'lib/cli.rb'

Rails/HelperInstanceVariable:
Enabled: false

Style/ClassAndModuleChildren:
Enabled: false

Expand Down
37 changes: 37 additions & 0 deletions .sass-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Linter Documentation:
# https://github.com/sasstools/sass-lint/tree/v1.13.1/docs/options

files:
include: app/javascript/styles/**/*.scss
ignore:
- app/javascript/styles/mastodon/reset.scss

rules:
# Disallows
no-color-literals: 0
no-css-comments: 0
no-duplicate-properties: 0
no-ids: 0
no-important: 0
no-mergeable-selectors: 0
no-misspelled-properties: 0
no-qualifying-elements: 0
no-transition-all: 0
no-vendor-prefixes: 0

# Nesting
force-element-nesting: 0
force-attribute-nesting: 0
force-pseudo-nesting: 0

# Name Formats
class-name-format: 0
leading-zero: 0

# Style Guide
attribute-quotes: 0
hex-length: 0
indentation: 0
nesting-depth: 0
property-sort-order: 0
quotes: 0
264 changes: 0 additions & 264 deletions .scss-lint.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .yarnclean
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ Gruntfile.js

# for specific ignore
!.svgo.yml

!sass-lint/**/*.yml
Loading

0 comments on commit 0eda4dc

Please sign in to comment.