diff options
Diffstat (limited to 'app/views/projects/issues')
4 files changed, 6 insertions, 6 deletions
diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml index 2fbaa5812c0..f1c19756474 100644 --- a/app/views/projects/issues/_discussion.html.haml +++ b/app/views/projects/issues/_discussion.html.haml @@ -1,5 +1,4 @@ -- add_page_startup_api_call discussions_path(@issue) -- add_page_startup_api_call notes_url +- add_page_startup_api_call Feature.enabled?(:paginated_issue_discussions, @project, default_enabled: :yaml) ? discussions_path(@issue, per_page: 20) : discussions_path(@issue) - @gfm_form = true diff --git a/app/views/projects/issues/_issues.html.haml b/app/views/projects/issues/_issues.html.haml index e4d072a9472..1ab51df6d24 100644 --- a/app/views/projects/issues/_issues.html.haml +++ b/app/views/projects/issues/_issues.html.haml @@ -1,5 +1,5 @@ - is_project_overview = local_assigns.fetch(:is_project_overview, false) -= render 'shared/alerts/positioning_disabled' += render 'shared/alerts/positioning_disabled' if @sort == 'relative_position' - if Feature.enabled?(:vue_issuables_list, @project) && !is_project_overview - data_endpoint = local_assigns.fetch(:data_endpoint, expose_path(api_v4_projects_issues_path(id: @project.id))) diff --git a/app/views/projects/issues/_service_desk_empty_state.html.haml b/app/views/projects/issues/_service_desk_empty_state.html.haml index a4251c8e5dc..afeb2a23ea2 100644 --- a/app/views/projects/issues/_service_desk_empty_state.html.haml +++ b/app/views/projects/issues/_service_desk_empty_state.html.haml @@ -16,7 +16,7 @@ = s_("ServiceDesk|Your users can send emails to this address:") %code= @project.service_desk_address - %span= s_("ServiceDesk|Issues created from Service Desk emails appear here. Each comment becomes part of the email conversation.") + %span= s_("ServiceDesk|Issues created from Service Desk emails will appear here. Each comment becomes part of the email conversation.") = link_to _('Learn more.'), help_page_path('user/project/service_desk') - if can_edit_project_settings && !service_desk_enabled diff --git a/app/views/projects/issues/_service_desk_info_content.html.haml b/app/views/projects/issues/_service_desk_info_content.html.haml index 448a341eba6..f0ec68ba54b 100644 --- a/app/views/projects/issues/_service_desk_info_content.html.haml +++ b/app/views/projects/issues/_service_desk_info_content.html.haml @@ -1,16 +1,17 @@ - service_desk_enabled = @project.service_desk_enabled? - can_edit_project_settings = can?(current_user, :admin_project, @project) +- can_admin_issues = can?(current_user, :admin_issue, @project) - title_text = s_("ServiceDesk|Use Service Desk to connect with your users and offer customer support through email right inside GitLab") .non-empty-state.media .svg-content - = render 'shared/empty_states/icons/service_desk_callout.svg' + = render partial: 'shared/empty_states/icons/service_desk_callout', formats: :svg .gl-mt-3.gl-ml-3 %h5= title_text - - if can_edit_project_settings && service_desk_enabled + - if can_admin_issues && service_desk_enabled %p = s_("ServiceDesk|Your users can send emails to this address:") %code= @project.service_desk_address |