Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #11370 from dpdawson/master | Rafael Mendonça França | 2013-07-08 | 1 | -1/+1 |
|\ | | | | | Fix a grammatical error/typo in Active Record Migrations guide. [ci skip] | ||||
| * | Fix a grammatical error/typo in Active Record Migrations guide. [ci skip] | Daniel Dawson | 2013-07-08 | 1 | -1/+1 |
|/ | |||||
* | refactor to_sql so it does not depend on the to_sql implementation of | Aaron Patterson | 2013-07-08 | 1 | -4/+11 |
| | | | | the connection | ||||
* | Merge pull request #11355 from wangjohn/class_for_rails_commands | Rafael Mendonça França | 2013-07-08 | 2 | -94/+172 |
|\ | | | | | Creating a class for carrying out rails commands. | ||||
| * | Creating a class for carrying out rails commands. | wangjohn | 2013-07-07 | 2 | -94/+172 |
| | | | | | | | | | | | | This class encapsulates a lot of logic that wasn't very object oriented. Helper methods have been created to try to make things more logical and easy to read. | ||||
* | | Merge pull request #11367 from artemeff/sass_in_notes | Rafael Mendonça França | 2013-07-08 | 3 | -2/+8 |
|\ \ | | | | | | | handle notes in *.sass files | ||||
| * | | handle notes in *.sass files | Yuri Artemev | 2013-07-08 | 3 | -2/+8 |
| | | | |||||
* | | | Merge pull request #11363 from dpdawson/master | Carlos Antonio da Silva | 2013-07-08 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | Fix 2 grammatical errors/typos in Active Record Basics guide. [ci skip] | ||||
| * | | Fix 2 grammatical errors/typos in Active Record Basics guide. [ci skip] | Daniel Dawson | 2013-07-08 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #11359 from willnet/patch-1 | Yves Senn | 2013-07-08 | 1 | -1/+0 |
|\ \ | | | | | | | Update 'Active Record Migrations' guide [ci skip] | ||||
| * | | Update 'Active Record Migrations' guide [ci skip] | Shinichi Maeshima | 2013-07-08 | 1 | -1/+0 |
| |/ | | | | | | | Delete an unneeded line. | ||||
* | | Fix SyntaxError in guides sample code | Akira Matsuda | 2013-07-08 | 1 | -1/+1 |
| | | | | | | | | [ci skip] | ||||
* | | 1.9 Hash Syntax | Akira Matsuda | 2013-07-08 | 4 | -4/+4 |
| | | |||||
* | | params keys are Strings | Akira Matsuda | 2013-07-08 | 1 | -13/+13 |
|/ | |||||
* | Add CHANGELOG entry for #11348 | Rafael Mendonça França | 2013-07-07 | 1 | -0/+14 |
| | |||||
* | Merge pull request #11348 from sanemat/fix/link-to-block | Rafael Mendonça França | 2013-07-07 | 2 | -1/+8 |
|\ | | | | | Fix actionview link_to with block and url_hash | ||||
| * | Include block in a argument shift | sanemat | 2013-07-08 | 1 | -6/+2 |
| | | |||||
| * | Fix link_to with block and url_hash | sanemat | 2013-07-07 | 2 | -1/+12 |
| | | | | | | | | | | | | Use link_to with block and url_hash, expect block as name. But ignore block and use url_hash as name. 3-2-stable passes this test. 4-0-stable and master fail this. | ||||
* | | Fix "Stack Level Too Deep" error when rendering recursive partials | Rafael Mendonça França | 2013-07-07 | 5 | -3/+40 |
| | | | | | | | | | | | | | | When rendering recursive partial Action View is trying to generate the view digest infinitly causing a stack level error. Fixes #11340 | ||||
* | | Merge pull request #11347 from ankit8898/refactoring-sp | Rafael Mendonça França | 2013-07-07 | 4 | -109/+92 |
|\ \ | | | | | | | Refactored strong parameters usage and updated Gemfile.lock with Rails 4 | ||||
| * | | Refactored strong paramters usage and updated Gemfile.lock with Rails 4 | Ankit Gupta | 2013-07-07 | 4 | -109/+92 |
| | | | |||||
* | | | Merge pull request #11317 from ma2gedev/enforcer_tag_option | Rafael Mendonça França | 2013-07-07 | 3 | -2/+39 |
|\ \ \ | | | | | | | | | Added an `enforce_utf8` hash option for `form_tag` method | ||||
| * | | | Added an `enforce_utf8` hash option for `form_tag` method | Takayuki Matsubara | 2013-07-07 | 3 | -2/+39 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Control to output a hidden input tag with name `utf8` without monkey patching Before: form_tag # => '<form>..<input name="utf8" type="hidden" value="✓" />..</form>' After: form_tag # => '<form>..<input name="utf8" type="hidden" value="✓" />..</form>' form_tag({}, { :enforce_utf8 => false }) # => '<form>....</form>' | ||||
* | | | Merge pull request #11274 from arunagw/deprecation-removed-build-fixed | Rafael Mendonça França | 2013-07-07 | 1 | -20/+0 |
|\ \ \ | |/ / |/| | | Deprecation removed build fixed | ||||
| * | | Removed unused test for DateTime.local_offset | Arun Agrawal | 2013-07-07 | 1 | -20/+0 |
| | | | | | | | | | | | | see discussion here #11274 | ||||
* | | | Merge pull request #11313 from gsamokovarov/url-encoded-params-test | Rafael Mendonça França | 2013-07-06 | 1 | -25/+27 |
|\ \ \ | | | | | | | | | Cleanup ul_encoded_params_parsing_test | ||||
| * | | | Cleanup ul_encoded_params_parsing_test | Genadi Samokovarov | 2013-07-05 | 1 | -25/+27 |
| | | | | |||||
* | | | | Merge pull request #11324 from blahedo/master | Rafael Mendonça França | 2013-07-06 | 6 | -27/+53 |
|\ \ \ \ | | | | | | | | | | | Cleanup on getting_started tutorial | ||||
| * | | | | Cleaned up wording and tags. | blahedo | 2013-07-06 | 6 | -27/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced <br /> with <br> for consistency; Added note about singular/plural distinction (which was previously confusing to a Rails noob); Rephrased explanation of how form is routed to controller, again to reduce confusion; and added explanation to replace incorrect link. [ci skip] | ||||
* | | | | | Merge pull request #11336 from ankit8898/performance-bm | Rafael Mendonça França | 2013-07-06 | 1 | -1/+13 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | Some performance benchmarking for take vs limit | ||||
| * | | | | Some performance benchmarking for take vs limit | Ankit Gupta | 2013-07-06 | 1 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added a dummy progress bar during insert of records so it shows something is happening. Performance report Model.take 6198.9 (±13.4%) i/s - 121743 in 20.042671s Model.take! 6173.6 (±13.6%) i/s - 121242 in 20.057006s Model.all limit(100) 107.8 (±15.8%) i/s - 2106 in 20.022316s Model.all take(100) 105.2 (±15.2%) i/s - 2061 in 20.062509s | ||||
* | | | | | Merge pull request #11339 from arunagw/running-actionpack-isolated | Yves Senn | 2013-07-06 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Running isolated test for assertions and journey | ||||
| * | | | | | Running isolated test for assertions and journey | Arun Agrawal | 2013-07-06 | 1 | -1/+1 |
|/ / / / / | | | | | | | | | | | | | | | | in actionpack | ||||
* | | | | | Merge pull request #11337 from arunagw/actionview-rdoc | Rafael Mendonça França | 2013-07-06 | 2 | -10/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | RUNNING_UNIT_TESTS tweaks. | ||||
| * | | | | | actionpack not having activerecord tests [ci skip] | Arun Agrawal | 2013-07-06 | 1 | -10/+0 |
| | | | | | | |||||
| * | | | | | RUNNING_UNIT_TESTS file is in rdoc [ci skip] | Arun Agrawal | 2013-07-06 | 1 | -0/+0 |
| | | | | | | |||||
* | | | | | | fixes Rails version for the stable API [ci skip] | Xavier Noria | 2013-07-06 | 2 | -1/+13 |
| | | | | | | |||||
* | | | | | | Merge pull request #11306 from ↵ | Rafael Mendonça França | 2013-07-06 | 3 | -2/+50 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jetthoughts/11288_remove_extra_queries_for_belongs_to_with_touch #11288: Removed duplicated touching Conflicts: activerecord/CHANGELOG.md | ||||
| * | | | | | | #11288: Removed duplicated touching | Paul Nikitochkin | 2013-07-05 | 3 | -2/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if belongs to model with touch option on touch Closes #11288 | ||||
* | | | | | | | fixes broken links in the API [Fixes #11335] [ci skip] | Xavier Noria | 2013-07-06 | 1 | -2/+2 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #11332 from sanemat/fix/av-test-duplication | Rafael Mendonça França | 2013-07-06 | 1 | -3/+0 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | Remove actionview test duplication | ||||
| * | | | | | Remove action view test duplication | sanemat | 2013-07-07 | 1 | -3/+0 |
|/ / / / / | | | | | | | | | | | | | | | | Same test exists above 2 or 3 lines. | ||||
* | | | | | Merge pull request #11329 from vipulnsward/cache_one | Rafael Mendonça França | 2013-07-06 | 1 | -1/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Extract common query to a constant. | ||||
| * | | | | | Extract common query to a constant. | Vipul A M | 2013-07-06 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | Perf ref: https://gist.github.com/vipulnsward/8209749201dfdd678c97 | ||||
* | | | | | | Merge pull request #11327 from schuetzm/hash-with-indifferent-access-select | Yves Senn | 2013-07-06 | 3 | -1/+12 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Make HashWithIndifferentAccess#select always return the hash. | ||||
| * | | | | | Make HashWithIndifferentAccess#select always return the hash. | Marc Schütz | 2013-07-06 | 3 | -1/+12 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | Hash#select! returns nil if the hash didn't change and thus behaves differently from select, so it's return value can't be used as result for the latter. | ||||
* | | | | | Merge pull request #11322 from blahedo/master | Rafael Mendonça França | 2013-07-05 | 1 | -3/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | Tidying "getting started" guide | ||||
| * | | | | Merged sections to reflect current contents of guide. | blahedo | 2013-07-05 | 1 | -3/+1 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | Section "allowing the update of fields" was now just a general introduction to the idea of the model (actual updating was two sections later). So, merged into the section about validation. | ||||
* | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2013-07-06 | 4 | -2/+43 |
|\ \ \ \ | |||||
| * | | | | [doc] fixed printing of code samples | Arun Agrawal | 2013-07-02 | 1 | -1/+1 |
| | | | | |