Add latest changes from gitlab-org/gitlab@master

app/graphql/types/work_item_type.rb

@@ -27,6 +27,9 @@ module Types
       description: 'Global ID of the work item.'
     field :iid, GraphQL::Types::String, null: false,
       description: 'Internal ID of the work item.'
+    field :imported, GraphQL::Types::Boolean, null: false,
+      method: :imported?,
+      description: 'Indicates whether the work item was imported.'
     field :lock_version,
       GraphQL::Types::Int,
       null: false,

app/models/work_item.rb

@@ -2,6 +2,7 @@
 
 class WorkItem < Issue
   include Gitlab::Utils::StrongMemoize
+  include Import::HasImportSource
 
   COMMON_QUICK_ACTIONS_COMMANDS = [
     :title, :reopen, :close, :cc, :tableflip, :shrug, :type, :promote_to, :checkin_reminder,

app/services/system_notes/time_tracking_service.rb

@@ -113,7 +113,8 @@ module SystemNotes
 
     def formatted_spent_at(spent_at)
       spent_at ||= DateTime.current
-      timezone = author.timezone || Time.zone.name
+      timezone = author.timezone
+      timezone = Time.zone.name if timezone.blank? || ActiveSupport::TimeZone[timezone].nil?
       spent_at.in_time_zone(timezone)
     end
 

doc/api/graphql/reference/_index.md

@@ -41656,6 +41656,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="workitemhidden"></a>`hidden` | [`Boolean`](#boolean) | Indicates the work item is hidden because the author has been banned. |
 | <a id="workitemid"></a>`id` | [`WorkItemID!`](#workitemid) | Global ID of the work item. |
 | <a id="workitemiid"></a>`iid` | [`String!`](#string) | Internal ID of the work item. |
+| <a id="workitemimported"></a>`imported` | [`Boolean!`](#boolean) | Indicates whether the work item was imported. |
 | <a id="workitemlockversion"></a>`lockVersion` | [`Int!`](#int) | Lock version of the work item. Incremented each time the work item is updated. |
 | <a id="workitemmovedtoworkitemurl"></a>`movedToWorkItemUrl` | [`String`](#string) | URL of the work item that the work item was moved to. |
 | <a id="workitemname"></a>`name` | [`String`](#string) | Name or title of the object. |

spec/graphql/types/work_item_type_spec.rb

@@ -19,6 +19,7 @@ RSpec.describe GitlabSchema.types['WorkItem'], feature_category: :team_planning
       description_html
       id
       iid
+      imported
       lock_version
       namespace
       project

spec/services/system_notes/time_tracking_service_spec.rb

@@ -383,6 +383,26 @@ RSpec.describe ::SystemNotes::TimeTrackingService, feature_category: :team_plann
           end
         end
 
+        context 'when author timezone is blank' do
+          let(:author) { create(:user, timezone: '') }
+
+          it 'sets the note text using default timezone' do
+            spend_time!(277200)
+
+            expect(subject.note).to eq "added 1w 4d 5h of time spent at 2019-12-30 14:05:12 UTC"
+          end
+        end
+
+        context 'when author timezone is invalid' do
+          let(:author) { create(:user, timezone: 'GitLab') }
+
+          it 'sets the note text using default timezone' do
+            spend_time!(277200)
+
+            expect(subject.note).to eq "added 1w 4d 5h of time spent at 2019-12-30 14:05:12 UTC"
+          end
+        end
+
         context 'when time was subtracted' do
           it 'sets the note text' do
             spend_time!(360000)