diff --git a/app/assets/javascripts/behaviors/markdown/render_gfm.js b/app/assets/javascripts/behaviors/markdown/render_gfm.js index b0935f007a083433f8b4d3246d31a43cb5db8973..74bd147859a640f99472b2b8c9e01d4ac754272e 100644 --- a/app/assets/javascripts/behaviors/markdown/render_gfm.js +++ b/app/assets/javascripts/behaviors/markdown/render_gfm.js @@ -52,5 +52,5 @@ export function renderGFM(element) { highlightCurrentUser(userEls); initPopovers(popoverEls); - if (gon?.features?.glqlIntegration) renderGlql(glqlEls.map((e) => e.parentNode)); + renderGlql(glqlEls.map((e) => e.parentNode)); } diff --git a/app/controllers/groups/boards_controller.rb b/app/controllers/groups/boards_controller.rb index 3ff428b6f19baa0647d74b5f421b2797fc9ab902..107f7b88bc15e2570382f15a6024e34e5326bae5 100644 --- a/app/controllers/groups/boards_controller.rb +++ b/app/controllers/groups/boards_controller.rb @@ -10,7 +10,6 @@ class Groups::BoardsController < Groups::ApplicationController push_frontend_feature_flag(:issues_list_drawer, group) push_force_frontend_feature_flag(:work_items_beta, !!group&.work_items_beta_feature_flag_enabled?) push_frontend_feature_flag(:notifications_todos_buttons, current_user) - push_force_frontend_feature_flag(:glql_integration, !!group&.glql_integration_feature_flag_enabled?) push_force_frontend_feature_flag(:continue_indented_text, !!group&.continue_indented_text_feature_flag_enabled?) push_frontend_feature_flag(:work_item_status_feature_flag, group&.root_ancestor) end diff --git a/app/controllers/groups/work_items_controller.rb b/app/controllers/groups/work_items_controller.rb index 476a1c40b6bea21992516cf2d6a4591607eef480..c67db5ccb6b12c0e5e1821fba4c3f1906c95f12d 100644 --- a/app/controllers/groups/work_items_controller.rb +++ b/app/controllers/groups/work_items_controller.rb @@ -11,7 +11,6 @@ class WorkItemsController < Groups::ApplicationController push_force_frontend_feature_flag(:work_items_alpha, !!group&.work_items_alpha_feature_flag_enabled?) push_force_frontend_feature_flag(:create_group_level_work_items, !!group&.create_group_level_work_items_feature_flag_enabled?) - push_force_frontend_feature_flag(:glql_integration, !!group&.glql_integration_feature_flag_enabled?) push_force_frontend_feature_flag(:glql_load_on_click, !!group&.glql_load_on_click_feature_flag_enabled?) push_force_frontend_feature_flag(:continue_indented_text, !!group&.continue_indented_text_feature_flag_enabled?) push_frontend_feature_flag(:issues_list_drawer, group) diff --git a/app/controllers/projects/boards_controller.rb b/app/controllers/projects/boards_controller.rb index 180397058e9a04d226bea904c7bd4cae08be54d9..03c51995cb0a0c082678d6bce822c6b29ccaae9b 100644 --- a/app/controllers/projects/boards_controller.rb +++ b/app/controllers/projects/boards_controller.rb @@ -10,7 +10,6 @@ class Projects::BoardsController < Projects::ApplicationController push_frontend_feature_flag(:issues_list_drawer, project) push_force_frontend_feature_flag(:work_items_beta, !!project&.work_items_beta_feature_flag_enabled?) push_frontend_feature_flag(:notifications_todos_buttons, current_user) - push_force_frontend_feature_flag(:glql_integration, !!project&.glql_integration_feature_flag_enabled?) push_force_frontend_feature_flag(:continue_indented_text, !!project&.continue_indented_text_feature_flag_enabled?) push_frontend_feature_flag(:work_item_status_feature_flag, project&.root_ancestor) end diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 5d829a7f6f5ab49ee5bd72d068b4cd57515b9501..0b6789ee2f09eb2b485d6b125b1e0c8ccd9639ae 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -54,7 +54,6 @@ class Projects::IssuesController < Projects::ApplicationController push_frontend_feature_flag(:issues_list_drawer, project) push_frontend_feature_flag(:notifications_todos_buttons, current_user) push_frontend_feature_flag(:work_item_planning_view, project&.group) - push_force_frontend_feature_flag(:glql_integration, !!project&.glql_integration_feature_flag_enabled?) push_force_frontend_feature_flag(:glql_load_on_click, !!project&.glql_load_on_click_feature_flag_enabled?) push_force_frontend_feature_flag(:continue_indented_text, !!project&.continue_indented_text_feature_flag_enabled?) push_force_frontend_feature_flag(:work_items_beta, !!project&.work_items_beta_feature_flag_enabled?) diff --git a/app/controllers/projects/merge_requests/application_controller.rb b/app/controllers/projects/merge_requests/application_controller.rb index d379dce50235e607c7c953a319d3578cf40b8d1b..878e7da908fd137c7987afa357707bd9d2d69689 100644 --- a/app/controllers/projects/merge_requests/application_controller.rb +++ b/app/controllers/projects/merge_requests/application_controller.rb @@ -8,7 +8,6 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont feature_category :code_review_workflow before_action do - push_force_frontend_feature_flag(:glql_integration, !!project&.glql_integration_feature_flag_enabled?) push_force_frontend_feature_flag(:glql_load_on_click, !!project&.glql_load_on_click_feature_flag_enabled?) push_force_frontend_feature_flag(:continue_indented_text, !!project&.continue_indented_text_feature_flag_enabled?) end diff --git a/app/controllers/projects/work_items_controller.rb b/app/controllers/projects/work_items_controller.rb index 37f13ef0a5cbecfa09b0574c252ce4d603c9ffb0..68c1dd40b2e0d737eb5388803066c208062349d6 100644 --- a/app/controllers/projects/work_items_controller.rb +++ b/app/controllers/projects/work_items_controller.rb @@ -12,7 +12,6 @@ class Projects::WorkItemsController < Projects::ApplicationController push_force_frontend_feature_flag(:work_items, !!project&.work_items_feature_flag_enabled?) push_force_frontend_feature_flag(:work_items_beta, !!project&.work_items_beta_feature_flag_enabled?) push_force_frontend_feature_flag(:work_items_alpha, !!project&.work_items_alpha_feature_flag_enabled?) - push_force_frontend_feature_flag(:glql_integration, !!project&.glql_integration_feature_flag_enabled?) push_force_frontend_feature_flag(:glql_load_on_click, !!project&.glql_load_on_click_feature_flag_enabled?) push_force_frontend_feature_flag(:continue_indented_text, !!project&.continue_indented_text_feature_flag_enabled?) push_frontend_feature_flag(:work_item_status_feature_flag, project&.root_ancestor) diff --git a/app/models/group.rb b/app/models/group.rb index 873dc3d4b060ff26811e02b8cad896f47e0f1dd4..2c25442495d7471b511685567d02bf861b485e9a 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -1111,7 +1111,7 @@ def continue_indented_text_feature_flag_enabled? end def glql_integration_feature_flag_enabled? - feature_flag_enabled_for_self_or_ancestor?(:glql_integration) + true end def glql_load_on_click_feature_flag_enabled? diff --git a/app/models/project.rb b/app/models/project.rb index f438118489cdc175bf980279c1e5008ba32ce819..9181542b04126de92edab0d705bf4b1d2c6afeab 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -3457,7 +3457,7 @@ def work_item_status_feature_available? end def glql_integration_feature_flag_enabled? - group&.glql_integration_feature_flag_enabled? || Feature.enabled?(:glql_integration, self) + true end def glql_load_on_click_feature_flag_enabled? diff --git a/config/feature_flags/development/glql_integration.yml b/config/feature_flags/development/glql_integration.yml deleted file mode 100644 index 8d041b20ace4d969ec7482a2f1d68f6e6a688614..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/glql_integration.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: glql_integration -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/161942 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/476990 -feature_issue_url: https://gitlab.com/groups/gitlab-org/-/epics/14767 -milestone: '17.3' -type: development -group: group::knowledge -default_enabled: true diff --git a/doc/user/glql/_index.md b/doc/user/glql/_index.md index 4940408a683fe61debbf71f09524786a1cf386ab..14dfa3b8b5cea1bf6e2ad0e26b66f10aeca979fb 100644 --- a/doc/user/glql/_index.md +++ b/doc/user/glql/_index.md @@ -19,16 +19,10 @@ title: GitLab Query Language (GLQL) - Enabled on GitLab.com in GitLab 17.4 for a subset of groups and projects. - [Changed](https://gitlab.com/gitlab-org/gitlab/-/issues/476990) from experiment to beta in GitLab 17.10. - Enabled on GitLab.com, GitLab Self-Managed, and GitLab Dedicated in GitLab 17.10. +- [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/476990) in GitLab 18.3. Feature flag `glql_integration` removed. {{< /history >}} -{{< alert type="flag" >}} - -The availability of this feature is controlled by a feature flag. -For more information, see the history. -This feature is available for testing, but not ready for production use. - -{{< /alert >}} GitLab Query Language (GLQL) is an attempt to create a single query language for all of GitLab. Use it to filter and embed content from anywhere in the platform, using familiar syntax. diff --git a/doc/user/glql/fields.md b/doc/user/glql/fields.md index db162415ba90cb75a7c5996f2ff17a097aa6edaa..4df005afc4ca8b17ca13610e7b41467d7fdb96ad 100644 --- a/doc/user/glql/fields.md +++ b/doc/user/glql/fields.md @@ -20,16 +20,9 @@ title: GLQL fields - Promoted to [beta](../../policy/development_stages_support.md#beta) status in GitLab 17.10. - [Changed](https://gitlab.com/gitlab-org/gitlab/-/issues/476990) from experiment to beta in GitLab 17.10. - Enabled on GitLab.com, GitLab Self-Managed, and GitLab Dedicated in GitLab 17.10. +- [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/476990) in GitLab 18.3. Feature flag `glql_integration` removed. {{< /history >}} -{{< alert type="flag" >}} - -The availability of this feature is controlled by a feature flag. -For more information, see the history. -This feature is available for testing, but not ready for production use. - -{{< /alert >}} - With GitLab Query Language (GLQL), fields are used to: - Filter the results returned from a [GLQL query](_index.md#query-syntax). diff --git a/doc/user/glql/functions.md b/doc/user/glql/functions.md index 2ddd292ebbb46257a12a0bcb1567e4e4af91e2d6..c0e189dfecf4b8c30ffcae23a723e267fc1a1c33 100644 --- a/doc/user/glql/functions.md +++ b/doc/user/glql/functions.md @@ -20,15 +20,9 @@ title: GLQL functions - Promoted to [beta](../../policy/development_stages_support.md#beta) status in GitLab 17.10. - [Changed](https://gitlab.com/gitlab-org/gitlab/-/issues/476990) from experiment to beta in GitLab 17.10. - Enabled on GitLab.com, GitLab Self-Managed, and GitLab Dedicated in GitLab 17.10. +- [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/476990) in GitLab 18.3. Feature flag `glql_integration` removed. {{< /history >}} -{{< alert type="flag" >}} - -The availability of this feature is controlled by a feature flag. -For more information, see the history. -This feature is available for testing, but not ready for production use. - -{{< /alert >}} Use functions with [GitLab Query Language (GLQL)](_index.md) to create dynamic queries. diff --git a/ee/app/controllers/groups/epics_controller.rb b/ee/app/controllers/groups/epics_controller.rb index c54aef4d6a86df009b1f459d5f20ce6dfbe98f7c..52c2d9f9da4dbe90334c0c949d9fe36a9d6d9760 100644 --- a/ee/app/controllers/groups/epics_controller.rb +++ b/ee/app/controllers/groups/epics_controller.rb @@ -21,7 +21,6 @@ class Groups::EpicsController < Groups::ApplicationController push_frontend_feature_flag(:preserve_markdown, @group) push_frontend_feature_flag(:notifications_todos_buttons, current_user) - push_force_frontend_feature_flag(:glql_integration, !!@group&.glql_integration_feature_flag_enabled?) push_force_frontend_feature_flag(:glql_load_on_click, !!@group&.glql_load_on_click_feature_flag_enabled?) push_force_frontend_feature_flag(:continue_indented_text, !!@group&.continue_indented_text_feature_flag_enabled?) push_force_frontend_feature_flag(:work_items_alpha, !!group.work_items_alpha_feature_flag_enabled?) diff --git a/spec/frontend/behaviors/markdown/render_gfm_spec.js b/spec/frontend/behaviors/markdown/render_gfm_spec.js index 67d3db70e6bebd2485204b3d26ed21d70eab6af8..410246d26dbcecc4fd77fa3ac7967ec8e6432833 100644 --- a/spec/frontend/behaviors/markdown/render_gfm_spec.js +++ b/spec/frontend/behaviors/markdown/render_gfm_spec.js @@ -27,28 +27,10 @@ describe('renderGFM', () => { '
labels = any