aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Update documentation and change the range method name to delimiter.Rafael Mendonça França2012-07-203-5/+7
* | | | | | | Don't pass `:within` option to the i18nRafael Mendonça França2012-07-203-2/+24
* | | | | | | `validates_inclusion_of` and `validates_exclusion_of` now acceptRafael Mendonça França2012-07-203-3/+26
* | | | | | | Merge pull request #7099 from f1sherman/sweeper-clean-up-if-exception-raisedRafael Mendonça França2012-07-202-2/+18
|\ \ \ \ \ \ \
| * | | | | | | Clean up Sweeper controller accessor when an Error is raisedBrian John2012-07-202-2/+18
| |/ / / / / /
* | | | | | | Convert association macros to the new syntaxJon Leighton2012-07-2016-135/+136
* | | | | | | Avoid options ever being nilJon Leighton2012-07-202-8/+8
* | | | | | | Merge pull request #7106 from LTe/default_separator_updatedCarlos Antonio da Silva2012-07-201-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Use join without default separatorPiotr Niełacny2012-07-201-2/+2
* | | | | | | | Don't assume resource param is :id when using shallow routesAndrew White2012-07-202-1/+15
* | | | | | | | Support constraints on resource custom params when nestingAndrew White2012-07-202-9/+24
* | | | | | | | adding Rails::Queueing::ContainerAaron Patterson2012-07-194-6/+63
* | | | | | | | Merge pull request #7078 from kennyj/logging_query_planRafael Mendonça França2012-07-192-2/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Log query plan when we use count_by_sql method.kennyj2012-07-182-2/+14
* | | | | | | | | Create default join table name using a SymbolCarlos Antonio da Silva2012-07-191-1/+1
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Use attributes instead of table names in migration exampleJosé Valim2012-07-191-1/+1
* | | | | | | | Merge pull request #7097 from lexmag/join_table_gen_attrJosé Valim2012-07-185-8/+24
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add fkey attributes to `join_table` migration generatorAleksey Magusev2012-07-195-8/+24
* | | | | | | | 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