aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Add nodoc to methodRafael Mendonça França2013-10-131-1/+1
* | | | | Merge pull request #12508 from jetthoughts/12415_generate_subqueries_for_rela...Rafael Mendonça França2013-10-134-2/+40
|\ \ \ \ \
| * | | | | Generate subquery for Relation passed as array condition for wherePaul Nikitochkin2013-10-134-2/+40
* | | | | | Merge pull request #12456 from razielgn/ar-test-fixesRafael Mendonça França2013-10-133-5/+11
|\ \ \ \ \ \
| * | | | | | Allow methods arity below -1 in assert_responds.Federico Ravasio2013-10-081-3/+4
| * | | | | | Assert presence of "frozen" in error message, not the full MRI message.Federico Ravasio2013-10-081-1/+3
| * | | | | | Just change ENV and restore it afterwards.Federico Ravasio2013-10-071-1/+4
* | | | | | | Merge pull request #12511 from jetthoughts/informative_raise_message_for_inco...Rafael Mendonça França2013-10-132-3/+9
|\ \ \ \ \ \ \
| * | | | | | | Make missed association exception message more informativePaul Nikitochkin2013-10-132-3/+9
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #12514 from schuetzm/stdout-logging-with-implicit-developm...Rafael Mendonça França2013-10-133-13/+54
|\ \ \ \ \ \ \
| * | | | | | | Make logging to stdout work again with implicit `development` envMarc Schütz2013-10-133-13/+54
| |/ / / / / /
* | | | | | | Merge pull request #12491 from shamanime/patch-1Rafael Mendonça França2013-10-131-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix wrong variable name used in the select_day method documentationJefferson Queiroz Venerando2013-10-101-2/+2
* | | | | | | | Merge pull request #12493 from drodriguez/patch-1Rafael Mendonça França2013-10-131-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Keep code consistent with previous code blocks.Daniel Rodríguez Troitiño2013-10-101-2/+2
* | | | | | | | | Merge pull request #12517 from vipulnsward/destructive_map_amRafael Mendonça França2013-10-131-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Change `map` to `map!` to save extra array creation on new arrayVipul A M2013-10-131-1/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #12516 from vipulnsward/drop_varRafael Mendonça França2013-10-131-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Drop unused iterator varVipul A M2013-10-131-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #11791 from versioncontrol/includes_with_persistent_selectRafael Mendonça França2013-10-123-1/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixes #11773 when using includes combined with select, the select statement w...Edo Balvers2013-10-083-1/+15
* | | | | | | | | Merge pull request #12507 from malavbhavsar/doc_patchRafael Mendonça França2013-10-122-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Some fixes in docs [ci skip]Malav Bhavsar2013-10-112-2/+2
* | | | | | | | | | Merge pull request #12512 from sbagdat/patch-1Andrew White2013-10-121-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Fix a writing mistakeSıtkı Bağdat2013-10-121-1/+1
|/ / / / / / / / /
* | | | | | | | | Revert "Merge pull request #12480 from iwiznia/master"Jeremy Kemper2013-10-114-57/+0
* | | | | | | | | no reason to do this column addition and subtraction businessAaron Patterson2013-10-111-1/+1
* | | | | | | | | Merge pull request #12480 from iwiznia/masterRafael Mendonça França2013-10-114-0/+57
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | flatten and flatten! methods for ActiveSupport::DurationIonatan Wiznia2013-10-114-0/+57
| |/ / / / / / / /
* | | | | | | | | Merge pull request #12503 from arunagw/removed-unused-requireRafael Mendonça França2013-10-111-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | No need to require rbconfig as we are using Gem.rubyArun Agrawal2013-10-111-1/+0
|/ / / / / / / / /
* | | | | | | | | refactor a little so we can remove some methodsAaron Patterson2013-10-102-4/+1
* | | | | | | | | the parent node is on the stack, so use itAaron Patterson2013-10-101-4/+4
* | | | | | | | | pass the parent node to the construct methodAaron Patterson2013-10-101-7/+6
* | | | | | | | | nodes do not need to be sortedAaron Patterson2013-10-101-1/+1
* | | | | | | | | delete unused codeAaron Patterson2013-10-102-50/+0
* | | | | | | | | merge JoinDependency as outer joinsAaron Patterson2013-10-102-1/+31
* | | | | | | | | stuff the join dependency object in the "anything goes" hash.Aaron Patterson2013-10-104-6/+8
* | | | | | | | | stop splatting things back and forthAaron Patterson2013-10-102-2/+2
* | | | | | | | | simplify each method.Aaron Patterson2013-10-101-8/+2
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #12339 from tjschuck/bcrypt_cost_attrJeremy Kemper2013-10-103-1/+13
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Use bcrypt's public cost attr, not internal constantT.J. Schuck2013-10-103-1/+13
|/ / / / / / /
* / / / / / / Respect `SCRIPT_NAME` when using `redirect` with a relative pathAndrew White2013-10-103-0/+136
|/ / / / / /
* | | | | | stop creating a bunch of relation objects when we can slap all the joins on a...Aaron Patterson2013-10-092-8/+3
* | | | | | Merge branch 'builder-instances'Rafael Mendonça França2013-10-098-59/+43
|\ \ \ \ \ \
| * | | | | | Method visibility will not make difference hereRafael Mendonça França2013-10-094-8/+0
| * | | | | | Remove builder instancesRafael Mendonça França2013-10-092-22/+10
| * | | | | | Extract the scope building to a class methodRafael Mendonça França2013-10-092-10/+17
| * | | | | | Remove unneeded readerRafael Mendonça França2013-10-091-2/+0
| * | | | | | Move wrap_scope to class levelRafael Mendonça França2013-10-091-2/+2