Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge pull request #15803 from sgrif/sg-column-in-associations | Rafael Mendonça França | 2014-06-19 | 3 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Don't rely on the column for type casting reflections | Sean Griffin | 2014-06-18 | 3 | -5/+5 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #15814 from sgrif/sg-number-changed | Rafael Mendonça França | 2014-06-19 | 1 | -12/+6 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Further simplify `changed?` conditional for numeric types | Sean Griffin | 2014-06-19 | 1 | -12/+6 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #15450 from aditya-kapoor/remove-nbsp-debug | Rafael Mendonça França | 2014-06-19 | 2 | -7/+7 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | remove unnecessary substitution for space in ActionView::Helpers#debug | Aditya Kapoor | 2014-06-14 | 2 | -7/+7 | |
* | | | | | | | | | Merge pull request #15818 from sgrif/sg-attribute-set | Rafael Mendonça França | 2014-06-19 | 8 | -23/+120 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Introduce an object to aid in creation and management of `@attributes` | Sean Griffin | 2014-06-19 | 8 | -23/+120 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #15808 from maurogeorge/guides-custom-errors-page | Eileen M. Uchitelle | 2014-06-19 | 1 | -0/+55 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Create custom errors page on ActionController guides | Mauro George | 2014-06-19 | 1 | -0/+55 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #15820 from lucasmazza/lm-except-highlight-tweaks | Rafael Mendonça França | 2014-06-19 | 3 | -7/+50 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 'TextHelper#highlight' now accepts a block to highlight the matched words. | Lucas Mazza | 2014-06-19 | 3 | -3/+30 | |
| * | | | | | | | | | highlight() now accepts regular expressions as well. | Jan Szumiec | 2014-06-19 | 2 | -5/+15 | |
| * | | | | | | | | | excerpt() now accepts regular expression instances as phrases. | Jan Szumiec | 2014-06-19 | 2 | -3/+9 | |
* | | | | | | | | | | Merge pull request #15772 from nbudin/sti_through_bug | Rafael Mendonça França | 2014-06-19 | 3 | -1/+18 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Don't include inheritance column in the through_scope_attributes | Nat Budin | 2014-06-17 | 3 | -2/+17 | |
* | | | | | | | | | | | Use a better test description | Rafael Mendonça França | 2014-06-19 | 1 | -1/+1 | |
* | | | | | | | | | | | Fix has_and_belongs_to_many in a namespaced model pointing to a non namespace... | Rafael Mendonça França | 2014-06-19 | 4 | -8/+20 | |
| |/ / / / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #15817 from zoombody/patch-1 | Rafael Mendonça França | 2014-06-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | [ci skip] Fix typo in 4.1 upgrade/flash structure | Dan Rice | 2014-06-19 | 1 | -1/+1 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #15813 from DNNX/valid-action-name-refactoring | Rafael Mendonça França | 2014-06-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Relpace `=~ Regexp.new str` with `.include? str` in AC::Base#_valid_action_name? | Viktar Basharymau | 2014-06-19 | 1 | -1/+1 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #15815 from DNNX/mail-helper-refactoring | Rafael Mendonça França | 2014-06-19 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Remove unused block parameter from #gsub call in AM::MailHelper#block_format | Viktar Basharymau | 2014-06-19 | 1 | -2/+2 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #15816 from DNNX/log-subscriber-add-debug-check | Rafael Mendonça França | 2014-06-19 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Add `logger.debug?` guard to `ActionMailer::LogSubscriber#process` | Viktar Basharymau | 2014-06-19 | 1 | -0/+1 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #15812 from crankharder/remove_postgres_adapter_method | Rafael Mendonça França | 2014-06-19 | 1 | -4/+0 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | this method is no longer being used | Josh Sharpe | 2014-06-19 | 1 | -4/+0 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #15795 from amitsuryavanshi/master | Rafael Mendonça França | 2014-06-18 | 3 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Titling the model name in views generated by scaffold. | Amit Suryavanshi | 2014-06-18 | 3 | -3/+3 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #15799 from zuhao/refactor_activesupport_time_zone_test_he... | Yves Senn | 2014-06-18 | 10 | -122/+47 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Extract out with_env_tz helper method. | Zuhao Wan | 2014-06-18 | 10 | -122/+47 | |
* | | | | | | | | | Merge pull request #15709 from zuhao/refactor_actionview_compiled_templates_test | Yves Senn | 2014-06-18 | 1 | -8/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Move cleanup into teardown, delete obsolete code. | Zuhao Wan | 2014-06-14 | 1 | -8/+1 | |
* | | | | | | | | | | Reconnect after possibly enabling hstore | Matthew Draper | 2014-06-18 | 1 | -0/+2 | |
* | | | | | | | | | | Merge pull request #15782 from sgrif/sg-column-defaults | Matthew Draper | 2014-06-18 | 17 | -68/+60 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Don't type cast the default on the column | Sean Griffin | 2014-06-17 | 17 | -68/+60 | |
* | | | | | | | | | | | Merge pull request #15790 from sgrif/sg-mutable-points | Rafael Mendonça França | 2014-06-17 | 3 | -3/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Detect in-place changes on point types | Sean Griffin | 2014-06-17 | 3 | -3/+31 | |
* | | | | | | | | | | | | Deprecate Rails::Rack::LogTailer | Rafael Mendonça França | 2014-06-17 | 2 | -0/+8 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #15789 from sgrif/sg-enable-hstore | Rafael Mendonça França | 2014-06-17 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Enable hstore in array tests | Sean Griffin | 2014-06-17 | 1 | -0/+6 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #15786 from sgrif/sg-in-place-array-mutation | Rafael Mendonça França | 2014-06-17 | 3 | -12/+41 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Detect mutations of arrays and array members | Sean Griffin | 2014-06-17 | 3 | -12/+41 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | initialize the right variable | Rafael Mendonça França | 2014-06-17 | 1 | -1/+1 | |
* | | | | | | | | | | | :scissors: | Rafael Mendonça França | 2014-06-17 | 1 | -8/+8 | |
* | | | | | | | | | | | Add a generic --skip-gems options to generator | Rafael Mendonça França | 2014-06-17 | 3 | -10/+19 | |
* | | | | | | | | | | | Merge pull request #15784 from sgrif/sg-delimiter | Rafael Mendonça França | 2014-06-17 | 4 | -7/+54 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Ensure `OID::Array#type_cast_for_database` matches PG's quoting behavior | Sean Griffin | 2014-06-17 | 4 | -7/+54 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #15778 from sgrif/sg-pg-mutable-arrays | Matthew Draper | 2014-06-18 | 4 | -38/+62 | |
|\ \ \ \ \ \ \ \ \ \ \ |