diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-05-28 16:24:51 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-05-28 16:24:51 +0000 |
| commit | bb88fb7ea234fc28824c8e5490194271478c4cc6 (patch) | |
| tree | d6e79d74f1523eb1e16142ad68c6253b1c9edf37 /spec/requests/api/runner_spec.rb | |
| parent | 57838e331c75aeab08a89d23c22f54a074477519 (diff) | |
| parent | acdea516c1d14ef17256858507b7a4316f01350f (diff) | |
| download | gitlab-ce-bb88fb7ea234fc28824c8e5490194271478c4cc6.tar.gz | |
Merge branch 'patch-28' into 'master'
Returns a correct TMP_UPLOAD_PATH to workhourse
Closes #46763
See merge request gitlab-org/gitlab-ce!19148
Diffstat (limited to 'spec/requests/api/runner_spec.rb')
| -rw-r--r-- | spec/requests/api/runner_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb index 827c6dd4af1..6aadf839dbd 100644 --- a/spec/requests/api/runner_spec.rb +++ b/spec/requests/api/runner_spec.rb @@ -1225,7 +1225,7 @@ describe API::Runner, :clean_gitlab_redis_shared_state do before do fog_connection.directories.get('artifacts').files.create( - key: 'tmp/upload/12312300', + key: 'tmp/uploads/12312300', body: 'content' ) |