Merge remote-tracking branch 'origin/better-themeing' into merging-upstream

2017-09-28 09:20:59 +02:00
parent 83bda6c1a8 f7ca205f38
commit daad07b1d5
25 changed files with 116 additions and 52 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -110,6 +110,10 @@ class User < ApplicationRecord
    settings.noindex
  end

+  def setting_theme
+    settings.theme
+  end
+
  def token_for_app(a)
    return nil if a.nil? || a.owner != self
    Doorkeeper::AccessToken