Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Revert "rm `same_host?`. The same conditional is two lines down." | Aaron Patterson | 2014-06-11 | 1 | -5/+8 | |
* | | | | | rm `same_host?`. The same conditional is two lines down. | Aaron Patterson | 2014-06-11 | 1 | -8/+5 | |
* | | | | | Revert "remove unnecssary require of `to_param`, as `to_query` is already req... | Rafael Mendonça França | 2014-06-11 | 4 | -0/+4 | |
* | | | | | Merge pull request #15650 from kuldeepaggarwal/remove-unecessary-require | Rafael Mendonça França | 2014-06-11 | 3 | -3/+0 | |
|\ \ \ \ \ | ||||||
| * | | | | | remove unnecssary require of `to_param`, as `to_query` is already require `to... | Kuldeep Aggarwal | 2014-06-12 | 3 | -3/+0 | |
* | | | | | | Merge pull request #15648 from kuldeepaggarwal/fix-warnings | Rafael Mendonça França | 2014-06-11 | 2 | -3/+0 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | remove warnings | Kuldeep Aggarwal | 2014-06-12 | 2 | -3/+0 | |
* | | | | | | cache host on the stack so we only look it up once | Aaron Patterson | 2014-06-11 | 1 | -8/+9 | |
* | | | | | | only pull :protocol from the options hash once | Aaron Patterson | 2014-06-11 | 1 | -2/+3 | |
* | | | | | | cache protocol on the stack to reduce options hash lookups | Aaron Patterson | 2014-06-11 | 1 | -7/+7 | |
* | | | | | | eliminate nil checks in normalize_port | Aaron Patterson | 2014-06-11 | 1 | -7/+7 | |
* | | | | | | reduce hash lookups and disconnect normalize_port from the options hash | Aaron Patterson | 2014-06-11 | 1 | -9/+9 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #15646 from aditya-kapoor/correct-conversion-docs | Zachary Scott | 2014-06-11 | 1 | -5/+12 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | [ci skip] correct docs for conversion | Aditya Kapoor | 2014-06-11 | 1 | -5/+12 | |
* | | | | | Merge pull request #15644 from akshay-vishnoi/activesupport | Rafael Mendonça França | 2014-06-11 | 1 | -1/+0 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | No need to require to_param, it is already required in to_query.rb | Akshay Vishnoi | 2014-06-11 | 1 | -1/+0 | |
* | | | | | Merge pull request #15643 from aditya-kapoor/add-test | Rafael Mendonça França | 2014-06-11 | 1 | -0/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | [ci skip] add tests for ActionModel::Conversion | Aditya Kapoor | 2014-06-11 | 1 | -0/+4 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #15642 from akshay-vishnoi/activesupport | Rafael Mendonça França | 2014-06-11 | 1 | -0/+0 | |
|\| | | | | ||||||
| * | | | | Move test for blank.rb under object | Akshay Vishnoi | 2014-06-11 | 1 | -0/+0 | |
|/ / / / | ||||||
* | | | | Merge pull request #15582 from sgrif/sg-timestamps | Rafael Mendonça França | 2014-06-11 | 1 | -3/+5 | |
|\ \ \ \ | ||||||
| * | | | | Refactor determination of max updated timestamp | Sean Griffin | 2014-06-09 | 1 | -3/+5 | |
* | | | | | Merge pull request #15630 from eileencodes/refactor-join-keys-on-add_constraints | Matthew Draper | 2014-06-12 | 2 | -12/+20 | |
|\ \ \ \ \ | ||||||
| * | | | | | begin refactoring add_constraints by moving join keys | eileencodes | 2014-06-10 | 2 | -12/+20 | |
* | | | | | | Merge pull request #15429 from sgrif/sg-rm-cached-attributes | Rafael Mendonça França | 2014-06-11 | 3 | -73/+24 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | rm cached attributes | Sean Griffin | 2014-06-11 | 3 | -73/+24 | |
* | | | | | | | Merge pull request #15641 from arthurnn/small_doc_add | Rafael Mendonça França | 2014-06-11 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add has_one? docs [skip ci] | Arthur Neves | 2014-06-11 | 1 | -0/+1 | |
* | | | | | | | | Merge pull request #15628 from akshay-vishnoi/test-cases | Yves Senn | 2014-06-11 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Add test cases for #in? and #presence_in | Akshay Vishnoi | 2014-06-11 | 1 | -0/+4 | |
* | | | | | | | | Merge pull request #15637 from akshay-vishnoi/delete-deprecated-method | Santiago Pastorino | 2014-06-11 | 1 | -4/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove deprecation warning | Akshay Vishnoi | 2014-06-11 | 1 | -4/+0 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #15638 from sgrif/sg-column-types | Rafael Mendonça França | 2014-06-11 | 1 | -6/+10 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Ensure `column_types` returns a type object, and not a column | Sean Griffin | 2014-06-11 | 1 | -6/+10 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #15639 from sgrif/sg-column-serialization | Rafael Mendonça França | 2014-06-11 | 1 | -6/+2 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Remove YAML serialization workaround for columns | Sean Griffin | 2014-06-11 | 1 | -6/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | cleanup, get rid of trailing whitespace. [ci skip] | Yves Senn | 2014-06-11 | 1 | -2/+2 | |
* | | | | | | | Merge pull request #15636 from hundredwatt/patch-1 | Yves Senn | 2014-06-11 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix Apache Directives [ci skip] | Jason Nochlin | 2014-06-11 | 1 | -2/+4 | |
|/ / / / / / / | ||||||
* | | | | | | | fix typo in changelog [ci skip] | Vijay Dev | 2014-06-11 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #15635 from kuldeepaggarwal/add-missing-changelog | Yves Senn | 2014-06-11 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | add missing changelog entry. refer [#16db90d] [ci skip] | Kuldeep Aggarwal | 2014-06-11 | 1 | -0/+4 | |
|/ / / / / / | ||||||
* | | | | / | remove deprecated code. Rely on `describe` provided by minitest | Aaron Patterson | 2014-06-10 | 1 | -24/+0 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | Merge pull request #15621 from sgrif/sg-column-type-decorations | Rafael Mendonça França | 2014-06-10 | 2 | -2/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | No need to decorate columns twice | Sean Griffin | 2014-06-10 | 2 | -2/+1 | |
* | | | | | | Merge pull request #15619 from aditya-kapoor/fix-js-doc | Rafael Mendonça França | 2014-06-10 | 1 | -1/+7 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | [ci skip] Fix doc for javascript_helper | Aditya Kapoor | 2014-06-11 | 1 | -1/+7 | |
* | | | | | | | Merge pull request #15620 from aditya-kapoor/correct-bundler-link | Zachary Scott | 2014-06-10 | 1 | -4/+3 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Correct Bundler link [ci skip] | Aditya Kapoor | 2014-06-11 | 1 | -4/+3 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #15618 from JuanitoFatas/doc/action-mailer-guide | Rafael Mendonça França | 2014-06-10 | 1 | -10/+19 | |
|\ \ \ \ \ \ |