| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #9978 from trevorturk/cookie-store-auto-upgrade | Santiago Pastorino | 2013-04-01 | 11 | -99/+239 |
| |\ | | | | | Cookie-base session store auto-upgrade | ||||
| | * | Allow transparent upgrading of legacy signed cookies to encrypted cookies; ↵ | Trevor Turk | 2013-03-28 | 11 | -99/+239 |
| | | | | | | | | | Automatically configure cookie-based sessions to use the best cookie jar given the app's config | ||||
| * | | Merge pull request #10026 from ogawaso/typo | Santiago Pastorino | 2013-04-01 | 1 | -2/+2 |
| |\ \ | | | | | | | typo recomend -> recommend | ||||
| | * | | typo recomend -> recommend | ogawaso | 2013-04-01 | 1 | -2/+2 |
| |/ / | |||||
| * | | gist for Active Record issues [Neeraj Singh & Xavier Noria] | Xavier Noria | 2013-04-01 | 3 | -1/+90 |
| | | | | | | | | | This commit closes issue #9775. | ||||
| * | | Merge pull request #9680 from bdmac/time-zone-options-revert-grep-to-select | Carlos Antonio da Silva | 2013-03-31 | 2 | -4/+23 |
| |\ \ | | | | | | | Revert grep to select since they are not the same | ||||
| | * | | Add regression test for TZ grep | Brian McManus | 2013-03-27 | 1 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | Added a regression test that will fail if anyone tries to change time_zone_select to use grep again thinking it will work when it does not. | ||||
| | * | | Revert grep to select since they are not the same | Brian McManus | 2013-03-27 | 2 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A previous commit swapped out a call to select for a call to grep in time_zone_options_for_select. This behavior actually causes the regexp priority option to stop working. ActiveSupport::TimeZone overrides the =~ operator which is what the select block was using previously. Enumerable#grep checks pattern === element and in this case that would be /US/ === ActiveSupport::TimeZone which does not work because ActiveSupport::TimeZone does not supply an implicit converting to_str method, only an explicit to_s method. It would be impossible to provide a to_str method that behaves identically to the =~ method provided on ActiveSupport::TimeZone so the only option is to revert back to using select with =~. | ||||
| * | | | Merge pull request #10013 from vipulnsward/fix_request_method_test | Santiago Pastorino | 2013-03-31 | 1 | -6/+2 |
| |\ \ \ | | | | | | | | | fix request methods test | ||||
| | * | | | fix request methods test | Vipul A M | 2013-03-31 | 1 | -6/+2 |
| | | | | | |||||
| * | | | | Merge pull request #10017 from vipulnsward/railties_cleanups | Steve Klabnik | 2013-03-31 | 3 | -6/+5 |
| |\ \ \ \ | | | | | | | | | | | cleanup railties test; fix typos | ||||
| | * | | | | cleanup railties test; fix typos | Vipul A M | 2013-03-31 | 3 | -6/+5 |
| | |/ / / | |||||
| * | | | | Merge pull request #10015 from vipulnsward/remove_unused_variable_in_get | Steve Klabnik | 2013-03-31 | 2 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | remove unused variable and assignment | ||||
| | * | | | | remove unused variable and assignment | Vipul A M | 2013-03-31 | 2 | -2/+2 |
| | |/ / / | |||||
| * | | | | Merge pull request #10014 from vipulnsward/remove_unused_match_var | Steve Klabnik | 2013-03-31 | 1 | -8/+8 |
| |\ \ \ \ | | | | | | | | | | | remove unused match variables in selector | ||||
| | * | | | | remove unused match variables in selector | Vipul A M | 2013-03-31 | 1 | -8/+8 |
| | |/ / / | |||||
| * | | | | Merge pull request #10012 from vipulnsward/fix_AP_error_message_error | Steve Klabnik | 2013-03-31 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / |/| | | | fix wrong argument error message [ci skip] | ||||
| | * | | | fix wrong argument error message | Vipul A M | 2013-03-31 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Make comment about uglifier in generated Gemfile consistent between branches | Carlos Antonio da Silva | 2013-03-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | Introduced in 59d20af2238f7ab553f41b96282722889d8d4393. | ||||
| * | | | Fix indent and change "or" usage to "||" in schema dumper tests | Carlos Antonio da Silva | 2013-03-30 | 1 | -5/+5 |
| | | | | |||||
| * | | | Improve AP changelog entry about layout method with nil return | Carlos Antonio da Silva | 2013-03-30 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | Add a note about getting the "no layout" behavior by returning "false" to make it easier for people that might need to change their code. Related to #8458. [ci skip] | ||||
| * | | | Refactor index algorithm lookup so that it only builds the available options ↵ | Carlos Antonio da Silva | 2013-03-30 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | once This way the available options are only built for actually fetching the algorithm in case the option is given. The options are going to be necessary a second time only in case the option is given but does not exist, which is supposed to be due to a typo or something like that, so no problem. | ||||
| * | | | Minor doc improvement about index algorithms [ci skip] | Carlos Antonio da Silva | 2013-03-30 | 1 | -3/+2 |
| | | | | |||||
| * | | | Fix typos in AP: "overriden" => "overridden" | Carlos Antonio da Silva | 2013-03-30 | 5 | -36/+36 |
| | | | | |||||
| * | | | Review some tests from AMo::Errors to remove "should" usage | Carlos Antonio da Silva | 2013-03-30 | 1 | -55/+35 |
| | | | | | | | | | | | | | | | | Also remove duplicated tests for Errors#as_json and minor improvements in some tests. | ||||
| * | | | Improve changelog entry for ActiveModel::Errors#full_messages_for [ci skip] | Carlos Antonio da Silva | 2013-03-30 | 2 | -4/+13 |
| | | | | | | | | | | | | | Add a working example of how to use this new method. | ||||
| * | | | Do not calculate values if they are not going to be used | Carlos Antonio da Silva | 2013-03-30 | 1 | -7/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building the indexes list in PostgreSQL, IndexDefinition objects are only created if the query for the related attributes really returns something matching the attributes. In case it does not, the variables for building the definition objects were being created but not used. | ||||
| * | | | Make docs a little bit more consistent with colons [ci skip] | Carlos Antonio da Silva | 2013-03-30 | 1 | -9/+9 |
| | | | | |||||
| * | | | Fix code examples indent in new index options docs [ci skip] | Carlos Antonio da Silva | 2013-03-30 | 1 | -3/+3 |
| | | | | |||||
| * | | | Use new hash style in doc examples [ci skip] | Carlos Antonio da Silva | 2013-03-30 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #9991 from Passionate/patch-1 | Rafael Mendonça França | 2013-03-30 | 1 | -18/+50 |
| |\ \ \ | | | | | | | | | improve readability | ||||
| | * | | | improve readability | Paritosh Piplewar | 2013-03-29 | 1 | -18/+50 |
| | | | | | |||||
| * | | | | Minor reviews in AR changelog [ci skip] | Carlos Antonio da Silva | 2013-03-30 | 1 | -10/+10 |
| | | | | | |||||
| * | | | | Use last released version of thor | Guillermo Iguaran | 2013-03-30 | 2 | -2/+1 |
| | | | | | |||||
| * | | | | Merge pull request #10004 from choudhuryanupam/master | Rafael Mendonça França | 2013-03-30 | 2 | -10/+0 |
| |\ \ \ \ | | | | | | | | | | | Refactored to remove unnecessary setup | ||||
| | * | | | | Refactored to remove unnecessary setup | Anupam Choudhury | 2013-03-30 | 2 | -10/+0 |
| | | | | | | |||||
| * | | | | | Merge pull request #10003 from tkhr/refactor-scoping-test-files | Carlos Antonio da Silva | 2013-03-30 | 3 | -330/+333 |
| |\ \ \ \ \ | | | | | | | | | | | | | Reorganize scoping test files | ||||
| | * | | | | | split relation_scoping_test.rb's default scoping tests into another file | Takehiro Adachi | 2013-03-30 | 2 | -357/+360 |
| | | | | | | | |||||
| | * | | | | | rename named_scope_test.rb to a proper file name | Takehiro Adachi | 2013-03-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file name should be name_scoping_test.rb and the class should be `NamedScopingTest` according to ActiveRecord::Scoping::Name | ||||
| | * | | | | | move tests for NamedScope and DefaultScope under test/cases/scoping/ | Takehiro Adachi | 2013-03-30 | 2 | -0/+0 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | The scoping/default.rb and scoping/named.rb got moved under scoping/ in commit 2b22564c4efaa63d4bbc006762838c4025c1bdca, but the tests never did. | ||||
| * | | | | | Merge pull request #9997 from vipulnsward/hash_destructive_merge | Carlos Antonio da Silva | 2013-03-30 | 2 | -2/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | Change merge to merge! to avoid creating new objects | ||||
| | * | | | | | change merge to merge! | Vipul A M | 2013-03-29 | 2 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #10007 from vipulnsward/fix_AS_typos | Carlos Antonio da Silva | 2013-03-30 | 3 | -14/+14 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix some typos in AS | ||||
| | * | | | | | | fix some typos in AS | Vipul A M | 2013-03-30 | 3 | -14/+14 |
| | | |/ / / / | |/| | | | | |||||
| * | | | | | | configure API generation lazily | Xavier Noria | 2013-03-30 | 1 | -7/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do the absolute bare minimum needed to define this task, no need to compute gem paths everytime you call rake. | ||||
| * | | | | | | be lazy configuring the RDoc files | Xavier Noria | 2013-03-30 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code is executed every time you run a rake task, there is no need to, specially adding a penalty to test suites. | ||||
| * | | | | | | be lazy loading SDoc | Xavier Noria | 2013-03-30 | 4 | -6/+18 |
| | | | | | | | |||||
| * | | | | | | fix upgrading guide [ci skip] | Vijay Dev | 2013-03-30 | 1 | -23/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I see no need to list the Gemfile contents (twice!) to convey this message. | ||||
| * | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-03-30 | 44 | -208/+274 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/adapter_test.rb guides/source/testing.md [ci skip] | ||||
| | * | | | | | More typo / wording fixes | Jonathan Roes | 2013-03-29 | 1 | -6/+6 |
| | | | | | | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |