2832 Commits (c3ef5d5414ac1fee5471d7063616a4b72a408e11)

 

All Branches   

Search

Author	SHA1	Message	Date
Tristan Mahé	964035b118	allow localhost to bypass the ratelimit (#2554)	8 years ago
Akihiko Odaki	5135d609b7	Use PostgreSQL inheritance for blocks and mutes (#2520)	8 years ago
Matt Jankowski	f48cb3eb17	More coverage yes more even more (#2627) ... * Add coverage for admin/confirmations controller * Coverage for statuses controller show action * Add coverage for admin/domain_blocks controller * Add coverage for settings/profiles#update	8 years ago
yhirano	8325866c61	Downgrade rubocop 0.48.1 => 0.46.0 (#2628) ... * downgrade rubocop 0.48.1 => 0.46.0 * exclude vendor/**/* from rubocop target files * add frozen_string_literal comment line * fix percent literal delimited by ( and ) * fix alignment * remove comment disabling unknown cop	8 years ago
Eugen Rochko	01e011bc90	Bump version to 1.3.2 (#2623)	8 years ago
Stephen Burgess	e3b60b07d9	fix(video): Position of play icon (#2608) ... * fix(video): Position of play icon #2601 * fix(overlay-button): Positioning * fix(expand): Bottom align expand icon * feat(video): Fit landscape videos into preview area	8 years ago
YOU	d0665726ca	Update index.js (#2612)	8 years ago
alpaca-tc	96c84da1d4	Expand uploaded thumbnail (#2611)	8 years ago
alpaca-tc	7d36a76180	Remove uneeded `ORDER BY` query (#2615)	8 years ago
Patrick Figel	197af5de70	Set unknown attachment type when adding domain blocks (#2605) ... Follow-up to #2599. When a domain block with `reject_media` is added or `rake mastodon:media:remove_remote` is invoked, mastodon deletes the locally cached attachments and avatars but does not reflect that change in the database, causing the `file` fields to still have values. This change persists the deletion in the database and sets the attachment type to unknown. This also introduces a one-off rake task that sets all attachments without a local file to the "unknown" type. The upgrade notes for the next release should contain a post-upgrade step with `rake mastodon:media:set_unknown`.	8 years ago
Joël Quenneville	27301312a6	Add tests to the Feed model (#2594) ... This adds a test for the `Feed#get` method. While the data transformations in `Feed#get` may seem redundant, they are important to maintain the order from Redis. The tests I wrote will fail if someone tries to refactor away this "redundancy" (as I tried to do in the first iteration of this change).	8 years ago
Patrick Figel	8ac7fca5d0	Set correct attachment type for rejected media (#2599) ... In #2110, a new attachment type "unknown" was introduced for attachments that were rejected due to a domain being blocked using reject_media. However, the "type" field was never set to "unknown" because a default value of "0" (image) is set for that column, causing the `type.blank?` expression to always equal false. This version uses type_changed? instead, causing the type to be set to "unknown" unless a type has been explicitly set. This introduces a small change in behaviour causing the type to be set to unknown before paperclip calls `before_post_process`. Presumably this behaviour is more appropriate than the current one because the attachment type has not been determined by that point. Included are new tests for `ProcessFeedService` and `UpdateRemoteProfileService` which now check that remote media is downloaded for non-blocked domains and is rejected for others.	8 years ago
Matt Jankowski	a823509b99	Fix broken view spec for about/links (#2591)	8 years ago
Yamagishi Kazutoshi	298d28af51	Fix API for Mastodon version (#2590) ... Fix #2589	8 years ago
Mingye Wang	439b2dceda	Minor updates to zh-CN JS translation (#2557) ... * Minor updates to zh-CN JS translation * removed "!" from "toot" per #2549 (it's a privacy indicator) * ellipsis work (from ... to some U+2026 horizontal ellipsis unicode stuff) * Spillcheck for zh-CN js translations (squash this) 部 [份→分]	8 years ago
Matt Jankowski	9262f6968b	Fix broken spec for about/links view partial (#2586)	8 years ago
Yamagishi Kazutoshi	71e73e36cd	Fix spec for hide get started (#2585)	8 years ago
Yamagishi Kazutoshi	01c206326f	Hide get started link when register closed (#2583)	8 years ago
Matt Jankowski	9566893cc9	More controller specs (#2561) ... * Add render_views in more places * Delegate methods from account to user with allow nil true, so that admin accounts show view renders when missing a user * Use actual account instances in authorize follow controller spec	8 years ago
Wonderfall	0e2589867f	Update en locale federation description (#2558)	8 years ago
Ratmir Karabut	4acc386dd5	Update Russian translation (pluralizations) (#2565) ... * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error * Update Russian translation * Fix formatting error * Update Russian translation * Update Russian translation * Update ru.jsx * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Fix translation consistency * Update Russian translation * Update Russian translation (pluralizations)	8 years ago
Matt Jankowski	429480bb77	Return missing page when tag does not exist (#2563)	8 years ago
Matt Jankowski	61067dc2e6	Gem version updates (#2566) ... * Update autoprefixer-rails to version 6.7.7.2 * Update aws-sdk to version 2.9.12 * Update http to version 2.2.2 * Update mail to version 2.6.5 * Update pghero to version 1.6.5 * Update ox to version 2.4.13 * Update json to version 2.1.0 * Update capistrano-rbenv to version 2.1.1 * Update httplog to version 0.99.3 * Update rainbow to version 2.2.2 * Update pkg-config to version 1.2.0 * Update globalid to version 0.4.0 * Update redis-rack to version 2.0.2 * Update webmock to version 3.0.1 * Update oj to version 3.0.2	8 years ago
Matt Jankowski	effb08edbb	More status specs (#2564) ... * Add rough outline of coverage needed for public timeline * Specs for visibility, replies, boosts * Specs for silenced account * Specs for local_only option * Specs for blocks and mutes * Add tentative spec around including other silenced account statuses * Add with_public_visibility scope * Add simple coverage for tag_timeline * Tag timeline includes replies * Replace tag.statuses with a tagged_with scope in tag timeline method * Use with_public_visibility in tag timeline * Extract common scope between public and tag timelines to method * Extract local domain check to local_only scope * Extract local_only check to starting scope method * Move list of excluded from timeline account ids to account model * Simplify excluded accounts list on account model * Only join accounts when needed * Rename method for account specific filtering * Extract method for account exclusions * Fix bug where silenced accounts were not including statuses from other silenced accounts * DRY up filter application from account or no account * timeline_scope can be private * Add spec showing that account can find its excluded accounts ids * Add spec which fails if local_only does not have a left outer join * rubocop	8 years ago
Ratmir Karabut	d1b4ebe07d	Update Russian translation (#2570) ... New column subheadings	8 years ago
Ash Furrow	5eef9dab80	Update version to 1.3.1 (#2571)	8 years ago
y-temp4	2ca246d7d1	Use the new Ruby 1.9 hash syntax (#2577)	8 years ago
ButterflyOfFire	9a085e138e	Update settings_helper.rb (#2556) ... Correcting language name arabic = العربية	8 years ago
Wonderfall	546b5a9dcf	Update onboard federation description (#2555)	8 years ago
Matt Jankowski	a39e719b39	Add render_views to admin/reports controller spec (#2548)	8 years ago
Shel Raphen	f51b2cb2e7	Copy edits to reflect changes in post privacy (#2552) ... There was still a reference to "private posts" and the phrasing of unlisted in contrast to the others now made it seem strangely more private.	8 years ago
Matt Jankowski	9736753985	Fix remote follow (#2547) ... * Add coverage for remote_follow#new * Fix reference to authorize_follows/card partial	8 years ago
Ratmir Karabut	ea783d3632	Fix typo and wording in follower auth settings (#2544)	8 years ago
Patrick Figel	074e9612a2	fix partial path in admin/reports (#2546) ... In #2505, the authorize_follow views were renamed to authorize_follows. This change was not applied in the show view of admin/reports, which causes a 500 when reports are viewed.	8 years ago
Eugen Rochko	7406404fa3	Hotfix remote status formatting (#2543)	8 years ago
Eduardo Elias	010e4f2879	Language: Missing keys for pt-BR (#2540)	8 years ago
unarist	ebbbcfef1c	Update Japanese translation (and English translation file) for JavaScript (#2538) ... * Update English translation file for JavaScript * Update Japanese translation for JavaScript	8 years ago
yhirano	3d776de2cb	Change permission from 0755 to 0644 (#2536) ... * chmod -x assets.rb * chmod -x assets/fonts * raname extname from jpeg to jpg	8 years ago
Yamagishi Kazutoshi	831ff60698	Fix broken oEmbed provider (#2537)	8 years ago
Yamagishi Kazutoshi	c25426ca47	Fix Doorkeeper error (#2534) ... * Fix Doorkeeper error * use Doorkeeper::OAuth::Scopes.from_string	8 years ago
jeroenpraat	09b93aaf85	Another (less urgent) Dutch string update (#2533) ... * Another (less urgent) update * Another (less urgent) update * Dutch strings: consistency: let's use 'voorkeuren' as a subset of 'instellingen'	8 years ago
Eugen Rochko	d4fedf84e0	Cache Status#ancestors recursive query results (#2527)	8 years ago
Eugen Rochko	2af4f3c4e2	Improve shared status verification (#2525) ... * Instead of parsing shared status contents verbatim, make roundtrip to purported original URL. Confirm that the "original" URL is from the same domain as the author it claims to be from. * Fix obvious typo, add comment * Use URI look-up first * Add test, update Goldfinger dependency to make less useless HTTP requests per Webfinger lookup	8 years ago
jeroenpraat	b8e7eee837	Last minute Dutch update and fix (after checking on live 1.3RC) (#2529) ... * Update and fix * Update and fix Dutch strings	8 years ago
Eugen Rochko	b48c9013aa	Bump version, improve how version is stored for better commit history (#2526)	8 years ago
Matt Jankowski	b48f2cbc8b	Catch error when server decryption fails on 2FA (#2512)	8 years ago
Ashley	1736badf28	Added '(dev)' to the title in development mode (#2524) ... * Added different title for dev * Changed indentation	8 years ago
Eugen Rochko	88725d6ce8	OEmbed support for PreviewCard (#2337) ... * OEmbed support for PreviewCard * Improve ProviderDiscovery code failure treatment * Do not crawl links if there is a content warning, since those don't display a link card anyway * Reset db schema * Fresh migrate * Fix rubocop style issues Fix #1681 - return existing access token when applicable instead of creating new * Fix test * Extract http client to helper * Improve oembed controller	8 years ago
Yamagishi Kazutoshi	be0a01145b	Sync a locale files for JavaScript (#2513) ... There are multiple messages missing in en.jsx. It is very troublesome when translating other languages.	8 years ago
Tomohiro Suwa	1f805a6377	Don't need to include ActiveModel::Validations (#2521)	8 years ago