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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
dd711aa1
Commit
dd711aa1
authored
Oct 25, 2020
by
Kassio Borges
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Ruby 2.7 kwargs warnings
parent
3803fff4
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
7 deletions
+7
-7
lib/gitlab/legacy_github_import/importer.rb
lib/gitlab/legacy_github_import/importer.rb
+1
-1
lib/gitlab/url_blocker.rb
lib/gitlab/url_blocker.rb
+2
-2
spec/lib/gitlab/github_import/importer/lfs_object_importer_spec.rb
...gitlab/github_import/importer/lfs_object_importer_spec.rb
+1
-1
spec/lib/gitlab/github_import/importer/lfs_objects_importer_spec.rb
...itlab/github_import/importer/lfs_objects_importer_spec.rb
+1
-1
spec/lib/gitlab/jira_import_spec.rb
spec/lib/gitlab/jira_import_spec.rb
+1
-1
spec/lib/gitlab/legacy_github_import/importer_spec.rb
spec/lib/gitlab/legacy_github_import/importer_spec.rb
+1
-1
No files found.
lib/gitlab/legacy_github_import/importer.rb
View file @
dd711aa1
...
@@ -36,7 +36,7 @@ module Gitlab
...
@@ -36,7 +36,7 @@ module Gitlab
}
}
end
end
@client
=
Client
.
new
(
credentials
[
:user
],
opts
)
@client
=
Client
.
new
(
credentials
[
:user
],
**
opts
)
end
end
def
execute
def
execute
...
...
lib/gitlab/url_blocker.rb
View file @
dd711aa1
...
@@ -65,8 +65,8 @@ module Gitlab
...
@@ -65,8 +65,8 @@ module Gitlab
protected_uri_with_hostname
protected_uri_with_hostname
end
end
def
blocked_url?
(
*
args
)
def
blocked_url?
(
url
,
**
kw
args
)
validate!
(
*
args
)
validate!
(
url
,
**
kw
args
)
false
false
rescue
BlockedUrlError
rescue
BlockedUrlError
...
...
spec/lib/gitlab/github_import/importer/lfs_object_importer_spec.rb
View file @
dd711aa1
...
@@ -12,7 +12,7 @@ RSpec.describe Gitlab::GithubImport::Importer::LfsObjectImporter do
...
@@ -12,7 +12,7 @@ RSpec.describe Gitlab::GithubImport::Importer::LfsObjectImporter do
}
}
end
end
let
(
:lfs_download_object
)
{
LfsDownloadObject
.
new
(
lfs_attributes
)
}
let
(
:lfs_download_object
)
{
LfsDownloadObject
.
new
(
**
lfs_attributes
)
}
let
(
:github_lfs_object
)
{
Gitlab
::
GithubImport
::
Representation
::
LfsObject
.
new
(
lfs_attributes
)
}
let
(
:github_lfs_object
)
{
Gitlab
::
GithubImport
::
Representation
::
LfsObject
.
new
(
lfs_attributes
)
}
let
(
:importer
)
{
described_class
.
new
(
github_lfs_object
,
project
,
nil
)
}
let
(
:importer
)
{
described_class
.
new
(
github_lfs_object
,
project
,
nil
)
}
...
...
spec/lib/gitlab/github_import/importer/lfs_objects_importer_spec.rb
View file @
dd711aa1
...
@@ -15,7 +15,7 @@ RSpec.describe Gitlab::GithubImport::Importer::LfsObjectsImporter do
...
@@ -15,7 +15,7 @@ RSpec.describe Gitlab::GithubImport::Importer::LfsObjectsImporter do
}
}
end
end
let
(
:lfs_download_object
)
{
LfsDownloadObject
.
new
(
lfs_attributes
)
}
let
(
:lfs_download_object
)
{
LfsDownloadObject
.
new
(
**
lfs_attributes
)
}
describe
'#parallel?'
do
describe
'#parallel?'
do
it
'returns true when running in parallel mode'
do
it
'returns true when running in parallel mode'
do
...
...
spec/lib/gitlab/jira_import_spec.rb
View file @
dd711aa1
...
@@ -11,7 +11,7 @@ RSpec.describe Gitlab::JiraImport do
...
@@ -11,7 +11,7 @@ RSpec.describe Gitlab::JiraImport do
let_it_be
(
:project
,
reload:
true
)
{
create
(
:project
)
}
let_it_be
(
:project
,
reload:
true
)
{
create
(
:project
)
}
let
(
:additional_params
)
{
{}
}
let
(
:additional_params
)
{
{}
}
subject
{
described_class
.
validate_project_settings!
(
project
,
additional_params
)
}
subject
{
described_class
.
validate_project_settings!
(
project
,
**
additional_params
)
}
shared_examples
'raise Jira import error'
do
|
message
|
shared_examples
'raise Jira import error'
do
|
message
|
it
'returns error'
do
it
'returns error'
do
...
...
spec/lib/gitlab/legacy_github_import/importer_spec.rb
View file @
dd711aa1
...
@@ -274,7 +274,7 @@ RSpec.describe Gitlab::LegacyGithubImport::Importer do
...
@@ -274,7 +274,7 @@ RSpec.describe Gitlab::LegacyGithubImport::Importer do
allow
(
project
).
to
receive
(
:import_data
).
and_return
(
double
(
credentials:
credentials
))
allow
(
project
).
to
receive
(
:import_data
).
and_return
(
double
(
credentials:
credentials
))
expect
(
Gitlab
::
LegacyGithubImport
::
Client
).
to
receive
(
:new
).
with
(
expect
(
Gitlab
::
LegacyGithubImport
::
Client
).
to
receive
(
:new
).
with
(
credentials
[
:user
],
credentials
[
:user
],
{}
**
{}
)
)
subject
.
client
subject
.
client
...
...
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