diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-26 09:47:40 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-26 09:47:40 +0000 |
| commit | 674882fe5dad76bdedd57f364ef2819b7e4f931f (patch) | |
| tree | 5a88db9b61e570a8abf38246dce0061f6b757e13 | |
| parent | 33aa3ca8e01928d53515dccf55d051518260a900 (diff) | |
| parent | 8f4745deb49c239aaf800da745dc203a929e3964 (diff) | |
| download | gitlab-ce-674882fe5dad76bdedd57f364ef2819b7e4f931f.tar.gz | |
Merge branch '49631-fix-dangerfile-schema-rb' into 'master'
Resolve "Dangerfile reporting that db/schema.rb wasn't updated"
Closes #49631
See merge request gitlab-org/gitlab-ce!20852
| -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 6f48994945a..ad5f1c1e0f3 100644 --- a/danger/database/Dangerfile +++ b/danger/database/Dangerfile @@ -41,8 +41,8 @@ end all_files = git.added_files + git.modified_files -non_geo_db_schema_updated = !git.modified_files.grep(%r{\Adb/schema\.rb/}).empty? -geo_db_schema_updated = !git.modified_files.grep(%r{\Aee/db/geo/schema\.rb/}).empty? +non_geo_db_schema_updated = !git.modified_files.grep(%r{\Adb/schema\.rb}).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? geo_migration_created = !git.added_files.grep(%r{\Aee/db/geo/(post_)?migrate/}).empty? |