Automatic merge of gitlab-org/gitlab-ce master

.gitlab-ci.yml

@@ -555,12 +555,12 @@ setup-test-env:
   cache: {}
   dependencies: []
   environment: &review-environment
-    name: review/mr-${CI_MERGE_REQUEST_IID}
-    url: https://gitlab-mr-${CI_MERGE_REQUEST_IID}.${REVIEW_APPS_DOMAIN}
+    name: review/${CI_COMMIT_REF_NAME}
+    url: https://gitlab-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}
   only:
     refs:
-      - merge_requests@gitlab-org/gitlab-ce
-      - merge_requests@gitlab-org/gitlab-ee
+      - branches@gitlab-org/gitlab-ce
+      - branches@gitlab-org/gitlab-ee
     kubernetes: active
   except:
     refs:
@@ -1121,8 +1121,8 @@ review-deploy:
   allow_failure: true
   variables:
     GIT_DEPTH: "1"
-    HOST_SUFFIX: "mr-${CI_MERGE_REQUEST_IID}"
-    DOMAIN: "-mr-${CI_MERGE_REQUEST_IID}.${REVIEW_APPS_DOMAIN}"
+    HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
+    DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
     GITLAB_HELM_CHART_REF: "master"
     API_TOKEN: "${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}"
   environment:

changelogs/unreleased/api-tags-search.yml

+---
+title: 'API: Support searching for tags'
+merge_request: 24385
+author: Robert Schilling
+type: added

doc/api/tags.md

@@ -17,6 +17,9 @@ Parameters:
 | `id` | integer/string| yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user|
 | `order_by` | string | no | Return tags ordered by `name` or `updated` fields. Default is `updated` |
 | `sort` | string | no | Return tags sorted in `asc` or `desc` order. Default is `desc` |
+| `search` | string | no | Return list of tags matching the search criteria |
+
+> Support for `search` was [introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/54401) in GitLab 11.8.
 
 ```json
 [

doc/development/testing_guide/review_apps.md

@@ -74,27 +74,27 @@ Note that both jobs first wait for the `review-deploy` job to be finished.
 ### Run a Rails console?
 
 1. [Filter Workloads by your Review App slug](https://console.cloud.google.com/kubernetes/workload?project=gitlab-review-apps)
-  , e.g. `review-mr-24388-314997`.
-1. Find and open the `task-runner` Deployment, e.g. `review-mr-24388-314997-task-runner`.
-1. Click on the Pod in the "Managed pods" section, e.g. `review-mr-24388-314997-task-runner-d5455cc8-2lsvz`.
+  , e.g. `review-29951-issu-id2qax`.
+1. Find and open the `task-runner` Deployment, e.g. `review-29951-issu-id2qax-task-runner`.
+1. Click on the Pod in the "Managed pods" section, e.g. `review-29951-issu-id2qax-task-runner-d5455cc8-2lsvz`.
 1. Click on the `KUBECTL` dropdown, then `Exec` -> `task-runner`.
 1. Replace `-c task-runner -- ls` with `-- /srv/gitlab/bin/rails c` from the
   default command or
-  - Run `kubectl exec --namespace review-apps-ce -it review-mr-24388-314997-task-runner-d5455cc8-2lsvz -- /srv/gitlab/bin/rails c`
+  - Run `kubectl exec --namespace review-apps-ce -it review-29951-issu-id2qax-task-runner-d5455cc8-2lsvz -- /srv/gitlab/bin/rails c`
     and
   - Replace `review-apps-ce` with `review-apps-ee` if the Review App
     is running EE, and
-  - Replace `review-mr-24388-314997-task-runner-d5455cc8-2lsvz`
+  - Replace `review-29951-issu-id2qax-task-runner-d5455cc8-2lsvz`
     with your Pod's name.
 
 ### Dig into a Pod's logs?
 
 1. [Filter Workloads by your Review App slug](https://console.cloud.google.com/kubernetes/workload?project=gitlab-review-apps)
-  , e.g. `review-mr-24388-314997`.
+  , e.g. `review-1979-1-mul-dnvlhv`.
 1. Find and open the `migrations` Deployment, e.g.
-  `review-mr-24388-314997-migrations.1`.
+  `review-1979-1-mul-dnvlhv-migrations.1`.
 1. Click on the Pod in the "Managed pods" section, e.g.
-  `review-mr-24388-314997-migrations.1-nqwtx`.
+  `review-1979-1-mul-dnvlhv-migrations.1-nqwtx`.
 1. Click on the `Container logs` link.
 
 ## Frequently Asked Questions

lib/api/tags.rb

@@ -20,12 +20,15 @@ module API
                         desc: 'Return tags sorted in updated by `asc` or `desc` order.'
         optional :order_by, type: String, values: %w[name updated], default: 'updated',
                             desc: 'Return tags ordered by `name` or `updated` fields.'
+        optional :search, type: String, desc: 'Return list of tags matching the search criteria'
         use :pagination
       end
       get ':id/repository/tags' do
-        tags = ::Kaminari.paginate_array(::TagsFinder.new(user_project.repository, sort: "#{params[:order_by]}_#{params[:sort]}").execute)
+        tags = ::TagsFinder.new(user_project.repository,
+                                sort: "#{params[:order_by]}_#{params[:sort]}",
+                                search: params[:search]).execute
 
-        present paginate(tags), with: Entities::Tag, project: user_project
+        present paginate(::Kaminari.paginate_array(tags)), with: Entities::Tag, project: user_project
       end
 
       desc 'Get a single repository tag' do

spec/requests/api/tags_spec.rb

@@ -54,6 +54,18 @@ describe API::Tags do
       end
     end
 
+    context 'searching' do
+      it 'only returns searched tags' do
+        get api("#{route}", user), params: { search: 'v1.1.0' }
+
+        expect(response).to have_gitlab_http_status(200)
+        expect(response).to include_pagination_headers
+        expect(json_response).to be_an Array
+        expect(json_response.size).to eq(1)
+        expect(json_response[0]['name']).to eq('v1.1.0')
+      end
+    end
+
     shared_examples_for 'repository tags' do
       it 'returns the repository tags' do
         get api(route, current_user)