summaryrefslogtreecommitdiff
path: root/app/services
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2019-02-25 12:53:09 -0800
committerMichael Kozono <mkozono@gmail.com>2019-02-25 12:53:09 -0800
commitcae2c336819d1838507b0c5d21c609710b21ac4f (patch)
tree5bcac1fa18fa97dabc5fe4fd5ddd6297a963f72b /app/services
parentea6945b8113160f2009daa854e612eb009690a2a (diff)
downloadgitlab-ce-cae2c336819d1838507b0c5d21c609710b21ac4f.tar.gz
Revert "Merge branch 'fix-misspellings-app-comments' into 'master'"
This reverts commit 9202bbd129537a698b986e6295d0c783b5a84815, reversing changes made to 4b282e9ce1ae246c4538b3ede18d1380ea778029.
Diffstat (limited to 'app/services')
-rw-r--r--app/services/ci/create_pipeline_service.rb4
-rw-r--r--app/services/ci/pipeline_trigger_service.rb4
-rw-r--r--app/services/git_push_service.rb2
-rw-r--r--app/services/git_tag_push_service.rb2
-rw-r--r--app/services/groups/create_service.rb2
-rw-r--r--app/services/groups/update_service.rb2
-rw-r--r--app/services/system_note_service.rb2
7 files changed, 9 insertions, 9 deletions
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb
index 35a0efcd0a1..c4f69175de3 100644
--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -112,10 +112,10 @@ module Ci
def extra_options(options = {})
# In Ruby 2.4, even when options is empty, f(**options) doesn't work when f
# doesn't have any parameters. We reproduce the Ruby 2.5 behavior by
- # checking explicitly that no arguments are given.
+ # checking explicitely that no arguments are given.
raise ArgumentError if options.any?
- {} # overridden in EE
+ {} # overriden in EE
end
end
end
diff --git a/app/services/ci/pipeline_trigger_service.rb b/app/services/ci/pipeline_trigger_service.rb
index 2dbb7c3917d..4ba3f5fb8ba 100644
--- a/app/services/ci/pipeline_trigger_service.rb
+++ b/app/services/ci/pipeline_trigger_service.rb
@@ -38,11 +38,11 @@ module Ci
end
def create_pipeline_from_job(job)
- # overridden in EE
+ # overriden in EE
end
def job_from_token
- # overridden in EE
+ # overriden in EE
end
def variables
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index f387c749a21..092fd64574d 100644
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -235,6 +235,6 @@ class GitPushService < BaseService
private
def pipeline_options
- {} # to be overridden in EE
+ {} # to be overriden in EE
end
end
diff --git a/app/services/git_tag_push_service.rb b/app/services/git_tag_push_service.rb
index e39b3603c6c..6fef5b3ed1d 100644
--- a/app/services/git_tag_push_service.rb
+++ b/app/services/git_tag_push_service.rb
@@ -61,6 +61,6 @@ class GitTagPushService < BaseService
end
def pipeline_options
- {} # to be overridden in EE
+ {} # to be overriden in EE
end
end
diff --git a/app/services/groups/create_service.rb b/app/services/groups/create_service.rb
index 99ead467f74..55a3b9fa7b1 100644
--- a/app/services/groups/create_service.rb
+++ b/app/services/groups/create_service.rb
@@ -33,7 +33,7 @@ module Groups
private
def after_build_hook(group, params)
- # overridden in EE
+ # overriden in EE
end
def create_chat_team?
diff --git a/app/services/groups/update_service.rb b/app/services/groups/update_service.rb
index 787445180f0..9ff1da270e2 100644
--- a/app/services/groups/update_service.rb
+++ b/app/services/groups/update_service.rb
@@ -31,7 +31,7 @@ module Groups
private
def before_assignment_hook(group, params)
- # overridden in EE
+ # overriden in EE
end
def after_update
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index ea8ac7e4656..ec6c306227b 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -360,7 +360,7 @@ module SystemNoteService
# author - User performing the change
# branch_type - 'source' or 'target'
# old_branch - old branch name
- # new_branch - new branch name
+ # new_branch - new branch nmae
#
# Example Note text:
#