CE Upstream - Monday (!1560) · Merge requests · GitLab.org / GitLab · GitLab

Dmytro Zaporozhets (DZ) requested to merge ce-to-ee into master Apr 03, 2017

Conflicts:

both modified: app/controllers/search_controller.rb
both modified: app/controllers/sessions_controller.rb
both modified: app/models/application_setting.rb
both modified: app/views/admin/application_settings/_form.html.haml
both modified: app/views/layouts/header/_default.html.haml
both modified: db/schema.rb
both modified: lib/api/settings.rb
both modified: spec/models/repository_spec.rb