diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-22 18:09:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-22 18:09:49 +0300 |
| commit | f2dfd9ee819afb07bf11bd36a5f9d23009be0d39 (patch) | |
| tree | edd9468dc9c6c55f9882175fd83a1aadec22edf0 /danger | |
| parent | 058c34839488502fcec48d805b83728f928a318c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'danger')
| -rw-r--r-- | danger/database/Dangerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/danger/database/Dangerfile b/danger/database/Dangerfile index a0a2959bab5..41ca2aa1978 100644 --- a/danger/database/Dangerfile +++ b/danger/database/Dangerfile @@ -31,7 +31,7 @@ MSG DATABASE_APPROVED_LABEL = 'database::approved' -non_geo_db_schema_updated = !git.modified_files.grep(%r{\Adb/schema\.rb}).empty? +non_geo_db_schema_updated = !git.modified_files.grep(%r{\Adb/structure\.sql}).empty? geo_db_schema_updated = !git.modified_files.grep(%r{\Aee/db/geo/schema\.rb}).empty? non_geo_migration_created = !git.added_files.grep(%r{\A(db/(post_)?migrate)/}).empty? @@ -40,7 +40,7 @@ geo_migration_created = !git.added_files.grep(%r{\Aee/db/geo/(post_)?migrate/}). format_str = gitlab_danger.ci? ? SCHEMA_NOT_UPDATED_MESSAGE_FULL : SCHEMA_NOT_UPDATED_MESSAGE_SHORT if non_geo_migration_created && !non_geo_db_schema_updated - warn format(format_str, migrations: 'migrations', schema: gitlab_danger.html_link("db/schema.rb")) + warn format(format_str, migrations: 'migrations', schema: gitlab_danger.html_link("db/structure.sql")) end if geo_migration_created && !geo_db_schema_updated |