Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rails/rails
...
head fork: rails/rails
This comparison is big! We're only showing the most recent 250 commits
Commits on Dec 07, 2011
@josevalim josevalim Merge pull request #3889 from kielkowicz/master
Annotating haml and slim file
6867212
@josevalim josevalim Merge pull request #3895 from kennyj/should_use_freezed_constant
Should use freezed string constant here.
12be0a5
@josevalim josevalim Remove #:nodoc: from partial renderer. 30f0d7b
@tenderlove tenderlove the required sqlite3 adapter responds to encoding, so stop checking. 8523784
@tenderlove tenderlove stop calling String#to_s so frequently 1fc47a1
Commits on Dec 08, 2011
@tenderlove tenderlove automatically add the column definition to the columns list if creati…
…ng a new one
483a3cf
@tenderlove tenderlove try to normalize the objects passed to column() 7e176a6
@tenderlove tenderlove Use a hash to look up column definitions 76c29a6
@tenderlove tenderlove speeding up ignored sql testing 38a8f7f
@tenderlove tenderlove moving ignored regexp to the instance a505b13
Jean-Francois Turcot ParamsWrapper only wrap the accessible attributes when they were set d552621
@mark-rushakoff mark-rushakoff Fix inflection regexes for mouse, mice 6f253fb
@josevalim josevalim Merge pull request #3901 from mark-rushakoff/inflection-regex-fix
Fix inflection regexes for mouse, mice
0144f4f
@josevalim josevalim Merge pull request #3888 from kennyj/should_use_default_charset
Assign config.encoding to AD::Response.default_charset at the initialization time.
f84bf83
@josevalim josevalim Remove dead broken code from AD::Request e2e9eab
Jean-Francois Turcot Add information to the changelog about the changes to ActionControlle…
…r::ParamsWrapper
677f968
@jonleighton jonleighton Fix broken test_exists_query_logging from the table_exists? change 188b8c3
@josevalim josevalim Merge pull request #3900 from jfturcot/accessible_wrap_params
ParamsWrapper only wrap the accessible attributes when they were set
bf34a36
@fxn fxn releasing instructions: updates the URLs that triggers stable docs ge…
…neration and publishing
2fe5834
@fxn fxn use our own fork of sdoc while Vijay's fix is not applied to voloko/sdoc 4936fc3
@fxn fxn updates the host and port of publish_docs, and changes the release in…
…structions to use the task rather than curl (thanks to Vijay Dev for spotting this one)
c2aadf8
@Mik-die Mik-die Typo in list 0944785
@kennyj kennyj Fix warning for params_wrapper_test. 3ade2f8
@josevalim josevalim Remove rb-fsevent from Gemfile. 0008918
@josevalim josevalim Add performance scripts from wycats/rails-simple-benches to actionpack. 06ac7d3
@josevalim josevalim Some small optimizations and improvements to benchmark code. efc28a7
@josevalim josevalim Optimize layout lookup to avoid double calls. 239262f
@josevalim josevalim Just use the proc if there is a chance of layout lookup. 67cc07e
@josevalim josevalim Merge pull request #3906 from kennyj/fix_warnings_for_params_wrapper_…
…test

Fix warning for params_wrapper_test.rb
1bad06a
@kennyj kennyj Fix testcase an error on ruby 1.8.x.
In Ruby 1.8.x, config.encoding sets $KCODE.
Therefore, the possible values are UTF8, SJIS, or EUC.
And, if we set SJIS, we'll has the error. Because some rails sources are written in utf-8 encoding.
d4d2e8e
@josevalim josevalim Merge pull request #3908 from kennyj/should_use_default_charset
Fix a failure in railties on ruby 1.8.x
7b1930a
@laserlemon laserlemon Add dependency status (a la build status) to the README 255c485
@fxn fxn Merge pull request #3909 from laserlemon/patch-1
Add dependency status (a la build status) to the README
b989b80
@josevalim josevalim Revert accidental change from cattr_accessor to class_attribute. 859a455
@tenderlove tenderlove Regexp.union seems to have different results in 1.8 d80e4ee
@tenderlove tenderlove fixing eval'd line numbers. 3cae753
@josevalim josevalim Improve cache on route_key lookup. 7280787
@josevalim josevalim Remove NilClass whiners feature.
Removing this feature causes boost in performance when using Ruby 1.9.

