Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | 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 | |
* | | | | | | | | | Improve CHANGELOG entry | Rafael Mendonça França | 2014-05-14 | 1 | -2/+4 | |
* | | | | | | | | | Merge remote-tracking branch 'apotonick/simplify-prefixes' | Rafael Mendonça França | 2014-05-14 | 3 | -15/+75 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | deprecate AbC:Base::parent_prefixes. | Nick Sutterer | 2014-05-13 | 3 | -4/+69 | |
| * | | | | | | | | | simplify AC:ViewPaths::_prefixes. by making it recursively traversing up the ... | Nick Sutterer | 2014-05-13 | 1 | -15/+10 | |
* | | | | | | | | | | Merge pull request #14833 from jyao6/attribute_inheritance | Matthew Draper | 2014-05-14 | 3 | -5/+37 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix inheritance of stored_attributes (fixes #14672) | Jessica Yao | 2014-05-14 | 3 | -5/+37 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #15102 from azul/patch-1 | Yves Senn | 2014-05-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | ||||||
| * | | | | | | | | | minor: point to the right test suite location | azul | 2014-05-14 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #15099 from eileencodes/refactor_delete_records_method | Aaron Patterson | 2014-05-13 | 3 | -16/+20 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | remove count var | eileencodes | 2014-05-13 | 1 | -4/+2 | |
| * | | | | | | | | | rename delete_all_records to delete_or_nullify_all_records | eileencodes | 2014-05-13 | 3 | -8/+4 | |
| * | | | | | | | | | remove need for :all symbol | eileencodes | 2014-05-13 | 1 | -13/+6 | |
| * | | | | | | | | | begin refactoring delete_records method | eileencodes | 2014-05-13 | 3 | -13/+30 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #15100 from eileencodes/remove-deprecation-warning-no-long... | Godfrey Chan | 2014-05-13 | 2 | -6/+4 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | remove deprecation warning | eileencodes | 2014-05-13 | 2 | -6/+4 | |
* | | | | | | | | | | _recall should be set to a hash or not set | Aaron Patterson | 2014-05-13 | 2 | -4/+4 | |
* | | | | | | | | | | we never call url_for with a block, so rm | Aaron Patterson | 2014-05-13 | 1 | -1/+0 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | drop || test for cases that do not need it | Aaron Patterson | 2014-05-13 | 2 | -4/+6 | |
* | | | | | | | | | no need to check for presence, script names can be blank | Aaron Patterson | 2014-05-13 | 1 | -2/+2 | |
* | | | | | | | | | extend with a module then use define_method | Aaron Patterson | 2014-05-13 | 1 | -7/+4 | |
* | | | | | | | | | this method should always have a parameter passed to it, so remove the default | Aaron Patterson | 2014-05-13 | 1 | -1/+1 | |
| |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | options should always be passed to url_for | Aaron Patterson | 2014-05-13 | 1 | -2/+2 | |
* | | | | | | | | Merge pull request #15092 from kares/pg-array-parser | Rafael Mendonça França | 2014-05-13 | 2 | -27/+27 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | [postgres] include PgArrayParser directly and only load/include ArrayParser i... | kares | 2014-05-13 | 2 | -27/+27 | |
* | | | | | | | | | Merge pull request #15095 from JuanitoFatas/doc/generators | Rafael Mendonça França | 2014-05-13 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | [ci skip] Fix a factual error and highlight code in generators guide. | Juanito Fatas | 2014-05-14 | 1 | -2/+2 | |
* | | | | | | | | | | Merge pull request #15072 from mjtko/fix/issue-15064 | Rafael Mendonça França | 2014-05-13 | 3 | -1/+14 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Require active_support/core_ext/string/output_safety and use html_safe rather... | Mark J. Titorenko | 2014-05-12 | 1 | -1/+2 | |
| * | | | | | | | | | | Use block parameter rather than `$1` during `gsub!` so `ActiveSupport::SafeBu... | Mark J. Titorenko | 2014-05-12 | 3 | -1/+13 | |
| | |_|_|_|/ / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #15073 from ifyouseewendy/master | Rafael Mendonça França | 2014-05-13 | 1 | -5/+32 | |
|\ \ \ \ \ \ \ \ \ \ |