Conflicts: app/javascript/styles/mastodon/components.scssth-downstream
commit
6d1023b2e9
@ -0,0 +1,11 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
module SignatureAuthentication
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
include SignatureVerification
|
||||
|
||||
def current_account
|
||||
super || signed_request_account
|
||||
end
|
||||
end
|
@ -0,0 +1,16 @@
|
||||
.container.links
|
||||
.brand
|
||||
= link_to root_url do
|
||||
= image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon'
|
||||
|
||||
%ul.nav
|
||||
%li
|
||||
- if user_signed_in?
|
||||
= link_to t('settings.back'), root_url, class: 'webapp-btn'
|
||||
- else
|
||||
= link_to t('auth.login'), new_user_session_path, class: 'webapp-btn'
|
||||
%li= link_to t('about.about_this'), about_more_path
|
||||
%li
|
||||
= link_to 'https://joinmastodon.org/' do
|
||||
= "#{t('about.other_instances')}"
|
||||
%i.fa.fa-external-link{ style: 'padding-left: 5px;' }
|
@ -0,0 +1,5 @@
|
||||
class AddRememberTokenToUsers < ActiveRecord::Migration[5.1]
|
||||
def change
|
||||
add_column :users, :remember_token, :string, null: true
|
||||
end
|
||||
end
|
Loading…
Reference in new issue