Merge branch 'mk/fix-broken-master-api-variables-ee' into 'master'

[EE] Fix broken master api_variables test

Closes #9048

See merge request gitlab-org/gitlab-ee!9038

spec/models/project_spec.rb

@@ -3815,7 +3815,9 @@ describe Project do
     end
 
     it 'contains a URL variable for every supported API version' do
-      supported_versions = API::API.versions.select do |version|
+      # Ensure future API versions have proper variables defined. We're not doing this for v3.
+      supported_versions = API::API.versions - ['v3']
+      supported_versions = supported_versions.select do |version|
         API::API.routes.select { |route| route.version == version }.many?
       end