• Jose Ivan Vargas's avatar
    Merge branch 'master' into 'jivanvl-add-text-variable-input-from-variables' · 594cf561
    Jose Ivan Vargas authored
    # Conflicts:
    #   app/assets/javascripts/monitoring/stores/actions.js
    #   app/assets/javascripts/monitoring/stores/mutation_types.js
    #   app/assets/javascripts/monitoring/stores/mutations.js
    #   app/assets/javascripts/monitoring/stores/state.js
    #   app/assets/javascripts/monitoring/utils.js
    #   changelogs/unreleased/jivanvl-use-metrics-url-query-param.yml
    #   spec/frontend/monitoring/store/mutations_spec.js
    594cf561
dashboard.vue 20.4 KB