1. 26 Jun, 2018 1 commit
    • GitLab Bot's avatar
      Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-26 · ef42202d
      GitLab Bot authored
      # Conflicts:
      #	.gitignore
      #	app/assets/javascripts/boards/components/board_sidebar.js
      #	app/assets/javascripts/boards/components/sidebar/remove_issue.vue
      #	app/workers/all_queues.yml
      #	config/sidekiq_queues.yml
      #	doc/integration/saml.md
      #	spec/models/merge_request_spec.rb
      
      [ci skip]
      ef42202d
  2. 25 Jun, 2018 39 commits