aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #17896 from GBH/globbing_route_mailer_previewRafael Mendonça França2014-12-082-1/+12
|\
| * fixing mailer previews for apps with globbing routeOleg2014-12-032-1/+12
* | Merge pull request #17969 from tiii/add-brackets-around-attribute_nameRafael Mendonça França2014-12-081-1/+1
|\ \
| * | add brackets around attribute_name_tiii2014-12-081-1/+1
* | | Fix type case of "validations" and word-wrap from #17954 [ci skip]Zachary Scott2014-12-081-2/+3
* | | Merge pull request #17966 from mikechau/update-ar-store-validation-documentationZachary Scott2014-12-081-1/+4
|\ \ \
| * | | Add note to Store about uniqueness validation (#17954) [skip ci]Mike Chau2014-12-081-1/+4
| |/ /
* | | Merge pull request #17953 from kirs/test-activejob-generatorRafael Mendonça França2014-12-081-0/+29
|\ \ \ | |/ / |/| |
| * | Test coverage for ActiveJob generatorKir Shatrov2014-12-071-0/+29
* | | Merge pull request #17963 from neerajdotname/wordsmitthingRichard Schneeman2014-12-081-3/+3
|\ \ \
| * | | minor sentences fixesNeeraj Singh2014-12-071-3/+3
|/ / /
* | | Merge pull request #17959 from eileencodes/fix-grammar-on-reflectionZachary Scott2014-12-071-3/+3
|\ \ \
| * | | Fix grammar of sentence in Reflection documentationeileencodes2014-12-071-3/+3
|/ / /
* | | Merge pull request #17950 from y-yagi/postgres_guideRichard Schneeman2014-12-071-0/+3
|\ \ \
| * | | [ci skip] add `enable_extension` to PostgreSQL hstore exampleyuuji.yaginuma2014-12-071-0/+3
|/ / /
* | | Merge pull request #17944 from tjschuck/mounted_named_routes_regressionSantiago Pastorino2014-12-062-14/+43
|\ \ \
| * | | Mounted Rack apps should have default named routes based on app nameT.J. Schuck2014-12-062-14/+43
* | | | Merge pull request #17942 from yui-knk/fix/upgrading.mdRichard Schneeman2014-12-061-1/+1
|\ \ \ \
| * | | | [ci skip] update rails version to 3.2.21yui-knk2014-12-061-1/+1
| |/ / /
* | | | Merge pull request #17943 from jeremywadsack/doc_cache_importabilityRichard Schneeman2014-12-061-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Add Guides note to change cache name space as Entry data is incompatible betw...Jeremy Wadsack2014-12-041-0/+4
* | | | Add `force: true` to tables created in PG testsSean Griffin2014-12-052-2/+2
* | | | Correctly respect subtypes for PG arrays and rangesSean Griffin2014-12-053-10/+43
* | | | Merge pull request #17932 from brooksreese/masterRafael Mendonça França2014-12-052-2/+2
|\ \ \ \
| * | | | Fix sentence structure [ci skip]Brooks Reese2014-12-051-1/+1
| * | | | Fix grammar in Rakefile markup [ci skip]Brooks Reese2014-12-051-1/+1
* | | | | Merge pull request #17934 from rubys/dev_webconsoleRafael Mendonça França2014-12-051-0/+10
|\ \ \ \ \
| * | | | | Use latest web-console when using --dev or --edgeSam Ruby2014-12-051-0/+10
|/ / / / /
* | | | | Merge pull request #17930 from sergey-alekseev/remove-unused-generalized-tableRafael Mendonça França2014-12-052-49/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | remove unused `#optional_parts`Sergey Alekseev2014-12-051-4/+0
| * | | | remove unused `#generalized_table`Sergey Alekseev2014-12-051-45/+0
* | | | | Include missing requireDavid Heinemeier Hansson2014-12-051-0/+1
* | | | | Merge pull request #17817 from aripollak/hide-activejob-argsDavid Heinemeier Hansson2014-12-052-1/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Inline to_global_id conversionAri Pollak2014-12-041-5/+1
| * | | | Use try instead of checking for GlobalID::IdentificationAri Pollak2014-12-041-5/+1
| * | | | Only filter GIDable objects; remove cosmetic changesAri Pollak2014-12-012-16/+14
| * | | | Hide potentially sensitive ActiveJob params from logsAri Pollak2014-11-282-11/+34
* | | | | Merge pull request #17925 from rebyn/german_typoSantiago Pastorino2014-12-052-3/+3
|\ \ \ \ \
| * | | | | Typo: Hello = Guten Tag (in German)Tu Hoang2014-12-052-3/+3
|/ / / / /
* | | | | Merge pull request #17919 from mrgilman/stop-supporting-nested-arraysSean Griffin2014-12-044-40/+5
|\ \ \ \ \
| * | | | | Remove deprecated behavior allowing nested arrays as query valuesMelanie Gilman2014-12-044-40/+5
* | | | | | Correctly handle multiple attribute method prefix/suffixes which matchSean Griffin2014-12-042-6/+14
* | | | | | Merge pull request #17920 from calebthompson/dont-rely-on-environment-task-fo...Sean Griffin2014-12-041-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove environment dependency for db:schema:loadCaleb Thompson2014-12-041-1/+1
* | | | | | Merge pull request #17916 from mrgilman/deprecate-class-handlerSean Griffin2014-12-043-4/+17
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Deprecate `Class` handler in `PredicateBuilder`Melanie Gilman2014-12-043-4/+17
* | | | | | Merge pull request #17797 from y-yagi/donot_delete_mailer_layoutsRafael Mendonça França2014-12-043-4/+23
|\ \ \ \ \ \
| * | | | | | Don't remove mailer layouts filesyuuji.yaginuma2014-11-273-4/+23
* | | | | | | Merge pull request #17825 from aripollak/fix-activejob-sidekiq-integrationRafael Mendonça França2014-12-041-1/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix Sidekiq ActiveJob integration setupAri Pollak2014-11-281-1/+2