aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* pass the route name to define_url_helperAaron Patterson2014-07-173-23/+26
* Make restore_attributes publicRafael Mendonça França2014-07-172-10/+20
* use a strategy object for generating urls in named helpersAaron Patterson2014-07-172-21/+37
* helper methods are public, so we can just call themAaron Patterson2014-07-171-4/+4
* docs, `select` and friends with `multiple=true` include a blank string.Yves Senn2014-07-171-5/+3
* Merge pull request #16198 from eileencodes/remove-need-for-macro-instance-varMatthew Draper2014-07-181-11/+14
|\
| * Remove need for macro instance vareileencodes2014-07-171-11/+14
* | Merge pull request #16205 from davejachimiak/remove_profile_and_benchmark_pointMatthew Draper2014-07-171-1/+0
|\ \ | |/ |/|
| * Remove "profile and benchmark" line from command line guideDave Jachimiak2014-07-171-1/+0
|/
* Merge pull request #16201 from noinkling/masterGodfrey Chan2014-07-161-5/+5
|\
| * Fix broken list formatting [ci skip]noinkling2014-07-171-5/+5
* | subclass Rails::EngineAaron Patterson2014-07-161-1/+2
|/
* extract path building to a methodAaron Patterson2014-07-161-9/+11
* break out path building logic to methodsAaron Patterson2014-07-161-14/+22
* only extract :params from the options hash onceAaron Patterson2014-07-161-3/+2
* we do not need to dup the options hash, it is private and a new object each callAaron Patterson2014-07-161-2/+2
* push rails app testing upAaron Patterson2014-07-161-9/+13
* Rails-ish apps should descend from Rails::RailtieAaron Patterson2014-07-164-14/+17
* app should always be a class (I suppose)Aaron Patterson2014-07-161-1/+1
* we should be checking if the app is a classAaron Patterson2014-07-161-1/+1
* Merge pull request #16197 from cgriego/patch-1Rafael Mendonça França2014-07-161-1/+1
|\
| * Remove unused 1:1 association :remote optionChris Griego2014-07-161-1/+1
|/
* Merge pull request #16196 from yahonda/mysql_restrict_testMatthew Draper2014-07-172-8/+6
|\
| * Revert "Rename to test_mysql_strict_mode_disabled_dont_override_global_sql_mode"Yasuo Honda2014-07-172-8/+6
* | Merge pull request #16195 from jonatack/patch-7Matthew Draper2014-07-171-4/+4
|\ \
| * | Fix typos in string_ext_test.rb [ci skip]Jon Atack2014-07-161-4/+4
|/ /
* | Merge remote-tracking branch 'origin/master'Rafael Mendonça França2014-07-164-7/+62
|\ \
| * \ Merge pull request #16190 from oss92/word_truncationMatthew Draper2014-07-173-0/+49
| |\ \
| | * | Added truncate_words method to activesupport stringsroot2014-07-163-0/+45
| * | | extract inner options before delegating to the helperAaron Patterson2014-07-161-7/+13
* | | | Use &= instead of select with include?Rafael Mendonça França2014-07-161-4/+1
* | | | Merge pull request #15917 from luke-gru/actionview_perfRafael Mendonça França2014-07-161-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | remove Set.new from DetailsKey::get, impacts rendering overhead performanceLuke Gruber2014-06-251-1/+1
* | | | Merge pull request #15944 from seuros/uuidRafael Mendonça França2014-07-163-1/+51
|\ \ \ \
| * | | | Treat invalid uuid as nilAbdelkader Boudih2014-07-143-1/+51
* | | | | Merge pull request #16183 from goddamnhippie/fix-psych-warningRafael Mendonça França2014-07-162-0/+6
|\ \ \ \ \
| * | | | | Move #encode_with to RelationGustavo Beathyate2014-07-152-4/+5
| * | | | | Implement required #encode_withGustavo Beathyate2014-07-152-0/+5
* | | | | | always transcode the file to utf-8Aaron Patterson2014-07-162-0/+7
* | | | | | Merge pull request #15718 from chancancode/regression_from_15694Godfrey Chan2014-07-162-1/+10
|\ \ \ \ \ \
| * | | | | | Fixed a regression introduced in 84cf156Godfrey Chan2014-06-142-1/+10
* | | | | | | Fix typo on the variable nameRafael Mendonça França2014-07-161-8/+8
* | | | | | | Merge branch 'joeljunstrom-local-iterator-for-partial-collections'Rafael Mendonça França2014-07-167-18/+125
|\ \ \ \ \ \ \
| * | | | | | | Add CHANGELOG entry for PartialIteration.Rafael Mendonça França2014-07-161-0/+10
| * | | | | | | Document the PartialIteration objectRafael Mendonça França2014-07-161-3/+9
| * | | | | | | Build only one PartialIteration object for loopRafael Mendonça França2014-07-162-16/+26
| * | | | | | | No need to have a file to PartialIteration classRafael Mendonça França2014-07-163-23/+19
| * | | | | | | Added PartialIteration class used when rendering collectionsJoel Junström2014-07-167-14/+99
|/ / / / / / /
* | | | | | | Remove unused fixturesRafael Mendonça França2014-07-1660-98/+0
* | | | | | | nodoc enum hooks [ci skip]Rafael Mendonça França2014-07-161-2/+2