| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | a test case that ensures AR::Relation#merge can merge associations | Akira Matsuda | 2012-06-03 | 1 | -0/+8 | |
| |/ | ||||||
| * | starting with the Rails 4.0 release notes | Vijay Dev | 2012-06-02 | 1 | -0/+591 | |
| | | | | | | | just a consolidation of the changelogs with minimal formatting [ci skip] | |||||
| * | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-06-02 | 6 | -36/+59 | |
| |\ | ||||||
| | * | copy edit AS guide [ci skip] | Vijay Dev | 2012-06-02 | 1 | -7/+5 | |
| | | | ||||||
| | * | copy edit routing guide [ci skip] | Vijay Dev | 2012-06-02 | 1 | -1/+3 | |
| | | | ||||||
| | * | fix up the example app for getting started guide [ci skip] | Vijay Dev | 2012-06-02 | 6 | -10/+8 | |
| | | | ||||||
| | * | better explanations for acts_like?, try and deep_dup | Hrvoje Šimić | 2012-06-02 | 1 | -6/+20 | |
| | | | ||||||
| | * | change welcome_helper.rb to home_helper.rb | spyhole | 2012-06-01 | 1 | -0/+0 | |
| | | | ||||||
| | * | Update guides/code/getting_started/test/functional/home_controller_test.rb | spyhole | 2012-06-02 | 1 | -1/+1 | |
| | | | ||||||
| | * | the file name should be changed to home_helper.rb | spyhole | 2012-06-02 | 1 | -1/+1 | |
| | | | ||||||
| | * | Update guides/code/getting_started/app/controllers/home_controller.rb | spyhole | 2012-06-02 | 1 | -1/+1 | |
| | | | ||||||
| | * | Update guides/code/getting_started/config/routes.rb | spyhole | 2012-06-02 | 1 | -1/+1 | |
| | | | ||||||
| | * | routes are viewable in browser (update guides) | schneems | 2012-06-01 | 1 | -2/+2 | |
| | | | | | | | From the Pull Request #6461 | |||||
| | * | update ActiveModel::Dirty documentation | Francesco Rodriguez | 2012-05-31 | 1 | -24/+35 | |
| | | | ||||||
| | * | Fix typo [ci skip] | Erich Menge | 2012-05-30 | 1 | -1/+1 | |
| | | | ||||||
| * | | Revert some ActiveSupport::Callbacks changes. | Rafael Mendonça França | 2012-06-01 | 1 | -3/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commits 911a0859ac065aa8e8834ac985353d659c7c7b65 and 30b31f51af6f7094c4a27b086755fc66c368d6fa. Reason: these changes make the Active Model tests fail randomly. Some examples: http://travis-ci.org/#!/rails/rails/jobs/1498992 http://travis-ci.org/#!/rails/rails/jobs/1496948 http://travis-ci.org/#!/rails/rails/jobs/1489985 This script was used to reproduce these breaks: https://gist.github.com/f6828a03ee4d40bffbc3 200 times, 0 failures | |||||
| * | | Allow to use mounted helpers in ActionView::TestCase | Piotr Sarnacki | 2012-06-01 | 4 | -1/+24 | |
| | | | | | | | | | | | Similarly to 6525002, this allows to use routes helpers for mounted helpers, but this time in ActionView::TestCase | |||||
| * | | minor comment revision | Xavier Noria | 2012-06-01 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge pull request #6588 from nbibler/polymorphic_to_model | José Valim | 2012-06-01 | 2 | -2/+34 | |
| | | | | | | | | | Correct the use of to_model in polymorphic routing | |||||
| * | | Sync CHANGLOG with the 3-2-stable branch | Rafael Mendonça França | 2012-06-01 | 5 | -4/+91 | |
| | | | ||||||
| * | | Include routes.mounted_helpers into integration tests | Piotr Sarnacki | 2012-06-01 | 4 | -3/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In integration tests, you might want to use helpers from engines that you mounted in your application. It's not hard to add it by yourself, but it's unneeded boilerplate. mounted_helpers are now included by default. That means that given engine mounted like: mount Foo::Engine => "/foo", :as => "foo" you will be able to use paths from this engine in tests this way: foo.root_path #=> "/foo" (closes #6573) | |||||
| * | | Merge pull request #6586 from amatsuda/generator_blank_line | Rafael Mendonça França | 2012-06-01 | 2 | -2/+2 | |
| |\ \ | | | | | | | remove unneeded blank line from !namespeced? generated controllers | |||||
| | * | | remove unneeded blank line from !namespeced? controller generators | Akira Matsuda | 2012-06-01 | 2 | -2/+2 | |
| |/ / | ||||||
| * | | Merge pull request #6583 from amatsuda/rake_dsl_19 | Piotr Sarnacki | 2012-06-01 | 1 | -1/+1 | |
| |\ \ | | | | | | | Revert "Only include Rake::DSL if it's defined." | |||||
| | * | | Revert "Only include Rake::DSL if it's defined." | Akira Matsuda | 2012-06-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | This reverts commit 82c3aca17e78d25f217702e530586673f2a219d7. Reason: Ruby 1.9.3 is shipped with Rake > 0.9 | |||||
| * | | | Merge pull request #6584 from amatsuda/ar_explain_inspect_readability | Xavier Noria | 2012-06-01 | 1 | -1/+7 | |
| |\ \ \ | | | | | | | | | improve readability of AR explain result | |||||
| | * | | | improve readability of AR explain result | Akira Matsuda | 2012-06-01 | 1 | -1/+7 | |
| |/ / / | ||||||
| * | | | Merge pull request #6579 from amatsuda/null_relation_modulize | José Valim | 2012-05-31 | 3 | -11/+15 | |
| |\ \ \ | |/ / |/| | | modulize AR::NullRelation | |||||
| | * | | unused method arguments | Akira Matsuda | 2012-06-01 | 1 | -7/+6 | |
| | | | | ||||||
| | * | | modulize AR::NullRelation | Akira Matsuda | 2012-06-01 | 3 | -4/+9 | |
| |/ / | | | | | | | now we can invoke previously added scope extension methods | |||||
| * | | Rake::DSL should always be available | Jeremy Kemper | 2012-05-31 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'master-sec' | Aaron Patterson | 2012-05-31 | 5 | -4/+65 | |
| |\ \ | | | | | | | | | | | | | | | | * master-sec: Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this! predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this | |||||
| | * | | Strip [nil] from parameters hash. | Aaron Patterson | 2012-05-30 | 2 | -1/+28 | |
| | | | | | | | | | | | | | | | | | | | Thanks to Ben Murphy for reporting this! CVE-2012-2660 | |||||
| | * | | predicate builder should not recurse for determining where columns. | Aaron Patterson | 2012-05-30 | 3 | -3/+37 | |
| | | | | | | | | | | | | | | | | | | | Thanks to Ben Murphy for reporting this CVE-2012-2661 | |||||
| * | | | Explicitly require rake so its DSL is available | Jeremy Kemper | 2012-05-31 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Rake is in 1.9 stdlib, no need for gem dep | Jeremy Kemper | 2012-05-31 | 1 | -4/+2 | |
| | | | | ||||||
| * | | | Psych is always available on 1.9 | Jeremy Kemper | 2012-05-31 | 2 | -29/+23 | |
| | | | | ||||||
| * | | | Merge pull request #6571 from ↵ | Rafael Mendonça França | 2012-05-31 | 3 | -7/+50 | |
| |\ \ \ | | | | | | | | | | | | | | | | | jeremyf/extract-force-ssl-filter-logic-to-separate-method Extracted redirect logic from ActionController::Force::ClassMethods.forc... | |||||
| | * | | | Extracted redirect logic from ActionController::Force::ClassMethods.force_ssl | Jeremy Friesen | 2012-05-31 | 3 | -7/+50 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this patch the existing .force_ssl method handles both defining the filter and handling the logic for performing the redirect. With this patch the logic for redirecting to the HTTPS protocol is separated from the filter logic that determines if a redirect should occur. By separating the two levels of behavior, an instance method for ActionController (i.e. #force_ssl_redirect) is exposed and available for more granular SSL enforcement. Cleaned up indentation. | |||||
| * | | | | Reduce warning messages when running Active Support tests | Andrew White | 2012-05-31 | 2 | -2/+8 | |
| | | | | | | | | | | | | | | | | | Eliminate the warnings generated by redefining methods and constants. | |||||
| * | | | | Merge pull request #6566 from arunagw/add-javascripts-to-rake-stats-task | Rafael Mendonça França | 2012-05-31 | 2 | -2/+10 | |
| |\ \ \ \ | |/ / / |/| | | | Add code statistics for Javascript and CoffeeScript files | |||||
| | * | | | Add code statistics for Javascript and | Arun Agrawal | 2012-05-31 | 2 | -2/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CoffeeScript files to `rake stats` task Orignal PR was #2270 Thanks to @nfm | |||||
| * | | | | Fix changelog example for count method with block [ci skip] | Carlos Antonio da Silva | 2012-05-31 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | Missed that too, thanks again @splattael. | |||||
| * | | | | Fix wrong example for count method with block [ci skip] | Carlos Antonio da Silva | 2012-05-31 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | Thanks @splattael. | |||||
| * | | | | Simplify link_to using content_tag | Carlos Antonio da Silva | 2012-05-31 | 2 | -12/+26 | |
| | | | | | | | | | | | | | | | | | Add some tests for link_to with blocks and escaping content. | |||||
| * | | | | Make link_to arguments explicit | Carlos Antonio da Silva | 2012-05-31 | 1 | -8/+4 | |
| | | | | | ||||||
| * | | | | Make button_to arguments explicit and refactor a bit | Carlos Antonio da Silva | 2012-05-31 | 1 | -10/+6 | |
| | | | | | | | | | | | | | | | | | Prefer Hash#[]= over Hash#merge when setting a value. | |||||
| * | | | | Simplify logic to initialize valid conditions in RouteSet | Carlos Antonio da Silva | 2012-05-31 | 1 | -7/+3 | |
| |/ / / | | | | | | | | | | | | | | | | Remove :to_sym call from public_instance_methods iteration, as such methods in Ruby 1.9 already return symbols. Initialize valid conditions with controller/action instead of setting them afterwards. | |||||
| * | | | Work around undiagnosed bug that's draining a relation's bind_values | Jeremy Kemper | 2012-05-31 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Fix backward compatibility with stored Hash values. Wrap coders to convert ↵ | Jeremy Kemper | 2012-05-30 | 3 | -15/+51 | |
| | | | | | | | | | | | | | serialized values to indifferent access. | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |