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 13, 2011
@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
@nashby nashby add failing tests for issue #3487 024d3b9
@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
@josevalim josevalim Remove i18n dependencies from AP and AMo since they are in AS. 5d91364
Xu Pan don't encode an UTF-8 encoded template
Signed-off-by: José Valim <jose.valim@gmail.com>
1897be9
@josevalim josevalim Do not hard code encoding to UTF8 2e0050c
@josevalim josevalim Check if source is encoding aware. 2305a98
@lest lest remove warnings about @variable_for_layout
Signed-off-by: José Valim <jose.valim@gmail.com>
e97aa2c
@josevalim josevalim Add a test case for layout nil. f29b4a0
@josevalim josevalim Depend on 3-2-stable. 51e8adb
@htanata htanata Improve doc for ActiveRecord::Base.unscoped. e149d50
@atambo atambo Fix reference to old :sql schema_format location
After 15fb430 the default location of the :sql schema_format location was
changed from environment_name.sql to structure.sql. This pull request updates
a reference to the old schema format location in the migration guides.
fec2999
@nashby nashby fix adding field_with_errors to date selects, closes #3487 9208813
@josevalim josevalim Merge pull request #4064 from nashby/date-helper-field-error-proc
fix adding field_with_errors to date selects, closes #3487
437f1e0
@arunagw arunagw It should be README.rdoc fixes #4067 490c00b
@spastorino spastorino Merge pull request #4069 from arunagw/issue_4067
It should be README.rdoc
cf2d31a
@heimidal heimidal Ensure option for select helper responds to `#first` before comparison. bd89946
@heimidal heimidal Check for response to `#last` instead of `#first`. a1b2dbd
@josevalim josevalim Merge pull request #4080 from heimidal/3-2-stable
Fix regression in select form helper when options are non-string values
a2f5df5
Commits on Dec 21, 2011
@htanata htanata Doc fixes on Rails::Generators::Base.hook_for. efb75f7
@jeremy jeremy Rails::SubTestTask warns on test failure and moves on. Renamed from T…
…estTaskWithoutDescription.

This makes it easier to add your own tests to the default suite:

  namespace :test do
    task run: 'test:acceptance'

    Rails::SubTestTask.new acceptance: 'test:prepare' do |t|
      t.libs << 'test'
      t.pattern = 'test/acceptance/**/*_test.rb'
    end
  end

Now `rake` runs unit, functional, integration, and acceptance tests.
e854848
@tenderlove tenderlove caches should not be global, so no need to clear in the teardown 79778ff
@tenderlove tenderlove adding integration test for journey #7 d5ccb5c
@jeremy jeremy Move SubTestTask. Soften up tests. 108e344
@qoobaa qoobaa added failing tests for has_many, has_one and belongs_to associations…
… with strict mass assignment sanitizer, fixed build_record to not merge creation_attributes, removed failing nested attributes tests (that feature was broken anyway) #4051

Signed-off-by: José Valim <jose.valim@gmail.com>
2d07c60
@lucasmazza lucasmazza raises an ArgumentError if no valid options are given to TemplateRend…
…erer#determine_template

Signed-off-by: José Valim <jose.valim@gmail.com>
b5bb3f8
@tenderlove tenderlove append puts the routes after the default, which causes a 404. instead…
… use prepend
476dce4
@tenderlove tenderlove just require things once 1945baf
Commits on Dec 22, 2011
@arunagw arunagw [docs] added missing "}" fixes #4126 8dc8926
@drogus drogus Merge pull request #4128 from arunagw/doc_fixes_3_2-stable
Doc fixes 3 2 stable
278a72e
@tenderlove tenderlove Revert "Added Enumerable#pluck to wrap the common pattern of collect(…
…&:method) *DHH*"

This reverts commit 4d20de8.
c0563ce
@tenderlove tenderlove Merge branch '3-2-stable' of github.com:rails/rails into 3-2-stable
* '3-2-stable' of github.com:rails/rails:
  [docs] added missing "}" fixes #4126
