aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge pull request #5020 from KL-7/fix-blank-image_tag-sourceJosé Valim2012-05-182-2/+3
* | Merge pull request #6390 from ernie/invalid-ruby18-syntax-in-habtmRafael Mendonça França2012-05-181-2/+2
|\ \
| * | Fix HABTM syntax error in Ruby 1.8.xErnie Miller2012-05-181-2/+2
|/ /
* | fix #delete_all with habtm with :delete_sqlJon Leighton2012-05-182-0/+7
* | Perf: Don't load the association for #delete_all.Jon Leighton2012-05-186-9/+48
* | Merge pull request #6377 from ihid/depreciate_old_text_helper_apisRafael Mendonça França2012-05-183-36/+56
|\ \
| * | Deprecate old APIs for highlight, excerpt and word_wrapJeremy Walker2012-05-183-36/+56
|/ /
* | Merge pull request #6367 from frodsan/fix_validators_docsVijay Dev2012-05-179-116/+154
|\ \
| * | fix validations docsFrancesco Rodriguez2012-05-179-116/+154
|/ /
* | Fix CollectionAssociation#replace to return new target (closes #6231)Piotr Sarnacki2012-05-162-0/+14
* | Merge pull request #6340 from bcardarella/patch-3Aaron Patterson2012-05-161-1/+1
|\ \
| * | Changing the indentation level of the block comment close for SASS Brian Cardarella2012-05-151-1/+1
|/ /
* | Merge pull request #6329 from acapilleri/backport_dup_validation_3_2Rafael Mendonça França2012-05-151-1/+9
|\ \
| * | add backport for the pull request #6324Angelo Capilleri2012-05-151-1/+9
|/ /
* | Fix indent from previous mergeCarlos Antonio da Silva2012-05-151-2/+2
* | Merge pull request #6324 from acapilleri/dup_validation_3_2Rafael Mendonça França2012-05-152-0/+21
|\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 02:40:55 +0000