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
f74c90f6
Commit
f74c90f6
authored
Jan 24, 2018
by
Micaël Bergeron
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix the failing specs
parent
1b5272db
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
3 deletions
+2
-3
app/models/concerns/avatarable.rb
app/models/concerns/avatarable.rb
+0
-1
ee/app/uploaders/object_storage.rb
ee/app/uploaders/object_storage.rb
+1
-1
spec/support/shared_examples/uploaders/object_storage_shared_examples.rb
...ared_examples/uploaders/object_storage_shared_examples.rb
+1
-1
No files found.
app/models/concerns/avatarable.rb
View file @
f74c90f6
...
@@ -50,5 +50,4 @@ module Avatarable
...
@@ -50,5 +50,4 @@ module Avatarable
url_base
+
avatar
.
url
url_base
+
avatar
.
url
end
end
end
end
ee/app/uploaders/object_storage.rb
View file @
f74c90f6
...
@@ -56,7 +56,7 @@ module ObjectStorage
...
@@ -56,7 +56,7 @@ module ObjectStorage
paths
.
include?
(
upload
.
path
)
&&
paths
.
include?
(
upload
.
path
)
&&
upload
.
model_id
==
model
.
id
&&
upload
.
model_id
==
model
.
id
&&
upload
.
model_type
==
model
.
base_class
.
sti_name
upload
.
model_type
==
model
.
class
.
base_class
.
sti_name
end
end
end
end
end
end
...
...
spec/support/shared_examples/uploaders/object_storage_shared_examples.rb
View file @
f74c90f6
...
@@ -4,7 +4,7 @@ shared_context 'with storage' do |store, **stub_params|
...
@@ -4,7 +4,7 @@ shared_context 'with storage' do |store, **stub_params|
end
end
end
end
shared_examples
"migrates"
do
|
to_store:
,
from_store:
nil
|
shared_examples
"migrates"
do
|
to_store
:,
from_store:
nil
|
let
(
:to
)
{
to_store
}
let
(
:to
)
{
to_store
}
let
(
:from
)
{
from_store
||
subject
.
object_store
}
let
(
:from
)
{
from_store
||
subject
.
object_store
}
...
...
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