fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-15 03:15:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Thank you, Officer Murphy

Browse source
This commit is contained in:
David Yip 2018-01-09 20:16:31 -06:00
parent 514db316f7
commit 395e64e858
No known key found for this signature in database
GPG key ID: 7DA0036508FCC0CC
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/settings/flavours_controller.rb
View file

@ -1,13 +1,12 @@
# frozen_string_literal: true
class Settings::FlavoursController < Settings::BaseController
def index
redirect_to action: 'show', flavour: current_flavour
end
def show
unless Themes.instance.flavours.include?(params[:flavour]) or params[:flavour] == current_flavour
unless Themes.instance.flavours.include?(params[:flavour]) || (params[:flavour] == current_flavour)
redirect_to action: 'show', flavour: current_flavour
end
@ -28,7 +27,6 @@ class Settings::FlavoursController < Settings::BaseController
def user_settings_params
{ setting_flavour: params.require(:flavour),
setting_skin: params.dig(:user, :setting_skin)
}.with_indifferent_access
setting_skin: params.dig(:user, :setting_skin) }.with_indifferent_access
end
end

1
spec/controllers/settings/flavours_controller_spec.rb
View file

@ -1,3 +1,4 @@
# frozen_string_literal: true
require 'rails_helper'
RSpec.describe Settings::FlavoursController, type: :controller do