Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

update work to #76 nailed the sass-rails gem to use version 3.1.5

  • Loading branch information...
commit 49898c76936fd15728346b9b3ee8e41b9c0cb212 1 parent 2e81759
@xecutioner xecutioner authored
View
1  .gitignore
@@ -12,4 +12,5 @@
# Ignore all logfiles and tempfiles.
/log/development.log
+/log/production.log
/tmp
View
4 Gemfile
@@ -8,10 +8,10 @@ gem 'rails', '3.1.3'
gem 'sqlite3'
gem 'jquery-rails'
gem "devise"
+gem 'sass-rails','3.1.5'
gem 'rails_admin', :git => 'git://github.com/sferik/rails_admin.git'
gem "github_api"
-
# Deploy with Capistrano
gem 'capistrano'
@@ -27,7 +27,7 @@ end
# in production environments by default.
group :assets do
# gem 'bootstrap-sass'
- gem 'sass-rails', '~> 3.1.5'
+ gem 'sass-rails', '3.1.5'
gem 'coffee-rails', '~> 3.1.1'
gem 'uglifier', '>= 1.0.3'
end
View
8 Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/sferik/rails_admin.git
- revision: 76c6c10076733e5581eed7d7ab2a40ab621f2188
+ revision: 8d6342878414c73a63eab5c7f11892be8415a995
specs:
rails_admin (0.0.1)
bbenezech-nested_form (~> 0.0.5)
@@ -195,10 +195,10 @@ GEM
sexp_processor (~> 3.0)
rubyzip (0.9.6.1)
sass (3.1.15)
- sass-rails (3.1.6)
+ sass-rails (3.1.5)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
- sass (>= 3.1.10)
+ sass (~> 3.1.10)
tilt (~> 1.3.2)
selenium-webdriver (2.20.0)
childprocess (>= 0.2.5)
@@ -245,7 +245,7 @@ DEPENDENCIES
rails (= 3.1.3)
rails_admin!
rspec-rails
- sass-rails (~> 3.1.5)
+ sass-rails (= 3.1.5)
sqlite3
therubyracer
turn (~> 0.8.3)
View
3  config/application.rb
@@ -44,5 +44,8 @@ class Application < Rails::Application
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
+
+ config.assets.initialize_on_precompile = false
+
end
end
View
4 config/environments/production.rb
@@ -57,4 +57,8 @@
# Send deprecation notices to registered listeners
config.active_support.deprecation = :notify
+
+
+ config.assets.precompile += ["rails_admin/rails_admin.js", "rails_admin/rails_admin.css", "rails_admin/jquery.colorpicker.js", "rails_admin/jquery.colorpicker.css"]
+
end
View
178 log/production.log
@@ -15,3 +15,181 @@ Compiled portfolio.css (11ms) (pid 6426)
Compiled projects.css (6ms) (pid 6426)
Compiled revolutionaries.css (5ms) (pid 6426)
Compiled services.css (23ms) (pid 6426)
+Compiled application.js (14ms) (pid 5469)
+Compiled jquery.js (5ms) (pid 5469)
+Compiled jquery_ujs.js (0ms) (pid 5469)
+Compiled bootstrap.js (0ms) (pid 5469)
+Compiled easing.js (1ms) (pid 5469)
+Compiled home.js (204ms) (pid 5469)
+Compiled loader.js (0ms) (pid 5469)
+Compiled projects.js (0ms) (pid 5469)
+Compiled services.js (4ms) (pid 5469)
+Compiled application.css (5ms) (pid 5469)
+Compiled bootstrap_importer.css (1ms) (pid 5469)
+Compiled home.css (0ms) (pid 5469)
+Compiled portfolio.css (0ms) (pid 5469)
+Compiled projects.css (0ms) (pid 5469)
+Compiled revolutionaries.css (0ms) (pid 5469)
+Compiled services.css (0ms) (pid 5469)
+Compiled sign_in.css (0ms) (pid 5469)
+Compiled user_display.css (0ms) (pid 5469)
+Compiled rails_admin/jquery.colorpicker.js (1ms) (pid 5469)
+Compiled rails_admin/rails_admin.js (52ms) (pid 5469)
+Compiled jquery.remotipart.js (4ms) (pid 5469)
+Compiled jquery.iframe-transport.js (1ms) (pid 5469)
+Compiled jquery.effects.core.js (0ms) (pid 5469)
+Compiled jquery.ui.sortable.js (9ms) (pid 5469)
+Compiled jquery.ui.core.js (4ms) (pid 5469)
+Compiled jquery.ui.widget.js (0ms) (pid 5469)
+Compiled jquery.ui.mouse.js (5ms) (pid 5469)
+Compiled jquery.ui.autocomplete.js (13ms) (pid 5469)
+Compiled jquery.ui.position.js (0ms) (pid 5469)
+Compiled jquery.ui.datepicker.js (4ms) (pid 5469)
+Compiled rails_admin/jquery.ui.timepicker.js (2ms) (pid 5469)
+Compiled rails_admin/ra.datetimepicker.js (0ms) (pid 5469)
+Compiled rails_admin/ra.filter-box.js (0ms) (pid 5469)
+Compiled rails_admin/ra.filtering-multiselect.js (0ms) (pid 5469)
+Compiled rails_admin/ra.filtering-select.js (0ms) (pid 5469)
+Compiled rails_admin/ra.remote-form.js (0ms) (pid 5469)
+Compiled rails_admin/jquery.pjax.js (0ms) (pid 5469)
+Compiled jquery_nested_form.js (0ms) (pid 5469)
+Compiled rails_admin/ra.nested-form-hooks.js (29ms) (pid 5469)
+Compiled rails_admin/ui.js (27ms) (pid 5469)
+Compiled rails_admin/themes/default/ui.js (0ms) (pid 5469)
+Compiled rails_admin/custom/ui.js (0ms) (pid 5469)
+Compiled rails_admin/jquery.colorpicker.css (149ms) (pid 5469)
+Compiled rails_admin/rails_admin.css (3ms) (pid 5469)
+Compiled application.js (15ms) (pid 5867)
+Compiled jquery.js (57ms) (pid 5867)
+Compiled jquery_ujs.js (0ms) (pid 5867)
+Compiled bootstrap.js (0ms) (pid 5867)
+Compiled easing.js (1ms) (pid 5867)
+Compiled home.js (217ms) (pid 5867)
+Compiled loader.js (0ms) (pid 5867)
+Compiled projects.js (0ms) (pid 5867)
+Compiled services.js (4ms) (pid 5867)
+Compiled application.css (8ms) (pid 5867)
+Compiled bootstrap_importer.css (1ms) (pid 5867)
+Compiled home.css (0ms) (pid 5867)
+Compiled portfolio.css (0ms) (pid 5867)
+Compiled projects.css (0ms) (pid 5867)
+Compiled revolutionaries.css (0ms) (pid 5867)
+Compiled services.css (0ms) (pid 5867)
+Compiled sign_in.css (0ms) (pid 5867)
+Compiled user_display.css (0ms) (pid 5867)
+Compiled rails_admin/jquery.colorpicker.js (1ms) (pid 5867)
+Compiled rails_admin/rails_admin.js (65ms) (pid 5867)
+Compiled jquery.remotipart.js (5ms) (pid 5867)
+Compiled jquery.iframe-transport.js (1ms) (pid 5867)
+Compiled jquery.effects.core.js (1ms) (pid 5867)
+Compiled jquery.ui.sortable.js (10ms) (pid 5867)
+Compiled jquery.ui.core.js (5ms) (pid 5867)
+Compiled jquery.ui.widget.js (0ms) (pid 5867)
+Compiled jquery.ui.mouse.js (6ms) (pid 5867)
+Compiled jquery.ui.autocomplete.js (9ms) (pid 5867)
+Compiled jquery.ui.position.js (1ms) (pid 5867)
+Compiled jquery.ui.datepicker.js (5ms) (pid 5867)
+Compiled rails_admin/jquery.ui.timepicker.js (2ms) (pid 5867)
+Compiled rails_admin/ra.datetimepicker.js (0ms) (pid 5867)
+Compiled rails_admin/ra.filter-box.js (0ms) (pid 5867)
+Compiled rails_admin/ra.filtering-multiselect.js (0ms) (pid 5867)
+Compiled rails_admin/ra.filtering-select.js (0ms) (pid 5867)
+Compiled rails_admin/ra.remote-form.js (0ms) (pid 5867)
+Compiled rails_admin/jquery.pjax.js (0ms) (pid 5867)
+Compiled jquery_nested_form.js (0ms) (pid 5867)
+Compiled rails_admin/ra.nested-form-hooks.js (33ms) (pid 5867)
+Compiled rails_admin/ui.js (87ms) (pid 5867)
+Compiled rails_admin/themes/default/ui.js (0ms) (pid 5867)
+Compiled rails_admin/custom/ui.js (1ms) (pid 5867)
+Compiled rails_admin/jquery.colorpicker.css (91ms) (pid 5867)
+Compiled rails_admin/rails_admin.css (3ms) (pid 5867)
+Compiled application.js (14ms) (pid 9001)
+Compiled jquery.js (55ms) (pid 9001)
+Compiled jquery_ujs.js (0ms) (pid 9001)
+Compiled bootstrap.js (0ms) (pid 9001)
+Compiled easing.js (1ms) (pid 9001)
+Compiled home.js (200ms) (pid 9001)
+Compiled loader.js (0ms) (pid 9001)
+Compiled projects.js (0ms) (pid 9001)
+Compiled services.js (4ms) (pid 9001)
+Compiled application.css (23ms) (pid 9001)
+Compiled bootstrap_importer.css (23ms) (pid 9001)
+Compiled home.css (16ms) (pid 9001)
+Compiled portfolio.css (10ms) (pid 9001)
+Compiled projects.css (4ms) (pid 9001)
+Compiled revolutionaries.css (11ms) (pid 9001)
+Compiled services.css (6ms) (pid 9001)
+Compiled sign_in.css (0ms) (pid 9001)
+Compiled user_display.css (0ms) (pid 9001)
+Compiled rails_admin/jquery.colorpicker.js (1ms) (pid 9001)
+Compiled rails_admin/rails_admin.js (54ms) (pid 9001)
+Compiled jquery.remotipart.js (24ms) (pid 9001)
+Compiled jquery.iframe-transport.js (1ms) (pid 9001)
+Compiled jquery.effects.core.js (14ms) (pid 9001)
+Compiled jquery.ui.sortable.js (10ms) (pid 9001)
+Compiled jquery.ui.core.js (13ms) (pid 9001)
+Compiled jquery.ui.widget.js (1ms) (pid 9001)
+Compiled jquery.ui.mouse.js (6ms) (pid 9001)
+Compiled jquery.ui.autocomplete.js (9ms) (pid 9001)
+Compiled jquery.ui.position.js (1ms) (pid 9001)
+Compiled jquery.ui.datepicker.js (5ms) (pid 9001)
+Compiled rails_admin/jquery.ui.timepicker.js (2ms) (pid 9001)
+Compiled rails_admin/ra.datetimepicker.js (0ms) (pid 9001)
+Compiled rails_admin/ra.filter-box.js (0ms) (pid 9001)
+Compiled rails_admin/ra.filtering-multiselect.js (0ms) (pid 9001)
+Compiled rails_admin/ra.filtering-select.js (0ms) (pid 9001)
+Compiled rails_admin/ra.remote-form.js (0ms) (pid 9001)
+Compiled rails_admin/jquery.pjax.js (0ms) (pid 9001)
+Compiled jquery_nested_form.js (7ms) (pid 9001)
+Compiled rails_admin/ra.nested-form-hooks.js (30ms) (pid 9001)
+Compiled rails_admin/ui.js (31ms) (pid 9001)
+Compiled rails_admin/themes/default/ui.js (0ms) (pid 9001)
+Compiled rails_admin/custom/ui.js (0ms) (pid 9001)
+Compiled rails_admin/jquery.colorpicker.css (73ms) (pid 9001)
+Compiled rails_admin/rails_admin.css (3ms) (pid 9001)
+Compiled rails_admin/imports.css (6390ms) (pid 9001)
+Compiled application.js (79ms) (pid 8993)
+Compiled jquery.js (62ms) (pid 8993)
+Compiled jquery_ujs.js (1ms) (pid 8993)
+Compiled bootstrap.js (8ms) (pid 8993)
+Compiled easing.js (12ms) (pid 8993)
+Compiled home.js (277ms) (pid 8993)
+Compiled loader.js (8ms) (pid 8993)
+Compiled projects.js (11ms) (pid 8993)
+Compiled services.js (58ms) (pid 8993)
+Compiled application.css (19ms) (pid 8993)
+Compiled bootstrap_importer.css (24ms) (pid 8993)
+Compiled home.css (15ms) (pid 8993)
+Compiled portfolio.css (10ms) (pid 8993)
+Compiled projects.css (5ms) (pid 8993)
+Compiled revolutionaries.css (11ms) (pid 8993)
+Compiled services.css (6ms) (pid 8993)
+Compiled sign_in.css (0ms) (pid 8993)
+Compiled user_display.css (0ms) (pid 8993)
+Compiled rails_admin/jquery.colorpicker.js (1ms) (pid 8993)
+Compiled rails_admin/rails_admin.js (53ms) (pid 8993)
+Compiled jquery.remotipart.js (18ms) (pid 8993)
+Compiled jquery.iframe-transport.js (1ms) (pid 8993)
+Compiled jquery.effects.core.js (14ms) (pid 8993)
+Compiled jquery.ui.sortable.js (10ms) (pid 8993)
+Compiled jquery.ui.core.js (13ms) (pid 8993)
+Compiled jquery.ui.widget.js (1ms) (pid 8993)
+Compiled jquery.ui.mouse.js (6ms) (pid 8993)
+Compiled jquery.ui.autocomplete.js (9ms) (pid 8993)
+Compiled jquery.ui.position.js (1ms) (pid 8993)
+Compiled jquery.ui.datepicker.js (5ms) (pid 8993)
+Compiled rails_admin/jquery.ui.timepicker.js (2ms) (pid 8993)
+Compiled rails_admin/ra.datetimepicker.js (0ms) (pid 8993)
+Compiled rails_admin/ra.filter-box.js (0ms) (pid 8993)
+Compiled rails_admin/ra.filtering-multiselect.js (0ms) (pid 8993)
+Compiled rails_admin/ra.filtering-select.js (0ms) (pid 8993)
+Compiled rails_admin/ra.remote-form.js (0ms) (pid 8993)
+Compiled rails_admin/jquery.pjax.js (0ms) (pid 8993)
+Compiled jquery_nested_form.js (14ms) (pid 8993)
+Compiled rails_admin/ra.nested-form-hooks.js (31ms) (pid 8993)
+Compiled rails_admin/ui.js (26ms) (pid 8993)
+Compiled rails_admin/themes/default/ui.js (0ms) (pid 8993)
+Compiled rails_admin/custom/ui.js (0ms) (pid 8993)
+Compiled rails_admin/jquery.colorpicker.css (74ms) (pid 8993)
+Compiled rails_admin/rails_admin.css (3ms) (pid 8993)
+Compiled rails_admin/imports.css (6513ms) (pid 8993)
Please sign in to comment.
Something went wrong with that request. Please try again.