Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
733ae949
Commit
733ae949
authored
Oct 30, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix typos in comments and specs
parent
c71c1f03
Changes
111
Show whitespace changes
Inline
Side-by-side
Showing
111 changed files
with
148 additions
and
148 deletions
+148
-148
app/assets/javascripts/environments/components/environment_item.vue
.../javascripts/environments/components/environment_item.vue
+2
-2
app/assets/javascripts/filtered_search/filtered_search_dropdown.js
...s/javascripts/filtered_search/filtered_search_dropdown.js
+1
-1
app/assets/javascripts/gl_field_errors.js
app/assets/javascripts/gl_field_errors.js
+1
-1
app/assets/javascripts/notes/components/note_awards_list.vue
app/assets/javascripts/notes/components/note_awards_list.vue
+1
-1
app/assets/javascripts/notes/stores/collapse_utils.js
app/assets/javascripts/notes/stores/collapse_utils.js
+1
-1
app/assets/javascripts/vue_shared/components/commit.vue
app/assets/javascripts/vue_shared/components/commit.vue
+1
-1
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+2
-2
app/controllers/admin/appearances_controller.rb
app/controllers/admin/appearances_controller.rb
+3
-3
app/controllers/import/gitea_controller.rb
app/controllers/import/gitea_controller.rb
+1
-1
app/controllers/import/github_controller.rb
app/controllers/import/github_controller.rb
+1
-1
app/controllers/oauth/authorizations_controller.rb
app/controllers/oauth/authorizations_controller.rb
+1
-1
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+1
-1
app/helpers/page_layout_helper.rb
app/helpers/page_layout_helper.rb
+1
-1
app/models/commit_status.rb
app/models/commit_status.rb
+2
-2
app/models/concerns/cacheable_attributes.rb
app/models/concerns/cacheable_attributes.rb
+2
-2
app/models/concerns/fast_destroy_all.rb
app/models/concerns/fast_destroy_all.rb
+1
-1
app/models/concerns/issuable.rb
app/models/concerns/issuable.rb
+1
-1
app/models/concerns/storage/legacy_namespace.rb
app/models/concerns/storage/legacy_namespace.rb
+1
-1
app/models/concerns/with_uploads.rb
app/models/concerns/with_uploads.rb
+1
-1
app/models/namespace.rb
app/models/namespace.rb
+1
-1
app/models/project.rb
app/models/project.rb
+1
-1
app/models/project_services/issue_tracker_service.rb
app/models/project_services/issue_tracker_service.rb
+1
-1
app/services/auth/container_registry_authentication_service.rb
...ervices/auth/container_registry_authentication_service.rb
+1
-1
app/services/keys/destroy_service.rb
app/services/keys/destroy_service.rb
+1
-1
app/services/members/base_service.rb
app/services/members/base_service.rb
+1
-1
app/services/projects/move_project_authorizations_service.rb
app/services/projects/move_project_authorizations_service.rb
+1
-1
app/services/projects/move_project_group_links_service.rb
app/services/projects/move_project_group_links_service.rb
+1
-1
app/services/projects/move_project_members_service.rb
app/services/projects/move_project_members_service.rb
+1
-1
app/services/quick_actions/interpret_service.rb
app/services/quick_actions/interpret_service.rb
+2
-2
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+1
-1
app/workers/gitlab/github_import/advance_stage_worker.rb
app/workers/gitlab/github_import/advance_stage_worker.rb
+1
-1
config/gitlab.yml.example
config/gitlab.yml.example
+1
-1
db/post_migrate/20170717111152_cleanup_move_system_upload_folder_symlink.rb
...170717111152_cleanup_move_system_upload_folder_symlink.rb
+1
-1
doc/development/api_graphql_styleguide.md
doc/development/api_graphql_styleguide.md
+1
-1
lib/extracts_path.rb
lib/extracts_path.rb
+1
-1
lib/gitlab/auth/o_auth/auth_hash.rb
lib/gitlab/auth/o_auth/auth_hash.rb
+1
-1
lib/gitlab/background_migration/set_confidential_note_events_on_services.rb
...und_migration/set_confidential_note_events_on_services.rb
+2
-2
lib/gitlab/background_migration/set_confidential_note_events_on_webhooks.rb
...und_migration/set_confidential_note_events_on_webhooks.rb
+2
-2
lib/gitlab/ci/templates/Maven.gitlab-ci.yml
lib/gitlab/ci/templates/Maven.gitlab-ci.yml
+1
-1
lib/gitlab/database/migration_helpers.rb
lib/gitlab/database/migration_helpers.rb
+1
-1
lib/gitlab/diff/position_tracer.rb
lib/gitlab/diff/position_tracer.rb
+1
-1
lib/gitlab/gitaly_client/repository_service.rb
lib/gitlab/gitaly_client/repository_service.rb
+1
-1
lib/gitlab/import_export/project_tree_restorer.rb
lib/gitlab/import_export/project_tree_restorer.rb
+1
-1
lib/gitlab/path_regex.rb
lib/gitlab/path_regex.rb
+1
-1
lib/gitlab/proxy_http_connection_adapter.rb
lib/gitlab/proxy_http_connection_adapter.rb
+1
-1
lib/gitlab/slash_commands/issue_new.rb
lib/gitlab/slash_commands/issue_new.rb
+1
-1
lib/gitlab/user_extractor.rb
lib/gitlab/user_extractor.rb
+1
-1
lib/google_api/auth.rb
lib/google_api/auth.rb
+1
-1
scripts/trigger-build
scripts/trigger-build
+6
-6
spec/controllers/groups/milestones_controller_spec.rb
spec/controllers/groups/milestones_controller_spec.rb
+2
-2
spec/controllers/groups_controller_spec.rb
spec/controllers/groups_controller_spec.rb
+1
-1
spec/controllers/profiles/keys_controller_spec.rb
spec/controllers/profiles/keys_controller_spec.rb
+1
-1
spec/controllers/projects/environments_controller_spec.rb
spec/controllers/projects/environments_controller_spec.rb
+1
-1
spec/controllers/projects/merge_requests_controller_spec.rb
spec/controllers/projects/merge_requests_controller_spec.rb
+1
-1
spec/features/dashboard/archived_projects_spec.rb
spec/features/dashboard/archived_projects_spec.rb
+1
-1
spec/features/import/manifest_import_spec.rb
spec/features/import/manifest_import_spec.rb
+1
-1
spec/features/issues/gfm_autocomplete_spec.rb
spec/features/issues/gfm_autocomplete_spec.rb
+1
-1
spec/features/projects/badges/pipeline_badge_spec.rb
spec/features/projects/badges/pipeline_badge_spec.rb
+1
-1
spec/features/projects/clusters_spec.rb
spec/features/projects/clusters_spec.rb
+1
-1
spec/features/projects/files/user_creates_files_spec.rb
spec/features/projects/files/user_creates_files_spec.rb
+2
-2
spec/javascripts/awards_handler_spec.js
spec/javascripts/awards_handler_spec.js
+2
-2
spec/javascripts/commit/commit_pipeline_status_component_spec.js
...vascripts/commit/commit_pipeline_status_component_spec.js
+4
-4
spec/javascripts/environments/environments_app_spec.js
spec/javascripts/environments/environments_app_spec.js
+1
-1
spec/javascripts/environments/folder/environments_folder_view_spec.js
...ipts/environments/folder/environments_folder_view_spec.js
+1
-1
spec/javascripts/jobs/components/job_app_spec.js
spec/javascripts/jobs/components/job_app_spec.js
+1
-1
spec/javascripts/lib/utils/datetime_utility_spec.js
spec/javascripts/lib/utils/datetime_utility_spec.js
+2
-2
spec/javascripts/lib/utils/text_utility_spec.js
spec/javascripts/lib/utils/text_utility_spec.js
+1
-1
spec/javascripts/notes/stores/mutation_spec.js
spec/javascripts/notes/stores/mutation_spec.js
+1
-1
spec/javascripts/pipelines/empty_state_spec.js
spec/javascripts/pipelines/empty_state_spec.js
+1
-1
spec/javascripts/pipelines/graph/action_component_spec.js
spec/javascripts/pipelines/graph/action_component_spec.js
+1
-1
spec/javascripts/pipelines/pipelines_spec.js
spec/javascripts/pipelines/pipelines_spec.js
+2
-2
spec/javascripts/pipelines/stage_spec.js
spec/javascripts/pipelines/stage_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js
.../vue_mr_widget/components/states/mr_widget_merged_spec.js
+1
-1
spec/javascripts/vue_shared/components/filtered_search_dropdown_spec.js
...ts/vue_shared/components/filtered_search_dropdown_spec.js
+1
-1
spec/javascripts/vue_shared/components/user_avatar/user_avatar_link_spec.js
...ue_shared/components/user_avatar/user_avatar_link_spec.js
+1
-1
spec/lib/banzai/filter/autolink_filter_spec.rb
spec/lib/banzai/filter/autolink_filter_spec.rb
+1
-1
spec/lib/banzai/filter/relative_link_filter_spec.rb
spec/lib/banzai/filter/relative_link_filter_spec.rb
+1
-1
spec/lib/container_registry/blob_spec.rb
spec/lib/container_registry/blob_spec.rb
+1
-1
spec/lib/gitlab/background_migration/create_fork_network_memberships_range_spec.rb
...d_migration/create_fork_network_memberships_range_spec.rb
+1
-1
spec/lib/gitlab/checks/lfs_integrity_spec.rb
spec/lib/gitlab/checks/lfs_integrity_spec.rb
+1
-1
spec/lib/gitlab/ci/ansi2html_spec.rb
spec/lib/gitlab/ci/ansi2html_spec.rb
+1
-1
spec/lib/gitlab/ci/build/policy/variables_spec.rb
spec/lib/gitlab/ci/build/policy/variables_spec.rb
+1
-1
spec/lib/gitlab/ci/config/entry/global_spec.rb
spec/lib/gitlab/ci/config/entry/global_spec.rb
+1
-1
spec/lib/gitlab/cross_project_access/check_info_spec.rb
spec/lib/gitlab/cross_project_access/check_info_spec.rb
+2
-2
spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb
...se/rename_reserved_paths_migration/v1/rename_base_spec.rb
+1
-1
spec/lib/gitlab/diff/position_spec.rb
spec/lib/gitlab/diff/position_spec.rb
+4
-4
spec/lib/gitlab/diff/position_tracer_spec.rb
spec/lib/gitlab/diff/position_tracer_spec.rb
+1
-1
spec/lib/gitlab/git/attributes_at_ref_parser_spec.rb
spec/lib/gitlab/git/attributes_at_ref_parser_spec.rb
+1
-1
spec/lib/gitlab/gpg_spec.rb
spec/lib/gitlab/gpg_spec.rb
+2
-2
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
+1
-1
spec/lib/gitlab/view/presenter/base_spec.rb
spec/lib/gitlab/view/presenter/base_spec.rb
+1
-1
spec/lib/microsoft_teams/notifier_spec.rb
spec/lib/microsoft_teams/notifier_spec.rb
+1
-1
spec/migrations/migrate_old_artifacts_spec.rb
spec/migrations/migrate_old_artifacts_spec.rb
+1
-1
spec/models/concerns/cacheable_attributes_spec.rb
spec/models/concerns/cacheable_attributes_spec.rb
+2
-2
spec/models/concerns/issuable_spec.rb
spec/models/concerns/issuable_spec.rb
+2
-2
spec/models/lfs_object_spec.rb
spec/models/lfs_object_spec.rb
+1
-1
spec/models/project_spec.rb
spec/models/project_spec.rb
+2
-2
spec/models/project_wiki_spec.rb
spec/models/project_wiki_spec.rb
+2
-2
spec/models/upload_spec.rb
spec/models/upload_spec.rb
+1
-1
spec/requests/api/commits_spec.rb
spec/requests/api/commits_spec.rb
+1
-1
spec/services/clusters/gcp/fetch_operation_service_spec.rb
spec/services/clusters/gcp/fetch_operation_service_spec.rb
+1
-1
spec/services/clusters/gcp/finalize_creation_service_spec.rb
spec/services/clusters/gcp/finalize_creation_service_spec.rb
+1
-1
spec/services/clusters/gcp/provision_service_spec.rb
spec/services/clusters/gcp/provision_service_spec.rb
+1
-1
spec/services/groups/transfer_service_spec.rb
spec/services/groups/transfer_service_spec.rb
+1
-1
spec/services/projects/import_service_spec.rb
spec/services/projects/import_service_spec.rb
+1
-1
spec/services/projects/transfer_service_spec.rb
spec/services/projects/transfer_service_spec.rb
+1
-1
spec/services/quick_actions/interpret_service_spec.rb
spec/services/quick_actions/interpret_service_spec.rb
+2
-2
spec/support/capybara.rb
spec/support/capybara.rb
+1
-1
spec/support/helpers/project_forks_helper.rb
spec/support/helpers/project_forks_helper.rb
+1
-1
spec/support/shared_examples/services/boards/lists_move_service.rb
...ort/shared_examples/services/boards/lists_move_service.rb
+6
-6
spec/tasks/gitlab/backup_rake_spec.rb
spec/tasks/gitlab/backup_rake_spec.rb
+1
-1
No files found.
app/assets/javascripts/environments/components/environment_item.vue
View file @
733ae949
...
...
@@ -15,7 +15,7 @@ import CommitComponent from '../../vue_shared/components/commit.vue';
import
eventHub
from
'
../event_hub
'
;
/**
* Env
ri
onment Item Component
* Env
ir
onment Item Component
*
* Renders a table row for each environment.
*/
...
...
@@ -60,7 +60,7 @@ export default {
computed
:
{
/**
* Verifies if `last_deployment` key exists in the current Env
ri
onment.
* Verifies if `last_deployment` key exists in the current Env
ir
onment.
* This key is required to render most of the html - this method works has
* an helper.
*
...
...
app/assets/javascripts/filtered_search/filtered_search_dropdown.js
View file @
733ae949
...
...
@@ -85,7 +85,7 @@ export default class FilteredSearchDropdown {
}
dispatchInputEvent
()
{
// Prop
o
gate input change to FilteredSearchDropdownManager
// Prop
a
gate input change to FilteredSearchDropdownManager
// so that it can determine which dropdowns to open
this
.
input
.
dispatchEvent
(
new
CustomEvent
(
'
input
'
,
{
...
...
app/assets/javascripts/gl_field_errors.js
View file @
733ae949
...
...
@@ -28,7 +28,7 @@ export default class GlFieldErrors {
this
.
form
.
on
(
'
submit
'
,
GlFieldErrors
.
catchInvalidFormSubmit
);
}
/* Nec
c
essary to prevent intercept and override invalid form submit
/* Necessary to prevent intercept and override invalid form submit
* because Safari & iOS quietly allow form submission when form is invalid
* and prevents disabling of invalid submit button by application.js */
...
...
app/assets/javascripts/notes/components/note_awards_list.vue
View file @
733ae949
...
...
@@ -110,7 +110,7 @@ export default {
// Get the remaining list to use in `and x more` text.
const
remainingAwardList
=
awardList
.
slice
(
TOOLTIP_NAME_COUNT
,
awardList
.
length
);
// Add myself to the begining of the list so title will start with You.
// Add myself to the begin
n
ing of the list so title will start with You.
if
(
hasReactionByCurrentUser
)
{
namesToShow
.
unshift
(
'
You
'
);
}
...
...
app/assets/javascripts/notes/stores/collapse_utils.js
View file @
733ae949
...
...
@@ -70,7 +70,7 @@ export const collapseSystemNotes = notes => {
}
else
if
(
lastDescriptionSystemNote
)
{
const
timeDifferenceMinutes
=
getTimeDifferenceMinutes
(
lastDescriptionSystemNote
,
note
);
// are they less than 10 minutes ap
p
art?
// are they less than 10 minutes apart?
if
(
timeDifferenceMinutes
>
10
)
{
// reset counter
descriptionChangedTimes
=
1
;
...
...
app/assets/javascripts/vue_shared/components/commit.vue
View file @
733ae949
...
...
@@ -13,7 +13,7 @@ export default {
},
props
:
{
/**
* Indicates the exist
a
nce of a tag.
* Indicates the exist
e
nce of a tag.
* Used to render the correct icon, if true will render `fa-tag` icon,
* if false will render a svg sprite fork icon
*/
...
...
app/assets/stylesheets/framework/dropdowns.scss
View file @
733ae949
...
...
@@ -158,7 +158,7 @@
color
:
$gl-text-color
;
outline
:
0
;
// make sure the text color is not overriden
// make sure the text color is not overrid
d
en
&
.text-danger
{
color
:
$brand-danger
;
}
...
...
@@ -184,7 +184,7 @@
text-align
:
left
;
width
:
100%
;
// make sure the text color is not overriden
// make sure the text color is not overrid
d
en
&
.text-danger
{
color
:
$brand-danger
;
}
...
...
app/controllers/admin/appearances_controller.rb
View file @
733ae949
...
...
@@ -33,21 +33,21 @@ class Admin::AppearancesController < Admin::ApplicationController
@appearance
.
save
redirect_to
admin_appearances_path
,
notice:
'Logo was succesfully removed.'
redirect_to
admin_appearances_path
,
notice:
'Logo was succes
s
fully removed.'
end
def
header_logos
@appearance
.
remove_header_logo!
@appearance
.
save
redirect_to
admin_appearances_path
,
notice:
'Header logo was succesfully removed.'
redirect_to
admin_appearances_path
,
notice:
'Header logo was succes
s
fully removed.'
end
def
favicon
@appearance
.
remove_favicon!
@appearance
.
save
redirect_to
admin_appearances_path
,
notice:
'Favicon was succesfully removed.'
redirect_to
admin_appearances_path
,
notice:
'Favicon was succes
s
fully removed.'
end
private
...
...
app/controllers/import/gitea_controller.rb
View file @
733ae949
...
...
@@ -23,7 +23,7 @@ class Import::GiteaController < Import::GithubController
:"
#{
provider
}
_host_url"
end
# Overriden methods
# Overrid
d
en methods
def
provider
:gitea
end
...
...
app/controllers/import/github_controller.rb
View file @
733ae949
...
...
@@ -103,7 +103,7 @@ class Import::GithubController < Import::BaseController
{
github_access_token:
session
[
access_token_key
]
}
end
# The following methods are overriden in subclasses
# The following methods are overrid
d
en in subclasses
def
provider
:github
end
...
...
app/controllers/oauth/authorizations_controller.rb
View file @
733ae949
...
...
@@ -3,7 +3,7 @@
class
Oauth::AuthorizationsController
<
Doorkeeper
::
AuthorizationsController
layout
'profile'
# Overriden from Doorkeeper::AuthorizationsController to
# Overrid
d
en from Doorkeeper::AuthorizationsController to
# include the call to session.delete
def
new
if
pre_auth
.
authorizable?
...
...
app/controllers/projects_controller.rb
View file @
733ae949
...
...
@@ -276,7 +276,7 @@ class ProjectsController < Projects::ApplicationController
# rubocop: enable CodeReuse/ActiveRecord
# Render project landing depending of which features are available
# So if page is not availble in the list it renders the next page
# So if page is not avail
a
ble in the list it renders the next page
#
# pages list order: repository readme, wiki home, issues list, customize workflow
def
render_landing_page
...
...
app/helpers/page_layout_helper.rb
View file @
733ae949
...
...
@@ -10,7 +10,7 @@ module PageLayoutHelper
@breadcrumb_title
=
@page_title
.
last
end
# Segments are sep
e
rated by middot
# Segments are sep
a
rated by middot
@page_title
.
join
(
" · "
)
end
...
...
app/models/commit_status.rb
View file @
733ae949
...
...
@@ -167,12 +167,12 @@ class CommitStatus < ActiveRecord::Base
false
end
# To be overriden when inherrited from
# To be overrid
d
en when inherrited from
def
retryable?
false
end
# To be overriden when inherrited from
# To be overrid
d
en when inherrited from
def
cancelable?
false
end
...
...
app/models/concerns/cacheable_attributes.rb
View file @
733ae949
...
...
@@ -12,12 +12,12 @@ module CacheableAttributes
"
#{
name
}
:
#{
Gitlab
::
VERSION
}
:
#{
Rails
.
version
}
"
.
freeze
end
# Can be overriden
# Can be overrid
d
en
def
current_without_cache
last
end
# Can be overriden
# Can be overrid
d
en
def
defaults
{}
end
...
...
app/models/concerns/fast_destroy_all.rb
View file @
733ae949
...
...
@@ -7,7 +7,7 @@
# `delete_all` is efficient as it deletes all rows with a single `DELETE` query.
#
# It's better to use `delete_all` as our best practice, however,
# if external data (e.g. ObjectStorage, FileStorage or Redis) are asso
s
iated with database records,
# if external data (e.g. ObjectStorage, FileStorage or Redis) are asso
c
iated with database records,
# it is difficult to accomplish it.
#
# This module defines a format to use `delete_all` and delete associated external data.
...
...
app/models/concerns/issuable.rb
View file @
733ae949
...
...
@@ -363,7 +363,7 @@ module Issuable
end
##
# Overriden in MergeRequest
# Overrid
d
en in MergeRequest
#
def
wipless_title_changed
(
old_title
)
old_title
!=
title
...
...
app/models/concerns/storage/legacy_namespace.rb
View file @
733ae949
...
...
@@ -94,7 +94,7 @@ module Storage
if
gitlab_shell
.
mv_namespace
(
repository_storage
,
full_path
,
new_path
)
Gitlab
::
AppLogger
.
info
%Q(Namespace directory "
#{
full_path
}
" moved to "
#{
new_path
}
")
# Remove namespace direct
ro
y async with delay so
# Remove namespace direct
or
y async with delay so
# GitLab has time to remove all projects first
run_after_commit
do
GitlabShellWorker
.
perform_in
(
5
.
minutes
,
:rm_namespace
,
repository_storage
,
new_path
)
...
...
app/models/concerns/with_uploads.rb
View file @
733ae949
...
...
@@ -2,7 +2,7 @@
# Mounted uploaders are destroyed by carrierwave's after_commit
# hook. This hook fetches upload location (local vs remote) from
# Upload model. So it's nec
c
essary to make sure that during that
# Upload model. So it's necessary to make sure that during that
# after_commit hook model's associated uploads are not deleted yet.
# IOW we can not use dependent: :destroy :
# has_many :uploads, as: :model, dependent: :destroy
...
...
app/models/namespace.rb
View file @
733ae949
...
...
@@ -83,7 +83,7 @@ class Namespace < ActiveRecord::Base
find_by
(
'lower(path) = :value'
,
value:
path
.
downcase
)
end
# Case insens
e
tive search for namespace by path or name
# Case insens
i
tive search for namespace by path or name
def
find_by_path_or_name
(
path
)
find_by
(
"lower(path) = :path OR lower(name) = :path"
,
path:
path
.
downcase
)
end
...
...
app/models/project.rb
View file @
733ae949
...
...
@@ -665,7 +665,7 @@ class Project < ActiveRecord::Base
remove_import_data
end
# This method is overriden in EE::Project model
# This method is overrid
d
en in EE::Project model
def
remove_import_data
import_data
&
.
destroy
end
...
...
app/models/project_services/issue_tracker_service.rb
View file @
733ae949
...
...
@@ -9,7 +9,7 @@ class IssueTrackerService < Service
# Override this method on services that uses different patterns
# This pattern does not support cross-project references
# The other code assumes that this pattern is a superset of all
# overriden patterns. See ReferenceRegexes::EXTERNAL_PATTERN
# overrid
d
en patterns. See ReferenceRegexes::EXTERNAL_PATTERN
def
self
.
reference_pattern
(
only_long:
false
)
if
only_long
/(\b[A-Z][A-Z0-9_]+-)(?<issue>\d+)/
...
...
app/services/auth/container_registry_authentication_service.rb
View file @
733ae949
...
...
@@ -99,7 +99,7 @@ module Auth
##
# Because we do not have two way communication with registry yet,
# we create a container repository image resource when push to the
# registry is successfuly authorized.
# registry is successful
l
y authorized.
#
def
ensure_container_repository!
(
path
,
actions
)
return
if
path
.
has_repository?
...
...
app/services/keys/destroy_service.rb
View file @
733ae949
...
...
@@ -6,7 +6,7 @@ module Keys
key
.
destroy
if
destroy_possible?
(
key
)
end
# overriden in EE::Keys::DestroyService
# overrid
d
en in EE::Keys::DestroyService
def
destroy_possible?
(
key
)
true
end
...
...
app/services/members/base_service.rb
View file @
733ae949
...
...
@@ -10,7 +10,7 @@ module Members
end
def
after_execute
(
args
)
# overriden in EE::Members modules
# overrid
d
en in EE::Members modules
end
private
...
...
app/services/projects/move_project_authorizations_service.rb
View file @
733ae949
...
...
@@ -3,7 +3,7 @@
# NOTE: This service cannot be used directly because it is part of a
# a bigger process. Instead, use the service MoveAccessService which moves
# project memberships, project group links, authorizations and refreshes
# the authorizations if nec
c
essary
# the authorizations if necessary
module
Projects
class
MoveProjectAuthorizationsService
<
BaseMoveRelationsService
def
execute
(
source_project
,
remove_remaining_elements:
true
)
...
...
app/services/projects/move_project_group_links_service.rb
View file @
733ae949
...
...
@@ -3,7 +3,7 @@
# NOTE: This service cannot be used directly because it is part of a
# a bigger process. Instead, use the service MoveAccessService which moves
# project memberships, project group links, authorizations and refreshes
# the authorizations if nec
c
essary
# the authorizations if necessary
module
Projects
class
MoveProjectGroupLinksService
<
BaseMoveRelationsService
def
execute
(
source_project
,
remove_remaining_elements:
true
)
...
...
app/services/projects/move_project_members_service.rb
View file @
733ae949
...
...
@@ -3,7 +3,7 @@
# NOTE: This service cannot be used directly because it is part of a
# a bigger process. Instead, use the service MoveAccessService which moves
# project memberships, project group links, authorizations and refreshes
# the authorizations if nec
c
essary
# the authorizations if necessary
module
Projects
class
MoveProjectMembersService
<
BaseMoveRelationsService
def
execute
(
source_project
,
remove_remaining_elements:
true
)
...
...
app/services/quick_actions/interpret_service.rb
View file @
733ae949
...
...
@@ -433,14 +433,14 @@ module QuickActions
end
end
desc
'Add or sub
s
tract spent time'
desc
'Add or subtract spent time'
explanation
do
|
time_spent
,
time_spent_date
|
if
time_spent
if
time_spent
>
0
verb
=
'Adds'
value
=
time_spent
else
verb
=
'Sub
s
tracts'
verb
=
'Subtracts'
value
=
-
time_spent
end
...
...
app/views/projects/edit.html.haml
View file @
733ae949
...
...
@@ -148,7 +148,7 @@
=
link_to
'Archive project'
,
archive_project_path
(
@project
),
data:
{
confirm:
"Are you sure that you want to archive this project?"
},
method: :post
,
class:
"btn btn-warning"
.sub-section.rename-re
s
pository
.sub-section.rename-repository
%h4
.warning-title
Rename repository
=
render
'projects/errors'
...
...
app/workers/gitlab/github_import/advance_stage_worker.rb
View file @
733ae949
...
...
@@ -14,7 +14,7 @@ module Gitlab
INTERVAL
=
30
.
seconds
.
to_i
# The number of seconds to wait (while blocking the thread) before
# continu
e
ing to the next waiter.
# continuing to the next waiter.
BLOCKING_WAIT_TIME
=
5
# The known importer stages and their corresponding Sidekiq workers.
...
...
config/gitlab.yml.example
View file @
733ae949
...
...
@@ -587,7 +587,7 @@ production: &base
gitaly:
# Path to the directory containing Gitaly client executables.
client_path: /home/git/gitaly/bin
# Default Gitaly authentication token. Can be overriden per storage. Can
# Default Gitaly authentication token. Can be overrid
d
en per storage. Can
# be left blank when Gitaly is running locally on a Unix socket, which
# is the normal way to deploy Gitaly.
token:
...
...
db/post_migrate/20170717111152_cleanup_move_system_upload_folder_symlink.rb
View file @
733ae949
...
...
@@ -13,7 +13,7 @@ class CleanupMoveSystemUploadFolderSymlink < ActiveRecord::Migration
say
"Removing
#{
old_directory
}
->
#{
new_directory
}
symlink"
FileUtils
.
rm
(
old_directory
)
else
say
"Symlink
#{
old_directory
}
non exist
a
nt, nothing to do."
say
"Symlink
#{
old_directory
}
non exist
e
nt, nothing to do."
end
end
...
...
doc/development/api_graphql_styleguide.md
View file @
733ae949
...
...
@@ -379,7 +379,7 @@ let(:mutation) do
)
end
it
'returns a successful
l
response'
do
it
'returns a successful response'
do
post_graphql_mutation
(
mutation
,
current_user:
user
)
expect
(
response
).
to
have_gitlab_http_status
(
:success
)
...
...
lib/extracts_path.rb
View file @
733ae949
...
...
@@ -153,7 +153,7 @@ module ExtractsPath
private
# overriden in subclasses, do not remove
# overrid
d
en in subclasses, do not remove
def
get_id
id
=
[
params
[
:id
]
||
params
[
:ref
]]
id
<<
"/"
+
params
[
:path
]
unless
params
[
:path
].
blank?
...
...
lib/gitlab/auth/o_auth/auth_hash.rb
View file @
733ae949
...
...
@@ -80,7 +80,7 @@ module Gitlab
end
# Get the first part of the email address (before @)
# In addtion in removes illegal characters
# In add
i
tion in removes illegal characters
def
generate_username
(
email
)
email
.
match
(
/^[^@]*/
)[
0
].
mb_chars
.
normalize
(
:kd
).
gsub
(
/[^\x00-\x7F]/
,
''
).
to_s
end
...
...
lib/gitlab/background_migration/set_confidential_note_events_on_services.rb
View file @
733ae949
...
...
@@ -3,8 +3,8 @@
module
Gitlab
module
BackgroundMigration
# Ensures services which previously rec
ie
ved all notes events continue
# to rec
ie
ve confidential ones.
# Ensures services which previously rec
ei
ved all notes events continue
# to rec
ei
ve confidential ones.
class
SetConfidentialNoteEventsOnServices
class
Service
<
ActiveRecord
::
Base
self
.
table_name
=
'services'
...
...
lib/gitlab/background_migration/set_confidential_note_events_on_webhooks.rb
View file @
733ae949
...
...
@@ -3,8 +3,8 @@
module
Gitlab
module
BackgroundMigration
# Ensures hooks which previously rec
ie
ved all notes events continue
# to rec
ie
ve confidential ones.
# Ensures hooks which previously rec
ei
ved all notes events continue
# to rec
ei
ve confidential ones.
class
SetConfidentialNoteEventsOnWebhooks
class
WebHook
<
ActiveRecord
::
Base
self
.
table_name
=
'web_hooks'
...
...
lib/gitlab/ci/templates/Maven.gitlab-ci.yml
View file @
733ae949
...
...
@@ -15,7 +15,7 @@
# * Publishes the documentation for `master` branch.
variables
:
# This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
# This will sup
p
ress any download for dependencies and plugins or upload messages which would clutter the console log.
# `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
MAVEN_OPTS
:
"
-Dhttps.protocols=TLSv1.2
-Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN
-Dorg.slf4j.simpleLogger.showDateTime=true
-Djava.awt.headless=true"
# As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used
...
...
lib/gitlab/database/migration_helpers.rb
View file @
733ae949
...
...
@@ -879,7 +879,7 @@ module Gitlab
columns
(
table
).
find
{
|
column
|
column
.
name
==
name
}
end
# This will replace the first occur
a
nce of a string in a column with
# This will replace the first occur
re
nce of a string in a column with
# the replacement
# On postgresql we can use `regexp_replace` for that.
# On mysql we find the location of the pattern, and overwrite it
...
...
lib/gitlab/diff/position_tracer.rb
View file @
733ae949
...
...
@@ -24,7 +24,7 @@ module Gitlab
# head of `feature` was commit B, resulting in the original diff A->B.
# Since creation, `master` was updated to C.
# Now `feature` is being updated to D, and the newly generated MR diff is C->D.
# It is possible that C and D are direct decendants of A and B respectively,
# It is possible that C and D are direct de
s
cendants of A and B respectively,
# but this isn't necessarily the case as rebases and merges come into play.
#
# Suppose we have a diff note on the original diff A->B. Now that the MR
...
...
lib/gitlab/gitaly_client/repository_service.rb
View file @
733ae949
...
...
@@ -349,7 +349,7 @@ module Gitlab
f
.
write
(
message
.
data
)
end
end
# If the file is empty means that we rec
ie
ved an empty stream, we delete the file
# If the file is empty means that we rec
ei
ved an empty stream, we delete the file
FileUtils
.
rm
(
save_path
)
if
File
.
zero?
(
save_path
)
end
...
...
lib/gitlab/import_export/project_tree_restorer.rb
View file @
733ae949
...
...
@@ -154,7 +154,7 @@ module Gitlab
Project
.
transaction
do
process_sub_relation
(
relation
,
relation_item
)
# For every subrelation that hangs from Project, save the associated records al
l
together
# For every subrelation that hangs from Project, save the associated records altogether
# This effectively batches all records per subrelation item, only keeping those in memory
# We have to keep in mind that more batch granularity << Memory, but >> Slowness
if
save
...
...
lib/gitlab/path_regex.rb
View file @
733ae949
...
...
@@ -236,7 +236,7 @@ module Gitlab
def
single_line_regexp
(
regex
)
# Turns a multiline extended regexp into a single line one,
# be
ac
use `rake routes` breaks on multiline regexes.
# be
ca
use `rake routes` breaks on multiline regexes.
Regexp
.
new
(
regex
.
source
.
gsub
(
/\(\?#.+?\)/
,
''
).
gsub
(
/\s*/
,
''
),
regex
.
options
^
Regexp
::
EXTENDED
).
freeze
end
end
...
...
lib/gitlab/proxy_http_connection_adapter.rb
View file @
733ae949
...
...
@@ -4,7 +4,7 @@
# of the global setting allow_local_requests_from_hooks_and_services this adapter
# will allow/block connection to internal IPs and/or urls.
#
# This functionality can be overriden by providing the setting the option
# This functionality can be overrid
d
en by providing the setting the option
# allow_local_requests = true in the request. For example:
# Gitlab::HTTP.get('http://www.gitlab.com', allow_local_requests: true)
#
...
...
lib/gitlab/slash_commands/issue_new.rb
View file @
733ae949
...
...
@@ -3,7 +3,7 @@ module Gitlab
class
IssueNew
<
IssueCommand
def
self
.
match
(
text
)
# we can not match \n with the dot by passing the m modifier as than
# the title and description are not sep
e
rated
# the title and description are not sep
a
rated
/\Aissue\s+(new|create)\s+(?<title>[^\n]*)\n*(?<description>(.|\n)*)/
.
match
(
text
)
end
...
...
lib/gitlab/user_extractor.rb
View file @
733ae949
# frozen_string_literal: true
# This class extracts all users found in a piece of text by the username or the
# email adress
# email ad
d
ress
module
Gitlab
class
UserExtractor
...
...
lib/google_api/auth.rb
View file @
733ae949
...
...
@@ -16,7 +16,7 @@ module GoogleApi
client
.
auth_code
.
authorize_url
(
redirect_uri:
redirect_uri
,
scope:
scope
,
state:
state
# This is used for arbitary redirection
state:
state
# This is used for arbit
r
ary redirection
)
end
...
...
scripts/trigger-build
View file @
733ae949
...
...
@@ -32,32 +32,32 @@ module Trigger
private
# Must be overriden
# Must be overrid
d
en
def
downstream_project_path
raise
NotImplementedError
end
# Must be overriden
# Must be overrid
d
en
def
ref
raise
NotImplementedError
end
# Must be overriden
# Must be overrid
d
en
def
trigger_token
raise
NotImplementedError
end
# Must be overriden
# Must be overrid
d
en
def
access_token
raise
NotImplementedError
end
# Can be overriden
# Can be overrid
d
en
def
extra_variables
{}
end
# Can be overriden
# Can be overrid
d
en
def
version_param_value
(
version_file
)
File
.
read
(
version_file
).
strip
end
...
...
spec/controllers/groups/milestones_controller_spec.rb
View file @
733ae949
...
...
@@ -63,7 +63,7 @@ describe Groups::MilestonesController do
let
(
:group_milestone
)
{
create
(
:milestone
,
group:
group
)
}
context
'when there is a title parameter'
do
it
'searchs for a legacy group milestone'
do
it
'search
e
s for a legacy group milestone'
do
expect
(
GlobalMilestone
).
to
receive
(
:build
)
expect
(
Milestone
).
not_to
receive
(
:find_by_iid
)
...
...
@@ -72,7 +72,7 @@ describe Groups::MilestonesController do
end
context
'when there is not a title parameter'
do
it
'searchs for a group milestone'
do
it
'search
e
s for a group milestone'
do
expect
(
GlobalMilestone
).
not_to
receive
(
:build
)
expect
(
Milestone
).
to
receive
(
:find_by_iid
)
...
...
spec/controllers/groups_controller_spec.rb
View file @
733ae949
...
...
@@ -529,7 +529,7 @@ describe GroupsController do
sign_in
(
user
)
end
context
'when transfering to a subgroup goes right'
do
context
'when transfer
r
ing to a subgroup goes right'
do
let
(
:new_parent_group
)
{
create
(
:group
,
:public
)
}
let!
(
:group_member
)
{
create
(
:group_member
,
:owner
,
group:
group
,
user:
user
)
}
let!
(
:new_parent_group_member
)
{
create
(
:group_member
,
:owner
,
group:
new_parent_group
,
user:
user
)
}
...
...
spec/controllers/profiles/keys_controller_spec.rb
View file @
733ae949
...
...
@@ -4,7 +4,7 @@ describe Profiles::KeysController do
let
(
:user
)
{
create
(
:user
)
}
describe
"#get_keys"
do
describe
"non exist
a
nt user"
do
describe
"non exist
e
nt user"
do
it
"does not generally work"
do
get
:get_keys
,
username:
'not-existent'
...
...
spec/controllers/projects/environments_controller_spec.rb
View file @
733ae949
...
...
@@ -216,7 +216,7 @@ describe Projects::EnvironmentsController do
expect
(
response
).
to
have_gitlab_http_status
(
200
)
end
it
'loads the terminals for the enviroment'
do
it
'loads the terminals for the enviro
n
ment'
do
expect_any_instance_of
(
Environment
).
to
receive
(
:terminals
)
get
:terminal
,
environment_params
...
...
spec/controllers/projects/merge_requests_controller_spec.rb
View file @
733ae949
...
...
@@ -786,7 +786,7 @@ describe Projects::MergeRequestsController do
merge_request
.
mark_as_merged!
end
it
'returns the enviroment on the source project'
do
it
'returns the enviro
n
ment on the source project'
do
get_ci_environments_status
(
environment_target:
'merge_commit'
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
...
...
spec/features/dashboard/archived_projects_spec.rb
View file @
733ae949
...
...
@@ -33,7 +33,7 @@ RSpec.describe 'Dashboard Archived Project' do
expect
(
page
).
not_to
have_content
(
project
.
name
)
end
it
'searchs archived projects'
,
:js
do
it
'search
e
s archived projects'
,
:js
do
click_button
'Last updated'
click_link
'Show archived projects'
...
...
spec/features/import/manifest_import_spec.rb
View file @
733ae949
...
...
@@ -22,7 +22,7 @@ describe 'Import multiple repositories by uploading a manifest file', :js, :post
expect
(
page
).
to
have_content
(
'https://android-review.googlesource.com/platform/build/blueprint'
)
end
it
'imports succesfully imports a project'
do
it
'imports succes
s
fully imports a project'
do
visit
new_import_manifest_path
attach_file
(
'manifest'
,
Rails
.
root
.
join
(
'spec/fixtures/aosp_manifest.xml'
))
...
...
spec/features/issues/gfm_autocomplete_spec.rb
View file @
733ae949
...
...
@@ -15,7 +15,7 @@ describe 'GFM autocomplete', :js do
wait_for_requests
end
it
'updates issue descripton with GFM reference'
do
it
'updates issue descript
i
on with GFM reference'
do
find
(
'.js-issuable-edit'
).
click
simulate_input
(
'#issue-description'
,
"@
#{
user
.
name
[
0
...
3
]
}
"
)
...
...
spec/features/projects/badges/pipeline_badge_spec.rb
View file @
733ae949
...
...
@@ -19,7 +19,7 @@ describe 'Pipeline Badge' do
let!
(
:pipeline
)
{
create
(
:ci_empty_pipeline
,
project:
project
,
ref:
ref
,
sha:
project
.
commit
(
ref
).
sha
)
}
let!
(
:job
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
context
'when the pipeline was successful
l
'
do
context
'when the pipeline was successful'
do
it
'displays so on the badge'
do
job
.
success
...
...
spec/features/projects/clusters_spec.rb
View file @
733ae949
...
...
@@ -40,7 +40,7 @@ describe 'Clusters', :js do
expect
(
page
).
to
have_selector
(
'.js-project-feature-toggle'
)
end
context
'with suc
essful
l request'
do
context
'with suc
cessfu
l request'
do
it
'user sees updated cluster'
do
expect
do
page
.
find
(
'.js-project-feature-toggle'
).
click
...
...
spec/features/projects/files/user_creates_files_spec.rb
View file @
733ae949
...
...
@@ -16,7 +16,7 @@ describe 'Projects > Files > User creates files' do
sign_in
(
user
)
end
context
'without commiting a new file'
do
context
'without commit
t
ing a new file'
do
context
'when an user has write access'
do
before
do
visit
(
project_tree_path_root_ref
)
...
...
@@ -49,7 +49,7 @@ describe 'Projects > Files > User creates files' do
end
end
context
'with commiting a new file'
do
context
'with commit
t
ing a new file'
do
context
'when an user has write access'
do
before
do
visit
(
project_tree_path_root_ref
)
...
...
spec/javascripts/awards_handler_spec.js
View file @
733ae949
...
...
@@ -219,7 +219,7 @@ describe('AwardsHandler', function() {
expect
(
$thumbsUpEmoji
.
data
(
'
originalTitle
'
)).
toBe
(
'
You, sam, jerry, max, and andy
'
);
});
it
(
'
handles the special case where "You" is not cleanly comma sep
e
rated
'
,
function
()
{
it
(
'
handles the special case where "You" is not cleanly comma sep
a
rated
'
,
function
()
{
const
awardUrl
=
awardsHandler
.
getAwardUrl
();
const
$votesBlock
=
$
(
'
.js-awards-block
'
).
eq
(
0
);
const
$thumbsUpEmoji
=
$votesBlock
.
find
(
'
[data-name=thumbsup]
'
).
parent
();
...
...
@@ -244,7 +244,7 @@ describe('AwardsHandler', function() {
expect
(
$thumbsUpEmoji
.
data
(
'
originalTitle
'
)).
toBe
(
'
sam, jerry, max, and andy
'
);
});
it
(
'
handles the special case where "You" is not cleanly comma sep
e
rated
'
,
function
()
{
it
(
'
handles the special case where "You" is not cleanly comma sep
a
rated
'
,
function
()
{
const
awardUrl
=
awardsHandler
.
getAwardUrl
();
const
$votesBlock
=
$
(
'
.js-awards-block
'
).
eq
(
0
);
const
$thumbsUpEmoji
=
$votesBlock
.
find
(
'
[data-name=thumbsup]
'
).
parent
();
...
...
spec/javascripts/commit/commit_pipeline_status_component_spec.js
View file @
733ae949
...
...
@@ -22,7 +22,7 @@ describe('Commit pipeline status component', () => {
Component
=
Vue
.
extend
(
commitPipelineStatus
);
});
describe
(
'
While polling pipeline data succesfully
'
,
()
=>
{
describe
(
'
While polling pipeline data succes
s
fully
'
,
()
=>
{
beforeEach
(()
=>
{
mock
=
new
MockAdapter
(
axios
);
mock
.
onGet
(
'
/dummy/endpoint
'
).
reply
(()
=>
{
...
...
@@ -59,14 +59,14 @@ describe('Commit pipeline status component', () => {
});
});
it
(
'
contains a ciStatus when the polling is succesful
'
,
done
=>
{
it
(
'
contains a ciStatus when the polling is succes
s
ful
'
,
done
=>
{
setTimeout
(()
=>
{
expect
(
vm
.
ciStatus
).
toEqual
(
mockCiStatus
);
done
();
});
});
it
(
'
contains a ci-status icon when polling is succesful
'
,
done
=>
{
it
(
'
contains a ci-status icon when polling is succes
s
ful
'
,
done
=>
{
setTimeout
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.ci-status-icon
'
)).
not
.
toBe
(
null
);
expect
(
vm
.
$el
.
querySelector
(
'
.ci-status-icon
'
).
classList
).
toContain
(
...
...
@@ -77,7 +77,7 @@ describe('Commit pipeline status component', () => {
});
});
describe
(
'
When polling data was not succesful
'
,
()
=>
{
describe
(
'
When polling data was not succes
s
ful
'
,
()
=>
{
beforeEach
(()
=>
{
mock
=
new
MockAdapter
(
axios
);
mock
.
onGet
(
'
/dummy/endpoint
'
).
reply
(
502
,
{});
...
...
spec/javascripts/environments/environments_app_spec.js
View file @
733ae949
...
...
@@ -31,7 +31,7 @@ describe('Environment', () => {
mock
.
restore
();
});
describe
(
'
successful
l
request
'
,
()
=>
{
describe
(
'
successful request
'
,
()
=>
{
describe
(
'
without environments
'
,
()
=>
{
beforeEach
((
done
)
=>
{
mock
.
onGet
(
mockData
.
endpoint
).
reply
(
200
,
{
environments
:
[]
});
...
...
spec/javascripts/environments/folder/environments_folder_view_spec.js
View file @
733ae949
...
...
@@ -30,7 +30,7 @@ describe('Environments Folder View', () => {
component
.
$destroy
();
});
describe
(
'
successful
l
request
'
,
()
=>
{
describe
(
'
successful request
'
,
()
=>
{
beforeEach
(()
=>
{
mock
.
onGet
(
mockData
.
endpoint
).
reply
(
200
,
{
environments
:
environmentsList
,
...
...
spec/javascripts/jobs/components/job_app_spec.js
View file @
733ae949
...
...
@@ -52,7 +52,7 @@ describe('Job App ', () => {
});
});
describe
(
'
with successful
l
request
'
,
()
=>
{
describe
(
'
with successful request
'
,
()
=>
{
beforeEach
(()
=>
{
mock
.
onGet
(
`
${
props
.
pagePath
}
/trace.json`
).
replyOnce
(
200
,
{});
});
...
...
spec/javascripts/lib/utils/datetime_utility_spec.js
View file @
733ae949
...
...
@@ -199,11 +199,11 @@ describe('datefix', () => {
expect
(
datetimeUtility
.
pad
(
2
)).
toEqual
(
'
02
'
);
});
it
(
'
should not add a zero when leng
ht
matches the default
'
,
()
=>
{
it
(
'
should not add a zero when leng
th
matches the default
'
,
()
=>
{
expect
(
datetimeUtility
.
pad
(
12
)).
toEqual
(
'
12
'
);
});
it
(
'
should add a 0 when leng
ht
is smaller than the provided
'
,
()
=>
{
it
(
'
should add a 0 when leng
th
is smaller than the provided
'
,
()
=>
{
expect
(
datetimeUtility
.
pad
(
12
,
3
)).
toEqual
(
'
012
'
);
});
});
...
...
spec/javascripts/lib/utils/text_utility_spec.js
View file @
733ae949
...
...
@@ -120,7 +120,7 @@ describe('text_utility', () => {
});
describe
(
'
getFirstCharacterCapitalized
'
,
()
=>
{
it
(
'
returns the first character cap
ti
alized, if first character is alphabetic
'
,
()
=>
{
it
(
'
returns the first character cap
it
alized, if first character is alphabetic
'
,
()
=>
{
expect
(
textUtils
.
getFirstCharacterCapitalized
(
'
loremIpsumDolar
'
)).
toEqual
(
'
L
'
);
expect
(
textUtils
.
getFirstCharacterCapitalized
(
'
Sit amit !
'
)).
toEqual
(
'
S
'
);
});
...
...
spec/javascripts/notes/stores/mutation_spec.js
View file @
733ae949
...
...
@@ -78,7 +78,7 @@ describe('Notes Store mutations', () => {
});
describe
(
'
COLLAPSE_DISCUSSION
'
,
()
=>
{
it
(
'
should coll
pa
se an expanded discussion
'
,
()
=>
{
it
(
'
should coll
ap
se an expanded discussion
'
,
()
=>
{
const
discussion
=
Object
.
assign
({},
discussionMock
,
{
expanded
:
true
});
const
state
=
{
...
...
spec/javascripts/pipelines/empty_state_spec.js
View file @
733ae949
...
...
@@ -24,7 +24,7 @@ describe('Pipelines Empty State', () => {
expect
(
component
.
$el
.
querySelector
(
'
.svg-content svg
'
)).
toBeDefined
();
});
it
(
'
should render em
tp
y state information
'
,
()
=>
{
it
(
'
should render em
pt
y state information
'
,
()
=>
{
expect
(
component
.
$el
.
querySelector
(
'
h4
'
).
textContent
).
toContain
(
'
Build with confidence
'
);
expect
(
...
...
spec/javascripts/pipelines/graph/action_component_spec.js
View file @
733ae949
...
...
@@ -50,7 +50,7 @@ describe('pipeline graph action component', () => {
});
describe
(
'
on click
'
,
()
=>
{
it
(
'
emits `pipelineActionRequestComplete` after a successful
l
request
'
,
done
=>
{
it
(
'
emits `pipelineActionRequestComplete` after a successful request
'
,
done
=>
{
spyOn
(
component
,
'
$emit
'
);
component
.
$el
.
click
();
...
...
spec/javascripts/pipelines/pipelines_spec.js
View file @
733ae949
...
...
@@ -372,7 +372,7 @@ describe('Pipelines', () => {
});
});
describe
(
'
successful
l
request
'
,
()
=>
{
describe
(
'
successful request
'
,
()
=>
{
describe
(
'
with pipelines
'
,
()
=>
{
beforeEach
(()
=>
{
mock
.
onGet
(
'
twitter/flight/pipelines.json
'
).
reply
(
200
,
pipelines
);
...
...
@@ -667,7 +667,7 @@ describe('Pipelines', () => {
});
});
it
(
'
returns false when state is em
tp
y state
'
,
done
=>
{
it
(
'
returns false when state is em
pt
y state
'
,
done
=>
{
vm
.
isLoading
=
false
;
vm
.
hasMadeRequest
=
true
;
vm
.
hasGitlabCi
=
false
;
...
...
spec/javascripts/pipelines/stage_spec.js
View file @
733ae949
...
...
@@ -40,7 +40,7 @@ describe('Pipelines stage component', () => {
expect
(
component
.
$el
.
querySelector
(
'
button
'
).
getAttribute
(
'
data-toggle
'
)).
toEqual
(
'
dropdown
'
);
});
describe
(
'
with successful
l
request
'
,
()
=>
{
describe
(
'
with successful request
'
,
()
=>
{
beforeEach
(()
=>
{
mock
.
onGet
(
'
path.json
'
).
reply
(
200
,
stageReply
);
});
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js
View file @
733ae949
...
...
@@ -69,7 +69,7 @@ describe('MRWidgetMerged', () => {
expect
(
vm
.
shouldShowRemoveSourceBranch
).
toEqual
(
true
);
});
it
(
'
returns false w
eh
n sourceBranchRemoved is true
'
,
()
=>
{
it
(
'
returns false w
he
n sourceBranchRemoved is true
'
,
()
=>
{
vm
.
mr
.
sourceBranchRemoved
=
true
;
expect
(
vm
.
shouldShowRemoveSourceBranch
).
toEqual
(
false
);
...
...
spec/javascripts/vue_shared/components/filtered_search_dropdown_spec.js
View file @
733ae949
...
...
@@ -41,7 +41,7 @@ describe('Filtered search dropdown', () => {
});
});
describe
(
'
when visible number is bigger than the items leng
ht
'
,
()
=>
{
describe
(
'
when visible number is bigger than the items leng
th
'
,
()
=>
{
beforeEach
(()
=>
{
vm
=
mountComponent
(
Component
,
{
items
:
[{
title
:
'
One
'
},
{
title
:
'
Two
'
},
{
title
:
'
Three
'
}],
...
...
spec/javascripts/vue_shared/components/user_avatar/user_avatar_link_spec.js
View file @
733ae949
...
...
@@ -44,7 +44,7 @@ describe('User Avatar Link Component', function() {
expect
(
this
.
userAvatarLink
.
$el
.
querySelector
(
'
img
'
)).
not
.
toBeNull
();
});
it
(
'
should return nec
c
essary props as defined
'
,
function
()
{
it
(
'
should return necessary props as defined
'
,
function
()
{
_
.
each
(
this
.
propsData
,
(
val
,
key
)
=>
{
expect
(
this
.
userAvatarLink
[
key
]).
toBeDefined
();
});
...
...
spec/lib/banzai/filter/autolink_filter_spec.rb
View file @
733ae949
...
...
@@ -76,7 +76,7 @@ describe Banzai::Filter::AutolinkFilter do
expect
(
doc
.
at_css
(
'a'
)[
'href'
]).
to
eq
link
end
it
'autolinks multiple occurences of smb'
do
it
'autolinks multiple occur
r
ences of smb'
do
link1
=
'smb:///Volumes/shared/foo.pdf'
link2
=
'smb:///Volumes/shared/bar.pdf'
...
...
spec/lib/banzai/filter/relative_link_filter_spec.rb
View file @
733ae949
...
...
@@ -226,7 +226,7 @@ describe Banzai::Filter::RelativeLinkFilter do
let
(
:ref
)
{
'mark#\'@],+;-._/#@!$&()+down'
}
it
'correctly escapes the ref'
do
# Adressable won't escape the '#', so we do this manually
# Ad
d
ressable won't escape the '#', so we do this manually
ref_escaped
=
'mark%23\'@%5D,+;-._/%23@!$&()+down'
# Stub this method so the branch doesn't actually need to be in the repo
...
...
spec/lib/container_registry/blob_spec.rb
View file @
733ae949
...
...
@@ -64,7 +64,7 @@ describe ContainerRegistry::Blob do
.
to_return
(
status:
200
)
end
it
'returns true when blob has been successfuly deleted'
do
it
'returns true when blob has been successful
l
y deleted'
do
expect
(
blob
.
delete
).
to
be_truthy
end
end
...
...
spec/lib/gitlab/background_migration/create_fork_network_memberships_range_spec.rb
View file @
733ae949
...
...
@@ -118,7 +118,7 @@ describe Gitlab::BackgroundMigration::CreateForkNetworkMembershipsRange, :migrat
expect
(
fork_network_members
.
count
).
to
eq
(
12
)
end
it
'knows when not all memberships within
g
a batch have been created'
do
it
'knows when not all memberships within a batch have been created'
do
expect
(
migration
.
missing_members?
(
8
,
10
)).
to
be_truthy
end
end
...
...
spec/lib/gitlab/checks/lfs_integrity_spec.rb
View file @
733ae949
...
...
@@ -68,7 +68,7 @@ describe Gitlab::Checks::LfsIntegrity do
expect
(
subject
.
objects_missing?
).
to
be_truthy
end
it
'is false parent project already con
at
ins LFS objects for the fork'
do
it
'is false parent project already con
ta
ins LFS objects for the fork'
do
lfs_object
=
create
(
:lfs_object
,
oid:
blob_object
.
lfs_oid
)
create
(
:lfs_objects_project
,
project:
parent_project
,
lfs_object:
lfs_object
)
...
...
spec/lib/gitlab/ci/ansi2html_spec.rb
View file @
733ae949
...
...
@@ -7,7 +7,7 @@ describe Gitlab::Ci::Ansi2html do
expect
(
convert_html
(
"Hello"
)).
to
eq
(
'Hello'
)
end
it
"strips non-color-changing control
l
sequences"
do
it
"strips non-color-changing control sequences"
do
expect
(
convert_html
(
"Hello
\e
[2Kworld"
)).
to
eq
(
'Hello world'
)
end
...
...
spec/lib/gitlab/ci/build/policy/variables_spec.rb
View file @
733ae949
...
...
@@ -24,7 +24,7 @@ describe Gitlab::Ci::Build::Policy::Variables do
expect
(
policy
).
to
be_satisfied_by
(
pipeline
,
seed
)
end
it
'is not satisfied by an overriden empty variable'
do
it
'is not satisfied by an overrid
d
en empty variable'
do
policy
=
described_class
.
new
([
'$CI_PROJECT_NAME'
])
expect
(
policy
).
not_to
be_satisfied_by
(
pipeline
,
seed
)
...
...
spec/lib/gitlab/ci/config/entry/global_spec.rb
View file @
733ae949
...
...
@@ -219,7 +219,7 @@ describe Gitlab::Ci::Config::Entry::Global do
##
# When nodes are specified but not defined, we assume that
# configuration is valid, and we asume that entry is simply undefined,
# configuration is valid, and we as
s
ume that entry is simply undefined,
# despite the fact, that key is present. See issue #18775 for more
# details.
#
...
...
spec/lib/gitlab/cross_project_access/check_info_spec.rb
View file @
733ae949
...
...
@@ -50,7 +50,7 @@ describe Gitlab::CrossProjectAccess::CheckInfo do
expect
(
info
.
should_run?
(
dummy_controller
)).
to
be_truthy
end
it
'returns the the oposite of #should_skip? when the check is a skip'
do
it
'returns the the op
p
osite of #should_skip? when the check is a skip'
do
info
=
described_class
.
new
({},
nil
,
nil
,
true
)
expect
(
info
).
to
receive
(
:should_skip?
).
with
(
dummy_controller
).
and_return
(
false
)
...
...
@@ -101,7 +101,7 @@ describe Gitlab::CrossProjectAccess::CheckInfo do
expect
(
info
.
should_skip?
(
dummy_controller
)).
to
be_truthy
end
it
'returns the the oposite of #should_run? when the check is not a skip'
do
it
'returns the the op
p
osite of #should_run? when the check is not a skip'
do
info
=
described_class
.
new
({},
nil
,
nil
,
false
)
expect
(
info
).
to
receive
(
:should_run?
).
with
(
dummy_controller
).
and_return
(
false
)
...
...
spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb
View file @
733ae949
...
...
@@ -20,7 +20,7 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameBase, :delete
end
describe
"#remove_last_ocurrence"
do
it
"removes only the last occur
a
nce of a string"
do
it
"removes only the last occur
re
nce of a string"
do
input
=
"this/is/a-word-to-replace/namespace/with/a-word-to-replace"
expect
(
subject
.
remove_last_occurrence
(
input
,
"a-word-to-replace"
))
...
...
spec/lib/gitlab/diff/position_spec.rb
View file @
733ae949
...
...
@@ -566,13 +566,13 @@ describe Gitlab::Diff::Position do
end
end
context
"for text positon"
do
context
"for text posit
i
on"
do
let
(
:args
)
{
args_for_text
}
it_behaves_like
"diff position json"
end
context
"for image positon"
do
context
"for image posit
i
on"
do
let
(
:args
)
{
args_for_img
}
it_behaves_like
"diff position json"
...
...
@@ -592,13 +592,13 @@ describe Gitlab::Diff::Position do
end
end
context
"for text positon"
do
context
"for text posit
i
on"
do
let
(
:args
)
{
args_for_text
}
it_behaves_like
"diff position json"
end
context
"for image positon"
do
context
"for image posit
i
on"
do
let
(
:args
)
{
args_for_img
}
it_behaves_like
"diff position json"
...
...
spec/lib/gitlab/diff/position_tracer_spec.rb
View file @
733ae949
...
...
@@ -43,7 +43,7 @@ describe Gitlab::Diff::PositionTracer do
#
# In any case, all of this means that the tests below will be extremely
# (excessively, unjustifiably) thorough for scenarios where "the file was
# created in the old diff" and then drop off to compar
i
tively lackluster
# created in the old diff" and then drop off to compar
a
tively lackluster
# testing of other scenarios.
#
# I did still try to cover most of the obvious and potentially tricky
...
...
spec/lib/gitlab/git/attributes_at_ref_parser_spec.rb
View file @
733ae949
...
...
@@ -17,7 +17,7 @@ describe Gitlab::Git::AttributesAtRefParser, :seed_helper do
end
it
'handles missing blobs'
do
expect
{
described_class
.
new
(
repository
,
'non-exist
a
nt-branch'
)
}.
not_to
raise_error
expect
{
described_class
.
new
(
repository
,
'non-exist
e
nt-branch'
)
}.
not_to
raise_error
end
describe
'#attributes'
do
...
...
spec/lib/gitlab/gpg_spec.rb
View file @
733ae949
...
...
@@ -96,7 +96,7 @@ describe Gitlab::Gpg do
expect
(
described_class
.
current_home_dir
).
to
eq
default_home_dir
end
it
'returns the explicit
e
ly set home dir'
do
it
'returns the explicitly set home dir'
do
GPGME
::
Engine
.
home_dir
=
'/tmp/gpg'
expect
(
described_class
.
current_home_dir
).
to
eq
'/tmp/gpg'
...
...
@@ -104,7 +104,7 @@ describe Gitlab::Gpg do
GPGME
::
Engine
.
home_dir
=
GPGME
::
Engine
.
dirinfo
(
'homedir'
)
end
it
'returns the default value when explicit
e
ly setting the home dir to nil'
do
it
'returns the default value when explicitly setting the home dir to nil'
do
GPGME
::
Engine
.
home_dir
=
nil
expect
(
described_class
.
current_home_dir
).
to
eq
default_home_dir
...
...
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
View file @
733ae949
...
...
@@ -321,7 +321,7 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
end
end
context
'when the project has overriden params in import data'
do
context
'when the project has overrid
d
en params in import data'
do
it
'overwrites the params stored in the JSON'
do
project
.
create_import_data
(
data:
{
override_params:
{
description:
"Overridden"
}
})
...
...
spec/lib/gitlab/view/presenter/base_spec.rb
View file @
733ae949
...
...
@@ -40,7 +40,7 @@ describe Gitlab::View::Presenter::Base do
end
end
context
'subject is overriden'
do
context
'subject is overrid
d
en'
do
it
'returns true'
do
presenter
=
presenter_class
.
new
(
build_stubbed
(
:project
,
:public
))
...
...
spec/lib/microsoft_teams/notifier_spec.rb
View file @
733ae949
...
...
@@ -48,7 +48,7 @@ describe MicrosoftTeams::Notifier do
stub_request
(
:post
,
webhook_url
).
with
(
body:
JSON
(
body
),
headers:
{
'Content-Type'
=>
'application/json'
}).
to_return
(
status:
200
,
body:
""
,
headers:
{})
end
it
'expects to receive successful
l
answer'
do
it
'expects to receive successful answer'
do
expect
(
subject
.
ping
(
options
)).
to
be
true
end
end
...
...
spec/migrations/migrate_old_artifacts_spec.rb
View file @
733ae949
...
...
@@ -76,7 +76,7 @@ describe MigrateOldArtifacts do
end
end
context
'when there are ar
it
facts in old and new directory'
do
context
'when there are ar
ti
facts in old and new directory'
do
before
do
store_artifacts_in_legacy_path
(
build2
)
...
...
spec/models/concerns/cacheable_attributes_spec.rb
View file @
733ae949
...
...
@@ -41,7 +41,7 @@ describe CacheableAttributes do
expect
(
minimal_test_class
.
current_without_cache
).
to
eq
(
minimal_test_class
.
last
)
end
it
'can be overriden'
do
it
'can be overrid
d
en'
do
minimal_test_class
.
define_singleton_method
(
:current_without_cache
)
do
first
end
...
...
@@ -64,7 +64,7 @@ describe CacheableAttributes do
context
'with defaults defined'
do
include_context
'with defaults'
it
'can be overriden'
do
it
'can be overrid
d
en'
do
expect
(
minimal_test_class
.
defaults
).
to
eq
({
foo:
'a'
,
bar:
'b'
,
baz:
'c'
})
end
end
...
...
spec/models/concerns/issuable_spec.rb
View file @
733ae949
...
...
@@ -519,7 +519,7 @@ describe Issuable do
end
end
context
'sub
s
tracting time'
do
context
'subtracting time'
do
before
do
spend_time
(
1800
)
end
...
...
@@ -530,7 +530,7 @@ describe Issuable do
expect
(
issue
.
total_time_spent
).
to
eq
(
900
)
end
context
'when time to sub
s
tract exceeds the total time spent'
do
context
'when time to subtract exceeds the total time spent'
do
it
'raise a validation error'
do
Timecop
.
travel
(
1
.
minute
.
from_now
)
do
expect
do
...
...
spec/models/lfs_object_spec.rb
View file @
733ae949
...
...
@@ -14,7 +14,7 @@ describe LfsObject do
expect
(
subject
.
local_store?
).
to
eq
true
end
it
'returns false whe file_store is equal to LfsObjectUploader::Store::REMOTE'
do
it
'returns false whe
n
file_store is equal to LfsObjectUploader::Store::REMOTE'
do
subject
.
file_store
=
LfsObjectUploader
::
Store
::
REMOTE
expect
(
subject
.
local_store?
).
to
eq
false
...
...
spec/models/project_spec.rb
View file @
733ae949
...
...
@@ -2746,7 +2746,7 @@ describe Project do
.
to
raise_error
(
ActiveRecord
::
RecordNotSaved
,
error_message
)
end
it
'updates the project succesfully'
do
it
'updates the project succes
s
fully'
do
merge_request
=
create
(
:merge_request
,
target_project:
project
,
source_project:
project
)
expect
{
project
.
append_or_update_attribute
(
:merge_requests
,
[
merge_request
])
}
...
...
@@ -3314,7 +3314,7 @@ describe Project do
end
end
context
'when explicit
e
ly enabled'
do
context
'when explicitly enabled'
do
context
'when domain is empty'
do
before
do
create
(
:project_auto_devops
,
project:
project
,
domain:
nil
)
...
...
spec/models/project_wiki_spec.rb
View file @
733ae949
...
...
@@ -145,7 +145,7 @@ describe ProjectWiki do
end
it
"returns nil if the page does not exist"
do
expect
(
subject
.
find_page
(
"non-exist
a
nt"
)).
to
eq
(
nil
)
expect
(
subject
.
find_page
(
"non-exist
e
nt"
)).
to
eq
(
nil
)
end
it
"can find a page by slug"
do
...
...
@@ -226,7 +226,7 @@ describe ProjectWiki do
end
it
'returns nil if the page does not exist'
do
expect
(
subject
.
find_file
(
'non-exist
a
nt'
)).
to
eq
(
nil
)
expect
(
subject
.
find_file
(
'non-exist
e
nt'
)).
to
eq
(
nil
)
end
it
'returns a Gitlab::Git::WikiFile instance'
do
...
...
spec/models/upload_spec.rb
View file @
733ae949
...
...
@@ -91,7 +91,7 @@ describe Upload do
.
to
change
{
upload
.
checksum
}.
from
(
nil
).
to
(
expected
)
end
it
'sets `checksum` to nil for a non-exist
a
nt file'
do
it
'sets `checksum` to nil for a non-exist
e
nt file'
do
expect
(
upload
).
to
receive
(
:exist?
).
and_return
(
false
)
checksum
=
Digest
::
SHA256
.
file
(
__FILE__
).
hexdigest
...
...
spec/requests/api/commits_spec.rb
View file @
733ae949
...
...
@@ -565,7 +565,7 @@ describe API::Commits do
}
end
it
'are commited as one in project repo'
do
it
'are commit
t
ed as one in project repo'
do
post
api
(
url
,
user
),
valid_mo_params
expect
(
response
).
to
have_gitlab_http_status
(
201
)
...
...
spec/services/clusters/gcp/fetch_operation_service_spec.rb
View file @
733ae949
...
...
@@ -24,7 +24,7 @@ describe Clusters::Gcp::FetchOperationService do
end
end
context
'when suceeded to fetch operation'
do
context
'when suc
c
eeded to fetch operation'
do
before
do
stub_cloud_platform_get_zone_operation
(
gcp_project_id
,
zone
,
operation_id
)
end
...
...
spec/services/clusters/gcp/finalize_creation_service_spec.rb
View file @
733ae949
...
...
@@ -30,7 +30,7 @@ describe Clusters::Gcp::FinalizeCreationService do
end
end
context
'when suceeded to fetch gke cluster info'
do
context
'when suc
c
eeded to fetch gke cluster info'
do
let
(
:endpoint
)
{
'111.111.111.111'
}
let
(
:api_url
)
{
'https://'
+
endpoint
}
let
(
:username
)
{
'sample-username'
}
...
...
spec/services/clusters/gcp/provision_service_spec.rb
View file @
733ae949
...
...
@@ -26,7 +26,7 @@ describe Clusters::Gcp::ProvisionService do
end
end
context
'when suceeded to request provision'
do
context
'when suc
c
eeded to request provision'
do
before
do
stub_cloud_platform_create_cluster
(
gcp_project_id
,
zone
)
end
...
...
spec/services/groups/transfer_service_spec.rb
View file @
733ae949
...
...
@@ -347,7 +347,7 @@ describe Groups::TransferService, :postgresql do
end
end
context
'when transfering a group with nested groups and projects'
do
context
'when transfer
r
ing a group with nested groups and projects'
do
let!
(
:group
)
{
create
(
:group
,
:public
)
}
let!
(
:project1
)
{
create
(
:project
,
:repository
,
:private
,
namespace:
group
)
}
let!
(
:subgroup1
)
{
create
(
:group
,
:private
,
parent:
group
)
}
...
...
spec/services/projects/import_service_spec.rb
View file @
733ae949
...
...
@@ -125,7 +125,7 @@ describe Projects::ImportService do
project
.
import_type
=
'bitbucket'
end
it
'succeeds if repository import is successful
l
'
do
it
'succeeds if repository import is successful'
do
expect_any_instance_of
(
Gitlab
::
Shell
).
to
receive
(
:import_repository
).
and_return
(
true
)
expect_any_instance_of
(
Gitlab
::
BitbucketImport
::
Importer
).
to
receive
(
:execute
).
and_return
(
true
)
expect_any_instance_of
(
Projects
::
LfsPointers
::
LfsImportService
).
to
receive
(
:execute
).
and_return
({})
...
...
spec/services/projects/transfer_service_spec.rb
View file @
733ae949
...
...
@@ -125,7 +125,7 @@ describe Projects::TransferService do
it
{
expect
(
project
.
errors
.
messages
[
:new_namespace
].
first
).
to
eq
'Please select a new namespace for your project.'
}
end
context
'disallow transfering of project with tags'
do
context
'disallow transfer
r
ing of project with tags'
do
let
(
:container_repository
)
{
create
(
:container_repository
)
}
before
do
...
...
spec/services/quick_actions/interpret_service_spec.rb
View file @
733ae949
...
...
@@ -315,7 +315,7 @@ describe QuickActions::InterpretService do
end
shared_examples
'award command'
do
it
'toggle award 100 emoji if content contain
t
s /award :100:'
do
it
'toggle award 100 emoji if content contains /award :100:'
do
_
,
updates
=
service
.
execute
(
content
,
issuable
)
expect
(
updates
).
to
eq
(
emoji_award:
"100"
)
...
...
@@ -1395,7 +1395,7 @@ describe QuickActions::InterpretService do
it
'includes the formatted duration and proper verb'
do
_
,
explanations
=
service
.
explain
(
content
,
issue
)
expect
(
explanations
).
to
eq
([
'Sub
s
tracts 2h spent time.'
])
expect
(
explanations
).
to
eq
([
'Subtracts 2h spent time.'
])
end
end
...
...
spec/support/capybara.rb
View file @
733ae949
...
...
@@ -100,7 +100,7 @@ RSpec.configure do |config|
# capybara/rspec already calls Capybara.reset_sessions! in an `after` hook,
# but `block_and_wait_for_requests_complete` is called before it so by
# calling it explicit
e
ly here, we prevent any new requests from being fired
# calling it explicitly here, we prevent any new requests from being fired
# See https://github.com/teamcapybara/capybara/blob/ffb41cfad620de1961bb49b1562a9fa9b28c0903/lib/capybara/rspec.rb#L20-L25
# We don't reset the session when the example failed, because we need capybara-screenshot to have access to it.
Capybara
.
reset_sessions!
unless
example
.
exception
...
...
spec/support/helpers/project_forks_helper.rb
View file @
733ae949
...
...
@@ -35,7 +35,7 @@ module ProjectForksHelper
if
create_repository
# The call to project.repository.after_import in RepositoryForkWorker does
# not reset the @exists variable of this forked_project.repository
# so we have to explicit
e
ly call this method to clear the @exists variable.
# so we have to explicitly call this method to clear the @exists variable.
# of the instance we're returning here.
forked_project
.
repository
.
after_import
end
...
...
spec/support/shared_examples/services/boards/lists_move_service.rb
View file @
733ae949
...
...
@@ -14,7 +14,7 @@ shared_examples 'lists move service' do
expect
(
current_list_positions
).
to
eq
[
0
,
1
,
2
,
3
]
end
it
'keeps position of lists when new positon is equal to old position'
do
it
'keeps position of lists when new posit
i
on is equal to old position'
do
service
=
described_class
.
new
(
parent
,
user
,
position:
planning
.
position
)
service
.
execute
(
planning
)
...
...
@@ -22,7 +22,7 @@ shared_examples 'lists move service' do
expect
(
current_list_positions
).
to
eq
[
0
,
1
,
2
,
3
]
end
it
'keeps position of lists when new positon is negative'
do
it
'keeps position of lists when new posit
i
on is negative'
do
service
=
described_class
.
new
(
parent
,
user
,
position:
-
1
)
service
.
execute
(
planning
)
...
...
@@ -30,7 +30,7 @@ shared_examples 'lists move service' do
expect
(
current_list_positions
).
to
eq
[
0
,
1
,
2
,
3
]
end
it
'keeps position of lists when new positon is equal to number of labels lists'
do
it
'keeps position of lists when new posit
i
on is equal to number of labels lists'
do
service
=
described_class
.
new
(
parent
,
user
,
position:
board
.
lists
.
label
.
size
)
service
.
execute
(
planning
)
...
...
@@ -38,7 +38,7 @@ shared_examples 'lists move service' do
expect
(
current_list_positions
).
to
eq
[
0
,
1
,
2
,
3
]
end
it
'keeps position of lists when new positon is greater than number of labels lists'
do
it
'keeps position of lists when new posit
i
on is greater than number of labels lists'
do
service
=
described_class
.
new
(
parent
,
user
,
position:
board
.
lists
.
label
.
size
+
1
)
service
.
execute
(
planning
)
...
...
@@ -46,7 +46,7 @@ shared_examples 'lists move service' do
expect
(
current_list_positions
).
to
eq
[
0
,
1
,
2
,
3
]
end
it
'increments position of intermediate lists when new positon is equal to first position'
do
it
'increments position of intermediate lists when new posit
i
on is equal to first position'
do
service
=
described_class
.
new
(
parent
,
user
,
position:
0
)
service
.
execute
(
staging
)
...
...
@@ -54,7 +54,7 @@ shared_examples 'lists move service' do
expect
(
current_list_positions
).
to
eq
[
1
,
2
,
3
,
0
]
end
it
'decrements position of intermediate lists when new positon is equal to last position'
do
it
'decrements position of intermediate lists when new posit
i
on is equal to last position'
do
service
=
described_class
.
new
(
parent
,
user
,
position:
board
.
lists
.
label
.
last
.
position
)
service
.
execute
(
planning
)
...
...
spec/tasks/gitlab/backup_rake_spec.rb
View file @
733ae949
...
...
@@ -251,7 +251,7 @@ describe 'gitlab:app namespace rake task' do
allow
(
Gitlab
.
config
.
repositories
).
to
receive
(
:storages
).
and_return
(
storages
)
# Avoid asking gitaly about the root ref (which will fail be
ac
use of the
# Avoid asking gitaly about the root ref (which will fail be
ca
use of the
# mocked storages)
allow_any_instance_of
(
Repository
).
to
receive
(
:empty?
).
and_return
(
false
)
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment