Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #410 from asanghi/LH6074 | José Valim | 2011-05-06 | 2 | -3/+18 |
|\ | | | | | distance_of_time_in_words calculates wrong no of years | ||||
| * | strip space | Aditya Sanghi | 2011-05-06 | 1 | -2/+2 |
| | | |||||
| * | Take leap years into account more seriously when calculating year distance ↵ | Aditya Sanghi | 2011-05-06 | 2 | -3/+18 |
| | | | | | | | | [#6074 state:resolved] | ||||
* | | Merge pull request #396 from asanghi/lh_4346 | Xavier Noria | 2011-05-06 | 2 | -29/+187 |
|\ \ | |/ |/| | Multiparameter POLA (principle of least authority) with respect to time_select fixes. See LH4346 | ||||
| * | Multiparameter POLA, time_select fixes. See LH4346 | Aditya Sanghi | 2011-05-05 | 2 | -29/+187 |
| | | |||||
* | | Merge pull request #408 from etdsoft/master | José Valim | 2011-05-06 | 1 | -1/+2 |
|\ \ | | | | | | | Rails::Server outputs 'http://' even when running over SSL | ||||
| * | | Take into account the Rack::Server :SSLEnable option when building the ↵ | Daniel Martin | 2011-05-06 | 1 | -1/+2 |
|/ / | | | | | | | application's URL | ||||
* | | Ensure params wrapper settings are not inherited and calculated each time. | José Valim | 2011-05-06 | 2 | -4/+28 |
| | | |||||
* | | Update CHANGELOGs. | José Valim | 2011-05-06 | 3 | -21/+18 |
| | | |||||
* | | Merge pull request #400 from arunagw/ruby_prof | José Valim | 2011-05-05 | 1 | -5/+3 |
|\ \ | | | | | | | Adding ruby-prof gem for ruby platform only #jruby | ||||
| * | | Grouped the ruby-prof into test. | Arun Agrawal | 2011-05-05 | 1 | -1/+4 |
| | | | |||||
| * | | Removing from duplicate places. Only in Ruby platform needed. | Arun Agrawal | 2011-05-05 | 1 | -2/+1 |
| | | | |||||
| * | | adding ruby-prof gem for ruby platform only #jruby | Vishnu Atrai | 2011-05-05 | 1 | -5/+1 |
| | | | |||||
* | | | Merge pull request #399 from ernie/join_conditions_on_join | Jon Leighton | 2011-05-05 | 2 | -3/+14 |
|\ \ \ | | | | | | | | | Add association join conditions to JOIN clause, not WHERE | ||||
| * | | | Add a test for outer joins with conditions where value IS NULL | Ernie Miller | 2011-05-05 | 1 | -0/+5 |
| | | | | |||||
| * | | | Add join conditions to JOIN clause, not WHERE | Ernie Miller | 2011-05-05 | 2 | -3/+9 |
| |/ / | |||||
* | | | Merge pull request #358 from baroquebobcat/fix_find_or_create_master | Aaron Patterson | 2011-05-05 | 2 | -3/+30 |
|\ \ \ | |/ / |/| | | Fix for lighthouse #6741 | ||||
| * | | Fix for lighthouse #6741 | Nick Howard | 2011-05-01 | 2 | -3/+30 |
| | | | | | | | | | | | | | | | | | | | | | - adds tests for find_or_create_by and find_or_initialize_by on has_many associations - changes the behavior of ActiveRecord::Associations::CollectionProxy#method_missing to differ to ActiveRecord::FinderMethods#find_or_instantiator_by_attributes for arg processing and saving so find_or_create_by's api on associations will be consistent w/ the api for model classes. | ||||
* | | | Merge pull request #397 from dchelimsky/view-path-decorator | José Valim | 2011-05-05 | 0 | -0/+0 |
|\ \ \ | | | | | | | | | rename test case to better describe use case | ||||
| * | | | rename test case to better describe use case | David Chelimsky | 2011-04-23 | 1 | -6/+6 |
| | | | | |||||
* | | | | Merge pull request #394 from splattael/fix_rake_routes_shows_custom_assets | José Valim | 2011-05-05 | 2 | -1/+10 |
|\ \ \ \ | | | | | | | | | | | Display custom asset routes in `rake routes` | ||||
| * | | | | Display custom asset routes in `rake routes` | Peter Suschlik | 2011-05-05 | 2 | -1/+10 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #392 from janx/master | José Valim | 2011-05-05 | 3 | -43/+117 |
|\ \ \ \ | | | | | | | | | | | Patch for performance test: make it run with ruby19/minitest | ||||
| * | | | | add tests for performance test | Jan Xie | 2011-05-05 | 2 | -0/+29 |
| | | | | | |||||
| * | | | | minitest/ruby19 compatible performance test | Jan Xie | 2011-05-05 | 1 | -43/+88 |
| |/ / / | |||||
* / / / | Update respond_with docs to deal better with collections. | José Valim | 2011-05-05 | 1 | -1/+6 |
|/ / / | |||||
* | | | Merge pull request #390 from arunagw/jruby_openssl | José Valim | 2011-05-05 | 2 | -0/+2 |
|\ \ \ | | | | | | | | | Adding jruby-openssl in Gemfile by default. #jruby | ||||
| * | | | Adding jruby-openssl in Gemfile by default. #jruby | Arun Agrawal | 2011-05-05 | 2 | -0/+2 |
| | | | | |||||
* | | | | Merge pull request #391 from bradleypriest/patch-1 | José Valim | 2011-05-05 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Tidying up the language in wrap_parameters.rb | ||||
| * | | | Tidying up the language in wrap_parameters.rb | Bradley Priest | 2011-05-04 | 1 | -1/+1 |
| | | | | |||||
* | | | | No longer need to reference mysql2 from git | David Heinemeier Hansson | 2011-05-04 | 1 | -9/+1 |
|/ / / | |||||
* | | | Prepare for beta1 | David Heinemeier Hansson | 2011-05-04 | 9 | -9/+9 |
| | | | |||||
* | | | Only show dump of regular env methods on exception screen (not all the rack ↵ | David Heinemeier Hansson | 2011-05-04 | 3 | -5/+8 |
| | | | | | | | | | | | | crap) [DHH] | ||||
* | | | Dont show the assets mount in rake routes | David Heinemeier Hansson | 2011-05-04 | 1 | -1/+2 |
| | | | |||||
* | | | ensure query cache is cleared when Rack body is closed, fixes bug reported ↵ | Aaron Patterson | 2011-05-04 | 2 | -0/+12 |
| | | | | | | | | | | | | on 951e18abea9c116fc5d6b330ca1dcd2890abe006 | ||||
* | | | Bump up rack-cache, tzinfo and thor | Santiago Pastorino | 2011-05-04 | 3 | -4/+4 |
| | | | |||||
* | | | Merge branch 'master' of github.com:rails/rails | Xavier Noria | 2011-05-04 | 2 | -3/+4 |
|\ \ \ | |||||
| * \ \ | Merge pull request #387 from smartinez87/remove_method. | José Valim | 2011-05-04 | 2 | -3/+4 |
| |\ \ \ | | | | | | | | | | | Use #remove_possible_method instead | ||||
| | * | | | Use #remove_possible_method instead here | Sebastian Martinez | 2011-05-04 | 1 | -2/+3 |
| | | | | | |||||
| | * | | | Use #remove_possible_method instead | Sebastian Martinez | 2011-05-04 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-04 | 2 | -35/+35 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | commented meta code | Vijay Dev | 2011-05-04 | 1 | -11/+11 |
| | | | | | |||||
| * | | | | formatting results in comments | Vijay Dev | 2011-05-04 | 2 | -24/+24 |
| | | | | | |||||
* | | | | | Fix renew feature on cookies. | José Valim | 2011-05-04 | 2 | -1/+17 |
| | | | | | |||||
* | | | | | Fix .subdomain regression. | José Valim | 2011-05-04 | 2 | -1/+10 |
| |/ / / |/| | | | |||||
* | | | | Use remove possible method here. | José Valim | 2011-05-04 | 1 | -1/+2 |
| | | | | |||||
* | | | | Relax this dependency a bit. | José Valim | 2011-05-04 | 1 | -1/+1 |
| | | | | |||||
* | | | | Let's run those precious tests against the gem. | José Valim | 2011-05-04 | 1 | -2/+0 |
| | | | | |||||
* | | | | Move sandbox to AR and pass the sandbox as a value. This way, other ORMs ↵ | José Valim | 2011-05-04 | 5 | -7/+21 |
| | | | | | | | | | | | | | | | | like Datamapper can also have their own sandboxing in rails console. | ||||
* | | | | Remove defined?(ActiveRecord) and use the railtie hook instead. | José Valim | 2011-05-04 | 2 | -7/+4 |
|/ / / |