Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-04-03 06:08:30 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-04-03 06:08:30 +0300
commit00c0098252ac7b303061175ff4c3e002c07407d2 (patch)
treed3882967cb0737c15ed2916f8bcc3ee9a7920fef /app/views/projects/issues
parentc8f8f2a4966ab5ccbee8477544987ef9bdbcd55f (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/issues')
-rw-r--r--app/views/projects/issues/_design_management.html.haml2
-rw-r--r--app/views/projects/issues/_discussion.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/issues/_design_management.html.haml b/app/views/projects/issues/_design_management.html.haml
index 5e2b2bbfcc4..df5ab1d4a7c 100644
--- a/app/views/projects/issues/_design_management.html.haml
+++ b/app/views/projects/issues/_design_management.html.haml
@@ -13,7 +13,7 @@
issue_path: project_issue_path(@project, @issue),
register_path: new_user_registration_path(redirect_to_referer: 'yes'),
sign_in_path: new_session_path(:user, redirect_to_referer: 'yes'),
- saved_replies_new_path: profile_saved_replies_path } }
+ new_comment_template_path: profile_comment_templates_path } }
- else
.gl-border-solid.gl-border-1.gl-border-gray-100.gl-rounded-base.gl-mt-5.gl-p-3.gl-text-center
= enable_lfs_message
diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml
index 8f259fe73e1..c6e5102889a 100644
--- a/app/views/projects/issues/_discussion.html.haml
+++ b/app/views/projects/issues/_discussion.html.haml
@@ -13,4 +13,4 @@
current_user_data: UserSerializer.new.represent(current_user, {only_path: true}, CurrentUserEntity).to_json,
can_add_timeline_events: "#{can?(current_user, :admin_incident_management_timeline_event, @issue)}",
report_abuse_path: add_category_abuse_reports_path,
- saved_replies_new_path: profile_saved_replies_path } }
+ new_comment_template_path: profile_comment_templates_path } }