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
Jérome Perrin
gitlab-ce
Commits
982dd504
Commit
982dd504
authored
Mar 03, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge cropper library into profile_bundle
parent
ed3e3317
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
9 deletions
+2
-9
app/assets/javascripts/lib/cropper.js
app/assets/javascripts/lib/cropper.js
+0
-7
app/assets/javascripts/profile/gl_crop.js.es6
app/assets/javascripts/profile/gl_crop.js.es6
+2
-0
app/views/profiles/_head.html.haml
app/views/profiles/_head.html.haml
+0
-1
config/application.rb
config/application.rb
+0
-1
No files found.
app/assets/javascripts/lib/cropper.js
deleted
100644 → 0
View file @
ed3e3317
/* eslint-disable func-names, space-before-function-paren */
/*= require cropper */
(
function
()
{
}).
call
(
window
);
app/assets/javascripts/profile/gl_crop.js.es6
View file @
982dd504
/* eslint-disable no-useless-escape, max-len, quotes, no-var, no-underscore-dangle, func-names, space-before-function-paren, no-unused-vars, no-return-assign, object-shorthand, one-var, one-var-declaration-per-line, comma-dangle, consistent-return, class-methods-use-this, new-parens */
/* eslint-disable no-useless-escape, max-len, quotes, no-var, no-underscore-dangle, func-names, space-before-function-paren, no-unused-vars, no-return-assign, object-shorthand, one-var, one-var-declaration-per-line, comma-dangle, consistent-return, class-methods-use-this, new-parens */
import 'vendor/cropper';
((global) => {
((global) => {
// Matches everything but the file name
// Matches everything but the file name
const FILENAMEREGEX = /^.*[\\\/]/;
const FILENAMEREGEX = /^.*[\\\/]/;
...
...
app/views/profiles/_head.html.haml
View file @
982dd504
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_tag
(
'lib/cropper.js'
)
=
page_specific_javascript_bundle_tag
(
'profile'
)
=
page_specific_javascript_bundle_tag
(
'profile'
)
config/application.rb
View file @
982dd504
...
@@ -100,7 +100,6 @@ module Gitlab
...
@@ -100,7 +100,6 @@ module Gitlab
config
.
assets
.
precompile
<<
"katex.js"
config
.
assets
.
precompile
<<
"katex.js"
config
.
assets
.
precompile
<<
"xterm/xterm.css"
config
.
assets
.
precompile
<<
"xterm/xterm.css"
config
.
assets
.
precompile
<<
"lib/ace.js"
config
.
assets
.
precompile
<<
"lib/ace.js"
config
.
assets
.
precompile
<<
"lib/cropper.js"
config
.
assets
.
precompile
<<
"lib/raphael.js"
config
.
assets
.
precompile
<<
"lib/raphael.js"
config
.
assets
.
precompile
<<
"u2f.js"
config
.
assets
.
precompile
<<
"u2f.js"
config
.
assets
.
precompile
<<
"vendor/assets/fonts/*"
config
.
assets
.
precompile
<<
"vendor/assets/fonts/*"
...
...
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