• GitLab Bot's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-12-14 · 1e2cacf0
    GitLab Bot authored
    # Conflicts:
    #	app/assets/images/icons.json
    #	app/assets/images/icons.svg
    #	app/assets/javascripts/dispatcher.js
    #	app/assets/javascripts/project_find_file.js
    #	app/assets/javascripts/render_gfm.js
    #	app/assets/javascripts/search.js
    #	app/assets/javascripts/search_autocomplete.js
    #	app/assets/stylesheets/framework/variables.scss
    #	app/assets/stylesheets/pages/boards.scss
    #	app/assets/stylesheets/pages/merge_requests.scss
    #	app/controllers/admin/groups_controller.rb
    #	app/presenters/group_member_presenter.rb
    #	app/presenters/member_presenter.rb
    #	app/presenters/project_member_presenter.rb
    #	app/views/projects/clusters/index.html.haml
    #	app/views/projects/merge_requests/_mr_title.html.haml
    #	app/views/shared/members/_member.html.haml
    #	app/workers/all_queues.yml
    #	lib/gitlab/sidekiq_config.rb
    #	spec/javascripts/search_autocomplete_spec.js
    #	spec/models/ci/build_spec.rb
    #	spec/models/merge_request_spec.rb
    
    [ci skip]
    1e2cacf0
issues_helper.rb 4.31 KB