Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update pull request instructions as per the new Github UI | Alex Johnson | 2013-10-30 | 1 | -7/+12 |
| | | | | [ci skip] | ||||
* | Revert "add active model basics wip to guides/documents.yaml" | Xavier Noria | 2013-10-29 | 1 | -6/+0 |
| | | | | | | | | | | | | Reason: WIP guides are not in the index because they are partial work pushed to the repo. Either there is someone working on them or else the work was interrupted. Guides are added to the index page when they are finished, the author considers the draft to be complete, someone reviews them, and overall they are considered to be good for users to read. This reverts commit eefc03a8069bddfe31751c4bd4fb1804e7f33c2c. | ||||
* | Merge pull request #11564 from zzak/active_model_guide | Yves Senn | 2013-10-28 | 1 | -0/+6 |
|\ | | | | | [Guides] Active Model Basics [ci skip] | ||||
| * | add active model basics wip to guides/documents.yaml | Zachary Scott | 2013-07-22 | 1 | -0/+6 |
| | | |||||
* | | Merge pull request #12578 from ↵ | Rafael Mendonça França | 2013-10-27 | 1 | -0/+2 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | jeradphelps/configurable_schema_migrations_table_name Configurable name for schema_migrations table Conflicts: activerecord/CHANGELOG.md | ||||
| * | | added schema_migrations_table_name to ActiveRecord::Base in order that the ↵ | Jerad Phelps | 2013-10-27 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name of the schema migrations table can be configured. consolidated test_schema_migrations_table_name tests Added changelog entry edited changelog removed commented lines removed reader ensure the schema migrations table is reset at end of test added entry to configuration guide guides typo and changelog order | ||||
* | | | [ci skip] second parameter of asset-url is depricated | Evgeniy | 2013-10-23 | 1 | -4/+3 |
| | | | |||||
* | | | Update docs on Tilt::Template in Asset Pipeline guide | David Verhasselt | 2013-10-21 | 1 | -3/+8 |
|/ / | |||||
* | | Merge pull request #12218 from dv/add-sass-globbing-to-asset-pipeline-docs | Yves Senn | 2013-10-17 | 1 | -1/+5 |
|\ \ | | | | | | | Add sass globbing to asset pipeline docs [ci skip] | ||||
| * | | Add Sass gobbling info to asset pipeline docs | David Verhasselt | 2013-10-17 | 1 | -1/+5 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | [ci skip] Fix number of methods added by association. | Juanito Fatas | 2013-10-17 | 1 | -8/+8 |
| | | | | | | | | | | | | Also clean up some trailing spaces on line 1143-1146. | ||||
* | | | Merge pull request #12545 from nateberkopec/rephrase_callback_warning | Yves Senn | 2013-10-16 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Rephrase ActiveRecord transaction rollback warning [ci skip] | ||||
| * | | | Rephrase ActiveRecord transaction rollback warning | Nate Berkopec | 2013-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2013-10-15 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Use ActiveRecord::Base#update! instead of #update_attributes! | Zachary Scott | 2013-09-28 | 1 | -1/+1 |
| | | | | |||||
* | | | | Remove size alias for length validation | Sıtkı Bağdat | 2013-10-14 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed ```The `size` helper is an alias for `length`.``` line. If you use this "nonexist" helper, you will get an error message like this: ``` ArgumentError: Unknown validator: 'SizeValidator' ... ``` Maybe wanted to mean ```validates_size_of``` helper as an alias for ```validates_length_of``` helper. | ||||
* | | | | Merge pull request #12493 from drodriguez/patch-1 | Rafael Mendonça França | 2013-10-13 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Keep code consistent with previous code blocks. | ||||
| * | | | | Keep code consistent with previous code blocks. | Daniel Rodríguez Troitiño | 2013-10-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | Merge pull request #12507 from malavbhavsar/doc_patch | Rafael Mendonça França | 2013-10-12 | 2 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Some fixes in docs [ci skip] | ||||
| * | | | | | Some fixes in docs [ci skip] | Malav Bhavsar | 2013-10-11 | 2 | -2/+2 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Update a link to point to right section in api docs Fix a typo | ||||
* | | | | | Fix a writing mistake | Sıtkı Bağdat | 2013-10-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | A small mistake found in the line of ```The default error is "can't be empty"``` for ```:presence``` helper. ```empty``` word changed to ```blank```. | ||||
* | | | | | Revert "Merge pull request #12480 from iwiznia/master" | Jeremy Kemper | 2013-10-11 | 1 | -15/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e5f5a838b96a362534d9bb60d02334439ed9784c, reversing changes made to d7567f3290a50952494e9213556a1f283a6cf3a0. | ||||
* | | | | | flatten and flatten! methods for ActiveSupport::Duration | Ionatan Wiznia | 2013-10-11 | 1 | -0/+15 |
|/ / / / | |||||
* | | | | Modifies the initialization guide to make the initializers process clearer ↵ | Cory Foy | 2013-10-09 | 1 | -6/+16 |
| | | | | | | | | | | | | | | | | and remove a TODO. [ci skip] | ||||
* | | | | [Validations Guide] Add full stop to the end of sentence [ci skip] | Francis Go | 2013-10-10 | 1 | -1/+1 |
| | | | | |||||
* | | | | Added ActionView in rake about [ci skip] | Arun Agrawal | 2013-10-09 | 1 | -5/+6 |
| | | | | |||||
* | | | | Minor align BR tags with HTML void - with reference to the generators code ↵ | AvnerCohen | 2013-10-09 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | change - https://github.com/rails/rails/commit/f038d4cc5fe1ac21f92c7e32c61ff85a0c816f3f | ||||
* | | | | Merge pull request #12283 from JuanitoFatas/rails-on-rack | Yves Senn | 2013-10-09 | 1 | -1/+5 |
|\ \ \ \ | | | | | | | | | | | [ci skip] Add explanation on Rack::Sendfile middleware in rails_on_rack.md. | ||||
| * | | | | [ci skip] Add explanation on Rack::Sendfile and fix serve static files setting. | Juanito Fatas | 2013-10-04 | 1 | -1/+5 |
| | | | | | |||||
* | | | | | Call `rails plugin new yaffle` in the plugins guide. [ci skip] | Ulysse Carion | 2013-10-08 | 1 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | It's confusing to not explicitly do this step. | ||||
* | | | | | Fix a typo in the code of Testing guide. | Geoffrey Roguelon | 2013-10-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Replace the word «Accepts» by «Accept» in the example of custom request headers. | ||||
* | | | | | copy-edits the new guide with our maintenance policy [ci skip] | Xavier Noria | 2013-10-03 | 1 | -14/+11 |
| | | | | | |||||
* | | | | | Adds the Rails maintenance policy to the Guides | Matias Korhonen | 2013-10-03 | 3 | -0/+70 |
| | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | guides: configuring: fixing explanation of :after_initialize hook | Sebastian Gassner | 2013-10-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | :after_initialize runs after config/initializers, not before | ||||
* | | | | | fixes incorrect spelling of `action_on_unpermitted_parameters` | Jared Beck | 2013-09-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | See `actionpack/test/controller/parameters/raise_on_unpermitted_params_test.rb` | ||||
* | | | | | Merge pull request #12387 from francisgo/patch-9 | Rafael Mendonça França | 2013-09-28 | 1 | -14/+14 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Migrations Guide: Add semicolon to sentences before code block [ci skip] | ||||
| * | | | | Migrations Guide: Add semicolon to sentences before code block [ci skip] | Francis Go | 2013-09-28 | 1 | -14/+14 |
| | | | | | |||||
* | | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2013-09-28 | 7 | -55/+24 |
|\ \ \ \ \ | |||||
| * | | | | | Added missing active record configurations. | wangjohn | 2013-09-25 | 1 | -0/+6 |
| | | | | | | |||||
| * | | | | | use active voice and use more descriptive terms | Weston Platter | 2013-09-22 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fix Show link on resource | Vipul A M | 2013-09-17 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | incorrect url | Sergio | 2013-09-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | incorrect url | ||||
| * | | | | | incorrect urls | Sergio | 2013-09-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | I've found two incorrects urls for adding ':' at the end of the url | ||||
| * | | | | | surplus : in attachment_fu plugin | Sergio | 2013-09-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | surplus ':' character in url | ||||
| * | | | | | EncryptedCookieStore => CookieStore [ci skip] | Rashmi Yadav | 2013-09-13 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | asset_url => asset-url in sass-rails docs [ci skip] | Rashmi Yadav | 2013-09-13 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Removed doc of diff method [ci skip] | Rashmi Yadav | 2013-09-13 | 1 | -38/+0 |
| | | | | | | |||||
| * | | | | | Updated guides with latest method [ci skip] | Rashmi Yadav | 2013-09-13 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Updated the file path [ci skip] | Rashmi Yadav | 2013-09-13 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | Updated with latest method [ci skip] | Rashmi Yadav | 2013-09-13 | 1 | -4/+5 |
| | | | | | |