Skip to content

CE upstream: Friday

username-removed-423915 requested to merge ce-to-ee-2017-08-04 into master

It's gonna be fun

both modified:   app/assets/javascripts/dispatcher.js
both added:      app/assets/javascripts/init_issuable_sidebar.js
both added:      app/assets/javascripts/init_legacy_filters.js
both modified:   app/assets/javascripts/main.js
both modified:   app/assets/javascripts/profile/gl_crop.js
both modified:   app/assets/javascripts/project.js
both added:      app/assets/javascripts/projects/project_new.js
both modified:   app/assets/stylesheets/framework/dropdowns.scss
both modified:   app/assets/stylesheets/framework/variables.scss
both modified:   app/models/project.rb
both modified:   app/models/project_wiki.rb
both added:      app/services/ci/pipeline_trigger_service.rb
both modified:   app/services/git_push_service.rb
both modified:   app/services/merge_requests/base_service.rb
both modified:   app/views/groups/issues.html.haml
both modified:   app/views/layouts/nav/_new_admin_sidebar.html.haml
both modified:   app/views/layouts/nav/_new_project_sidebar.html.haml
both modified:   app/views/projects/commits/show.html.haml
both modified:   app/views/projects/tree/_tree_content.html.haml
both modified:   app/views/shared/_clone_panel.html.haml
both modified:   db/schema.rb
both modified:   doc/README.md
both modified:   doc/api/users.md
both modified:   doc/articles/index.md
both modified:   doc/user/project/milestones/index.md
both modified:   lib/banzai/filter/upload_link_filter.rb
both modified:   lib/tasks/gitlab/gitaly.rake
both added:      scripts/gitaly-test-build
both modified:   spec/controllers/projects/imports_controller_spec.rb
both modified:   spec/controllers/projects/settings/integrations_controller_spec.rb
both modified:   spec/factories/boards.rb
both modified:   spec/factories/forked_project_links.rb
both modified:   spec/factories/issues.rb
both modified:   spec/factories/projects.rb
both modified:   spec/factories/protected_branches.rb
both modified:   spec/factories/protected_tags.rb
both modified:   spec/features/boards/boards_spec.rb
both modified:   spec/finders/issues_finder_spec.rb
both modified:   spec/helpers/gitlab_routing_helper_spec.rb
both modified:   spec/helpers/groups_helper_spec.rb
both modified:   spec/lib/banzai/filter/upload_link_filter_spec.rb
both modified:   spec/lib/gitlab/import_export/all_models.yml
both modified:   spec/models/concerns/issuable_spec.rb
both modified:   spec/models/project_spec.rb
both modified:   spec/requests/api/boards_spec.rb
both modified:   spec/requests/api/groups_spec.rb
both modified:   spec/requests/api/v3/groups_spec.rb
both modified:   spec/requests/lfs_http_spec.rb
both modified:   spec/services/boards/issues/list_service_spec.rb
both added:      spec/services/ci/pipeline_trigger_service_spec.rb
deleted by them: spec/services/notification_recipient_service_spec.rb
both modified:   spec/services/wiki_pages/create_service_spec.rb
both modified:   spec/services/wiki_pages/destroy_service_spec.rb
both modified:   spec/services/wiki_pages/update_service_spec.rb
both modified:   spec/spec_helper.rb
both modified:   spec/tasks/gitlab/gitaly_rake_spec.rb

Merge request reports