Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Fix tests, Rails.env may be different on CI | Piotr Sarnacki | 2012-02-16 | 1 | -2/+5 | |
* | | | | | | | Refactor Rails::Console to make it easier to test and add tests for it | Piotr Sarnacki | 2012-02-16 | 2 | -25/+130 | |
* | | | | | | | Allow to set custom console type with Rails.application.config.console= | Piotr Sarnacki | 2012-02-16 | 4 | -3/+27 | |
* | | | | | | | Remove console --irb deprecation notice | Piotr Sarnacki | 2012-02-16 | 1 | -1/+0 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #5064 from lest/patch-1 | Jeremy Kemper | 2012-02-16 | 3 | -6/+19 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | move id_before_type_cast to PrimaryKey module | Sergey Nartimov | 2012-02-16 | 3 | -6/+19 | |
* | | | | | | | Merge pull request #5059 from waseem/autoload_effectively | Xavier Noria | 2012-02-16 | 1 | -9/+12 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Autoload various constants effectively in abstract connection adapter. | Waseem Ahmad | 2012-02-16 | 1 | -9/+12 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #5062 from bogdan/test2 | José Valim | 2012-02-16 | 1 | -2/+9 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | ActionDispatch: add missing test for callbacks | Bogdan Gusiev | 2012-02-16 | 1 | -2/+9 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #5055 from rafaelfranca/fix-drop-table | Jeremy Kemper | 2012-02-15 | 1 | -2/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Revert "No need to pass options which is never used" | Rafael Mendonça França | 2012-02-15 | 1 | -2/+2 | |
|/ / / / / / | ||||||
* | | | | | | fixing AP tests | Aaron Patterson | 2012-02-15 | 1 | -1/+1 | |
* | | | | | | Merge pull request #5049 from fabioyamate/master | José Valim | 2012-02-15 | 2 | -3/+10 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix sanitize_for_mass_assigment when role is nil | Fabio Yamate | 2012-02-15 | 2 | -3/+10 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #5045 from avakhov/am-format-paragraph-fix | José Valim | 2012-02-15 | 2 | -1/+14 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix AM format_paragraph helper method if a first word is long | Alexey Vakhov | 2012-02-15 | 2 | -1/+14 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #5046 from avakhov/am-block-format-fit | José Valim | 2012-02-14 | 2 | -2/+33 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Cosmetic fixes in block_format AM helper method + test | Alexey Vakhov | 2012-02-15 | 2 | -2/+33 | |
|/ / / / / / | ||||||
* | | | | | | adding tests to document behavior for #4817 | Aaron Patterson | 2012-02-14 | 1 | -0/+26 | |
* | | | | | | Rack body respond to each and not to join | Santiago Pastorino | 2012-02-14 | 2 | -2/+16 | |
* | | | | | | CSS fix for guides. Closing #5028 [ci skip] | Vijay Dev | 2012-02-15 | 1 | -1/+1 | |
* | | | | | | Merge pull request #5042 from parndt/patch-2 | Vijay Dev | 2012-02-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | "Or" was not meaningful anymore, per dad7fdc5734a3813246f238ac5760b2076932216 | Philip Arndt | 2012-02-15 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #3544 from amatsuda/_field_changed | Aaron Patterson | 2012-02-14 | 3 | -4/+18 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | A test case for GH #3544 to ensure that a field named field works fine | Akira Matsuda | 2012-02-14 | 1 | -0/+14 | |
| * | | | | | | Rename field_changed? to _field_changed? so that users can create a field nam... | Akira Matsuda | 2012-02-14 | 2 | -4/+4 | |
* | | | | | | | Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redo | José Valim | 2012-02-14 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Always reenable _dump task in AR databases rake. Closes #5030 | Carlos Antonio da Silva | 2012-02-14 | 1 | -1/+4 | |
* | | | | | | | | Merge pull request #5039 from funny-falcon/fix_callback | José Valim | 2012-02-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | sync __run_callbacks with ruby-trunk | Sokolov Yura | 2012-02-14 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #5036 from carlosantoniodasilva/form-button | José Valim | 2012-02-14 | 1 | -8/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove not used button translation from av locale | Carlos Antonio da Silva | 2012-02-14 | 1 | -8/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #5032 from carlosantoniodasilva/collection-helpers-object | José Valim | 2012-02-14 | 4 | -9/+36 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Allow collection helpers with block to access current object in the collection | Carlos Antonio da Silva | 2012-02-13 | 4 | -9/+36 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #5035 from lest/patch-1 | José Valim | 2012-02-13 | 8 | -9/+0 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | remove unnecessary require core_ext/string/encoding | Sergey Nartimov | 2012-02-14 | 8 | -9/+0 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #3305 from cjolly/request_filtered_env | Jeremy Kemper | 2012-02-13 | 2 | -1/+34 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Exclude rack.request.form_vars from request.filtered_env | Chad Jolly | 2012-01-18 | 2 | -1/+34 | |
* | | | | | | Merge pull request #5031 from carlosantoniodasilva/sprockets-compressors-refa... | Jeremy Kemper | 2012-02-13 | 3 | -23/+25 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Use Hash#fetch instead of testing for #key? | Carlos Antonio da Silva | 2012-02-13 | 2 | -3/+3 | |
| * | | | | | | Refactor sprockets compressors module | Carlos Antonio da Silva | 2012-02-13 | 1 | -20/+22 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #5026 from castlerock/remove_require_for_string_encoding | Santiago Pastorino | 2012-02-13 | 2 | -2/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | remove unwanted require for string encoding | Vishnu Atrai | 2012-02-13 | 2 | -2/+0 | |
* | | | | | | | Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare | Aaron Patterson | 2012-02-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | fixes rake db:test:prepare when using postgresql with sql db structure file a... | Sean Kirby | 2012-02-01 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #5000 from flavorpill/master-with-multidb-association-fix | Aaron Patterson | 2012-02-13 | 11 | -10/+40 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | fix associations when using per class databases | Lars Kanis | 2012-02-10 | 3 | -8/+5 | |
| * | | | | | | | added test for #3732 | Rick Martinez | 2012-02-10 | 8 | -2/+35 | |
* | | | | | | | | Merge pull request #5012 from waseem/alias-reconnect-mysql2 | Aaron Patterson | 2012-02-13 | 1 | -5/+1 | |
|\ \ \ \ \ \ \ \ |