aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #9791 from wangjohn/remove_configurableRafael Mendonça França2013-04-295-21/+45
|\ | | | | Removing Railtie::Configurable and replacing it with class methods
| * Removing Railtie::Configurable from the base Railtie object and makingwangjohn2013-04-295-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.betaRafael Mendonça França2013-04-2914-4410/+22
|
* Bump version to rc1David Heinemeier Hansson2013-04-298-8/+8
|
* Bump activerecord-deprecated_finders. Fixes #10304Rafael Mendonça França2013-04-291-1/+1
|
* Merge pull request #10372 from ↵Jeremy Kemper2013-04-283-12/+13
|\ | | | | | | | | jeremy/statement-invalid-wraps-underlying-exception StatementInvalid takes WrappedDatabaseException's place
| * StatementInvalid takes WrappedDatabaseException's placeJeremy Kemper2013-04-283-12/+13
| |
* | Delegate #unscope query methodCarlos Antonio da Silva2013-04-282-1/+11
|/
* Merge pull request #10364 from wangjohn/refactoring_activesupport_cacheJeremy Kemper2013-04-281-10/+23
|\ | | | | Making the retrieval of the cache store class a method
| * Making the retrieval of the cache store class a method, also wrotewangjohn2013-04-281-10/+23
| | | | | | | | comments for the expand_cache_key method.
* | Merge pull request #10361 from teeparham/patch-1Carlos Antonio da Silva2013-04-281-1/+1
|\ \ | | | | | | Fix travis links in readme [ci skip]
| * | fix travis links in readmeTee Parham2013-04-261-1/+1
| | | | | | | | | links were redirects
* | | Merge pull request #10368 from demands/fix-typoGuillermo Iguaran2013-04-281-1/+1
|\ \ \ | | | | | | | | Fix typo in serialized_attribute_test. [ci skip]
| * | | Fix typo in serialized_attribute_test. [ci skip]Max Edmands2013-04-281-1/+1
| | | |
* | | | Use new hash syntax in module delegation docs [ci skip]Carlos Antonio da Silva2013-04-281-1/+1
| |_|/ |/| |
* | | fixes a test, and explains why AR::AttributeMethods checks ↵Xavier Noria2013-04-283-6/+8
| | | | | | | | | | | | defined?(@attributes) in some places
* | | pass over the code commentsXavier Noria2013-04-281-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 requestAndrew White2013-04-271-1/+2
| |
* | adding test for the symbol refsAaron Patterson2013-04-261-0/+7
| |
* | Module#delegate checks nilness rather that falsehood if :allow_nil is true, ↵Xavier Noria2013-04-262-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-1Andrew White2013-04-261-4/+5
|\ | | | | | | | | Improve poor security recommendation in docs [ci skip]
| * Improve poor security recommendation in docsStephen Touset2013-03-281-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 Noria2013-04-262-5/+10
|\ \ | | | | | | | | | | | | JonRowe/update_as_date_next_week_to_document_intent Propose better documentation for ActiveSupports `next_week` functionaility
| * | formattingJon Rowe2013-04-261-1/+1
| | |
| * | better document `next_week` functionaility closes #9568Jon Rowe2013-04-262-5/+10
| | |
* | | Merge pull request #10347 from lellisga/delegation_bug_documentationGuillermo Iguaran2013-04-252-0/+19
|\ \ \ | |/ / |/| | Delegation method bug
| * | Delegation method bugLi Ellis Gallardo2013-04-252-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 RecordXavier Noria2013-04-251-1/+1
| | |
* | | fixes warning in the AR test suiteXavier Noria2013-04-251-1/+1
|/ /
* | Revert "Merge pull request #10337 from eimermusic/fix_template_digestor_lookup"Rafael Mendonça França2013-04-253-11/+2
| | | | | | | | | | | | | | | | This reverts commit b4239622afc4f3f73808fd0c97512f3a534e07dd, reversing changes made to f99ce3c188f5dde57e2ff63e6a22363c62f0a4cd. Reason: This broke the build https://travis-ci.org/rails/rails/jobs/6629894
* | Merge pull request #10337 from eimermusic/fix_template_digestor_lookupRafael Mendonça França2013-04-253-2/+11
|\ \ | | | | | | | | | | | | | | | | | | Fix ActionView::Digestor to correctly pass format to LookupContext Conflicts: actionpack/CHANGELOG.md
| * | AV Digestor correctly passes format to LookupContextMartin Westin2013-04-253-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | ActionView::Digestor now passes arguments correctly to LookupContext::find method. This makes cache digests respect the format option correctly. FixtureFinder in tests also changed to reflect this.
* | | Add support for extra options to `force_ssl`Andrew White2013-04-253-31/+159
| | | | | | | | | | | | | | | | | | | | | | | | This commit adds support for passing additional url options along with a :status option and any of the flash-related options to `redirect_to` (i.e. :flash, :alert & :notice). Closes #7570.
* | | Use `request.fullpath` to build redirect url in `force_ssl`Andrew White2013-04-253-4/+79
|/ / | | | | | | | | | | | | | | | | | | | | The `force_ssl` command now builds the redirect url from `request.fullpath`. This ensures that the format is maintained and it doesn't redirect to a route that has the same parameters but is defined earlier in `routes.rb`. Also any optional segments are maintained. Fixes #7528. Fixes #9061. Fixes #10305.
* | Review DatabaseTasks docs [ci skip]Carlos Antonio da Silva2013-04-241-17/+17
| |
* | Merge pull request #10333 from ikataitsev/move-test-method-to-testsRafael Mendonça França2013-04-242-8/+9
|\ \ | | | | | | Move method used only in the test to the test code itself
| * | Move method used only in the test to the test code itselfIvan Kataitsev2013-04-252-8/+9
| | |
* | | Minor AR changelog review [ci skip]Carlos Antonio da Silva2013-04-241-6/+8
|/ /
* | Merge pull request #10332 from vipulnsward/number_helperRafael Mendonça França2013-04-241-2/+3
|\ \ | | | | | | refactor number helper
| * | refactor number helperVipul A M2013-04-251-2/+3
| | |
* | | Merge branch 'active-record-standalone-improvements'Piotr Sarnacki2013-04-244-24/+92
|\ \ \
| * | | Use env == 'development' instead of env.development?Piotr Sarnacki2013-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It's simpler to assume that passed env is just a string without any extensions, especially when DatabaseTasks are intended to be used also without rails.
| * | | Move CHANGELOG entry for db.rake improvements to 4.0.0Piotr Sarnacki2013-04-241-3/+1
| | | |
| * | | Don't require Rails.env in order to use AR::Tasks::DatabaseTasksPiotr Sarnacki2013-04-242-6/+8
| | | |
| * | | Add some documentation to ActiveRecord::Tasks::DatabaseTasksPiotr Sarnacki2013-04-241-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | This is a public class, which could be used directly in order to allow easier database management. Now it also contains settings, which will be used by databases.rake.
| * | | Use DatabaseTasks.fixtures_path instead of FIXTURES_PATH in db.rakePiotr Sarnacki2013-04-243-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | This will allow to set fixtures path in global config easier, it should be not needed to use FIXTURES_PATH every time user wants to load fixtures.
| * | | Don't require having Rails.application to run database tasksPiotr Sarnacki2013-04-244-15/+36
| | | |
* | | | Merge pull request #10330 from kennyj/fix_10067Rafael Mendonça França2013-04-243-1/+22
|\ \ \ \ | | | | | | | | | | Serialized column should not be wrapped twice. Fix #10067.
| * | | | Added testcase for #10067 and a CHANGELOG entry about this change.kennyj2013-04-252-0/+21
| | | | |
| * | | | Fix a SystemStackError that occurs when using time zone aware attributes.Dan Erikson2013-04-251-1/+1
|/ / / / | | | | | | | | | | | | This fixes issue #10066
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-15 21:24:54 +0000