diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-24 15:09:32 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-24 15:09:32 +0300 |
| commit | f296f23500b4b3758670ae0c5ce2e1779f533e8b (patch) | |
| tree | 717151cb9e81d489b4ecf880988ea10d77b7224f /config | |
| parent | fd7c75bf603f4f2f1a4a4e63ef5cbc1a51cc0a15 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/telesign_callback.yml | 8 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/config/feature_flags/development/telesign_callback.yml b/config/feature_flags/development/telesign_callback.yml new file mode 100644 index 00000000000..33bdb24a727 --- /dev/null +++ b/config/feature_flags/development/telesign_callback.yml @@ -0,0 +1,8 @@ +--- +name: telesign_callback +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/125983 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/417703 +milestone: '16.3' +type: development +group: group::anti-abuse +default_enabled: false diff --git a/config/routes.rb b/config/routes.rb index 740911f2e3f..7e2f1f0027a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -166,6 +166,7 @@ InitializerConnections.raise_if_new_database_connection do draw :country draw :country_state draw :subscription + draw :phone_verification scope '/push_from_secondary/:geo_node_id' do draw :git_http |