diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-11-01 21:37:33 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-11-01 21:37:33 +0300 |
| commit | 8336a04d434bad642b2be6ba54754c438cdb4486 (patch) | |
| tree | 7342635ac7e5279e400287555b725ff7288f79dd | |
| parent | 7f43b65fe54962a2fd3e4fd5d5413e4b1a0cf9c2 (diff) | |
| parent | 09165b464a6b5dddad53d58370a26acb166d5dfa (diff) | |
Merge branch 'db-schema-merge-conflicts' into 'master'
Use merge_db_schema for db/schema.rb conflicts
See merge request gitlab-org/gitlab-ce!22692
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index f1c41c9bb76..7282c9e61b1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ Dangerfile gitlab-language=ruby +db/schema.rb merge=merge_db_schema |