Skip to content

Commit

Permalink
Merge branch 'master' into huniafatima/replace-deprecated-github-actions
Browse files Browse the repository at this point in the history
  • Loading branch information
huniafatima-arbi authored Jul 2, 2024
2 parents 41bc954 + 2717e5c commit 1f6ce56
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions openedx/core/djangoapps/user_authn/views/register.py
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@ def _track_user_registration(user, profile, params, third_party_provider, regist
'total_registration_time': round(float(params.get('totalRegistrationTime', '0'))),
'activation_key': registration.activation_key if registration else None,
'host': params.get('host', ''),
'app_name': params.get('app_name', ''),
'utm_campaign': params.get('utm_campaign', ''),
}
# VAN-738 - added below properties to experiment marketing emails opt in/out events on Braze.
Expand Down
2 changes: 1 addition & 1 deletion requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ celery>=5.2.2,<6.0.0
# The team that owns this package will manually bump this package rather than having it pulled in automatically.
# This is to allow them to better control its deployment and to do it in a process that works better
# for them.
edx-enterprise==4.20.13
edx-enterprise==4.20.14

# Stay on LTS version, remove once this is added to common constraint
Django<5.0
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ edx-drf-extensions==10.3.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.20.13
edx-enterprise==4.20.14
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/kernel.in
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ edx-drf-extensions==10.3.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.20.13
edx-enterprise==4.20.14
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/doc.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ edx-drf-extensions==10.3.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.20.13
edx-enterprise==4.20.14
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ edx-drf-extensions==10.3.0
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.20.13
edx-enterprise==4.20.14
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
Expand Down

0 comments on commit 1f6ce56

Please sign in to comment.