treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
7,929 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

7929 Commits (759005e4d023866974951269da8880bcbf0a8a52)

Author SHA1 Message Date
Thibaut Girka 759005e4d0 [Glitch] Fix form validation flash message color and input borders 
Port 718e4752a9 to glitch-soc
 2018-11-09 15:10:09 +01:00
Thibaut Girka bf26c23205 Merge branch 'master' into glitch-soc/merge-upstream 2018-11-09 14:56:31 +01:00
Eugen Rochko a3f443b9c3 Improve ActiveRecord connection in on_worker_boot (#9238) 
This is how it looks in the example in the Puma README
 2018-11-09 09:08:01 +01:00
dependabot[bot] 39fb2ab658 Bump tty-prompt from 0.17.1 to 0.17.2 (#9243) 
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.17.1 to 0.17.2.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases)
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.17.1...v0.17.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-09 09:07:45 +01:00
dependabot[bot] 6dfc7643d8 Bump sidekiq from 5.2.2 to 5.2.3 (#9241) 
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.2 to 5.2.3.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.2...v5.2.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-09 06:56:46 +01:00
dependabot[bot] aed0348e73 Bump pry-rails from 0.3.6 to 0.3.7 (#9242) 
Bumps [pry-rails](https://github.com/rweng/pry-rails) from 0.3.6 to 0.3.7.
- [Release notes](https://github.com/rweng/pry-rails/releases)
- [Commits](https://github.com/rweng/pry-rails/compare/v0.3.6...v0.3.7)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-09 06:55:41 +01:00
dependabot[bot] 1e9a0a1a4d Bump hiredis from 0.6.1 to 0.6.3 (#9240) 
Bumps [hiredis](https://github.com/redis/hiredis-rb) from 0.6.1 to 0.6.3.
- [Release notes](https://github.com/redis/hiredis-rb/releases)
- [Changelog](https://github.com/redis/hiredis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/hiredis-rb/compare/v0.6.1...v0.6.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-09 06:55:19 +01:00
Eugen Rochko eed84cacba Fix nil error regression from #9229 in tootctl media remove (#9239) 
Fix #9237
 2018-11-08 21:55:59 +01:00
Eugen Rochko d78aed7a37 Reduce connect timeout limit and limit signature failures by source IP (#9236) 
* Reduce connect timeout from 10s to 1s

* Limit failing signature verifications per source IP
 2018-11-08 21:35:58 +01:00
Eugen Rochko 9a32abcbac Use local instead of global loading indicator for timelines, account timelines (#9224) 
So that opening a profile feels faster. Also, pinned toots are not
shown before other toots have loaded. Also, if no toots are loaded,
added empty message
 2018-11-08 21:35:06 +01:00
dependabot[bot] 333d4cbf41 Bump bullet from 5.7.6 to 5.8.1 (#9156) 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.7.6 to 5.8.1.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/5.7.6...5.8.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-08 21:15:33 +01:00
dependabot[bot] 20b4adc3a9 Bump parallel_tests from 2.26.0 to 2.26.2 (#9154) 
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.26.0 to 2.26.2.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.26.0...v2.26.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-08 21:15:08 +01:00
dependabot[bot] 900a0d9402 Bump aws-sdk-s3 from 1.23.0 to 1.23.1 (#9174) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.23.0 to 1.23.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-08 21:14:25 +01:00
dependabot[bot] 91584828bb Bump capybara from 3.10.0 to 3.10.1 (#9216) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.10.0 to 3.10.1.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.10.0...3.10.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-08 21:13:44 +01:00
dependabot[bot] 473638701b Bump pkg-config from 1.3.1 to 1.3.2 (#9215) 
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/ruby-gnome2/pkg-config/releases)
- [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS)
- [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.1...1.3.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-08 21:13:27 +01:00
Eugen Rochko 142940f4c6 Add "Show thread" link to self-replies (#9228) 
Fix #4716
 2018-11-08 21:08:57 +01:00
Eugen Rochko a178e66988 Display amount of freed disk space in tootctl media remove (#9229) 
* Display amount of freed disk space in tootctl media remove

Fix #9213

* Fix code style issue
 2018-11-08 21:06:26 +01:00
Eugen Rochko 718e4752a9 Fix form validation flash message color and input borders (#9235) 
* Fix form validation flash message color and input borders

* Fix typo
 2018-11-08 21:06:14 +01:00
Eugen Rochko 32c2f5a07f Fix follow limit validator reporting lower number past threshold (#9230) 
* Fix follow limit validator reporting lower number past threshold

* Avoid floating point follow limit
 2018-11-08 21:06:01 +01:00
Eugen Rochko 5f613d55e6 Optimize the process of following someone (#9220) 
* Eliminate extra accounts select query from FollowService

* Optimistically update follow state in web UI and hide loading bar

Fix #6205

* Asynchronize NotifyService in FollowService

And fix failing test

* Skip Webfinger resolve routine when called from FollowService if possible

If an account is ActivityPub, then webfinger re-resolving is not necessary
when called from FollowService. Improve options of ResolveAccountService
 2018-11-08 21:05:42 +01:00
Les Orchard 54bc905a57 Cancel list scroll reset after mouse move on wheel scroll (#9233) 
- Use object properties rather than component state for
  mouseMovedRecently and scrollToTopOnMouseIdle flags

- Remove redundant scrollToTop prop call, also fixing an attempt to call
  an undefined prop.

Fixes #9217
 2018-11-08 18:45:20 +01:00
Eugen Rochko 3e6a35d3ee Increase default column width from 330px to 350px (#9227) 2018-11-08 07:42:17 +01:00
Thibaut Girka c29da32add [Glitch] Update reset.scss from upstream 2018-11-06 16:03:53 +01:00
Thibaut Girka e18018e930 Merge branch 'master' into glitch-soc/merge-upstream 2018-11-06 15:22:44 +01:00
dependabot[bot] 15fd2bb8cd [Security] Bump rack from 2.0.5 to 2.0.6 (#9214) 
Bumps [rack](https://github.com/rack/rack) from 2.0.5 to 2.0.6. **This update includes security fixes.**
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/2.0.5...2.0.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-06 05:36:56 +01:00
dependabot[bot] 88d15e4f6c Bump active_model_serializers from 0.10.7 to 0.10.8 (#9209) 
Bumps [active_model_serializers](https://github.com/rails-api/active_model_serializers) from 0.10.7 to 0.10.8.
- [Release notes](https://github.com/rails-api/active_model_serializers/releases)
- [Changelog](https://github.com/rails-api/active_model_serializers/blob/master/CHANGELOG-0-10.md)
- [Commits](https://github.com/rails-api/active_model_serializers/compare/v0.10.7...v0.10.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-05 19:01:17 +01:00
Les Orchard 6e72dda7ef Temporarily hold timeline if mouse moved recently (fixes #8630) (#9200) 
- On recent mouse movement, hold timeline position so statuses remain in
  place for interactions in progress.

- If the timeline had been scrolled to the top before mouse movement,
  restore scroll on mouse idle.
 2018-11-05 18:59:41 +01:00
m.b 1093295902 Update resolve_url_service.rb (#9188) 2018-11-05 18:54:07 +01:00
James Kiesel d2a9ea58da Allow joining several hashtags in a single column (#8904) 
* Nascent tag menu on frontend

* Hook up frontend to search

* Tag intersection backend first pass

* Update yarnlock

* WIP

* Fix for tags not searching correctly

* Make radio buttons function

* Simplify radio buttons with modeOption

* Better naming

* Rearrange options

* Add all/any/none functionality on backend

* Small PR cleanup

* Move to service from scope

* Small cleanup, add proper service tests

* Don't use send with user input :D

* Set appropriate column header

* Handle auto updating timeline

* Fix up toggle function

* Use tag value correctly

* A bit more correct to use 'self' rather than 'all' in status scope

* Fix some style issues

* Fix more code style issues

* Style select dropdown more better

* Only use to_id'ed value to ensure no SQL injection

* Revamp frontend to allow for multiple selects

* Update backend / col header to account for more flexible tagging

* Update brakeman ignore

* Codeclimate suggestions

* Fix presenter tag_url

* Implement initial PR feedback

* Handle additional tag streaming

* CodeClimate tweak
 2018-11-05 18:53:25 +01:00
namelessGonbai 43bfd0a7d0 Implement adding a user to a list from their profile (#9062) 
* Add add user to list from thier profile

* Fix listAdderCss
 2018-11-05 18:52:38 +01:00
Steven Tappert 6cd08a266a Check for empty "last_status" before sorting DM column (#9207) 
* Check for empty "last_status" before sorting

* Small touchups for codeclimate
 2018-11-05 18:51:43 +01:00
Sorin Davidoi bd31e76dcf fix(reset): Property name for styled scrollbars (#9210) 
https://webplatform.news/issues/2018-10-26
 2018-11-05 18:51:26 +01:00
dependabot[bot] 8c19b9abce Bump rack-attack from 5.4.1 to 5.4.2 (#9186) 
Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 5.4.1 to 5.4.2.
- [Release notes](https://github.com/kickstarter/rack-attack/releases)
- [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kickstarter/rack-attack/compare/v5.4.1...v5.4.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-05 18:50:53 +01:00
dependabot[bot] bdc036586f Bump redis from 4.0.2 to 4.0.3 (#9187) 
Bumps [redis](https://github.com/redis/redis-rb) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/redis/redis-rb/releases)
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/redis-rb/compare/v4.0.2...v4.0.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-03 09:34:43 +09:00
Thibaut Girka 235e9b13ff Fix timestamp position in public pages with RTL languages 2018-10-31 11:37:47 +01:00
Thibaut Girka 080a6cb6f3 Fix styling of display names in public pages 2018-10-31 11:37:47 +01:00
ThibG 960ebc9e36 Merge pull request #803 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes (v2.6.1)
 2018-10-31 11:15:37 +01:00
Thibaut Girka 33ad16faa7 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-31 10:08:36 +01:00
Thibaut Girka 13567f13af [Glitch] Port some of upstream's getting started footer links 2018-10-31 10:07:41 +01:00
Eugen Rochko 56e256b686 Bump version to 2.6.1 (#9172) 2018-10-31 01:04:45 +01:00
Eugen Rochko 083f015f9f Fix reducer error when conversation has no last status in web UI (#9173) 
Fix #9170
 2018-10-31 00:55:20 +01:00
Eugen Rochko 3981da6f90 Revert "Fix FetchAtomService content type handling (#9132)" (#9171) 
This reverts commit c20d55f7dd.
 2018-10-31 00:43:34 +01:00
Eugen Rochko 15fd0fb2cf Bump version to 2.6.0 (#9149) 
* Bump version to 2.6.0

* Update CHANGELOG.md
 2018-10-30 22:06:59 +01:00
Quentí 407cab9844 [i18n] Update for Occitan (#9169) 
* Update oc.json

* Update oc.yml

* Update simple_form.oc.yml

* Update simple_form.oc.yml

* Update oc.json
 2018-10-30 22:06:31 +01:00
Eugen Rochko 1fad3301a1 Remove progress estimate from MigrateAccountConversations (#9168) 2018-10-30 21:09:33 +01:00
ThibG 64fedb341a Merge pull request #802 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-10-30 20:10:09 +01:00
Jeong Arm 24aa422858 Specify node version to not use node11 (#9166) 
uWS has no support node11 yet.
 2018-10-30 19:46:20 +01:00
Thibaut Girka 5ad4bcbece [Glitch] Fix empty display name precedence over username in web UI 
Port 4084814d8a to glitch-soc
 2018-10-30 17:54:50 +01:00
Thibaut Girka fd18ed4cea Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/auth/sessions_controller.rb

Upstream reverted something we partially reverted already.
Reverted the rest to match upstream.
 2018-10-30 17:52:08 +01:00
Thibaut Girka 8bef422043 Add a local setting for inline preview cards 2018-10-30 17:51:06 +01:00