Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 1 deletions

diff --git a/spec/graphql/types/timelog_type_spec.rb b/spec/graphql/types/timelog_type_spec.rb
index 38bd70d5097..791c2fdb046 100644
--- a/spec/graphql/types/timelog_type_spec.rb
+++ b/spec/graphql/types/timelog_type_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe GitlabSchema.types['Timelog'] do
-  let(:fields) { %i[spent_at time_spent user issue note] }
+  let(:fields) { %i[spent_at time_spent user issue merge_request note] }
 
   it { expect(described_class.graphql_name).to eq('Timelog') }
   it { expect(described_class).to have_graphql_fields(fields) }
@@ -25,6 +25,14 @@ RSpec.describe GitlabSchema.types['Timelog'] do
     end
   end
 
+  describe 'merge_request field' do
+    subject { described_class.fields['mergeRequest'] }
+
+    it 'returns merge_request' do
+      is_expected.to have_graphql_type(Types::MergeRequestType)
+    end
+  end
+
   describe 'note field' do
     subject { described_class.fields['note'] }