aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix regex used to find URI schemes in redirect_toDerek Prior2013-09-192-1/+6
| | | | | The previous regex was allowing `_` in the URI scheme, which is not allowed by RFC 3986. This change brings the regex in line with the RFC.
* Fix incorrect assert_redirected_to failure messageDerek Prior2013-09-194-34/+48
| | | | | | | | | | | | | | | In some instances, `assert_redirected_to` assertion was returning an incorrect and misleading failure message when the assertion failed. This was due to a disconnect in how the assertion computes the redirect string for the failure message and how `redirect_to` computes the string that is actually used for redirection. I made the `_compute_redirect_to_loaction` method used by `redirect_to` public and call that from the method `assert_redirect_to` uses to calculate the URL. The reveals a new test failure due to the regex used by `_compute_redirect_to_location` allow `_` in the URL scheme.
* Merge pull request #12280 from kennyj/remove_1_8_compatJosé Valim2013-09-191-1/+1
|\ | | | | Remove 1.8 compatible code
| * Remove 1.8 compatible codekennyj2013-09-191-1/+1
| |
* | Merge pull request #12279 from jbaudanza/reset_sessionJosé Valim2013-09-182-0/+13
|\ \ | |/ |/| Calling reset_session inside of a controller with a NullSessionHash raises a nil exception.
| * NullSessionHash#destroy should be a no-opJonathan Baudanza2013-09-182-0/+13
|/ | | | Previously it was raising a NilException
* remove unused variableAaron Patterson2013-09-181-1/+0
|
* support objects with blank string primary keysAaron Patterson2013-09-182-1/+7
|
* ActiveRecord::Base#<=> has been removed. Primary keys may not be in order,Aaron Patterson2013-09-183-16/+10
| | | | | | | | | | | or even be numbers, so sorting by id doesn't make sense. Please use `sort_by` and specify the attribute you wish to sort with. For example, change: Post.all.to_a.sort to: Post.all.to_a.sort_by(&:id)
* do what the superclass does in the case that objects do not matchAaron Patterson2013-09-182-0/+10
|
* Merge pull request #12276 from kennyj/fix_12269Rafael Mendonça França2013-09-183-0/+11
|\ | | | | Fix an issue where router can't recognize downcased url encoding path.
| * Fix an issue where router can't recognize downcased url encoding path.kennyj2013-09-193-0/+11
|/
* There's no need to do thisSantiago Pastorino2013-09-171-4/+1
| | | | | | | AS does the following inside Time.find_zone! ... `ActiveSupport::TimeZone[time_zone] || TZInfo::Timezone.get(time_zone)` and given that the test is stubbing AS::TZ[] we don't need the removed code.
* Merge pull request #12262 from sferik/remove_tzinfo_from_actionpackRafael Mendonça França2013-09-171-5/+4
|\ | | | | Remove tzinfo dependency from Action Pack
| * Remove tzinfo dependency from Action PackErik Michaels-Ober2013-09-171-5/+4
|/ | | | | This gem is used by Active Support but it should not be a dependency of Action Pack.
* Merge pull request #12250 from JuanitoFatas/migrationRafael Mendonça França2013-09-161-3/+3
|\ | | | | [ci skip] Improve readability of 4.3's NOTE in migration.md.
| * [ci skip] Improve readability of 4.3's NOTE in migration.md.Juanito Fatas2013-09-171-3/+3
| |
* | Merge pull request #12011 from jetthoughts/11963_fix_join_with_association_scopeRafael Mendonça França2013-09-164-6/+25
|\ \ | |/ |/| | | | | | | | | Collapse where constraints to the Arel::Nodes::And node Conflicts: activerecord/CHANGELOG.md
| * Collapse where constraints to one where constraintPaul Nikitochkin2013-09-134-6/+25
| | | | | | | | | | | | | | In order to remove duplication with joining arel where constraints with `AND`, all constraints on `build_arel` are collapsed into one head node: `Arel::Nodes::And` Closes: #11963
* | Merge pull request #12245 from kennyj/remove_no_using_code_20130916José Valim2013-09-161-4/+0
|\ \ | | | | | | Removes unused code related to DatabaseTasks.
| * | Removes unused code related to DatabaseTasks.kennyj2013-09-161-4/+0
|/ /
* | Merge pull request #12239 from JuanitoFatas/form_helpersSteve Klabnik2013-09-151-1/+1
|\ \ | | | | | | [ci skip] Consistency wording of 9.6 in form_helpers.md
| * | [ci skip] Consistency wording of 9.6 in form_helpers.mdJuanito Fatas2013-09-151-1/+1
|/ / | | | | | | | | | | Chapter 9 is giving a user and set of addresses example. So 'Add a new address' would be more consistent. Also change the javascript to JavaScript.
* | Merge pull request #12231 from harshadsabne/masterSteve Klabnik2013-09-141-6/+6
|\ \ | | | | | | [ci skip] Update plugins.md
| * | [ci skip] Update plugins.mdHarshad Sabne2013-09-141-6/+6
| | | | | | | | | Highlighted code.
* | | Merge pull request #12225 from adomokos/no_need_for_active_support_concernSteve Klabnik2013-09-131-2/+0
|\ \ \ | | | | | | | | Removing ActiveSupport::Concern, it's not needed
| * | | Removing ActiveSupport::Concern, it's not neededAttila Domokos2013-09-131-2/+0
|/ / /
* | | Merge pull request #12223 from adomokos/fixing_typoRafael Mendonça França2013-09-131-1/+1
|\ \ \ | | | | | | | | Fixing comment typo in ActionController::Base
| * | | Fixing comment typo in ActionController::BaseAttila Domokos2013-09-131-1/+1
|/ / /
* | | Don't require using application_name before optionsPiotr Sarnacki2013-09-135-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit options for `rails new` and `rails plugin new` had to be passed in a strict order, trying to execute a following command: rails new -J path/to/app resulted in an error. This commit fixes the situation and allows to pass path to app anywhere after `new`
* | | Merge pull request #12222 from rcillo/fix-custom-flashRafael Mendonça França2013-09-133-1/+20
|\ \ \ | | | | | | | | | | | | | | | | Custom flash should be defined only for the class that defines it and it's subclasses Fixes #12057
| * | | Custom flash should be defined only for the class that defines it and it's ↵Ricardo de Cillo2013-09-133-1/+20
| | | | | | | | | | | | | | | | subclasses.
* | | | Merge pull request #12215 from harshadsabne/masterRafael Mendonça França2013-09-131-5/+5
|\ \ \ \ | | |/ / | |/| | Update 3_2_release_notes.md
| * | | Update 3_2_release_notes.mdHarshad Sabne2013-09-131-5/+5
| | | | | | | | | | | | Fixed typo and applied proper code highlighting.
* | | | Merge pull request #12216 from suginoy/a-anRafael Mendonça França2013-09-139-11/+11
|\ \ \ \ | | | | | | | | | | Fix typos: the indefinite articles(a -> an).
| * | | | Fix typos: the indefinite articles(a -> an)SUGINO Yasuhiro2013-09-139-11/+11
| | | | |
* | | | | Missing destroy commandAkira Matsuda & Yukiko Kawamoto2013-09-131-0/+4
| |_|/ / |/| | |
* | | | Merge pull request #12129 from Empact/deprecate-array-bang-delegationRafael Mendonça França2013-09-125-147/+265
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate the delegation of Array bang methods in ActiveRecord::Delegation Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/relation_test.rb
| * | | | Deprecate the delegation of Array bang methods in ActiveRecord::DelegationBen Woosley2013-09-043-3/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The primary means of returning results for Array bang methods is to modify the array in-place. When you call these methods on a relation, that array is created, modified, and then thrown away. Only the secondary return value is exposed to the caller. Removing this delegation is a straight-forward way to reduce user error by forcing callers to first explicitly call #to_a in order to expose the array to be acted on by the bang method.
| * | | | Pull the RelationMutationTests from cases/relation_test to ↵Ben Woosley2013-09-032-135/+139
| |/ / / | | | | | | | | | | | | cases/relation/mutation_test.
* | | | Merge pull request #12137 from lann/fix_association_first_lastRafael Mendonça França2013-09-123-6/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make CollectionAssociation first/last with integer fetch with query Conflicts: activerecord/CHANGELOG.md
| * | | | Make CollectionAssociation first/last with integer fetch with queryLann Martin2013-09-093-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When first or last is called with an integer on an unloaded association, the entire collection is loaded. This differs surprisingly from the behavior of Relation#first/last, which translate the call into a limit query. For large collections this can make a big difference in performance. Change CollectionAssociation#fetch_first_or_last_using_find? to make this kind of call delegate to Relation.
* | | | | Add CHANGELOG entry for #11698Rafael Mendonça França2013-09-121-0/+4
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #11698 from dmathieu/sqlite_tasks_without_railsRafael Mendonça França2013-09-123-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Let the SQLite rake tasks run without rails
| * | | | | let the sqlite task run without railsDamien Mathieu2013-08-073-2/+4
| | | | | |
* | | | | | Merge pull request #12156 from rywall/from-copy-bindsRafael Mendonça França2013-09-123-0/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow Relation#from to accept other relations with bind values. Conflicts: activerecord/CHANGELOG.md
| * | | | | | Allow Relation#from to accept other relations with bind values.Ryan Wallace2013-09-083-0/+12
| | | | | | |
* | | | | | | Add CHANGELOG entry for #12149Rafael Mendonça França2013-09-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge pull request #12159 from nashby/issue-12149Rafael Mendonça França2013-09-122-1/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | do not break params filtering on nil values
| * | | | | | | do not break params filtering on nil valuesVasiliy Ermolovich2013-09-072-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes #12149
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 03:34:03 +0000