aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Give the credits [ci skip]Rafael Mendonça França2013-09-221-0/+2
|
* Merge pull request #10500 from kennyj/fix_10450Rafael Mendonça França2013-09-223-3/+50
|\ | | | | | | | | | | | | Fixed a bug in when using has_many association with :inverse_of option and UUID primary key. Conflicts: activerecord/CHANGELOG.md
| * Fixed a bug in when using has_many association with :inverse_of option and ↵kennyj2013-05-083-3/+48
| | | | | | | | UUID primary key.
* | Merge pull request #12281 from kennyj/add_doc_about_12276Rafael Mendonça França2013-09-221-0/+2
|\ \ | | | | | | [ci skip] Add some comment about downcase url encoded string.
| * | [ci skip] Add some comment about downcase url encoded string.kennyj2013-09-221-0/+2
| | |
* | | Merge pull request #12316 from JuanitoFatas/enginesRafael Mendonça França2013-09-221-1/+5
|\ \ \ | | | | | | | | [ci skip] Add missing migrate step in generating comment resource section.
| * | | [ci skip] Add missing migrate step in generating comment resource section.Juanito Fatas2013-09-221-1/+5
|/ / /
* | | Merge pull request #12311 from kennyj/fix_typo_about_uuidRafael Mendonça França2013-09-211-1/+1
|\ \ \ | | | | | | | | Fix typo. This test isn't executed even in the postgresql.
| * | | Fix typo. This test isn't executed in even postgresql.kennyj2013-09-221-1/+1
| |/ /
* | | Add back options argument in the ActiveRecord::Base.initialize methodRafael Mendonça França2013-09-211-2/+10
| | | | | | | | | | | | | | | | | | | | | This will make easier to hook protected_attributes gem in our code without making that gem fragile to change in Rails code base. Closes #12243
* | | Merge pull request #12307 from douglascalhoun/patch-1Vijay Dev2013-09-211-2/+0
|\ \ \ | | | | | | | | Removes (redundant?) sentence fragment in intro text
| * | | Removes redundant into textdouglascalhoun2013-09-211-2/+0
| |/ / | | | | | | Looks like a remnant sentence fragment from the 3.2 guide.
* | | Merge pull request #12310 from JuanitoFatas/fix-a-typoVijay Dev2013-09-211-1/+1
|\ \ \ | |/ / |/| | [ci skip] Fix a typo in Engines.md.
| * | [ci skip] Fix a typo in Engines.md.Juanito Fatas2013-09-221-1/+1
|/ /
* | Merge pull request #12232 from claudiob/delete-unused-helper-fixturesSantiago Pastorino2013-09-204-16/+0
|\ \ | | | | | | Remove unused AV helper fixtures from e10a2531
| * | Remove unused AV helper fixtures from e10a2531claudiob2013-09-144-16/+0
| | | | | | | | | | | | | | | Several fixtures for helpers are removed. They were introduced in ActionView by @strzalek but never referenced in any test.
* | | Merge pull request #12301 from Gazler/guide_3_0_release_notes_broken_linkRafael Mendonça França2013-09-201-2/+0
|\ \ \ | | | | | | | | | | | | | | | | Documentation Fix: Remove broken link on rails 3 guide Closes #12300
| * | | Fix: Remove broken link on rails 3 guideGary Rennie2013-09-201-2/+0
| | | | | | | | | | | | | | | | | | | | As raised in https://github.com/rails/rails/issues/12300 [ci skip]
* | | | Merge pull request #11452 from dasch/dasch/details-in-digestor-cache-keyJosé Valim2013-09-203-2/+39
|\ \ \ \ | | | | | | | | | | Bust the template digest cache key when details are changed
| * | | | Bust the template digest cache key when details are changedDaniel Schierbeck2013-09-193-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the lookup details will influence which template is resolved, they need to be included in the cache key -- otherwise two different templates may erroneously share the same digest value.
* | | | | Merge pull request #12285 from dasch/dasch/allow-attaching-up-frontJosé Valim2013-09-203-2/+92
|\ \ \ \ \ | | | | | | | | | | | | Allow attaching to AS::Notifications namespace up front
| * | | | | Allow attaching to AS::Notifications namespace up frontDaniel Schierbeck2013-09-203-2/+92
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, you were required to attach *after* adding the methods to the class, since the attachment process needed the methods to be present. With this change, any new method will also be attached to the configured namespace.
* | | | | Merge pull request #12299 from hitendrasingh/code_refactorJosé Valim2013-09-203-8/+8
|\ \ \ \ \ | |/ / / / |/| | | | DRYing up method_missing code; Initializing Codepoint object with default values
| * | | | Initializing Codepoint object with default valuesHitendra Singh2013-09-202-6/+7
| | | | |
| * | | | Drying up method_missing codeHitendra Singh2013-09-201-2/+1
| | | | |
* | | | | mention controller test base class in testing guide. [ci skip]Yves Senn2013-09-201-4/+6
|/ / / /
* | | | Merge pull request #12295 from gaurish/patch-2Guillermo Iguaran2013-09-191-1/+1
|\ \ \ \ | | | | | | | | | | Allow failures in jruby-head
| * | | | Allow failures in jruby-headGaurish Sharma2013-09-201-1/+1
|/ / / /
* | | | Merge pull request #12294 from gaurish/patch-1Guillermo Iguaran2013-09-191-1/+1
|\ \ \ \ | | | | | | | | | | Run Tests against JRuby master
| * | | | Run Tests against JRuby masterGaurish Sharma2013-09-201-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many of the failing tests in rails test suite fail because of missing encoding support, example #11739 And according to recent announcement, lot of encoding issues have been fixed in current master. http://ruby.11.x6.nabble.com/Big-encoding-patches-landed-on-master-td4993719.html So lets test against JRuby master & incase there are still bugs. it would be easier to report them to JRuby.
* | | | Merge pull request #10362 from derekprior/dp-fix-assert-redirect-toAndrew White2013-09-194-34/+53
|\ \ \ \ | | | | | | | | | | Fix incorrect assert_redirected_to failure message
| * | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 17:07:41 +0000