diff options
| -rw-r--r-- | .gitlab/issue_templates/Security Release.md | 36 | ||||
| -rw-r--r-- | Gemfile | 5 | ||||
| -rw-r--r-- | Gemfile.lock | 25 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/georgekoltsov-add-epics-activity-to-group-export.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-trim-extra-periods-merge-error.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/import_export/group_import_export.yml | 6 | ||||
| -rw-r--r-- | spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb | 8 |
8 files changed, 53 insertions, 45 deletions
diff --git a/.gitlab/issue_templates/Security Release.md b/.gitlab/issue_templates/Security Release.md index e6e5d731d96..e5b26bc6fc6 100644 --- a/.gitlab/issue_templates/Security Release.md +++ b/.gitlab/issue_templates/Security Release.md @@ -16,37 +16,27 @@ Set the title to: `Security Release: 12.2.X, 12.1.X, and 12.0.X` * 12.1.X: {release task link} * 12.0.X: {release task link} -## Security Issues: +## Issues in GitLab Security -* {https://gitlab.com/gitlab-org/gitlab/issues link} - -## Security Issues in dev.gitlab.org: - -### CE - -- {https://dev.gitlab.org/gitlab/gitlabhq/issues link} +* {https://gitlab.com/gitlab-org/security/gitlab/issues/ link} | Version | MR | |---------|----| -| 12.2 | {https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/ link} | -| 12.1 | {https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/ link} | -| 12.0 | {https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/ link} | -| master | {https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/ link} | - +| 12.2 | {https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests link} | +| 12.1 | {https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests link} | +| 12.0 | {https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests link} | +| master | {https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests link} | +## Issues in Omnibus-GitLab -### EE - -* {https://dev.gitlab.org/gitlab/gitlabhq/issues/ link} - +* {https://gitlab.com/gitlab-org/security/gitlab/issues/ link} | Version | MR | |---------|----| -| 12.2 | {https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/ link} | -| 12.1 | {https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/ link} | -| 12.0 | {https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/ link} | -| master | {https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/ link} | - +| 12.2 | {https://dev.gitlab.org/gitlab/omnibus-gitlab/merge_requests/ link} | +| 12.1 | {https://dev.gitlab.org/gitlab/omnibus-gitlab/merge_requests/ link} | +| 12.0 | {https://dev.gitlab.org/gitlab/omnibus-gitlab/merge_requests/ link} | +| master | {https://dev.gitlab.org/gitlab/omnibus-gitlab/merge_requests/ link} | ## QA {QA issue link} @@ -54,7 +44,7 @@ Set the title to: `Security Release: 12.2.X, 12.1.X, and 12.0.X` ## Blog post Dev: {https://dev.gitlab.org/gitlab/www-gitlab-com/merge_requests/ link}<br/> -gitlab.com: {https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/ link} +GitLab.com: {https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/ link} ## Email notification {https://gitlab.com/gitlab-com/marketing/general/issues/ link} @@ -132,9 +132,8 @@ gem 'seed-fu', '~> 2.3.7' gem 'elasticsearch-model', '~> 6.1' gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation' gem 'elasticsearch-api', '~> 6.8' -gem 'aws-sdk-core', '~> 3' -gem 'aws-sdk-cloudformation', '~> 1' -gem 'faraday_middleware-aws-sigv4' +gem 'aws-sdk' +gem 'faraday_middleware-aws-signers-v4' # Markdown and HTML processing gem 'html-pipeline', '~> 2.12' diff --git a/Gemfile.lock b/Gemfile.lock index 1061cfebac4..b5aca8658b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,15 +81,13 @@ GEM attr_required (1.0.1) awesome_print (1.8.0) aws-eventstream (1.0.3) - aws-partitions (1.263.0) - aws-sdk-cloudformation (1.29.0) - aws-sdk-core (~> 3, >= 3.71.0) - aws-sigv4 (~> 1.1) - aws-sdk-core (3.88.0) - aws-eventstream (~> 1.0, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) - aws-sigv4 (~> 1.1) + aws-sdk (2.11.374) + aws-sdk-resources (= 2.11.374) + aws-sdk-core (2.11.374) + aws-sigv4 (~> 1.0) jmespath (~> 1.0) + aws-sdk-resources (2.11.374) + aws-sdk-core (= 2.11.374) aws-sigv4 (1.1.0) aws-eventstream (~> 1.0, >= 1.0.2) axiom-types (0.1.1) @@ -278,9 +276,9 @@ GEM faraday (~> 0.8) faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) - faraday_middleware-aws-sigv4 (0.3.0) - aws-sigv4 (~> 1.0) - faraday (>= 0.15) + faraday_middleware-aws-signers-v4 (0.1.7) + aws-sdk-resources (~> 2) + faraday (~> 0.9) faraday_middleware-multi_json (0.0.6) faraday_middleware multi_json @@ -1144,8 +1142,7 @@ DEPENDENCIES atlassian-jwt (~> 0.2.0) attr_encrypted (~> 3.1.0) awesome_print - aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3) + aws-sdk babosa (~> 1.0.2) base32 (~> 0.3.0) batch-loader (~> 1.4.0) @@ -1191,7 +1188,7 @@ DEPENDENCIES escape_utils (~> 1.1) factory_bot_rails (~> 5.1.0) faraday (~> 0.12) - faraday_middleware-aws-sigv4 + faraday_middleware-aws-signers-v4 fast_blank ffaker (~> 2.10) flipper (~> 0.17.1) diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue index a18da7386f6..9085383e230 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue @@ -121,8 +121,14 @@ export default { ); }, mergeError() { + let { mergeError } = this.mr; + + if (mergeError && mergeError.slice(-1) === '.') { + mergeError = mergeError.slice(0, -1); + } + return sprintf(s__('mrWidget|Merge failed: %{mergeError}. Please try again.'), { - mergeError: this.mr.mergeError, + mergeError, }); }, }, diff --git a/changelogs/unreleased/georgekoltsov-add-epics-activity-to-group-export.yml b/changelogs/unreleased/georgekoltsov-add-epics-activity-to-group-export.yml new file mode 100644 index 00000000000..ae7169649f2 --- /dev/null +++ b/changelogs/unreleased/georgekoltsov-add-epics-activity-to-group-export.yml @@ -0,0 +1,5 @@ +--- +title: Add Epics Activity information to Group Export +merge_request: 23613 +author: +type: changed diff --git a/changelogs/unreleased/sh-trim-extra-periods-merge-error.yml b/changelogs/unreleased/sh-trim-extra-periods-merge-error.yml new file mode 100644 index 00000000000..42b1b3b3d8f --- /dev/null +++ b/changelogs/unreleased/sh-trim-extra-periods-merge-error.yml @@ -0,0 +1,5 @@ +--- +title: Trim extra period when merge error displayed +merge_request: 23737 +author: +type: fixed diff --git a/lib/gitlab/import_export/group_import_export.yml b/lib/gitlab/import_export/group_import_export.yml index 049d81f96a4..08f26a4192a 100644 --- a/lib/gitlab/import_export/group_import_export.yml +++ b/lib/gitlab/import_export/group_import_export.yml @@ -34,6 +34,8 @@ methods: - :type notes: - :type + events: + - :action preloads: @@ -44,8 +46,12 @@ ee: group: - epics: - :parent + - events: + - :push_event_payload - notes: - :author + - events: + - :push_event_payload - boards: - :board_assignee - labels: diff --git a/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb b/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb index e40276f74e4..a37fc120b86 100644 --- a/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb +++ b/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb @@ -152,7 +152,7 @@ describe 'Merge request > User merges when pipeline succeeds', :js do before do merge_request.update( merge_user: merge_request.author, - merge_error: 'Something went wrong' + merge_error: 'Something went wrong.' ) refresh end @@ -162,7 +162,7 @@ describe 'Merge request > User merges when pipeline succeeds', :js do wait_for_requests page.within('.mr-section-container') do - expect(page).to have_content('Merge failed: Something went wrong') + expect(page).to have_content('Merge failed: Something went wrong. Please try again.') end end end @@ -171,7 +171,7 @@ describe 'Merge request > User merges when pipeline succeeds', :js do before do merge_request.update( merge_user: merge_request.author, - merge_error: 'Something went wrong' + merge_error: 'Something went wrong.' ) refresh end @@ -181,7 +181,7 @@ describe 'Merge request > User merges when pipeline succeeds', :js do wait_for_requests page.within('.mr-section-container') do - expect(page).to have_content('Merge failed: Something went wrong') + expect(page).to have_content('Merge failed: Something went wrong. Please try again.') end end end |