diff options
Diffstat (limited to 'config')
6 files changed, 21 insertions, 5 deletions
diff --git a/config/feature_flags/development/linear_group_descendants_finder_upto.yml b/config/feature_flags/development/linear_group_descendants_finder_upto.yml index ef045ebfa7a..db3a37191ff 100644 --- a/config/feature_flags/development/linear_group_descendants_finder_upto.yml +++ b/config/feature_flags/development/linear_group_descendants_finder_upto.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78991 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350972 milestone: '14.8' type: development -group: group::authentication and authorization +group: group::workspace default_enabled: false diff --git a/config/feature_flags/development/project_list_filter_bar.yml b/config/feature_flags/development/project_list_filter_bar.yml index 86b8a61b1e4..370074a914c 100644 --- a/config/feature_flags/development/project_list_filter_bar.yml +++ b/config/feature_flags/development/project_list_filter_bar.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/11209 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321404 milestone: '11.11' type: development -group: group::authentication and authorization +group: group::workspace default_enabled: false diff --git a/config/feature_flags/development/use_traversal_ids_for_descendants_scopes.yml b/config/feature_flags/development/use_traversal_ids_for_descendants_scopes.yml index b2262c9707e..3eece0b906a 100644 --- a/config/feature_flags/development/use_traversal_ids_for_descendants_scopes.yml +++ b/config/feature_flags/development/use_traversal_ids_for_descendants_scopes.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78542 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350637 milestone: '14.8' type: development -group: group::authentication and authorization +group: group::workspace default_enabled: true diff --git a/config/feature_flags/development/user_time_settings.yml b/config/feature_flags/development/user_time_settings.yml index bd2b94fe015..77ee79fe80a 100644 --- a/config/feature_flags/development/user_time_settings.yml +++ b/config/feature_flags/development/user_time_settings.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/25 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321407 milestone: '11.11' type: development -group: group::authentication and authorization +group: group::workspace default_enabled: false diff --git a/config/feature_flags/ops/legacy_open_source_license_available.yml b/config/feature_flags/ops/legacy_open_source_license_available.yml index 2408e31633a..36ee6c230bf 100644 --- a/config/feature_flags/ops/legacy_open_source_license_available.yml +++ b/config/feature_flags/ops/legacy_open_source_license_available.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79855 rollout_issue_url: milestone: '14.8' type: ops -group: 'group::authentication and authorization' +group: 'group::workspace' default_enabled: true diff --git a/config/routes/user.rb b/config/routes/user.rb index 0c1bc1956a9..1c122ea0c94 100644 --- a/config/routes/user.rb +++ b/config/routes/user.rb @@ -55,6 +55,22 @@ devise_scope :user do get '/users/almost_there' => 'confirmations#almost_there' post '/users/resend_verification_code', to: 'sessions#resend_verification_code' get '/users/successful_verification', to: 'sessions#successful_verification' + + # Redirect on GitHub authorization request errors. E.g. it could happen when user: + # 1. cancel authorization the GitLab OAuth app via GitHub to import GitHub repos + # (they'll be redirected to /projects/new#import_project) + # 2. cancel signing in to GitLab using GitHub account + # (they'll be redirected to /users/sign_in) + # In these cases, GitHub redirects user to the GitLab OAuth app's + # registered callback URL - /users/auth, which is the url to the auth user's profile page + get '/users/auth', + constraints: ->(req) { + req.params[:error].present? && req.params[:state].present? + }, + to: redirect { |_params, req| + redirect_path = req.session.delete(:auth_on_failure_path) + redirect_path || Rails.application.routes.url_helpers.new_user_session_path + } end scope '-/users', module: :users do |