Skip to content

Commit

Permalink
Merge pull request #6410 from hotosm/develop
Browse files Browse the repository at this point in the history
Merge changes to staging for 4.7.2
  • Loading branch information
ramyaragupathy committed May 6, 2024
2 parents ee65c73 + 8ce70d1 commit 252d9e0
Show file tree
Hide file tree
Showing 449 changed files with 7,394 additions and 9,492 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
frontend-code-test:
resource_class: large
docker:
- image: cimg/node:16.20
- image: cimg/node:18.19.1
working_directory: /home/circleci/tasking-manager
steps:
- checkout
Expand Down Expand Up @@ -184,7 +184,7 @@ jobs:
working_directory: /home/circleci/tasking-manager
resource_class: medium
docker:
- image: cimg/python:3.10.7-node
- image: cimg/node:18.19.1
steps:
- checkout
- aws-cli/setup:
Expand Down Expand Up @@ -237,7 +237,7 @@ jobs:
working_directory: /home/circleci/tasking-manager
resource_class: large
docker:
- image: cimg/python:3.10.7-node
- image: cimg/node:18.19.1
parameters:
stack_name:
description: "the name of the stack for cfn-config"
Expand Down
322 changes: 0 additions & 322 deletions .github/dependabot.yml

This file was deleted.

12 changes: 4 additions & 8 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
"codebase: frontend":
"scope: frontend":
- frontend/**/*
"codebase: backend":
"scope: backend":
- backend/**/*
- tests/**/*
- migrations/**/*
- ./manage.py
- ./pyproject.toml
"infrastructure":
"scope: infrastructure":
- .circleci/*
- .github/**/*
- scripts/aws/**/*
Expand All @@ -16,9 +16,5 @@
"dependencies":
- frontend/yarn.lock
- ./pyproject.toml
"javascript":
- frontend/yarn.lock
"python":
- ./pyproject.toml
"type: translations":
"scope: translations":
- frontend/src/locales/*

0 comments on commit 252d9e0

Please sign in to comment.