aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #21804 from merhard/mounted_engine_route_fixAndrew White2015-10-074-2/+64
|\
| * Fix mounted engine named routes regressionMatthew Erhard2015-10-074-2/+64
* | Output inline is set to true in the plugin.Kasper Timm Hansen2015-10-072-3/+3
* | Refactor create_test_file to take a pass option.Kasper Timm Hansen2015-10-071-31/+7
* | Hide Minitest's aggregated results if outputting inline.Kasper Timm Hansen2015-10-072-0/+29
* | Merge pull request #21904 from morgoth/missing-test-for-not-modifing-queuesRichard Schneeman2015-10-072-14/+31
|\ \
| * | Added missing specs for not modifying queues when using AJ test helpersWojciech Wnętrzak2015-10-072-14/+31
| |/
* / Revert "Update asset_pipeline.md"Rafael Mendonça França2015-10-071-1/+1
|/
* Merge pull request #21902 from mparramont/patch-1Rafael Mendonça França2015-10-071-1/+1
|\
| * Fix "Esperanto" nameMiguel Parramon2015-10-071-1/+1
|/
* Merge pull request #21899 from scottgonzalez/layouts-and-rendering-typoRichard Schneeman2015-10-071-1/+1
|\
| * Fix typo in docs [ci skip]Scott González2015-10-071-1/+1
* | Merge pull request #21900 from scottgonzalez/contributing-typoRafael Mendonça França2015-10-071-1/+1
|\ \ | |/ |/|
| * Fix pluralization in docs [ci skip]Scott González2015-10-071-1/+1
|/
* Merge pull request #21895 from abhishekjain16/doc_fixKasper Timm Hansen2015-10-071-1/+1
|\
| * [ci skip] fix typoAbhishek Jain2015-10-071-1/+1
|/
* Merge pull request #20983 from jameskerr/mailer-preview-urlArthur Nogueira Neves2015-10-062-1/+21
|\
| * Update the URL when changing mailer preview formatsJames Kerr2015-10-062-1/+21
* | use methods for accessing the cache control headersAaron Patterson2015-10-063-7/+10
* | etag header is in Rack, so use it's response methodsAaron Patterson2015-10-062-7/+3
|/
* Merge pull request #21869 from jeremy/mime-constant-deprecationJeremy Daer2015-10-0632-214/+193
|\
| * Use `Mime[:foo]` instead of `Mime::Type[:FOO]` for back compatJeremy Daer2015-10-0632-214/+193
|/
* Merge pull request #21887 from abhishekjain16/doc_fixKasper Timm Hansen2015-10-062-2/+2
|\
| * Fix usage of word alternatively in docs [ci skip]Abhishek Jain2015-10-062-2/+2
* | Merge pull request #21888 from tanmay3011/fix-grammarYves Senn2015-10-068-9/+9
|\ \ | |/ |/|
| * [ci skip] Change 'an URL' to 'a URL' as URL doesn't have a vowel soundtanmay30112015-10-068-9/+9
|/
* Implement equality comparison on `AttributeSet` and friendsSean Griffin2015-10-063-11/+33
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-18 09:00:16 +0000