CE Upstream - Friday (2017-07-14)

Unmerged paths:

both modified:   Gemfile.lock
both modified:   app/models/merge_request.rb
both modified:   app/views/layouts/_broadcast.html.haml
both deleted:    app/views/projects/protected_branches/_dropdown.html.haml
both modified:   app/views/projects/protected_branches/_protected_branch.html.haml
added by us:     app/views/projects/protected_branches/ee/_dropdown.html.haml
both added:      app/views/projects/protected_branches/shared/_dropdown.html.haml
both modified:   app/views/projects/protected_tags/_protected_tag.html.haml
both modified:   app/views/projects/settings/repository/show.html.haml
both modified:   spec/models/user_spec.rb
both modified:   spec/requests/api/settings_spec.rb
both modified:   spec/spec_helper.rb

Untracked files:

app/views/projects/protected_branches/shared/_dropdown.html.haml~HEAD
app/views/projects/protected_branches/shared/_dropdown.html.haml~upstream_master