Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
vidjil
vidjil
Commits
39dd01f7
Commit
39dd01f7
authored
Jun 08, 2020
by
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
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
39dd01f7
...
...
@@ -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.*\/.*$/
...
...
browser/test/QUnit/testFiles/segmenter_test.js
View file @
39dd01f7
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment