aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge pull request #16359 from skanev/after-bundle-in-rails-templatesYves Senn2014-08-067-3/+95
| |\ \
| | * | Add after_bundle to the release notes and upgrade guideStefan Kanev2014-08-052-0/+35
| | * | Add an after_bundle callback in Rails templatesStefan Kanev2014-08-035-3/+60
| * | | Merge pull request #16316 from rails/senny/purge_schema_maintenanceYves Senn2014-08-066-14/+133
| |\ \ \
| | * | | schema rake tasks are specific about the configuration to act on.Yves Senn2014-08-064-22/+39
| | * | | Revert "Revert "Merge pull request #15394 from morgoth/fix-automatic-maintain...Yves Senn2014-08-064-3/+105
| |/ / /
| * | | call the routes method on enginesAaron Patterson2014-08-051-74/+37
| * | | a rails application should be an engine subclassAaron Patterson2014-08-051-1/+1
| * | | no reason to lazily instantiate the routesAaron Patterson2014-08-051-45/+42
* | | | Stop using padding in the generated Gemfile -- it looks shitDavid Heinemeier Hansson2014-08-072-6/+1
|/ / /
* | | Merge pull request #16364 from arthurnn/make_transaction_one_classJeremy Kemper2014-08-052-72/+56
|\ \ \
| * | | Cleanup Transaction inheritance.Arthur Neves2014-08-052-72/+56
* | | | just assign the instance variables on the testAaron Patterson2014-08-051-7/+3
* | | | We don't need parenthesis for thisGuillermo Iguaran2014-08-051-1/+1
* | | | Merge pull request #16405 from arthurnn/fix_digest_etag_testGuillermo Iguaran2014-08-051-1/+1
|\ \ \ \
| * | | | Fix digest ETAG test.Arthur Neves2014-08-051-1/+1
|/ / / /
* | | | Merge pull request #16404 from bogdan/move-create-with-bangCarlos Antonio da Silva2014-08-052-15/+12
|\ \ \ \
| * | | | Moved #create! method from Validations to Persistence moduleBogdan Gusiev2014-08-052-15/+12
| | |_|/ | |/| |
* | | | Fix AS docs / changelog with wrong method [ci skip]Carlos Antonio da Silva2014-08-052-3/+3
* | | | Bring back the helpers testsJosé Valim2014-08-053-0/+50
* | | | Remove unused text? predicate method and delegationCarlos Antonio da Silva2014-08-052-5/+1
* | | | Call public methods rather than class_eval'ingCarlos Antonio da Silva2014-08-051-4/+2
|/ / /
* | | avoid testing only_pathAaron Patterson2014-08-042-2/+5
* | | Merge pull request #16396 from eileencodes/dont-delegate-chain-to-through-ass...Rafael Mendonça França2014-08-041-2/+2
|\ \ \
| * | | Don't delegate Reflection#chain to ThroughAssociationeileencodes2014-08-041-2/+2
|/ / /
* | | Merge pull request #16395 from jonatack/patch-8Rafael Mendonça França2014-08-041-1/+1
|\ \ \
| * | | Update itself.rb [ci skip]Jon Atack2014-08-051-1/+1
|/ / /
* | | Merge pull request #16375 from johnnyshields/guidesRichard Schneeman2014-08-041-0/+2
|\ \ \
| * | | [ci skip] Guides: Add definition of `config.assets.manifest` option to config...Johnny Shields2014-08-051-0/+2
| | |/ | |/|
* | | Only define Objetc#itself when it is not definedRafael Mendonça França2014-08-041-8/+10
* | | Merge pull request #16393 from jonatack/patch-8Rafael Mendonça França2014-08-041-1/+1
|\ \ \
| * | | Fix typo [ci skip]Jon Atack2014-08-041-1/+1
|/ / /
* | | Regenerate sid when sbdy tries to fixate the sessionSantiago Pastorino2014-08-042-12/+11
* | | Merge pull request #16333 from joker1007/fix_decimal_cast_from_float_with_lar...Yves Senn2014-08-043-4/+26
|\ \ \
| * | | Fix type casting to Decimal from Float with ...joker10072014-08-013-4/+26
* | | | Explain why we use asset digests, not what a setter doesDavid Heinemeier Hansson2014-08-032-2/+4
* | | | Add suggestion as to how you can app the the assets load pathDavid Heinemeier Hansson2014-08-031-0/+3
* | | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-032-43/+33
|\ \ \ \
| * \ \ \ Merge pull request #16386 from JackDanger/journey-no-result-varGuillermo Iguaran2014-08-032-43/+33
| |\ \ \ \
| | * | | | Using no_result_var in Journey's parser generatorJack Danger Canty2014-08-032-43/+33
* | | | | | Pull in the custom configuration concept from dhh/custom_configurationDavid Heinemeier Hansson2014-08-035-1/+103
|/ / / / /
* | | | | A few more tests asserting the presence of helper test stubsDavid Heinemeier Hansson2014-08-036-17/+0
* | | | | Update docs to reflect that helper stubs are no longer generatedDavid Heinemeier Hansson2014-08-035-25/+2
* | | | | Stubs are no longer generated for helpers, so dont test for itDavid Heinemeier Hansson2014-08-031-4/+0
* | | | | Change the production log level default from :info to :debug. All production ...David Heinemeier Hansson2014-08-031-2/+2
* | | | | Generating stubs for helper tests is overly specific. Most helpers should sim...David Heinemeier Hansson2014-08-034-75/+0
|/ / / /
* | | | Merge pull request #16306 from aditya-kapoor/add-docs-for-uglifierZachary Scott2014-08-021-8/+9
|\ \ \ \
| * | | | [ci skip] add tip for uglifier in execjs errorAditya Kapoor2014-08-031-8/+9
* | | | | Merge pull request #16380 from y-yagi/patch-1Richard Schneeman2014-08-021-1/+0
|\ \ \ \ \
| * | | | | [ci skip] Remove "Machinist" from testing guideyuuji.yaginuma2014-08-031-1/+0
|/ / / / /