aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #14689 from matthewd/asset_initializerRafael Mendonça França2014-04-116-11/+24
|\ \ \ \ | | | | | | | | | | Move assets precompile (and version) to an initializer
| * | | | Move assets precompile (and version) to an initializerMatthew Draper2014-04-116-11/+24
| | |/ / | |/| | | | | | | | | | | | | | sprockets-rails 2.1 needs the precompile list to be available in all environments.
* | | | Add CHANGELOG entry for #14619 [ci skip]Rafael Mendonça França2014-04-111-0/+4
| | | |
* | | | Merge pull request #14619 from winston/enhance-routing-error-htmlRafael Mendonça França2014-04-111-63/+119
|\ \ \ \ | | | | | | | | | | | | | | | Enhance routing error html page
| * | | | Split search results into 'exact matches' and 'fuzzy matches'.Winston2014-04-111-60/+96
| | | | | | | | | | | | | | | | | | | | - also refactored the javascript.
| * | | | Improve CSS styling for routing error html page.Winston2014-04-111-7/+25
| | | | |
| * | | | Implement fuzzy matching for route search on routing error html page.Winston2014-04-111-8/+10
| | | | |
* | | | | Merge pull request #14707 from minio-sk/fix-issue-14702Rafael Mendonça França2014-04-111-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Be explicit about allowed constraint values, fixes #14702
| * | | | | Be explicit about allowed constraint values, fixes #14702Jano Suchal2014-04-111-0/+2
| | | | | |
* | | | | | Merge pull request #14692 from senny/pg/reload_type_map_for_unknown_typesYves Senn2014-04-118-16/+74
|\ \ \ \ \ \ | | | | | | | | | | | | | | PostgreSQL automatic type map reload
| * | | | | | PostgreSQL, warn once per connection per missing OID. Closes #14275.Yves Senn2014-04-113-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [Yves Senn & Matthew Draper]
| * | | | | | PostgreSQL, adapter automatically reloads it's type map. Closes #14678.Yves Senn2014-04-118-16/+57
| | |/ / / / | |/| | | | | | | | | | | | | | | | [Yves Senn & Matthew Draper]
* | | | | | Merge pull request #14705 from akshay-vishnoi/doc_changesRafael Mendonça França2014-04-114-0/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Add more test case for #demodulize, Improve documentation
| * | | | | Add more test case for #demodulize, Improve documentationAkshay Vishnoi2014-04-114-0/+8
| | | | | |
* | | | | | Merge pull request #14684 from Futurelearn/jc-deep-nested-shallow-url-helper-bugAndrew White2014-04-113-3/+40
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | Add a failing test for a URL helper that was broken by a6b9ea2.
| * | | | | Only make deeply nested routes shallow when parent is shallowAndrew White2014-04-112-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since `:shallow` may be set at any point in the resource nesting we should only make the new and collection routes shallow when the parent is shallow. This is a bit of a hack but until the mapper is refactored to an object graph instead of a hash of merged values it's the best we can do. Fixes #14684.
| * | | | | Add a failing test for a URL helper that was broken by a6b9ea2.James Coglan2014-04-101-0/+18
| | |/ / / | |/| | |
* | | | | docs, make association `autosave: true` examples runnable. Closes #14700Yves Senn2014-04-111-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] The examples are written in a way you expect them to be executable. However one snippet assumed there to be two comments when only one was created above. The defined models did not extend `ActiveRecord::Base` The example used `comments.last.mark_for_destruction`. This does no longer load the whole collection but just the last record. It is then refetcht on subsequent calls to `last`. This breaks the example.
* | | | | Merge pull request #12829 from iantropov/issue_insert_via_hmt_scope_3548Rafael Mendonça França2014-04-106-4/+32
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix insertion of records for hmt association with scope Conflicts: activerecord/CHANGELOG.md
| * | | | | Fix insertion of records for hmt association with scope, fix #3548Ivan Antropov2013-11-176-4/+32
| | | | | |
* | | | | | Merge pull request #14694 from heironimus/callback_guideRafael Mendonça França2014-04-101-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add after_commit/after_rollback to callback list
| * | | | | | Add after_commit/after_rollback to callback listKyle Heironimus2014-04-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding after_commit/after_rollback to list of callbacks in order helps explain the callback order as well as making it consistent with the API docs at http://api.rubyonrails.org/classes/ActiveRecord/Callbacks.html
* | | | | | | Merge pull request #14695 from akshay-vishnoi/doc_changesRafael Mendonça França2014-04-101-14/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | [ci skip] Remove false documentation
| * | | | | [ci skip] Remove false documentationAkshay Vishnoi2014-04-111-14/+1
|/ / / / /
* | | | | Remove warning of unused variableRafael Mendonça França2014-04-101-1/+1
| | | | |
* | | | | Merge branch 'rm-uuid-fixtures'Rafael Mendonça França2014-04-1013-10/+149
|\ \ \ \ \
| * | | | | No need to call sendRafael Mendonça França2014-04-101-1/+1
| | | | | |
| * | | | | Merge branch 'master' into rm-uuid-fixturesRafael Mendonça França2014-04-1079-287/+783
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG.md activesupport/CHANGELOG.md
* | | | | | Require action_controller before any other action_controller fileRafael Mendonça França2014-04-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will load properly the loading hooks. Closes rails/sass-rails#205
* | | | | | Merge pull request #11656 from emre-basala/xml_mini_testRafael Mendonça França2014-04-101-1/+58
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add tests to ActiveSupport:XmlMini to_tag method
| * | | | | | Add tests to ActiveSupport:XmlMini to_tag methodemre-basala2013-08-071-1/+58
| | | | | | |
* | | | | | | Merge pull request #14677 from JuanitoFatas/update-initialization-code-snippetsRafael Mendonça França2014-04-101-53/+102
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | [ci skip] Update code snippets to latest master (initialization.md).
| * | | | | | [ci skip] Update code snippets to latest master (initialization.md).Juanito Fatas2014-04-101-53/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update the `server.run` example (Replace Mongrel with Puma).
* | | | | | | Merge pull request #14679 from pbharadiya/masterYves Senn2014-04-101-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Correct factual error for page not found [ci skip]
| * | | | | | | Correct factual error for page not foundParth Bharadiya2014-04-101-1/+1
|/ / / / / / /
* / / / / / / +EOLAkira Matsuda2014-04-101-1/+1
|/ / / / / /
* | | | | | Merge pull request #11411 from dscataglini/masterAaron Patterson2014-04-091-6/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Active support callback's before/after/around filters are not correctly making their singleton methods private
| * | | | | | private method doesn't work for singleton methods defined this wayDiego Scataglini2013-07-121-6/+12
| | | | | | |
* | | | | | | Only call uniq on the conditional that actually needs itCarlos Antonio da Silva2014-04-091-1/+1
| | | | | | |
* | | | | | | Remove extra collect callCarlos Antonio da Silva2014-04-091-1/+1
| | | | | | |
* | | | | | | Merge pull request #14675 from ↵Aaron Patterson2014-04-092-7/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | laurocaetano/make_reflection_caches_works_with_string_keys Make reflection and aggregate_reflection caches work with string keys.
| * | | | | | | Make sure the reflection test is passing a String to the reflectionLauro Caetano2014-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cache.
| * | | | | | | Make the aggregate_reflections cache work with strings as its keys.Lauro Caetano2014-04-091-2/+2
| | | | | | | |
| * | | | | | | No need to call `to_sym` on reflection name, since the cache now worksLauro Caetano2014-04-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with strings with string keys. Related #14668.
| * | | | | | | Make the reflections cache work with strings as its keys.Lauro Caetano2014-04-091-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #14671 from arthurnn/travis_memcacheRafael Mendonça França2014-04-091-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | add services: memcache to travis
| * | | | | | | add services: memcache to travisArthur Neves2014-04-091-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #14668 from laurocaetano/source_option_with_string_valueAaron Patterson2014-04-092-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | The :source option for has_many => through should accept String values.
| * | | | | | | The `source` option for `has_many => through` should accept StringLauro Caetano2014-04-092-3/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values. With the changes introduced by 16b70fddd4dc7e7fb7be108add88bae6e3c2509b it was expecting the value to be a Symbol, while it could be also a String value.
* | | | | | | Merge pull request #14665 from andrielfn/avoid-uri-parsingRafael Mendonça França2014-04-092-5/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Avoid URI parsing
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 01:40:47 +0000