Commit 9202bbd1 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'fix-misspellings-app-comments' into 'master'

Fix misspellings in app/spec comments

See merge request gitlab-org/gitlab-ce!25517
parents 4b282e9c bbf479a3
...@@ -11,7 +11,7 @@ export const requestReleases = ({ commit }) => commit(types.REQUEST_RELEASES); ...@@ -11,7 +11,7 @@ export const requestReleases = ({ commit }) => commit(types.REQUEST_RELEASES);
/** /**
* Fetches the main endpoint. * Fetches the main endpoint.
* Will dispatch requestNamespace action before starting the request. * Will dispatch requestNamespace action before starting the request.
* Will dispatch receiveNamespaceSuccess if the request is successfull * Will dispatch receiveNamespaceSuccess if the request is successful
* Will dispatch receiveNamesapceError if the request returns an error * Will dispatch receiveNamesapceError if the request returns an error
* *
* @param {String} projectId * @param {String} projectId
......
...@@ -24,7 +24,7 @@ class Clusters::ClustersController < Clusters::BaseController ...@@ -24,7 +24,7 @@ class Clusters::ClustersController < Clusters::BaseController
# Note: We are paginating through an array here but this should OK as: # Note: We are paginating through an array here but this should OK as:
# #
# In CE, we can have a maximum group nesting depth of 21, so including # In CE, we can have a maximum group nesting depth of 21, so including
# project cluster, we can have max 22 clusters for a group hierachy. # project cluster, we can have max 22 clusters for a group hierarchy.
# In EE (Premium) we can have any number, as multiple clusters are # In EE (Premium) we can have any number, as multiple clusters are
# supported, but the number of clusters are fairly low currently. # supported, but the number of clusters are fairly low currently.
# #
......
...@@ -123,7 +123,7 @@ module LfsRequest ...@@ -123,7 +123,7 @@ module LfsRequest
(authentication_abilities || []).include?(capability) (authentication_abilities || []).include?(capability)
end end
# Overriden in EE # Overridden in EE
def limit_exceeded? def limit_exceeded?
false false
end end
......
...@@ -134,7 +134,7 @@ class GroupDescendantsFinder ...@@ -134,7 +134,7 @@ class GroupDescendantsFinder
def subgroups def subgroups
return Group.none unless Group.supports_nested_objects? return Group.none unless Group.supports_nested_objects?
# When filtering subgroups, we want to find all matches withing the tree of # When filtering subgroups, we want to find all matches within the tree of
# descendants to show to the user # descendants to show to the user
groups = if params[:filter] groups = if params[:filter]
subgroups_matching_filter subgroups_matching_filter
......
...@@ -13,7 +13,7 @@ module CountHelper ...@@ -13,7 +13,7 @@ module CountHelper
# memberships, and deducting 1 for each root of the fork network. # memberships, and deducting 1 for each root of the fork network.
# This might be inacurate as the root of the fork network might have been deleted. # This might be inacurate as the root of the fork network might have been deleted.
# #
# This makes querying this information a lot more effecient and it should be # This makes querying this information a lot more efficient and it should be
# accurate enough for the instance wide statistics # accurate enough for the instance wide statistics
def approximate_fork_count_with_delimiters(count_data) def approximate_fork_count_with_delimiters(count_data)
fork_network_count = count_data[ForkNetwork] fork_network_count = count_data[ForkNetwork]
......
...@@ -18,7 +18,7 @@ module Ci ...@@ -18,7 +18,7 @@ module Ci
FailedToPersistDataError = Class.new(StandardError) FailedToPersistDataError = Class.new(StandardError)
# Note: The ordering of this enum is related to the precedence of persist store. # Note: The ordering of this enum is related to the precedence of persist store.
# The bottom item takes the higest precedence, and the top item takes the lowest precedence. # The bottom item takes the highest precedence, and the top item takes the lowest precedence.
enum data_store: { enum data_store: {
redis: 1, redis: 1,
database: 2, database: 2,
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
# it is difficult to accomplish it. # it is difficult to accomplish it.
# #
# This module defines a format to use `delete_all` and delete associated external data. # This module defines a format to use `delete_all` and delete associated external data.
# Here is an exmaple # Here is an example
# #
# Situation # Situation
# - `Project` has many `Ci::BuildTraceChunk` through `Ci::Build` # - `Project` has many `Ci::BuildTraceChunk` through `Ci::Build`
......
...@@ -4,7 +4,7 @@ module IidRoutes ...@@ -4,7 +4,7 @@ module IidRoutes
## ##
# This automagically enforces all related routes to use `iid` instead of `id` # This automagically enforces all related routes to use `iid` instead of `id`
# If you want to use `iid` for some routes and `id` for other routes, this module should not to be included, # If you want to use `iid` for some routes and `id` for other routes, this module should not to be included,
# instead you should define `iid` or `id` explictly at each route generators. e.g. pipeline_path(project.id, pipeline.iid) # instead you should define `iid` or `id` explicitly at each route generators. e.g. pipeline_path(project.id, pipeline.iid)
def to_param def to_param
iid.to_s iid.to_s
end end
......
...@@ -153,7 +153,7 @@ class NotificationRecipient ...@@ -153,7 +153,7 @@ class NotificationRecipient
user.global_notification_setting user.global_notification_setting
end end
# Returns the notificaton_setting of the lowest group in hierarchy with non global level # Returns the notification_setting of the lowest group in hierarchy with non global level
def closest_non_global_group_notification_settting def closest_non_global_group_notification_settting
return unless @group return unless @group
return if indexed_group_notification_settings.empty? return if indexed_group_notification_settings.empty?
......
...@@ -248,10 +248,10 @@ class Project < ActiveRecord::Base ...@@ -248,10 +248,10 @@ class Project < ActiveRecord::Base
has_many :container_repositories, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent has_many :container_repositories, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
has_many :commit_statuses has_many :commit_statuses
# The relation :all_pipelines is intented to be used when we want to get the # The relation :all_pipelines is intended to be used when we want to get the
# whole list of pipelines associated to the project # whole list of pipelines associated to the project
has_many :all_pipelines, class_name: 'Ci::Pipeline', inverse_of: :project has_many :all_pipelines, class_name: 'Ci::Pipeline', inverse_of: :project
# The relation :ci_pipelines is intented to be used when we want to get only # The relation :ci_pipelines is intended to be used when we want to get only
# those pipeline which are directly related to CI. There are # those pipeline which are directly related to CI. There are
# other pipelines, like webide ones, that we won't retrieve # other pipelines, like webide ones, that we won't retrieve
# if we use this relation. # if we use this relation.
...@@ -1206,7 +1206,7 @@ class Project < ActiveRecord::Base ...@@ -1206,7 +1206,7 @@ class Project < ActiveRecord::Base
"#{web_url}.git" "#{web_url}.git"
end end
# Is overriden in EE # Is overridden in EE
def lfs_http_url_to_repo(_) def lfs_http_url_to_repo(_)
http_url_to_repo http_url_to_repo
end end
......
...@@ -112,10 +112,10 @@ module Ci ...@@ -112,10 +112,10 @@ module Ci
def extra_options(options = {}) def extra_options(options = {})
# In Ruby 2.4, even when options is empty, f(**options) doesn't work when f # 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 # doesn't have any parameters. We reproduce the Ruby 2.5 behavior by
# checking explicitely that no arguments are given. # checking explicitly that no arguments are given.
raise ArgumentError if options.any? raise ArgumentError if options.any?
{} # overriden in EE {} # overridden in EE
end end
end end
end end
...@@ -38,11 +38,11 @@ module Ci ...@@ -38,11 +38,11 @@ module Ci
end end
def create_pipeline_from_job(job) def create_pipeline_from_job(job)
# overriden in EE # overridden in EE
end end
def job_from_token def job_from_token
# overriden in EE # overridden in EE
end end
def variables def variables
......
...@@ -235,6 +235,6 @@ class GitPushService < BaseService ...@@ -235,6 +235,6 @@ class GitPushService < BaseService
private private
def pipeline_options def pipeline_options
{} # to be overriden in EE {} # to be overridden in EE
end end
end end
...@@ -61,6 +61,6 @@ class GitTagPushService < BaseService ...@@ -61,6 +61,6 @@ class GitTagPushService < BaseService
end end
def pipeline_options def pipeline_options
{} # to be overriden in EE {} # to be overridden in EE
end end
end end
...@@ -33,7 +33,7 @@ module Groups ...@@ -33,7 +33,7 @@ module Groups
private private
def after_build_hook(group, params) def after_build_hook(group, params)
# overriden in EE # overridden in EE
end end
def create_chat_team? def create_chat_team?
......
...@@ -31,7 +31,7 @@ module Groups ...@@ -31,7 +31,7 @@ module Groups
private private
def before_assignment_hook(group, params) def before_assignment_hook(group, params)
# overriden in EE # overridden in EE
end end
def after_update def after_update
......
...@@ -360,7 +360,7 @@ module SystemNoteService ...@@ -360,7 +360,7 @@ module SystemNoteService
# author - User performing the change # author - User performing the change
# branch_type - 'source' or 'target' # branch_type - 'source' or 'target'
# old_branch - old branch name # old_branch - old branch name
# new_branch - new branch nmae # new_branch - new branch name
# #
# Example Note text: # Example Note text:
# #
......
...@@ -278,7 +278,7 @@ describe 'GFM autocomplete', :js do ...@@ -278,7 +278,7 @@ describe 'GFM autocomplete', :js do
end end
end end
# This context has jsut one example in each contexts in order to improve spec performance. # This context has just one example in each contexts in order to improve spec performance.
context 'labels', :quarantine do context 'labels', :quarantine do
let!(:backend) { create(:label, project: project, title: 'backend') } let!(:backend) { create(:label, project: project, title: 'backend') }
let!(:bug) { create(:label, project: project, title: 'bug') } let!(:bug) { create(:label, project: project, title: 'bug') }
......
...@@ -77,7 +77,7 @@ describe 'Editing file blob', :js do ...@@ -77,7 +77,7 @@ describe 'Editing file blob', :js do
click_link 'Preview' click_link 'Preview'
wait_for_requests wait_for_requests
# the above generates two seperate lists (not embedded) in CommonMark # the above generates two separate lists (not embedded) in CommonMark
expect(page).to have_content("sublist") expect(page).to have_content("sublist")
expect(page).not_to have_xpath("//ol//li//ul") expect(page).not_to have_xpath("//ol//li//ul")
end end
......
...@@ -170,7 +170,7 @@ describe 'Projects > Wiki > User previews markdown changes', :js do ...@@ -170,7 +170,7 @@ describe 'Projects > Wiki > User previews markdown changes', :js do
fill_in :wiki_content, with: "1. one\n - sublist\n" fill_in :wiki_content, with: "1. one\n - sublist\n"
click_on "Preview" click_on "Preview"
# the above generates two seperate lists (not embedded) in CommonMark # the above generates two separate lists (not embedded) in CommonMark
expect(page).to have_content("sublist") expect(page).to have_content("sublist")
expect(page).not_to have_xpath("//ol//li//ul") expect(page).not_to have_xpath("//ol//li//ul")
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment