diff options
| author | ThibG <thib@sitedethib.com> | 2018-05-11 20:34:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-11 20:34:19 +0200 |
| commit | da8897aaefeedf281a72f2e3b1b88ea0573e481e (patch) | |
| tree | 53a6ce915f8687b15e5bd5d06a53d08ed764d3da /app/controllers/shares_controller.rb | |
| parent | e7ed61917b045f15776adbf257501dc9dac85557 (diff) | |
| parent | 45fce0e496727cd1579c630c22592638341f78c6 (diff) | |
Merge pull request #477 from ThibG/glitch-soc/merge
Merge upstream changes
Diffstat (limited to 'app/controllers/shares_controller.rb')
| -rw-r--r-- | app/controllers/shares_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/shares_controller.rb b/app/controllers/shares_controller.rb index 3cbaccb35..4624c29a6 100644 --- a/app/controllers/shares_controller.rb +++ b/app/controllers/shares_controller.rb @@ -16,6 +16,7 @@ class SharesController < ApplicationController def initial_state_params text = [params[:title], params[:text], params[:url]].compact.join(' ') + { settings: Web::Setting.find_by(user: current_user)&.data || {}, push_subscription: current_account.user.web_push_subscription(current_session), |