aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15347 from JuanitoFatas/benchmark-in-contributing-to-rorZachary Scott2014-05-261-0/+30
|\ | | | | [ci skip] Add benchmark your code section to contributing to ruby on rails guide.
| * [ci skip] Add benchmark your code section to contributing to ruby on rails ↵Juanito Fatas2014-05-271-0/+30
| | | | | | | | | | | | | | guide. I have seen many times that maintainers want people to use this gem to give a benchmark report. It would be nice to add it and refer to it later.
* | Merge pull request #15300 from arthurnn/refactor_reflectionsRafael Mendonça França2014-05-2616-34/+85
|\ \ | | | | | | Refactor reflections
| * | Refactoring .reflections public method.Arthur Neves2014-05-264-9/+28
| | | | | | | | | | | | | | | | | | Now the internal reflections will hold a reference to its public representation, so when the outside world calls `Account.reflection` we can build a list of public reflections.
| * | Use .to_s on _reflections lookupArthur Neves2014-05-242-2/+2
| | |
| * | Merge pull request #15210 from arthurnn/fix_hbtm_reflectionArthur Neves2014-05-2416-30/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix habtm reflection Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/counter_cache.rb activerecord/lib/active_record/reflection.rb activerecord/test/cases/reflection_test.rb
* | | Merge pull request #15350 from sgrif/sg-refactor-predicate-builderRafael Mendonça França2014-05-261-11/+14
|\ \ \ | | | | | | | | Refactor the handling of arrays in where predicates
| * | | Refactor the handling of arrays in where predicatesSean Griffin2014-05-261-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | Simplifies the code slightly, isolates non-nil non-range values into a single array, which will make it easier to do things like apply type casting to them in the future.
* | | | Merge pull request #15323 from JohnKellyFerguson/getting-started-appRafael Mendonça França2014-05-2630-142/+147
|\ \ \ \ | | | | | | | | | | Docs: Rename Posts to Articles in Guides' Getting Started App
| * | | | Rename Posts to Articles in Guides' Getting Started App, continuation of ↵John Kelly Ferguson2014-05-2530-142/+147
| | | | | | | | | | | | | | | | | | | | #15215 [ci skip]
* | | | | Merge pull request #15346 from aditya-kapoor/correct-doc-for-pathRafael Mendonça França2014-05-261-14/+14
|\ \ \ \ \ | |_|_|_|/ |/| | | | correct documentation for asset_path and image_path [ci skip]
| * | | | correct docs for (asset|image)_path [ci skip]Aditya Kapoor2014-05-271-14/+14
|/ / / /
* | | | Merge pull request #15345 from matthewd/skip-dalli-errorsGuillermo Iguaran2014-05-261-0/+18
|\ \ \ \ | | | | | | | | | | Skip individual tests upon Dalli::RingError
| * | | | Skip individual tests upon Dalli::RingErrorMatthew Draper2014-05-271-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike the outer `rescue`, this one is much more precise about what we want to handle: a connection failure (`Dalli::RingError`) is not relevant to what we're testing here. But other Dalli errors may well be indicating an actual problem.
* | | | | Merge pull request #15342 from aditya-kapoor/correct-tag-docsRafael Mendonça França2014-05-261-10/+10
|\ \ \ \ \ | |/ / / / |/| | | | correct docs for audio_tag and video_tag [ci skip]
| * | | | correct doc for (audio|video)_tag [ci skip]Aditya Kapoor2014-05-271-10/+10
| | | | |
* | | | | Escape user input before showing in the page.Rafael Mendonça França2014-05-261-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | This is not a security issue since this page is not present in production and user have to type something in the field but is better to escape the input.
* | | | Merge pull request #15333 from ShunsukeAida/update_ruby_versionRafael Mendonça França2014-05-261-1/+1
|\ \ \ \ | | | | | | | | | | update the recommended ruby version.
| * | | | update the recommended ruby versionShunsukeAida2014-05-271-1/+1
| | | | |
* | | | | Merge pull request #15294 from schneems/schneems/generator-output-in-error2Rafael Mendonça França2014-05-262-14/+20
|\ \ \ \ \ | | | | | | | | | | | | print generators on failed generate
| * | | | | print generators on failed generateschneems2014-05-262-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's say we just ran: ``` $ rails g migrate add_click_to_issue_assignment ``` We will get an error that looks like: ``` Could not find generator migrate. ``` This patch adds all existing migrations to the output to make it easier for a developer to find a valid migration. ``` Could not find generator "migrate". Please select a valid generator: Rails: assets controller generator helper integration_test mailer migration model resource scaffold scaffold_controller task ``` It would be nice to do some spelling detection and suggest alternatives, but for now this should help.
* | | | | | Merge pull request #15340 from aditya-kapoor/correct-docsRafael Mendonça França2014-05-261-15/+16
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Correct Documentation for asset_tag_helpers
| * | | | | Correct Documentation for asset_tag_helpersAditya Kapoor2014-05-261-15/+16
| | | | | |
* | | | | | Merge pull request #15339 from sgrif/sg-mysql-booleansRafael Mendonça França2014-05-262-13/+18
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Refactor the type casting of booleans in MySQL
| * | | | | Refactor the type casting of booleans in MySQLSean Griffin2014-05-262-13/+18
|/ / / / /
* | | | | Merge pull request #15336 from sgrif/sg-quotingMatthew Draper2014-05-275-54/+33
|\ \ \ \ \ | | | | | | | | | | | | Remove checks against `column.type` in abstract adapter quoting
| * | | | | Remove checks against `column.type` in abstract adapter quotingSean Griffin2014-05-265-54/+33
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | The intention is to eventually remove `column` from the arguments list both for `quote` and for `type_cast` entirely. This is the first step to that end.
* | | | | Merge pull request #15335 from sgrif/sg-missing-test-caseRafael Mendonça França2014-05-262-0/+11
|\ \ \ \ \ | |/ / / / |/| | | | Add missing test case for quoting behavior
| * | | | Add missing test case for quoting behaviorSean Griffin2014-05-262-0/+11
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that the only time that `quote` is called with a column, but without first calling `type_cast` is when where is called with an array. My previous pull request broke this behavior, without failing tests. This adds a test for the only case I can think of that exercises the `if column.type == :integer` branch of `quote` effectively.
* | | | Merge pull request #15307 from sgrif/sg-type-cast-for-writeYves Senn2014-05-266-10/+19
|\ \ \ \ | | | | | | | | | | Add an interface for type objects to control Ruby => SQL
| * | | | Add an interface for type objects to control Ruby => SQLSean Griffin2014-05-266-10/+19
| |/ / / | | | | | | | | | | | | | | | | Adds the ability to save custom types, which type cast to non-primitive ruby objects.
* | | | pg, add missing `:nodoc:` to adapter.Yves Senn2014-05-261-8/+8
| | | |
* | | | pg, remove unused code. Use `extract_schema_and_table` instead.Yves Senn2014-05-261-10/+0
| | | |
* | | | Merge pull request #15325 from tgxworld/no_need_to_call_to_sYves Senn2014-05-262-2/+2
|\ \ \ \ | | | | | | | | | | Remove duplicated to_s method call.
| * | | | Remove duplicated to_s method call.Guo Xiang Tan2014-05-252-2/+2
| | |/ / | |/| |
* | | | Merge pull request #15316 from akshay-vishnoi/test-casesYves Senn2014-05-261-7/+8
|\ \ \ \ | | | | | | | | | | | | | | | Fix test cases for inflector.rb
| * | | | Fix test cases for inflector.rbAkshay Vishnoi2014-05-251-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `yield` was missing in #with_dup, due to which 57 assertions were not running in real, and all tests were passing by default. Error was introduced in commit - 31ceb5e.
* | | | | Merge pull request #15324 from andriytyurnikov/simple_rake_stats_for_everythingYves Senn2014-05-261-18/+22
|\ \ \ \ \ | | | | | | | | | | | | simple solution that brings rake stats task to all rails project
| * | | | | simple solution that brings rake stats task to every kind of rails projectAndriy Tyurnikov2014-05-261-18/+22
| | |/ / / | |/| | |
* | | | | Merge pull request #15328 from kuldeepaggarwal/remove-warningsYves Senn2014-05-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | remove unused variable warning.
| * | | | | remove unused variable warningKuldeep Aggarwal2014-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | `warning: assigned but unused variable - album`
* | | | | | Fix docs for ActionController::Renderers.addGuillermo Iguaran2014-05-261-1/+1
|/ / / / /
* | | | | Merge pull request #15310 from tgxworld/small_refactor_get_routes_as_headCarlos Antonio da Silva2014-05-251-3/+1
|\ \ \ \ \ | |/ / / / |/| | | | Remove unnecessary flatten! method call.
| * | | | Remove unnecessary flatten! method call.Guo Xiang Tan2014-05-251-3/+1
| | | | |
* | | | | Merge pull request #15315 from JuanitoFatas/guides-guidelinesSantiago Pastorino2014-05-251-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | [ci skip] Update GFM link in guides guidelines.
| * | | | [ci skip] Update GFM link in guides guidelines.Juanito Fatas2014-05-251-1/+1
| |/ / / | | | | | | | | | | | | Also remove a duplicated sentence.
* | | | Merge pull request #15312 from JuanitoFatas/action_view/asset_pathYves Senn2014-05-251-1/+1
|\ \ \ \ | | | | | | | | | | Convert source to string if it is present.
| * | | | Convert source to string if it is present.Juanito Fatas2014-05-251-1/+1
| |/ / /
* | | | Merge pull request #15311 from zuhao/refactor_actionpack_bare_metal_testYves Senn2014-05-251-2/+2
|\ \ \ \ | |/ / / |/| | | The correct status to test should be :switching_protocols.
| * | | The correct status to test should be :switching_protocols.Zuhao Wan2014-05-251-2/+2
|/ / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 12:21:56 +0000