Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | rewrite tests to have no side-effects on `include_root_in_json`. | Yves Senn | 2013-03-04 | 1 | -33/+55 |
| | |||||
* | only calculate next_id when we need a new method defined | Aaron Patterson | 2013-03-04 | 1 | -1/+2 |
| | |||||
* | Merge pull request #9541 from maximerety/fix_7774 | José Valim | 2013-03-04 | 2 | -1/+6 |
|\ | | | | | Fix formats on xhr requests when HTTP_ACCEPT is empty string | ||||
| * | Fix formats on xhr requests when HTTP_ACCEPT is empty string | maximerety | 2013-03-04 | 2 | -1/+6 |
| | | | | | | | | | | | | Fix ActionDispatch::Request#formats on xhr requests when HTTP_ACCEPT header is empty string. About issue #7774, same fix as in commit bebb02f but for xhr requests. | ||||
* | | Merge pull request #9540 from dimko/patch-1 | Xavier Noria | 2013-03-04 | 1 | -3/+3 |
|\ \ | |/ |/| | Fixed typo in active record's changelog | ||||
| * | Fixed typo in active record's changelog | Dimko | 2013-03-04 | 1 | -3/+3 |
|/ | |||||
* | Remove .all usage from unscope doc examples [ci skip] | Carlos Antonio da Silva | 2013-03-04 | 1 | -4/+4 |
| | |||||
* | Use 1.9 hash style in changelog and doc examples [ci skip] | Carlos Antonio da Silva | 2013-03-04 | 2 | -6/+6 |
| | |||||
* | Merge pull request #9537 from NARKOZ/patch-6 | Steve Klabnik | 2013-03-04 | 2 | -4/+6 |
|\ | | | | | add prompt to 422 page to check logs | ||||
| * | add prompt to 422 page to check logs | Nihad Abbasov | 2013-03-04 | 2 | -4/+6 |
|/ | |||||
* | Merge pull request #9200 from wangjohn/unscoping_activerecord_merging | Jeremy Kemper | 2013-03-03 | 4 | -0/+275 |
|\ | | | | | Introduce relation #unscope | ||||
| * | Created an unscope method for removing relations from a chain of | wangjohn | 2013-03-03 | 4 | -0/+275 |
| | | | | | | | | | | relations. Specific where values can be unscoped, and the unscope method still works when relations are merged or combined. | ||||
* | | Merge pull request #9532 from neerajdotname/fix-sql-in-example | Carlos Antonio da Silva | 2013-03-03 | 1 | -1/+2 |
|\ \ | |/ |/| | In example fix sql that is generated from scoping | ||||
| * | fix the sql that is generated from scoping | Neeraj Singh | 2013-03-03 | 1 | -1/+2 |
| | | |||||
* | | Bring config.allow_concurrency back | José Valim | 2013-03-03 | 3 | -19/+48 |
| | | | | | | | | | | Since the Rack::Lock still exists in development, let's provide a way to disable it explicitly. | ||||
* | | Use custom visitor class for optimized url helpers | Andrew White | 2013-03-03 | 4 | -9/+19 |
| | | | | | | | | | | | | | | | | Rather than trying to use gsub to remove the optional route segments, which will fail with nested optional segments, use a custom visitor class that returns a empty string for group nodes. Closes #9524 | ||||
* | | Merge pull request #9465 from senny/document_strong_params_in_ac_guide | Xavier Noria | 2013-03-03 | 1 | -0/+118 |
|\ \ | | | | | | | integrate the strong params README into the AC guide. | ||||
| * | | integrate the strong params README into the AC guide. | Yves Senn | 2013-03-03 | 1 | -0/+118 |
|/ / | | | | | | | | | | | | | | | | | | | The current ActionController guide does not mention strong parameters at all. I integrated the README into the guide to explain the API. I also included a section to illustrate that the API does not solve all possible whitelisting scenarios. The origin was #9454. | ||||
* | | Merge pull request #9512 from Jacke/master | Guillermo Iguaran | 2013-03-02 | 8 | -67/+254 |
|\ \ | | | | | | | New 404, 422, 500 pages, they are more stylish and bring ruby essence… | ||||
| * | | New beauty pages(404, 422, 500) | Stanislav | 2013-03-02 | 8 | -67/+254 |
| | | | | | | | | | | | | | | | | | | moving changelog note to unreleased section New beauty pages(404, 422, 500) | ||||
* | | | Remove hard coded references to Active Record in railties | José Valim | 2013-03-02 | 5 | -23/+11 |
| | | | |||||
* | | | Merge pull request #9431 from troyk/patch-2 | Andrew White | 2013-03-02 | 3 | -4/+8 |
|\ \ \ | | | | | | | | | | | | | Fix PostgreSQL TIMESTAMP WITH TIME ZONE to return ActiveSupport::Time | ||||
| * | | | Fix PostgreSQL TIMESTAMP WITH TIME ZONE to return ActiveSupport::Time | Troy Kruthoff | 2013-03-01 | 3 | -4/+8 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | In an AR model a timestamptz attribute would return a ruby string and AR tests did not check for any type casting. Previous tests would pass only because an assert_equal was being used on a Time.utc object, which will parse the right side of the eq to a valid Time instance for comparision. switch to test instance of Time instead of ActiveSupport::TimeWithZone | ||||
* | | | :scissors: extra blank line | Akira Matsuda | 2013-03-02 | 1 | -1/+0 |
| | | | |||||
* | | | Merge pull request #9510 from ↵ | Rafael Mendonça França | 2013-03-01 | 3 | -9/+32 |
|\ \ \ | | | | | | | | | | | | | | | | | senny/7364_warn_when_appending_prepending_to_an_association deal with `#append` and `#prepend` on association collections | ||||
| * | | | deal with `#append` and `#prepend` on association collections. | Yves Senn | 2013-03-01 | 3 | -5/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #7364. Collection associations behave similar to Arrays. However there is no way to prepend records. And to append one should use `<<`. Before this patch `#append` and `#prepend` did not add the record to the loaded association. `#append` now behaves like `<<` and `#prepend` is not defined. | ||||
| * | | | don't use non-ascii ' chars in documentation | Yves Senn | 2013-03-01 | 1 | -4/+4 |
| |/ / | |||||
* / / | Restore note about nested SCRIPT_NAME handling. | Jeremy Kemper | 2013-03-01 | 1 | -0/+2 |
|/ / | |||||
* | | Merge pull request #8652 from codeodor/create_table_migration | Carlos Antonio da Silva | 2013-03-01 | 6 | -7/+57 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support creating a table migration generator Sometimes you want to create a table without an associated model and test, which is also not a join table. With this commit, you can now do that. Example: rails g migration create_posts title:string or rails g migration CreatePosts title:string This commit also moves the template the model generator uses for the migration to the migration templates folder, as it seems a more sensible place for it now that it is shared code. | ||||
| * | | Support creating a table migration generator | Sammy Larbi | 2013-03-01 | 6 | -7/+57 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes you want to create a table without an associated model and test, which is also not a join table. With this commit, you can now do that. Example: rails g migration create_posts title:string or rails g migration CreatePosts title:string This commit also moves the template the model generator uses for the migration to the migration templates folder, as it seems a more sensible place for it now that it is shared code. | ||||
* | | Wordsmithing @trevorturk's upgrade notes | Jeremy Kemper | 2013-02-28 | 1 | -7/+4 |
| | | | | | | | | | | Removed the bit about `SCRIPT_NAME` handling, since setting `default_url_options[:script_name]` does work correctly. We ran into an issue with it but it was an app bug. | ||||
* | | Merge pull request #9495 from trevorturk/upgrade-guide | Jeremy Kemper | 2013-02-28 | 1 | -1/+69 |
|\ \ | | | | | | | Add some more documentation to the upgrade guide | ||||
| * | | Document introduction of ActionDispatch::ParamsParser::ParseError | Trevor Turk | 2013-02-28 | 1 | -0/+2 |
| | | | |||||
| * | | Document that scopes require a callable object | Trevor Turk | 2013-02-28 | 1 | -1/+9 |
| | | | |||||
| * | | Document common deprecations | Trevor Turk | 2013-02-28 | 1 | -0/+11 |
| | | | |||||
| * | | Document the deprecation of ActionView::RecordIdentifier | Trevor Turk | 2013-02-28 | 1 | -0/+2 |
| | | | |||||
| * | | Document ActiveRecord::Fixtures becoming ActiveRecord::FixtureSet | Trevor Turk | 2013-02-28 | 1 | -0/+2 |
| | | | |||||
| * | | Document change in routes using match | Trevor Turk | 2013-02-28 | 1 | -0/+13 |
| | | | |||||
| * | | Document removal of assets:precompile:primary | Trevor Turk | 2013-02-28 | 1 | -0/+4 |
| | | | |||||
| * | | Document sass-rails asset_url deprecation | Trevor Turk | 2013-02-28 | 1 | -0/+4 |
| | | | |||||
| * | | Document caveat from 5b3bb61 which fixed handling SCRIPT_NAME from within ↵ | Trevor Turk | 2013-02-28 | 1 | -0/+3 |
| | | | | | | | | | | | | mounted engine | ||||
| * | | Document rails-observers extraction | Trevor Turk | 2013-02-28 | 1 | -0/+4 |
| | | | |||||
| * | | Document the switch from memcache-client to dalli | Trevor Turk | 2013-02-28 | 1 | -0/+2 |
| | | | |||||
| * | | Improve docs for UpgradeSignatureToEncryptionCookieStore | Trevor Turk | 2013-02-28 | 1 | -1/+10 |
| | | | |||||
| * | | Document extraction of actionpack-xml_parser | Trevor Turk | 2013-02-28 | 1 | -0/+2 |
| | | | |||||
| * | | Document introduction of the ActionController::UnknownFormat exception | Trevor Turk | 2013-02-28 | 1 | -0/+2 |
| | | | |||||
* | | | Improve the CHANGELOG entry | Rafael Mendonça França | 2013-02-28 | 1 | -2/+3 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | Merge pull request #9493 from kennyj/fix_wrong_exception | Rafael Mendonça França | 2013-02-28 | 3 | -0/+13 |
|\ \ \ | | | | | | | | | | | | | | | | | Wrong exception is occured when raising no translatable exception Closes #8617 | ||||
| * | | | Wrong exception is occured when raising no translatable exception | kennyj | 2013-03-01 | 3 | -0/+13 |
| | | | | |||||
* | | | | Improve the CHANGELOG entry | Rafael Mendonça França | 2013-02-28 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | [ci skip] |