summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/api/entities/ci/secure_file.rb2
-rw-r--r--lib/gitlab/ci/secure_files/cer.rb2
-rw-r--r--lib/gitlab/ci/secure_files/p12.rb2
-rw-r--r--lib/sidebars/groups/menus/issues_menu.rb3
-rw-r--r--lib/sidebars/groups/menus/merge_requests_menu.rb3
-rw-r--r--lib/sidebars/groups/super_sidebar_menus/code_menu.rb26
-rw-r--r--lib/sidebars/groups/super_sidebar_menus/plan_menu.rb2
-rw-r--r--lib/sidebars/groups/super_sidebar_panel.rb1
-rw-r--r--lib/sidebars/projects/menus/issues_menu.rb3
-rw-r--r--lib/sidebars/projects/menus/merge_requests_menu.rb3
-rw-r--r--lib/sidebars/projects/super_sidebar_menus/code_menu.rb1
-rw-r--r--lib/sidebars/projects/super_sidebar_menus/plan_menu.rb1
12 files changed, 38 insertions, 11 deletions
diff --git a/lib/api/entities/ci/secure_file.rb b/lib/api/entities/ci/secure_file.rb
index bf8d2776db1..614fd49aa30 100644
--- a/lib/api/entities/ci/secure_file.rb
+++ b/lib/api/entities/ci/secure_file.rb
@@ -10,7 +10,7 @@ module API
documentation: { type: 'string', example: '16630b189ab34b2e3504f4758e1054d2e478deda510b2b08cc0ef38d12e80aac' }
expose :checksum_algorithm, documentation: { type: 'string', example: 'sha256' }
expose :created_at, documentation: { type: 'dateTime', example: '2022-02-22T22:22:22.222Z' }
- expose :expires_at, documentation: { type: 'dateTime', example: '2022-09-21T14:56:00.000Z' }
+ expose :expires_at, documentation: { type: 'dateTime', example: '2023-09-21T14:55:59.000Z' }
expose :metadata, documentation: { type: 'Hash', example: { "id" => "75949910542696343243264405377658443914" } }
expose :file_extension, documentation: { type: 'string', example: 'jks' }
end
diff --git a/lib/gitlab/ci/secure_files/cer.rb b/lib/gitlab/ci/secure_files/cer.rb
index 45d2898c29b..3340afa8f2a 100644
--- a/lib/gitlab/ci/secure_files/cer.rb
+++ b/lib/gitlab/ci/secure_files/cer.rb
@@ -36,7 +36,7 @@ module Gitlab
private
def expires_at
- certificate_data.not_before
+ certificate_data.not_after
end
def id
diff --git a/lib/gitlab/ci/secure_files/p12.rb b/lib/gitlab/ci/secure_files/p12.rb
index 1006a4d05b2..04cd4243bb0 100644
--- a/lib/gitlab/ci/secure_files/p12.rb
+++ b/lib/gitlab/ci/secure_files/p12.rb
@@ -36,7 +36,7 @@ module Gitlab
private
def expires_at
- certificate_data.not_before
+ certificate_data.not_after
end
def serial
diff --git a/lib/sidebars/groups/menus/issues_menu.rb b/lib/sidebars/groups/menus/issues_menu.rb
index a09cb01ad0d..27b78d89aa1 100644
--- a/lib/sidebars/groups/menus/issues_menu.rb
+++ b/lib/sidebars/groups/menus/issues_menu.rb
@@ -53,10 +53,9 @@ module Sidebars
def serialize_as_menu_item_args
super.merge({
active_routes: list_menu_item.active_routes,
- sprite_icon: sprite_icon,
pill_count: pill_count,
has_pill: has_pill?,
- super_sidebar_parent: ::Sidebars::StaticMenu,
+ super_sidebar_parent: ::Sidebars::Groups::SuperSidebarMenus::PlanMenu,
item_id: :group_issue_list
})
end
diff --git a/lib/sidebars/groups/menus/merge_requests_menu.rb b/lib/sidebars/groups/menus/merge_requests_menu.rb
index 5e25c33167c..356c823add9 100644
--- a/lib/sidebars/groups/menus/merge_requests_menu.rb
+++ b/lib/sidebars/groups/menus/merge_requests_menu.rb
@@ -56,10 +56,9 @@ module Sidebars
override :serialize_as_menu_item_args
def serialize_as_menu_item_args
super.merge({
- sprite_icon: sprite_icon,
pill_count: pill_count,
has_pill: has_pill?,
- super_sidebar_parent: ::Sidebars::StaticMenu,
+ super_sidebar_parent: ::Sidebars::Groups::SuperSidebarMenus::CodeMenu,
item_id: :group_merge_request_list
})
end
diff --git a/lib/sidebars/groups/super_sidebar_menus/code_menu.rb b/lib/sidebars/groups/super_sidebar_menus/code_menu.rb
new file mode 100644
index 00000000000..e102066b18d
--- /dev/null
+++ b/lib/sidebars/groups/super_sidebar_menus/code_menu.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Sidebars
+ module Groups
+ module SuperSidebarMenus
+ class CodeMenu < ::Sidebars::Menu
+ override :title
+ def title
+ s_('Navigation|Code')
+ end
+
+ override :sprite_icon
+ def sprite_icon
+ 'code'
+ end
+
+ override :configure_menu_items
+ def configure_menu_items
+ [
+ :group_merge_request_list
+ ].each { |id| add_item(::Sidebars::NilMenuItem.new(item_id: id)) }
+ end
+ end
+ end
+ end
+end
diff --git a/lib/sidebars/groups/super_sidebar_menus/plan_menu.rb b/lib/sidebars/groups/super_sidebar_menus/plan_menu.rb
index da357253b8f..74e7977fff5 100644
--- a/lib/sidebars/groups/super_sidebar_menus/plan_menu.rb
+++ b/lib/sidebars/groups/super_sidebar_menus/plan_menu.rb
@@ -17,6 +17,8 @@ module Sidebars
override :configure_menu_items
def configure_menu_items
[
+ :group_issue_list,
+ :group_epic_list,
:issue_boards,
:epic_boards,
:roadmap,
diff --git a/lib/sidebars/groups/super_sidebar_panel.rb b/lib/sidebars/groups/super_sidebar_panel.rb
index 3a9d8304183..03af904d99d 100644
--- a/lib/sidebars/groups/super_sidebar_panel.rb
+++ b/lib/sidebars/groups/super_sidebar_panel.rb
@@ -15,6 +15,7 @@ module Sidebars
add_menu(Sidebars::StaticMenu.new(context))
add_menu(Sidebars::Groups::SuperSidebarMenus::ManageMenu.new(context))
add_menu(Sidebars::Groups::SuperSidebarMenus::PlanMenu.new(context))
+ add_menu(Sidebars::Groups::SuperSidebarMenus::CodeMenu.new(context))
add_menu(Sidebars::Groups::SuperSidebarMenus::BuildMenu.new(context))
add_menu(Sidebars::Groups::SuperSidebarMenus::SecureMenu.new(context))
add_menu(Sidebars::Groups::SuperSidebarMenus::OperationsMenu.new(context))
diff --git a/lib/sidebars/projects/menus/issues_menu.rb b/lib/sidebars/projects/menus/issues_menu.rb
index dd5d4458fbb..070eac0ae49 100644
--- a/lib/sidebars/projects/menus/issues_menu.rb
+++ b/lib/sidebars/projects/menus/issues_menu.rb
@@ -72,10 +72,9 @@ module Sidebars
override :serialize_as_menu_item_args
def serialize_as_menu_item_args
super.merge({
- sprite_icon: sprite_icon,
pill_count: pill_count,
has_pill: has_pill?,
- super_sidebar_parent: ::Sidebars::StaticMenu,
+ super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::PlanMenu,
item_id: :project_issue_list
})
end
diff --git a/lib/sidebars/projects/menus/merge_requests_menu.rb b/lib/sidebars/projects/menus/merge_requests_menu.rb
index 71cc53da3ea..ae4fd6b02e7 100644
--- a/lib/sidebars/projects/menus/merge_requests_menu.rb
+++ b/lib/sidebars/projects/menus/merge_requests_menu.rb
@@ -69,10 +69,9 @@ module Sidebars
override :serialize_as_menu_item_args
def serialize_as_menu_item_args
super.merge({
- sprite_icon: sprite_icon,
pill_count: pill_count,
has_pill: has_pill?,
- super_sidebar_parent: ::Sidebars::StaticMenu,
+ super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::CodeMenu,
item_id: :project_merge_request_list
})
end
diff --git a/lib/sidebars/projects/super_sidebar_menus/code_menu.rb b/lib/sidebars/projects/super_sidebar_menus/code_menu.rb
index a201312f8ce..89acb92e3b8 100644
--- a/lib/sidebars/projects/super_sidebar_menus/code_menu.rb
+++ b/lib/sidebars/projects/super_sidebar_menus/code_menu.rb
@@ -17,6 +17,7 @@ module Sidebars
override :configure_menu_items
def configure_menu_items
[
+ :project_merge_request_list,
:files,
:branches,
:commits,
diff --git a/lib/sidebars/projects/super_sidebar_menus/plan_menu.rb b/lib/sidebars/projects/super_sidebar_menus/plan_menu.rb
index 38b30949bfa..bc3111cc6f4 100644
--- a/lib/sidebars/projects/super_sidebar_menus/plan_menu.rb
+++ b/lib/sidebars/projects/super_sidebar_menus/plan_menu.rb
@@ -17,6 +17,7 @@ module Sidebars
override :configure_menu_items
def configure_menu_items
[
+ :project_issue_list,
:boards,
:project_wiki,
:service_desk,
View Lorry Controller Status