aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Simplify path setupCarlos Antonio da Silva2014-07-301-1/+1
* Simplify plugin tests a bit, leave the regexp work for minitestCarlos Antonio da Silva2014-07-301-6/+6
* Invert unless..else conditions on JRuby checksCarlos Antonio da Silva2014-07-302-12/+12
* Merge pull request #16352 from gchan/remove-unnecessary-convert-keyCarlos Antonio da Silva2014-07-301-2/+2
|\
| * Removed unnecessary call to 'convert_key' in 'HashWithIndifferentAccess#to_hash'Gordon Chan2014-07-311-2/+2
* | Remove some more globals from testsCarlos Antonio da Silva2014-07-301-26/+26
* | Fix / improve some assertionsCarlos Antonio da Silva2014-07-301-6/+4
* | Remove some globals from configuration testsCarlos Antonio da Silva2014-07-301-20/+20
* | remove useless deupAaron Patterson2014-07-301-1/+1
* | push options inside the scope objectAaron Patterson2014-07-301-4/+9
* | turn scope in to a linked listAaron Patterson2014-07-301-15/+36
* | don't access named routes internalsAaron Patterson2014-07-301-1/+1
* | remove alias_method_chainAaron Patterson2014-07-301-4/+2
* | avoid instrospection on the moduleAaron Patterson2014-07-301-1/+2
* | fix variable nameAaron Patterson2014-07-301-3/+3
* | split path_helpers and url_helpersAaron Patterson2014-07-301-18/+25
* | `add` will remove the method if it exists alreadyAaron Patterson2014-07-301-1/+0
* | Merge pull request #15840 from schneems/schneems/deprecate-mailer_path_methodsXavier Noria2014-07-3012-57/+183
|\ \
| * | Deprecate `*_path` methods in mailers@schneems and @sgrif2014-07-3012-57/+183
* | | Merge pull request #16346 from JackDanger/remove_redundant_self_in_class_meth...Rafael Mendonça França2014-07-301-5/+5
|\ \ \
| * | | Remove redundant `self.` in class method callsJack Danger Canty2014-07-301-5/+5
| | |/ | |/|
* | | Merge pull request #16345 from robin850/rbx-tidy-bytesRafael Mendonça França2014-07-301-1/+2
|\ \ \ | |_|/ |/| |
| * | Prevent using String#scrub on RubiniusRobin Dupret2014-07-301-1/+2
|/ /
* / Revert "Merge pull request #15305 from tgxworld/remove_unnecessary_require"Santiago Pastorino2014-07-304-2/+5
|/
* Merge pull request #15959 from aditya-kapoor/remove-unneeded-casesRafael Mendonça França2014-07-292-26/+17
|\
| * remove unneeded test model for ActiveModel test cases.Aditya Kapoor2014-06-282-26/+17
* | Merge pull request #16339 from rwz/with_options_implicitDavid Heinemeier Hansson2014-07-293-2/+29
|\ \
| * | Add implicit receiver support to `Object#with_options`Pavel Pravosud2014-07-293-2/+29
* | | Merge pull request #16335 from arthurnn/rm_parent_state_trasactionRafael Mendonça França2014-07-291-2/+1
|\ \ \
| * | | Remove @state.parent assignment on commitArthur Neves2014-07-291-2/+1
* | | | oops! :bomb:Aaron Patterson2014-07-291-1/+1
* | | | ask the named routes collection if the route is definedAaron Patterson2014-07-292-1/+5
* | | | helpers should be a Set so it doesn't grow unboundedAaron Patterson2014-07-291-4/+12
* | | | pass the module to define_named_route_methodsAaron Patterson2014-07-291-7/+7
* | | | only ask for the routes module onceAaron Patterson2014-07-291-2/+4
* | | | eval_block should be privateAaron Patterson2014-07-291-0/+1
* | | | :nail_care: from #16329 [ci skip]Zachary Scott2014-07-291-1/+1
* | | | Merge pull request #16329 from deependersingla/masterZachary Scott2014-07-291-0/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Get request should not write to database note added. [skip ci]Deepender Singla2014-07-291-0/+2
* | | | Merge pull request #16336 from akshay-vishnoi/fix-testsRafael Mendonça França2014-07-292-24/+16
|\ \ \ \
| * | | | Add missing test case for Array#to_sentence, collect all test cases for Objec...Akshay Vishnoi2014-07-292-24/+16
|/ / / /
* | | | Merge pull request #16334 from akshay-vishnoi/array-testsRafael Mendonça França2014-07-297-482/+495
|\ \ \ \ | |_|/ / |/| | |
| * | | Move array test files under arrayAkshay Vishnoi2014-07-297-482/+495
* | | | docs, cleanup mixed indents within `form_options_helper.rb` RDoc.Yves Senn2014-07-291-81/+81
* | | | Merge pull request #16332 from shizm/fix-docs-validates-uniqueness-ofRobin Dupret2014-07-291-1/+1
|\ \ \ \
| * | | | [ci skip] fix doc typo for validates_uniqueness_ofSatoru Yamasaki2014-07-291-1/+1
|/ / / /
* | | | Merge pull request #16328 from noinkling/template_password_confirmation_fixYves Senn2014-07-292-1/+6
|\ \ \ \
| * | | | Give password_confirmation div the "field" class in erb form templatenoinkling2014-07-291-1/+1
* | | | | Merge pull request #16148 from rails/fix_json_autoloadGodfrey Chan2014-07-293-3/+52
|\ \ \ \ \
| * | | | | Fixed a compatibility issue with the `Oj` gemGodfrey Chan2014-07-292-3/+10