Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5219 from ↵ | Aaron Patterson | 2012-02-29 | 3 | -4/+17 |
|\ | | | | | | | | | mattfawcett/2781-fix-querystring-route-constraint-for-testing Fix for #2781 | ||||
| * | Fix the assert_recognizes test method so that it works when there are | Matt Fawcett | 2012-02-24 | 3 | -4/+17 |
| | | | | | | | | constraints on the querystring. Issue #2781 | ||||
* | | fix api doc [ci skip] | Vijay Dev | 2012-03-01 | 1 | -1/+1 |
| | | |||||
* | | adds a nodoc [ci skip] | Vijay Dev | 2012-03-01 | 1 | -1/+1 |
| | | | | | | | | We have an empty api doc page otherwise :) | ||||
* | | Merge pull request #5221 from kennyj/fix_warning_20120301 | Jeremy Kemper | 2012-02-29 | 1 | -3/+0 |
|\ \ | | | | | | | Fix warning: assigned but unused variable | ||||
| * | | Fix warning: assigned but unused variable | kennyj | 2012-03-01 | 1 | -3/+0 |
|/ / | |||||
* | | reduced localhost check to two method calls | Aaron Patterson | 2012-02-28 | 1 | -2/+3 |
| | | |||||
* | | Merge pull request #5214 from bdurand/fix_session_cache_store_require | Jeremy Kemper | 2012-02-28 | 1 | -1/+0 |
|\ \ | | | | | | | remove unnecessary memcache require in ActionDispatch CacheStore | ||||
| * | | remove unnecessary memcache equire in ActionDispatch::Session::CacheStore | Brian Durand | 2012-02-28 | 1 | -1/+0 |
|/ / | |||||
* | | Merge pull request #5212 from MarkMT/master | Xavier Noria | 2012-02-28 | 1 | -8/+19 |
|\ \ | | | | | | | update_only documentation for accepts_nested_attributes_for | ||||
| * | | Modified comments explaining what the update_only option does. | Mark | 2012-02-28 | 1 | -8/+19 |
| | | | |||||
* | | | Merge pull request #5208 from ysoslow/ef79b8400f064361b2dbe1ee89f42d2adc103a3c | Aaron Patterson | 2012-02-28 | 1 | -5/+3 |
|\ \ \ | | | | | | | | | Inject in constantize | ||||
| * | | | Inflector/constantize - inject method lets us to avoid using another variable | homa | 2012-02-28 | 1 | -5/+3 |
| | | | | |||||
* | | | | Merge pull request #5196 from lest/patch-3 | José Valim | 2012-02-28 | 2 | -0/+14 |
|\ \ \ \ | | | | | | | | | | | force datetime attributes to be changed, fix GH #3965 | ||||
| * | | | | force datetime attributes to be changed, fix GH #3965 | Sergey Nartimov | 2012-02-28 | 2 | -0/+14 |
| | | | | | |||||
* | | | | | minor edits [ci skip] | Vijay Dev | 2012-02-28 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-02-28 | 4 | -2/+20 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | move the strict validations to an appropriate section and some edits [ci skip] | Vijay Dev | 2012-02-28 | 1 | -14/+12 |
| | | | | | |||||
| * | | | | copy edits [ci skip] | Vijay Dev | 2012-02-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add brief summary of strict validations added in 3.2. | Oliver Legg | 2012-02-27 | 1 | -0/+14 |
| | | | | | |||||
| * | | | | Correct NullStore cache store name in caching guide | Toby Matejovsky | 2012-02-27 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | document how to create non show paths from an array of parameters | Florent Guilleux | 2012-02-26 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | reverted regular expression fix | Tima Maslyuchenko | 2012-02-26 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'master' of github.com:lifo/docrails | Tima Maslyuchenko | 2012-02-26 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | layout affects views not methods | Rajinder Yadav | 2012-02-26 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | fixed regular expression in Specifying Constraints section | Tima Maslyuchenko | 2012-02-26 | 1 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge pull request #4284 from mattdbridges/time_calculation_aliases | Xavier Noria | 2012-02-28 | 6 | -6/+80 |
|\ \ \ \ \ | | | | | | | | | | | | | Added aliases for prev_year, prev_month, and prev_week in Time and Date calculations | ||||
| * | | | | | Adding :last_week, :last_month, and :last_year aliases to Time and Date | Matt Bridges | 2012-02-21 | 6 | -6/+80 |
| | | | | | | | | | | | | | | | | | | | | | | | | core extensions | ||||
* | | | | | | Merge pull request #5199 from gabehollombe/master | Xavier Noria | 2012-02-28 | 1 | -2/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | The language for describing how to configure ActionController::Base.asset_host could be clearer | ||||
| * | | | | | | Change asset_host config language to be more helpful and accurate | Gabe Hollombe | 2012-02-28 | 1 | -2/+3 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #5197 from lest/patch-4 | José Valim | 2012-02-27 | 1 | -6/+0 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | remove unnecessary code | ||||
| * | | | | | remove unnecessary code | Sergey Nartimov | 2012-02-28 | 1 | -6/+0 |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | it was added in 36129f21b86db4bd69e932e586129e246c2a5ca8 but isn't useful anymore as corresponding tests pass without it | ||||
* | | | | | Revert "only mutate the scope object in the `bind` method" | Aaron Patterson | 2012-02-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 1b9e19cd22f2b5d5e7b82e042f92340822c0f966. | ||||
* | | | | | call binmode on the tempfile for Ruby 1.8 compatibility | Aaron Patterson | 2012-02-27 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | only mutate the scope object in the `bind` method | Aaron Patterson | 2012-02-27 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | bind value creation refactoring | Aaron Patterson | 2012-02-27 | 1 | -4/+10 |
|/ / / / | |||||
* | | | | removing dead code | Aaron Patterson | 2012-02-27 | 1 | -3/+2 |
| | | | | |||||
* | | | | use bind values for join columns | Aaron Patterson | 2012-02-27 | 6 | -12/+36 |
| | | | | |||||
* | | | | Merge pull request #5191 from rafaelfranca/fix-393 | Aaron Patterson | 2012-02-27 | 3 | -38/+38 |
|\ \ \ \ | | | | | | | | | | | Add a new line after the textarea opening tag. | ||||
| * | | | | Add a new line after the textarea opening tag. | Rafael Mendonça França | 2012-02-27 | 3 | -38/+38 |
| | | | | | | | | | | | | | | | | | | | | Closes #393 | ||||
* | | | | | Merge pull request #5168 from kennyj/fix_5152 | Aaron Patterson | 2012-02-27 | 2 | -1/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | [PostgreSQL] Remove NULLS FIRST/LAST. Closes #5152 | ||||
| * | | | | | Remove NULLS FIRST/LAST. closes #5152 | kennyj | 2012-02-25 | 2 | -1/+6 |
| | | | | | | |||||
* | | | | | | Merge pull request #5173 from kennyj/fix_3931-2 | Aaron Patterson | 2012-02-27 | 3 | -12/+23 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931 (Try again). | ||||
| * | | | | | | Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931. | kennyj | 2012-02-26 | 3 | -12/+23 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #5179 from RalphShnelvar/Binary_mode_Window_bug | Aaron Patterson | 2012-02-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binary mode window bug | ||||
* | | | | | | | Merge pull request #5192 from amatsuda/rdoc_task_19 | José Valim | 2012-02-27 | 2 | -14/+3 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | no need to rescue when requiring 'rdoc/task' in Ruby >= 1.9 | ||||
| * | | | | | | ruby19: no need to rescue when requiring 'rdoc/task' in Ruby >= 1.9 | Akira Matsuda | 2012-02-27 | 2 | -14/+3 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #5185 from rafaelfranca/fix-collection_helpers | José Valim | 2012-02-26 | 3 | -37/+76 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix collection helpers | ||||
| * | | | | | | Fix collection_check_boxes and collection_radio_buttons when using local | Rafael Mendonça França | 2012-02-26 | 2 | -0/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | variables in the form builder | ||||
| * | | | | | | Add documentation to object method of CollectionHelpers::Builder | Rafael Mendonça França | 2012-02-26 | 1 | -6/+6 |
| | | | | | | |