Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
commit
deb9a2e55d
@ -1,5 +1,5 @@
|
||||
class MainController < ApplicationController
|
||||
def index
|
||||
render file: 'public/react/build/index.html', :layout => false
|
||||
render file: 'public/react/build/index', formats: [:html]
|
||||
end
|
||||
end
|
@ -1,2 +1,3 @@
|
||||
admins-mirror_scripts: 'admins-mirror_repositories'
|
||||
admins-laboratory_settings: 'admins-laboratories'
|
||||
admins-laboratory_settings: 'admins-laboratories'
|
||||
admins-carousels: 'admins-laboratories'
|
@ -0,0 +1,8 @@
|
||||
class AddLaboratoryIdToPortalImages < ActiveRecord::Migration[5.2]
|
||||
def change
|
||||
add_column :portal_images, :laboratory_id, :bigint
|
||||
add_index :portal_images, :laboratory_id
|
||||
|
||||
execute 'UPDATE portal_images SET laboratory_id = 1'
|
||||
end
|
||||
end
|
Loading…
Reference in new issue