Skip to content

Actions: appsembler/edx-platform

Actions

Merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
report_conflicts.yml
129 workflow runs
129 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump lodash-es from 4.17.6 to 4.17.21 Merge conflicts #1208: Pull request #1395 opened by dependabot bot
January 26, 2024 17:33 2m 16s dependabot/npm_and_yarn/lodash-es-4.17.21
dependabot/npm_and_yarn/lodash-es-4.17.21
January 26, 2024 17:33 2m 16s
Bump scss-tokenizer and node-sass Merge conflicts #1207: Pull request #1394 opened by dependabot bot
January 25, 2024 01:51 2m 10s dependabot/npm_and_yarn/scss-tokenizer-and-node-sass-0.4.3
dependabot/npm_and_yarn/scss-tokenizer-and-node-sass-0.4.3
January 25, 2024 01:51 2m 10s
Bump minimatch and plato Merge conflicts #1206: Pull request #1393 opened by dependabot bot
January 25, 2024 01:50 2m 19s dependabot/npm_and_yarn/minimatch-and-plato-3.0.8
dependabot/npm_and_yarn/minimatch-and-plato-3.0.8
January 25, 2024 01:50 2m 19s
Bump socket.io-parser and karma Merge conflicts #1205: Pull request #1392 opened by dependabot bot
January 25, 2024 01:50 2m 12s dependabot/npm_and_yarn/socket.io-parser-and-karma-4.2.4
dependabot/npm_and_yarn/socket.io-parser-and-karma-4.2.4
January 25, 2024 01:50 2m 12s
Bump qs and body-parser Merge conflicts #1204: Pull request #1391 opened by dependabot bot
January 25, 2024 01:50 2m 10s dependabot/npm_and_yarn/qs-and-body-parser-6.5.3
dependabot/npm_and_yarn/qs-and-body-parser-6.5.3
January 25, 2024 01:50 2m 10s
Bump decode-uri-component from 0.2.0 to 0.2.2 Merge conflicts #1203: Pull request #1390 opened by dependabot bot
January 25, 2024 01:50 2m 51s dependabot/npm_and_yarn/decode-uri-component-0.2.2
dependabot/npm_and_yarn/decode-uri-component-0.2.2
January 25, 2024 01:50 2m 51s
Bump moment-timezone from 0.5.14 to 0.5.35 Merge conflicts #1202: Pull request #1389 opened by dependabot bot
January 25, 2024 01:49 2m 14s dependabot/npm_and_yarn/moment-timezone-0.5.35
dependabot/npm_and_yarn/moment-timezone-0.5.35
January 25, 2024 01:49 2m 14s
Update from main (production) Merge conflicts #1201: Pull request #1386 synchronize by bryanlandia
January 2, 2024 18:35 2m 11s main
main
January 2, 2024 18:35 2m 11s
Sync Dockerfile.tutor with latest server-vars.yml for Tahoe prod Merge conflicts #1200: Pull request #1388 opened by bryanlandia
January 2, 2024 04:05 2m 10s chore/dockerfile-sync-configs
chore/dockerfile-sync-configs
January 2, 2024 04:05 2m 10s
fix: Updated settings.py to dynamically populate ALLOWED_HOSTS using domains from the Django sites. Merge conflicts #1199: Pull request #1384 synchronize by bryanlandia
December 14, 2023 05:22 2m 40s fix/host-header-injection-vulnerabilit
fix/host-header-injection-vulnerabilit
December 14, 2023 05:22 2m 40s
Update from main (production) Merge conflicts #1198: Pull request #1386 synchronize by bryanlandia
December 14, 2023 05:13 2m 15s main
main
December 14, 2023 05:13 2m 15s
use py2neo-history for access to older release gone from py2neo Merge conflicts #1197: Pull request #1387 synchronize by bryanlandia
December 14, 2023 04:52 2m 44s bugfix/py2neo-eol
bugfix/py2neo-eol
December 14, 2023 04:52 2m 44s
use py2neo-history for access to older release gone from py2neo Merge conflicts #1196: Pull request #1387 opened by bryanlandia
December 12, 2023 00:18 2m 55s bugfix/py2neo-eol
bugfix/py2neo-eol
December 12, 2023 00:18 2m 55s
fix: Updated settings.py to dynamically populate ALLOWED_HOSTS using domains from the Django sites. Merge conflicts #1195: Pull request #1384 synchronize by bryanlandia
December 11, 2023 22:03 2m 22s fix/host-header-injection-vulnerabilit
fix/host-header-injection-vulnerabilit
December 11, 2023 22:03 2m 22s
fix: Updated settings.py to dynamically populate ALLOWED_HOSTS using domains from the Django sites. Merge conflicts #1194: Pull request #1384 synchronize by bryanlandia
December 11, 2023 21:55 2m 33s fix/host-header-injection-vulnerabilit
fix/host-header-injection-vulnerabilit
December 11, 2023 21:55 2m 33s
fix: Arabic translation placeholders in progress page Merge conflicts #1193: Pull request #1385 opened by amirtds
November 17, 2023 01:34 2m 14s fix/arabic-translation-placeholder
fix/arabic-translation-placeholder
November 17, 2023 01:34 2m 14s
fix: Updated settings.py to dynamically populate ALLOWED_HOSTS using domains from the Django sites. Merge conflicts #1192: Pull request #1384 synchronize by amirtds
November 16, 2023 01:08 2m 18s fix/host-header-injection-vulnerabilit
fix/host-header-injection-vulnerabilit
November 16, 2023 01:08 2m 18s
fix: Updated settings.py to dynamically populate ALLOWED_HOSTS using domains from the Django sites. Merge conflicts #1191: Pull request #1384 synchronize by amirtds
November 16, 2023 01:05 2m 7s fix/host-header-injection-vulnerabilit
fix/host-header-injection-vulnerabilit
November 16, 2023 01:05 2m 7s
fix: Updated settings.py to dynamically populate ALLOWED_HOSTS using domains from the Django sites. Merge conflicts #1190: Pull request #1384 synchronize by amirtds
November 16, 2023 01:04 2m 14s fix/host-header-injection-vulnerabilit
fix/host-header-injection-vulnerabilit
November 16, 2023 01:04 2m 14s
fix: Updated settings.py to dynamically populate ALLOWED_HOSTS using domains from the Django sites. Merge conflicts #1189: Pull request #1384 synchronize by amirtds
November 16, 2023 00:57 2m 11s fix/host-header-injection-vulnerabilit
fix/host-header-injection-vulnerabilit
November 16, 2023 00:57 2m 11s
fix: Updated settings.py to dynamically populate ALLOWED_HOSTS using domains from the Django sites. Merge conflicts #1188: Pull request #1384 synchronize by amirtds
November 16, 2023 00:54 2m 23s fix/host-header-injection-vulnerabilit
fix/host-header-injection-vulnerabilit
November 16, 2023 00:54 2m 23s
fix: Updated settings.py to dynamically populate ALLOWED_HOSTS using domains from the Django sites. Merge conflicts #1187: Pull request #1384 synchronize by amirtds
November 15, 2023 22:48 2m 15s fix/host-header-injection-vulnerabilit
fix/host-header-injection-vulnerabilit
November 15, 2023 22:48 2m 15s
fix: Updated settings.py to dynamically populate ALLOWED_HOSTS using domains from the Django sites. Merge conflicts #1186: Pull request #1384 opened by amirtds
November 15, 2023 22:42 2m 12s fix/host-header-injection-vulnerabilit
fix/host-header-injection-vulnerabilit
November 15, 2023 22:42 2m 12s
Fix: Handle Request objects in Segment fetch override Merge conflicts #1185: Pull request #1382 synchronize by amirtds
November 14, 2023 21:50 2m 11s fix/segment-fetch-interception
fix/segment-fetch-interception
November 14, 2023 21:50 2m 11s
Fix: Handle Request objects in Segment fetch override Merge conflicts #1184: Pull request #1382 synchronize by amirtds
November 14, 2023 21:39 2m 11s fix/segment-fetch-interception
fix/segment-fetch-interception
November 14, 2023 21:39 2m 11s