Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove unnecessary assertions. We should only test the before_seq isn't same ↵ | kennyj | 2012-05-16 | 1 | -5/+1 |
| | | | | to the after_seq when using sequencer. | ||||
* | Merge pull request #5571 from jarkko/5559-fix-dst-jump-bug-on-master | Aaron Patterson | 2012-05-15 | 2 | -0/+23 |
|\ | | | | | [#5559] Do not black out the system timezone DST jump hour if Time.zone ... | ||||
| * | [#5559] Do not black out the system timezone DST jump hour if Time.zone ↵ | Jarkko Laine | 2012-03-24 | 2 | -0/+23 |
| | | | | | | | | | | | | | | | | differs from that. The system timezone DST jump hour should not be blacked out by Time.zone.parse if current Time.zone does not do the jump at that time. Fixes #5559. | ||||
* | | Remove extra `end` in arel_table docs. [ci skip] | Carlos Antonio da Silva | 2012-05-15 | 1 | -8/+6 |
| | | | | | | | | Introduced in 7ecfe3d30ccfaee8dcca4ee649cc006c090bdfb4 | ||||
* | | Merge pull request #6284 from acapilleri/dup_validation | Carlos Antonio da Silva | 2012-05-15 | 2 | -0/+21 |
|\ \ | | | | | | | clean the erros if an object that includes validation is duped. | ||||
| * | | clean the erros if an object that includes validations errors is duped. ↵ | Angelo Capilleri | 2012-05-13 | 2 | -0/+21 |
| | | | | | | | | | | | | Fixes #5953 | ||||
* | | | Revert "Revert "Remove `:disable_with` in favor of `'data-disable-with'` ↵ | José Valim | 2012-05-15 | 6 | -57/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | option from `submit_tag`, `button_tag` and `button_to` helpers."" Finally remove `:disable_with` but use `:data => { :disable_with => ... }` in examples to show off a better API (which looks nicer in Ruby 1.9) This reverts commit a5c38a9c087e33d36397afc496be7c8e01b37ef0. | ||||
* | | | Revert "Remove `:disable_with` in favor of `'data-disable-with'` option from ↵ | José Valim | 2012-05-15 | 6 | -13/+57 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `submit_tag`, `button_tag` and `button_to` helpers." `disable_with:` is much easier to type than `"data-disable-with" =>`, and the fact it uses "data-disable-with" => is an implementation concern, it should not affect the public API. This reverts commit 683fc4db00f496e5225928afb4d4e932e0fcdc48. | ||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-15 | 70 | -341/+161 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb | ||||
| * | | | missing dot [ci skip] | Vijay Dev | 2012-05-15 | 1 | -1/+1 |
| | | | | |||||
| * | | | copy edit asset guide [ci skip] | Vijay Dev | 2012-05-15 | 1 | -7/+5 |
| | | | | |||||
| * | | | Removing ==Examples and last blank lines of docs from actionpack | Francesco Rodriguez | 2012-05-15 | 32 | -183/+56 |
| | | | | |||||
| * | | | code-format italicized 'production' env [ci skip] | Mark Rushakoff | 2012-05-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | s/aff/add [ci skip] | Mark Rushakoff | 2012-05-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add documentation for arel_table | Oscar Del Ben | 2012-05-14 | 1 | -0/+8 |
| | | | | |||||
| * | | | Minor editing of getting started guide | Oscar Del Ben | 2012-05-14 | 1 | -3/+11 |
| | | | | |||||
| * | | | Merge branch 'master' of github.com:lifo/docrails | Oscar Del Ben | 2012-05-14 | 252 | -1613/+3273 |
| |\ \ \ | |||||
| | * | | | remove docs on Range#step | Vasiliy Ermolovich | 2012-05-14 | 1 | -12/+0 |
| | | | | | |||||
| | * | | | Removing ==Examples and last blank lines of docs from railties | Francesco Rodriguez | 2012-05-14 | 6 | -61/+0 |
| | | | | | |||||
| | * | | | 'Netherlands locale' does not make any sense, it's Dutch locale [ci skip] | Ayrton De Craene | 2012-05-14 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Improved the readability of some sentences [ci skip] | Ayrton De Craene | 2012-05-14 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | fix format in getting started guide [ci skip] | Vijay Dev | 2012-05-14 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | adding examples to deep_dup method | Francesco Rodriguez | 2012-05-14 | 1 | -1/+23 |
| | | | | | |||||
| | * | | | Missed colon | Alexey Vakhov | 2012-05-14 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | removing unnecessary 'examples' noise from activesupport | Francesco Rodriguez | 2012-05-13 | 21 | -74/+11 |
| | | | | | |||||
| | * | | | Fixing Hash#stringify_keys docs | Francesco Rodriguez | 2012-05-13 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge pull request #98 from acapilleri/mispelling_asset | Angelo Capilleri | 2012-05-13 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | | | mispelling asset_tag_helper | ||||
| | | * | | | mispelling asset_tag_helper | Angelo Capilleri | 2012-05-13 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Correct code wrapping around content of welcome/index.html.erb | Ryan Bigg | 2012-05-14 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Wrap 'Missing template posts/new' error message in a blockquote for better ↵ | Ryan Bigg | 2012-05-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | formatting | ||||
| | * | | | | Rails actually has one root route defined | Ryan Bigg | 2012-05-14 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Separate CR out in CRUD explanation, explain each letter one at a time | Ryan Bigg | 2012-05-14 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Re-enforce/re-explain what happens when you go to root route (Welcome#index) ↵ | Ryan Bigg | 2012-05-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | better | ||||
| | * | | | | Briefly explain static file routing in the getting started guide | Ryan Bigg | 2012-05-14 | 1 | -1/+1 |
| | |/ / / | |||||
| | * | | | marking self in Hash#symbolize_keys! | Francesco Rodriguez | 2012-05-13 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | added example to Hash#symbolize_keys | Francesco Rodriguez | 2012-05-13 | 1 | -2/+5 |
| | | | | | |||||
| | * | | | unnecessary 'examples' noise in Hash#assert_valid_keys docs | Francesco Rodriguez | 2012-05-13 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | added example to Hash#stringify_keys | Francesco Rodriguez | 2012-05-13 | 1 | -1/+5 |
| | | | | | |||||
| | * | | | adding examples to Hash#deep_merge method | Francesco Rodriguez | 2012-05-13 | 1 | -2/+7 |
| | | | | | |||||
| | * | | | Update docs to public_send for Object#try | Oscar Del Ben | 2012-05-13 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | update docs on Object#try | Vasiliy Ermolovich | 2012-05-13 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | [guides] add local precompilation section | Richard Hulse | 2012-05-13 | 1 | -1/+36 |
| | | | | | |||||
| * | | | | Initial proof reading of getting started guide | Oscar Del Ben | 2012-05-07 | 1 | -19/+22 |
| | | | | | |||||
* | | | | | Merge pull request #6318 from mpapis/master | José Valim | 2012-05-15 | 1 | -0/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | fix `bundle exec rails new app` not running `bundle install` properly | ||||
| * | | | | | prevent using already loaded Gemfile for 'bundle install', fix #6314 | Michal Papis | 2012-05-15 | 1 | -0/+8 |
|/ / / / / | |||||
* | | | | | Merge pull request #6317 from korny/routes-draw-backtrace | Piotr Sarnacki | 2012-05-14 | 4 | -3/+55 |
|\ \ \ \ \ | | | | | | | | | | | | | add tests and external file backtrace for Routing::Mapper#draw | ||||
| * | | | | | add tests and external file backtrace for Routing::Mapper#draw | Kornelius Kalnbach | 2012-05-15 | 4 | -3/+55 |
| | | | | | | |||||
* | | | | | | Merge pull request #6186 from anydiem/fix_unconventional_pks | Rafael Mendonça França | 2012-05-14 | 2 | -1/+13 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Set the primary key during #copy_table if necessary. Fixes [#2312] | ||||
| * | | | | | Set the primary key during #copy_table if necessary. Fixes [#2312] | Sean Scally | 2012-05-14 | 2 | -1/+13 |
| | | | | | | |||||
* | | | | | | Use merge! instead reverse_merge! here | Santiago Pastorino | 2012-05-14 | 1 | -1/+1 |
| | | | | | |