aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge branch '3-2-stable-sec' into 3-2-relAaron Patterson2012-05-315-5/+66
| |\
| * | updating changelogsAaron Patterson2012-05-317-4/+32
| * | Merge pull request #6558 from parndt/fix_regressionAaron Patterson2012-05-301-3/+4
* | | Merge branch '3-2-stable-sec' into 3-2-stableAaron Patterson2012-05-3114-22/+83
|\ \ \ | | |/ | |/|
| * | Strip [nil] from parameters hash.Aaron Patterson2012-05-302-1/+28
| * | predicate builder should not recurse for determining where columns.Aaron Patterson2012-05-303-4/+38
| |/
| * bumping to 3.2.4.rc1Aaron Patterson2012-05-289-17/+17
* | Merge pull request #6562 from martinoconnor/generator-fix-stableRafael Mendonça França2012-05-302-2/+2
|\ \
| * | Changed symbol platform to platforms for the commented out call to gem 'theru...Martin O'Connor2012-05-302-2/+2
|/ /
* | Merge pull request #6558 from parndt/fix_regressionAaron Patterson2012-05-301-3/+4
|\ \
| * | Revert "Removes unneeded caching from ActiveRecord::Base.relation"Philip Arndt2012-05-311-3/+4
|/ /
* | Merge pull request #6477 from steveklabnik/close_discovered_pg_connectionRafael Mendonça França2012-05-301-1/+2
* | Merge pull request #6553 from erichmenge/3-2-stable-json-patchPiotr Sarnacki2012-05-304-10/+32
|\ \
| * | Deprecate ActiveSupport::JSON::VariableErich Menge2012-05-303-4/+20
| * | True, False, and Nil should be represented in as_json as themselves.Erich Menge2012-05-302-6/+12
* | | Merge pull request #5810 from kennyj/fix_5797Aaron Patterson2012-05-304-5/+15
|/ /
* | Merge pull request #6519 from oscardelben/3-2-stableCarlos Antonio da Silva2012-05-292-7/+11
|\ \
| * | Remove irrelevant assertionOscar Del Ben2012-05-291-7/+0
| * | Display annotations from .coffee files in `rake notes`Bartlomiej Kozal2012-05-282-7/+18
| |/
* | Merge pull request #6531 from freerange/3-2-stable-minitest-passthrough-excep...Rafael Mendonça França2012-05-292-2/+47
|\ \ | |/ |/|
| * Exceptions like Interrupt should not be rescued in tests.James Mead2012-05-292-2/+47
|/
* Fix railties_order when application object is passedPiotr Sarnacki2012-05-272-1/+5
* Merge pull request #6494 from pwim/no-memcache-requireJosé Valim2012-05-271-1/+0
|\
| * remove unnecessary memcache equire in ActionDispatch::Session::CacheStoreBrian Durand2012-05-261-1/+0
|/
* Merge pull request #5244 from fotos/myqsl2_wait_timeoutRafael Mendonça França2012-05-251-1/+1
* Merge pull request #5925 from Juanmcuello/pg_structure_dumpCarlos Antonio da Silva2012-05-241-2/+2
|\
| * Use Shellwords to scape arguments in db:structure:dump for PostgreSQL.Juan M. Cuello2012-05-221-2/+2
* | Merge pull request #6467 from aselder/3-2-stableAaron Patterson2012-05-231-10/+12
|\ \ | |/ |/|
| * Synchronize the ConnectionPool#release method to avoid thread safety issues [...Andrew Selder2012-05-231-10/+12
|/
* Merge pull request #6451 from chancancode/3-2-stable_restore_frozen_state_on_...Rafael Mendonça França2012-05-221-2/+4
|\
| * Fixes the build break caused by 9ee8528 in #6445.Godfrey Chan2012-05-221-2/+4
|/
* Merge pull request #6445 from chancancode/3-2-stable_restore_frozen_state_on_...Rafael Mendonça França2012-05-222-1/+13
|\
| * Restore the frozen state on rollback. Fixes #6417.Godfrey Chan2012-05-222-1/+13
|/
* Use require_dependency in generated controllersPiotr Sarnacki2012-05-223-4/+4
* Merge pull request #6418 from pwnall/pgsql_bytea_limit3Aaron Patterson2012-05-212-8/+20
|\
| * Postgresql doesn't accept limits on binary (bytea) columns.Victor Costan2012-05-212-8/+20
* | Merge pull request #6423 from lest/patch-2Carlos Antonio da Silva2012-05-213-2/+10
|\ \
| * | Assets: don't add extension if other given and file existsSergey Nartimov2012-05-213-2/+10
|/ /
* / More info on commit messages in contributing guidePiotr Sarnacki2012-05-211-1/+33
|/
* Fix generators to help with ambiguous `ApplicationController` issuePiotr Sarnacki2012-05-204-5/+24
* Merge pull request #6410 from Bodacious/tag_helper_data_fix_3-2-stableRafael Mendonça França2012-05-202-3/+3
|\
| * Fixed tag_helper data-attribute bug with BigDecimalsBodacious2012-05-202-3/+3
* | Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614cJosé Valim2012-05-201-10/+22
|\ \ | |/ |/|
| * Prevent concurrent compilation of templates - closes #6400Tom Clarke2012-05-201-10/+22
* | Improve docs for `try` by adding note on `BasicObject`Piotr Sarnacki2012-05-201-0/+4
* | Fix uniqueness validator with `allow_nil: false` also for mysqlPiotr Sarnacki2012-05-191-1/+1
* | Fix `validates_uniqueness_off :field, :allow_nil => false`Piotr Sarnacki2012-05-192-2/+13
* | Use right option for excerpt text helper in tests, fix buildCarlos Antonio da Silva2012-05-192-10/+10
* | Merge pull request #6398 from pmahoney/threadsafe-connection-poolAaron Patterson2012-05-191-4/+8
* | Ensure that CollectionAssociation#replace returns proper targetPiotr Sarnacki2012-05-192-3/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 20:00:05 +0000