diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-05-11 12:40:44 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-05-11 12:40:44 -0700 |
| commit | e3bac7dffe87a6e5adb1b51700acedba09420515 (patch) | |
| tree | 3cad0696bdfeb79609c0442f79708fbbed2d93f1 /spec/models/application_setting_spec.rb | |
| parent | f4b6bc06da18bce9553032463ca2012d7cad7268 (diff) | |
| parent | e7e132529bff3af38175076b84c818b6dea4b05f (diff) | |
| download | gitlab-ce-sh-ajax-tests.tar.gz | |
Merge branch 'master' into sh-ajax-testssh-ajax-tests
Diffstat (limited to 'spec/models/application_setting_spec.rb')
| -rw-r--r-- | spec/models/application_setting_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb index c2c19c62048..3c3ae3832de 100644 --- a/spec/models/application_setting_spec.rb +++ b/spec/models/application_setting_spec.rb @@ -89,7 +89,7 @@ describe ApplicationSetting, models: true do storages = { 'custom1' => 'tmp/tests/custom_repositories_1', 'custom2' => 'tmp/tests/custom_repositories_2', - 'custom3' => 'tmp/tests/custom_repositories_3', + 'custom3' => 'tmp/tests/custom_repositories_3' } allow(Gitlab.config.repositories).to receive(:storages).and_return(storages) |