aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14193 from ys/patch-1Vijay Dev2014-02-251-1/+1
|\ | | | | Add missing parantheses in index_exists?
| * Add missing parantheses in index_exists?Yannick Schutz2014-02-251-1/+1
| |
* | Point master changelogs to 4-1-stable branchCarlos Antonio da Silva2014-02-258-3831/+8
|/ | | | Remove 4-1 related entries from master [ci skip]
* `ActionDispatch::Head` was replaced by `Rack::Head`. Closes #14191.Yves Senn2014-02-251-1/+0
| | | | See 449039a86d802871b707dfb51ac1ed96d53526f9 for the original commit.
* Merge pull request #14006 from Loremaster/strong_params_improvementXavier Noria2014-02-253-6/+28
|\ | | | | Sungularize ActionController::UnpermittedParameters error in case when only 1 parameter is unpermitted.
| * Simple Sungularize ActionController::UnpermittedParameters error in case ↵Serj L2014-02-243-6/+28
| | | | | | | | when only 1 parameter is unpermitted.
* | Merge pull request #14186 from ch33hau/standardized-punctuationYves Senn2014-02-251-3/+3
|\ \ | | | | | | Standardized punctuation.
| * | [skip ci] Standardized punctuation.ch33hau2014-02-251-3/+3
|/ /
* | Merge pull request #14182 from mecampbellsoup/fix_typo_in_url_helper_docsArthur Nogueira Neves2014-02-241-1/+1
|\ \ | | | | | | [skip ci] Fixing typo in documentation: actionview/lib/action_view/helpers/url_helper.rb
| * | [skip ci] Fix typo in link_to :method option descriptionMatt Campbell2014-02-241-1/+1
|/ /
* | refactor, with_locale is not needed because I18n is mocked.Yves Senn2014-02-241-7/+5
| | | | | | | | | | This is a follow up to #14170. While backporting I recognized that this call is not needed at all.
* | Merge pull request #14170 from kritik/masterYves Senn2014-02-243-2/+20
|\ \ | | | | | | there could be more than 10 nested records
| * | Fix ActionView label translation for more than 10 nested elementsVladimir Krylov2014-02-243-2/+20
|/ /
* | Go with #presence_in instead of #present_in -- it doesnt sound quite as ↵David Heinemeier Hansson2014-02-243-7/+7
| | | | | | | | good, but the closer relationship to #presence over #present is ultimately worth it
* | refactor, extract `with_locale` helper.Yves Senn2014-02-241-87/+79
| |
* | build fix. follow up to 174c9f0df39cd338a4871f82794256cc64f68a81Yves Senn2014-02-241-1/+1
|/
* include names in model generator warning message. refs #13515.Yves Senn2014-02-242-5/+7
| | | | | | This is a follow up to #13515. It includes the name given and the singularized version in the warning message. This will aide the user to see wether the detected singular was right or not.
* Merge pull request #10497 from senny/10485_does_not_coerce_stringsYves Senn2014-02-244-7/+50
|\ | | | | coerce strings when reading attributes
| * Coerce strings when reading attributes.Yves Senn2014-02-234-7/+50
| |
* | Merge pull request #14171 from arthurnn/extract_middleware_cacheGuillermo Iguaran2014-02-232-32/+41
|\ \ | | | | | | Extract local cache middleware
| * | Extract local cache middlewareArthur Neves2014-02-232-32/+41
| |/ | | | | | | | | Extract LocalCache Middleware, so it can requires rack dependencies, without adding rack dependencies to `AS::Cache::Strategy::LocalCache`.
* | Group assets options in production env templateCarlos Antonio da Silva2014-02-231-6/+4
| |
* | Introduce Concern#class_methods and Kernel#concernJeremy Kemper2014-02-237-18/+113
|/
* Merge pull request #13793 from senny/postgres/dynamic_range_oidYves Senn2014-02-234-63/+147
|\ | | | | Dynamically define PostgreSQL Range OIDs
| * deprecate support for pg ranges with excluding beginnings.Yves Senn2014-02-233-23/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Ruby Range object does not support excluding beginnings. We currently support excluding beginnings for some subtypes using manually by incrementing them (now using the `#succ` method). This is approach is flawed as it's not equal to an excluding beginning. This commit deprecates the current support for excluding beginnings. It also raises an `ArgumentError` for subtypes that do not implement the `succ` method. This is a temporary solution to get rid of the broken state. We might still add complete support for excluding beginnings afterwards. (Probably with a new `PGRange` object, which acts like a `Range` but has excluding beginnings.
| * dynamically define PostgreSQL OID range types.Yves Senn2014-02-234-52/+81
| | | | | | | | | | | | | | | | This gets AR working with custom defined range types. It also removes the need for subtype specific branches in `OID::Range`. This expands the interface of all `OID` types with the `infinity` method. It's responsible to provide a value for positive and negative infinity.
* | update version to 4.2.0.alphaYves Senn2014-02-239-11/+11
|/
* Add tests for default scope behaviour changeJon Leighton2014-02-232-0/+20
| | | | See #13875
* Merge pull request #13515 from kuldeepaggarwal/f-model-generationGodfrey Chan2014-02-225-12/+40
|\ | | | | Added warning when user tried to create model with pluralize name.
| * Add warning when user tried to create model with pluralize name.Kuldeep Aggarwal2014-02-235-12/+40
| | | | | | | | | | 1. Generate model with correct_name. 2. It will help new users to avoid mistakes when tried to create model with wrong name.
* | Merge pull request #14164 from vajrasky/fix_typo_max_idGuillermo Iguaran2014-02-221-1/+1
|\ \ | | | | | | Fixed typo in comment about MAX_ID.
| * | Fixed typo in comment about MAX_ID.Vajrasky Kok2014-02-231-1/+1
| | |
* | | Distinguish ConnectionNotEstablished messages: no conn pool for the class, ↵Jeremy Kemper2014-02-221-1/+4
| | | | | | | | | | | | or no conn available from the pool
* | | Merge pull request #14140 from WojtekKruszewski/optimize_foreign_key_forCarlos Antonio da Silva2014-02-211-1/+1
|\ \ \ | | | | | | | | Prevent foreign_key_for? from evaluating all attributes
| * | | Prevent foreign_key_for? from type casting all attributesWojtek Kruszewski2014-02-211-1/+1
| | | |
* | | | Revert "Only lookup `config.log_level` for stdlib `::Logger`. Closes #11665."Guillermo Iguaran2014-02-213-26/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e0a521cfcd13e4d1f0ae8ab96004289e1c020f71. Conflicts: railties/CHANGELOG.md We expect loggers to quack like stdlib logger. If log4r needs different level= assignment, using a Logger-quacking wrapper is the way to do it. Fixes #14114.
* | / releasing Rails no longer needs triggering docs generation by hand [ci skip]Xavier Noria2014-02-202-37/+0
| |/ |/| | | | | | | | | GitHub is now able to notify tag creation, I have configured the webhook for the docs server to receive that event. Therefore, we no longer need to trigger docs generation manually when releasing.
* | Merge pull request #14131 from kuldeepaggarwal/upgrade-rails-versionArthur Nogueira Neves2014-02-201-2/+2
|\ \ | | | | | | update guides to new version of rails 3.2.x, i.e. 3.2.17 [skip ci]
| * | [ci skip] update guides to new version of rails 3.2.xKuldeep Aggarwal2014-02-211-2/+2
|/ /
* | adding a test for #14106Aaron Patterson2014-02-201-0/+25
| |
* | Revert "context in validation goes through has many relationship"Aaron Patterson2014-02-204-27/+1
| | | | | | | | This reverts commit 5e3d466d52fa4e9a42c3a1f8773a7c31da875e48.
* | Merge pull request #14129 from joankaradimov/fix-render-to-stringCarlos Antonio da Silva2014-02-201-1/+3
|\ \ | | | | | | Fix `render_to_string` when called via manually instantiated controllers
| * | Check if the `request` variable isn't nil when calling render_to_stringJoan Karadimov2014-02-201-1/+3
| | | | | | | | | | | | closes #14125
* | | Merge pull request #14086 from jingweno/masterArthur Nogueira Neves2014-02-201-1/+1
|\ \ \ | | | | | | | | Fix the javascript path in guide for asset modules [skip ci]
| * | | [skip ci] Fix the javascript path in guide for asset modulesJingwen Owen Ou2014-02-201-1/+1
| | | |
* | | | Merge pull request #14124 from arthurnn/fix_14116Aaron Patterson2014-02-202-5/+8
|\ \ \ \ | |_|/ / |/| | | Fix collection proxy exists? regression
| * | | Add regression test for collection proxy readerArthur Neves2014-02-201-0/+7
| | | | | | | | | | | | | | | | [related #14116]
| * | | Revert "speed up the collection proxy reader method, but slow down the ↵Arthur Neves2014-02-201-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | constructor" This reverts commit f9e4c3c7c0c4152b62fe9202a9d12262884bb118. [fixes #14116]
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-02-201-0/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Add tip about using RDoc's --pipe command to quickly test the output ofZachary Scott2014-02-101-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | a piece of documentation. This can be useful for trying out combinations of markup and code, as discussed in rails/rails@225bcad
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-09 07:38:32 +0000