Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #15113 from leafac/document-schema-conflicts | Rafael Mendonça França | 2014-05-16 | 1 | -0/+5 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Document conflicts in `db/schema.rb` [ci skip] | Leandro Facchinetti | 2014-05-16 | 1 | -0/+5 | |
* | | | | | | | Merge pull request #15133 from ShunsukeAida/master | Rafael Mendonça França | 2014-05-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | fixed a typo [ci skip] | Aida | 2014-05-17 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | / / / | formatting pass through CHANGELOGS. [ci skip] | Yves Senn | 2014-05-16 | 4 | -8/+10 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Merge pull request #15118 from khelben/head_with_status_action_stack_level_to... | Rafael Mendonça França | 2014-05-15 | 6 | -2/+47 | |
|\ \ \ \ \ | ||||||
| * | | | | | fixes stack level too deep exception on action named 'status' returning 'head... | Christiaan Van den Poel | 2014-05-15 | 6 | -2/+47 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #15121 from skarpesh/rfc4791-methods | Rafael Mendonça França | 2014-05-15 | 3 | -3/+10 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add RFC4791 MKCALENDAR method | kasper | 2014-05-15 | 3 | -3/+10 | |
* | | | | | | Merge pull request #14791 from asn62/mysql_double_bug | Matthew Draper | 2014-05-16 | 3 | -0/+47 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Changed extract_limit in class Column to return correct mysql float and doubl... | Aaron Nelson | 2014-05-16 | 3 | -0/+47 | |
|/ / / / / / | ||||||
* / / / / / | Revert "Remove ruby-head from allow_failures matrix" | Santiago Pastorino | 2014-05-15 | 1 | -0/+1 | |
|/ / / / / | ||||||
* | | | | | Remove ruby-head from allow_failures matrix | Santiago Pastorino | 2014-05-15 | 1 | -1/+0 | |
* | | | | | Merge pull request #15116 from tgxworld/remove_unused_method_in_test | Santiago Pastorino | 2014-05-15 | 1 | -4/+0 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove unused method in RouteSet test. | Guo Xiang Tan | 2014-05-15 | 1 | -4/+0 | |
* | | | | | | flexible ruby-oci8 version specification. [Gaurav Sharma] | Yves Senn | 2014-05-15 | 1 | -1/+1 | |
* | | | | | | update ruby-oci8 version specification. Closes #15109. [ci skip] | Yves Senn | 2014-05-15 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Only path requirements are relevant to optimized urls | Andrew White | 2014-05-15 | 1 | -1/+1 | |
* | | | | | Add missing requires for require 'action_dispatch/routing' | Andrew White | 2014-05-15 | 2 | -0/+3 | |
* | | | | | :scissors: | Rafael Mendonça França | 2014-05-14 | 3 | -4/+0 | |
* | | | | | Methods of these modules are internal | Rafael Mendonça França | 2014-05-14 | 2 | -14/+14 | |
* | | | | | Merge pull request #15088 from kares/shareable-modules | Rafael Mendonça França | 2014-05-14 | 11 | -68/+67 | |
|\ \ \ \ \ | ||||||
| * | | | | | PostgreSQLAdapter::Utils seems to be only used from a single spot - quite red... | kares | 2014-05-14 | 4 | -40/+34 | |
| * | | | | | move PostgreSQL's DatabaseStatements out of the PostgreSQLAdapter name-space | kares | 2014-05-14 | 2 | -7/+7 | |
| * | | | | | PostgreSQL's SchemaStatements seems a could candidate for re-use (with AR-JDBC) | kares | 2014-05-14 | 2 | -8/+7 | |
| * | | | | | introduce AR::ConnectionAdapters::PostgreSQL for sharing modules (with AR-JDBC) | kares | 2014-05-14 | 7 | -15/+21 | |
* | | | | | | Don't use Active Support where it is not needed. | Rafael Mendonça França | 2014-05-14 | 1 | -1/+3 | |
* | | | | | | Merge pull request #14871 from kassio/kb-fixes-namespaced-habtm | Rafael Mendonça França | 2014-05-14 | 7 | -1/+43 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix how to compute class name on habtm namespaced. | Kassio Borges | 2014-05-13 | 7 | -1/+42 | |
* | | | | | | | Merge pull request #15078 from nbudin/fix_merger_filter_binds_comparison_master | Rafael Mendonça França | 2014-05-14 | 5 | -1/+32 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Make filter_binds filter out symbols that are equal to strings | Nat Budin | 2014-05-14 | 5 | -1/+32 | |
* | | | | | | | | Merge pull request #14137 from dasch/better-fragment-cache-instrumentation | Rafael Mendonça França | 2014-05-14 | 3 | -1/+31 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | Add controller and action name to the instrumentation payload | Daniel Schierbeck | 2014-05-10 | 3 | -1/+31 | |
* | | | | | | | | Merge pull request #15070 from ayamomiji/sse-patch | Aaron Patterson | 2014-05-14 | 2 | -1/+18 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add multiple lines message support for SSE module | ayaya | 2014-05-12 | 2 | -1/+18 | |
* | | | | | | | | | rake, remove frontbase related tasks from Active Record Rakefile. | Yves Senn | 2014-05-14 | 1 | -46/+0 | |
* | | | | | | | | | Merge pull request #15110 from kuldeepaggarwal/fix-warning | Rafael Mendonça França | 2014-05-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | remove warning `ambiguous first argument; put parentheses or even spaces` | Kuldeep Aggarwal | 2014-05-15 | 1 | -1/+1 | |
* | | | | | | | | | | Merge pull request #15074 from kuldeepaggarwal/docs-changes | Rafael Mendonça França | 2014-05-14 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | [ci skip]add updated information, ref[#522c0fd] | Kuldeep Aggarwal | 2014-05-14 | 1 | -0/+2 | |
* | | | | | | | | | | Merge pull request #15108 from arthurnn/i18n_master | Rafael Mendonça França | 2014-05-14 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Use i18n master to run tests | Arthur Neves | 2014-05-13 | 1 | -0/+1 | |
* | | | | | | | | | | | Merge pull request #15096 from robin850/patch-20 | Rafael Mendonça França | 2014-05-14 | 3 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Update Redcarpet to 3.1.2 | Robin Dupret | 2014-05-14 | 3 | -4/+4 | |
* | | | | | | | | | | | We need an explicit return | Rafael Mendonça França | 2014-05-14 | 1 | -4/+4 | |
* | | | | | | | | | | | Following documentation guideline | Rafael Mendonça França | 2014-05-14 | 1 | -4/+3 | |
* | | | | | | | | | | | Refactoring the code to make consitional return explicit | Rafael Mendonça França | 2014-05-14 | 1 | -4/+9 | |
* | | | | | | | | | | | Follow the documentation guideline | Rafael Mendonça França | 2014-05-14 | 1 | -1/+1 | |
* | | | | | | | | | | | Mark _prefix as nodoc | Rafael Mendonça França | 2014-05-14 | 1 | -3/+2 | |
* | | | | | | | | | | | ._prefix is private API so we should not recommend to override it | Rafael Mendonça França | 2014-05-14 | 1 | -2/+2 |