Merge remote-tracking branch 'origin/master' into gs-master

2017-11-16 22:52:37 -06:00
parent ee560abdbe dc6e031364
commit b28b405b97
29 changed files with 136 additions and 72 deletions
--- a/spec/lib/user_settings_decorator_spec.rb
+++ b/spec/lib/user_settings_decorator_spec.rb
@@ -62,7 +62,7 @@ describe UserSettingsDecorator do
      settings.update(values)
      expect(user.settings['auto_play_gif']).to eq false
    end
-    
+
    it 'updates the user settings value for system font in UI' do
      values = { 'setting_system_font_ui' => '0' }