From d0d16ef2c479c6704b665178f28225cdaeb963e2 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 6 Mar 2023 20:59:02 +0000 Subject: Add latest changes from gitlab-org/gitlab@15-9-stable-ee --- doc/development/rake_tasks.md | 2 +- spec/models/error_tracking/project_error_tracking_setting_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/development/rake_tasks.md b/doc/development/rake_tasks.md index 82e96befd11..cd7f8cba39b 100644 --- a/doc/development/rake_tasks.md +++ b/doc/development/rake_tasks.md @@ -258,7 +258,7 @@ One way to generate the initial list is to run the Rake task `rubocop:todo:gener bundle exec rake rubocop:todo:generate ``` -To generate TODO list for specific RuboCop rules, pass them comma-seperated as +To generate TODO list for specific RuboCop rules, pass them comma-separated as argument to the Rake task: ```shell diff --git a/spec/models/error_tracking/project_error_tracking_setting_spec.rb b/spec/models/error_tracking/project_error_tracking_setting_spec.rb index d48f6f7f3e4..26795c0ea7f 100644 --- a/spec/models/error_tracking/project_error_tracking_setting_spec.rb +++ b/spec/models/error_tracking/project_error_tracking_setting_spec.rb @@ -302,7 +302,7 @@ RSpec.describe ErrorTracking::ProjectErrorTrackingSetting do it { expect(result[:issue].gitlab_commit_path).to eq(nil) } end - context 'when repo commit matches first relase version' do + context 'when repo commit matches first release version' do let(:commit) { instance_double(Commit, id: commit_id) } let(:repository) { instance_double(Repository, commit: commit) } -- cgit v1.2.1