Add latest changes from gitlab-org/gitlab@master

3 files changed, 11 insertions, 1 deletions

diff --git a/config/feature_flags/development/global_time_tracking_report.yml b/config/feature_flags/development/global_time_tracking_report.yml
new file mode 100644
index 00000000000..eb2072e33d3
--- /dev/null
+++ b/config/feature_flags/development/global_time_tracking_report.yml
@@ -0,0 +1,8 @@
+---
+name: global_time_tracking_report
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108368
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/394715
+milestone: '15.11'
+type: development
+group: group::project management
+default_enabled: false
diff --git a/config/feature_flags/development/pages_deploy_upload_file_outside_transaction.yml b/config/feature_flags/development/pages_deploy_upload_file_outside_transaction.yml
index f3a502593b0..c656166bcc0 100644
--- a/config/feature_flags/development/pages_deploy_upload_file_outside_transaction.yml
+++ b/config/feature_flags/development/pages_deploy_upload_file_outside_transaction.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/396512
 milestone: '15.11'
 type: development
 group: group::knowledge
-default_enabled: false
+default_enabled: true
diff --git a/config/routes.rb b/config/routes.rb
index 50b28830e99..10b1378d924 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -224,6 +224,8 @@ InitializerConnections.raise_if_new_database_connection do
       # Deprecated route for permanent failures
       # https://gitlab.com/gitlab-org/gitlab/-/issues/362606
       post '/members/mailgun/permanent_failures' => 'mailgun/webhooks#process_webhook'
+
+      get '/timelogs' => 'time_tracking/timelogs#index'
     end
     # End of the /-/ scope.