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
Léo-Paul Géneau
gitlab-ce
Commits
107292dd
Commit
107292dd
authored
Aug 03, 2018
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spec warnings and template helper
parent
b901df22
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
1 deletion
+1
-1
lib/gitlab/template_helper.rb
lib/gitlab/template_helper.rb
+1
-1
spec/support/shared_examples/services/gitlab_projects_import_service_shared_examples.rb
...ervices/gitlab_projects_import_service_shared_examples.rb
+0
-0
No files found.
lib/gitlab/template_helper.rb
View file @
107292dd
...
@@ -3,7 +3,7 @@ module Gitlab
...
@@ -3,7 +3,7 @@ module Gitlab
include
Gitlab
::
Utils
::
StrongMemoize
include
Gitlab
::
Utils
::
StrongMemoize
def
prepare_template_environment
(
file
)
def
prepare_template_environment
(
file
)
return
unless
file
&
.
path
.
present?
return
unless
file
if
Gitlab
::
ImportExport
.
object_storage?
if
Gitlab
::
ImportExport
.
object_storage?
params
[
:import_export_upload
]
=
ImportExportUpload
.
new
(
import_file:
file
)
params
[
:import_export_upload
]
=
ImportExportUpload
.
new
(
import_file:
file
)
...
...
spec/support/shared_examples/gitlab_projects_import_service_shared_examples.rb
→
spec/support/shared_examples/
services/
gitlab_projects_import_service_shared_examples.rb
View file @
107292dd
File moved
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