aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Add line endings to files which are missing themSean Griffin2015-02-1716-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These files get modified whenever someone uses a tool like `sed`. Let's just get this over with in one commit so it'd not adding diff noise to something else.
* | | | | | | | Fix test failures on Mysql 5.5Sean Griffin2015-02-171-1/+1
| | | | | | | |
* | | | | | | | Update code which depended on methods added by 1502caefSean Griffin2015-02-171-1/+1
| | | | | | | |
* | | | | | | | Revert "Allow `:precision` option for time type columns"Sean Griffin2015-02-177-90/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1502caefd30b137fd1a0865be34c5bbf85ba64c1. The test suite for the mysql adapter broke when this commit was used with MySQL 5.6. Conflicts: activerecord/CHANGELOG.md
* | | | | | | | Merge branch 'y-yagi-fix_deprecate_msg'eileencodes2015-02-171-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | correct method name in deprecation messageyuuji.yaginuma2015-02-181-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #18961 from vipulnsward/deprecate-start-valueYves Senn2015-02-174-33/+73
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Deprecated passing of `start` value to `find_in_batches` and `find_each`
| * | | | | | | Deprecated passing of `start` value to `find_in_batches` and `find_each` in ↵Vipul A M2015-02-174-33/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | favour of `begin_at` value.
* | | | | | | | Revert c732a66:Zachary Scott2015-02-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * "rm docs for dependency_loading and disable_dependency_loading config" It was added back in a71350cae0082193ad8c66d65ab62e8bb0b7853b by @tenderlove See also #13142
* | | | | | | | Revert "Don't unhook autoloading in production"Aaron Patterson2015-02-161-0/+7
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | This reverts commit a8bf12979e5fa15282b39c8cfa315e663f613539.
* | | | | | | Merge pull request #18960 from ctaintor/remove_dependency_docZachary Scott2015-02-161-4/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | removes documentation that is no longer relevant
| * | | | | | | removes docs for dependency_loading config option and ↵Case Taintor2015-02-161-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disable_dependency_loading initializer because it was removed by commit a8bf12979e5fa15282b39c8cfa315e663f613539
* | | | | | | | Merge pull request #18959 from phillbaker/cleanup/server-log-pathCarlos Antonio da Silva2015-02-161-4/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Remove unused Rails::Server#log_path
| * | | | | | | Remove unused Rails::Server#log_pathPhill Baker2015-02-161-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With refactors to Rails::Sever from v3 to v4, this method is no longer used and is untested. Previous usage: https://github.com/rails/rails/blob/3-2-stable/railties/lib/rails/commands/server.rb#L79 Currently set from: https://github.com/rails/rails/blob/7b75551a1a4539876f878f37a2439cd02f89d961/railties/lib/rails/application/configuration.rb#L69
* | | | | | | | Merge pull request #18485 from andreynering/robots.txtZachary Scott2015-02-162-0/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Adding 'Search Engines Indexing' Section [ci skip]
| * | | | | | | | Adding 'Search Engines Indexing' Section [ci skip]Andrey Nering2015-01-142-0/+22
| | | | | | | | |
* | | | | | | | | Merge pull request #18679 from adipra3n/masterZachary Scott2015-02-161-0/+52
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add web console in debugging rails applications guide [ci skip]
| * | | | | | | | | document web console in debugging guide [ci skip]Adi Pradhan2015-01-261-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | document web console in debugging guide [ci skip] document web console in debugging guide [ci skip]
* | | | | | | | | | Merge pull request #18815 from tmingos/patch-1Zachary Scott2015-02-161-3/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Correct pluralization error
| * | | | | | | | | | Edit text on optional db constraints for uniqueness validations [ci skip]Taylor Mingos2015-02-041-3/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #18958 from andreynering/guides-form-remoteZachary Scott2015-02-161-0/+28
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improving remote forms guides [ci skip]
| * | | | | | | | | | | Improving remote forms guides [ci skip]Andrey Nering2015-02-161-0/+28
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #18949 from craftsmen/image_tag_sizeYves Senn2015-02-163-0/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | Allow to pass a string value to size option in `image_tag` and `video_tag`
| * | | | | | | | | | Allow to pass a string value to size option in `image_tag` and `video_tag`Mehdi Lahmam2015-02-163-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the behavior more consistent with `width` or `height` options
* | | | | | | | | | | Merge pull request #18662 from estum/foreign-key-existsYves Senn2015-02-164-15/+63
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `foreign_key_exists?` method.
| * | | | | | | | | | | Add methods to get foreign key matching argumentsAnton2015-01-292-40/+36
| | | | | | | | | | | |
| * | | | | | | | | | | Add `foreign_key_exists?` method.Anton2015-01-243-0/+48
| | | | | | | | | | | |
* | | | | | | | | | | | fix, `to_table` in `remove_foreign_key` should be plural.Yves Senn2015-02-161-1/+1
| |_|_|_|_|/ / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #18951 from ↵Guillermo Iguaran2015-02-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jurezove/gemfile-lock-to-plugin-gitignore-template Add Gemfile.lock to plugin's gitignore template
| * | | | | | | | | | | Add Gemfile.lock to plugin's gitignore templateJure Žove2015-02-151-0/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Register adapter specific types with the global type registrySean Griffin2015-02-157-67/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do this in the adapter classes specifically, so the types aren't registered if we don't use that adapter. Constants under the PostgreSQL namespace for example are never loaded if we're using mysql.
* | | | | | | | | | | Add a global type registry, used to lookup and register typesSean Griffin2015-02-154-0/+336
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per previous discussions, we want to give users the ability to reference their own types with symbols, instead of having to pass the object manually. This adds the class that will be used to do so. ActiveRecord::Type.register(:money, MyMoneyType)
* | | | | | | | | | Tiny documentation edits [ci skip]Robin Dupret2015-02-156-35/+41
| | | | | | | | | |
* | | | | | | | | | Merge pull request #18946 from davydovanton/format-paragraph-default-paramsZachary Scott2015-02-151-0/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Added default values for #format_paragraph docs [skip ci]
| * | | | | | | | | | Added default values for #format_paragraph docs [skip ci]Anton Davydov2015-02-151-0/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #18394 from arthurnn/http_cache_foreverArthur Nogueira Neves2015-02-153-0/+75
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Implement http_cache_forever to ActionController
| * | | | | | | | | | Implement http_cache_forever to ActionControllerArthur Neves2015-02-153-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add http_cache_forever to ActionController, so we can cache results forever. Things like static pages are a good candidate for this type of caching. This cache only controls caching headers, so it is up to the browser to cache those requests.
* | | | | | | | | | | Merge pull request #18945 from y-yagi/layouts_and_rendering_guideAbdelkader Boudih2015-02-151-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fix syntax error in render partial example [ci skip]
| * | | | | | | | | | | fix syntax error in render partial example [ci skip]yuuji.yaginuma2015-02-151-2/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #18938 from tchandy/updating_query_tracer_linkArthur Nogueira Neves2015-02-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Updating Query Tracer github repository
| * | | | | | | | | | | Updating Query Tracer github repositoryThiago Pradi2015-02-141-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-02-145-20/+21
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [ci skip] Add some more code highlights.Juanito Fatas2015-02-101-5/+5
| | | | | | | | | | | | |
| * | | | | | | | | | | | Do not use the same name for two `:belongs_to`claudiob2015-02-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A model cannot have two `:belongs_to` with the same exact name, so we are better off avoiding this code in our examples, which might mislead users in thinking it's admissible. [ci skip]
| * | | | | | | | | | | | AM#Dirty doc fixesVipul A M2015-02-011-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Grammar fixes - Add doc for changes_include? - implemntations => implementations
| * | | | | | | | | | | | Fix description for AM::CallbacksVipul A M2015-01-311-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Wording fixes for `:skip_after_callbacks_if_terminated` callbacks optionVipul A M2015-01-311-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | [ci skip] Add a missing space in t.belongs_to argument.Juanito Fatas2015-01-291-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Mention `where.not` in the exampleGodfrey Chan2015-02-142-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...so it doesn't look like you *have* to use SQL strings for that case (not anymore!). Would like to replace the SQL string example with something that you cannot do with the "normal" query API, but I could not come up with a short, realistic example. Suggestions welcome!
* | | | | | | | | | | | | Fixed a bug where NULLs are casted into the first enum valueGodfrey Chan2015-02-132-3/+9
| |/ / / / / / / / / / / |/| | | | | | | | | | |