aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #21877 from amitsuroliya/unused_block_argumentArthur Nogueira Neves2015-10-051-1/+1
|\ | | | | Remove unused block argument
| * Remove unused block argumentamitkumarsuroliya2015-10-061-1/+1
|/
* Merge pull request #21876 from kentendo/masterSean Griffin2015-10-051-1/+1
|\ | | | | Update asset_pipeline.md [ci skip]
| * Update asset_pipeline.mdkentendo2015-10-051-1/+1
| |
* | render should return a stringAaron Patterson2015-10-051-1/+1
|/
* move file sending to the response objectAaron Patterson2015-10-056-30/+50
| | | | | | | Just a slight refactor that delegates file sending to the response object. This gives us the advantage that if a webserver (in the future) provides a response object that knows how to do accelerated file serving, it can implement this method.
* Merge pull request #21872 from kirs/chore/attributes-cleanupSean Griffin2015-10-051-3/+0
|\ | | | | No need to declare ActiveRecord::Attributes::Type
| * No need to declare ActiveRecord::Attributes::TypeKir Shatrov2015-10-051-3/+0
| |
* | Merge pull request #21796 from dv/docs-change-to-parse-nested-queryEileen M. Uchitelle2015-10-051-7/+0
|\ \ | | | | | | Change "parse_query" to "parse_nested_query"
| * | Remove TIP on parse_queryDavid Verhasselt2015-10-051-7/+0
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #20098 from hanachin/add_ability_to_translate_documents.yamlXavier Noria2015-10-052-2/+2
|\ \ \ | | | | | | | | Add ability to translate rails guides documents.yaml
| * | | concatenate @lang if @lang is presence to avoid useless slashSeiei Miyagi2015-10-051-1/+1
| | | |
| * | | Add ability to translate rails guides documents.yamlSeiei Miyagi2015-10-052-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some translations of rails guides has their own documents.yaml, for example Japanese: https://github.com/yasslab/railsguides.jp/blob/japanese/guides/source/documents.yaml Traditional Chinese: https://github.com/docrails-tw/guides/blob/master/rails_guides/helpers.rb#L21,L27 https://github.com/docrails-tw/guides/blob/master/source/documents_zh-TW.yaml The [Translating Rails Guides](https://github.com/rails/docrails/wiki/translating-rails-guides) says > Copy the contents of guides/source into your own language directory and translate them. So that sounds ok to copy guides/source/documents.yaml into language specific directly and translating them like other markdown files.
* | | Merge pull request #21854 from morgoth/fix-serializing-at-option-in-aj-matchersYves Senn2015-10-053-8/+38
|\ \ \ | | | | | | | | | | | | Fixed serializing `:at` option for `assert_eqnueued_with` and `assert_performed_with`
| * | | Fixed serializing `:at` option for `assert_enqueued_with` and ↵Wojciech Wnętrzak2015-10-033-8/+32
| | | | | | | | | | | | | | | | `assert_performed_with`
* | | | Merge pull request #21033 from dgynn/preloader_build_scope_tuningArthur Nogueira Neves2015-10-041-1/+3
|\ \ \ \ | | | | | | | | | | Skip _select! call unless needed for preloader
| * | | | skip _select! call unless :select values are specifiedDave Gynn2015-07-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | the default scope will select all fields. removing this improves performance and reduces String creation.
* | | | | Merge pull request #20981 from dkoprov/ar_postgres_enum_docs_additionSean Griffin2015-10-041-5/+41
|\ \ \ \ \ | | | | | | | | | | | | Add more info on working with postgres ENUM type
| * | | | | adds more info on working with postgres ENUM typeDmitry Koprov2015-07-231-5/+41
| | | | | |
* | | | | | Merge pull request #20986 from radar/rails-engine-caller-locationsArthur Nogueira Neves2015-10-041-6/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove check for caller_locations in Rails::Engine
| * | | | | | Remove check for caller_locations in Rails::EngineRyan Bigg2015-07-231-6/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | This is no longer necessary, as the minimum version requirement for Ruby is 2.2.2, and the `caller_locations` feature was added in Ruby 2.0.0. Since Rails no longer supports pre 2.0 versions of Ruby, there is no need to check first if the Kernel does respond to `caller_locations`. The answer is: yes it does.
* | | | | | Merge pull request #21005 from jaredbeck/patch-1Arthur Nogueira Neves2015-10-041-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Docs: Update options for add_reference
| * | | | | | Docs: Update options for add_referenceJared Beck2015-07-231-1/+3
| | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge pull request #20116 from cristianbica/activejob-enqueue-loggingArthur Nogueira Neves2015-10-041-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | ActiveJob - log enqueued message only after the job was successfully enqueued
| * | | | | | | ActiveJob - log enqueued message only after the job was successfully enqueuedCristian Bica2015-05-111-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #21865 from Gaurav2728/test_cases_protected_method_nodocSean Griffin2015-10-041-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | action mailer test cases protected method can be `# :nodoc:` [ci skip]
| * | | | | | | | action mailer test cases protected method can be `# :nodoc:`Gaurav Sharma2015-10-041-5/+5
| | | | | | | | |
* | | | | | | | | Merge pull request #21867 from akihiro17/fix-relation-docSean Griffin2015-10-041-5/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [ci skip] Fix ActiveRecord::Relation#update documentation
| * | | | | | | | | [ci skip] Fix ActiveRecord::Relation#update documentationakihiro172015-10-051-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * before ``` people = Person.where(group: 'expert') people.update(group: 'masters') Note: Updating a large number of records will run a UPDATE query for each record, which may cause a performance issue. So if it is not needed to run callbacks for each update, it is preferred to use <tt>update_all</tt> for updating all records using a single query. ``` * after ``` people = Person.where(group: 'expert') people.update(group: 'masters') ``` Note: Updating a large number of records will run an UPDATE query for each record, which may cause a performance issue. So if it is not needed to run callbacks for each update, it is preferred to use <tt>update_all</tt> for updating all records using a single query.
* | | | | | | | | | Merge pull request #21868 from tanmay3011/fix_time_class_documentationVijay Dev2015-10-051-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ci skip] Fix #seconds_since_midnight documentation output it will al…
| * | | | | | | | | | [ci skip] Fix #seconds_since_midnight documentation output it will always ↵Tanmay Sinha2015-10-051-3/+3
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | return floating pointnumber
* | | | | | | | | | Merge pull request #21857 from cllns/fix-myspace-example-wordingClaudio B.2015-10-041-5/+3
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Update text on CSS Injection
| * | | | | | | | | Update text on CSS Injection / MyspaceSean Collins2015-10-031-5/+3
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | [skip ci]
* | | | | | | | | Merge pull request #21866 from tanmay3011/fix_documentationSean Griffin2015-10-041-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix Time.now format in documentation [ci skip]
| * | | | | | | | | Fix Time.now format in documentationTanmay Sinha2015-10-041-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #21863 from tanmay3011/use_applications_yearSean Griffin2015-10-041-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Use #current instead of #now to prevent zone issues and use new ruby …
| * | | | | | | | | Use Time#current instead of Time#now to prevent zone issue inorder to use ↵Tanmay Sinha2015-10-041-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | application's time zone
* | | | | | | | | Merge pull request #21848 from yui-knk/test_suppress_warningsSean Griffin2015-10-041-3/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Suppress warnings of `assigned but unused variable`
| * | | | | | | | | Suppress warnings of `assigned but unused variable`yui-knk2015-10-031-3/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-10-0420-27/+31
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | [ci skip] Fix commentyui-knk2015-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `alias :migrations_path= :migrations_paths=`, so `migrations_path = some_string` is correct.
| * | | | | | | | | [ci skip] default_normalization_form accessing from UnicodeGaurav Sharma2015-09-291-1/+1
| | | | | | | | | |
| * | | | | | | | | Revert "proper raise ArgumentError, divided large text new line"Rafael Mendonça França2015-09-282-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4147ab730e807f622e5260a5f876749ff41fef26.
| * | | | | | | | | adding basic change_column and remove_columns in CommandRecorder ↵Gaurav Sharma2015-09-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | documentations [ci skip]
| * | | | | | | | | proper raise ArgumentError, divided large text new lineGaurav Sharma2015-09-292-4/+4
| | | | | | | | | |
| * | | | | | | | | Add missing punctuation mark to all ActionMailer docs [ci skip]amitkumarsuroliya2015-09-285-12/+12
| | | | | | | | | |
| * | | | | | | | | Renamed ‘Return’ to ‘Returns’ [ci skip]Ronak Jangir2015-09-287-9/+9
| | | | | | | | | |
| * | | | | | | | | Add a missing period to ActionMailer Base docs [ci skip]amitkumarsuroliya2015-09-281-1/+1
| | | | | | | | | |
| * | | | | | | | | [ci skip] Fix document of `ActionController::RequestForgeryProtection`yui-knk2015-09-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add `end` to end of class definition * add a blank line between explanation and example code
| * | | | | | | | | [ci skip] Add `:` before code blocks.yui-knk2015-09-251-1/+1
| | | | | | | | | |