Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add missing require to fix test :bomb: | Carlos Antonio da Silva | 2014-05-02 | 1 | -0/+1 |
| | |||||
* | Add branch to arel on Gemfile to allow local bundle config [ci skip] | Carlos Antonio da Silva | 2014-05-02 | 1 | -1/+1 |
| | |||||
* | Move dup destroyed test to specific file that tests dup logic | Carlos Antonio da Silva | 2014-05-02 | 2 | -9/+10 |
| | | | | | Also change other related test to use existing record rather than creating new one. | ||||
* | passing a nil in the polymorphic array is not supported. remove nils before ↵ | Aaron Patterson | 2014-05-02 | 2 | -4/+8 |
| | | | | you call the method | ||||
* | push up bind params on "simple" subquery calculations | Aaron Patterson | 2014-05-02 | 2 | -3/+11 |
| | | | | | bind parameters we not being propogated to simple subquery calculation calls. This fixes it | ||||
* | passing a nil should always raise an ArgumentError | Aaron Patterson | 2014-05-02 | 2 | -1/+25 |
| | |||||
* | eliminate repetition in guide links for past releases [ci skip] | Vijay Dev | 2014-05-02 | 1 | -10/+1 |
| | |||||
* | Merge pull request #14943 from ↵ | Rafael Mendonça França | 2014-05-02 | 3 | -6/+28 |
|\ | | | | | | | | | arunagw/hbakhtiyor-i18n-validation-message-singular-and-plural Add singular and plural form for some validation messages | ||||
| * | Add singular and plural form for some validation messages | Abd ar-Rahman Hamidi | 2014-05-02 | 3 | -6/+28 |
| | | |||||
* | | Merge pull request #14942 from JuanitoFatas/patch/cc-by-sa-4-0 | Rafael Mendonça França | 2014-05-02 | 1 | -1/+1 |
|\ \ | | | | | | | [ci skip] Update guides license to CC BY-SA 4.0 International. | ||||
| * | | [ci skip] Update guides license to CC BY-SA 4.0 International. | Juanito Fatas | 2014-05-02 | 1 | -1/+1 |
| | | | | | | | | | | | | Benefits: https://creativecommons.org/version4 | ||||
* | | | Merge pull request #14941 from ↵ | Rafael Mendonça França | 2014-05-02 | 5 | -3/+65 |
|\ \ \ | | | | | | | | | | | | | | | | | arunagw/hbakhtiyor-new-plugin-command-advanced-config Plugin gemspec | ||||
| * | | | skip-git should not hit git commands plugin generators | Arun Agrawal | 2014-05-02 | 3 | -14/+38 |
| | | | | |||||
| * | | | Works correctly if git not installed | Roman Shmatov | 2014-05-02 | 2 | -8/+30 |
| | | | | |||||
| * | | | Automaticly add username and email if configured in git-scm, as bundle gem | Abd ar-Rahman Hamidi | 2014-05-02 | 3 | -3/+19 |
| | |/ | |/| | |||||
* / | | Tiny follow up to #14915 [ci skip] | Robin Dupret | 2014-05-02 | 1 | -19/+18 |
|/ / | |||||
* / | Added link for 4.1 guides on edge guide [ci skip] | Arun Agrawal | 2014-05-02 | 1 | -0/+3 |
|/ | |||||
* | Follow up to 38ad5438 [ci skip] | Robin Dupret | 2014-05-02 | 1 | -27/+36 |
| | | | | | | | | | | | | | | This commit adds new lines between titles, paragraphs and code blocks for an easier reading. Moreover, in order to be consistent with the other guides, let's remove the sharps on the right side of the different titles. The "Running a Single Test" part was also explained after the "Testing Active Record" one which shows how to run a single test under the scope of a specific adapter. Finally, let's explain the `-n` option to run a specific test method. | ||||
* | Enhance a bit a few changelog entries [ci skip] | Robin Dupret | 2014-05-02 | 3 | -9/+10 |
| | |||||
* | Merge pull request #14939 from jonatack/patch-8 | Damien Mathieu | 2014-05-02 | 1 | -1/+1 |
|\ | | | | | Form_tag_helper grammar fix [skip ci] | ||||
| * | Form_tag_helper grammar fix [skip ci] | Jon Atack | 2014-05-02 | 1 | -1/+1 |
|/ | |||||
* | only add the optiosn if they are not empty | Aaron Patterson | 2014-05-01 | 1 | -1/+3 |
| | | | | | | I think this is wrong, but it gets the build passing for now. We should always add options, but we need to make more guarantees about how the underlying url helper is called | ||||
* | always pass options to the _url method | Aaron Patterson | 2014-05-01 | 2 | -6/+14 |
| | |||||
* | never merge url options in to the first data hash | Aaron Patterson | 2014-05-01 | 1 | -1/+1 |
| | | | | | if you want options, don't mix them with the first hash, just pass them all in with the second hash | ||||
* | Merge pull request #14896 from jetthoughts/14895_overide_strict_by_sql_mode | Rafael Mendonça França | 2014-05-01 | 4 | -5/+30 |
|\ | | | | | | | | | | | | | Symbolize variables of mysql/mysql2 connection configuration Conflicts: activerecord/CHANGELOG.md | ||||
| * | Stringify variables names for mysql connections | Paul Nikitochkin | 2014-04-30 | 4 | -5/+30 |
| | | | | | | | | | | | | | | For mysql2/mysql adapters, `sql_mode` variable name set in `database.yml` as string, was ignored and `sql_mode` was set to use strict mode. Fixes #14895 | ||||
* | | Merge pull request #14932 from phoet/use_file_join | Rafael Mendonça França | 2014-05-01 | 3 | -2/+20 |
|\ \ | | | | | | | always use File.join in asset_path | ||||
| * | | always use File.join | phoet | 2014-05-01 | 3 | -2/+20 |
| | | | |||||
* | | | Merge pull request #14931 from heironimus/security_guide_clarity | Jeremy Kemper | 2014-05-01 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | [ci skip] Security guide clarity. | ||||
| * | | [ci skip] Security guide clarity. | Kyle Heironimus | 2014-05-01 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #14915 from juanpastas/patch-1 | Rafael Mendonça França | 2014-05-01 | 1 | -20/+37 |
|\ \ | | | | | | | Update mapper.rb | ||||
| * | | [skip ci] Document: required `via` option in `match` routing method. | Juan David Pastas | 2014-04-30 | 1 | -20/+37 |
| | | | |||||
* | | | Merge pull request #12651 from cespare/ipv6-remote-ip-fixes | Rafael Mendonça França | 2014-05-01 | 3 | -2/+13 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Make remote_ip detection properly handle private IPv6 addresses Conflicts: actionpack/CHANGELOG.md | ||||
| * | | | Make remote_ip detection properly handle private IPv6 addresses | Caleb Spare | 2013-10-26 | 3 | -2/+13 |
| | | | | | | | | | | | | | | | | Fixes #12638. | ||||
* | | | | Remove unused variable | Rafael Mendonça França | 2014-05-01 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #13640 from maginatics/fix_sqlite3_ensure_master | Rafael Mendonça França | 2014-05-01 | 3 | -3/+27 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SQLite3: Always close statements. Conflicts: activerecord/CHANGELOG.md | ||||
| * | | | | SQLite3: Always close statements. | Timur Alperovich | 2014-01-15 | 3 | -3/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SQLite3 adapter must make sure to close statements after queries. Fixes: #13631 | ||||
* | | | | | Merge pull request #14928 from potomak/update-scaffold-form-template | Rafael Mendonça França | 2014-05-01 | 1 | -5/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Avoid unnecessary conditional block | ||||
| * | | | | | Avoid unnecessary conditional block | Giovanni Cappellotto | 2014-05-01 | 1 | -5/+0 |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | GeneratedAttribute#column_name checks already for reference? on the attribute returning the right name to use as symbol for label and field. | ||||
* | | | | | Merge pull request #14922 from ↵ | Rafael Mendonça França | 2014-05-01 | 1 | -1/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | rizwanreza/add-selected-documentation-to-select-tag Add documentation to select_tag for :selected option | ||||
| * | | | | | Add documentation to select_tag for :selected option | Rizwan Reza | 2014-04-30 | 1 | -1/+5 |
| | | | | | | |||||
* | | | | | | Merge pull request #14916 from ↵ | Matthew Draper | 2014-05-01 | 2 | -7/+12 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | moktin/real_privacy_for_functions_in_predicate_builder Give real privacy to class methods in AR::PredicateBuilder | ||||
| * | | | | | Give real privacy to class methods in AR::PredicateBuilder | Hector Satre | 2014-05-01 | 2 | -7/+12 |
|/ / / / / | |||||
* | | | | | avoid calling extract_record multiple times | Aaron Patterson | 2014-04-30 | 1 | -3/+2 |
| | | | | | |||||
* | | | | | eliminate conditional when sending the named route method | Aaron Patterson | 2014-04-30 | 1 | -2/+4 |
| | | | | | |||||
* | | | | | do not allocate strings while creating urls | Aaron Patterson | 2014-04-30 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | don't allocate string on hash access | Aaron Patterson | 2014-04-30 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | split nil / Hash cases in url_for | Aaron Patterson | 2014-04-30 | 1 | -4/+4 |
|/ / / | | | | | | | | | | | | | | | | | | | this reduces the number of comparisons and method calls `url_for` requires. The nil case no longer calls `symbolize_keys`, we already know options is nil, so no more ||=, and since it is nil we already know that options[:host] will be nil too. | ||||
* | | | Merge pull request #14909 from jonatack/patch-7 | Arthur Nogueira Neves | 2014-04-29 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | the use of ... in place >> using ... instead | ||||
| * | | | the use of ... in place >> using ... instead | Jon Atack | 2014-04-30 | 1 | -2/+2 |
|/ / / | | | | | | | [ci skip] |