Skip to content

Commit ab8d75e

Browse files
committed
Merge branch 'master' into dev
2 parents f076a42 + 7ea9640 commit ab8d75e

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

.github/workflows/release-ci.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ jobs:
7676
type=ref,event=branch
7777
type=ref,event=pr
7878
type=semver,pattern={{version}}
79-
8079
- name: Build and push container
8180
uses: docker/build-push-action@v3
8281
with:
@@ -117,14 +116,11 @@ jobs:
117116
echo "EMAIL_PASSWORD=${{ secrets.EMAIL_PASSWORD }}" >> .env &&
118117
echo "EMAIL_HOST=${{ secrets.EMAIL_HOST }}" >> .env &&
119118
echo "EMAIL_PORT=${{ secrets.EMAIL_PORT }}" >> .env &&
120-
121119
echo "SELECTEL_ACCOUNT_ID=${{ secrets.SELECTEL_ACCOUNT_ID }}" >> .env &&
122120
echo "SELECTEL_CONTAINER_NAME=${{ secrets.SELECTEL_CONTAINER_NAME }}" >> .env &&
123121
echo "SELECTEL_CONTAINER_PASSWORD=${{ secrets.SELECTEL_CONTAINER_PASSWORD }}" >> .env &&
124122
echo "SELECTEL_CONTAINER_USERNAME=${{ secrets.SELECTEL_CONTAINER_USERNAME }}" >> .env &&
125-
126123
127124
echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
128125
129-
docker-compose -f docker-compose.prod-ci.yml -p prod up -d
130-
126+
docker-compose -f docker-compose.prod-ci.yml -p prod up -d

users/serializers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class MentorSerializer(serializers.ModelSerializer):
1717
class Meta:
1818
model = Mentor
1919
fields = [
20-
"job",
20+
# "job",
2121
"useful_to_project",
2222
]
2323

0 commit comments

Comments
 (0)