aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add both branches to the only_path conditionalAaron Patterson2014-06-191-6/+6
* Merge pull request #15728 from sgrif/sg-double-save-hm-tRafael Mendonça França2014-06-193-4/+30
|\
| * Don't save through records twiceSean Griffin2014-06-173-3/+29
* | Merge pull request #15823 from yuki24/better-docmentation-for-dynamic-error-p...Rafael Mendonça França2014-06-191-1/+1
|\ \
| * | ErrorsController shouldn't inherit ApplicationController, but ActionControlle...Yuki Nishijima2014-06-191-1/+1
* | | Merge pull request #15747 from sgrif/sg-trolololol-this-is-so-brokenRafael Mendonça França2014-06-193-1/+56
|\ \ \
| * | | Always update counter caches in memory when adding recordsSean Griffin2014-06-163-1/+56
* | | | Merge pull request #15800 from sgrif/sg-column-in-calculationRafael Mendonça França2014-06-192-17/+8
|\ \ \ \
| * | | | Don't use `Column` for type casting in Relation calculationsSean Griffin2014-06-182-17/+8
* | | | | Merge pull request #15801 from sgrif/sg-column-defaultsRafael Mendonça França2014-06-191-2/+2
|\ \ \ \ \
| * | | | | Don't use column object when calculating type cast defaultsSean Griffin2014-06-181-2/+2
| |/ / / /
* | | | | Merge pull request #15802 from sgrif/sg-column-quotingRafael Mendonça França2014-06-193-31/+6
|\ \ \ \ \
| * | | | | Don't use column object for type casting in `quoting`Sean Griffin2014-06-183-31/+6
| |/ / / /
* | | | | Merge pull request #15803 from sgrif/sg-column-in-associationsRafael Mendonça França2014-06-193-5/+5
|\ \ \ \ \
| * | | | | Don't rely on the column for type casting reflectionsSean Griffin2014-06-183-5/+5
| |/ / / /
* | | | | Merge pull request #15814 from sgrif/sg-number-changedRafael Mendonça França2014-06-191-12/+6
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Further simplify `changed?` conditional for numeric typesSean Griffin2014-06-191-12/+6
| |/ / /
* | | | Merge pull request #15450 from aditya-kapoor/remove-nbsp-debugRafael Mendonça França2014-06-192-7/+7
|\ \ \ \
| * | | | remove unnecessary substitution for space in ActionView::Helpers#debugAditya Kapoor2014-06-142-7/+7
* | | | | Merge pull request #15818 from sgrif/sg-attribute-setRafael Mendonça França2014-06-198-23/+120
|\ \ \ \ \
| * | | | | Introduce an object to aid in creation and management of `@attributes`Sean Griffin2014-06-198-23/+120
| | |/ / / | |/| | |
* | | | | Merge pull request #15808 from maurogeorge/guides-custom-errors-pageEileen M. Uchitelle2014-06-191-0/+55
|\ \ \ \ \
| * | | | | Create custom errors page on ActionController guidesMauro George2014-06-191-0/+55
* | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-17 03:43:53 +0000