aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #21879 from abhishekjain16/doc_fixAndrew White2015-10-061-1/+1
|\
| * Fix ActionView changelog documentation [ci skip]Abhishek Jain2015-10-061-1/+1
* | Merge pull request #21881 from b1nary/active_model_doc_fixYves Senn2015-10-061-1/+1
|\ \ | |/ |/|
| * use ActiveModel::Naming module instead of Model [ci skip]Roman Pramberger2015-10-061-1/+1
|/
* Merge pull request #21877 from amitsuroliya/unused_block_argumentArthur Nogueira Neves2015-10-051-1/+1
|\
| * Remove unused block argumentamitkumarsuroliya2015-10-061-1/+1
|/
* Merge pull request #21876 from kentendo/masterSean Griffin2015-10-051-1/+1
|\
| * 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
* Merge pull request #21872 from kirs/chore/attributes-cleanupSean Griffin2015-10-051-3/+0
|\
| * 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
|\ \
| * | Remove TIP on parse_queryDavid Verhasselt2015-10-051-7/+0
* | | Merge pull request #20098 from hanachin/add_ability_to_translate_documents.yamlXavier Noria2015-10-052-2/+2
|\ \ \
| * | | 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
|/ / /
* | | Merge pull request #21854 from morgoth/fix-serializing-at-option-in-aj-matchersYves Senn2015-10-053-8/+38
|\ \ \
| * | | Fixed serializing `:at` option for `assert_enqueued_with` and `assert_perform...Wojciech Wnętrzak2015-10-033-8/+32
* | | | Merge pull request #21033 from dgynn/preloader_build_scope_tuningArthur Nogueira Neves2015-10-041-1/+3
|\ \ \ \
| * | | | skip _select! call unless :select values are specifiedDave Gynn2015-07-261-1/+3
* | | | | Merge pull request #20981 from dkoprov/ar_postgres_enum_docs_additionSean Griffin2015-10-041-5/+41
|\ \ \ \ \
| * | | | | 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::EngineRyan Bigg2015-07-231-6/+1
| |/ / / / /
* | | | | | Merge pull request #21005 from jaredbeck/patch-1Arthur Nogueira Neves2015-10-041-1/+3
|\ \ \ \ \ \
| * | | | | | Docs: Update options for add_referenceJared Beck2015-07-231-1/+3
* | | | | | | 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 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:`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 documentationakihiro172015-10-051-5/+5
* | | | | | | | | | 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 always ret...Tanmay Sinha2015-10-051-3/+3
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #21857 from cllns/fix-myspace-example-wordingClaudio B.2015-10-041-5/+3
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Update text on CSS Injection / MyspaceSean Collins2015-10-031-5/+3
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #21866 from tanmay3011/fix_documentationSean Griffin2015-10-041-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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 Time#current instead of Time#now to prevent zone issue inorder to use app...Tanmay Sinha2015-10-041-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #21848 from yui-knk/test_suppress_warningsSean Griffin2015-10-041-3/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
| * | | | | | | | | [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
| * | | | | | | | | adding basic change_column and remove_columns in CommandRecorder documentatio...Gaurav Sharma2015-09-291-0/+2
| * | | | | | | | | 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