Skip to content

Commit

Permalink
Merge 324cda6 into 1c46a06
Browse files Browse the repository at this point in the history
  • Loading branch information
hsbt committed Nov 24, 2013
2 parents 1c46a06 + 324cda6 commit 6fb8edc
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 156 deletions.
5 changes: 0 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ gem 'sprockets'
gem 'hikidoc'
gem 'fastimage'

group :coffee do
gem 'coffee-script'
gem 'therubyracer'
end

group :server do
platforms :mri do
gem 'thin'
Expand Down
75 changes: 0 additions & 75 deletions spec/core/rack/assets/precompile_spec.rb

This file was deleted.

5 changes: 0 additions & 5 deletions tdiary/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,6 @@ def call( env )
environment.append_path path
end

if Application.config.assets_precompile
require 'tdiary/rack/assets/precompile'
use TDiary::Rack::Assets::Precompile, environment
end

run environment
end
end
Expand Down
4 changes: 1 addition & 3 deletions tdiary/application/configuration.rb
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
module TDiary
class Application
class Configuration
attr_accessor :assets_paths, :assets_precompile, :plugin_paths, :path, :builder_procs, :authenticate_proc
attr_accessor :assets_paths, :plugin_paths, :path, :builder_procs, :authenticate_proc

def initialize
@assets_paths = []
# if you need to auto compilation for CoffeeScript
@assets_precompile = false;
@plugin_paths = []
@path = {
index: '/',
Expand Down
37 changes: 0 additions & 37 deletions tdiary/rack/assets/precompile.rb

This file was deleted.

31 changes: 0 additions & 31 deletions tdiary/tasks/assets.rake

This file was deleted.

0 comments on commit 6fb8edc

Please sign in to comment.