89e2647
@jonleighton jonleighton Make read_attribute code path accessible at the class level 7edade3
@jonleighton jonleighton Make ActiveRecord::Relation#pluck work with serialized attributes e46e491
@tenderlove tenderlove refactoring routing tests 585e291
@spastorino spastorino Use sass-rails >= 3.2.2 for new apps 6758941
@tenderlove tenderlove rack bodies should be a list 2bc3f81
@tenderlove tenderlove Merge branch '3-2-stable' of github.com:rails/rails into 3-2-stable
* '3-2-stable' of github.com:rails/rails:
  Use sass-rails >= 3.2.2 for new apps
  Make ActiveRecord::Relation#pluck work with serialized attributes
  Make read_attribute code path accessible at the class level
f2e65b7
Commits on Dec 23, 2011
@tenderlove tenderlove Adding an integration test. Fixes #4136 a32d3d0
@tenderlove tenderlove adding an integration test for splat regexp substitutions. fixes #4138 5f2bfce
@jonleighton jonleighton Fix build when IM=true 96c38ec
@josevalim josevalim Merge pull request #4141 from arunagw/fix_build
Fix build 3-2-stable
35ded6f
@fxn fxn removes Enumerable#pluck from the AS guide 824334c
@alvarobp alvarobp serialize fails on subclass 6b9ab88
@jonleighton jonleighton Fix #4046. 7bb754e
@jonleighton jonleighton Doh, remove debugging line 9d9440f
@vijaydev vijaydev Rails 3.2 Release Notes 4a86708
@jonleighton jonleighton Fix situation where id method didn't get defined causing postgres to …
…fail
0a2e379
Commits on Dec 24, 2011
@jeremy jeremy Remove broken #compute_source_path 684448b
@ai ai Gzip files on page caching
Signed-off-by: José Valim <jose.valim@gmail.com>
754823d
@josevalim josevalim Provide a class optin for page_cache_compression. ba86892
@josevalim josevalim Remove unecessary config_accessors. c4ef3d3
@german german added ability to specify from cli when generating a model/migration w…
…hether particular property should be an index like this 'rails g model person name:string:index profile:string'
7f5b516
@josevalim josevalim Tidy up migration types. 557014d
@josevalim josevalim Update CHANGELOGs. fc42998
@josevalim josevalim Fix regexp intervals. 1db5f4e
@vijaydev vijaydev minor edits in caching guide 853439c
@vijaydev vijaydev add latest changes to 3.2 release notes 929bfb8
@josevalim josevalim assert_not_match -> assert_no_match. 0e8cbbe
@tenderlove tenderlove delegating and deprecating logger#silence. fixes #4159 b590fe4
@tenderlove tenderlove avoid deprecation warnings when running AR tests a410a9c
@josevalim josevalim Last attempt to fix 1.8.7 tests. bea3524
Commits on Dec 25, 2011
@fxn fxn (draft) guides for the Kindle and Kindle apps [Mip Earson & Xavier No…
…ria]
69cc645
@kuroda kuroda Reconnect to the first database after db:create
Otherwise, the schema and seed will be loaded onto the
test database.
38bc917
@tenderlove tenderlove Merge pull request #4175 from kuroda/3-2-stable
Reconnect to the first database after db:create
0daf80a
@fxn fxn guides generation for the Kindle looking good now [Mip Earson & Xavie…
…r Noria]
4ae1cdd
@fxn fxn download guides for the Kindle and Kindle apps from the home page d6d561e
@fxn fxn registers guide generation for the Kindle and Kindle apps in the Chan…
…gelog
7ec8473
@mipearson mipearson Mip Earson -> Michael Pearson in changelog. 51fd3f3
@vijaydev vijaydev fix kindle apps link in edge guides index 7a3121b
@vijaydev vijaydev Some fixes in rails guides generation
* Passing edge information to the views fixes the lack of the edge badge
and sets the appropriate welcome page on edgeguides.rubyonrails.org.
* Changes in the welcome message to hyper link the rails tree based on
the version.
* Mention the Amazon url from where kindlegen can be downloaded.
68564eb
@vijaydev vijaydev add back the version info to the title in guides index page 4cf40d0
Commits on Dec 26, 2011
@drogus drogus Correctly display rack apps with dynamic constraints in RoutesInspector
If you used dynamic constraint like that:

  scope :constraint => MyConstraint.new do
    mount RackApp => "/foo"
  end

