422 Commits (0f92119cebbebc463960c5532a049277ec1706be)

Author	SHA1	Message	Date
Matt Jankowski	2212dc4aaa	Update Rails to version 5.1.1 (#3121) ... * Update rails to version 5.1.1 * Run `rails app:update` * Remove the override of polymorphic activity relationship * Silence warning about otp_secret attribute being unknown to rails * We will only introduce form_with where we want to use remote data	9 years ago
Matt Jankowski	d1e08bd38c	Handle nil and blank cases in Account finders (#3500)	9 years ago
Matt Jankowski	a132332b86	Add Instance class to list admin records (#3443)	9 years ago
Matt Jankowski	b25e42a77f	Misc tidying and clean ups (#3445) ... * Remove trailing whitespace in i18n mailers * Use query methods instead of #present? on AR attributes * Delegate Status#account_domain method * Delegate Mention #account_username and #account_acct methods	9 years ago
Matt Jankowski	2cc3111a77	Expand spec coverage and refactor the `Account.find_` methods (#3485) ... * Move specs for account finder methods to concern spec * Move account finder methods to concern * Improve spec wording * Use more explicit comparison to ensure correct return value * Add coverage for .find_local! and .find_remote! * Add some methods to the finder * Use arel on matching_username method * Avoid ternary in matching domain method * Simplify finder methods * Use an AccountFinder class to simplify lookup	9 years ago
alpaca-tc	3652a39de0	Account.find_remote should be raise ActiveRecord::RecordNotFound (#3476)	9 years ago
Akihiko Odaki	7db98aa70e	Refactor User and spec (#3431) ... * Protect send_devise_notification of User * Improve spec for User	9 years ago
Jack Jennings	3a2003ba86	Extract authorization policy for viewing statuses (#3150)	9 years ago
Atsushi Yamamoto	402c19a924	Add preference setting for delete toot modal (#3368) ... * Set delete_modal preference to true by default * Does not show confirmation modal if delete_modal is false * Add ja translation for preference setting page	9 years ago
Yamagishi Kazutoshi	bca334cd28	Remove arguments in association reader (#3305)	9 years ago
alpaca-tc	08dce5e607	Refactor Setting (#3302) ... * @object is not needed * Remove unneeded dependencies * Do not call private method * Prefer #respond_to_missing? over #respond_to? `#respond_to?` doesn't support `User.settings.method(:method_name)` * Use find_or_initialize_by instead of	9 years ago
masarakki	3b59f9c6c2	fix-cache-returns-nil (#3213)	9 years ago
Akihiko Odaki	bf575a1f5e	Introduce recent to Follow (#3247) ... Introduce recent to Follow, as Account and other models have. This change also adds specs for the scope and the dependents.	9 years ago
Akihiko Odaki	8fd174298d	Cover AccountsController more in spec (#3229) ... * Introduce recent scope to Status and StreamEntry Introduce recent scope to Status and StreamEntry as Account has. * Cover AccountsController more in AccountsController	9 years ago
Matt Jankowski	e1b42e9aa0	Add coverage for ReportFilter and AccountFilter (#3236)	9 years ago
Matt Jankowski	ec34ec63b1	Specs for cleanup workers (#3235) ... * Add spec files for feed and media cleanup workers * Add coverage for feed and media cleanup schedulers * Clean up feed and media cleanup workers	9 years ago
Akihiko Odaki	2af5cd96fe	Fix mutes_controller error and incorrect statuses_controller report (#3202) ... This commit fixes a regression in commit f554807563.	9 years ago
Matt Jankowski	8f4b7c1820	Filter languages with opt out (#3175) ... * Remove allowed_languages and add filtered_languages * Use filtered_languages instead of allowed_languages	9 years ago
beatrix	724fc3cbdf	guard against empty domain block list in status scope (#3161)	9 years ago
Eugen Rochko	f8ee136c29	Fix federated timeline excluding local toots when any domain blocks are set (#3151)	9 years ago
Eugen Rochko	f1ab70649b	Add buttons to block and unblock domain (#3127) ... * Add buttons to block and unblock domain * Relationship API now returns "domain_blocking" status for accounts, rename "block entire domain" to "hide entire domain", fix unblocking domain, do not block notifications from domain-blocked-but-followed people, do not send Salmons to domain blocked users * Add test * Personal domain blocks shouldn't affect Salmon after all, since in this direction of communication the control is very thin when it comes to public stuff. Best stay consistent and not affect federation in this way * Ignore followers and follow request from domain blocked folks, ensure account domain blocks are not created for empty domain, and avoid duplicates in validation * Purge followers when blocking domain (without soft-blocks, since they are useless here) * Add tests, fix local timeline being empty when having any domain blocks	9 years ago
alpaca-tc	198ae3e366	Define instance method outside #included (#3128)	9 years ago
Matt Jankowski	6e4c7d6211	Conditional validations no longer accept strings for if/unless (#3124)	9 years ago
Eugen Rochko	620d0d8029	Account domain blocks (#2381) ... * Add <ostatus:conversation /> tag to Atom input/output Only uses ref attribute (not href) because href would be the alternate link that's always included also. Creates new conversation for every non-reply status. Carries over conversation for every reply. Keeps remote URIs verbatim, generates local URIs on the fly like the rest of them. * Conversation muting - prevents notifications that reference a conversation (including replies, favourites, reblogs) from being created. API endpoints /api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute Currently no way to tell when a status/conversation is muted, so the web UI only has a "disable notifications" button, doesn't work as a toggle * Display "Dismiss notifications" on all statuses in notifications column, not just own * Add "muted" as a boolean attribute on statuses JSON For now always false on contained reblogs, since it's only relevant for statuses returned from the notifications endpoint, which are not nested Remove "Disable notifications" from detailed status view, since it's only relevant in the notifications column * Up max class length * Remove pending test for conversation mute * Add tests, clean up * Rename to "mute conversation" and "unmute conversation" * Raise validation error when trying to mute/unmute status without conversation * Adding account domain blocks that filter notifications and public timelines * Add tests for domain blocks in notifications, public timelines Filter reblogs of blocked domains from home * Add API for listing and creating account domain blocks * API for creating/deleting domain blocks, tests for Status#ancestors and Status#descendants, filter domain blocks from them * Filter domains in streaming API * Update account_domain_block_spec.rb	9 years ago
Yamagishi Kazutoshi	79ef8b3653	Fetch remote image using http.rb (#3114)	9 years ago
alpaca-tc	59ceeae8ea	Refactor Status#ancestors/descendants (#3092)	9 years ago
alpaca-tc	e89e4355eb	Add filter to AccountFilter (#2968)	9 years ago
alpaca-tc	682b68438e	Improve Account#triadic_closures (#3079)	9 years ago
alpaca-tc	09ec6e504b	Order by symbol value (#3077)	9 years ago
alpaca-tc	a2a2af244c	Optimize Status#permitted_for 24x (#3069) ... * Build query with arel node * Add spec for current Status#permitted_for implementation * Refactor status.rb * Order by visibility to optimize query	9 years ago
Eugen Rochko	af706583bd	Fix change of status callbacks not setting in_reply_to_account_id and (#3072) ... possibly others when expected. Add some tests for it	9 years ago
Eugen Rochko	d0dd9eb5b5	Feature conversations muting (#3017) ... * Add <ostatus:conversation /> tag to Atom input/output Only uses ref attribute (not href) because href would be the alternate link that's always included also. Creates new conversation for every non-reply status. Carries over conversation for every reply. Keeps remote URIs verbatim, generates local URIs on the fly like the rest of them. * Conversation muting - prevents notifications that reference a conversation (including replies, favourites, reblogs) from being created. API endpoints /api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute Currently no way to tell when a status/conversation is muted, so the web UI only has a "disable notifications" button, doesn't work as a toggle * Display "Dismiss notifications" on all statuses in notifications column, not just own * Add "muted" as a boolean attribute on statuses JSON For now always false on contained reblogs, since it's only relevant for statuses returned from the notifications endpoint, which are not nested Remove "Disable notifications" from detailed status view, since it's only relevant in the notifications column * Up max class length * Remove pending test for conversation mute * Add tests, clean up * Rename to "mute conversation" and "unmute conversation" * Raise validation error when trying to mute/unmute status without conversation	9 years ago
alpaca-tc	e9810cbad6	Fixes NoMethodError: undefined method 'first' for nil:NilClass (#3036)	9 years ago
Eugen Rochko	5abdc77c80	Add conversation model, <ostatus:conversation /> (#3016) ... * Add <ostatus:conversation /> tag to Atom input/output Only uses ref attribute (not href) because href would be the alternate link that's always included also. Creates new conversation for every non-reply status. Carries over conversation for every reply. Keeps remote URIs verbatim, generates local URIs on the fly like the rest of them. * Fix conversation migration * More spec coverage for status before_create * Prevent n+1 query when generating Atom with the new conversations * Improve code style * Remove redundant local variable	9 years ago
Eugen Rochko	58bcd50f7f	Fix #1426 - Trim long usernames in public follower/following lists (#2993) ... Fix #2221 - Catch OpenSSL exceptions when loading remote avatars/headers/attachments Don't strip "rel" attribute from <a> tags when sanitizing (microformats)	9 years ago
Eugen Rochko	65f9db73b0	Fix #2027 - Accept own ID for remote follow with and without preceding @ (#2991) ... * Fix #2027 - Accept own ID for remote follow with and without preceding @ Fix #2177 - Omit leading "acct:" in remote follow redirect template expansion * Fix test	9 years ago
Go Shoemake	9cd3a6836b	Fixed mention regex to support unicode (#2420)	9 years ago
Matt Jankowski	7a7d12d27f	Delegate Account#user_locale method and allow nil (#2927)	9 years ago
Matt Jankowski	bba537a7be	Improve allowed language handling (#2897) ... * Dont allow empty value in user allowed languages * Sanitize language input to reject blank values in array	9 years ago
alpaca-tc	ca05bfaac7	Refactor account.rb (#2881) ... * Call simple query * Refactor Account#keypair * Replace escaped single quote * Extract similar behavior to method * Gather the same condition to one block * Remove not needed receiver	9 years ago
alpaca-tc	05b72368ed	Fixes slow query in notifications api (#2851) ... * Add inclusion validation for activity_type * When excluding all types with `WHERE NOT IN`, the query search all rows.	9 years ago
Matt Jankowski	3f5b994ff0	Stream entry specs and refactor to use delegate (#2827) ... * Add coverage for stream entry delegated methods * Use delegate with allow_nil to clean up stream entry	9 years ago
Matt Jankowski	4e05751346	Move account header and avatar methods to a concern (#2825)	9 years ago
alpaca-tc	ee3e0a93f4	Fixes unknown mime type (#2822)	9 years ago
Matt Jankowski	484c9709b6	Misc spec coverage improvements (#2821) ... * Dont use raise_error by itself (avoids warning) * Add coverage for AccountFilter * Improve coverage and refactor for Subscription#lease_seconds * Improve coverage and refactor for NotificationMailer * Simplify assignment of min/max threshold on subscription	9 years ago
Eugen Rochko	81584779cb	More robust PuSH subscription refreshes (#2799) ... * Fix #2473 - Use sidekiq scheduler to refresh PuSH subscriptions instead of cron Fix an issue where / in domain would raise exception in TagManager#normalize_domain PuSH subscriptions refresh done in a round-robin way to avoid hammering a single server's hub in sequence. Correct handling of failures/retries through Sidekiq (see also #2613). Optimize Account#with_followers scope. Also, since subscriptions are now delegated to Sidekiq jobs, an uncaught exception will not stop the entire refreshing operation halfway through Fix #2702 - Correct user agent header on outgoing http requests * Add test for SubscribeService * Extract #expiring_accounts into method * Make mastodon:push:refresh no-op * Queues are now defined in sidekiq.yml * Queues are now in sidekiq.yml	9 years ago
Tomohiro Suwa	aa6a26a2d5	Correct Account model for rubocop (#2587) ... * Correct Account model for rubocop * Undo these changes	9 years ago
Kaylee	7880671f35	Add option to disable two factor auth in admin accounts panel. (#2584) ... * Add option to disable two factor auth in admin accounts panel. Closes #2578 * Add @mjankowski's suggestions. * Moves destroy actions behind User#disable_two_factor! * Adds spec coverage for Admin:TwoFactorAuthenticationsController and User#disable_two_factor!	9 years ago
Yamagishi Kazutoshi	6f75c8451d	Fix subscription expiration condition (#2715) ... * Fix subscription expiration condition * dry and add spec	9 years ago
yhirano	298796cc7b	annotate models (#2697) ... * add annotate to Gemfile * rails g annotate:install * configure annotate_models * add schema info to models * fix rubocop to add frozen_string_literal	9 years ago
Matt Jankowski	a4859446ab	Coverage for remote follows (#2694) ... * Add coverage for create with empty acct value * Add coverage for create with webfinger failure * Add coverage for create with webfinger providing bad values * Add coverage for create when webfinger is good * Add coverage for session[:remote_follow] having data * Simplify how remote follow pulls acct from session * Remote follow behaves more like model * Move the discovery portions of remote follow out of controller * Check for suspended accounts	9 years ago
Matt Jankowski	f025cc6782	Filter on allowed user language preferences (#2361) ... * Naive approached to timeline filtering * Convert allowed_languages into a db column * Allow users to choose languages to see statuses in * Style list items as two columns * Add a hint to explain language filtering preference	9 years ago
yhirano	3988f2dade	Fix Rubocop offences (#2630) ... * disable Bundler/OrderedGems * fix rubocop Lint/UselessAssignment * fix rubocop Style/BlockDelimiters * fix rubocop Style/AlignHash * fix rubocop Style/AlignParameters, Style/EachWithObject * fix rubocop Style/SpaceInLambdaLiteral	9 years ago
Yamagishi Kazutoshi	1899cf5f04	Detect extension for preview card (#2679) ... * Detect extension for preview card * next	9 years ago
Matt Jankowski	5259319cf5	Reports spec for media attachments, clean up method (#2660) ... * Add coverage for Report#media_attachments * Direct query on media attachment	9 years ago
Akihiko Odaki	a6788662b0	Revert "Use PostgreSQL inheritance for blocks and mutes (#2520)" (#2634) ... This reverts commit 5135d609b7.	9 years ago
Akihiko Odaki	5135d609b7	Use PostgreSQL inheritance for blocks and mutes (#2520)	9 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.	9 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	9 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	9 years ago
Eugen Rochko	d4fedf84e0	Cache Status#ancestors recursive query results (#2527)	9 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	9 years ago
Tomohiro Suwa	1f805a6377	Don't need to include ActiveModel::Validations (#2521)	9 years ago
Francis Chong	193dddb433	Add media dimensions (#2448) ... * Fixes #1985 - add migration AddMediaAttachmentMeta, which add meta field to media_attachments - before saving attachment, set file meta if needed - add meta in api * add spec * align the “size” format for image and video * fix code climate * fixes media_attachment_spec.rb	9 years ago
Eugen	17c591ffba	Punycode URI normalization (#2370) ... * Fix #2119 - Whenever about to send a HTTP request, normalize the URI * Add test for IDN request in FetchLinkCardService * Perform IDN normalization on domains before they are stored in the DB	9 years ago
Effy Elden	1801a36414	Report processing improvements (#2349) ... * Expose media attachments on reported statuses directly * Comment out unused bulk report checkbox. Add title to report comment for viewing full comment. Add 'contents' column, with icons and numerical indicators to show the number of referenced statuses and media attachments in the report * Link account name on authorize_follow card back to account * Add localisation string for report_contents * Show new admin accounts card partial on report view. Apply simple_format to report comment so newlines are preserved. * Add new admin accounts card partial, for display quick useful admin stats (e.g. report history, moderation status). * Fix localized variable	9 years ago
Eugen	501514960a	Followers-only post federation (#2111) ... * Make private toots get PuSHed to subscription URLs that belong to domains where you have approved followers * Authorized followers controller, stub for bulk action * Soft block in the background * Add simple test for new controller * Rename Settings::FollowersController to Settings::FollowerDomainsController, paginate results, rename "private" post setting to "followers-only", fix pagination style, improve post privacy preferences style, improve warning style * Extract compose form warnings into own container, show warning when posting to followers-only with unlocked account	9 years ago
Evan Minto	66fd8e7821	ActivityPub: Add basic, read-only support for Outboxes, Notes, and Create/Announce Activities (#2197) ... * Clean up collapsible components * Expose user Outboxes and AS2 representations of statuses * Save work thus far. * Fix bad merge. * Save my work * Clean up pagination. * First test working. * Add tests. * Add Forbidden error template. * Revert yarn.lock changes. * Fix code style deviations and use localized instead of hardcoded English text.	9 years ago
Ash Furrow	723f25a999	Admin UI for confirming users (#2245) ... * Shows confirmed status in list. * Adds ability to confirm users in admin UI. * Added new english translations. * Addresses feedback from #2245. * More feedback.	9 years ago
codl	8565ba68f7	strip leading & trailing spaces from remote follow acct (#997) (#2321)	9 years ago
Eugen	2e4afccd9d	Fix #2108 - Fix gif uploads (#2171) ... * Fix #2108 - Fix gif uploads Add specs for media attachment gifv conversion * Add ffmpeg to travis * Make travis install ffmpeg, not libav * Switch travis to trusty	9 years ago
alpaca-tc	2c0d756ad9	Extract error messages to locale file (#2162)	9 years ago
Eugen	bfbc2ca0d8	Attachment list for uncached attachments (#2110) ... * For undownloaded attachments, set type :unknown, display them as a list in the web UI * Fix case when attachment type is set explicitly	9 years ago
Eugen	e09ab2c0bd	Fix #1642, fix #1912 - Dictate content-type file extension (#2078) ... * Fix #1642, fix #1912 - Previous change (#1718) did not modify how original file was saved on upload * Fix for when file is missing	9 years ago
Matt Jankowski	55e1503522	Instances list in admin (#2095) ... * Add admin/instances index action * Add link to instances admin page * View lists instances * Instances, grouped by domain, ordered by count * Use Account.remote scope * Extract method: Account.by_domain_accounts	9 years ago
Matt Jankowski	66d8f99a30	Admin reports with accounts (#2092) ... * Add a ReportFilter class * Add reports and targeted_reports relationships to Account * Use ReportFilter from admin/reports controller * Link to admin/reports filtered views from admin account show view * Add indexes to reports.account_id and reports.target_account_id	9 years ago
839	e2a1b574ab	Avoid dynamic methods due to processing speed (#2080)	9 years ago
Eugen Rochko	57d784f1e4	Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif	9 years ago
Matt Jankowski	16d50f60d1	Remove unused methods (#1730) ... * Remove unused method #set_counters_maps from api controller * Remove unused method #set_account_counters_maps from api controller * Remove unused method Account#followers_domains * Remove unused User.prolific scope * Add mastodon:users:admins task to list all admin emails * Use interpolated query style in Account.triadic_closures * Coverage for Account.triadic_closures	9 years ago
Eugen Rochko	f5cd0b4956	Rename cache key to exclude_account_ids_for:id, adjust formatting	9 years ago
Eugen Rochko	2fd0473aa1	Merge branch 'fix/cache_blocking' of git://github.com/pixiv/mastodon into pixiv-fix/cache_blocking	9 years ago
Matt Jankowski	cc1361c149	Media controller specs (#2022) ... * Add spec for media controller * Add MediaAttachment.attached scope * Simplify methods in media controller	9 years ago
alpaca-tc	630de52fdd	Required foreign keys (#2003) ... * Add `required: true` option to foreign column * Fixes NoMethodError ``` > Favourite.new.valid? NoMethodError: undefined method `reblog?' for nil:NilClass ```	9 years ago
Patrick Figel	ffb99325ca	Add gif auto-play/pause preference ... This introduces a new per-user preference called "Auto-play animated GIFs", which is enabled by default. When a user disables this setting, gifs in toots become click-to-play. Previews of animated gifs were changed to display the video play button so that users can distinguish them from regular images. This setting also affects account avatars in the detailed account view, which was changed to use the same hover-to-play mechanism that is used for animated avatars in timelines. Fixes #1652	9 years ago
Matt Jankowski	f87b51fda8	I18n health warnings (#1949) ... * Rename admin.domain_block to admin.domain_blocks in prep for i18n improvement * Use implicit controller/action path for i18n in admin/domain_blocks * Add DomainBlock#accounts has_many * Avoid i18n health warning for `en` locale by using symbol scope with :count * Remove unused i18n key: plaintext_secret_html * Remove unused i18n key two_factor_auth.warning * Remove final will_paginate i18n keys * Remove unused key two_factor_auth.recovery_codes * Remove unused key: admin.reports.comment.none * Remove unused reports. i18n namespace (moved to admin.reports) * Ignore keys from locales which override activemodel and activerecord errors * Revert "Remove unused key: admin.reports.comment.none" This reverts commit 350ef2685f. * Update i18n key reference to match moved location * Add missing `en` keys to i18n * Tell i18n-tasks to ignore missing attributes that dont need overwriting * Add i18n-tasks unused to travis	9 years ago
Effy Elden	acd33101c5	Merge branch 'master' into fix/cache_blocking	9 years ago
Matt Jankowski	73b0af5c93	Simplify the og:image and og:description code in stream_entries/show (#1934)	9 years ago
tackeyy	fc34e0e191	Remove .keep in models (#1892)	9 years ago
alpaca-tc	de72db99fa	Add presence validation to Import (#1928) ... ``` *An* `ActiveRecord::StatementInvalid` *occurred while* `POST </settings/import>` *was processed by* `imports#create` Exception ---------------- PG::NotNullViolation: ERROR: null value in column "type" violates not-null constraint ```	9 years ago
Eugen	5d710b1139	Make file attachment on MediaAttachment optional (#1865) ... Create MediaAttachment but without actual file download when domain is blocked with reject_media set to true Clean up old media files when creating a new domain block with reject_media set to true Return remote_url in media attachments API if local file is not present Undo domain block action in admin UI Ability to enable reject_media from admin UI	9 years ago
Keiji Yoshimi	fd81916e86	cache blockings for reducing queries.	9 years ago
Patrick Figel	df4ff9a8e1	Add recovery code support for two-factor auth (#1773) ... * Add recovery code support for two-factor auth When users enable two-factor auth, the app now generates ten single-use recovery codes. Users are encouraged to print the codes and store them in a safe place. The two-factor prompt during login now accepts both OTP codes and recovery codes. The two-factor settings UI allows users to regenerated lost recovery codes. Users who have set up two-factor auth prior to this feature being added can use it to generate recovery codes for the first time. Fixes #563 and fixes #987 * Set OTP_SECRET in test enviroment * add missing .html to view file names	9 years ago
西小倉宏信	290e8ef854	Remove .keep in models (#1748)	9 years ago
Matt Jankowski	8b74aa4217	Admin reports controller improvements (#1714) ... * Simplify admin/reports controller filtering for index * Rename parameter to resolved * Fix issue where reports view could not access filter_link_to * Add coverage for admin/reports controller * DRY up resolution of related reports for target account * Clean up admin/reports routes * Add Report#statuses method * DRY up current account action taken params * Rubocop styles	9 years ago
Matt Jankowski	3a9eb81a80	Admin accounts controller cleanup (#1664) ... * Remove unused account_params method in admin/accounts controller * Introduce AccountFilter to find accounts * Use AccountFilter in admin/accounts controller * Use more restful routes admin silence and suspension area * Add admin/silences and admin/suspensions controllers	9 years ago
Matt Jankowski	0e39cc6a35	Settings export refactor (#1646) ... * Refactor Export to take an account and know about the export types * Use Export instance in settings/exports#show	9 years ago
Matt Jankowski	7f0a865b05	Allow import/export of mutes list (#1541) ... * Allow export of mutes list * Allow importing of mutes list * Refactor to use Settings::Exports::BaseController and DRY up exports code	9 years ago
Matt Jankowski	3ddd936b03	Refactor exports controller (#1567) ... * Add basic coverage for settings/exports controller * Remove unused @account variable from settings/exports controller * Add coverage for download export actions * Remove deprecated `render :text` in favor of `send_data` for csv downloads * Add model to handle exports * Use Export class in settings/exports controller * Simplify settings/exports controller methods * Move settings/export to more restful routes	9 years ago
Eugen Rochko	2a7602cad4	Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master	9 years ago
blackle	06444bf050	Allow user to disable the boost confirm dialog in preferences	9 years ago