diff --git a/app/assets/javascripts/repository/components/blob_content_viewer.vue b/app/assets/javascripts/repository/components/blob_content_viewer.vue
index 4ec57676b798491e40ac990cd8bf6eabf1d65b54..8cca70e07a26f4baa9ee484c7ef2a9ce66c40274 100644
--- a/app/assets/javascripts/repository/components/blob_content_viewer.vue
+++ b/app/assets/javascripts/repository/components/blob_content_viewer.vue
@@ -205,7 +205,7 @@ export default {
},
isBlameEnabled() {
// Blame information within the blob viewer is not yet supported in our fallback (HAML) viewers
- return this.glFeatures.blobBlameInfo && !this.useFallback;
+ return !this.useFallback;
},
},
watch: {
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index 7851e2ac80becad61a4770fcc9e0bd347052b5b9..558aac7b1ef2b5995534efd3949bf9c990338537 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -49,7 +49,6 @@ class Projects::BlobController < Projects::ApplicationController
urgency :low, [:create, :show, :edit, :update, :diff]
before_action do
- push_frontend_feature_flag(:blob_blame_info, @project)
push_frontend_feature_flag(:highlight_js_worker, @project)
push_frontend_feature_flag(:explain_code_chat, current_user)
push_frontend_feature_flag(:encoding_logs_tree)
diff --git a/app/controllers/projects/tree_controller.rb b/app/controllers/projects/tree_controller.rb
index 1bbf272e8f98c30707b708b97ac0dff71176b95e..e98a5fc07d3ffba1b77ec6a62f8ee8ae0a952a69 100644
--- a/app/controllers/projects/tree_controller.rb
+++ b/app/controllers/projects/tree_controller.rb
@@ -19,7 +19,6 @@ class Projects::TreeController < Projects::ApplicationController
before_action :authorize_edit_tree!, only: [:create_dir]
before_action do
- push_frontend_feature_flag(:blob_blame_info, @project)
push_frontend_feature_flag(:highlight_js_worker, @project)
push_frontend_feature_flag(:explain_code_chat, current_user)
push_frontend_feature_flag(:encoding_logs_tree)
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index d4b77c588dcf682c093ea1faeddddc95c9e60b6d..29b0cb4c018be2ac3f48c43e1982f9833e7a141b 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -38,7 +38,6 @@ class ProjectsController < Projects::ApplicationController
before_action :check_export_rate_limit!, only: [:export, :download_export, :generate_new_export]
before_action do
- push_frontend_feature_flag(:blob_blame_info, @project)
push_frontend_feature_flag(:highlight_js_worker, @project)
push_frontend_feature_flag(:remove_monitor_metrics, @project)
push_frontend_feature_flag(:explain_code_chat, current_user)
diff --git a/config/feature_flags/development/blob_blame_info.yml b/config/feature_flags/development/blob_blame_info.yml
deleted file mode 100644
index 0066fbafc5219cbd91fca560f81a69122788899e..0000000000000000000000000000000000000000
--- a/config/feature_flags/development/blob_blame_info.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: blob_blame_info
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133798
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/425272
-milestone: '16.5'
-type: development
-group: group::source code
-default_enabled: true
diff --git a/doc/user/project/repository/git_blame.md b/doc/user/project/repository/git_blame.md
index f1fb118b8d53054cb9d48972616aba8a655b6fbd..7f333ec7b7f441d3ba4559edb2a2c6f3276bd4c5 100644
--- a/doc/user/project/repository/git_blame.md
+++ b/doc/user/project/repository/git_blame.md
@@ -36,15 +36,14 @@ changes to light gray.
### View blame directly in the file view
<!--
-When feature flags `graphql_git_blame`, `blob_blame_info` and `highlight_js_worker` are removed,
+When feature flags `graphql_git_blame` and `highlight_js_worker` are removed,
delete this section and update the steps in "View blame for a file".
-->
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/430950) in GitLab 16.7 [with flags](../../../administration/feature_flags.md) named `graphql_git_blame`, `blob_blame_info` and `highlight_js_worker`. Enabled by default.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/430950) in GitLab 16.7 [with flags](../../../administration/feature_flags.md) named `graphql_git_blame` and `highlight_js_worker`. Enabled by default.
FLAG:
On self-managed GitLab, by default this feature is available.
-To hide the feature, an administrator can [disable the feature flag](../../../administration/feature_flags.md) named `blob_blame_info`.
On GitLab.com, this feature is available.
When this feature is enabled, you can additionally view blame for a file directly from the file page.
diff --git a/spec/frontend/repository/components/blob_content_viewer_spec.js b/spec/frontend/repository/components/blob_content_viewer_spec.js
index cd5bc08faf0a7ab2547d43af47956dade4810557..8414dfcf151c729e92ce3624475323a730c8add6 100644
--- a/spec/frontend/repository/components/blob_content_viewer_spec.js
+++ b/spec/frontend/repository/components/blob_content_viewer_spec.js
@@ -75,7 +75,6 @@ const createComponent = async (mockData = {}, mountFn = shallowMount, mockRoute
createMergeRequestIn = userPermissionsMock.createMergeRequestIn,
isBinary,
inject = {},
- blobBlameInfo = true,
} = mockData;
const blobInfo = {
@@ -139,7 +138,6 @@ const createComponent = async (mockData = {}, mountFn = shallowMount, mockRoute
...inject,
glFeatures: {
highlightJsWorker: false,
- blobBlameInfo,
},
},
}),
@@ -219,14 +217,6 @@ describe('Blob content viewer component', () => {
expect(findSourceViewerNew().props('showBlame')).toBe(false);
});
- describe('blobBlameInfo feature flag disabled', () => {
- it('does not render a blame toggle', async () => {
- await createComponent({ blob: simpleViewerMock, blobBlameInfo: false });
-
- expect(findBlobHeader().props('showBlameToggle')).toEqual(false);
- });
- });
-
describe('when viewing rich content', () => {
it('always shows the blame when clicking on the blame button', async () => {
loadViewer.mockReturnValueOnce(SourceViewerNew);