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

Fix broken master api_variables test

See merge request gitlab-org/gitlab-ce!24165

spec/models/project_spec.rb

@@ -3534,7 +3534,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