CE upstream
Monday merge
Conflicts:
both added: app/assets/javascripts/commons/jquery.js
added by us: app/assets/javascripts/cycle_analytics/svg/icon_branch.js
added by us: app/assets/javascripts/cycle_analytics/svg/icon_build_status.js
added by us: app/assets/javascripts/cycle_analytics/svg/icon_commit.js
both modified: app/assets/javascripts/environments/components/environment.js
both modified: app/assets/javascripts/environments/components/environment_item.js
both modified: app/assets/javascripts/environments/components/environments_table.js
both modified: app/assets/javascripts/environments/folder/environments_folder_view.js
added by them: app/assets/javascripts/environments/stores/environments_store.js
both modified: app/assets/javascripts/main.js
added by them: app/assets/javascripts/protected_branches/protected_branch_access_dropdown.js
added by them: app/assets/javascripts/protected_branches/protected_branch_create.js
added by them: app/assets/javascripts/protected_branches/protected_branch_edit.js
added by us: app/assets/javascripts/vue_pipelines_index/status.js
both modified: app/models/project.rb
both modified: app/policies/group_policy.rb
both modified: app/views/layouts/nav/_project.html.haml
both modified: app/views/projects/commits/_head.html.haml
deleted by them: app/views/projects/graphs/_head.html.haml
both modified: app/views/projects/merge_requests/widget/open/_accept.html.haml
both modified: config/webpack.config.js
both modified: doc/api/groups.md
both modified: doc/api/v3_to_v4.md
both modified: lib/api/api.rb
both modified: lib/api/entities.rb
both modified: lib/api/v3/entities.rb
both modified: lib/api/v3/groups.rb
both added: lib/api/v3/settings.rb
both added: spec/features/projects/milestones/milestone_spec.rb
added by them: spec/javascripts/environments/environment_table_spec.js
added by them: spec/javascripts/environments/environments_store_spec.js
added by us: spec/javascripts/lib/utils/text_utility_spec.js
added by us: spec/javascripts/user_callout_spec.js
both modified: spec/requests/api/v3/groups_spec.rb
both added: spec/requests/api/v3/settings_spec.rb
To resolve
-
both added: app/assets/javascripts/commons/jquery.js -
added by us: app/assets/javascripts/cycle_analytics/svg/icon_branch.js -
added by us: app/assets/javascripts/cycle_analytics/svg/icon_build_status.js -
added by us: app/assets/javascripts/cycle_analytics/svg/icon_commit.js -
both modified: app/assets/javascripts/environments/components/environment.js -
both modified: app/assets/javascripts/environments/components/environment_item.js -
both modified: app/assets/javascripts/environments/components/environments_table.js -
both modified: app/assets/javascripts/environments/folder/environments_folder_view.js -
added by them: app/assets/javascripts/environments/stores/environments_store.js -
both modified: app/assets/javascripts/main.js -
added by them: app/assets/javascripts/protected_branches/protected_branch_access_dropdown.js -
added by them: app/assets/javascripts/protected_branches/protected_branch_create.js -
added by them: app/assets/javascripts/protected_branches/protected_branch_edit.js -
added by us: app/assets/javascripts/vue_pipelines_index/status.js -
both modified: app/models/project.rb -
both modified: app/policies/group_policy.rb -
both modified: app/views/layouts/nav/_project.html.haml -
both modified: app/views/projects/commits/_head.html.haml -
deleted by them: app/views/projects/graphs/_head.html.haml -
both modified: app/views/projects/merge_requests/widget/open/_accept.html.haml -
both modified: config/webpack.config.js -
both modified: doc/api/groups.md -
both modified: doc/api/v3_to_v4.md -
both modified: lib/api/api.rb -
both modified: lib/api/entities.rb -
both modified: lib/api/v3/entities.rb -
both modified: lib/api/v3/groups.rb -
both added: lib/api/v3/settings.rb -
both added: spec/features/projects/milestones/milestone_spec.rb -
added by them: spec/javascripts/environments/environment_table_spec.js -
added by them: spec/javascripts/environments/environments_store_spec.js -
added by us: spec/javascripts/lib/utils/text_utility_spec.js -
added by us: spec/javascripts/user_callout_spec.js -
both modified: spec/requests/api/v3/groups_spec.rb -
both added: spec/requests/api/v3/settings_spec.rb