Skip to content

CE upstream: Thursday

Nick Thomas requested to merge nt/ce-to-ee-thursday into master
	both modified:   db/schema.rb

# Other
	both modified:   app/assets/javascripts/diff_notes/components/resolve_btn.js
	both modified:   app/assets/javascripts/dropzone_input.js
	both modified:   app/models/identity.rb
	both added:      app/services/commits/create_service.rb
	both modified:   app/views/layouts/nav/_project.html.haml
	both modified:   app/views/projects/merge_requests/widget/_open.html.haml
	both modified:   config/webpack.config.js
	both modified:   doc/api/users.md
	both modified:   lib/api/users.rb
	both modified:   spec/features/merge_requests/widget_spec.rb
	both modified:   spec/requests/api/internal_spec.rb

# Filtered search
	both modified:   app/assets/javascripts/filtered_search/filtered_search_dropdown.js
	both modified:   app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
	both modified:   app/assets/javascripts/filtered_search/filtered_search_manager.js

# search
	both modified:   app/services/search/global_service.rb
	both added:      app/services/search/group_service.rb
	both added:      spec/services/search/group_service_spec.rb

# Activity service
	both added:      app/services/users/activity_service.rb
	both added:      app/workers/schedule_update_user_activity_worker.rb
	both added:      app/workers/update_user_activity_worker.rb
	both modified:   config/sidekiq_queues.yml
	both added:      db/migrate/20161007073613_create_user_activities.rb
	both added:      db/post_migrate/20161128170531_drop_user_activities_table.rb
	both added:      spec/services/users/activity_service_spec.rb

# Usage ping
	both modified:   app/assets/javascripts/dispatcher.js
	both modified:   app/models/application_setting.rb
	both modified:   app/views/admin/application_settings/_form.html.haml
	both added:      app/views/admin/cohorts/_usage_ping.html.haml
	both modified:   config/routes/admin.rb
	both added:      db/migrate/20160713222618_add_usage_ping_to_application_settings.rb
	both added:      doc/user/admin_area/settings/usage_statistics.md
	both added:      lib/gitlab/usage_data.rb
	both added:      spec/lib/gitlab/usage_data_spec.rb
	both added:      spec/workers/gitlab_usage_ping_worker_spec.rb

Merge request reports