Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #12511 from ↵ | Rafael Mendonça França | 2013-10-13 | 2 | -3/+9 |
|\ | | | | | | | | | jetthoughts/informative_raise_message_for_incorrect_association Make missed association exception message more informative | ||||
| * | Make missed association exception message more informative | Paul Nikitochkin | 2013-10-13 | 2 | -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ça | 2013-10-13 | 3 | -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` env | Marc Schütz | 2013-10-13 | 3 | -13/+54 |
| |/ | |||||
* | | Merge pull request #12491 from shamanime/patch-1 | Rafael Mendonça França | 2013-10-13 | 1 | -2/+2 |
|\ \ | | | | | | | Fix wrong variable name used in the select_day method documentation | ||||
| * | | Fix wrong variable name used in the select_day method documentation | Jefferson Queiroz Venerando | 2013-10-10 | 1 | -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-1 | Rafael Mendonça França | 2013-10-13 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Keep code consistent with previous code blocks. | ||||
| * | | | Keep code consistent with previous code blocks. | Daniel Rodríguez Troitiño | 2013-10-10 | 1 | -2/+2 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | | Merge pull request #12517 from vipulnsward/destructive_map_am | Rafael Mendonça França | 2013-10-13 | 1 | -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 array | Vipul A M | 2013-10-13 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #12516 from vipulnsward/drop_var | Rafael Mendonça França | 2013-10-13 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | Drop unused iterator var | ||||
| * | | | | Drop unused iterator var | Vipul A M | 2013-10-13 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #11791 from versioncontrol/includes_with_persistent_select | Rafael Mendonça França | 2013-10-12 | 3 | -1/+15 |
|\ \ \ \ | | | | | | | | | | | Includes with persistent select, fixes #11773 | ||||
| * | | | | Fixes #11773 when using includes combined with select, the select statement ↵ | Edo Balvers | 2013-10-08 | 3 | -1/+15 |
| | | | | | | | | | | | | | | | | | | | | was overwritten. | ||||
* | | | | | Merge pull request #12507 from malavbhavsar/doc_patch | Rafael Mendonça França | 2013-10-12 | 2 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Some fixes in docs [ci skip] | ||||
| * | | | | | Some fixes in docs [ci skip] | Malav Bhavsar | 2013-10-11 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update a link to point to right section in api docs Fix a typo | ||||
* | | | | | | Merge pull request #12512 from sbagdat/patch-1 | Andrew White | 2013-10-12 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Fix a writing mistake | ||||
| * | | | | | Fix a writing mistake | Sıtkı Bağdat | 2013-10-12 | 1 | -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 Kemper | 2013-10-11 | 4 | -57/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e5f5a838b96a362534d9bb60d02334439ed9784c, reversing changes made to d7567f3290a50952494e9213556a1f283a6cf3a0. | ||||
* | | | | | no reason to do this column addition and subtraction business | Aaron Patterson | 2013-10-11 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #12480 from iwiznia/master | Rafael Mendonça França | 2013-10-11 | 4 | -0/+57 |
|\ \ \ \ \ | | | | | | | | | | | | | flatten and flatten! methods for ActiveSupport::Duration | ||||
| * | | | | | flatten and flatten! methods for ActiveSupport::Duration | Ionatan Wiznia | 2013-10-11 | 4 | -0/+57 |
| |/ / / / | |||||
* | | | | | Merge pull request #12503 from arunagw/removed-unused-require | Rafael Mendonça França | 2013-10-11 | 1 | -1/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | No need to require rbconfig as we are using Gem.ruby | ||||
| * | | | | | No need to require rbconfig as we are using Gem.ruby | Arun Agrawal | 2013-10-11 | 1 | -1/+0 |
|/ / / / / | |||||
* | | | | | refactor a little so we can remove some methods | Aaron Patterson | 2013-10-10 | 2 | -4/+1 |
| | | | | | |||||
* | | | | | the parent node is on the stack, so use it | Aaron Patterson | 2013-10-10 | 1 | -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 method | Aaron Patterson | 2013-10-10 | 1 | -7/+6 |
| | | | | | |||||
* | | | | | nodes do not need to be sorted | Aaron Patterson | 2013-10-10 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | delete unused code | Aaron Patterson | 2013-10-10 | 2 | -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 joins | Aaron Patterson | 2013-10-10 | 2 | -1/+31 |
| | | | | | | | | | | | | | | | | | | | | Merge JoinDependency objects as outer joins | ||||
* | | | | | stuff the join dependency object in the "anything goes" hash. | Aaron Patterson | 2013-10-10 | 4 | -6/+8 |
| | | | | | |||||
* | | | | | stop splatting things back and forth | Aaron Patterson | 2013-10-10 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | simplify each method. | Aaron Patterson | 2013-10-10 | 1 | -8/+2 |
| |_|/ / |/| | | | | | | | | | | | Stop writing terrible code Aaron. This is Ruby, not Scheme | ||||
* | | | | Merge pull request #12339 from tjschuck/bcrypt_cost_attr | Jeremy Kemper | 2013-10-10 | 3 | -1/+13 |
|\ \ \ \ | |_|_|/ |/| | | | Use bcrypt's public cost attr instead of internal constant | ||||
| * | | | Use bcrypt's public cost attr, not internal constant | T.J. Schuck | 2013-10-10 | 3 | -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 path | Andrew White | 2013-10-10 | 3 | -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 Patterson | 2013-10-09 | 2 | -8/+3 |
| | | | | | | | | at once | ||||
* | | Merge branch 'builder-instances' | Rafael Mendonça França | 2013-10-09 | 8 | -59/+43 |
|\ \ | |||||
| * | | Method visibility will not make difference here | Rafael Mendonça França | 2013-10-09 | 4 | -8/+0 |
| | | | |||||
| * | | Remove builder instances | Rafael Mendonça França | 2013-10-09 | 2 | -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 method | Rafael Mendonça França | 2013-10-09 | 2 | -10/+17 |
| | | | |||||
| * | | Remove unneeded reader | Rafael Mendonça França | 2013-10-09 | 1 | -2/+0 |
| | | | |||||
| * | | Move wrap_scope to class level | Rafael Mendonça França | 2013-10-09 | 1 | -2/+2 |
| | | | |||||
| * | | Move macro to class level | Rafael Mendonça França | 2013-10-09 | 4 | -5/+5 |
| | | | |||||
| * | | Make validate_options a class method | Rafael Mendonça França | 2013-10-09 | 1 | -3/+3 |
| | | | |||||
| * | | Make valid_options a class method | Rafael Mendonça França | 2013-10-09 | 6 | -7/+7 |
| | | | |||||
| * | | Define the association extensions without need to have a builder | Rafael Mendonça França | 2013-10-09 | 3 | -16/+15 |
| | | | | | | | | | | | | instance | ||||
* | | | Merge pull request #12488 from CoryFoy/master | Rafael Mendonça França | 2013-10-09 | 1 | -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 Foy | 2013-10-09 | 1 | -6/+16 |
| | | | | | | | | | | | | | | | | and remove a TODO. [ci skip] | ||||
* | | | | no need to to_sym | Aaron Patterson | 2013-10-09 | 1 | -1/+1 |
| | | | |