CE upstream: Thursday

• both modified: Gemfile
• both modified: Gemfile.lock
• both modified: app/assets/javascripts/boards/services/board_service.js
• both modified: app/presenters/merge_request_presenter.rb
• both modified: spec/presenters/merge_request_presenter_spec.rb
• both modified: spec/serializers/merge_request_entity_spec.rb
• both modified: spec/support/redis/redis_shared_examples.rb