diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-11-07 17:25:29 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-11-07 17:25:29 +0000 |
| commit | 25e53b63ae27052b5815644656d73e1dcf96b7a4 (patch) | |
| tree | b79c37d8eb2edc848e396ddc598e4c5a2396370c | |
| parent | 89f1e4b63c3349056c98b278b10e909d3c922a0f (diff) | |
| parent | d1a5746e1e8b9e628a3625413a892c7220cfd72a (diff) | |
| download | gitlab-ce-25e53b63ae27052b5815644656d73e1dcf96b7a4.tar.gz | |
Merge branch 'dz-fix-initialize-shards' into 'master'
Fix syntax error in initializers/fill_shards
See merge request gitlab-org/gitlab-ce!22871
| -rw-r--r-- | config/initializers/fill_shards.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/config/initializers/fill_shards.rb b/config/initializers/fill_shards.rb index 0f45cf44621..18e067c8854 100644 --- a/config/initializers/fill_shards.rb +++ b/config/initializers/fill_shards.rb @@ -1,4 +1,3 @@ -return unless Shard.connected? -return if Gitlab::Database.read_only? - -Shard.populate! +if Shard.connected? && !Gitlab::Database.read_only? + Shard.populate! +end |