diff options
Diffstat (limited to 'models/fixtures')
| -rw-r--r-- | models/fixtures/repo_unit.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/models/fixtures/repo_unit.yml b/models/fixtures/repo_unit.yml index e9931453ad..45229cce37 100644 --- a/models/fixtures/repo_unit.yml +++ b/models/fixtures/repo_unit.yml @@ -30,7 +30,7 @@ id: 5 repo_id: 1 type: 3 - config: "{}" + config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowSquash\":true}" created_unix: 946684810 - @@ -51,7 +51,7 @@ id: 8 repo_id: 3 type: 3 - config: "{}" + config: "{\"IgnoreWhitespaceConflicts\":true,\"AllowMerge\":true,\"AllowRebase\":false,\"AllowSquash\":false}" created_unix: 946684810 - |