scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-08 06:04:35 +08:00
Code Issues Projects Releases Packages Wiki Activity

Additional fixes required by latest merge from master

Browse source
This commit is contained in:
Luka Murn 2017-10-23 09:51:13 +02:00
parent 8254153bb9
commit 6c2c5aff17
4 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/my_module.rb
View file

@ -284,7 +284,7 @@ class MyModule < ApplicationRecord
until modules.empty?
my_module = modules.shift
final << my_module unless final.include?(my_module)
modules.push(*my_module.my_modules.flatten)
modules.push(*my_module.my_modules)
end
final
end
@ -296,7 +296,7 @@ class MyModule < ApplicationRecord
until modules.empty?
my_module = modules.shift
final << my_module unless final.include?(my_module)
modules.push(*my_module.my_module_antecessors.flatten)
modules.push(*my_module.my_module_antecessors)
end
final
end

3
config/initializers/devise_async.rb
View file

@ -1,4 +1 @@
Devise::Async.enabled = true
Devise::Async.backend = :delayed_job
Devise::Async.queue = :devise_email
# Devise::Async.priority = 10

2
db/migrate/20171003082333_add_connections_and_sample_tasks_indexes.rb
View file

@ -1,4 +1,4 @@
class AddConnectionsAndSampleTasksIndexes < ActiveRecord::Migration
class AddConnectionsAndSampleTasksIndexes < ActiveRecord::Migration[4.2]
def change
add_index :connections, :input_id
add_index :connections, :output_id

2
db/migrate/20171005135350_update_my_module_groups.rb
View file

@ -1,4 +1,4 @@
class UpdateMyModuleGroups < ActiveRecord::Migration
class UpdateMyModuleGroups < ActiveRecord::Migration[4.2]
def change
remove_column :my_module_groups, :name, :string
end