aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4543 from jdelStrother/find_or_initJon Leighton2012-02-012-2/+13
| | | | Don't instantiate two objects in collection proxy / find_or_instantiate_by
* Merge pull request #4827 from sikachu/3-2-stable-fix-plugin-newJosé Valim2012-02-012-3/+7
|\ | | | | Fix plugin_new test failure from c8c84397
| * Fix plugin_new test failure from c8c84397Prem Sichanugrist2012-02-012-3/+7
|/ | | | | `plugin_new` generator doesn't generate `sass-rails` in the Gemfile, so you can't check for that.
* Merge pull request #4822 from carlosantoniodasilva/strict-validation-3-2José Valim2012-02-013-11/+19
|\ | | | | Generate strict validation error messages with attribute name (3-2-stable)
| * Generate strict validation error messages with attribute nameCarlos Antonio da Silva2012-02-013-11/+19
| | | | | | | | Backported from master.
* | Merge pull request #4815 from kennyj/fix_4749Santiago Pastorino2012-02-012-2/+7
|\ \ | | | | | | Fix GH #4749. Remove branch options, because edge is not 3-2-stable.
| * | Fix GH #4749. Remove branch options, because edge is not 3-2-stable.kennyj2012-02-012-2/+7
| | |
* | | Merge pull request #4811 from rafaelfranca/3-2-stable-fixSantiago Pastorino2012-01-313-13/+13
|\| | | | | | | | Fix broken build in 3-2-stable branch
| * | Fix broken tests added by 85c724d59Rafael Mendonça França2012-01-313-13/+13
|/ /
* | Improve deprecation messageJon Leighton2012-01-311-7/+17
| |
* | Merge pull request #4735 from arton/masterAaron Patterson2012-01-311-1/+5
| | | | | | | | Re-launch assets:precompile task using original $0 if $0 is batch file so it works on Windows
* | Merge pull request #4779 from bsodmike/bsodmike-3-2-stableAaron Patterson2012-01-311-1/+1
|\ \ | | | | | | Update comment in Gemfile re Unicorn (minor clarification)
| * | clarification to prevent confusing newbies; Passenger/Unicorn are app ↵Michael de Silva2012-01-311-1/+1
| | | | | | | | | | | | servers, Apache/Nginx are the web servers along with thin a la Heroku etc.
* | | Merge pull request #4793 from kennyj/fix_4760José Valim2012-01-312-2/+11
|\ \ \ | | | | | | | | [3-2-stable] Fix GH #4760. A Block was not evaluated.
| * | | Fix GH #4760. A Block was not evaluated.kennyj2012-01-312-2/+11
| | | |
* | | | Merge pull request #4783 from gregolsen/ids_reader_fixJon Leighton2012-01-313-1/+6
| | | | | | | | | | | | | | | | ids_reader method fixed, test added to has_many association (for PostgreSQL)
* | | | Merge pull request #4790 from marten/fix-require-deprecation-in-activesupportJosé Valim2012-01-314-0/+7
|\ \ \ \ | | | | | | | | | | Fix Deprecation usage in ActiveSupport when requiring only parts of AS
| * | | | Fix use of Deprecation without requiring active_support/deprecation in whiny nilMarten Veldthuis2012-01-311-0/+2
| | | | |
| * | | | Fix use of Deprecation without requiring active_support/deprecation in ↵Marten Veldthuis2012-01-311-0/+1
| | | | | | | | | | | | | | | | | | | | message verifier
| * | | | Fix use of Deprecation without requiring active_support/deprecation in ↵Marten Veldthuis2012-01-311-0/+2
| | | | | | | | | | | | | | | | | | | | ActiveSupport::Concern in Base64
| * | | | Fix use of Deprecation without requiring active_support/deprecation in ↵Marten Veldthuis2012-01-311-0/+2
|/ / / / | | | | | | | | | | | | ActiveSupport::Concern
* | | | Merge pull request #4786 from lest/patch-2José Valim2012-01-311-1/+1
|\ \ \ \ | |/ / / |/| | | fix assets test in 3-2-stable
| * | | fix assets testSergey Nartimov2012-01-311-1/+1
|/ / /
* | | Allow writing unknown attributes, but with a deprecation warning. Closes #4583.Jon Leighton2012-01-312-4/+14
| | |
* | | Add workaround and deprecation if the inherited hook is not executed. Closes ↵Jon Leighton2012-01-312-0/+22
| | | | | | | | | | | | #4757.
* | | Merge pull request #4763 from kennyj/fix_4754Jon Leighton2012-01-312-1/+17
|/ / | | | | | | [MySQL] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES
* | query cache instrumentation should included the bindings in the payload ↵Xavier Noria2012-01-301-1/+1
| | | | | | | | [closes #4750]
* | fix typo [ci skip]Vijay Dev2012-01-301-1/+1
| |
* | Inline the prefix assignment so it doesnt look so daftDavid Heinemeier Hansson2012-01-271-2/+1
| |
* | Revert "Fix expanding cache key for single element arrays"David Heinemeier Hansson2012-01-272-16/+8
| | | | | | | | | | | | This reverts commit abe915f23777efe10f17d611bf5718ca855a0704. This broke all existing keys and it's wrong anyway. The array is just there as a convenience option for building the string. It's intentional that [ "stuff"] and "stuff" generates the same key.
* | Merge check box fixes from remote-tracking branch ↵José Valim2012-01-273-5/+18
|\ \ | |/ |/| | | 'cantonio/checkbox-hidden-backport' into 3-2-stable
| * don't set the hidden checkbox value if it's nilDamien Mathieu2012-01-272-1/+9
| |
| * check_box helper with :disabled => true generates disabled hidden field. ↵Tadas Tamošauskas2012-01-273-5/+8
|/ | | | fixes #1953
* Merge pull request #4715 from pwim/find-create-multi-argsJon Leighton2012-01-272-1/+12
| | | | Fix regression from Rails 3.1
* fixes whitespace in CHANGELOG entriesXavier Noria2012-01-263-3/+3
|
* updating RAILS_VERSIONXavier Noria2012-01-269-9/+9
|
* CHANGELOG revision for v3.2.1Xavier Noria2012-01-267-2/+50
|
* Revert usage of safe constantizeJosé Valim2012-01-261-1/+3
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* safe_constantize should handle wrong constant name NameErrors Fixes #4710Alex Tambellini2012-01-262-3/+4
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* bumping journey to 1.0.1Aaron Patterson2012-01-261-1/+1
|
* Merge pull request #4696 from rafaelfranca/issue-4653Aaron Patterson2012-01-261-2/+0
|\ | | | | Remove extra attributes from HABTM join tables in AR tests
| * Remove extra attributes from HABTM join tables in AR testsRafael Mendonça França2012-01-261-2/+0
| | | | | | | | | | | | | | | | | | HABTM Join tables should not have extra attributes When extra attributes is needed in HABTM join tables is better to use `has_many :through` association. Fix #4653
* | global variables may not be set depending on the match. fixes #4703Aaron Patterson2012-01-262-1/+8
| |
* | registers 2483460 in the CHANGELOGXavier Noria2012-01-261-3/+5
| |
* | disable automatic explain if there is no logger [closes #4671]Xavier Noria2012-01-263-1/+20
|/
* Fix contributing guide to reflect preferred position on indentationbrainopia2012-01-261-1/+1
| | | | | | | | | | | Fix incorrect recommendation from indenting after private/protected to not. Based on opinions of @spastorino, @jonleighton, @tenderlove https://github.com/rails/rails/pull/1838#issuecomment-1440281 https://en.twitter.com/#!/spastorino/status/142054749351575552 https://en.twitter.com/#!/tenderlove/status/142014046445641728 https://en.twitter.com/#!/jonleighton/status/142021813415841794
* call to_s on value passed to table_name=Sergey Nartimov2012-01-262-1/+6
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge pull request #4675 from lunks/3-2-stableAaron Patterson2012-01-251-1/+1
|\ | | | | Duping log handler on buffered logger silencer.
| * Duping log handler. fixes #4668Pedro Nascimento2012-01-251-1/+1
| |
* | Merge pull request #4673 from carlosantoniodasilva/validation-guides-update-3-2Vijay Dev2012-01-256-25/+34
|\ \ | |/ |/| Validation guides update 3 2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 11:41:17 +0000