Skip to content

Commit 98414b9

Browse files
committed
Merge branch 'redmine4_upgrade' into develop
2 parents d3ddd09 + 20bfbe6 commit 98414b9

5 files changed

+6
-5
lines changed

db/migrate/20180130013200_create_supply_items.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
class CreateSupplyItems < ActiveRecord::Migration
1+
class CreateSupplyItems < ActiveRecord::Migration[5.2]
22
def change
33
create_table :supply_items do |t|
44
t.references :project, null: false

db/migrate/20180130013201_create_issue_supply_items.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
class CreateIssueSupplyItems < ActiveRecord::Migration
1+
class CreateIssueSupplyItems < ActiveRecord::Migration[5.2]
22
def change
33
create_table :issue_supply_items do |t|
44
t.references :issue, null: false

db/migrate/20180530235851_add_stock_count_to_supply_items.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
class AddStockCountToSupplyItems < ActiveRecord::Migration
1+
class AddStockCountToSupplyItems < ActiveRecord::Migration[5.2]
22
def change
33
add_column :supply_items, :stock, :integer, default: 0, null: false
44
end

db/migrate/20180531003652_create_supply_item_journals.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
class CreateSupplyItemJournals < ActiveRecord::Migration
1+
class CreateSupplyItemJournals < ActiveRecord::Migration[5.2]
22
def change
33
create_table :supply_item_journals do |t|
44
t.string :type, index: true, null: false

test/unit/save_supply_item_test.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
require_relative '../test_helper'
22

33
class SaveSupplyItemTest < ActiveSupport::TestCase
4-
self.use_transactional_fixtures = false
4+
5+
self.use_transactional_tests = false
56

67
fixtures :projects
78

0 commit comments

Comments
 (0)