Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | doc/README_FOR_APP is no longer generated | Xavier Noria | 2013-01-08 | 7 | -16/+11 |
| | |||||
* | let the rails gem ship with the README | Xavier Noria | 2013-01-08 | 1 | -1/+1 |
| | | | | The doc:rails application rake task needs this README. | ||||
* | Fix named scope + class method example | Carlos Antonio da Silva | 2013-01-07 | 1 | -3/+1 |
| | | | | Closes #8804 [ci skip] | ||||
* | Merge pull request #8803 from frodsan/sp_docs | Carlos Antonio da Silva | 2013-01-07 | 1 | -8/+7 |
|\ | | | | | Improve StrongParameters documentation [ci skip] | ||||
| * | improve StrongParameters documentation [ci skip] | Francesco Rodriguez | 2013-01-07 | 1 | -8/+7 |
| | | |||||
* | | Merge pull request #8773 from goshakkk/guides-page-titles | Xavier Noria | 2013-01-07 | 1 | -1/+3 |
|\ \ | | | | | | | Place article name in the beginning of guides page title | ||||
| * | | place article name in the beginning of guides page title | Gosha Arinich | 2013-01-06 | 1 | -1/+3 |
| | | | |||||
* | | | Revert some warning removals related to Ruby 2.0 | Carlos Antonio da Silva | 2013-01-07 | 3 | -6/+0 |
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These warnings were actually a bug in Ruby 2.0, the accessors should not be raising such warnings, they are only meant for ivars. - Revert "fix warnings in Ruby 2.0" This reverts commit 26702a6d3461f4a1c75165030b96886514ecb877. - Revert "Merge pull request #8282 from arunagw/warning_removed_for_ruby2" This reverts commit f63d6544e45e78cda29c0c56fbdf3d9e1f405340, reversing changes made to 3a890681fad8218305585036abed6d7463a44e41. | ||||
* | | Merge pull request #8799 from goshakkk/ivar-readers | Steve Klabnik | 2013-01-07 | 2 | -3/+3 |
|\ \ | | | | | | | Access ivars via instance reader methods for consistency | ||||
| * | | access `@path` and `@routes` via reader methods in journey | Gosha Arinich | 2013-01-07 | 2 | -3/+3 |
|/ / | |||||
* | | Merge pull request #8798 from goshakkk/show-exceptions-begin-rescue | José Valim | 2013-01-07 | 1 | -7/+4 |
|\ \ | | | | | | | Refactor ShowExceptions' #call to use def-rescue instead of begin-rescue | ||||
| * | | refactor ShowExceptions' #call to use def-rescue instead of begin-rescue | Gosha Arinich | 2013-01-07 | 1 | -7/+4 |
| | | | |||||
* | | | Use similar comment style | David Heinemeier Hansson | 2013-01-07 | 2 | -2/+2 |
|/ / | |||||
* | | Merge pull request #8788 from goshakkk/remove-begin-rescue | Xavier Noria | 2013-01-07 | 1 | -10/+9 |
|\ \ | | | | | | | Remove begin-rescue in favor of def-rescue | ||||
| * | | remove begin-rescue in favor of def-rescue | Gosha Arinich | 2013-01-07 | 1 | -10/+9 |
| | | | |||||
* | | | Take the heat :fire: | Jeremy Kemper | 2013-01-06 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #8786 from jeremy/executables | Jeremy Kemper | 2013-01-06 | 31 | -230/+163 |
|\ \ \ | | | | | | | | | Introduce ./bin for your app's executables: bin/bundle, bin/rails, bin/rake | ||||
| * | | | Introduce ./bin for your app's executables: bin/bundle, bin/rails, bin/rake. ↵ | Jeremy Kemper | 2013-01-06 | 31 | -230/+163 |
|/ / / | | | | | | | | | | Executable scripts are versioned code like the rest of your app. To generate a stub for a bundled gem: 'bundle binstubs unicorn' and 'git add bin/unicorn' | ||||
* / / | Use whitelist to pass valid connection parameters to PGConn. | Rafael Mendonça França | 2013-01-06 | 1 | -7/+10 |
|/ / | | | | | | | | | | | | | | | | | All the valids parameters for libpq are used. See http://www.postgresql.org/docs/9.1/static/libpq-connect.html for the full list Fixes #8784 | ||||
* | | Fix operators precedence issue | Rafael Mendonça França | 2013-01-06 | 1 | -1/+1 |
| | | |||||
* | | Remove the configuration key in the correct place | Rafael Mendonça França | 2013-01-06 | 1 | -3/+1 |
| | | |||||
* | | Merge pull request #8787 from tank-bohr/master | Rafael Mendonça França | 2013-01-06 | 1 | -2/+2 |
|\ \ | | | | | | | masgn and response variable | ||||
| * | | return multiple assingment and response variable | tank-bohr | 2013-01-07 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #8785 from goshakkk/refactor-debug-exceptions | Rafael Mendonça França | 2013-01-06 | 1 | -2/+1 |
|\ \ \ | |/ / |/| | | Refactor DebugExceptions | ||||
| * | | refactor DebugExceptions by combining two conditionals into one | Gosha Arinich | 2013-01-07 | 1 | -2/+1 |
| | | | |||||
* | | | Fix failing test under sqlite3 | Akira Matsuda | 2013-01-07 | 1 | -1/+1 |
| | | | |||||
* | | | Reduce number of Strings a bit | Akira Matsuda | 2013-01-07 | 4 | -7/+7 |
| | | | |||||
* | | | Namespace HashWithIndifferentAccess | Akira Matsuda | 2013-01-07 | 11 | -19/+17 |
| | | | |||||
* | | | Needs to reset SchemaMigration first, or the tests fail in sqlite3 | Akira Matsuda | 2013-01-07 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #8783 from goshakkk/refactor-journey-routes | Rafael Mendonça França | 2013-01-06 | 1 | -12/+11 |
|\ \ | | | | | | | Refactor Journey::Routes | ||||
| * | | refactor Journey::Routes | Gosha Arinich | 2013-01-07 | 1 | -12/+11 |
| | | | | | | | | | | | | | | | * prefer do-end for multiline blocks * prefer or-equals over returns with checks | ||||
* | | | Merge pull request #8782 from tank-bohr/master | Rafael Mendonça França | 2013-01-06 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | doesn't work with rubinius | ||||
| * | | | fix for rbx | tank-bohr | 2013-01-07 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rubinius returns a boolean after such assingment response = (_, headers, body = @app.call(env)) see https://github.com/rubinius/rubinius/issues/2117 get rid of a local variable | ||||
* | | | | Merge pull request #8781 from trisweb/tristan_8757_integer_column_nan_error_fix | Rafael Mendonça França | 2013-01-06 | 3 | -9/+12 |
|\ \ \ \ | |/ / / |/| / / | |/ / | Fix error raised when assigning NaN to an integer column | ||||
| * / | Fix error when assigning NaN to an integer column | Tristan Harward | 2013-01-06 | 3 | -9/+12 |
|/ / | | | | | | | | | | | | | | | | | Also covers any non-castable case by returning nil, which is in-line with the intention of the former implementation, but covers the odd cases which respond to to_i but raise an error when it's called, such as NaN, Infinity and -Infinity. Fixes #8757 | ||||
* | | Missing require | Akira Matsuda | 2013-01-07 | 1 | -0/+2 |
| | | |||||
* | | These are already required through AS/rails | Akira Matsuda | 2013-01-07 | 8 | -12/+0 |
| | | | | | | | | | | | | * dependencies/autoload * concern * deprecation | ||||
* | | Merge pull request #8263 from senny/refactor_plugin_new_generator | Yehuda Katz | 2013-01-06 | 5 | -11/+13 |
|\ \ | | | | | | | refactor the naming within plugin new generator | ||||
| * | | refactor the naming within plugin new generator | Yves Senn | 2012-11-18 | 5 | -11/+13 |
| | | | | | | | | | | | | | | | | | | Having a method called `full?`, which checks on :full and :mountable is very confusing. I renamed `full?` to `engine?` and created a `full?` method that only checks the `:full` option | ||||
* | | | Merge pull request #8770 from goshakkk/guides-img-fix | Xavier Noria | 2013-01-06 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | Fix img width in guides | ||||
| * | | | fix img width in guides | Gosha Arinich | 2013-01-05 | 1 | -0/+4 |
| | | | | |||||
* | | | | Merge pull request #8780 from diogomafra/require_core_ext | Carlos Antonio da Silva | 2013-01-06 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require 'active_support/core_ext/module/aliasing' in the infinite_comparable module When requiring 'active_support/core_ext', the following error is raised: undefined method `alias_method_chain' for Date:Class (NoMethodError) Adding the missing require to this module fixes the problem. | ||||
| * | | | | Require 'active_support/core_ext/module/aliasing' in the infinite_comparable ↵ | Diogo Mafra | 2013-01-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | module | ||||
* | | | | | Needless requires | Akira Matsuda | 2013-01-06 | 2 | -6/+0 |
| | | | | | |||||
* | | | | | Missing requires | Akira Matsuda | 2013-01-06 | 2 | -0/+2 |
| | | | | | |||||
* | | | | | These are already required through AS/rails | Akira Matsuda | 2013-01-06 | 5 | -6/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * core_ext/object/blank * concern * core_ext/class/attribute * deprecation | ||||
* | | | | | Rescue from LoadError when trying to load the debugger gem for console | Carlos Antonio da Silva | 2013-01-06 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid swallowing all exceptions that might happen when requiring debugger, just catch a LoadError if it cannot be loaded. Check for more background: https://github.com/rails/rails/commit/28fd867c9bc790636d37a28f288791cd0089a6fd#commitcomment-2386952 | ||||
* | | | | Rename route_wrapper partial layout to table | Carlos Antonio da Silva | 2013-01-06 | 2 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | It is used by the table formatter only, and it's already inside a routes directory that namespaces it properly, so calling it just "table" seems simpler. | ||||
* | | | | Move table routes formatter class to the inspector and rename it | Carlos Antonio da Silva | 2013-01-06 | 4 | -20/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | It feels more consistent to have this class called "HtmlTableFormatter", and to have it here with the routes inspector and console formatter, since it's used for both routing error exceptions and the rails info page. | ||||
* | | | | Merge pull request #8777 from goshakkk/delegate-class | Andrew White | 2013-01-06 | 5 | -5/+5 |
|\ \ \ \ | | | | | | | | | | | Delegate to :class rather than 'self.class' |