Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 0 deletions

diff --git a/qa/qa/page/project/issue/show.rb b/qa/qa/page/project/issue/show.rb
index 9264289b603..0aa53b1487a 100644
--- a/qa/qa/page/project/issue/show.rb
+++ b/qa/qa/page/project/issue/show.rb
@@ -35,6 +35,10 @@ module QA
             element :more_assignees_link
           end
 
+          view 'app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue' do
+            element :remove_issue_button
+          end
+
           view 'app/helpers/dropdowns_helper.rb' do
             element :dropdown_input_field
           end
@@ -76,6 +80,10 @@ module QA
             click_element(:milestone_link)
           end
 
+          def click_remove_issue_button
+            click_element(:remove_issue_button)
+          end
+
           # Adds a comment to an issue
           # attachment option should be an absolute path
           def comment(text, attachment: nil, filter: :all_activities)
diff --git a/qa/qa/resource/issue.rb b/qa/qa/resource/issue.rb
index 9d0a5e159e0..0817a9de06f 100644
--- a/qa/qa/resource/issue.rb
+++ b/qa/qa/resource/issue.rb
@@ -15,6 +15,7 @@ module QA
       end
 
       attribute :id
+      attribute :iid
       attribute :assignee_ids
       attribute :labels
       attribute :title