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
iv
gitlab-ce
Commits
a99e5cd8
Commit
a99e5cd8
authored
Jun 28, 2016
by
Connor Shea
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Split Cropper.js from the main JavaScript manifest.
parent
1ade080e
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
2 deletions
+11
-2
app/assets/javascripts/application.js.coffee
app/assets/javascripts/application.js.coffee
+0
-1
app/assets/javascripts/dispatcher.js.coffee
app/assets/javascripts/dispatcher.js.coffee
+0
-1
app/assets/javascripts/lib/cropper.js.coffee
app/assets/javascripts/lib/cropper.js.coffee
+1
-0
app/assets/javascripts/profile/application.js.coffee
app/assets/javascripts/profile/application.js.coffee
+2
-0
app/assets/javascripts/profile/gl_crop.js.coffee
app/assets/javascripts/profile/gl_crop.js.coffee
+0
-0
app/assets/javascripts/profile/profile.js.coffee
app/assets/javascripts/profile/profile.js.coffee
+3
-0
app/views/profiles/show.html.haml
app/views/profiles/show.html.haml
+4
-0
config/application.rb
config/application.rb
+1
-0
No files found.
app/assets/javascripts/application.js.coffee
View file @
a99e5cd8
...
@@ -54,7 +54,6 @@
...
@@ -54,7 +54,6 @@
#= require_directory ./u2f
#= require_directory ./u2f
#= require_directory .
#= require_directory .
#= require fuzzaldrin-plus
#= require fuzzaldrin-plus
#= require cropper
#= require u2f
#= require u2f
window
.
slugify
=
(
text
)
->
window
.
slugify
=
(
text
)
->
...
...
app/assets/javascripts/dispatcher.js.coffee
View file @
a99e5cd8
...
@@ -129,7 +129,6 @@ class Dispatcher
...
@@ -129,7 +129,6 @@ class Dispatcher
when
'dashboard'
,
'root'
when
'dashboard'
,
'root'
shortcut_handler
=
new
ShortcutsDashboardNavigation
()
shortcut_handler
=
new
ShortcutsDashboardNavigation
()
when
'profiles'
when
'profiles'
new
Profile
()
new
NotificationsForm
()
new
NotificationsForm
()
new
NotificationsDropdown
()
new
NotificationsDropdown
()
when
'projects'
when
'projects'
...
...
app/assets/javascripts/lib/cropper.js.coffee
0 → 100644
View file @
a99e5cd8
#= require cropper
app/assets/javascripts/profile/application.js.coffee
0 → 100644
View file @
a99e5cd8
#
#= require_tree .
app/assets/javascripts/gl_crop.js.coffee
→
app/assets/javascripts/
profile/
gl_crop.js.coffee
View file @
a99e5cd8
File moved
app/assets/javascripts/profile.js.coffee
→
app/assets/javascripts/profile
/profile
.js.coffee
View file @
a99e5cd8
...
@@ -78,3 +78,6 @@ $ ->
...
@@ -78,3 +78,6 @@ $ ->
if
comment
&&
comment
.
length
>
1
&&
$title
.
val
()
==
''
if
comment
&&
comment
.
length
>
1
&&
$title
.
val
()
==
''
$title
.
val
(
comment
[
1
]).
change
()
$title
.
val
(
comment
[
1
]).
change
()
if
$
(
'body'
).
attr
(
'data-page'
).
split
(
':'
).
first
()
==
'profiles'
new
Profile
()
app/views/profiles/show.html.haml
View file @
a99e5cd8
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_tag
(
'lib/cropper.js'
)
=
page_specific_javascript_tag
(
'profile/application.js'
)
=
form_for
@user
,
url:
profile_path
,
method: :put
,
html:
{
multipart:
true
,
class:
"edit-user prepend-top-default"
},
authenticity_token:
true
do
|
f
|
=
form_for
@user
,
url:
profile_path
,
method: :put
,
html:
{
multipart:
true
,
class:
"edit-user prepend-top-default"
},
authenticity_token:
true
do
|
f
|
=
form_errors
(
@user
)
=
form_errors
(
@user
)
...
...
config/application.rb
View file @
a99e5cd8
...
@@ -84,6 +84,7 @@ module Gitlab
...
@@ -84,6 +84,7 @@ module Gitlab
config
.
assets
.
precompile
<<
"graphs/application.js"
config
.
assets
.
precompile
<<
"graphs/application.js"
config
.
assets
.
precompile
<<
"users/application.js"
config
.
assets
.
precompile
<<
"users/application.js"
config
.
assets
.
precompile
<<
"network/application.js"
config
.
assets
.
precompile
<<
"network/application.js"
config
.
assets
.
precompile
<<
"profile/application.js"
config
.
assets
.
precompile
<<
"lib/utils/*.js"
config
.
assets
.
precompile
<<
"lib/utils/*.js"
config
.
assets
.
precompile
<<
"lib/*.js"
config
.
assets
.
precompile
<<
"lib/*.js"
...
...
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