aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove repeated wordKirill Nikitin2012-04-301-1/+1
|
* Escape interpolated params when redirecting - fixes #5688Andrew White2012-04-292-1/+36
|
* Merge pull request #6061 from twinturbo/scaffold-markupPiotr Sarnacki2012-04-291-16/+20
|\ | | | | Close #3886 - Add THEAD and TBODY to scaffold markup
| * Close #3886 - Add THEAD and TBODY to scaffold markuptwinturbo2012-04-291-16/+20
|/
* Add failing test case for #6053Andrew White2012-04-291-0/+21
|
* Fix controller_class_name for anonymous controllers.Michael Schuerig2012-04-291-1/+1
|
* Merge pull request #6059 from rafaelfranca/check_box_invertedJosé Valim2012-04-292-6/+100
|\ | | | | Change check_box to work inverting the checked and unchecked value
| * Change check_box to work inverting the checked and unchecked valueRafael Mendonça França2012-04-292-6/+100
| | | | | | | | | | | | | | | | | | | | This fixes: * Boolean with inverted logic * Integer with inverted logic * BigDecimal with inverted logic Fixes #3995
* | Merge pull request #6006 from ↵José Valim2012-04-296-16/+49
|\ \ | | | | | | | | | | | | carlosantoniodasilva/partial-layout-collection-item Partial layout collection item
| * | Add changelog entry and some docs for collection + layoutCarlos Antonio da Silva2012-04-293-3/+20
| | |
| * | Move layout logic with collection to be handled only with explicit template ↵Carlos Antonio da Silva2012-04-291-15/+8
| | | | | | | | | | | | | | | | | | | | | is given Layout is never an available option when rendering with the shortcut `render @collection`.
| * | Allow access to current object_counter variable from layout when rendering ↵Carlos Antonio da Silva2012-04-293-5/+14
| | | | | | | | | | | | with partial + collection
| * | Allow layout to access current object being rendered when using render ↵Carlos Antonio da Silva2012-04-292-1/+5
| | | | | | | | | | | | partial + object
| * | Allow layout rendering to access current object being rendered when using ↵Carlos Antonio da Silva2012-04-293-8/+18
| | | | | | | | | | | | partial + collection
* | | Merge pull request #6017 from larzconwell/remove_sanitize_dom_idJeremy Kemper2012-04-291-6/+1
|\ \ \ | | | | | | | | Removed the sanitize_dom_id method
| * | | Removed the sanitize_dom_id method because HTML5 doctype let's us use ↵Larz Conwell2012-04-271-6/+1
| | | | | | | | | | | | | | | | anything except nothing and whitespace for id's
* | | | Merge pull request #6057 from jeremyf/remove-deprecation-warning-due-to-reloadJosé Valim2012-04-291-1/+1
|\ \ \ \ | |_|/ / |/| | | Removed extraneous .present? check for AR::Base#reload
| * | | Removed extraneous .present? check for AR::Base#reloadJeremy Friesen2012-04-291-1/+1
| | | |
* | | | Merge pull request #6056 from jeremyf/remove-deprecation-warning-due-to-reloadJosé Valim2012-04-291-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#reloadJeremy Friesen2012-04-291-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-mimetypeJosé Valim2012-04-292-1/+3
|\ \ \ | |/ / |/| | Add changelog entry for jsonp mimetype change, fix failing test
| * | Add changelog entry for jsonp mimetype change, fix failing testCarlos Antonio da Silva2012-04-292-1/+3
|/ / | | | | | | Fix failing test: Mime::JS generates "text/javascript"
* | Removed unclear doc in AR querying guide [ci skip]Vijay Dev2012-04-291-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_separatorJosé Valim2012-04-292-1/+10
|\ \ | | | | | | Tests for regexp separator in String#truncate
| * | Tests for regexp separator in String#truncateAlexey Gaziev2012-04-292-1/+10
| | | | | | | | | | | | https://github.com/rails/rails/commit/5a7513593f64e0ff7e4de1ee37bac5eeddfae270
* | | Don't convert params if the request isn't HTML - fixes #5341Andrew White2012-04-292-8/+58
| | |
* | | Merge pull request #5986 from carlosantoniodasilva/deprecation-behavior-silenceJosé Valim2012-04-293-2/+32
|\ \ \ | | | | | | | | Add a "silence" behavior to completely turn off deprecation warnings.
| * | | Add test for default silence and stderr deprecation behaviorsCarlos Antonio da Silva2012-04-281-0/+20
| | | |
| * | | Document #behavior= and update CHANGELOGtwinturbo2012-04-282-0/+9
| | | |
| * | | Add a "silence" behavior to completely turn off deprecation warnings.Adam Hawkins2012-04-281-2/+3
| | | |
* | | | Avoid calling content type multiple timesJosé Valim2012-04-291-4/+6
| | | |
* | | | Merge pull request #2321 from omjokine/masterJosé Valim2012-04-292-2/+5
|\ \ \ \ | |_|/ / |/| | | JSONP should use mimetype application/javascript
| * | | Merge remote-tracking branch 'upstream/master'Olli Jokinen2011-12-01745-24065/+35303
| |\ \ \
| * | | | fixed test case test_render_json_with_callback to use content_type ↵Olli Jokinen2011-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | application/javascript
| * | | | Change mimetype to Mime::JS if JSONP is usedOlli Jokinen2011-07-281-1/+4
| | | | |
* | | | | Lazy load `default_form_builder` if it's passed as a stringPiotr Sarnacki2012-04-284-2/+27
| | | | | | | | | | | | | | | | | | | | closes #3341
* | | | | Merge pull request #5996 from gazay/remove_excess_selfsJeremy Kemper2012-04-2841-324/+473
|\ \ \ \ \ | | | | | | | | | | | | Active Support housekeeping and polish
| * | | | | String quotes and trailing spacesAlexey Gaziev2012-04-2921-126/+126
| | | | | |
| * | | | | Indentation for private methodsAlexey Gaziev2012-04-292-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/e7d55f734aae204115d0a04a2db774ac364c1312
| * | | | | AS core_ext refactoring pt.2Alexey Gaziev2012-04-2920-86/+110
| | | | | |
| * | | | | AS core_ext refactoringAlexey Gaziev2012-04-2915-93/+220
| | | | | |
* | | | | | Allow Thor 0.15 and 1.0, to be released shortlytomhuda2012-04-281-1/+5
| | | | | |
* | | | | | Don't create new directory for testsPiotr Sarnacki2012-04-282-26/+24
| | | | | |
* | | | | | Fix Engine#routes to not call draw_paths multiple timesPiotr Sarnacki2012-04-282-2/+14
| | | | | |
* | | | | | Engine#routes? method has been fixedRoman V. Babenko2012-04-281-1/+1
| | | | | |
* | | | | | Add a failing test for #5764Piotr Sarnacki2012-04-281-0/+16
| | | | | |
* | | | | | Merge session arg with existing session instead of overwritingAndrew White2012-04-283-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_plpgsqlAaron Patterson2012-04-281-21/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | Create plpgsql language if not available
| * | | | | | Create plpgsql language if not availablePrem Sichanugrist2012-04-271-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-refactorJosé Valim2012-04-283-12/+17
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Refactor AMo::Translation, avoid changing options in human attr name
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-03 15:53:34 +0000