about summary refs log tree commit diff
path: root/spec/lib
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2017-11-16 22:52:37 -0600
committerDavid Yip <yipdw@member.fsf.org>2017-11-16 22:52:37 -0600
commitb28b405b9763a0bb3df653b51e6d084b42e9a54d (patch)
treec69f1ccb99440fea8cc94014e77687238e205160 /spec/lib
parentee560abdbe7a2caf0f7ac6137faf248bbaff9a93 (diff)
parentdc6e031364d1f47a49ea47f20070a4e9986a4c68 (diff)
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/user_settings_decorator_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/user_settings_decorator_spec.rb b/spec/lib/user_settings_decorator_spec.rb
index 6fbf6536b..fee875373 100644
--- 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' }