Fix bad replace; update schema.rb

This commit is contained in:
Karina Kwiatek 2020-04-25 21:01:46 +01:00
parent 2bf7d29e98
commit 10a9ca5577
2 changed files with 24 additions and 8 deletions

View File

@ -14,5 +14,5 @@
- comment.smiles.all.each do |smile| - comment.smiles.all.each do |smile|
%li.user-list-entry.user-list-entry-smiles %li.user-list-entry.user-list-entry-smiles
%a{href: show_user_profile_path(smile.user.screen_name)} %a{href: show_user_profile_path(smile.user.screen_name)}
%img.img-rounded{src: smile.user), alt: user_screen_name(smile.user, url: false.profile_picture.url(:medium)} %img.img-rounded{src: smile.user.profile_picture.url(:medium), alt: user_screen_name(smile.user, url: false)}
%span= user_screen_name(smile.user, url: false) %span= user_screen_name(smile.user, url: false)

View File

@ -10,11 +10,32 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 2020_04_19_185535) do ActiveRecord::Schema.define(version: 2020_04_25_194536) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
create_table "active_storage_attachments", force: :cascade do |t|
t.string "name", null: false
t.string "record_type", null: false
t.bigint "record_id", null: false
t.bigint "blob_id", null: false
t.datetime "created_at", null: false
t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
end
create_table "active_storage_blobs", force: :cascade do |t|
t.string "key", null: false
t.string "filename", null: false
t.string "content_type"
t.text "metadata"
t.bigint "byte_size", null: false
t.string "checksum", null: false
t.datetime "created_at", null: false
t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
end
create_table "announcements", force: :cascade do |t| create_table "announcements", force: :cascade do |t|
t.text "content", null: false t.text "content", null: false
t.string "link_text" t.string "link_text"
@ -241,12 +262,10 @@ ActiveRecord::Schema.define(version: 2020_04_19_185535) do
t.integer "commented_count", default: 0, null: false t.integer "commented_count", default: 0, null: false
t.string "display_name" t.string "display_name"
t.integer "smiled_count", default: 0, null: false t.integer "smiled_count", default: 0, null: false
t.boolean "admin", default: false, null: false
t.string "motivation_header", default: "", null: false t.string "motivation_header", default: "", null: false
t.string "website", default: "", null: false t.string "website", default: "", null: false
t.string "location", default: "", null: false t.string "location", default: "", null: false
t.text "bio", default: "", null: false t.text "bio", default: "", null: false
t.boolean "moderator", default: false, null: false
t.string "profile_picture_file_name" t.string "profile_picture_file_name"
t.string "profile_picture_content_type" t.string "profile_picture_content_type"
t.integer "profile_picture_file_size" t.integer "profile_picture_file_size"
@ -256,14 +275,11 @@ ActiveRecord::Schema.define(version: 2020_04_19_185535) do
t.integer "crop_y" t.integer "crop_y"
t.integer "crop_w" t.integer "crop_w"
t.integer "crop_h" t.integer "crop_h"
t.boolean "supporter", default: false
t.boolean "privacy_allow_anonymous_questions", default: true t.boolean "privacy_allow_anonymous_questions", default: true
t.boolean "privacy_allow_public_timeline", default: true t.boolean "privacy_allow_public_timeline", default: true
t.boolean "privacy_allow_stranger_answers", default: true t.boolean "privacy_allow_stranger_answers", default: true
t.boolean "privacy_show_in_search", default: true t.boolean "privacy_show_in_search", default: true
t.boolean "permanently_banned", default: false t.boolean "permanently_banned", default: false
t.boolean "blogger", default: false
t.boolean "contributor", default: false
t.string "ban_reason" t.string "ban_reason"
t.datetime "banned_until" t.datetime "banned_until"
t.integer "comment_smiled_count", default: 0, null: false t.integer "comment_smiled_count", default: 0, null: false
@ -277,7 +293,6 @@ ActiveRecord::Schema.define(version: 2020_04_19_185535) do
t.integer "crop_h_w" t.integer "crop_h_w"
t.integer "crop_h_h" t.integer "crop_h_h"
t.string "locale", default: "en" t.string "locale", default: "en"
t.boolean "translator", default: false
t.string "confirmation_token" t.string "confirmation_token"
t.datetime "confirmed_at" t.datetime "confirmed_at"
t.datetime "confirmation_sent_at" t.datetime "confirmation_sent_at"
@ -300,4 +315,5 @@ ActiveRecord::Schema.define(version: 2020_04_19_185535) do
t.index ["user_id"], name: "index_users_roles_on_user_id" t.index ["user_id"], name: "index_users_roles_on_user_id"
end end
add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
end end