Ruby 1.9 started to do implicit conversions using `to_ary` and `to_str`
in some STDLIB methods (like Array#join). To do such implicit conversions,
Ruby 1.9 always dispatches the method and rescues the NoMethodError exception
in case one is raised.

Therefore, since the whiners feature defined NilClass#method_missing, such
implicit conversions for nil became much, much slower. In fact, just defining
NilClass#method_missing (even without the whiners feature) already causes a
massive slow down. Here is a snippet that shows such slow down:

    require "benchmark"
    Benchmark.realtime { 1_000.times { [nil,nil,nil].join } }

    class NilClass
      def method_missing(*args)
        raise NoMethodError
      end
    end

    Benchmark.realtime { 1_000.times { [nil,nil,nil].join } }
d1abf29
@vijaydev vijaydev minor text change c81bb97
@vijaydev vijaydev fix comments 965f6f2
@vijaydev vijaydev add haml and slim to the list of extensions supported by rake notes 120861c
@vijaydev vijaydev fix nodocs 94dcbe8
@josevalim josevalim Fix a regression and also fix broken test. ebd71fd
@jonleighton jonleighton Fix #3890. (Calling proxy_association in scope chain.) 5da90b3
@josevalim josevalim Move symbolize keys to the inner options as we can assume url_options…
… will be properly symbolized.
c41f08c
@dissolved dissolved Replacing vague mention of an unspecified section above with a link t…
…o the actual section containing Asset Organization.
65796bb
@josevalim josevalim Fix another regression related to the layout optimization. d4d99bb
@tenderlove tenderlove Exceptions should read from the spec configu 8c26cd5
@tenderlove tenderlove load the encoding converter to work around [ruby-core:41556] when swi…
…tching encodings
2c471b3
Commits on Dec 09, 2011
@drogus drogus Fix copying migrations from engines
There was a bug in ActiveRecord::Migration.copy method, which
prevented adding special comment about the origin of migration.

Because of that, the check if migration is identical or if it's
not and should be skipped was always saying that migration is
skipped, which was causing additional useless warnings about
skipped migrations.
652db2f
@drogus drogus Ignore origin comment when checking for duplicates on Migration.copy
49ebe51 fixed copying migrations, but existing migrations would still
trigger warnings. The proper way to compare migrations is to ignore
origin lines - if migration is identical it means that we can
silently skip it, regardless where it comes from.
62d5564
@drogus drogus Fix railties tests, identical migrations are not considered when copying b164ab7
@drogus drogus Run also migrations in subdirectories.
With this commit, ActiveRecord will also look for migrations
in db/migrate subdirectories.
1d9de9d
@josevalim josevalim Simplify path traversal logic 2995134
@josevalim josevalim Deprecate implicit layout lookup in favor of inheriting the _layout c…
…onfig.
5ad5215
@drogus drogus String#to_a is not available in 1.9 255d9f5
@drogus drogus Add suffix for migrations copied from engines ed0b1f6
@drogus drogus Compare migrations for copying only by name and scope 929b264
@dhh dhh Make ActiveSupport::Benchmarkable a default module for ActionControll…
…er::Base, so the #benchmark method is once again available in the controller context like it used to be *DHH*
22a6079
@tenderlove tenderlove only load converter if the encodings are different c212a34
@tenderlove tenderlove squelch table exists? queries. a29d1db
@tenderlove tenderlove don't need a begin / end. 007965a
@tenderlove tenderlove Use `table_exists?` from the schema cache. 5b82f50
@josevalim josevalim Fix extend -> include. ab30570
@drogus drogus Allow to filter migrations by passing a block
Example:
  ActiveRecord::Migrator.migrate(path) do |migration|
    migration.name =~ /User/
  end

The above example will migrate only migrations with User in
the name
f0b782d
@drogus drogus Allow to run migrations with given scope, with SCOPE=<scope>
Scope in migrations can be defined by adding suffix in filename,
like: 01_a_migration.blog.rb. Such migration have blog scope.

Scope is automatically added while copying migrations from engine,
so if you want to revert all of the migrations from given engine,
you can just run db:migrate with SCOPE, like:

    rake db:migrate SCOPE=blog
35a1744
@drogus drogus Fix indentation 866d2db
@laserlemon laserlemon Add the .rdoc extension to the README that Rails generates for a new …
…application
5c60b44
@tenderlove tenderlove Merge pull request #3924 from laserlemon/readme-ext
Add the .rdoc extension to the README that Rails generates for a new app
f79b257
Commits on Dec 10, 2011
@tenderlove tenderlove * ActiveSupport::BufferedLogger#silence is deprecated. If you want to…
… squelch

    logs for a certain block, change the log level for that block.

*   ActiveSupport::BufferedLogger#open_log is deprecated.  This method should
    not have been public in the first place.

*   ActiveSupport::BufferedLogger's behavior of automatically creating the
    directory for your log file is deprecated.  Please make sure to create the
    directory for your log file before instantiating.

*   ActiveSupport::BufferedLogger#auto_flushing is deprecated.  Either set the
    sync level on the underlying file handle like this:

        f = File.open('foo.log', 'w')
        f.sync = true
        ActiveSupport::BufferedLogger.new f

    Or tune your filesystem.  The FS cache is now what controls flushing.

*   ActiveSupport::BufferedLogger#flush is deprecated.  Set sync on your
    filehandle, or tune your filesystem.
04ef93d
@drogus drogus Update partials documentation, partial_path is no longer generated us…
…ing RecordIdentifier
efed2d5
@fxn fxn revises some stuff that was out of sync with the recent generated REA…
…DME.rdoc
3e55928
@guilleiguaran guilleiguaran Add test to verify that therubyrhino isn't included when JRuby isn't …
…used
55afc7d
@guilleiguaran guilleiguaran Skip assets groups if --skip-sprockets option is given b12a176
@wycats wycats Merge pull request #3926 from guilleiguaran/skip-assets-group-if-spro…
…ckets-skipped

Skip assets groups if --skip-sprockets option is given
7fc0964
@wycats wycats Merge pull request #3925 from guilleiguaran/extra-test-for-therubyrhino
Add test to verify that therubyrhino isn't included when JRuby isn't used
aace38a
@josevalim josevalim Fix AS test suite. cd7fbcb
@dissolved dissolved Fixing typo in Routing Guide. 83bc2c2
@drogus drogus Clarify the default assets.precompile matcher behavior 1c2cb7d
@guilleiguaran guilleiguaran Use ProcessedAsset#pathname in Sprockets helpers when debugging is on…
…. Closes #3333 #3348 #3361.

Is wrong use ProcessedAsset#to_s since it returns the content of the file.
7a7e87d
@drogus drogus Ensure that files that compile to js/css are not compiled by default …
…with `rake assets:precompile`

This case was not tested and documentation was a bit confusing
on that topic, so it was not obvious if current code
works properly or not.
cde9981
Commits on Dec 11, 2011
@tenderlove tenderlove Try to keep people from calling the deprecated flush method. 4beaa9b
@tenderlove tenderlove Errno::ENOENT error makes more sense when a file cannot be found d09b67c
@tenderlove tenderlove ensure @fixture_connections is initialized in case an exception happe…
…ns during setup
d102791
@josevalim josevalim Merge pull request #3932 from guilleiguaran/fix-assets-helpers
Use ProcessedAsset#pathname in Sprockets helpers when debugging is on. Closes #3333 #3348 #3361.
7983509
@guilleiguaran guilleiguaran Skip assets options in environments files when --skip-sprockets is used ea5a70a
@wfarr wfarr Add button_tag support to ActionView::Helpers::FormBuilder.
This support is near-identical to the existing submit_tag support.

Example:

    <%= form_for @post do |f| %>
      <%= f.button %>
    <% end %>
3f65e7f
@josevalim josevalim Merge pull request #3933 from wfarr/master
Add button_tag support to ActionView::Helpers::FormBuilder
78de996
@vijaydev vijaydev revising doc aa6aa9b
@wycats wycats Merge pull request #3936 from guilleiguaran/skip-assets-options-when-…
…sprockets-skipped

Skip assets options in environments files when --skip-sprockets is used
75a9d88
@vijaydev vijaydev update command line guide: generated README is now an rdoc 6887aed
@azimux azimux Overrode Hash#nested_under_indifferent_access in HashWithIndifferentA…
…ccess

to return self.
3d6eafe
@josevalim josevalim Merge pull request #3941 from azimux/fix_nested_under_indifferent_access
Overrode Hash#nested_under_indifferent_access in HashWithIndifferentAccess
a8f2b20
@DevL DevL Added :use_two_digit_numbers option [Lennart Fridén & Kim Persson]
Added use_two_digit_numbers select_tag option for displaying months and days with leading zeros without affecting the values (useful for e.g. ISO-style dates, 2011-08-01).

Signed-off-by: José Valim <jose.valim@gmail.com>

Conflicts:

	actionpack/CHANGELOG.md
dc43e40
@jeremy jeremy Use 1.9 native XML escaping to speed up html_escape and shush regexp …
…warnings

        length      user     system      total        real
before  6      0.010000   0.000000   0.010000 (  0.012378)
after   6      0.010000   0.000000   0.010000 (  0.012866)
before  60     0.040000   0.000000   0.040000 (  0.046273)
after   60     0.040000   0.000000   0.040000 (  0.036421)
before  600    0.390000   0.000000   0.390000 (  0.390670)
after   600    0.210000   0.000000   0.210000 (  0.209094)
before  6000   3.750000   0.000000   3.750000 (  3.751008)
after   6000   1.860000   0.000000   1.860000 (  1.857901)
63cd943
@jeremy jeremy Remove duplicate html_escape docs 9147613
Commits on Dec 12, 2011
@sunaku sunaku disambiguate "and not" when explaining "&& return" b15e2be
@josevalim josevalim Composition > inheritance. 5c234ab
@josevalim josevalim Allow FileUpdateChecker to work with globs. 57e0c03
@josevalim josevalim Improve docs for Rails::Application and add routes_reloader_hook and …
…app_reloader_hooks.
27f0add
@josevalim josevalim Provide a unique point for running initializers. c2e3ce8
@clst clst fixed example for :finder_sql
people.* will not work when the alias is named p
a6b15bd
@josevalim josevalim Give hooks the flexibility to choose the type of callback. c046660
@pokonski pokonski Default relative_url_root to ENV["RAILS_RELATIVE_URL_ROOT"]. Fixes #3365
5266eb9
@sferik sferik Use HTTPS rubygems source efc74f5
@sferik sferik Make quotes in Gemfile consistent (use single quotes) 3ffa01c
@josevalim josevalim Merge pull request #3946 from pokonski/relative_root
Fix #3365. Default config.relative_url_root to ENV["RAILS_RELATIVE_URL_ROOT"].
af308ff
@clst clst changed :finder_sql example to select *
because with select p.* you can no longer use count(). Using count will result in an SQL error message.
2be6df6
@spastorino spastorino Merge pull request #3948 from sferik/use_https_rubygems_source
Use HTTPS rubygems source
2fdc3ab
@guilleiguaran guilleiguaran Use rubygems https endpoint for the Gemfile on new apps f8fa383
@josevalim josevalim Update checker returns a boolean if callback was executed or not. 9a51053
@josevalim josevalim Allow reloader to be configured. ede647a
@bdurand bdurand Add ActiveSupport::Cache::NullStore to expose caching interface witho…
…ut actually caching for development and test environments.
04d5eae
@tenderlove tenderlove strip whitespace errors from the generated Gemfile b04e2d8
@josevalim josevalim Provide a dir => extension API to file update checker. 62cda03
@josevalim josevalim Speed up development by only reloading classes if dependencies files …
…changed.

This can be turned off by setting `config.reload_classes_only_on_change` to false.

Extensions like Active Record should add their respective files like db/schema.rb and db/structure.sql to `config.watchable_files` if they want their changes to affect classes reloading.

Thanks to https://github.com/paneq/active_reload and Pastorino for the inspiration. <3
fa1d9a8
@josevalim josevalim Merge pull request #3954 from bdurand/null_store_2
Add ActiveSupport::Cache::NullStore for testing and development
ffa8bfe
@sferik sferik Include TagHelper but don't explicitly require it
Allow autoloading to work as intended and avoid multiple requires.
196407c
@josevalim josevalim Merge pull request #3943 from sferik/add_explicit_requires
Include TagHelper but don't explicitly require it
400929f
@tenderlove tenderlove use the schema cache when asking for the primary key d12e6d0
Commits on Dec 13, 2011
@tenderlove tenderlove logger adds a newline for us 676092f
@drogus drogus Merge pull request #3950 from guilleiguaran/use-https-for-rubygems-in…
…-apps

Use rubygems https endpoint for the Gemfile on new apps
3d4f913
@tenderlove tenderlove use Array#join so that file encoding doesn't impact returned string.
Fixes #3957
810837d
@lest lest commented whitelist mode enforcement for mass assignment f2fa483
@lest lest missing require in activesupport test 8a9cf79
@josevalim josevalim Revert "Provide a unique point for running initializers."
This reverts commit c2e3ce8.

Conflicts:

	railties/lib/rails/application/configuration.rb
	railties/lib/rails/application/finisher.rb
	railties/lib/rails/engine.rb
11aa167
@josevalim josevalim Merge pull request #3960 from lest/activesupport-test-missing-require
missing require in activesupport test
f9df3ef
@josevalim josevalim Merge pull request #3958 from lest/comment-on-whitelist
commented whitelist mode enforcement for mass assignment
148d15d
@josevalim josevalim Add config.file_watcher so developers can provide their own watchers …
…(for instance, hooking on fsevents).
cd3033e
@josevalim josevalim Move hooks back to initializers (we need an API that allows hooks to …
…be replaced).
693d2be
@josevalim josevalim Clean up FileUpdateChecker API. 1f5b9bb
@lest lest missing require in buffered logger d060d6d
@josevalim josevalim FileUpdateChecker should be able to handle deleted files. 80256ab
@josevalim josevalim Merge pull request #3963 from lest/logger-missing-require
missing require in buffered logger
1668b90
@josevalim josevalim Fix failing AP tests. 0f4da5b
@Mik-die Mik-die typo in textile markup 485e024
@tenderlove tenderlove stop freezing hash value 8b85e4a
@tenderlove tenderlove stop freezing the details hash 9d87a67
@tenderlove tenderlove locale and default_locale may be the same, so uniq the array ab802e7
@lest lest log exception backtrace when all backtrace lines silenced 081431f
@josevalim josevalim Merge pull request #3970 from lest/backtrace-when-silenced
log exception backtrace when all backtrace lines silenced
5dc4868
@vijaydev vijaydev copy edits 23bd340
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails 74e46e5
@tenderlove tenderlove dup the details hash if a key has already been set for this object c7552d9
@jonleighton jonleighton Revert naive O(1) table_exists? implementation.
It was a bad idea to rescue exceptions here. This can interfere with
transaction rollbacks which seems to be the cause of current CI
failure.

Instead, each adapter should implement its own DB-specific O(1)
implementation, and we fall back on the generic, slower, implementation
otherwise.
38703ac
Commits on Dec 14, 2011
@josevalim josevalim Clean up details keys before some tests to expire the cache. f3531a8
@jonleighton jonleighton Unfluff the CI.
With transactional fixtures enabled, the session records would end up in
@_current_transaction_records, and at the end of the transaction,
methods would be called on them that would trigger method_missing and
trigger attribute methods to be generated.

However, at this point the sessions table would not exist, and the
columns were not cached, so an exception would be raised because we
can't find the columns to generate attribute methods for.

Not sure exactly why this didn't crop up before but there have been
changes to the schema cache code and perhaps that means that column data
that was cached previously at that point is now uncached.
3ab49f8
@jonleighton jonleighton Add return for 1.8.7 665ef11
@kommen kommen dbconsole: Use the app's database_configuration instead of duplicatin…
…g code.
6cbe270
@drogus drogus Merge pull request #3979 from kommen/dbconsole_db_config
dbconsole: Use the app's database_configuration instead of duplicating loading code.
a5589db
@choonkeat choonkeat Fix url_for options[:subdomain] to allow objects as values
* e.g. blog_url(subdomain: current_user) instead of blog_url(subdomain: current_user.to_param)
5f67cfe
@jonleighton jonleighton Use a separate module for 'external' attribute methods. bb44e5a
@jeremy jeremy Merge pull request #3981 from choonkeat/master
Fix url_for options[:subdomain] to allow objects as values
384a60a
@jonleighton jonleighton Stop the build asploding on 1.8.7 19bea9f
@josevalim josevalim Close the response body on cascade pass, closes #3975. e3a4eb4
@jonleighton jonleighton Avoid super; speeds up Model.new by about 12% 7b0edbb
@jonleighton jonleighton Cache column defaults on model. ~30% on Model.new due to avoiding rep…
…eatedly fetching connection.
18bf309
@abonec abonec Update activerecord/lib/active_record/reflection.rb 9e39dc4
@jonleighton jonleighton Don't try to autosave nested assocs. Fixes #2961. 909b337
@jonleighton jonleighton Remove that there copy/pasted code :bomb: 8a37970
@jonleighton jonleighton Fix #3672 again (dependent: delete_all perf) 889e8be
@lest lest fix separator insertion in date_select helper caa1c19
@josevalim josevalim Merge pull request #3988 from lest/fix-date-select
fix separator insertion in date_select helper
2a10b91
@fxn fxn let sdoc say which version of rdoc we depend on 800252c
@tenderlove tenderlove updating arel and journey dependencies b6105b0
@baroquebobcat baroquebobcat escape assigns[:person], assigns[person] etc in actioncontroller test…
…case
dcd59f2
Commits on Dec 15, 2011
@akaspick akaspick Allow nested attributes in associations to update values in it's owne…
…r object. Fixes a regression from 3.0.x
774ff18
@tenderlove tenderlove seed file was already tested for existence. ಠ_ಠ e938247
@ugisozols ugisozols Remove autoload for non-existent file. 8d82732
@josevalim josevalim Merge pull request #3990 from ugisozols/master
Remove autoload for non-existent file
ad87752
@abonec abonec Merge pull request #74 from abonec/master
Fixed typo in comments
bdcc271
@whilefalse whilefalse Added .sass-cache/ directory to the genrated gitignore in engines. 54f60c1
@jonleighton jonleighton Merge pull request #3991 from akaspick/attrfix
Allow nested attributes in associations to update values in it's owner o...
0ddb9d6
@josevalim josevalim Merge pull request #3994 from whilefalse/sass_cache_gitignore
Added .sass-cache/ directory to the genrated gitignore in engines.
d7e714a
@jonleighton jonleighton Fix #3987. 8dba32f
@josevalim josevalim There isn't a column_hash. It was being invoked by method missing. de947c6
@josevalim josevalim Clean up the cache before the request in case we are running in the r…
…eload_classes_only_on_change schema.
283a087
@josevalim josevalim Fix diagnostics page for routing errors. 26e7400
@josevalim josevalim Improve delegate list to avoid method missing. 1af2a1d
@rafacv rafacv Fixed small typo in the Rails::Engine documentation. 4baf145
@fxn fxn Merge pull request #3998 from rafacv/master
Small typo in Rails::Engine documentation
22bd21d
@josevalim josevalim Make with_scope public so we stop using send :bomb: 1e8b751
@josevalim josevalim Move delegation reponsibilities of Relation to a module. Also precomp…
…ile method missing calls for rofscale.
b17bc58
@josevalim josevalim Set up delegations also for to_a and arel branches. 8854bf2
@jonleighton jonleighton Split out most of the AR::Base code into separate modules :cake: ceb33f8
@jonleighton jonleighton Let AttributeMethods do its own including etc 17ad71e
@jonleighton jonleighton Move DefaultScope and NamedScope under Scoping 2b22564
@fxn fxn it's -> its 5e0dec5
@fxn fxn removes Ruby constraint in RedCloth dependency dbfc6b8
Commits on Dec 16, 2011
@arunagw arunagw Warning removed "warning: (...) interpreted as grouped expression" aa39149
@drogus drogus Merge pull request #4002 from arunagw/warning_removed_grouped_expression
Warning removed "warning: (...) interpreted as grouped expression"
8015f90
@josevalim josevalim Get rid of the close checks since we cannot reliably close the sessio…
…n anyway.
d142572
@josevalim josevalim Extract the rendering of public exceptions pages into a Rack app. deef8dd
@josevalim josevalim Allow a custom exceptions app to set. 02127e6
@josevalim josevalim Improve the specs on exceptions app. 7dd1c75
@josevalim josevalim ShowExceptions should understand X-Cascade responses from exceptions …
…app.
5359262
@josevalim josevalim Do not raise an exception if an invalid route was generated automatic…
…ally.
192e55c
@josevalim josevalim Show detailed exceptions no longer returns true if the request is loc…
…al in production.
654df86
@josevalim josevalim Update CHANGELOGs and guides. 6481bc5
@josevalim josevalim Fix failing asset test. dbe28f3
@josevalim josevalim Wait a full second so we have time for changes to propagate 4fe76f4
@jonleighton jonleighton Cache columns at the model level.
Allows two models to use the same table but have different primary keys.
0b08ff7
@jonleighton jonleighton Defaults hash can go on the model dee94d8
@jonleighton jonleighton Don't store defaults in the schema cache 7f20bb9
@jonleighton jonleighton Should clear the primary keys cache also 7b1eeea
@jonleighton jonleighton Fix the build on postgres. Note: we should probably actually make sch…
…ema mutations bust the cache.
eba5818
@jonleighton jonleighton Delete obsolete comment f307f4d
@kommen kommen Make structure file configureable in db:structure:dump analog to SCHE…
…MA in db:schema dump and clean up a bit.
aa92d37
@exviva exviva Fix expanding cache key for single element arrays
In short:
expand_cache_key(element) should not equal expand_cache_key([element])

This way a fragment cache key for an index page with only a single
element in the collection is different than a fragment cache for a
typical show page for that element.
abe915f
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails bd84b2b
@vijaydev vijaydev Merge pull request #3780 from marcbowes/master
Fix favicon_link_tag help text
5f6bcd7
@devton devton Fixed bug when error message is an empty string. 66e747b
@josevalim josevalim Merge pull request #4006 from devton/validation_error_on_message_is_e…
…mpty_part_2

Fixed bug when error message is an empty string.
05316ba
@fxn fxn AS::Concern is not really needed for AR::Explain 0065f37
@josevalim josevalim Merge pull request #4007 from exviva/expand_cache_key_for_one_element…
…_array

Fix expanding cache key for single element arrays
4f35d5a
Commits on Dec 17, 2011
@arunagw arunagw warning removed "warning: instance variable @variable_for_layout not …
…initialized"
23334be
@josevalim josevalim Merge pull request #4008 from arunagw/warning_variable_for_layout
warning removed "warning: instance variable @variable_for_layout not ini...
3346de6
@arunagw arunagw Fixed test "ArgumentError: wrong number of arguments(1 for 0)" 4fac64b
@josevalim josevalim Merge pull request #4010 from arunagw/fix_test_activemodel
Fixed test "ArgumentError: wrong number of arguments(1 for 0)"
1bfed9e
@lest lest call scope within unscoped to prevent duplication of where values 04cea56
@josevalim josevalim Use gem versions of sass-rails and coffee-rails. 8de9694
@justincampbell justincampbell Allow symbols to be passed for extension aliases 4d5266e
@justincampbell justincampbell Add test for type aliases a87690b
@kirs kirs Rake tasks generator with test 5e68fed
@justincampbell justincampbell Add test for register_alias 27f3619
@josevalim josevalim Merge pull request #4012 from JustinCampbell/master
Allow symbols to be passed as extension aliases in Mime::Type.register
9412130
@spastorino spastorino Add campfire notifications for travis 7bde2e2
@schneems schneems add help text to routing error
When a newcomer hits the routing error page they
are often confused about how to trouble shoot the
next step. Adding a simple help text can gently 
remind coders where to get more help.
921dcc2
@josevalim josevalim Merge pull request #4015 from schneems/schneems/routing_error_help
Add Help Text to Routing Error
d2951eb
@drogus drogus Merge pull request #4009 from kirs/generate-rake-task
Rake tasks generator
fe72f7d
Commits on Dec 18, 2011
@arunagw arunagw No need 'abstract_unit' here. It's already in 'generators_test_helper' 1e50af9
@josevalim josevalim Merge pull request #4017 from arunagw/remove_extra_require
No need 'abstract_unit' here. It's already in 'generators_test_helper'
5da7927
@lest lest bypass preloading for ids_reader
when fetching ids for a collection, bypass preloading
to avoid the unnecessary performance overhead
109db5a
@arunagw arunagw Warning removed in test ff502d9
@josevalim josevalim Merge pull request #4018 from arunagw/warning_removed_
Warning removed in test
1214e16
@jonleighton jonleighton Merge pull request #4011 from lest/scope-with-lambda-duplicates
call scope within unscoped to prevent duplication of where values
81c67c1
@jonleighton jonleighton Merge pull request #4014 from lest/bypass-preloading-for-ids-reader
bypass preloading for ids_reader
de2306f
@kommen kommen Rename STRUCTURE to DB_STRUCTURE, update dump task description and ad…
…d simple testcase.
a2249ee
@josevalim josevalim Merge pull request #4019 from kommen/rake_db_structure
Make structure.sql file configureable in db:structure:dump analog to SCHEMA in db:schema:dump
81deb34
@josevalim josevalim Update activerecord/lib/active_record/railties/databases.rake e8d6943
@vijaydev vijaydev fix a minor typo c59409b
@jonleighton jonleighton Don't notify campfire when the build keeps passing 4012fcf
Commits on Dec 19, 2011
@Juanmcuello Juanmcuello Fix database tasks in test namespace. 876bade
@josevalim josevalim Merge pull request #4030 from Juanmcuello/database_tasks
Fix database tasks in test namespace.
a0edfb4
@josevalim josevalim Revert "Merge pull request #4030 from Juanmcuello/database_tasks"
This reverts commit a0edfb4, reversing
changes made to 4012fcf.
3c1884e
@Juanmcuello Juanmcuello Fix database tasks in test namespace.
This is mostly the same as 876bade
that was reverted due to test failures, but now with a correction.
626c881
@tenderlove tenderlove adding tests for #4029 9d0789c
@drogus drogus Merge pull request #4036 from Juanmcuello/database_tasks
Fix database tasks in test namespace.
61d0de2
Commits on Dec 20, 2011
@dhh dhh Add an invitation to use jbuilder, since we are not going to bundle i…
…t in 3.2
1e941dd
@dhh dhh Party like its R-C-UNO! 9d6e52b