Project

General

Profile

Revision 8a1d63a3

Added by David Davis over 7 years ago

Fixes #9716 - Handle 1.8.0-rc1 version format

View differences:

lib/foreman_docker/engine.rb
89 89 
        # apipie API documentation
90 90 
        # Only available in 1.8, otherwise it has to be in the initializer below
91 91 
        if SETTINGS[:version].to_s.include?('develop') ||
92 
           Gem::Version.new(SETTINGS[:version]) >= Gem::Version.new('1.8')
92 
           Gem::Version.new(SETTINGS[:version].notag) >= Gem::Version.new('1.8')
93 93 
          apipie_documented_controllers [
94 94 
            "#{ForemanDocker::Engine.root}/app/controllers/api/v2/*.rb"]
95 95 
        end
......
100 100 
      # this condition is here for compatibility reason to work with Foreman 1.4.x
101 101 
      # Also need to handle the reverse of the 1.8 method above
102 102 
      unless SETTINGS[:version].to_s.include?('develop') ||
103 
             Gem::Version.new(SETTINGS[:version]) >= Gem::Version.new('1.8')
103 
             Gem::Version.new(SETTINGS[:version].notag) >= Gem::Version.new('1.8')
104 104 
        if Apipie.configuration.api_controllers_matcher.is_a?(Array)
105 105 
          Apipie.configuration.api_controllers_matcher <<
106 106 
            "#{ForemanDocker::Engine.root}/app/controllers/api/v2/*.rb"

Also available in: Unified diff