Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-07-20 18:10:07 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-07-20 18:10:07 +0300
commitb21276806d34b8cc0ec7ac7854ec62f70d408b3c (patch)
tree128fb345bb3d656e4ee862355df4ff2f4274317c /spec/helpers
parenta84766a28a87c0342c6b048f5ea2eab2f3216fcf (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/helpers')
-rw-r--r--spec/helpers/application_settings_helper_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/helpers/application_settings_helper_spec.rb b/spec/helpers/application_settings_helper_spec.rb
index 90bfb2e72e6..654d4116519 100644
--- a/spec/helpers/application_settings_helper_spec.rb
+++ b/spec/helpers/application_settings_helper_spec.rb
@@ -238,7 +238,7 @@ RSpec.describe ApplicationSettingsHelper do
expect(helper.kroki_available_formats).to eq([
{
name: 'kroki_formats_blockdiag',
- label: 'BlockDiag (includes BlockDiag, SeqDiag, ActDiag, NwDiag, PacketDiag and RackDiag)',
+ label: 'BlockDiag (includes BlockDiag, SeqDiag, ActDiag, NwDiag, PacketDiag, and RackDiag)',
value: true
},
{