Shel R
9f43e3b428
Merge branch 'master' into patch-4
2017-04-07 22:02:26 -04:00
Eugen
1961825ff9
Merge pull request #1183 from thoughtbot/cp-post-status-service-specs
...
Add specs for PostStatusService
2017-04-07 22:30:28 +02:00
Chad Pytel
ad5ddd5e95
Use I18n for media attachment validation errors
...
These are currently user facing errors, but are not localized. This adds the
ability for these messages to be localized.
2017-04-07 14:23:18 -04:00
Joël Quenneville
d4c94fa004
DRY up reblog vs original status check
...
Checking reblog vs original status was happening in multiple places
across the app. For views, this logic was encapsulated in a helper
method named `proper_status` but in the other layers of the app, the
logic was duplicated.
Because the logic is used at all layers of the app, we extracted it into
a `Status#proper` method on the model and changed all uses of the logic
to use this method. There is now a single source of truth for this
condition.
We added test coverage to untested methods that got refactored.
2017-04-07 14:18:30 -04:00
Eugen
4e41cd9ab8
Merge pull request #1146 from tootsuite/fix-object-type-nil-exception
...
Fix nil#object_type error
2017-04-07 13:08:51 +02:00
Eugen
c9b23a93c7
Merge branch 'master' into fix-object-type-nil-exception
2017-04-07 13:07:36 +02:00
Eugen
0adee18d73
Merge branch 'master' into feature-customized-default-locale
2017-04-07 13:07:03 +02:00
Eugen Rochko
8a6d8de60a
Fix nil#object_type error
2017-04-07 13:05:34 +02:00
Jantso Porali
786e6f94b9
Update Finnish translations, add sample Minio config ( #954 )
2017-04-07 12:58:12 +02:00
Eugen Rochko
e3a3422a65
Allow setting of default language through config
...
Setting of locale in controller extracted to Localized concern,
the doorkeeper authorized applications controller moved under
custom namespace with inclusion of Localized, which resolves the
"it sometimes appears in a different random language" bug
2017-04-07 12:40:26 +02:00
Eugen Rochko
624a9a7136
Re-add forgotten <author> element on standalone <entry>
2017-04-07 12:21:00 +02:00
Eugen
1c351709bc
Force UTF8 encoding on generated XML ( #1140 )
2017-04-07 11:09:14 +02:00
Eugen
6d6a429af8
Rewrite Atom generation from stream entries to use Ox instead of Nokogiri ( #1124 )
...
* Rewrite Atom generation from stream entries to use Ox instead of Nokogiri::Builder
StreamEntry is now limited to only statuses, which allows some optimization. Removed
extra queries on AccountsController#show. AtomSerializer instead of AtomBuilderHelper
used in AccountsController#show, StreamEntriesController#show, StreamEntryRenderer
and PubSubHubbub::DistributionWorker
PubSubHubbub::DistributionWorker moves n+1 DomainBlock query to PubSubHubbub::DeliveryWorker
instead.
All Salmon slaps that aren't based on StreamEntry still use AtomBuilderHelper and Nokogiri
* All Salmon slaps now use Ox instead of Nokogiri. No touch from status on account
2017-04-07 05:56:56 +02:00
Matt Jankowski
97ae53daa8
Reduce size of background-photo.jpeg
...
Reduced by running through `guetzli` image optimizer.
2017-04-06 16:24:57 -04:00
Eugen Rochko
51d7caaf19
Fix wrong pubsub channel on public timelines
2017-04-06 04:03:23 +02:00
Eugen
a9c0062e80
Merge pull request #1013 from blackle/master
...
Catch more errors in process_follows so it doesn't fail
2017-04-06 02:35:34 +02:00
Eugen Rochko
dbd529109e
Fix notifications delivered to wrong pubsub channel, optimized RemoveStatusService,
...
slightly optimized FanOutOnWriteService again
2017-04-06 02:26:59 +02:00
blackle
540d6efe88
Catch more errors in process_follows so it doesn't fail
2017-04-05 20:04:13 -04:00
Eugen Rochko
5442083b3c
Split SalmonWorker into smaller parts, move profile updating into another job
2017-04-05 21:43:10 +02:00
Eugen Rochko
5b95be1c42
Replace calls to FeedManager#inline_render and #broadcast
2017-04-05 19:45:18 +02:00
Eugen
c9ebd5d19f
Fix wrong variable used in publish channel
2017-04-05 18:58:32 +02:00
Eugen
1b8c244dff
Add proper message to PushUpdateWorker, use redis directly
2017-04-05 18:48:41 +02:00
Eugen
3d8b80e1cc
Merge branch 'master' into broadcast-to-worker
2017-04-05 18:44:33 +02:00
tom
8989569dd4
Update components.scss
...
Use nicer scrollbars in MS edge
2017-04-05 12:10:25 -04:00
Eugen Rochko
220bc48e8e
Only render public payload once in FanOutOnWrite
2017-04-05 14:26:17 +02:00
Eugen Rochko
8530f9413b
Replace ActionCable broadcast call with simple redis publish
2017-04-05 13:28:46 +02:00
Eugen
1904a1aa14
Merge pull request #919 from JantsoP/master
...
More updates to Finnish language
2017-04-05 10:27:12 +02:00
Eugen
6b566c6b88
Merge pull request #908 from krainboltgreene/application-worker-for-shared-logic
...
ApplicationWorker for shared worker behavior
2017-04-05 10:23:52 +02:00
JantsoP
20b53e6add
Merge branch 'master' into master
2017-04-05 10:07:17 +02:00
JantsoP
b8a867adcc
updated translation
...
Updated some translations after seeing them in service. Should be better now
2017-04-05 09:56:10 +02:00
Brad Urani
6a1da87cd3
Eliminate unnecessary queries and query clauses with none and all
2017-04-05 06:02:58 +00:00
Kurtis Rainbolt-Greene
22dcadedb4
We're going to want these nice helper methods, lets share them with a parent class that matches Rails 5 practices (application level abstraction)
2017-04-04 21:14:37 -07:00
Kurtis Rainbolt-Greene
7bed4e51db
Moved to the worker
2017-04-04 20:51:44 -07:00
Kurtis Rainbolt-Greene
9638894233
Moving in the inline render
2017-04-04 20:51:18 -07:00
Kurtis Rainbolt-Greene
220051b8b2
I don't actually think we need that.
2017-04-04 20:48:22 -07:00
Kurtis Rainbolt-Greene
0069c01285
Moving the queue_at into the worker
2017-04-04 20:39:14 -07:00
Kurtis Rainbolt-Greene
dc5704b0b0
This method isn't used anymore
2017-04-04 20:38:07 -07:00
Kurtis Rainbolt-Greene
96ef933820
Replacing the broadcast method with the one defined in the feed manager
2017-04-04 20:36:03 -07:00
Kurtis Rainbolt-Greene
1e96ce378e
By pushing this into a worker we can reduce the amount of time the feed manager using workers eat up a connection
2017-04-04 20:23:40 -07:00
Eugen
4c92f15664
Merge branch 'master' into add_more_tests_to_models
2017-04-05 03:27:38 +02:00
Eugen
afdcdce551
Merge pull request #839 from SirCmpwn/profile-readability
...
Improve readability of text on profiles
2017-04-05 03:23:16 +02:00
Drew DeVault
c106b6d3e0
Improve readability of text on profiles
2017-04-04 21:13:23 -04:00
Eugen
e76dd52b08
Merge pull request #818 from JantsoP/master
...
Updated Finnish Translation
2017-04-05 03:09:20 +02:00
Eugen
117b22e905
Merge pull request #852 from peterkeen/email-whitelist-817
...
[#817 ] Add email whitelist
2017-04-05 03:04:58 +02:00
Eugen
909d81923e
Merge pull request #898 from SirCmpwn/remote-follow-improvements
...
Remote follow improvements
2017-04-05 02:54:03 +02:00
Eugen
2edeb3fe1c
Merge pull request #858 from krainboltgreene/patch-6
...
Use active record shorthand
2017-04-05 02:53:39 +02:00
Drew DeVault
f7e35d90db
Remote follow improvements
...
This stores the @username@instance you provide in your session and
reuses it the next time you remote follow someone from this instance.
2017-04-04 20:52:31 -04:00
Eugen Rochko
bda37489ac
Remove PuSH subscriptions when delivery is answered with a 4xx error
2017-04-05 02:34:33 +02:00
Samy KACIMI
79ef756f64
fix rubocop issues
2017-04-05 00:47:17 +02:00
Samy KACIMI
81c76fe375
add more tests to models
2017-04-05 00:29:56 +02:00
