aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge pull request #15820 from lucasmazza/lm-except-highlight-tweaksRafael Mendonça França2014-06-193-7/+50
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 'TextHelper#highlight' now accepts a block to highlight the matched words.Lucas Mazza2014-06-193-3/+30
| * | | | | | | | | | | highlight() now accepts regular expressions as well.Jan Szumiec2014-06-192-5/+15
| * | | | | | | | | | | excerpt() now accepts regular expression instances as phrases.Jan Szumiec2014-06-192-3/+9
* | | | | | | | | | | | Merge pull request #15772 from nbudin/sti_through_bugRafael Mendonça França2014-06-193-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Don't include inheritance column in the through_scope_attributesNat Budin2014-06-173-2/+17
* | | | | | | | | | | | | Use a better test descriptionRafael Mendonça França2014-06-191-1/+1
* | | | | | | | | | | | | Fix has_and_belongs_to_many in a namespaced model pointing to a non namespace...Rafael Mendonça França2014-06-194-8/+20
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #15817 from zoombody/patch-1Rafael Mendonça França2014-06-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [ci skip] Fix typo in 4.1 upgrade/flash structureDan Rice2014-06-191-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #15813 from DNNX/valid-action-name-refactoringRafael Mendonça França2014-06-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Relpace `=~ Regexp.new str` with `.include? str` in AC::Base#_valid_action_name?Viktar Basharymau2014-06-191-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #15815 from DNNX/mail-helper-refactoringRafael Mendonça França2014-06-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove unused block parameter from #gsub call in AM::MailHelper#block_formatViktar Basharymau2014-06-191-2/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #15816 from DNNX/log-subscriber-add-debug-checkRafael Mendonça França2014-06-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add `logger.debug?` guard to `ActionMailer::LogSubscriber#process`Viktar Basharymau2014-06-191-0/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #15812 from crankharder/remove_postgres_adapter_methodRafael Mendonça França2014-06-191-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | this method is no longer being usedJosh Sharpe2014-06-191-4/+0
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #15795 from amitsuryavanshi/masterRafael Mendonça França2014-06-183-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Titling the model name in views generated by scaffold.Amit Suryavanshi2014-06-183-3/+3
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #15799 from zuhao/refactor_activesupport_time_zone_test_he...Yves Senn2014-06-1810-122/+47
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Extract out with_env_tz helper method.Zuhao Wan2014-06-1810-122/+47
* | | | | | | | | | | Merge pull request #15709 from zuhao/refactor_actionview_compiled_templates_testYves Senn2014-06-181-8/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Move cleanup into teardown, delete obsolete code.Zuhao Wan2014-06-141-8/+1
* | | | | | | | | | | | Reconnect after possibly enabling hstoreMatthew Draper2014-06-181-0/+2
* | | | | | | | | | | | Merge pull request #15782 from sgrif/sg-column-defaultsMatthew Draper2014-06-1817-68/+60
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Don't type cast the default on the columnSean Griffin2014-06-1717-68/+60
* | | | | | | | | | | | | Merge pull request #15790 from sgrif/sg-mutable-pointsRafael Mendonça França2014-06-173-3/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Detect in-place changes on point typesSean Griffin2014-06-173-3/+31
* | | | | | | | | | | | | | Deprecate Rails::Rack::LogTailerRafael Mendonça França2014-06-172-0/+8
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #15789 from sgrif/sg-enable-hstoreRafael Mendonça França2014-06-171-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Enable hstore in array testsSean Griffin2014-06-171-0/+6
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #15786 from sgrif/sg-in-place-array-mutationRafael Mendonça França2014-06-173-12/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Detect mutations of arrays and array membersSean Griffin2014-06-173-12/+41
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | initialize the right variableRafael Mendonça França2014-06-171-1/+1
* | | | | | | | | | | | | :scissors:Rafael Mendonça França2014-06-171-8/+8
* | | | | | | | | | | | | Add a generic --skip-gems options to generatorRafael Mendonça França2014-06-173-10/+19
* | | | | | | | | | | | | Merge pull request #15784 from sgrif/sg-delimiterRafael Mendonça França2014-06-174-7/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Ensure `OID::Array#type_cast_for_database` matches PG's quoting behaviorSean Griffin2014-06-174-7/+54
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #15778 from sgrif/sg-pg-mutable-arraysMatthew Draper2014-06-184-38/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Move array database type casting to the Array typeSean Griffin2014-06-174-38/+62
* | | | | | | | | | | | | | Merge pull request #15716 from schuetzm/skip-turbolinksRafael Mendonça França2014-06-172-2/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add an option to skip installation of TurbolinksMarc Schütz2014-06-142-2/+21
* | | | | | | | | | | | | | | Merge pull request #15727 from aditya-kapoor/add-tests-for-migrationMatthew Draper2014-06-181-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add test cases for Migration#inverse_ofAditya Kapoor2014-06-171-0/+17
* | | | | | | | | | | | | | | Fix documentation from #15669 [ci skip]Zachary Scott2014-06-171-3/+5
* | | | | | | | | | | | | | | [ci skip] fix doc for the Hash#assert_valid_keysAditya Kapoor2014-06-171-3/+3
* | | | | | | | | | | | | | | Merge pull request #15780 from sgrif/sg-dont-always-save-mutable-typesRafael Mendonça França2014-06-173-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Don't assume that Hstore columns have always changedSean Griffin2014-06-173-2/+4
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #15775 from sgrif/sg-use-column-defaults-in-dirtyRafael Mendonça França2014-06-171-11/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |