74c5b2bd08
Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) |
||
---|---|---|
.. | ||
account/components | ||
account_gallery | ||
account_timeline | ||
audio | ||
blocks | ||
community_timeline | ||
compose | ||
direct_timeline | ||
directory | ||
domain_blocks | ||
emoji | ||
favourited_statuses | ||
favourites | ||
follow_requests | ||
followers | ||
following | ||
generic_not_found | ||
getting_started | ||
hashtag_timeline | ||
home_timeline | ||
introduction | ||
keyboard_shortcuts | ||
list_adder | ||
list_editor | ||
list_timeline | ||
lists | ||
mutes | ||
notifications | ||
pinned_statuses | ||
public_timeline | ||
reblogs | ||
report | ||
search | ||
standalone | ||
status | ||
ui | ||
video |