From ee263364b911a960ce7c60600d021d360b163844 Mon Sep 17 00:00:00 2001 From: Brett Walker Date: Wed, 1 Apr 2020 15:15:53 -0500 Subject: [PATCH] Remove license checks for issue_board_focus_mode so that it is available for everyone --- doc/ci/variables/README.md | 6 +++--- doc/user/project/issue_board.md | 5 +++-- ee/app/helpers/ee/boards_helper.rb | 7 +++---- ee/app/models/license.rb | 2 -- .../shared/promotions/_promote_issue_board.html.haml | 3 --- .../unreleased/bw-issue-board-focus-mode-license.yml | 5 +++++ ee/spec/features/boards/boards_spec.rb | 12 +----------- locale/gitlab.pot | 3 --- 8 files changed, 15 insertions(+), 28 deletions(-) create mode 100644 ee/changelogs/unreleased/bw-issue-board-focus-mode-license.yml diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md index 1ec4c1540392f3..81b9cd8becef61 100644 --- a/doc/ci/variables/README.md +++ b/doc/ci/variables/README.md @@ -4,7 +4,7 @@ type: reference # GitLab CI/CD environment variables -After a brief overview over the use of environment +After a brief overview of the use of environment variables, this document teaches you how to use GitLab CI/CD's variables, presents the full reference for predefined variables, and dives into more advanced applications. @@ -715,8 +715,8 @@ if [[ -d "/builds/gitlab-examples/ci-debug-trace/.git" ]]; then ++ CI_SERVER_VERSION_PATCH=0 ++ export CI_SERVER_REVISION=f4cc00ae823 ++ CI_SERVER_REVISION=f4cc00ae823 -++ export GITLAB_FEATURES=audit_events,burndown_charts,code_owners,contribution_analytics,description_diffs,elastic_search,export_issues,group_bulk_edit,group_burndown_charts,group_webhooks,issuable_default_templates,issue_board_focus_mode,issue_weights,jenkins_integration,ldap_group_sync,member_lock,merge_request_approvers,multiple_issue_assignees,multiple_ldap_servers,multiple_merge_request_assignees,protected_refs_for_users,push_rules,related_issues,repository_mirrors,repository_size_limit,scoped_issue_board,usage_quotas,visual_review_app,wip_limits,adjourned_deletion_for_projects_and_groups,admin_audit_log,auditor_user,batch_comments,blocking_merge_requests,board_assignee_lists,board_milestone_lists,ci_cd_projects,cluster_deployments,code_analytics,code_owner_approval_required,commit_committer_check,cross_project_pipelines,custom_file_templates,custom_file_templates_for_namespace,custom_project_templates,custom_prometheus_metrics,cycle_analytics_for_groups,db_load_balancing,default_project_deletion_protection,dependency_proxy,deploy_board,design_management,email_additional_text,extended_audit_events,external_authorization_service_api_management,feature_flags,file_locks,geo,github_project_service_integration,group_allowed_email_domains,group_project_templates,group_saml,issues_analytics,jira_dev_panel_integration,ldap_group_sync_filter,merge_pipelines,merge_request_performance_metrics,merge_trains,metrics_reports,multiple_approval_rules,multiple_clusters,multiple_group_issue_boards,object_storage,operations_dashboard,packages,productivity_analytics,project_aliases,protected_environments,reject_unsigned_commits,required_ci_templates,scoped_labels,service_desk,smartcard_auth,group_timelogs,type_of_work_analytics,unprotection_restrictions,ci_project_subscriptions,cluster_health,container_scanning,dast,dependency_scanning,epics,group_ip_restriction,incident_management,insights,license_management,personal_access_token_expiration_policy,pod_logs,prometheus_alerts,pseudonymizer,report_approver_rules,sast,security_dashboard,tracing,web_ide_terminal -++ GITLAB_FEATURES=audit_events,burndown_charts,code_owners,contribution_analytics,description_diffs,elastic_search,export_issues,group_bulk_edit,group_burndown_charts,group_webhooks,issuable_default_templates,issue_board_focus_mode,issue_weights,jenkins_integration,ldap_group_sync,member_lock,merge_request_approvers,multiple_issue_assignees,multiple_ldap_servers,multiple_merge_request_assignees,protected_refs_for_users,push_rules,related_issues,repository_mirrors,repository_size_limit,scoped_issue_board,usage_quotas,visual_review_app,wip_limits,adjourned_deletion_for_projects_and_groups,admin_audit_log,auditor_user,batch_comments,blocking_merge_requests,board_assignee_lists,board_milestone_lists,ci_cd_projects,cluster_deployments,code_analytics,code_owner_approval_required,commit_committer_check,cross_project_pipelines,custom_file_templates,custom_file_templates_for_namespace,custom_project_templates,custom_prometheus_metrics,cycle_analytics_for_groups,db_load_balancing,default_project_deletion_protection,dependency_proxy,deploy_board,design_management,email_additional_text,extended_audit_events,external_authorization_service_api_management,feature_flags,file_locks,geo,github_project_service_integration,group_allowed_email_domains,group_project_templates,group_saml,issues_analytics,jira_dev_panel_integration,ldap_group_sync_filter,merge_pipelines,merge_request_performance_metrics,merge_trains,metrics_reports,multiple_approval_rules,multiple_clusters,multiple_group_issue_boards,object_storage,operations_dashboard,packages,productivity_analytics,project_aliases,protected_environments,reject_unsigned_commits,required_ci_templates,scoped_labels,service_desk,smartcard_auth,group_timelogs,type_of_work_analytics,unprotection_restrictions,ci_project_subscriptions,cluster_health,container_scanning,dast,dependency_scanning,epics,group_ip_restriction,incident_management,insights,license_management,personal_access_token_expiration_policy,pod_logs,prometheus_alerts,pseudonymizer,report_approver_rules,sast,security_dashboard,tracing,web_ide_terminal +++ export GITLAB_FEATURES=audit_events,burndown_charts,code_owners,contribution_analytics,description_diffs,elastic_search,export_issues,group_bulk_edit,group_burndown_charts,group_webhooks,issuable_default_templates,issue_weights,jenkins_integration,ldap_group_sync,member_lock,merge_request_approvers,multiple_issue_assignees,multiple_ldap_servers,multiple_merge_request_assignees,protected_refs_for_users,push_rules,related_issues,repository_mirrors,repository_size_limit,scoped_issue_board,usage_quotas,visual_review_app,wip_limits,adjourned_deletion_for_projects_and_groups,admin_audit_log,auditor_user,batch_comments,blocking_merge_requests,board_assignee_lists,board_milestone_lists,ci_cd_projects,cluster_deployments,code_analytics,code_owner_approval_required,commit_committer_check,cross_project_pipelines,custom_file_templates,custom_file_templates_for_namespace,custom_project_templates,custom_prometheus_metrics,cycle_analytics_for_groups,db_load_balancing,default_project_deletion_protection,dependency_proxy,deploy_board,design_management,email_additional_text,extended_audit_events,external_authorization_service_api_management,feature_flags,file_locks,geo,github_project_service_integration,group_allowed_email_domains,group_project_templates,group_saml,issues_analytics,jira_dev_panel_integration,ldap_group_sync_filter,merge_pipelines,merge_request_performance_metrics,merge_trains,metrics_reports,multiple_approval_rules,multiple_clusters,multiple_group_issue_boards,object_storage,operations_dashboard,packages,productivity_analytics,project_aliases,protected_environments,reject_unsigned_commits,required_ci_templates,scoped_labels,service_desk,smartcard_auth,group_timelogs,type_of_work_analytics,unprotection_restrictions,ci_project_subscriptions,cluster_health,container_scanning,dast,dependency_scanning,epics,group_ip_restriction,incident_management,insights,license_management,personal_access_token_expiration_policy,pod_logs,prometheus_alerts,pseudonymizer,report_approver_rules,sast,security_dashboard,tracing,web_ide_terminal +++ GITLAB_FEATURES=audit_events,burndown_charts,code_owners,contribution_analytics,description_diffs,elastic_search,export_issues,group_bulk_edit,group_burndown_charts,group_webhooks,issuable_default_templates,issue_weights,jenkins_integration,ldap_group_sync,member_lock,merge_request_approvers,multiple_issue_assignees,multiple_ldap_servers,multiple_merge_request_assignees,protected_refs_for_users,push_rules,related_issues,repository_mirrors,repository_size_limit,scoped_issue_board,usage_quotas,visual_review_app,wip_limits,adjourned_deletion_for_projects_and_groups,admin_audit_log,auditor_user,batch_comments,blocking_merge_requests,board_assignee_lists,board_milestone_lists,ci_cd_projects,cluster_deployments,code_analytics,code_owner_approval_required,commit_committer_check,cross_project_pipelines,custom_file_templates,custom_file_templates_for_namespace,custom_project_templates,custom_prometheus_metrics,cycle_analytics_for_groups,db_load_balancing,default_project_deletion_protection,dependency_proxy,deploy_board,design_management,email_additional_text,extended_audit_events,external_authorization_service_api_management,feature_flags,file_locks,geo,github_project_service_integration,group_allowed_email_domains,group_project_templates,group_saml,issues_analytics,jira_dev_panel_integration,ldap_group_sync_filter,merge_pipelines,merge_request_performance_metrics,merge_trains,metrics_reports,multiple_approval_rules,multiple_clusters,multiple_group_issue_boards,object_storage,operations_dashboard,packages,productivity_analytics,project_aliases,protected_environments,reject_unsigned_commits,required_ci_templates,scoped_labels,service_desk,smartcard_auth,group_timelogs,type_of_work_analytics,unprotection_restrictions,ci_project_subscriptions,cluster_health,container_scanning,dast,dependency_scanning,epics,group_ip_restriction,incident_management,insights,license_management,personal_access_token_expiration_policy,pod_logs,prometheus_alerts,pseudonymizer,report_approver_rules,sast,security_dashboard,tracing,web_ide_terminal ++ export CI_PROJECT_ID=17893 ++ CI_PROJECT_ID=17893 ++ export CI_PROJECT_NAME=ci-debug-trace diff --git a/doc/user/project/issue_board.md b/doc/user/project/issue_board.md index 1b9077299d7e7a..2f4f3dd5392e78 100644 --- a/doc/user/project/issue_board.md +++ b/doc/user/project/issue_board.md @@ -203,9 +203,10 @@ If you don't have editing permission in a board, you're still able to see the co ![Viewing board configuration](img/issue_board_view_scope.png) -### Focus mode **(STARTER)** +### Focus mode -> Introduced in [GitLab Starter 9.1](https://about.gitlab.com/releases/2017/04/22/gitlab-9-1-released/#issue-boards-focus-mode-ees-eep). +> - Introduced in [GitLab Starter 9.1](https://about.gitlab.com/releases/2017/04/22/gitlab-9-1-released/#issue-boards-focus-mode-ees-eep). +> - Focus mode moved to GitLab Core in GitLab 12.10. Click the button at the top right to toggle focus mode on and off. In focus mode, the navigation UI is hidden, allowing you to focus on issues in the board. diff --git a/ee/app/helpers/ee/boards_helper.rb b/ee/app/helpers/ee/boards_helper.rb index c48043d5c26315..e1ad2e0c4b456f 100644 --- a/ee/app/helpers/ee/boards_helper.rb +++ b/ee/app/helpers/ee/boards_helper.rb @@ -12,9 +12,8 @@ def board_list_data override :board_data def board_data - show_feature_promotion = (@project && show_promotions? && - (!@project.feature_available?(:scoped_issue_board) || - !@project.feature_available?(:issue_board_focus_mode))) + show_feature_promotion = @project && show_promotions? && + !@project.feature_available?(:scoped_issue_board) data = { board_milestone_title: board.milestone&.name, @@ -23,7 +22,7 @@ def board_data label_ids: board.label_ids, labels: board.labels.to_json(only: [:id, :title, :color, :text_color] ), board_weight: board.weight, - focus_mode_available: current_board_parent.feature_available?(:issue_board_focus_mode), + focus_mode_available: true, weight_feature_available: current_board_parent.feature_available?(:issue_weights).to_s, show_promotion: show_feature_promotion, scoped_labels: current_board_parent.feature_available?(:scoped_labels)&.to_s, diff --git a/ee/app/models/license.rb b/ee/app/models/license.rb index e6f65b6633f517..f5d9dd46cd2e17 100644 --- a/ee/app/models/license.rb +++ b/ee/app/models/license.rb @@ -22,7 +22,6 @@ class License < ApplicationRecord group_burndown_charts group_webhooks issuable_default_templates - issue_board_focus_mode issue_weights jenkins_integration ldap_group_sync @@ -151,7 +150,6 @@ class License < ApplicationRecord file_locks group_webhooks issuable_default_templates - issue_board_focus_mode issue_weights jenkins_integration merge_request_approvers diff --git a/ee/app/views/shared/promotions/_promote_issue_board.html.haml b/ee/app/views/shared/promotions/_promote_issue_board.html.haml index f8c6f21899c220..5cbb43fba569ef 100644 --- a/ee/app/views/shared/promotions/_promote_issue_board.html.haml +++ b/ee/app/views/shared/promotions/_promote_issue_board.html.haml @@ -15,9 +15,6 @@ - unless @project.feature_available?(:scoped_issue_board) %li = link_to _('Scoped issue boards'), help_page_path('user/project/issue_board.html', anchor:'configurable-issue-boards-starter'), target: '_blank' - - unless @project.feature_available?(:issue_board_focus_mode) - %li - = link_to _('Issue board focus mode'), help_page_path('user/project/issue_board.html', anchor:'focus-mode-starter'), target: '_blank' = render 'shared/promotions/promotion_link_project' .top-space %button.d-block.mb-3.btn.btn-default.btn-block#hide-btn{ :href => "#", "@click.stop" => "clearPromotionState" } diff --git a/ee/changelogs/unreleased/bw-issue-board-focus-mode-license.yml b/ee/changelogs/unreleased/bw-issue-board-focus-mode-license.yml new file mode 100644 index 00000000000000..b31343fa1092d7 --- /dev/null +++ b/ee/changelogs/unreleased/bw-issue-board-focus-mode-license.yml @@ -0,0 +1,5 @@ +--- +title: Enable issue board focus mode for all tiers on Enterprise Edition +merge_request: 28597 +author: +type: changed diff --git a/ee/spec/features/boards/boards_spec.rb b/ee/spec/features/boards/boards_spec.rb index a279f2db545dbc..ae42d9f5d0ab10 100644 --- a/ee/spec/features/boards/boards_spec.rb +++ b/ee/spec/features/boards/boards_spec.rb @@ -17,21 +17,11 @@ login_as(user) end - it 'shows the button when the feature is enabled' do - stub_licensed_features(issue_board_focus_mode: true) - + it 'shows the button' do visit_board_page expect(page).to have_link('Toggle focus mode') end - - it 'hides the button when the feature is enabled' do - stub_licensed_features(issue_board_focus_mode: false) - - visit_board_page - - expect(page).not_to have_link('Toggle focus mode') - end end context 'with group and reporter' do diff --git a/locale/gitlab.pot b/locale/gitlab.pot index b9f0e1f7b8b893..b2da42097b66e8 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -11228,9 +11228,6 @@ msgstr "" msgid "Issue already promoted to epic." msgstr "" -msgid "Issue board focus mode" -msgstr "" - msgid "Issue cannot be found." msgstr "" -- GitLab