diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-16 12:59:07 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-16 12:59:07 +0200 |
| commit | 452c076a34cc11cc97f4b1c3113e86ce4367e055 (patch) | |
| tree | a503b33dc6dd181e2cf56d5965fc1eb822b4d9f9 /config/application.rb | |
| parent | 13e37a3ee5c943525a99481b855d654e97e8597c (diff) | |
| download | gitlab-ce-452c076a34cc11cc97f4b1c3113e86ce4367e055.tar.gz | |
Revert "squashed merge and fixed conflicts"
This reverts commit 13e37a3ee5c943525a99481b855d654e97e8597c.
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index 05fec995ed3..49d4d3ba555 100644 --- a/config/application.rb +++ b/config/application.rb @@ -83,7 +83,6 @@ module Gitlab config.assets.precompile << "mailers/*.css" config.assets.precompile << "graphs/application.js" config.assets.precompile << "users/application.js" - config.assets.precompile << "network/application.js" # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' |