aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avoid extra method calls for appending newlinesAman Gupta2013-03-041-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | before: ');@output_buffer.append= ( content_icon row[:content] );@output_buffer.safe_concat(' ');@output_buffer.safe_concat(' ');@output_buffer.append= ( spinner_img );@output_buffer.safe_concat(' ');@output_buffer.safe_concat(' </td> <td class="content"> ');@output_buffer.append= ( content_link row[:content] );@output_buffer.safe_concat(' ');@output_buffer.safe_concat(' </td> <td class="message"> '); after: ';@output_buffer.append=( content_icon row[:content] );@output_buffer.safe_append=' ';@output_buffer.append=( spinner_img );@output_buffer.safe_append=' </td> <td class="content"> ';@output_buffer.append=( content_link row[:content] );@output_buffer.safe_append=' </td> <td class="message"> ';
* Use ActionView::OutputBuffer#safe_append= from templatesAman Gupta2013-03-042-3/+9
|
* Merge pull request #9554 from tmm1/string-gsub-hashJosé Valim2013-03-041-2/+2
|\ | | | | Use 1.9 String#gsub syntax
| * Call String#gsub with Hash directlyAman Gupta2013-03-041-2/+2
|/
* adds guides/.document to tell rdoc not to process this directoryXavier Noria2013-03-041-0/+0
| | | | | | When the Rails 4 gem is installed rdoc sees markdown files below the guides directory and processes them. With an empty .document file we prevent that from happening. Thanks to @drbrain for the tip.
* Merge pull request #9467 from senny/9459_include_json_root_out_of_syncRafael Mendonça França2013-03-043-34/+60
|\ | | | | `ActiveRecord::Base.include_root_in_json` is `false` by default.
| * `ActiveRecord::Base.include_root_in_json` is `false` by default.Yves Senn2013-03-042-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Closes #9459. The PR #6597 unified the configuration for `include_root_in_json` in AM and AR to `false`. Later on with the refactoring commit: e030f26 the value in AR was set to `true` but I think this was not on purpose. With this commit both AM and AR will have the same configuration for `include_root_in_json`, which is `false`.
| * rewrite tests to have no side-effects on `include_root_in_json`.Yves Senn2013-03-041-33/+55
|/
* only calculate next_id when we need a new method definedAaron Patterson2013-03-041-1/+2
|
* Merge pull request #9541 from maximerety/fix_7774José Valim2013-03-042-1/+6
|\ | | | | Fix formats on xhr requests when HTTP_ACCEPT is empty string
| * Fix formats on xhr requests when HTTP_ACCEPT is empty stringmaximerety2013-03-042-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-1Xavier Noria2013-03-041-3/+3
|\ \ | |/ |/| Fixed typo in active record's changelog
| * Fixed typo in active record's changelogDimko2013-03-041-3/+3
|/
* Remove .all usage from unscope doc examples [ci skip]Carlos Antonio da Silva2013-03-041-4/+4
|
* Use 1.9 hash style in changelog and doc examples [ci skip]Carlos Antonio da Silva2013-03-042-6/+6
|
* Merge pull request #9537 from NARKOZ/patch-6Steve Klabnik2013-03-042-4/+6
|\ | | | | add prompt to 422 page to check logs
| * add prompt to 422 page to check logsNihad Abbasov2013-03-042-4/+6
|/
* Merge pull request #9200 from wangjohn/unscoping_activerecord_mergingJeremy Kemper2013-03-034-0/+275
|\ | | | | Introduce relation #unscope
| * Created an unscope method for removing relations from a chain ofwangjohn2013-03-034-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-exampleCarlos Antonio da Silva2013-03-031-1/+2
|\ \ | |/ |/| In example fix sql that is generated from scoping
| * fix the sql that is generated from scopingNeeraj Singh2013-03-031-1/+2
| |
* | Bring config.allow_concurrency backJosé Valim2013-03-033-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 helpersAndrew White2013-03-034-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_guideXavier Noria2013-03-031-0/+118
|\ \ | | | | | | integrate the strong params README into the AC guide.
| * | integrate the strong params README into the AC guide.Yves Senn2013-03-031-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/masterGuillermo Iguaran2013-03-028-67/+254
|\ \ | | | | | | New 404, 422, 500 pages, they are more stylish and bring ruby essence…
| * | New beauty pages(404, 422, 500)Stanislav2013-03-028-67/+254
| | | | | | | | | | | | | | | | | | moving changelog note to unreleased section New beauty pages(404, 422, 500)
* | | Remove hard coded references to Active Record in railtiesJosé Valim2013-03-025-23/+11
| | |
* | | Merge pull request #9431 from troyk/patch-2Andrew White2013-03-023-4/+8
|\ \ \ | | | | | | | | | | | | Fix PostgreSQL TIMESTAMP WITH TIME ZONE to return ActiveSupport::Time
| * | | Fix PostgreSQL TIMESTAMP WITH TIME ZONE to return ActiveSupport::TimeTroy Kruthoff2013-03-013-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 lineAkira Matsuda2013-03-021-1/+0
| | |
* | | Merge pull request #9510 from ↵Rafael Mendonça França2013-03-013-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 Senn2013-03-013-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 documentationYves Senn2013-03-011-4/+4
| |/ /
* / / Restore note about nested SCRIPT_NAME handling.Jeremy Kemper2013-03-011-0/+2
|/ /
* | Merge pull request #8652 from codeodor/create_table_migrationCarlos Antonio da Silva2013-03-016-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 generatorSammy Larbi2013-03-016-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 notesJeremy Kemper2013-02-281-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-guideJeremy Kemper2013-02-281-1/+69
|\ \ | | | | | | Add some more documentation to the upgrade guide
| * | Document introduction of ActionDispatch::ParamsParser::ParseErrorTrevor Turk2013-02-281-0/+2
| | |
| * | Document that scopes require a callable objectTrevor Turk2013-02-281-1/+9
| | |
| * | Document common deprecationsTrevor Turk2013-02-281-0/+11
| | |
| * | Document the deprecation of ActionView::RecordIdentifierTrevor Turk2013-02-281-0/+2
| | |
| * | Document ActiveRecord::Fixtures becoming ActiveRecord::FixtureSetTrevor Turk2013-02-281-0/+2
| | |
| * | Document change in routes using matchTrevor Turk2013-02-281-0/+13
| | |
| * | Document removal of assets:precompile:primaryTrevor Turk2013-02-281-0/+4
| | |
| * | Document sass-rails asset_url deprecationTrevor Turk2013-02-281-0/+4
| | |
| * | Document caveat from 5b3bb61 which fixed handling SCRIPT_NAME from within ↵Trevor Turk2013-02-281-0/+3
| | | | | | | | | | | | mounted engine
| * | Document rails-observers extractionTrevor Turk2013-02-281-0/+4
| | |
| * | Document the switch from memcache-client to dalliTrevor Turk2013-02-281-0/+2
| | |