diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2014-09-27 11:28:23 +0200 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2014-09-27 11:28:23 +0200 |
| commit | 9345ca33b112ba0155205b035030ea390e519349 (patch) | |
| tree | 8abd7b59f1727e9bf89b5db2e3665fc1ff220c2e | |
| parent | 37a68eab9f9c719274ba6ecae70c9dc8f71d3328 (diff) | |
| parent | ac55373ff39674782e914b045469ae49c77e814a (diff) | |
| download | gitlab-ce-9345ca33b112ba0155205b035030ea390e519349.tar.gz | |
Merge pull request #7877 from cirosantilli/empty-nil-blank
Replace empty? || nil? with blank?.
| -rw-r--r-- | db/fixtures/production/001_admin.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/fixtures/production/001_admin.rb b/db/fixtures/production/001_admin.rb index 21c10f31923..f84d0903910 100644 --- a/db/fixtures/production/001_admin.rb +++ b/db/fixtures/production/001_admin.rb @@ -1,4 +1,4 @@ -password = if ENV['GITLAB_ROOT_PASSWORD'].nil? || ENV['GITLAB_ROOT_PASSWORD'].empty? +password = if ENV['GITLAB_ROOT_PASSWORD'].blank? "5iveL!fe" else ENV['GITLAB_ROOT_PASSWORD'] |