rails 3.1 and designs (with bug)
This commit is contained in:
1 parent
7215b56f7e
commit
f387139ae1
687 files changed
+137
-129308
No files matched your search
@@ -14,9 +14,9 @@ Bundler.require(:default, Rails.env) if defined?(Bundler)
|
||||
module PrototypeR4
|
||||
class Application < Rails::Application
|
||||
|
||||
config.paths.vendor.plugins.instance_variable_set("@paths", config.paths.vendor.plugins.instance_variable_get("@paths") + ["#{config.root}/vendor/built_in_modules"])
|
||||
config.paths.vendor.plugins.instance_variable_set("@paths", config.paths.vendor.plugins.instance_variable_get("@paths") + ["#{config.root}/vendor/downloaded_modules"])
|
||||
config.paths.vendor.plugins.instance_variable_set("@paths", config.paths.vendor.plugins.instance_variable_get("@paths") + ["#{config.root}/vendor/radius"])
|
||||
# config.paths.vendor.plugins.instance_variable_set("@paths", config.paths.vendor.plugins.instance_variable_get("@paths") + ["#{config.root}/vendor/built_in_modules"])
|
||||
# config.paths.vendor.plugins.instance_variable_set("@paths", config.paths.vendor.plugins.instance_variable_get("@paths") + ["#{config.root}/vendor/downloaded_modules"])
|
||||
# config.paths.vendor.plugins.instance_variable_set("@paths", config.paths.vendor.plugins.instance_variable_get("@paths") + ["#{config.root}/vendor/radius"])
|
||||
|
||||
# Settings in config/environments/* take precedence over those specified here.
|
||||
# Application configuration should go into files in config/initializers
|
||||
@@ -51,6 +51,9 @@ module PrototypeR4
|
||||
|
||||
# Configure sensitive parameters which will be filtered from the log file.
|
||||
config.filter_parameters += [:password]
|
||||
|
||||
# Enable the asset pipeline
|
||||
config.assets.enabled = true
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
+7
-3
@@ -1,8 +1,12 @@
|
||||
require 'rubygems'
|
||||
|
||||
# Set up gems listed in the Gemfile.
|
||||
gemfile = File.expand_path('../../Gemfile', __FILE__)
|
||||
begin
|
||||
#gemfile = File.expand_path('../../Gemfile', __FILE__)
|
||||
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',__FILE__)
|
||||
|
||||
require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
|
||||
|
||||
=begin
|
||||
ENV['BUNDLE_GEMFILE'] = gemfile
|
||||
require 'bundler'
|
||||
Bundler.setup
|
||||
@@ -10,4 +14,4 @@ rescue Bundler::GemNotFound => e
|
||||
STDERR.puts e.message
|
||||
STDERR.puts "Try running `bundle install`."
|
||||
exit!
|
||||
end if File.exist?(gemfile)
|
||||
=end if File.exist?(gemfile)
|
||||
@@ -11,7 +11,7 @@ PrototypeR4::Application.configure do
|
||||
|
||||
# Show full error reports and disable caching
|
||||
config.consider_all_requests_local = true
|
||||
config.action_view.debug_rjs = true
|
||||
#config.action_view.debug_rjs = true
|
||||
config.action_controller.perform_caching = false
|
||||
|
||||
# Don't care if the mailer can't send
|
||||
@@ -22,5 +22,6 @@ PrototypeR4::Application.configure do
|
||||
|
||||
# Only use best-standards-support built into browsers
|
||||
config.action_dispatch.best_standards_support = :builtin
|
||||
|
||||
end
|
||||
|
||||
@@ -46,4 +46,9 @@ PrototypeR4::Application.configure do
|
||||
|
||||
# Send deprecation notices to registered listeners
|
||||
config.active_support.deprecation = :notify
|
||||
|
||||
|
||||
#compress both stylesheets and Javascripts
|
||||
config.assets.js_compressor = :uglifier
|
||||
config.assets.css_compressor = :scss
|
||||
end
|
||||
@@ -4,4 +4,4 @@
|
||||
# If you change this key, all old signed cookies will become invalid!
|
||||
# Make sure the secret is at least 30 characters and all random,
|
||||
# no regular words or you'll be exposed to dictionary attacks.
|
||||
ActionController::Base.cookie_verifier_secret = 'cbf6409102b30cb9f4da455ee08c3a7e9d8b2a3d32a0e5b59a354dad03f469d363a8127ef4b7bc3b1afa632d7cf947a1e59e09022d2d4cd8df1f4fa521d7ec07'
|
||||
PrototypeR4::Application.config.secret_token = 'cbf6409102b30cb9f4da455ee08c3a7e9d8b2a3d32a0e5b59a354dad03f469d363a8127ef4b7bc3b1afa632d7cf947a1e59e09022d2d4cd8df1f4fa521d7ec07'
|
||||
@@ -1,2 +1,3 @@
|
||||
data = File.open(File.join(RAILS_ROOT, 'config', 'list.yml')).read
|
||||
#data = File.open(File.join(RAILS_ROOT, 'config', 'list.yml')).read
|
||||
data = File.open(File.join(Rails.root, 'config', 'list.yml')).read
|
||||
LIST = YAML::load(ERB.new(data).result(binding)).symbolize_keys
|
||||
@@ -1,4 +1,5 @@
|
||||
PrototypeR4::Application.routes.draw do
|
||||
|
||||
devise_for :users
|
||||
|
||||
# The priority is based upon order of creation:
|
||||
@@ -43,6 +44,7 @@ PrototypeR4::Application.routes.draw do
|
||||
|
||||
end
|
||||
resources :layouts
|
||||
resources :designs
|
||||
resources :links do
|
||||
member do
|
||||
get 'delete'
|
||||
|
||||
Reference in new issue
Block a user