routes were not displayed correctly when using `rake routes`.
This commit fixes it. If you want nice display of dynamic
constraints in `rake routes` output, please just override
to_s method in your constraint's class.
d7cfb63
Commits on Dec 27, 2011
@gazay gazay Safe getting value from cache entry f7b1906
@tapajos tapajos Closes #4208 b3490d8
Commits on Dec 28, 2011
@josevalim josevalim Merge pull request #4210 from tapajos/patch-1
Fix #4208
d547761
@tapajos tapajos Remove empty line. 7767159
@fxn fxn Merge pull request #4217 from tapajos/patch-2
Remove empty line
40cab62
@bensie bensie Further simplify singleton_class checking in class_attribute 520918a
@spastorino spastorino Bump to rack 1.4.0 2004a13
@spastorino spastorino Add CHANGELOG entry a0fd9fb
@tenderlove tenderlove Merge pull request #4196 from gazay/3-2-stable-marshalling
3.2 stable marshalling
df37018
@jonleighton jonleighton Revert "Further simplify singleton_class checking in class_attribute"
This reverts commit 520918a.

Reason: build failure
bbafe73
@fxn fxn app code in general wants Time.current, not Time.now 7a80ac0
Commits on Dec 29, 2011
@tenderlove tenderlove last named route wins. fixes #4164
This differs from route recognition where first recognized route wins.
This will not be supported in Rails 4.0 so that route recognition and
generation rules are consistent.
50af25b
@tenderlove tenderlove Revert "Merge pull request #4196 from gazay/3-2-stable-marshalling"
This reverts commit df37018, reversing
changes made to a0fd9fb.
80f2eeb
@tenderlove tenderlove Merge pull request #4216 from edgecase/master_fix_reorder_with_limite…
…d_ids

allow reorder to affect eager loading correctly
f423bdc
@gazay gazay Backward compatibility with 3.1 cache storing b815676
@ugisozols ugisozols Remove unnecessary comma. bea4f9a
@joliss joliss Document that index names are made up of all columns, not just the fi…
…rst.

index_name has been using the following expression

    "index_#{table_name}_on_#{Array.wrap(options[:column]) * '_and_'}"

since at least 2006 (bc7f231), and that's how they come out in my DB.

Please check that this is correct before merging into master, perhaps
I'm misunderstanding the section I changed.
d8a43e2
@fuzzyalej fuzzyalej Fixed formatting of code examples in form_tag_helper.rb 5f57d2a
@kevmoo kevmoo Documented about using :path option for resources 2e533e3
@vijaydev vijaydev revise some doc changes 63c6fee
@tenderlove tenderlove fixing typo. Thanks Vijay! 766eda3
Commits on Dec 30, 2011
@lest lest refactor Range#include? to handle ranges with floats
Conflicts:

	activesupport/lib/active_support/core_ext/range/include_range.rb
