aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #9523 from ↵Rafael Mendonça França2013-03-274-2/+16
|\ | | | | | | | | | | | | | | | | stopdropandrew/Instrumenter#instrument-yields-payload ActiveSupport::Notifications::Instrumenter#instrument should yield Conflicts: activesupport/CHANGELOG.md
| * ActiveSupport::Notifications::Instrumenter#instrument should yieldstopdropandrew2013-03-024-3/+16
| | | | | | | | its payload the same way that ActiveSupport::Notifications does. Fix spelling in test name.
* | Merge pull request #9955 from rubys/cleanup_app_gemfileRafael Mendonça França2013-03-271-17/+7
|\ \ | | | | | | Cosmetic cleanup of generated Gemfile
| * | Remove buggy and unnecessary logicSam Ruby2013-03-271-7/+0
| | | | | | | | | | | | based on a discussion with @rafaelfranca
| * | Cosmetic cleanup of generated GemfileSam Ruby2013-03-271-17/+14
| | | | | | | | | | | | | | | | | | - Remove obsolete/misleading comment about assets only being used production - Remove unnecessary group :assets - Eliminate blank lines if options[:skip_javascript] is not specified
* | | Fix syntax errorRafael Mendonça França2013-03-271-1/+0
| | |
* | | Merge pull request #9274 from KrzysiekJ/spaces_in_scope_namesRafael Mendonça França2013-03-272-5/+17
|\ \ \ | |/ / |/| | | | | Use define_method when method name contains weird characters.
| * | Use define_method when method name contains weird characters.Krzysztof Jurewicz2013-03-182-5/+17
| | |
* | | Merge pull request #8458 from ↵Rafael Mendonça França2013-03-274-5/+68
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lucisferre/improve-layout-override-fallback-behavior Provides standard layout lookup behavior for method and proc cases Conflicts: actionpack/CHANGELOG.md
| * | | Provides standard layout lookup behavior for method and proc casesChris Nicola2013-03-274-5/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When setting the layout either by referencing a method or supplying a Proc there is no way to fall back to the default lookup behavior if desired. This patch allows fallback to the layout lookup behavior when returning nil from the proc or method.
* | | | Merge pull request #9954 from neerajdotname/space_after_entirelyRafael Mendonça França2013-03-271-1/+1
|\ \ \ \ | | | | | | | | | | entirelyby => 'entirely by'
| * | | | entirelyby => 'entirely by'Neeraj Singh2013-03-271-1/+1
|/ / / /
* | | | Merge pull request #9949 from vipulnsward/drop_yaml_error_constantRafael Mendonça França2013-03-272-4/+2
|\ \ \ \ | | | | | | | | | | drop errors constant
| * | | | drop errors constantVipul A M2013-03-272-4/+2
| | | | |
* | | | | Merge pull request #9952 from prathamesh-sonpatki/AR-typosRafael Mendonça França2013-03-275-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Fixed typos in activerecord
| * | | | | Fixed typos in activerecordPrathamesh Sonpatki2013-03-275-5/+5
|/ / / / /
* | | | | Merge pull request #9947 from senny/strong_params_doc_for_complex_formsRafael Mendonça França2013-03-271-1/+25
|\ \ \ \ \ | | | | | | | | | | | | mention strong parameters in complex forms section of the guides.
| * | | | | mention strong parameters in complex forms section of the guides.Yves Senn2013-03-271-1/+25
| |/ / / / | | | | | | | | | | | | | | | Closes #9921.
* | | | | Merge pull request #8368 from SamSaffron/masterRafael Mendonça França2013-03-273-3/+75
|\ \ \ \ \ | | | | | | | | | | | | Allow connection_handler to be overriden per-thread
| * | | | | Make connection_handler overridable per threadSam Saffron2013-03-273-3/+75
| | | | | |
* | | | | | Use thor master since 0.18.0 has a regressionRafael Mendonça França2013-03-271-0/+1
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/wycats/thor/commit/08265a380d0ff3fce014e98e87bb8c2330858e4a for the discussion and https://github.com/wycats/thor/pull/316 for the fix
* | | | | Merge pull request #9945 from vipulnsward/drop_var_in_validationsCarlos Antonio da Silva2013-03-271-2/+1
|\ \ \ \ \ | |/ / / / |/| | | | Drop variable assignment in validations
| * | | | drop variable assignment in validationsVipul A M2013-03-271-2/+1
|/ / / /
* | | | Merge pull request #9876 from macksmind/restore_cols_dropped_by_hstore_testRafael Mendonça França2013-03-261-15/+5
|\ \ \ \ | | | | | | | | | | Restore columns dropped by hstore test
| * | | | Combine tests and restore columns dropped by hstore testingMack Earnhardt2013-03-261-15/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Disabling the hstore extension during testing created order dependent test failures.
* | | | | Merge pull request #9928 from vipulnsward/fix_rename_auto_increment_mysqlRafael Mendonça França2013-03-266-11/+27
|\ \ \ \ \ | | | | | | | | | | | | respect auto_increment in rename_column for mysql
| * | | | | respect auto_increment in rename_column for mysqlVipul A M2013-03-276-11/+27
| | | | | |
* | | | | | Merge pull request #9939 from dchapman1988/masterRafael Mendonça França2013-03-261-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixing some typo(s)/grammar.
| * | | | | | s/and and run/and runs/David Chapman2013-03-261-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Fixing some typos/grammar.
* | | | | | Merge pull request #9937 from zolzaya/masterRafael Mendonça França2013-03-261-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Asia/Ulaanbaatar is incorrect mapping Fixes #9936
| * | | | | | Fixed timezone mapping of Ulaanbaatar.Zolzaya2013-03-271-1/+1
|/ / / / / /
* | | | | | Merge pull request #9923 from danmcclain/psql-concurrent-indexesRafael Mendonça França2013-03-269-35/+86
|\ \ \ \ \ \ | | | | | | | | | | | | | | Adds support for concurrent indexing in PostgreSQL adapter
| * | | | | | Checks :algorithm argument for valid valuesDan McClain2013-03-264-1/+18
| | | | | | |
| * | | | | | Adds support for concurrent indexing in PostgreSQL adapterDan McClain2013-03-259-35/+69
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for algorithm option in MySQL indexes Moves USING and algorithm options upstream The syntax is still specific to the Adapter, so the actual executed string happens in the corresponding adapter
* | | | | | Merge pull request #9930 from kennyj/bump_tzinfoSantiago Pastorino2013-03-252-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Bump TZInfo version to 0.3.37 based on version v2013b of the underlying tz data.
| * | | | | | Bump TZInfo version to 0.3.37 based on version v2013b of the underlying tz data.kennyj2013-03-262-2/+2
| | | | | | |
* | | | | | | default RAILS_ENV to test if we're in a test taskAaron Patterson2013-03-251-0/+4
| |/ / / / / |/| | | | |
* | | | | | Fix typoRafael Mendonça França2013-03-251-1/+1
| | | | | |
* | | | | | Merge pull request #9925 from senny/relative_guide_linksSteve Klabnik2013-03-253-18/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | use relative links inside guides [ci skip]
| * | | | | | use relative links inside guides [ci skip]Yves Senn2013-03-253-18/+26
| | | | | | |
* | | | | | | The sql_type method called here is fromRafael Mendonça França2013-03-252-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord::ConnectionAdapters::Column See https://github.com/rails/rails/blob/28b8ca766e3e7c6c43d3ae900c99f8377153c62/activerecord/lib/active_record/connection_adapters/column.rb#L16
* | | | | | | Merge pull request #9920 from senny/clean_up_testing_examples_for_action_mailerSteve Klabnik2013-03-252-36/+26
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | move mailer testing examples into the testing guide.
| * | | | | | move mailer testing examples into the testing guide.Yves Senn2013-03-252-36/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9325. I adjusted the example and the description in the testing guide and simply linked from the mailer to the testing guide. This way we don't have to maintain two separate places.
* | | | | | | Merge pull request #7324 from MSch/pg-geometricRafael Mendonça França2013-03-256-12/+77
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Add support for pg geometric datatypes point and box
| * | | | | | Move away from column.sql_type in untested code tooMartin Schürrer2013-03-251-5/+6
| | | | | | |
| * | | | | | Make Postgres point type correspond to ruby array with two floats insideMartin Schürrer2013-03-256-8/+72
|/ / / / / /
* | | | | | Created a layer of abstraction for the valid type checking in schema dumper. ↵Ranjay Krishna2013-03-257-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | Now, connection handles the check for valid types so that each database can handle the changes individually.
* | | | | | Merge pull request #9874 from arunagw/skipping-test-for-openssl-pkcs5Rafael Mendonça França2013-03-251-0/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Skipping test for OpenSSL::PKCS5 JRuby
| * | | | | | Skipping test for OpenSSL::PKCS5 JRubyArun Agrawal2013-03-251-0/+10
| | | | | | |
* | | | | | | Merge pull request #8527 from shockone/patch-1Rafael Mendonça França2013-03-253-0/+39
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add a method full_messages_for to the Errors class
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 06:42:15 +0000