Commit 39dd01f7 authored by Mathieu Giraud's avatar Mathieu Giraud
Browse files

Merge branch 'hotfix-cs/partial-revert' into 'dev'

Hotfix - Partial revert !713

See merge request !717
parents ce0e3d9b 9614a200
Pipeline #149733 passed with stages
in 10 minutes and 15 seconds
......@@ -399,7 +399,6 @@ deploy_review:
name: review/$CI_BUILD_REF_NAME
url: http://$CI_BUILD_REF_SLUG.ci.vidjil.org/?data=analysis-example.vidjil
on_stop: stop_deploy_review
when: manual
only:
- /^feature-.*c.*\/.*$/
- /^hotfix-.*c.*\/.*$/
......@@ -429,7 +428,6 @@ deploy_review_server:
url: http://$CI_BUILD_REF_SLUG.server.ci.vidjil.org/browser/
on_stop: stop_deploy_review_server
auto_stop_in: 2 months
when: manual
only:
- /^feature-.*s.*\/.*$/
- /^hotfix-.*s.*\/.*$/
......
......@@ -287,10 +287,6 @@ QUnit.test("align", function (assert) {
segment.init();
segment.update();
// hotfix
assert.ok(true, "hotfix");
return;
if (segment.cgi_address == "") segment.cgi_address = "https://db.vidjil.org/cgi/"
//select 2 clones
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment