aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge pull request #7084 from LTe/logger_default_separator"Aaron Patterson2012-07-182-14/+3
* Merge pull request #7095 from davekaro/masterRafael Mendonça França2012-07-183-7/+7
|\
| * revert Default timestamps to non-nullDave Kroondyk2012-07-183-7/+7
|/
* Merge pull request #6614 from carlosgaldino/data-confirmRafael Mendonça França2012-07-1811-74/+58
|\
| * Remove `:confirm` in favor of `:data => { :confirm => 'Text' }` optionCarlos Galdino2012-07-1811-74/+58
|/
* Merge pull request #7084 from LTe/logger_default_separatorJosé Valim2012-07-182-3/+14
|\
| * Don't use default separatorPiotr Niełacny2012-07-182-3/+14
* | Update changelog for migration generator changeJosé Valim2012-07-181-0/+7
* | Merge pull request #7082 from jalkoby/lazy_lookup_in_abstract_controllerJosé Valim2012-07-182-1/+20
|\ \ | |/ |/|
| * add lazy look up in abstract controller's translate methodSergey Pchelincev2012-07-182-1/+20
|/
* Merge pull request #7028 from lexmag/join_table_indexesJosé Valim2012-07-187-16/+66
|\
| * Add join table migration generatorAleksey Magusev2012-07-187-16/+66
* | Merge pull request #6626 from route/render_formatsJosé Valim2012-07-1712-4/+33
|\ \
| * | Common behavior with adding formats to lookup_context for TemplateRenderer an...Dmitry Vorotilin2012-07-1812-4/+33
|/ /
* | Merge pull request #7081 from jfirebaugh/to_param_regression_masterJon Leighton2012-07-172-1/+7
|\ \
| * | AR::Integration must be included after AM::ConversionJohn Firebaugh2012-07-172-1/+7
|/ /
* | Add support for optional root segments containing slashesAndrew White2012-07-172-1/+28
* | Merge pull request #7076 from kennyj/fix_class_evalAaron Patterson2012-07-175-6/+6
|\ \
| * | Fix class_eval without __FILE__ and __LINE__.kennyj2012-07-185-6/+6
* | | Merge pull request #7072 from beerlington/fix_validations_with_scopeJon Leighton2012-07-172-1/+17
|\ \ \ | |/ / |/| |
| * | Fixes "Cannot visit ..." with validates_uniqueness_ofbeerlington2012-07-172-1/+17
|/ /
* | Merge pull request #7006 from jaredbeck/issue_7005_explain_asset_debugPiotr Sarnacki2012-07-161-1/+1
|\ \
| * | A more informative comment for config.asset.debugJared Beck2012-07-161-1/+1
* | | Merge pull request #7066 from wkang/masterRafael Mendonça França2012-07-161-1/+1
|\ \ \
| * | | Fix activerecord model to_ary method comment 'see also' linkKang Wen2012-07-161-1/+1
|/ / /
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-07-1511-38/+218
|\ \ \
| * | | session_id column is string in defaultkennyj2012-07-151-1/+1
| * | | add note about requiring gem dependencies before initialization [ci skip]Francesco Rodriguez2012-07-131-6/+28
| * | | Added note about feature requests and rails-core list.Steve Klabnik2012-07-131-0/+2
| * | | Updated with_routing example to 3.x syntax [ci skip]Wojciech Wnętrzak2012-07-131-7/+4
| * | | Change Assertion language to Expected/Actual from obj1/obj2Scott Stewart2012-07-121-5/+5
| * | | Fixes typo in CommentsController#create example Andy Lindeman2012-07-111-1/+1
| * | | Fix typoChun-wei Kuo2012-07-111-1/+1
| * | | [getting started] update a code listingSimon Hengel2012-07-101-0/+1
| * | | use 'use_zone' method in example, instead of reimplementing itJakub Kuźma2012-07-101-5/+5
| * | | Add info note about sass/coffeescript use in engine assets to guideMarten Veldthuis2012-07-091-0/+2
| * | | Fixed second assert_match - previous one didn't make any sense (if the first ...Jakub Kuźma2012-07-091-1/+1
| * | | It's better to pass strings to assert_match - it converts them to regular exp...Jakub Kuźma2012-07-091-2/+2
| * | | Revert "Select missing formbuilder typo."Dan Patrick2012-07-081-2/+2
| * | | Select missing formbuilder typo.Dan Patrick2012-07-081-2/+2
| * | | Document building complex forms using accepts_nested_attributes_forFrederick Cheung2012-07-081-8/+127
| * | | Add docs for having, lock and readonlyOscar Del Ben2012-07-071-0/+12
| * | | Add doc for joins and improve includes docOscar Del Ben2012-07-071-2/+17
| * | | Add docs for eager_laod and preloadOscar Del Ben2012-07-071-0/+10
* | | | adds a missing require [fixes #6896]Xavier Noria2012-07-152-1/+1
* | | | Merge pull request #7057 from kennyj/fix_sql_bypass_problemRafael Mendonça França2012-07-142-1/+15
|\ \ \ \
| * | | | Fix SqlBypass.data_column= problem. SqlBypass.find_by_session_id method didn'...kennyj2012-07-152-1/+15
* | | | | Merge pull request #7056 from kennyj/avoid_twice_callRafael Mendonça França2012-07-141-6/+8
|\| | | |
| * | | | Avoid to call send(store_attribute) twice.kennyj2012-07-151-6/+8
|/ / / /
* | | | Merge pull request #7053 from pferdefleisch/activesupport-timely-requiresXavier Noria2012-07-143-0/+14
|\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 12:48:21 +0000