kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

A few doc changes

Browse source
This commit is contained in:
Vijay Dev 2011-12-24 15:25:22 +05:30
parent 8a04bd0c83
commit cd2c31a1c4
3 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
activesupport/lib/active_support/tagged_logging.rb
View file

@ -32,9 +32,9 @@ module ActiveSupport
%w( fatal error warn info debug unknown ).each do |severity| %w( fatal error warn info debug unknown ).each do |severity|
eval <<-EOM, nil, __FILE__, __LINE__ + 1 eval <<-EOM, nil, __FILE__, __LINE__ + 1
def #{severity}(progname = nil, &block) def #{severity}(progname = nil, &block) # def warn(progname = nil, &block)
add(Logger::#{severity.upcase}, progname, &block) add(Logger::#{severity.upcase}, progname, &block) # add(Logger::WARN, progname, &block)
end end # end
EOM EOM
end end

2
railties/guides/rails_guides/generator.rb
View file

@ -216,7 +216,7 @@ module RailsGuides
anchors = Set.new anchors = Set.new
html.scan(/<h\d\s+id="([^"]+)/).flatten.each do |anchor| html.scan(/<h\d\s+id="([^"]+)/).flatten.each do |anchor|
if anchors.member?(anchor) if anchors.member?(anchor)
puts "*** DUPLICATE ID: #{anchor}, please put and explicit ID, e.g. h4(#explicit-id), or consider rewording" puts "*** DUPLICATE ID: #{anchor}, please use an explicit ID, e.g. h4(#explicit-id), or consider rewording"
else else
anchors << anchor anchors << anchor
end end

11
railties/lib/rails/application.rb
View file

@ -154,15 +154,8 @@ module Rails
self self
end end
# Rails.application.env_config stores some of the Rails initial environment parameters. # Stores some of the Rails initial environment parameters which
# Currently stores: # will be used by middlewares and engines to configure themselves.
#
# * action_dispatch.parameter_filter" => config.filter_parameters,
# * action_dispatch.secret_token" => config.secret_token,
# * action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions
#
# These parameters will be used by middlewares and engines to configure themselves.
#
def env_config def env_config
@env_config ||= super.merge({ @env_config ||= super.merge({
"action_dispatch.parameter_filter" => config.filter_parameters, "action_dispatch.parameter_filter" => config.filter_parameters,