diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-08-16 10:27:46 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-08-16 10:27:46 +0000 |
| commit | 7b68bdce15a2f02d0b55d9fd43473408858cd6b6 (patch) | |
| tree | 8430a7fc007a57398e08ebbce9a7c28fcdf33e8f /db/post_migrate | |
| parent | 1b46a8360e0adffba79fad5730e94e333350f063 (diff) | |
| parent | 142b9ec4a0b3e5d5cbcbb2fc3b201755f0966b9f (diff) | |
| download | gitlab-ce-7b68bdce15a2f02d0b55d9fd43473408858cd6b6.tar.gz | |
Merge branch 'rs-trailingwhitespace-cop' into 'master'
Enable Layout/TrailingWhitespace cop and auto-correct offenses
See merge request !13573
Diffstat (limited to 'db/post_migrate')
| -rw-r--r-- | db/post_migrate/20170503004427_update_retried_for_ci_build.rb | 2 | ||||
| -rw-r--r-- | db/post_migrate/20170523083112_migrate_old_artifacts.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/db/post_migrate/20170503004427_update_retried_for_ci_build.rb b/db/post_migrate/20170503004427_update_retried_for_ci_build.rb index 705e11ed47d..3a4d6c4916b 100644 --- a/db/post_migrate/20170503004427_update_retried_for_ci_build.rb +++ b/db/post_migrate/20170503004427_update_retried_for_ci_build.rb @@ -21,7 +21,7 @@ class UpdateRetriedForCiBuild < ActiveRecord::Migration private def up_mysql - # This is a trick to overcome MySQL limitation: + # This is a trick to overcome MySQL limitation: # Mysql2::Error: Table 'ci_builds' is specified twice, both as a target for 'UPDATE' and as a separate source for data # However, this leads to create a temporary table from `max(ci_builds.id)` which is slow and do full database update execute <<-SQL.strip_heredoc diff --git a/db/post_migrate/20170523083112_migrate_old_artifacts.rb b/db/post_migrate/20170523083112_migrate_old_artifacts.rb index f2690bd0017..3a77b9751d3 100644 --- a/db/post_migrate/20170523083112_migrate_old_artifacts.rb +++ b/db/post_migrate/20170523083112_migrate_old_artifacts.rb @@ -7,7 +7,7 @@ class MigrateOldArtifacts < ActiveRecord::Migration # This uses special heuristic to find potential candidates for data migration # Read more about this here: https://gitlab.com/gitlab-org/gitlab-ce/issues/32036#note_30422345 - + def up builds_with_artifacts.find_each do |build| build.migrate_artifacts! @@ -51,14 +51,14 @@ class MigrateOldArtifacts < ActiveRecord::Migration private def source_artifacts_path - @source_artifacts_path ||= + @source_artifacts_path ||= File.join(Gitlab.config.artifacts.path, created_at.utc.strftime('%Y_%m'), ci_id.to_s, id.to_s) end def target_artifacts_path - @target_artifacts_path ||= + @target_artifacts_path ||= File.join(Gitlab.config.artifacts.path, created_at.utc.strftime('%Y_%m'), project_id.to_s, id.to_s) |