diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/helpers/regexp.ts | 1 | ||||
| -rw-r--r-- | server/initializers/migrations/0135-video-channel-actor.ts | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/server/helpers/regexp.ts b/server/helpers/regexp.ts index cfc2be488..257054cea 100644 --- a/server/helpers/regexp.ts +++ b/server/helpers/regexp.ts | |||
| @@ -4,7 +4,6 @@ function regexpCapture (str: string, regex: RegExp, maxIterations = 100) { | |||
| 4 | let m: RegExpExecArray | 4 | let m: RegExpExecArray |
| 5 | let i = 0 | 5 | let i = 0 |
| 6 | 6 | ||
| 7 | // tslint:disable:no-conditional-assignment | ||
| 8 | while ((m = regex.exec(str)) !== null && i < maxIterations) { | 7 | while ((m = regex.exec(str)) !== null && i < maxIterations) { |
| 9 | // This is necessary to avoid infinite loops with zero-width matches | 8 | // This is necessary to avoid infinite loops with zero-width matches |
| 10 | if (m.index === regex.lastIndex) { | 9 | if (m.index === regex.lastIndex) { |
diff --git a/server/initializers/migrations/0135-video-channel-actor.ts b/server/initializers/migrations/0135-video-channel-actor.ts index 3f620dfa3..6989e1cbb 100644 --- a/server/initializers/migrations/0135-video-channel-actor.ts +++ b/server/initializers/migrations/0135-video-channel-actor.ts | |||
| @@ -56,7 +56,6 @@ async function up (utils: { | |||
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | { | 58 | { |
| 59 | // tslint:disable:no-trailing-whitespace | ||
| 60 | const query1 = | 59 | const query1 = |
| 61 | ` | 60 | ` |
| 62 | INSERT INTO "actor" | 61 | INSERT INTO "actor" |