| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Removing the app constant and replacing it with Rails.application | wangjohn | 2013-04-30 | 13 | -18/+22 |
| | | | | | | syntax. This helps removing the class level abstraction of an application. | ||||
| * | Merge pull request #10339 from eiel/unused-require | Rafael Mendonça França | 2013-04-30 | 1 | -1/+0 |
| |\ | | | | | remove unused require | ||||
| | * | remove unused require | Tomohiko Himura | 2013-04-25 | 1 | -1/+0 |
| | | | | | | | | | not used remove_possible_method | ||||
| * | | Merge pull request #10388 from benolee/fix-parser-semicolon | Rafael Mendonça França | 2013-04-30 | 1 | -0/+1 |
| |\ \ | | | | | | | add missing semicolon to journey parser.y | ||||
| | * | | add missing semicolon to journey parser.y | Ben Holley | 2013-04-30 | 1 | -0/+1 |
| |/ / | |||||
| * | | mysql needs to reconnect after recreate. Thanks @mperham | Aaron Patterson | 2013-04-30 | 1 | -0/+1 |
| | | | |||||
| * | | Merge pull request #10386 from kennyj/should_stop_task_when_missing_file | Rafael Mendonça França | 2013-04-30 | 4 | -6/+21 |
| |\ \ | | | | | | | Abort a rake task when missing db/structure.sql like `db:schema:load` task. | ||||
| | * | | Abort a rake task when missing db/structure.sql like `db:schema:load` task. | kennyj | 2013-05-01 | 4 | -6/+21 |
| | | | | |||||
| * | | | Merge pull request #10387 from gaurish/rack-mount | Rafael Mendonça França | 2013-04-30 | 1 | -1/+1 |
| |\ \ \ | |/ / |/| | | Rack::Mount was replaced by Journey, Fixed comment | ||||
| | * | | Rack::Mount was replaced by Journey, Fixed comment | Gaurish Sharma | 2013-04-30 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #10357 from ↵ | Rafael Mendonça França | 2013-04-30 | 1 | -6/+6 |
| |\ \ | | | | | | | | | | | | | arunagw/minor-code-deuplication-removed-app-generator Minor code duplication removed | ||||
| | * | | Minor code duplication removed | Arun Agrawal | 2013-04-29 | 1 | -6/+6 |
| | | | | |||||
| * | | | Merge pull request #10385 from siong1987/fix_rake_doc_guides | Xavier Noria | 2013-04-30 | 2 | -3/+3 |
| |\ \ \ | | | | | | | | | Make `rake doc:guides` works again. Fix #10384. | ||||
| | * | | | Make `rake doc:guides` works again. Fix #10384. | Teng Siong Ong | 2013-04-30 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | Merge pull request #10383 from Noemj/bind_param_handling | Rafael Mendonça França | 2013-04-30 | 2 | -26/+28 |
| |\ \ \ \ | |/ / / |/| | | | Moved update_record logic to relation.rb | ||||
| | * | | | Moved update_record logic to relation.rb | Noemj | 2013-04-30 | 2 | -26/+28 |
| |/ / / | |||||
| * | | | Merge pull request #10379 from frodsan/fix_nodoc_ar_delegation | Guillermo Iguaran | 2013-04-29 | 1 | -3/+3 |
| |\ \ \ | | | | | | | | | add missing :nodoc: marks to ActiveRecord::Delegation [ci skip] | ||||
| | * | | | add missing :nodoc: marks to ActiveRecord::Delegation [ci skip] | Francesco Rodriguez | 2013-04-29 | 1 | -3/+3 |
| |/ / / | |||||
| * | | | Merge pull request #10378 from frodsan/fix_precompiling_assets_section | Rafael Mendonça França | 2013-04-29 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Fix assets precompiling in production guide | ||||
| | * | | | Fix guide section about assets precompiling task in production [ci skip] | Francesco Rodriguez | 2013-04-29 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | You need to specify `RAILS_ENV=production` Related to https://github.com/rails/sass-rails/issues/152. /cc @guilleiguaran | ||||
| * | | | Merge pull request #9791 from wangjohn/remove_configurable | Rafael Mendonça França | 2013-04-29 | 5 | -21/+45 |
| |\ \ \ | | | | | | | | | Removing Railtie::Configurable and replacing it with class methods | ||||
| | * | | | Removing Railtie::Configurable from the base Railtie object and making | wangjohn | 2013-04-29 | 5 | -21/+45 |
| |/ / / | | | | | | | | | | | | | Railtie itself abstract. This stops the weird behavior of forcing subclasses of Railtie to include the Configurable module. | ||||
| * | | | rails/master is now 4.1.0.beta | Rafael Mendonça França | 2013-04-29 | 14 | -4410/+22 |
| | | | | |||||
| * | | | Bump version to rc1 | David Heinemeier Hansson | 2013-04-29 | 8 | -8/+8 |
| | | | | |||||
| * | | | Bump activerecord-deprecated_finders. Fixes #10304 | Rafael Mendonça França | 2013-04-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #10372 from ↵ | Jeremy Kemper | 2013-04-28 | 3 | -12/+13 |
| |\ \ \ | | | | | | | | | | | | | | | | | jeremy/statement-invalid-wraps-underlying-exception StatementInvalid takes WrappedDatabaseException's place | ||||
| | * | | | StatementInvalid takes WrappedDatabaseException's place | Jeremy Kemper | 2013-04-28 | 3 | -12/+13 |
| | | | | | |||||
| * | | | | Delegate #unscope query method | Carlos Antonio da Silva | 2013-04-28 | 2 | -1/+11 |
| |/ / / | |||||
| * | | | Merge pull request #10364 from wangjohn/refactoring_activesupport_cache | Jeremy Kemper | 2013-04-28 | 1 | -10/+23 |
| |\ \ \ | | | | | | | | | Making the retrieval of the cache store class a method | ||||
| | * | | | Making the retrieval of the cache store class a method, also wrote | wangjohn | 2013-04-28 | 1 | -10/+23 |
| | | | | | | | | | | | | | | | | | comments for the expand_cache_key method. | ||||
| * | | | | Merge pull request #10361 from teeparham/patch-1 | Carlos Antonio da Silva | 2013-04-28 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | Fix travis links in readme [ci skip] | ||||
| | * | | | | fix travis links in readme | Tee Parham | 2013-04-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | links were redirects | ||||
| * | | | | | Merge pull request #10368 from demands/fix-typo | Guillermo Iguaran | 2013-04-28 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix typo in serialized_attribute_test. [ci skip] | ||||
| | * | | | | | Fix typo in serialized_attribute_test. [ci skip] | Max Edmands | 2013-04-28 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Use new hash syntax in module delegation docs [ci skip] | Carlos Antonio da Silva | 2013-04-28 | 1 | -1/+1 |
| | |_|/ / / |/| | | | | |||||
| * | | | | | fixes a test, and explains why AR::AttributeMethods checks ↵ | Xavier Noria | 2013-04-28 | 3 | -6/+8 |
| | | | | | | | | | | | | | | | | | | | | | defined?(@attributes) in some places | ||||
| * | | | | | pass over the code comments | Xavier Noria | 2013-04-28 | 1 | -28/+32 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | * Highlights the requirement of an attributes method. * Removes some details that depend on the implementation of the class including the module. * Applies guidelines here and there. | ||||
| * | | | | Don't reprocess the options hash on every request | Andrew White | 2013-04-27 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | adding test for the symbol refs | Aaron Patterson | 2013-04-26 | 1 | -0/+7 |
| | | | | | |||||
| * | | | | Module#delegate checks nilness rather that falsehood if :allow_nil is true, ↵ | Xavier Noria | 2013-04-26 | 2 | -30/+73 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and avoids multiple evaluation of the target method Notes: 1) I hope nilness is a word. 2) See rationale for avoiding multiple evaluation in a comment in the patch, credit goes to @jeremy for pointing out this gotcha in the existing implementation. 3) Embeds a little joke dedicated to @pixeltrix (it could be worse! :D). References #10347. | ||||
| * | | | Merge pull request #9980 from stouset/patch-1 | Andrew White | 2013-04-26 | 1 | -4/+5 |
| |\ \ \ | | | | | | | | | | | | | | | | | Improve poor security recommendation in docs [ci skip] | ||||
| | * | | | Improve poor security recommendation in docs | Stephen Touset | 2013-03-28 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | As reported in #9960, the current documentation recommends an insecure practice for key generation from a password (a single round of SHA-256). The modified documentation uses ActiveSupport::KeyGenerator to perform proper key stretching. | ||||
| * | | | | Merge pull request #10351 from ↵ | Xavier Noria | 2013-04-26 | 2 | -5/+10 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | JonRowe/update_as_date_next_week_to_document_intent Propose better documentation for ActiveSupports `next_week` functionaility | ||||
| | * | | | formatting | Jon Rowe | 2013-04-26 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | better document `next_week` functionaility closes #9568 | Jon Rowe | 2013-04-26 | 2 | -5/+10 |
| | | | | | |||||
| * | | | | Merge pull request #10347 from lellisga/delegation_bug_documentation | Guillermo Iguaran | 2013-04-25 | 2 | -0/+19 |
| |\ \ \ \ | |/ / / |/| | | | Delegation method bug | ||||
| | * | | | Delegation method bug | Li Ellis Gallardo | 2013-04-25 | 2 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation and test to delegation method that make sure we're aware that when a delegated object is not nil or false and doesn't respond to the method it will still raise a NoMethodError exception. | ||||
| * | | | | ActiveRecord -> Active Record | Xavier Noria | 2013-04-25 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fixes warning in the AR test suite | Xavier Noria | 2013-04-25 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Revert "Merge pull request #10337 from eimermusic/fix_template_digestor_lookup" | Rafael Mendonça França | 2013-04-25 | 3 | -11/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b4239622afc4f3f73808fd0c97512f3a534e07dd, reversing changes made to f99ce3c188f5dde57e2ff63e6a22363c62f0a4cd. Reason: This broke the build https://travis-ci.org/rails/rails/jobs/6629894 | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |