aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Follow up to bbe7fe41 to fix enum leakage across classes.Godfrey Chan2014-04-073-11/+35
* Merge pull request #14634 from laurocaetano/fix_reorderRafael Mendonça França2014-04-074-7/+26
|\
| * Build the reverse_order on its proper method.Lauro Caetano2014-04-074-7/+26
* | Merge pull request #14635 from eileencodes/remove-check-for-presentRafael Mendonça França2014-04-071-2/+2
|\ \
| * | remove check for present? from delete_alleileencodes2014-04-071-2/+2
* | | Rails.application should be set inside before_configuration hookRafael Mendonça França2014-04-073-1/+17
|/ /
* / Remove useless begin..endCarlos Antonio da Silva2014-04-071-2/+1
|/
* Merge pull request #14632 from matthewd/escape_byteaRafael Mendonça França2014-04-072-2/+19
|\
| * Use connection-specific bytea escapingMatthew Draper2014-04-082-2/+19
* | Merge pull request #14631 from laurocaetano/fix_count_with_orderSantiago Pastorino2014-04-072-1/+15
|\ \
| * | Ignore order when doing count.Lauro Caetano2014-04-072-1/+15
|/ /
* | Merge pull request #14609 from evanwhalen/enums_inheritanceRafael Mendonça França2014-04-073-4/+28
|\ \ | |/ |/|
| * make enums distinct per classEvan Whalen2014-04-073-4/+28
* | Merge pull request #14628 from vipulnsward/remove-flash-test-warningYves Senn2014-04-071-2/+2
|\ \
| * | Remove unused `subclass_controller_with_flash_type_bar` var from flash test.Vipul A M2014-04-071-2/+2
* | | Merge pull request #14624 from jamox/dev_install_guideYves Senn2014-04-071-1/+14
|\ \ \ | |/ / |/| |
| * | Added OS X specific commands to installation guide [ci skip]Jarmo Isotalo2014-04-071-1/+14
* | | Merge pull request #14626 from eileencodes/fix_incorrect_collection_proxy_del...Arthur Nogueira Neves2014-04-061-6/+1
|\ \ \
| * | | fix CollectionProxy delete_all documentationeileencodes2014-04-061-6/+1
|/ / /
* | | Merge pull request #14614 from tgxworld/fix_add_flash_types_testYves Senn2014-04-061-6/+15
|\ \ \ | |/ / |/| |
| * | Fix setup of adding _flash_types test.Guo Xiang Tan2014-04-061-6/+15
| |/
* | Merge pull request #14623 from t3chnoboy/masterYves Senn2014-04-061-1/+1
|\ \ | |/ |/|
| * Use SVG version of travis build status badge [skip ci]Dmitry Mazuro2014-04-061-1/+1
|/
* Merge pull request #14612 from acallaghan/patch-1Arthur Nogueira Neves2014-04-051-1/+1
|\
| * W3C CSP document moved to gihub.io URL [ci skip]Andy Callaghan2014-04-051-1/+1
|/
* Merge pull request #14579 from senny/pg/remove_string_limitRafael Mendonça França2014-04-047-5/+19
|\
| * test, show current adapter behavior for `add_column limit: nil`.Yves Senn2014-04-041-0/+8
| * PostgreSQL and SQLite, remove varchar limit. [Vladimir Sazhin & Toms Mikoss &...Yves Senn2014-04-046-5/+11
* | sprockets-rails was releasedRafael Mendonça França2014-04-041-1/+0
* | Fix the test defining the models in the right placeRafael Mendonça França2014-04-044-15/+16
* | Add CHANGELOG entry for #11650 [ci skip]Rafael Mendonça França2014-04-041-0/+6
* | Merge pull request #11650 from prathamesh-sonpatki/renameRafael Mendonça França2014-04-049-19/+37
|\ \
| * | [Active Record] Renamed private methods create_record and update_recordPrathamesh Sonpatki2014-02-209-19/+37
* | | Declare the assets dependencyRafael Mendonça França2014-04-041-7/+8
* | | Use sass-rails 4.0.3Rafael Mendonça França2014-04-041-1/+1
* | | Make possible to use sprockets-rails 2.1Rafael Mendonça França2014-04-042-1/+2
* | | Merge pull request #14562 from jefflai2/collection_proxyRafael Mendonça França2014-04-044-0/+23
|\ \ \
| * | | CollectionProxy uses the arel of its association's scope.Jefferson Lai2014-04-024-0/+23
* | | | Merge pull request #14599 from spagalloco/patch-1Arthur Nogueira Neves2014-04-041-1/+1
|\ \ \ \
| * | | | add missing parentheses to validates_with documentation [skip ci]Steve Agalloco2014-04-041-1/+1
|/ / / /
* | | | Remove unused variableRafael Mendonça França2014-04-041-1/+1
* | | | Merge pull request #14598 from rajcybage/assert_dprecated_for_as_test_caseRafael Mendonça França2014-04-041-4/+4
|\ \ \ \
| * | | | Active support instead of ActiveSupport::Deprecation.silence we can use asser...Rajarshi Das2014-04-041-4/+4
* | | | | Merge pull request #14597 from matthewd/kernel_y_for_1_9_option_1Rafael Mendonça França2014-04-043-10/+29
|\ \ \ \ \
| * | | | | Ensure we supply Kernel#y for 1.9 tooMatthew Draper2014-04-043-10/+29
| | |_|_|/ | |/| | |
* | | | | Merge pull request #14593 from tgxworld/fix_postgresql_schema_test_random_orderYves Senn2014-04-041-17/+16
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Prevent state leak in test.Guo Xiang Tan2014-04-031-17/+16
|/ / / /
* | | | Merge pull request #14582 from arthurnn/blacklist_ruby_methodsRafael Mendonça França2014-04-034-1/+15
|\ \ \ \
| * | | | Block a few default Class methods as scope name.Arthur Neves2014-04-034-1/+15
|/ / / /
* | | | Merge pull request #14572 from laurocaetano/with_options_and_scopeRafael Mendonça França2014-04-036-1/+24
|\ \ \ \