aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Rearrange the config merger some moreMatthew Draper2014-04-081-19/+16
| * | | | entry is always a HashRafael Mendonça França2014-04-081-1/+1
| * | | | Check env_url only onceRafael Mendonça França2014-04-081-2/+7
| * | | | Only call DEFAULT_ENV proc one timeRafael Mendonça França2014-04-081-2/+5
| * | | | Test DATABASE_URL has precendance over DATABASE_URL_#{environment}Rafael Mendonça França2014-04-081-0/+9
| * | | | Make sure DEFAULT_URL only override current environment databaseRafael Mendonça França2014-04-082-10/+30
| * | | | Only apply DATABASE_URL for Rails.envMatthew Draper2014-04-082-45/+40
|/ / / /
* | | | Ensure we are looking with string keysGodfrey Chan2014-04-071-1/+1
* | | | 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
|/ / / / / / /
| | | | | | * Merge pull request #12016 from roderickvd/uuid_fixesRafael Mendonça França2014-04-0413-10/+149
| |_|_|_|_|/| |/| | | | | |
| | | | | | * Auto-generate stable fixture UUIDs on PostgreSQL.Roderick van Domburg2014-01-0714-17/+154