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
bc705979
Commit
bc705979
authored
Mar 17, 2016
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix failing spec
parent
9ed1cbf2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
app/assets/javascripts/gl_crop.js.coffee
app/assets/javascripts/gl_crop.js.coffee
+8
-3
app/views/profiles/show.html.haml
app/views/profiles/show.html.haml
+1
-1
No files found.
app/assets/javascripts/gl_crop.js.coffee
View file @
bc705979
class
GitLabCrop
class
GitLabCrop
constructor
:
(
el
,
opts
=
{})
->
constructor
:
(
input
,
opts
=
{})
->
# Input file
@
fileInput
=
$
(
input
)
@
fileInput
=
$
(
el
)
# We should rename to avoid spec to fail
# Form will submit the proper input filed with a file using FormData
@
fileInput
.
attr
(
'name'
,
"
#{
@
fileInput
.
attr
(
'name'
)
}
-trigger"
)
.
attr
(
'id'
,
"
#{
@
fileInput
.
attr
(
'id'
)
}
-trigger"
)
# Set defaults
# Set defaults
{
{
...
...
app/views/profiles/show.html.haml
View file @
bc705979
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
%a
.btn.js-choose-user-avatar-button
%a
.btn.js-choose-user-avatar-button
Browse file...
Browse file...
%span
.avatar-file-name.prepend-left-default.js-avatar-filename
No file chosen
%span
.avatar-file-name.prepend-left-default.js-avatar-filename
No file chosen
=
f
.
file_field
:avatar
_dialog_trigger
,
class:
"js-user-avatar-input hidden"
,
accept:
"image/*"
=
f
.
file_field
:avatar
,
class:
"js-user-avatar-input hidden"
,
accept:
"image/*"
.help-block
.help-block
The maximum file size allowed is 200KB.
The maximum file size allowed is 200KB.
-
if
@user
.
avatar?
-
if
@user
.
avatar?
...
...
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