Yamagishi Kazutoshi
1be48dd805
Refactor views/admin/reports/show.html.haml ( #3656 )
2017-06-09 15:08:06 +02:00
Yamagishi Kazutoshi
69dc56b5d0
Add includes to Report#statuses ( #3655 )
2017-06-09 15:07:02 +02:00
Yamagishi Kazutoshi
6384041d17
Add includes to Report#statuses ( #3655 )
2017-06-09 15:07:02 +02:00
Yamagishi Kazutoshi
0e2b04d920
Check ready state of document in public pages ( #3652 )
...
* Check ready state of document in public pages
* add check interactive
2017-06-09 15:06:38 +02:00
Yamagishi Kazutoshi
140e73bc82
Check ready state of document in public pages ( #3652 )
...
* Check ready state of document in public pages
* add check interactive
2017-06-09 15:06:38 +02:00
ふぁぼ原
2eec65d27f
adjust the size of column-header__back-button ( #3654 )
2017-06-09 15:05:26 +02:00
ふぁぼ原
e3fae6f52c
adjust the size of column-header__back-button ( #3654 )
2017-06-09 15:05:26 +02:00
unarist
6c2359ce87
Add Japanese translation for #3640 ( #3650 )
2017-06-09 03:14:15 +02:00
unarist
65d8c73bae
Add Japanese translation for #3640 ( #3650 )
2017-06-09 03:14:15 +02:00
Eugen Rochko
67330ceec7
Fix regression from #3592 - validation condition nesting ( #3644 )
2017-06-08 19:10:48 +02:00
Eugen Rochko
177dd8bb53
Fix regression from #3592 - validation condition nesting ( #3644 )
2017-06-08 19:10:48 +02:00
Eugen Rochko
cd5c9d67e8
Bump version to 1.4.2
2017-06-08 15:30:43 +02:00
Eugen Rochko
380b20eed6
Bump version to 1.4.2
2017-06-08 15:30:43 +02:00
Eugen Rochko
006594e181
Fix db:seed - only run some validations when the field was changed ( #3592 )
...
* Fix db:seed - only run some validations when the field was changed
* Add tests
2017-06-08 09:22:01 -04:00
Eugen Rochko
c207b4bb33
Fix db:seed - only run some validations when the field was changed ( #3592 )
...
* Fix db:seed - only run some validations when the field was changed
* Add tests
2017-06-08 09:22:01 -04:00
Eugen Rochko
3fc61534fd
Fix #3378 - If favourite/reblog already exists, return it instead of failing ( #3641 )
2017-06-08 15:07:39 +02:00
Eugen Rochko
b87eb8ea14
Fix #3378 - If favourite/reblog already exists, return it instead of failing ( #3641 )
2017-06-08 15:07:39 +02:00
Eugen Rochko
9eefd60136
Add explit admin actions to (re)subscribe/unsubscribe remote accounts ( #3640 )
...
* Add explit admin actions to (re)subscribe/unsubscribe remote accounts
and re-download avatar/header
* Improve how admin NSFW toggle looks
2017-06-08 14:58:22 +02:00
Eugen Rochko
8902e265b4
Add explit admin actions to (re)subscribe/unsubscribe remote accounts ( #3640 )
...
* Add explit admin actions to (re)subscribe/unsubscribe remote accounts
and re-download avatar/header
* Improve how admin NSFW toggle looks
2017-06-08 14:58:22 +02:00
nullkal
9335e15763
Support multiple trusted proxy ip addresses ( #3639 )
...
* Support multiple trusted proxy ip addresses
* correct coding style
2017-06-08 14:33:28 +02:00
nullkal
b8ea28d6d0
Support multiple trusted proxy ip addresses ( #3639 )
...
* Support multiple trusted proxy ip addresses
* correct coding style
2017-06-08 14:33:28 +02:00
ThibG
38f03f6da4
Fixes #3605 by returning account from database in case of race condition ( #3606 )
2017-06-08 13:40:11 +02:00
ThibG
f741673638
Fixes #3605 by returning account from database in case of race condition ( #3606 )
2017-06-08 13:40:11 +02:00
Yamagishi Kazutoshi
5da41e0cae
Improve RuboCop rules (compatibility to Code Climate) ( #3636 )
...
08f8de84eb/Gemfile.lock (L38)
2017-06-08 13:24:28 +02:00
Yamagishi Kazutoshi
0a0b9a271a
Improve RuboCop rules (compatibility to Code Climate) ( #3636 )
...
08f8de84eb/Gemfile.lock (L38)
2017-06-08 13:24:28 +02:00
Yamagishi Kazutoshi
26e4a2cc3c
Add Japanese translations ( #3635 )
2017-06-08 13:23:56 +02:00
Yamagishi Kazutoshi
7d2b4186c3
Add Japanese translations ( #3635 )
2017-06-08 13:23:56 +02:00
m4sk1n
28c83a27f3
i18n: Update Polish translation ( #3637 )
2017-06-08 13:23:40 +02:00
m4sk1n
90689190a3
i18n: Update Polish translation ( #3637 )
2017-06-08 13:23:40 +02:00
Sorin Davidoi
4ce6597e3a
fix: Warn if JavaScript is disabled ( #3634 )
2017-06-08 00:52:56 +02:00
Sorin Davidoi
8acadeea76
fix: Warn if JavaScript is disabled ( #3634 )
2017-06-08 00:52:56 +02:00
Eugen Rochko
2a447b8147
Add rake task to prepare database for foreign keys introduced by #3562 ( #3614 )
...
* Add rake task to prepare database for foreign keys introduced by #3562
* Fix typo
* Do not delete OAuth values where NULL values may be permitted
* Fix typo
2017-06-07 20:16:53 +02:00
Eugen Rochko
75c6513c67
Add rake task to prepare database for foreign keys introduced by #3562 ( #3614 )
...
* Add rake task to prepare database for foreign keys introduced by #3562
* Fix typo
* Do not delete OAuth values where NULL values may be permitted
* Fix typo
2017-06-07 20:16:53 +02:00
Matt Jankowski
76f986d07b
Clean up for api/base controller ( #3629 )
...
* Move ApiController to Api/BaseController
* API controllers inherit from Api::BaseController
* Add coverage for various error cases in api/base controller
2017-06-07 20:09:25 +02:00
Matt Jankowski
73540ffe6b
Clean up for api/base controller ( #3629 )
...
* Move ApiController to Api/BaseController
* API controllers inherit from Api::BaseController
* Add coverage for various error cases in api/base controller
2017-06-07 20:09:25 +02:00
jeroenpraat
fa04340b99
Rest of 2FA translated + small fix ( #3630 )
2017-06-07 20:08:34 +02:00
jeroenpraat
92bb166246
Rest of 2FA translated + small fix ( #3630 )
2017-06-07 20:08:34 +02:00
Sorin Davidoi
7300a41678
fix(components/autosuggest_textarea): Race condition regarding onBlur ( #3631 )
2017-06-07 20:05:53 +02:00
Sorin Davidoi
8cf8ce4ac0
fix(components/autosuggest_textarea): Race condition regarding onBlur ( #3631 )
2017-06-07 20:05:53 +02:00
unarist
c40e5aea44
Use "match_array" only for order independent assertions ( #3626 )
2017-06-07 12:59:28 -04:00
unarist
0f1b1d78b1
Use "match_array" only for order independent assertions ( #3626 )
2017-06-07 12:59:28 -04:00
Eugen Rochko
2c3de601e6
Fix broken screenshot
2017-06-07 17:53:47 +02:00
Eugen Rochko
d3bbef27e7
Fix broken screenshot
2017-06-07 17:53:47 +02:00
Matt Jankowski
9a43a1051a
Coverage improvement and concern extraction for rate limit headers in API controller ( #3625 )
...
* Coverage for rate limit headers
* Move rate limit headers methods to concern
* Move throttle check to condition on before_action
* Move match_data variable into method
* Move utc timestamp to separate method
* Move header setting into smaller methods
* specs cleanup
2017-06-07 17:23:26 +02:00
Matt Jankowski
f0634ba876
Coverage improvement and concern extraction for rate limit headers in API controller ( #3625 )
...
* Coverage for rate limit headers
* Move rate limit headers methods to concern
* Move throttle check to condition on before_action
* Move match_data variable into method
* Move utc timestamp to separate method
* Move header setting into smaller methods
* specs cleanup
2017-06-07 17:23:26 +02:00
Yamagishi Kazutoshi
1844753bda
Fix Code Climate failed (regression from #3622 ) ( #3624 )
2017-06-07 15:57:59 +02:00
Yamagishi Kazutoshi
1d68fe1a60
Fix Code Climate failed (regression from #3622 ) ( #3624 )
2017-06-07 15:57:59 +02:00
unarist
eebfad1ac8
Allow "class" attribute on the "a" tag in sanitization ( #3623 )
...
This preserves `<a ... class="u-url mention">` from other Mastodon instances.
2017-06-07 15:57:30 +02:00
unarist
6bd6dcf6df
Allow "class" attribute on the "a" tag in sanitization ( #3623 )
...
This preserves `<a ... class="u-url mention">` from other Mastodon instances.
2017-06-07 15:57:30 +02:00
ThibG
13340bdc7a
Fixes #3388 by moving re-entrant shared_status_from_xml before transaction block ( #3622 )
...
Steps to reproduce the original issue:
1. Have two remote accounts, A that you don't follow, and B that you follow.
2. Have A post a toot and reply to it.
3. Boost A's reply from remote account B.
This used to cause the local instance to get A's reply but fail to link it to
the original post.
2017-06-07 12:28:16 +02:00
