Skip to content

CE upstream: Thursday

Nick Thomas requested to merge ce-to-ee into master 
both modified:   Gemfile
both modified:   app/assets/javascripts/dispatcher.js
both modified:   app/assets/javascripts/filtered_search/dropdown_utils.js
both modified:   app/assets/javascripts/filtered_search/filtered_search_bundle.js
both modified:   app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
both modified:   app/assets/javascripts/filtered_search/filtered_search_manager.js
both modified:   app/assets/stylesheets/pages/environments.scss
both modified:   app/controllers/projects/boards/issues_controller.rb
both modified:   app/controllers/projects/deploy_keys_controller.rb
both modified:   app/controllers/projects/environments_controller.rb
both modified:   app/controllers/projects/protected_branches_controller.rb
both added:      app/controllers/projects/settings/repository_controller.rb
both modified:   app/models/issue.rb
both modified:   app/models/project.rb
both modified:   app/services/git_push_service.rb
deleted by them: app/views/layouts/nav/_project_settings.html.haml
both added:      app/views/projects/deploy_keys/_index.html.haml
both modified:   app/views/projects/protected_branches/_protected_branch.html.haml
both added:      app/views/projects/settings/repository/show.html.haml
both modified:   config/routes.rb
both modified:   config/routes/project.rb
both modified:   config/sidekiq_queues.yml
both modified:   db/schema.rb
both modified:   doc/api/issues.md
both modified:   doc/api/merge_requests.md
both modified:   doc/api/users.md
both modified:   doc/api/v3_to_v4.md
both modified:   features/project/active_tab.feature
both modified:   features/steps/project/active_tab.rb
both modified:   lib/api/entities.rb
both modified:   lib/api/merge_requests.rb
both modified:   lib/tasks/gitlab/info.rake
both modified:   spec/controllers/projects/environments_controller_spec.rb
both modified:   spec/features/issues/filtered_search/dropdown_assignee_spec.rb
both modified:   spec/features/issues/filtered_search/dropdown_milestone_spec.rb
both added:      spec/features/issues/filtered_search/visual_tokens_spec.rb
both modified:   spec/features/security/project/internal_access_spec.rb
both modified:   spec/features/security/project/private_access_spec.rb
both modified:   spec/features/security/project/public_access_spec.rb
both modified:   spec/models/environment_spec.rb
both modified:   spec/requests/api/issues_spec.rb
both modified:   spec/requests/api/merge_requests_spec.rb
both modified:   spec/requests/api/users_spec.rb
both modified:   spec/requests/api/v3/merge_request_diffs_spec.rb
both modified:   spec/services/merge_requests/refresh_service_spec.rb
both modified:   spec/support/filtered_search_helpers.rb

Merge request reports