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_batch.rb | ||
| admin_settings.rb | ||
| custom_emoji_batch.rb | ||
| delete_confirmation.rb | ||
| migration.rb | ||
| status_batch.rb | ||
| tag_batch.rb | ||
| two_factor_confirmation.rb | ||