Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow layout rendering to access current object being rendered when using ↵ | Carlos Antonio da Silva | 2012-04-29 | 3 | -8/+18 |
| | | | | partial + collection | ||||
* | Merge pull request #6056 from jeremyf/remove-deprecation-warning-due-to-reload | José Valim | 2012-04-29 | 1 | -1/+7 |
|\ | | | | | Removed deprecation warning for #find as a result of AR::Base#reload | ||||
| * | Removed deprecation warning for #find as a result of AR::Base#reload | Jeremy Friesen | 2012-04-29 | 1 | -1/+7 |
| | | | | | | | | | | Cleaned up "DEPRECATION WARNING: Passing options to #find is deprecated. Please build a scope and then call #find on it." | ||||
* | | Merge pull request #6047 from carlosantoniodasilva/changelog-jsonp-mimetype | José Valim | 2012-04-29 | 2 | -1/+3 |
|\ \ | |/ |/| | Add changelog entry for jsonp mimetype change, fix failing test | ||||
| * | Add changelog entry for jsonp mimetype change, fix failing test | Carlos Antonio da Silva | 2012-04-29 | 2 | -1/+3 |
|/ | | | | Fix failing test: Mime::JS generates "text/javascript" | ||||
* | Removed unclear doc in AR querying guide [ci skip] | Vijay Dev | 2012-04-29 | 1 | -16/+0 |
| | | | | | The range example used in array conditions is unclear and talks about the old 'conditions' option. Closes #4943. | ||||
* | Merge pull request #6044 from gazay/tests_for_string_truncate_w_regexp_separator | José Valim | 2012-04-29 | 2 | -1/+10 |
|\ | | | | | Tests for regexp separator in String#truncate | ||||
| * | Tests for regexp separator in String#truncate | Alexey Gaziev | 2012-04-29 | 2 | -1/+10 |
| | | | | | | | | https://github.com/rails/rails/commit/5a7513593f64e0ff7e4de1ee37bac5eeddfae270 | ||||
* | | Don't convert params if the request isn't HTML - fixes #5341 | Andrew White | 2012-04-29 | 2 | -8/+58 |
| | | |||||
* | | Merge pull request #5986 from carlosantoniodasilva/deprecation-behavior-silence | José Valim | 2012-04-29 | 3 | -2/+32 |
|\ \ | | | | | | | Add a "silence" behavior to completely turn off deprecation warnings. | ||||
| * | | Add test for default silence and stderr deprecation behaviors | Carlos Antonio da Silva | 2012-04-28 | 1 | -0/+20 |
| | | | |||||
| * | | Document #behavior= and update CHANGELOG | twinturbo | 2012-04-28 | 2 | -0/+9 |
| | | | |||||
| * | | Add a "silence" behavior to completely turn off deprecation warnings. | Adam Hawkins | 2012-04-28 | 1 | -2/+3 |
| | | | |||||
* | | | Avoid calling content type multiple times | José Valim | 2012-04-29 | 1 | -4/+6 |
| | | | |||||
* | | | Merge pull request #2321 from omjokine/master | José Valim | 2012-04-29 | 2 | -2/+5 |
|\ \ \ | |_|/ |/| | | JSONP should use mimetype application/javascript | ||||
| * | | Merge remote-tracking branch 'upstream/master' | Olli Jokinen | 2011-12-01 | 745 | -24065/+35303 |
| |\ \ | |||||
| * | | | fixed test case test_render_json_with_callback to use content_type ↵ | Olli Jokinen | 2011-07-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | application/javascript | ||||
| * | | | Change mimetype to Mime::JS if JSONP is used | Olli Jokinen | 2011-07-28 | 1 | -1/+4 |
| | | | | |||||
* | | | | Lazy load `default_form_builder` if it's passed as a string | Piotr Sarnacki | 2012-04-28 | 4 | -2/+27 |
| | | | | | | | | | | | | | | | | closes #3341 | ||||
* | | | | Merge pull request #5996 from gazay/remove_excess_selfs | Jeremy Kemper | 2012-04-28 | 41 | -324/+473 |
|\ \ \ \ | | | | | | | | | | | Active Support housekeeping and polish | ||||
| * | | | | String quotes and trailing spaces | Alexey Gaziev | 2012-04-29 | 21 | -126/+126 |
| | | | | | |||||
| * | | | | Indentation for private methods | Alexey Gaziev | 2012-04-29 | 2 | -20/+18 |
| | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/e7d55f734aae204115d0a04a2db774ac364c1312 | ||||
| * | | | | AS core_ext refactoring pt.2 | Alexey Gaziev | 2012-04-29 | 20 | -86/+110 |
| | | | | | |||||
| * | | | | AS core_ext refactoring | Alexey Gaziev | 2012-04-29 | 15 | -93/+220 |
| | | | | | |||||
* | | | | | Allow Thor 0.15 and 1.0, to be released shortly | tomhuda | 2012-04-28 | 1 | -1/+5 |
| | | | | | |||||
* | | | | | Don't create new directory for tests | Piotr Sarnacki | 2012-04-28 | 2 | -26/+24 |
| | | | | | |||||
* | | | | | Fix Engine#routes to not call draw_paths multiple times | Piotr Sarnacki | 2012-04-28 | 2 | -2/+14 |
| | | | | | |||||
* | | | | | Engine#routes? method has been fixed | Roman V. Babenko | 2012-04-28 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Add a failing test for #5764 | Piotr Sarnacki | 2012-04-28 | 1 | -0/+16 |
| | | | | | |||||
* | | | | | Merge session arg with existing session instead of overwriting | Andrew White | 2012-04-28 | 3 | -1/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This may break existing tests that are asserting the whole session contents but should not break existing tests that are asserting individual keys - e.g: class SomeControllerTest < ActionController::TestCase setup do session['user_id'] = 1 end test "some test" do get :some_action, nil, { 'another_var' => 2 } # This assertion will now fail assert_equal({ 'another_var' => 2 }, session) # This assertion will still pass assert_equal 2, session['another_var] end end Fixes #1529. | ||||
* | | | | | Merge pull request #6028 from sikachu/master-fix_plpgsql | Aaron Patterson | 2012-04-28 | 1 | -21/+29 |
|\ \ \ \ \ | | | | | | | | | | | | | Create plpgsql language if not available | ||||
| * | | | | | Create plpgsql language if not available | Prem Sichanugrist | 2012-04-27 | 1 | -21/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix the problem in Travis CI server. (http://travis-ci.org/#!/rails/rails/jobs/1194988) | ||||
* | | | | | | Merge pull request #6035 from carlosantoniodasilva/amo-translation-refactor | José Valim | 2012-04-28 | 3 | -12/+17 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Refactor AMo::Translation, avoid changing options in human attr name | ||||
| * | | | | | Refactor human attribute name | Carlos Antonio da Silva | 2012-04-28 | 2 | -7/+7 |
| | | | | | | |||||
| * | | | | | Do not modify options hash in human_attribute_name, remove reverse_merge | Carlos Antonio da Silva | 2012-04-28 | 2 | -5/+10 |
|/ / / / / | |||||
* | | | | | Use Rails::Queueing::Queue instead of Queue so people can build their own ↵ | José Valim | 2012-04-28 | 7 | -7/+15 |
| | | | | | | | | | | | | | | | | | | | | consumers around stdlib's Queue | ||||
* | | | | | Merge pull request #6025 from carlosantoniodasilva/amo-errors-refactor | José Valim | 2012-04-28 | 1 | -7/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Refactor AMo::Errors | ||||
| * | | | | | Refactor AMo::Errors | Carlos Antonio da Silva | 2012-04-27 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use merge!, remove reverse_merge * Use case statement instead of is_a? checks | ||||
* | | | | | | Merge pull request #6024 from carlosantoniodasilva/amo-dirty-refactor | José Valim | 2012-04-28 | 1 | -1/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Improve AMo::Dirty *_will_change! method | ||||
| * | | | | | | Return earlier if attribute already changed in *_will_change! methods | Carlos Antonio da Silva | 2012-04-27 | 1 | -1/+3 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Avoid obtaining the value and duplicating it when possible. | ||||
* | | | | | | Merge pull request #6029 from aderyabin/fix_depr | José Valim | 2012-04-28 | 2 | -3/+3 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | removed deprecation warnings | ||||
| * | | | | | removed deprecation warnings | Andrey Deryabin | 2012-04-28 | 2 | -3/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #6026 from sikachu/master-fix_warning | Santiago Pastorino | 2012-04-27 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | Add parentheses to hide Ruby warning | ||||
| * | | | | Add parentheses to hide Ruby warning | Prem Sichanugrist | 2012-04-27 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #6023 from carlosantoniodasilva/fix-queue-test | Aaron Patterson | 2012-04-27 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Fix failing test related to TestQueue | ||||
| * | | | | Fix failing test, TestQueue#contents is not #jobs | Carlos Antonio da Silva | 2012-04-27 | 2 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #6021 from sikachu/log_exception | José Valim | 2012-04-27 | 2 | -1/+21 |
|\ \ \ \ | | | | | | | | | | | Log the exception from the ThreadConsumer | ||||
| * | | | | Log the exception from the ThreadConsumer | Prem Sichanugrist | 2012-04-27 | 2 | -1/+21 |
| | | | | | | | | | | | | | | | | | | | | This will make sure you know when there's an exception occur. | ||||
* | | | | | ensure that draining the queue will raise exceptions | Aaron Patterson | 2012-04-27 | 1 | -0/+5 |
| | | | | | |||||
* | | | | | adding the `jobs` method to the test queue for getting a list of test | Aaron Patterson | 2012-04-27 | 2 | -0/+14 |
|/ / / / | | | | | | | | | | | | | jobs. |