Resolve merge conflicts

Author: Rynaard Burger

.rubocop.yml

@@ -48,6 +48,21 @@ Style/AsciiComments:
 # which would be incorrect and not what we want
 Style/StringConcatenation:
   Enabled: false
+  
+# This rule was enforced after upgrading Rubocop from `1.22.1` to `1.50.2`. We are disabling this rule for the
+# time being so that we don't see any unexpected behavior when running Release Toolkit actions that could be
+# changed by this rule. See https://github.com/wordpress-mobile/release-toolkit/pull/464#pullrequestreview-1396569629
+# for more discussion
+Style/FetchEnvVar:
+  Enabled: false
+  
+########## Gemspec Rules
+
+# This was turned on by default after updating Rubocop to `1.50.2`. We want to disable this for now because
+# all the gem publishing is done within CI and doesn't allow for user input such as an MFA code. See
+# https://github.com/wordpress-mobile/release-toolkit/pull/464#pullrequestreview-1396569313 for more discussion
+Gemspec/RequireMFA:
+  Enabled: false
 
 ########## Metrics / Max Lengths Rules
 

CHANGELOG.md

@@ -10,6 +10,7 @@ _None_
 
 ### New Features
 
+- Add `ios_get_build_number` action to get the current build number from an `xcconfig` file. [#458]
 - Add new `android_generate_apk_from_aab` action to generate an APK from a given AAB.
 
 ### Bug Fixes
@@ -21,6 +22,11 @@ _None_
 - Add "Mobile Secrets" to `configure_update` current branch message to clarify which repo it's referring to. [#455]
 - `buildkite_trigger_build` now prints the web URL of the newly scheduled build, to allow you to easily open it via cmd-click. [#460]
 - Add the branch information to the 'This is not a release branch' error that's thrown from complete code freeze lane. [#461]
+- Update `octokit` to `5.6.1` This is a major version bump from version `4.18`, but is not a breaking change for the Release Toolkit because it doesn't change any public APIs for clients. [#464]
+- Update `danger` to `9.3.0`. This is an internal-only change and is not a breaking change for clients. [#464]
+- Replace `rspec-buildkite-analytics` with `buildkite-test_collector` (Buildkite renamed the gem) and update it to `2.2.0`. This is another internal-only change and is not a breaking change for clients. [#465]
+- Adds `ignore_pipeline_branch_filters=true` parameter to the API call triggering a Buildkite build [#468]
+- Replace all instances of `is_string` with `type` [#469]
 
 ## 7.0.0
 

Dangerfile

@@ -32,7 +32,7 @@ end
 
 # Lint with Rubocop and report violations inline in GitHub
 github.dismiss_out_of_range_messages # This way, fixed violations should go
-renaming_map = (git.renamed_files || []).map { |e| [e[:before], e[:after]] }.to_h # when files are renamed, git.modified_files contains old name, not new one, so we need to do the convertion
+renaming_map = (git.renamed_files || []).to_h { |e| [e[:before], e[:after]] } # when files are renamed, git.modified_files contains old name, not new one, so we need to do the convertion
 rubocop.lint(
   files: git.added_files + (git.modified_files.map { |f| renaming_map[f] || f }) - git.deleted_files,
   inline_comment: true,

Gemfile

@@ -2,11 +2,11 @@ source('https://rubygems.org')
 
 gemspec
 
-gem 'danger', '~> 8.0'
+gem 'danger', '~> 9.3'
 gem 'danger-rubocop', '~> 0.6'
 
 gem 'codecov', require: false
 gem 'webmock', require: false
 gem 'yard'
 
-gem 'rspec-buildkite-analytics', '~> 0.8.1'
+gem 'buildkite-test_collector', '~> 2.2'