Skip to content

CE Upstream - Wednesday

Rémy Coutable requested to merge rc/ce-to-ee-wednesday into master

Resolved conflicts:

UU .gitlab-ci.yml
UU app/assets/javascripts/api.js
UU app/assets/javascripts/boards/boards_bundle.js
AA app/assets/javascripts/boards/filtered_search_boards.js
UU app/assets/javascripts/boards/stores/boards_store.js
UU app/assets/javascripts/confirm_danger_modal.js
UU app/assets/javascripts/gl_dropdown.js
UU app/assets/javascripts/main.js
UU app/views/projects/boards/_show.html.haml
UU app/views/shared/issuable/_search_bar.html.haml
UU config/initializers/omniauth.rb
UU db/schema.rb
UU doc/api/issues.md
UU lib/gitlab/checks/change_access.rb
UU lib/gitlab/git_access.rb
UU spec/javascripts/project_title_spec.js
UU spec/models/user_spec.rb
UU spec/spec_helper.rb

Unresolved conflicts:

UU app/assets/javascripts/environments/components/environment.js
UU app/assets/javascripts/environments/components/environment_item.js
UU app/assets/javascripts/environments/components/environments_table.js
UU app/assets/javascripts/environments/folder/environments_folder_view.js
UU app/assets/javascripts/environments/services/environments_service.js
UU spec/javascripts/environments/environment_item_spec.js
UU spec/javascripts/environments/environment_table_spec.js
UU spec/javascripts/environments/environments_store_spec.js
UU spec/javascripts/environments/mock_data.js

These conflicts are resolved by https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1370 but this MR wasn't ready and merged synchronously with its CE counterpart (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9688), thus we end-up with a painful situation.

Merge request reports