CE upstream
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: .flayignore
both modified: app/models/project.rb
both modified: app/models/user.rb
both modified: app/policies/project_policy.rb
both added: app/views/admin/users/_access_levels.html.haml
both modified: app/views/layouts/nav/_project_settings.html.haml
both modified: config/initializers/1_settings.rb
both modified: config/sidekiq_queues.yml
both added: db/migrate/20151215132013_add_pages_size_to_application_settings.rb
both added: db/migrate/20160210105555_create_pages_domain.rb
both modified: db/schema.rb
both modified: doc/README.md
both added: doc/api/v3_to_v4.md
both modified: features/project/active_tab.feature
both modified: lib/api/api.rb
both modified: lib/api/merge_requests.rb
both modified: lib/api/settings.rb
both added: lib/api/v3/issues.rb
both added: lib/api/v3/merge_requests.rb
both modified: lib/gitlab/visibility_level.rb
both modified: lib/tasks/gitlab/backup.rake
both modified: spec/models/project_spec.rb
both modified: spec/models/user_spec.rb
both modified: spec/policies/project_policy_spec.rb
both added: spec/policies/project_snippet_policy_spec.rb
both added: spec/requests/api/v3/merge_requests_spec.rb