71f59b7
@fxn fxn adds a comments that clarifies why Range#include? chooses the compari…
…son operator
0814e74
@tenderlove tenderlove Merge pull request #4227 from gazay/3-2-stable-marshalling
3 2 stable marshalling
f12d904
Commits on Dec 31, 2011
@vijaydev vijaydev remove wiki link 0a048f3
@vijaydev vijaydev fix a couple of formatting issues ba19837
@sumbach sumbach Minor readability improvements 003d0ff
@sumbach sumbach SCSS processor is provided by the sass gem 95a83cc
@fuzzyalej fuzzyalej Fixed documentation error in code examples from form_tag_helper.rb 8be9d92
Commits on Jan 01, 2012
@vijaydev vijaydev DRY up guides index page
Use the list of guides available in documents.yaml to fill in the
menu in the index page instead of duplicating the list again. Also,
remove WIP guides from the menu.
6e9cd38
Commits on Jan 02, 2012
@lest lest deprecate ActiveSupport::Base64
extend and define ::Base64 if needed
5f09414
@fxn fxn Merge pull request #4267 from lest/3-2-deprecate-activesupport-base64
deprecate ActiveSupport::Base64
7bdfbac
@lest lest fix base64 requires 4f440a3
@fxn fxn Merge pull request #4268 from lest/3-2-deprecate-activesupport-base64
fix base64 requires
e369c4e
Commits on Jan 03, 2012
@lest lest use pg 0.11.0 under ruby 1.8.7 0b5cda7
@josevalim josevalim Merge pull request #4273 from lest/fix-pg-version
use pg 0.11.0 under ruby 1.8.7
2535898
@spastorino spastorino Deprecate Rails::Plugin in favor of gems 853de2b
@lest lest deprecate AS::Base64 methods without DeprecatedConstantProxy 1fc53df
@josevalim josevalim Merge pull request #4275 from lest/3-2-deprecate-activesupport-base64
deprecate AS::Base64 methods without DeprecatedConstantProxy
c032ff6
@spastorino spastorino Merge pull request #4278 from kennyj/fix_rdoc_generating_problem
Use -e option instead of -c option (rake rdoc task).
ca24ee7
@tenderlove tenderlove Merge pull request #4279 from lest/fix-log
do not rewrite log during application bootstrap
eafdf6c
@spastorino spastorino Add font_path helper method 0d7d3a6
@bogdan bogdan AS::Callbacks: improve __define_runner perfomance 9f8f4c2
@bogdan bogdan AS::Callbacks: improved __define_runner performance 4e8286f
@bogdan bogdan Refactor AS::Callbacks
Extracted `__reset_runner` from `__define_runner`
And call it in proper places
5b8d270
@bogdan bogdan AS::Callbacks: remove __define_runner 40c8aa7
@josevalim josevalim Override respond_to? since we are also overriding method_missing. d38dac8
@josevalim josevalim Merge pull request #4280 from lest/3-2-backport-callbacks
backport changes in AS::Callbacks
124536e
@spastorino spastorino Pass extensions to javascript_path and stylesheet_path helpers. Closes 8c129f1
@lest lest add CHANGELOG entry for AS::Base64 deprecation 337ac05
@spastorino spastorino Merge pull request #4281 from lest/3-2-changelog
add CHANGELOG entry for AS::Base64 deprecation
caa6cde
@tenderlove tenderlove Merge pull request #4283 from lest/fix-singleton-checking
use correct variant of checking whether class is a singleton
c4a29de
@tenderlove tenderlove Revert "Named Routes shouldn't override existing ones (currently rout…
…e recognition goes with the earliest match, named routes use the latest match)"

This reverts commit 71d769e.
e912211
@tenderlove tenderlove When generating routes, the last defined named route wins. This is in
contrast to route recognition where the first recognized route wins.
This behavior will not exist in Rails 4.0.

See:

  #4245
  #4164
63f7a61
Commits on Jan 04, 2012
@kennyj kennyj Fix GH #4285. Remove options when we record calling creat_table 6012970
@josevalim josevalim Merge pull request #4288 from kennyj/fix_4285-2
(3-2-stable) Fix GH #4285. Remove options when we record calling create_table
a10f309
@imkmf imkmf Final grammar checkup on 3.2 release notes. 6bcc1b8
@vijaydev vijaydev updates to 3.2 release notes bc36613
@ffmike ffmike General editing pass over assets pipeline guide 20a4258
@elpic elpic improve doc in number helper options 00a27c5
@vijaydev vijaydev copy edits 4b2b595
@spastorino spastorino Revert "use pg 0.11.0 under ruby 1.8.7"
There's a new pg release, no need for this anymore
This reverts commit 0b5cda7.
3fb32cf
@spastorino spastorino Use sass-rails 3.2.3 f8df37b
@tenderlove tenderlove Merge pull request #4282 from edgecase/order_after_reorder
correctly handle order calls after a reorder
d22592a
@jeremy jeremy Clarify vendor/plugins deprecation warning d9e0c4a
@jeremy jeremy Add release notes URL to vendor/plugins deprecation warning. Update C…
…HANGELOG.
49a1017
@josevalim josevalim Revert "AS::Callbacks: remove __define_runner"
Runners are used internally.

This reverts commit 40c8aa7.
0b24dc9
@spastorino spastorino Bump to rc2 d268ef2