Add latest changes from gitlab-org/gitlab@master

4 files changed, 22 insertions, 9 deletions

diff --git a/doc/user/incident_management/index.md b/doc/user/incident_management/index.md
index 5ac27d227a1..febe1a2423a 100644
--- a/doc/user/incident_management/index.md
+++ b/doc/user/incident_management/index.md
@@ -91,7 +91,7 @@ Please refer to a list of [available slash commands](../../integration/slash_com
 
 ## Zoom in issues
 
-In order to communicate synchronously for incidents management, GitLab allows to
+In order to communicate synchronously for incidents management, GitLab allows you to
 associate a Zoom meeting with an issue. Once you start a Zoom call for a fire-fight,
 you need a way to associate the conference call with an issue, so that your team
 members can join swiftly without requesting a link.
diff --git a/doc/user/profile/active_sessions.md b/doc/user/profile/active_sessions.md
index 8a70799f5a0..f68b11a57ec 100644
--- a/doc/user/profile/active_sessions.md
+++ b/doc/user/profile/active_sessions.md
@@ -2,10 +2,9 @@
 type: howto
 ---
 
-# Active Sessions
+# Active sessions
 
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/17867)
->   in GitLab 10.8.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/17867) in GitLab 10.8.
 
 GitLab lists all devices that have logged into your account. This allows you to
 review the sessions, and revoke any you don't recognize.
@@ -18,8 +17,12 @@ review the sessions, and revoke any you don't recognize.
 
 ![Active sessions list](img/active_sessions_list.png)
 
-CAUTION: **Caution:**
-It is currently possible to have 100 active sessions at once. If the number of active sessions exceed 100, the oldest ones will be deleted.
+## Active sessions limit
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/31611) in GitLab 12.6.
+
+GitLab allows users to have up to 100 active sessions at once. If the number of active sessions
+exceeds 100, the oldest ones are deleted.
 
 <!-- ## Troubleshooting
 
diff --git a/qa/qa/resource/project.rb b/qa/qa/resource/project.rb
index b2b62184837..0928936284a 100644
--- a/qa/qa/resource/project.rb
+++ b/qa/qa/resource/project.rb
@@ -115,8 +115,8 @@ module QA
         post_body
       end
 
-      def runners
-        response = get Runtime::API::Request.new(api_client, api_runners_path).url
+      def runners(tag_list: nil)
+        response = get Runtime::API::Request.new(api_client, "#{api_runners_path}?tag_list=#{tag_list.compact.join(',')}").url
         parse_body(response)
       end
 
diff --git a/qa/qa/resource/runner.rb b/qa/qa/resource/runner.rb
index 102c1ec83f5..d1b4e8f7d54 100644
--- a/qa/qa/resource/runner.rb
+++ b/qa/qa/resource/runner.rb
@@ -41,7 +41,17 @@ module QA
       end
 
       def remove_via_api!
-        @id = project.runners.find { |runner| runner[:description] == name }[:id]
+        runners = project.runners(tag_list: tags)
+        unless runners && !runners.empty?
+          raise "Project #{project.path_with_namespace} has no runners with tags #{tags}."
+        end
+
+        this_runner = runners.find { |runner| runner[:description] == name }
+        unless this_runner
+          raise "Project #{project.path_with_namespace} does not have a runner with a description matching #{name} and tags #{tags}. Runners available: #{runners}"
+        end
+
+        @id = this_runner[:id]
 
         super