Merge branch 'master' into mar-2-polish

This commit is contained in:
Andrew Brown 2020-03-02 13:47:49 -06:00 committed by GitHub
commit 7819f02791
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions

View File

@ -5,5 +5,4 @@ RUN apt-get update -qq && \
COPY . /notebook-ai
WORKDIR /notebook-ai
RUN bundle install
RUN rake db:create
RUN rake db:migrate
RUN rails db:setup

View File

@ -1394,7 +1394,7 @@ ActiveRecord::Schema.define(version: 2020_03_02_022930) do
t.datetime "updated_at", null: false
t.string "src_file_name"
t.string "src_content_type"
t.bigint "src_file_size"
t.integer "src_file_size"
t.datetime "src_updated_at"
t.index ["content_type", "content_id"], name: "index_image_uploads_on_content_type_and_content_id"
t.index ["user_id"], name: "index_image_uploads_on_user_id"