diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-05 09:19:15 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-05 09:19:15 +0000 |
| commit | 508f0c4ee719abb1294684eea4a63aa44cd23597 (patch) | |
| tree | 1af8199669fe0e9086bc57ba91510e80da093ffa /app/controllers | |
| parent | 9a0dd27b634dde1f947beafcf822efef1cd2dcfc (diff) | |
| download | gitlab-ce-508f0c4ee719abb1294684eea4a63aa44cd23597.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/profiles/chat_names_controller.rb | 7 | ||||
| -rw-r--r-- | app/controllers/projects/blob_controller.rb | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/controllers/profiles/chat_names_controller.rb b/app/controllers/profiles/chat_names_controller.rb index ae757c30d1c..564a84a0829 100644 --- a/app/controllers/profiles/chat_names_controller.rb +++ b/app/controllers/profiles/chat_names_controller.rb @@ -11,6 +11,7 @@ class Profiles::ChatNamesController < Profiles::ApplicationController end def new + @integration_name = integration_name end def create @@ -65,4 +66,10 @@ class Profiles::ChatNamesController < Profiles::ApplicationController def chat_names @chat_names ||= current_user.chat_names end + + def integration_name + s_('Integrations|Mattermost slash commands') + end end + +Profiles::ChatNamesController.prepend_mod diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index a5d18af993d..1be5363b464 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -49,6 +49,7 @@ class Projects::BlobController < Projects::ApplicationController before_action do push_frontend_feature_flag(:highlight_js, @project) + push_frontend_feature_flag(:explain_code, current_user) push_licensed_feature(:file_locks) if @project.licensed_feature_available?(:file_locks) end |