Skip to content
Snippets Groups Projects
Commit 9bd4c94a authored by Jacques Erasmus's avatar Jacques Erasmus :speech_balloon:
Browse files

Cleanup blobBlameInfo feature flag

Removed all references to the feature flag as it's enabled by default

Changelog: other
parent bf30db5e
No related branches found
No related tags found
2 merge requests!144312Change service start (cut-off) date for code suggestions to March 15th,!141853Cleanup blob_blame_info feature flag
......@@ -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: {
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
---
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
......@@ -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.
......
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment