aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Use inheritance chain instead of callbacks to increment counter caches after ...Jean Boussier2014-04-143-16/+31
* | | | Merge pull request #14766 from eric-chahin/migration_bugRafael Mendonça França2014-04-153-2/+30
|\ \ \ \
| * | | | Changed change_column in PG schema_statements.rb to make sure that the uuid_g...Eric Chahin2014-04-153-2/+30
|/ / / /
* | | | Merge pull request #14745 from razum2um/plain-text-diagnosticsRafael Mendonça França2014-04-153-1/+11
|\ \ \ \
| * | | | Display diagnostics in text format for xhr requestVlad Bokov2014-04-143-1/+11
* | | | | Merge pull request #14762 from dwo/masterArthur Nogueira Neves2014-04-151-1/+1
|\ \ \ \ \
| * | | | | use YAML.load_file in database tasks exampleRobin Tweedie2014-04-151-1/+1
* | | | | | Merge pull request #14756 from laurocaetano/fix-count-on-association-relationRafael Mendonça França2014-04-153-9/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Make sure the column_name is different from 'all'.Lauro Caetano2014-04-141-1/+1
| * | | | | The Association Relation should use `empty?` and `size` from Relation.Lauro Caetano2014-04-142-8/+11
* | | | | | Merge pull request #14758 from JuanitoFatas/migrations-mdYves Senn2014-04-151-0/+1
|\ \ \ \ \ \
| * | | | | | [ci skip] Add missing end in one of the examples in Migrations.md.Juanito Fatas2014-04-151-0/+1
|/ / / / / /
* | | | | | Merge pull request #14728 from stomar/assertion-msgYves Senn2014-04-152-14/+16
|\ \ \ \ \ \
| * | | | | | Refine tests for assert_select failure messagesMarcus Stollsteimer2014-04-141-11/+13
| * | | | | | Remove surplus period from assertion messagesMarcus Stollsteimer2014-04-131-3/+3
* | | | | | | Merge pull request #14642 from tgxworld/fix_notifications_not_unsubscribingYves Senn2014-04-152-6/+9
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix subscriptions not being unsubscribed.Guo Xiang Tan2014-04-142-6/+9
* | | | | | | Make console and generators blocks works at Application instance levelRafael Mendonça França2014-04-144-0/+114
* | | | | | | :scissors:Rafael Mendonça França2014-04-141-4/+4