diff options
Diffstat (limited to 'app')
4 files changed, 5 insertions, 7 deletions
diff --git a/app/assets/javascripts/work_items/components/work_item_detail.vue b/app/assets/javascripts/work_items/components/work_item_detail.vue index 0f1af44e8a1..f20ca1ce69a 100644 --- a/app/assets/javascripts/work_items/components/work_item_detail.vue +++ b/app/assets/javascripts/work_items/components/work_item_detail.vue @@ -279,7 +279,7 @@ export default { // Once more types are moved to have Work Items involved // we need to handle this properly. if (this.parentWorkItemType === WORK_ITEM_TYPE_VALUE_ISSUE) { - return `../../issues/${this.parentWorkItem?.iid}`; + return `../../-/issues/${this.parentWorkItem?.iid}`; } return this.parentWorkItem?.webUrl; }, diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss index dd1989aa5e1..529f6acaf04 100644 --- a/app/assets/stylesheets/framework/mixins.scss +++ b/app/assets/stylesheets/framework/mixins.scss @@ -436,8 +436,7 @@ &:last-child { &::after { - content: ''; - padding: 0; + display: none; } } } diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index ad3b79b604c..97b625d1ae2 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -613,8 +613,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo Feature.enabled?(:summarize_my_code_review, current_user) && namespace.group_namespace? && namespace.licensed_feature_available?(:summarize_my_mr_code_review) && - Gitlab::Llm::StageCheck.available?(namespace, :summarize_my_mr_code_review) && - merge_request.send_to_ai? + Gitlab::Llm::StageCheck.available?(namespace, :summarize_my_mr_code_review) end end diff --git a/app/views/projects/tags/show.html.haml b/app/views/projects/tags/show.html.haml index 3124f47c832..5127972c406 100644 --- a/app/views/projects/tags/show.html.haml +++ b/app/views/projects/tags/show.html.haml @@ -1,6 +1,6 @@ - user = user_email = nil -- if @tag.tagger - - user_email = @tag.tagger.email +- if @tag.user_email + - user_email = @tag.user_email - user = User.find_by_any_email(user_email) - add_to_breadcrumbs s_('TagsPage|Tags'), project_tags_path(@project) - breadcrumb_title @tag.name |