diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-05-10 15:15:39 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-05-10 16:19:56 +0200 |
| commit | 4a70792b4a8393a0cfd83a7e70f72179899111fa (patch) | |
| tree | d340885b5dfb0f990c81b1a29f529a258c49d591 /app/views | |
| parent | c6ff4c634caf718adf7280e04909c091d15add1d (diff) | |
| parent | 4b766f984689311523b89e1b68d2a11dff3fc396 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `Gemfile.lock`: Not a real conflict, just a glitch-soc-only dependency too close to a dependency that got updated upstream. Updated as well. - `app/models/status.rb`: Not a real conflict, just a change too close to glitch-soc-changed code for optionally showing boosts in public timelines. Applied upstream changes. - `app/views/layouts/application.html.haml`: Upstream a new, static CSS file, conflict due to glitch-soc's theming system, include the file regardless of the theme. - `config/initializers/content_security_policy.rb`: Upstream dropped 'unsafe-inline' from the 'style-src' directive, but both files are very different. Removed 'unsafe-inline' as well.
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/reports/index.html.haml | 2 | ||||
| -rwxr-xr-x | app/views/layouts/application.html.haml | 2 | ||||
| -rw-r--r-- | app/views/settings/identity_proofs/_proof.html.haml | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml index 0263b80fb..2149fcc46 100644 --- a/app/views/admin/reports/index.html.haml +++ b/app/views/admin/reports/index.html.haml @@ -25,7 +25,7 @@ - target_account = reports.first.target_account .report-card .report-card__profile - = account_link_to target_account, '', size: 36, path: admin_account_path(target_account.id) + = account_link_to target_account, '', path: admin_account_path(target_account.id) .report-card__profile__stats = link_to t('admin.reports.account.notes', count: target_account.targeted_moderation_notes.count), admin_account_path(target_account.id) %br/ diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 99ab3729e..92edaea3c 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -28,6 +28,8 @@ = javascript_pack_tag "locales/#{@theme[:flavour]}/en", integrity: true, crossorigin: 'anonymous' = csrf_meta_tags + = stylesheet_link_tag '/inert.css', skip_pipeline: true, media: 'all', id: 'inert-style' + = yield :header_tags -# These must come after :header_tags to ensure our initial state has been defined. diff --git a/app/views/settings/identity_proofs/_proof.html.haml b/app/views/settings/identity_proofs/_proof.html.haml index 524827ad7..14e8e91be 100644 --- a/app/views/settings/identity_proofs/_proof.html.haml +++ b/app/views/settings/identity_proofs/_proof.html.haml @@ -18,3 +18,4 @@ %td = table_link_to 'external-link', t('identity_proofs.view_proof'), proof.badge.proof_url if proof.badge.proof_url + = table_link_to 'trash', t('identity_proofs.remove'), settings_identity_proof_path(proof), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } |