aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Change unless + else into if + elseShaliko Usubov2012-05-061-3/+3
* Merge pull request #6180 from soulim/fix_submit_tag_docVijay Dev2012-05-061-1/+1
|\
| * Fix typo in submit_tag helper documentationAlex Soulim2012-05-061-1/+1
|/
* Update actionpack/CHANGELOG.mdJosé Valim2012-05-061-1/+5
* Merge pull request #2313 from ssoroka/masterJosé Valim2012-05-065-15/+33
|\
| * remove .new from raise ActionController::UnknownFormatSteven Soroka2012-05-061-1/+1
| * added an integration test that checks ActionController::UnknownFormat renders...Steven Soroka2012-05-061-0/+9
| * Raise a rescuable exception when Rails doesn't know what to do with the forma...Steven Soroka2012-05-064-15/+24
|/
* Merge pull request #6173 from mhfs/takes_instead_firstJeremy Kemper2012-05-053-5/+17
|\
| * Use `take` instead of `first` to avoid unwanted implicit ordering (fixes #6147)Marcelo Silveira2012-05-053-5/+17
* | Merge pull request #6069 from mipearson/use_strict_mode_in_mysqlJeremy Kemper2012-05-056-1/+54
|\ \
| * | Changelog entry regarding mysql(2) STRICT_ALL_TABLESMichael Pearson2012-05-051-0/+6
| * | Add config option, rdoc, tests for mysql(2) STRICT_ALL_TABLES mode.Michael Pearson2012-05-054-4/+38
| * | Default to 'strict mode' in MySQLMichael Pearson2012-05-052-0/+11
| * | Modify test schema.rb to use a VARCHAR rather than a TEXT when a default is r...Michael Pearson2012-05-051-1/+3
* | | Merge pull request #6054 from flexoid/column-fixJon Leighton2012-05-052-3/+31
|\ \ \
| * | | Prevent creating valid time-like objects from blank string from dbEgor Lynko2012-05-052-3/+31
* | | | Revert "Merge pull request #5494 from armstrjare/active_record_relation_keep_...Jon Leighton2012-05-054-43/+6
|/ / /
* | | Merge pull request #5494 from armstrjare/active_record_relation_keep_associat...Jon Leighton2012-05-054-6/+43
|\ \ \
| * | | Allow ActiveRecord::Relation merges to maintain context of joined associationsJared Armstrong2012-05-044-6/+43
* | | | Make RedCloth not convert double hyphens to emdashes. Closes #5292Vijay Dev2012-05-061-0/+6
* | | | Merge pull request #6176 from nashby/checkboxesJosé Valim2012-05-052-1/+10
|\ \ \ \
| * | | | check checkboxes with array of strings as :checked optionVasiliy Ermolovich2012-05-052-1/+10
| | |_|/ | |/| |
* | | | some corrections in the AR query guide [ci skip]Vijay Dev2012-05-051-13/+15
* | | | Merge pull request #6175 from mhfs/guide_take_first_lastVijay Dev2012-05-051-8/+42
|\ \ \ \ | |/ / / |/| | |
| * | | Update `first`, `last` and `take` in guidesMarcelo Silveira2012-05-051-8/+42
|/ / /
* | | Try to convert object passed to debug_hash to hashPiotr Sarnacki2012-05-051-2/+2
* | | Merge pull request #6169 from marcandre/respond_to_missingJosé Valim2012-05-056-6/+24
|\ \ \ | |_|/ |/| |
| * | Use respond_to_missing for TimeWithZoneMarc-Andre Lafortune2012-05-052-3/+4
| * | Use respond_to_missing? for CharsMarc-Andre Lafortune2012-05-052-2/+11
| * | Use respond_to_missing? for OrderedOptionsMarc-Andre Lafortune2012-05-052-1/+9
* | | Give more detailed instructions in script/rails in enginePiotr Sarnacki2012-05-041-0/+4
* | | Duplicate column_defaults properly (closes #6115)Piotr Sarnacki2012-05-043-2/+12
* | | Change unless + ! into ifPiotr Sarnacki2012-05-041-1/+1
* | | Merge pull request #3713 from kf8a/masterAaron Patterson2012-05-042-2/+19
|\ \ \
| * | | postgresql adapter handles quoting of not a number (NaN) and InfinitySven Bohm2011-11-212-2/+19
* | | | need to dup the default options so that mutations will not impact usAaron Patterson2012-05-041-1/+1
* | | | make sure the superclass matches so load order does not matterAaron Patterson2012-05-042-2/+2
* | | | Merge pull request #6156 from mjtko/feature-beginning_of_hourJeremy Kemper2012-05-045-0/+56
|\ \ \ \
| * | | | added beginning_of_hour support to core_ext calculations for Time and DateTimeMark J. Titorenko2012-05-045-0/+56
* | | | | Merge pull request #6163 from carlosantoniodasilva/wrap-params-refactorJeremy Kemper2012-05-041-1/+1
|\ \ \ \ \
| * | | | | Use Hash#fetch instead of has_key? checkCarlos Antonio da Silva2012-05-041-1/+1
* | | | | | Merge pull request #6157 from mjtko/fix-activesupport-time_with_zone-testsAndrew White2012-05-041-8/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | enable tests for beginning_of_* and end_of_* within time zone tests; enable t...Mark J. Titorenko2012-05-041-8/+8
| |/ / / /
* | | | | Merge pull request #4445 from nragaz/role_based_params_wrappingJosé Valim2012-05-042-4/+18
* | | | | Merge pull request #5808 from avakhov/assert-template-layout-improveJosé Valim2012-05-043-6/+60
|\ \ \ \ \
| * | | | | Improve assert_template layout checkingAlexey Vakhov2012-05-042-3/+30
| * | | | | Fix assert_template :layout => nil assertionAlexey Vakhov2012-05-042-2/+17
| * | | | | Fix assert_template assertion with :layout optionAlexey Vakhov2012-05-043-1/+13
|/ / / / /
* | | | | Merge pull request #6160 from carlosantoniodasilva/resource-route-canonical-a...Aaron Patterson2012-05-043-5/+13
|\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 07:56:21 +0000