diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-07 16:55:03 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-07 16:55:03 +0000 |
| commit | a5db7f54252d22e3ecd49786a3fdff7c46658fa3 (patch) | |
| tree | 71a947d3274aadf2a2896166a6709174b910a2d0 /spec/requests/api | |
| parent | ba3ce6bd39ffdcc03c1b435c8c69ddfc4ff688e2 (diff) | |
| parent | 0b9d56f960e272047ac749cff7a29f2b5f03f7a5 (diff) | |
| download | gitlab-ce-a5db7f54252d22e3ecd49786a3fdff7c46658fa3.tar.gz | |
Merge branch '28447-hybrid-repository-storages' into 'master'
Update storage settings to allow extra values per shard
See merge request !9597
Diffstat (limited to 'spec/requests/api')
| -rw-r--r-- | spec/requests/api/api_internal_helpers_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/api_internal_helpers_spec.rb b/spec/requests/api/api_internal_helpers_spec.rb index be4bc39ada2..f5265ea60ff 100644 --- a/spec/requests/api/api_internal_helpers_spec.rb +++ b/spec/requests/api/api_internal_helpers_spec.rb @@ -21,7 +21,7 @@ describe ::API::Helpers::InternalHelpers do # Relative and absolute storage paths, with and without trailing / ['.', './', Dir.pwd, Dir.pwd + '/'].each do |storage_path| context "storage path is #{storage_path}" do - subject { clean_project_path(project_path, [storage_path]) } + subject { clean_project_path(project_path, [{ 'path' => storage_path }]) } it { is_expected.to eq(expected) } end |