diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
| commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
| tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /app/controllers/profiles | |
| parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) | |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'app/controllers/profiles')
| -rw-r--r-- | app/controllers/profiles/personal_access_tokens_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/profiles/preferences_controller.rb | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/profiles/personal_access_tokens_controller.rb b/app/controllers/profiles/personal_access_tokens_controller.rb index a45205c5da7..251967a7dff 100644 --- a/app/controllers/profiles/personal_access_tokens_controller.rb +++ b/app/controllers/profiles/personal_access_tokens_controller.rb @@ -3,6 +3,10 @@ class Profiles::PersonalAccessTokensController < Profiles::ApplicationController feature_category :authentication_and_authorization + before_action do + push_frontend_feature_flag(:personal_access_tokens_scoped_to_projects, current_user) + end + def index set_index_vars @personal_access_token = finder.build diff --git a/app/controllers/profiles/preferences_controller.rb b/app/controllers/profiles/preferences_controller.rb index add5046e213..45bab5f6cd1 100644 --- a/app/controllers/profiles/preferences_controller.rb +++ b/app/controllers/profiles/preferences_controller.rb @@ -49,7 +49,8 @@ class Profiles::PreferencesController < Profiles::ApplicationController :tab_width, :sourcegraph_enabled, :gitpod_enabled, - :render_whitespace_in_code + :render_whitespace_in_code, + :markdown_surround_selection ] end end |