aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | Don't accept parameters as argument for redirect to [via @homakov]Santiago Pastorino2014-07-162-0/+11
* | | | | | we intend to keep the `capture` helper for Active Record tests.Yves Senn2014-07-161-18/+12
* | | | | | Active Record tests still depend on `capture`. Let's keep it for now.Yves Senn2014-07-162-19/+23
* | | | | | Merge pull request #16187 from jone/testing-guide-assertionsYves Senn2014-07-161-2/+13
|\ \ \ \ \ \
| * | | | | | link minitest assertions documentation.Jonas Baumann2014-07-161-2/+7
| * | | | | | document assert[_not]_empty, assert[_not]_includes, assert[_not]_predicate in...Jonas Baumann2014-07-161-0/+6
|/ / / / / /
* | | | | | use foreign key DSL in our tests.Yves Senn2014-07-162-5/+4
* | | | | | Merge pull request #16138 from sgrif/sg-attribute-set-keyYves Senn2014-07-163-10/+10
|\ \ \ \ \ \
| * | | | | | AttributeSet#include? -> AttributeSet#key?Sean Griffin2014-07-113-10/+10
* | | | | | | Fix 1.9. uggghhhhhh get it together @tenderlove :bomb:Aaron Patterson2014-07-151-2/+2
* | | | | | | fix for 1.9 kwargs syntaxAaron Patterson2014-07-151-1/+2
* | | | | | | routed applications will respond to these methodsAaron Patterson2014-07-152-2/+2
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'rm-uuid'Rafael Mendonça França2014-07-156-78/+78
|\ \ \ \ \ \
| * | | | | | Move uuid_v5 and uuid_v3 to Digest::UUIDRafael Mendonça França2014-07-156-78/+78
* | | | | | | stop passing recall to url_forAaron Patterson2014-07-152-37/+48
* | | | | | | rack 1.6 encodes the filenames in posts correctly nowAaron Patterson2014-07-151-8/+1
* | | | | | | fix warningsAaron Patterson2014-07-151-1/+1
* | | | | | | stop calling url_for with recall parameters and actually use a requestAaron Patterson2014-07-152-85/+197
|/ / / / / /
* | | | | | execute a request and check the path_parametersAaron Patterson2014-07-151-17/+59
* | | | | | set `set` in the setup methodAaron Patterson2014-07-151-2/+5
* | | | | | remove useless ivar setAaron Patterson2014-07-151-1/+0
* | | | | | RouteSet should be in charge of constructing the dispatherAaron Patterson2014-07-153-10/+15
* | | | | | Merge pull request #16180 from rafaelfranca/rm-dirtyRafael Mendonça França2014-07-156-18/+79
|\ \ \ \ \ \
| * | | | | | Deprecate `reset_#{attribute}` in favor of `restore_#{attribute}`.Rafael Mendonça França2014-07-155-13/+38
| * | | | | | Deprecate ActiveModel::Dirty#reset_changes in favor of #clear_changes_informa...Rafael Mendonça França2014-07-154-6/+42