aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14795 from braddunbar/uglifierRafael Mendonça França2014-04-181-1/+1
|\
| * :uglify -> :uglifierBrad Dunbar2014-04-181-1/+1
|/
* Merge pull request #14790 from krisselden/optimize-postgres-selectsRafael Mendonça França2014-04-182-19/+41
|\
| * Optimize select_value, select_values, select_rows and dry up checking whether...Kris Selden2014-04-172-19/+41
* | Merge pull request #14793 from arthurnn/fixes_8928Rafael Mendonça França2014-04-183-2/+16
|\ \
| * | Regression test for irregular inflection on has_manyArthur Neves2014-04-182-0/+14
| * | Singularize association names before camelizationJavier Goizueta2014-04-181-2/+2
* | | Merge pull request #14786 from PaulL1/patch-1Rafael Mendonça França2014-04-171-7/+6
|\ \ \ | |_|/ |/| |
| * | Include default rails protect_from_forgery with: :exceptionPaulL12014-04-171-4/+4
| * | CSRF protection should rescue exception not extendPaulL12014-04-171-3/+2
| |/
* | Remove wrapper div for inputs in button_toRafael Mendonça França2014-04-173-22/+22
* | Update Request forgery tests to remove input wrappign divRafael Mendonça França2014-04-171-5/+5
* | Merge pull request #14738 from tilsammans/pull/11407Rafael Mendonça França2014-04-175-15/+30
|\ \
| * | Remove wrapping div with inline styles for hidden form fields.Joost Baaij2014-04-145-15/+30
* | | Add CHANGELOG entry for #14755 [ci skip]Rafael Mendonça França2014-04-171-0/+5
* | | Change the method descriptionRafael Mendonça França2014-04-171-1/+1
* | | Implement to_io as an aliasRafael Mendonça França2014-04-171-5/+1
* | | Merge pull request #14755 from timlinquist/to_io_http_uploadRafael Mendonça França2014-04-172-0/+11
|\ \ \
| * | | Provide interface for accessing underlying IO objectTim Linquist2014-04-152-0/+11
* | | | Merge pull request #14788 from arthurnn/conn_adpt_apiRafael Mendonça França2014-04-172-3/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Bring SQLite3Adpter init API closer to othersArthur Neves2014-04-172-3/+2
|/ / /
* | | Merge pull request #14783 from hakanensari/autoload-strict-validation-failedRafael Mendonça França2014-04-161-0/+1
|\ \ \
| * | | Autoload ActiveModel::StrictValidationFailedhakanensari2014-04-161-0/+1
|/ / /
* | | Merge pull request #14781 from zenati/masterRafael Mendonça França2014-04-161-0/+26
|\ \ \
| * | | [ci skip] Added examples for url_field_tag methodZENATI YASSINE2014-04-161-0/+13
| * | | [ci skip] Added examples for telephone_field_tag methodZENATI YASSINE2014-04-161-0/+13
* | | | Merge pull request #14780 from zenati/masterRafael Mendonça França2014-04-161-0/+13
|\| | |
| * | | [ci skip] Added examples for search_field_tag methodZENATI YASSINE2014-04-161-0/+13
|/ / /
* | | Merge pull request #14779 from zenati/masterRafael Mendonça França2014-04-161-0/+13
|\ \ \
| * | | [ci skip] Added examples for color_field_tag methodZENATI YASSINE2014-04-161-0/+13
* | | | Merge pull request #14771 from heironimus/i18n_guide_reorderArthur Nogueira Neves2014-04-161-54/+54
|\ \ \ \ | |/ / / |/| | |
| * | | [skip ci] Reorder i18n guideKyle Heironimus2014-04-161-54/+54
|/ / /
* | | Merge pull request #14773 from eric-chahin/null_relation_fixYves Senn2014-04-163-2/+19
|\ \ \
| * | | Changed the NullRelation so that when count is called with #group it will pro...Eric Chahin2014-04-163-2/+19
* | | | `sanitize_sql_like` escapes `escape_character` not only backslash.Yves Senn2014-04-162-5/+7
* | | | Merge pull request #11836 from mcfiredrill/engines-testing-docArthur Nogueira Neves2014-04-161-0/+10
|\ \ \ \ | |/ / / |/| | |
| * | | additional note about routes in functional tests for engines [ci skip]Tony Miller2013-08-101-0/+10
* | | | SQL Like escaping helper method. [Rob Gilson & Yves Senn]Rob Gilson2014-04-163-0/+48
* | | | Merge pull request #14770 from crazymykl/avoid_dos_vuln_in_i18n_guideRafael Mendonça França2014-04-151-2/+2
|\ \ \ \
| * | | | [ci skip] Avoid suggesting dangerous code in i18n guideMike MacDonald2014-04-151-2/+2
|/ / / /
* | | | Merge pull request #14733 from akshay-vishnoi/test-casesRafael Mendonça França2014-04-152-16/+12
|\ \ \ \
| * | | | Object#duplicable?Akshay Vishnoi2014-04-162-16/+12
* | | | | Merge pull request #14768 from spectator/ac_metal_docfixRafael Mendonça França2014-04-151-1/+2
|\ \ \ \ \
| * | | | | Update AC::Metal documentation example [ci skip]Yury Velikanau2014-04-151-1/+2
|/ / / / /
* | | | | Add CHANGELOG entry for #14766 [ci skip]Rafael Mendonça França2014-04-151-0/+6
* | | | | Merge pull request #14765 from byroot/refactor-counter-cache-create-and-destroyRafael Mendonça França2014-04-153-34/+44
|\ \ \ \ \
| * | | | | Hide BelongsToAssociation#increment_counters and #decrement_countersJean Boussier2014-04-152-3/+2
| * | | | | Restore the destroy_by_association check in post destroy counter cacheJean Boussier2014-04-151-2/+9
| * | | | | Set _after_create_counter_called flag to make update counter cache workJean Boussier2014-04-151-1/+6
| * | | | | Use inheritance chain instead of callbacks to increment counter caches after ...Jean Boussier2014-04-142-20/+4