Skip to content
  • Pawel Chojnacki's avatar
    Squashed commit of the following: · a1673a1b6f60
    Pawel Chojnacki authored
    commit 22e1cb8f4b98f71d21026f69aa3e68d79946d6ae
    Merge: 766a42a9639 e966c6aea25
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Fri Feb 23 21:30:46 2018 +0100
    
        Merge remote-tracking branch 'upstream/master' into 38783-add-cluster-metrics.yml
    
        # Conflicts:
        #	app/controllers/projects/prometheus/metrics_controller.rb
        #	app/controllers/projects/prometheus_controller.rb
        #	app/models/project_services/prometheus_service.rb
        #	lib/gitlab/prometheus/queries/query_additional_metrics.rb
        #	spec/controllers/projects/prometheus/metrics_controller_spec.rb
        #	spec/models/project_services/prometheus_service_spec.rb
    
    commit 766a42a96393f502d439c1f0beb0b6cfb2c228d4
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Fri Feb 23 17:58:45 2018 +0100
    
        Move prometheus adapter to app/models/concerns
    
    commit ca84eed49811cf3064a2e5ea611af1c947c590d7
    Merge: 66702099586 cb504cedc2a
    Author: Pawel Chojnacki <pawel@chojnacki.ws>
    Date:   Fri Feb 23 15:36:03 2018 +01...
    a1673a1b6f60