summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-07-12 14:21:07 +0000
committerJose <jvargas@gitlab.com>2018-07-12 17:28:35 -0500
commitd36007d8768e5f74bfcbfbeb84d7e238c7b21d0a (patch)
tree0c8b1d17f38d313e5e1b0baff28d7321599ca862
parent69b171f22b5f0528238fb3479487e8647496d627 (diff)
downloadgitlab-ce-d36007d8768e5f74bfcbfbeb84d7e238c7b21d0a.tar.gz
Merge branch 'qa-fix-timestamp' into 'master'
[QA] Fix duplicate year in namespace name See merge request gitlab-org/gitlab-ce!20581
-rw-r--r--qa/qa/runtime/namespace.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/qa/qa/runtime/namespace.rb b/qa/qa/runtime/namespace.rb
index ccfa8b44db3..f1c8ef11f94 100644
--- a/qa/qa/runtime/namespace.rb
+++ b/qa/qa/runtime/namespace.rb
@@ -8,7 +8,7 @@ module QA
end
def name
- 'qa-test-' + time.strftime('%d-%m-%Y-%H-%M-%S')
+ "qa-test-#{time.strftime('%Y-%m-%d-%H-%M-%S')}"
end
def path