Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge pull request #15764 from arthurnn/dependencies_name_error | Matthew Draper | 2014-06-21 | 3 | -5/+11 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | ||||||
| * | | | | | | | | | Add regression test for NameError#name | Arthur Neves | 2014-06-20 | 2 | -2/+5 | |
| * | | | | | | | | | Make dependencies.rb add a name to NameError | Arthur Neves | 2014-06-20 | 2 | -4/+7 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | docs, configurations method is listed in the docs. [ci skip] | Yves Senn | 2014-06-20 | 1 | -1/+0 | |
* | | | | | | | | | Merge pull request #15809 from maurogeorge/guides-console-app | Yves Senn | 2014-06-20 | 1 | -0/+25 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
| * | | | | | | | | Add to guides app and helper objects on command line | Mauro George | 2014-06-19 | 1 | -0/+25 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #15537 from tgxworld/fix_state_leak | Matthew Draper | 2014-06-20 | 4 | -5/+5 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | ||||||
| * | | | | | | | Remove redundant code. | Guo Xiang Tan | 2014-06-05 | 1 | -4/+0 | |
| * | | | | | | | Prevent state leak. | Guo Xiang Tan | 2014-06-05 | 4 | -1/+5 | |
* | | | | | | | | Merge pull request #15824 from bhicks/remove-extra-list-item-element | Sean Griffin | 2014-06-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| * | | | | | | | Remove extra list item element | Ben Hicks | 2014-06-19 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | add both branches to the only_path conditional | Aaron Patterson | 2014-06-19 | 1 | -6/+6 | |
* | | | | | | | Merge pull request #15728 from sgrif/sg-double-save-hm-t | Rafael Mendonça França | 2014-06-19 | 3 | -4/+30 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Don't save through records twice | Sean Griffin | 2014-06-17 | 3 | -3/+29 | |
* | | | | | | | | Merge pull request #15823 from yuki24/better-docmentation-for-dynamic-error-p... | Rafael Mendonça França | 2014-06-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | ErrorsController shouldn't inherit ApplicationController, but ActionControlle... | Yuki Nishijima | 2014-06-19 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #15747 from sgrif/sg-trolololol-this-is-so-broken | Rafael Mendonça França | 2014-06-19 | 3 | -1/+56 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Always update counter caches in memory when adding records | Sean Griffin | 2014-06-16 | 3 | -1/+56 | |
* | | | | | | | | | | Merge pull request #15800 from sgrif/sg-column-in-calculation | Rafael Mendonça França | 2014-06-19 | 2 | -17/+8 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Don't use `Column` for type casting in Relation calculations | Sean Griffin | 2014-06-18 | 2 | -17/+8 | |
* | | | | | | | | | | | Merge pull request #15801 from sgrif/sg-column-defaults | Rafael Mendonça França | 2014-06-19 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Don't use column object when calculating type cast defaults | Sean Griffin | 2014-06-18 | 1 | -2/+2 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #15802 from sgrif/sg-column-quoting | Rafael Mendonça França | 2014-06-19 | 3 | -31/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Don't use column object for type casting in `quoting` | Sean Griffin | 2014-06-18 | 3 | -31/+6 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | 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 | |
| |/ / / / / / / / / / / |