• GitLab Bot's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-26 · c96913e8
    GitLab Bot authored
    # Conflicts:
    #	Gemfile.lock
    #	app/assets/javascripts/boards/index.js
    #	app/assets/javascripts/vue_shared/components/reports/issues_list.vue
    #	app/assets/javascripts/vue_shared/components/reports/report_issues.vue
    #	app/helpers/environments_helper.rb
    #	lib/gitlab/prometheus/queries/query_additional_metrics.rb
    #	locale/gitlab.pot
    
    [ci skip]
    c96913e8
This project manages its dependencies using Bundler. Learn more
Gemfile.lock 30.5 KB