Release 9.3 RC2 diff
As part of RC2, I am trying to do the following task:
- Merge CE
master
into9-3-stable
till commit https://gitlab.com/gitlab-org/gitlab-ce/commit/b1bf6d88fceb24663bfe4be2d9cc111710d9126b
I did the following command
git merge -Xtheirs b1bf6d88fceb24663bfe4be2d9cc111710d9126b
and then I pushed to 9-3-stable-rc2
branch
and then
git diff --name-only b1bf6d88fceb24663bfe4be2d9cc111710d9126b
Below are the results of the diff. Which means that they were files that were in 9-3-stable
but not master
(b1bf6d88). We need to go through each file to make sure they are security patch changes and or changes to make 9-3-stable
passing
-
app/assets/javascripts/issue_show/issue_title_description.vue -
app/assets/javascripts/notes.js -
app/assets/javascripts/pipelines/components/graph/graph_component.vue -
app/assets/javascripts/users_select.js -
app/assets/stylesheets/framework/sidebar.scss -
app/assets/stylesheets/framework/timeline.scss -
app/models/commit_status.rb -
app/uploaders/gitlab_uploader.rb -
doc/development/README.md -
doc/user/project/issues/img/issues_main_view_numbered.png -
features/project/merge_requests/accept.feature -
lib/gitlab/regex.rb -
spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb -
spec/javascripts/commit/pipelines/mock_data.js -
spec/javascripts/issue_show/issue_title_description_spec.js -
spec/javascripts/notes_spec.js -
spec/migrations/update_retried_for_ci_builds_spec.rb -
spec/support/prometheus_helpers.rb -
spec/support/wait_for_vue_resource.rb -
spec/validators/dynamic_path_validator_spec.rb
Edited by Mike Greiling