summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytse@gitlab.com>2015-12-28 17:08:15 +0100
committerSytse Sijbrandij <sytse@gitlab.com>2015-12-28 17:08:15 +0100
commit4465e2eca0162a27142a401e6a46aa78add9177f (patch)
treec28b93cf968854c29dfdd7215513752073bee1fc
parent17ef4cdff96991727fd2d205d1871b99272a55b9 (diff)
downloadgitlab-ce-fix-spelling-mistake.tar.gz
Fix spelling mistake, thanks Connor.fix-spelling-mistake
-rw-r--r--app/views/groups/edit.html.haml2
-rw-r--r--spec/lib/ci/gitlab_ci_yaml_processor_spec.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index 8daac585960..1dea77c2e96 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -31,7 +31,7 @@
.col-sm-10
.checkbox
= f.check_box :public
- %span.descr Make this group public (even if there is no any public project inside this group)
+ %span.descr Make this group public (even if there are no public projects inside this group)
.form-actions
= f.submit 'Save group', class: "btn btn-save"
diff --git a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
index c90133fbf03..d15100fc6d8 100644
--- a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+++ b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
module Ci
describe GitlabCiYamlProcessor, lib: true do
let(:path) { 'path' }
-
+
describe "#builds_for_ref" do
let(:type) { 'test' }
@@ -29,7 +29,7 @@ module Ci
when: "on_success"
})
end
-
+
describe :only do
it "does not return builds if only has another branch" do
config = YAML.dump({
@@ -517,7 +517,7 @@ module Ci
end.to raise_error(GitlabCiYamlProcessor::ValidationError, "Unknown parameter: extra")
end
- it "returns errors if there is no any jobs defined" do
+ it "returns errors if there are no jobs defined" do
config = YAML.dump({ before_script: ["bundle update"] })
expect do
GitlabCiYamlProcessor.new(config, path)