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
809b7f8b
Commit
809b7f8b
authored
Jul 22, 2019
by
Lukas Eipert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve difference in app/assets/stylesheets/application.scss
parent
886a6957
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
0 deletions
+15
-0
app/assets/stylesheets/_ee/application_ee.scss
app/assets/stylesheets/_ee/application_ee.scss
+5
-0
app/assets/stylesheets/application.scss
app/assets/stylesheets/application.scss
+4
-0
config/application.rb
config/application.rb
+6
-0
No files found.
app/assets/stylesheets/_ee/application_ee.scss
0 → 100644
View file @
809b7f8b
/*
This is a noop-file. In EE:
ee/app/assets/stylesheets/_ee/application_ee.scss
will take precedence over it and import more styles
*/
app/assets/stylesheets/application.scss
View file @
809b7f8b
...
...
@@ -34,4 +34,8 @@
// Styles for JS behaviors.
@import
"behaviors"
;
// EE-only stylesheets
@import
"application_ee"
;
// CSS util classes
@import
"utilities"
;
config/application.rb
View file @
809b7f8b
...
...
@@ -183,6 +183,12 @@ module Gitlab
config
.
assets
.
precompile
<<
"pages/jira_connect.css"
end
# Import path for EE specific SCSS entry point
# In CE it will import a noop file, in EE a functioning file
# Order is important, so that the ee file takes precedence:
config
.
assets
.
paths
<<
"
#{
config
.
root
}
/ee/app/assets/stylesheets/_ee"
config
.
assets
.
paths
<<
"
#{
config
.
root
}
/app/assets/stylesheets/_ee"
config
.
assets
.
paths
<<
"
#{
config
.
root
}
/vendor/assets/javascripts/"
config
.
assets
.
precompile
<<
"snowplow/sp.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