summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-03-06 20:59:02 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-03-06 20:59:02 +0000
commitd0d16ef2c479c6704b665178f28225cdaeb963e2 (patch)
tree8259086b99f495f1e0982e79e27be0c9358d0e83
parentfc0a2622a00b99a0b20ac7cfd0342879c1e3044a (diff)
downloadgitlab-ce-d0d16ef2c479c6704b665178f28225cdaeb963e2.tar.gz
Add latest changes from gitlab-org/gitlab@15-9-stable-ee
-rw-r--r--doc/development/rake_tasks.md2
-rw-r--r--spec/models/error_tracking/project_error_tracking_setting_spec.rb2
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) }