aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12511 from ↵Rafael Mendonça França2013-10-132-3/+9
|\ | | | | | | | | jetthoughts/informative_raise_message_for_incorrect_association Make missed association exception message more informative
| * Make missed association exception message more informativePaul Nikitochkin2013-10-132-3/+9
| | | | | | | | | | Add target class name, which should have missed association on preload, into exception message to simplify detecting problem part.
* | Merge pull request #12514 from ↵Rafael Mendonça França2013-10-133-13/+54
|\ \ | | | | | | | | | | | | schuetzm/stdout-logging-with-implicit-development-env Make logging to stdout work again with implicit `development` env
| * | 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 documentation
| * | Fix wrong variable name used in the select_day method documentationJefferson Queiroz Venerando2013-10-101-2/+2
| | | | | | | | | The variable name created in the example is `my_date`, the methods were using `my_time` instead.
* | | Merge pull request #12493 from drodriguez/patch-1Rafael Mendonça França2013-10-131-2/+2
|\ \ \ | | | | | | | | Keep code consistent with previous code blocks.
| * | | Keep code consistent with previous code blocks.Daniel Rodríguez Troitiño2013-10-101-2/+2
| | | | | | | | | | | | [ci skip]
* | | | 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 array
| * | | | 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 var
| * | | | 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
|\ \ \ \ | | | | | | | | | | Includes with persistent select, fixes #11773
| * | | | Fixes #11773 when using includes combined with select, the select statement ↵Edo Balvers2013-10-083-1/+15
| | | | | | | | | | | | | | | | | | | | was overwritten.
* | | | | Merge pull request #12507 from malavbhavsar/doc_patchRafael Mendonça França2013-10-122-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Some fixes in docs [ci skip]
| * | | | | Some fixes in docs [ci skip]Malav Bhavsar2013-10-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update a link to point to right section in api docs Fix a typo
* | | | | | Merge pull request #12512 from sbagdat/patch-1Andrew White2013-10-121-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Fix a writing mistake
| * | | | | Fix a writing mistakeSıtkı Bağdat2013-10-121-1/+1
|/ / / / / | | | | | | | | | | A small mistake found in the line of ```The default error is "can't be empty"``` for ```:presence``` helper. ```empty``` word changed to ```blank```.
* | | | | Revert "Merge pull request #12480 from iwiznia/master"Jeremy Kemper2013-10-114-57/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e5f5a838b96a362534d9bb60d02334439ed9784c, reversing changes made to d7567f3290a50952494e9213556a1f283a6cf3a0.
* | | | | 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::Duration
| * | | | | 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.ruby
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | we don't need to walk back up the node's parents when we have the parent on the stack
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | Now that we merge trees from the top down, we don't need to search through the whole tree for particular nodes, just walk it and merge.
* | | | | merge JoinDependency as outer joinsAaron Patterson2013-10-102-1/+31
| | | | | | | | | | | | | | | | | | | | Merge JoinDependency objects as outer joins
* | | | | 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
| |_|/ / |/| | | | | | | | | | | Stop writing terrible code Aaron. This is Ruby, not Scheme
* | | | Merge pull request #12339 from tjschuck/bcrypt_cost_attrJeremy Kemper2013-10-103-1/+13
|\ \ \ \ | |_|_|/ |/| | | Use bcrypt's public cost attr instead of internal constant
| * | | Use bcrypt's public cost attr, not internal constantT.J. Schuck2013-10-103-1/+13
|/ / / | | | | | | | | | | | | | | | | | | | | | See: - https://github.com/codahale/bcrypt-ruby/pull/63 - https://github.com/codahale/bcrypt-ruby/pull/64 - https://github.com/codahale/bcrypt-ruby/pull/65
* / / Respect `SCRIPT_NAME` when using `redirect` with a relative pathAndrew White2013-10-103-0/+136
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: # application routes.rb mount BlogEngine => '/blog' # engine routes.rb get '/admin' => redirect('admin/dashboard') This now redirects to the path `/blog/admin/dashboard`, whereas before it would've generated an invalid url because there would be no slash between the host name and the path. It also allows redirects to work where the application is deployed to a subdirectory of a website. Fixes #7977
* | stop creating a bunch of relation objects when we can slap all the joins on ↵Aaron Patterson2013-10-092-8/+3
| | | | | | | | at once
* | 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
| | | | | | | | | | | | | | | All the job can be done at class level so we can avoid some object allocation
| * | 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
| | |
| * | Move macro to class levelRafael Mendonça França2013-10-094-5/+5
| | |
| * | Make validate_options a class methodRafael Mendonça França2013-10-091-3/+3
| | |
| * | Make valid_options a class methodRafael Mendonça França2013-10-096-7/+7
| | |
| * | Define the association extensions without need to have a builderRafael Mendonça França2013-10-093-16/+15
| | | | | | | | | | | | instance
* | | Merge pull request #12488 from CoryFoy/masterRafael Mendonça França2013-10-091-6/+16
|\ \ \ | | | | | | | | [ci skip] Modifies the initialization guide to make the initializers process clearer
| * | | Modifies the initialization guide to make the initializers process clearer ↵Cory Foy2013-10-091-6/+16
| | | | | | | | | | | | | | | | and remove a TODO. [ci skip]
* | | | no need to to_symAaron Patterson2013-10-091-1/+1
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-17 14:53:07 +0000