Skip to content
Merge conflicts

fix: Updated settings.py to dynamically populate ALLOWED_HOSTS using domains from the Django sites. #1211

Sign in to view logs

fix: Updated settings.py to dynamically populate ALLOWED_HOSTS using domains from the Django sites.

fix: Updated settings.py to dynamically populate ALLOWED_HOSTS using domains from the Django sites. #1211

Workflow file for this run

.github/workflows/report_conflicts.yml at 88217c3
on: [pull_request]
name: 'Merge conflicts'
jobs:
report:
name: 'nutmeg and master'
uses: appsembler/action-conflict-counter/.github/workflows/report-via-comment.yml@main
with:
local_base_branch: ${{ github.base_ref }}
upstream_repo: 'https://github.com/edx/edx-platform.git'
upstream_branches: 'open-release/nutmeg.master,master'
exclude_paths: 'cms/static/js/,conf/locale/,lms/static/js/,package.json,package-lock.json,.github/'
secrets:
custom_github_token: ${{ secrets.GITHUB_TOKEN }}