aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8803 from frodsan/sp_docsCarlos Antonio da Silva2013-01-071-8/+7
|\ | | | | Improve StrongParameters documentation [ci skip]
| * improve StrongParameters documentation [ci skip]Francesco Rodriguez2013-01-071-8/+7
| |
* | Merge pull request #8773 from goshakkk/guides-page-titlesXavier Noria2013-01-071-1/+3
|\ \ | | | | | | Place article name in the beginning of guides page title
| * | place article name in the beginning of guides page titleGosha Arinich2013-01-061-1/+3
| | |
* | | Revert some warning removals related to Ruby 2.0Carlos Antonio da Silva2013-01-073-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-readersSteve Klabnik2013-01-072-3/+3
|\ \ | | | | | | Access ivars via instance reader methods for consistency
| * | access `@path` and `@routes` via reader methods in journeyGosha Arinich2013-01-072-3/+3
|/ /
* | Merge pull request #8798 from goshakkk/show-exceptions-begin-rescueJosé Valim2013-01-071-7/+4
|\ \ | | | | | | Refactor ShowExceptions' #call to use def-rescue instead of begin-rescue
| * | refactor ShowExceptions' #call to use def-rescue instead of begin-rescueGosha Arinich2013-01-071-7/+4
| | |
* | | Use similar comment styleDavid Heinemeier Hansson2013-01-072-2/+2
|/ /
* | Merge pull request #8788 from goshakkk/remove-begin-rescueXavier Noria2013-01-071-10/+9
|\ \ | | | | | | Remove begin-rescue in favor of def-rescue
| * | remove begin-rescue in favor of def-rescueGosha Arinich2013-01-071-10/+9
| | |
* | | Take the heat :fire:Jeremy Kemper2013-01-061-0/+2
| | |
* | | Merge pull request #8786 from jeremy/executablesJeremy Kemper2013-01-0631-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 Kemper2013-01-0631-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ça2013-01-061-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 issueRafael Mendonça França2013-01-061-1/+1
| |
* | Remove the configuration key in the correct placeRafael Mendonça França2013-01-061-3/+1
| |
* | Merge pull request #8787 from tank-bohr/masterRafael Mendonça França2013-01-061-2/+2
|\ \ | | | | | | masgn and response variable
| * | return multiple assingment and response variabletank-bohr2013-01-071-2/+2
| | |
* | | Merge pull request #8785 from goshakkk/refactor-debug-exceptionsRafael Mendonça França2013-01-061-2/+1
|\ \ \ | |/ / |/| | Refactor DebugExceptions
| * | refactor DebugExceptions by combining two conditionals into oneGosha Arinich2013-01-071-2/+1
| | |
* | | Fix failing test under sqlite3Akira Matsuda2013-01-071-1/+1
| | |
* | | Reduce number of Strings a bitAkira Matsuda2013-01-074-7/+7
| | |
* | | Namespace HashWithIndifferentAccessAkira Matsuda2013-01-0711-19/+17
| | |
* | | Needs to reset SchemaMigration first, or the tests fail in sqlite3Akira Matsuda2013-01-071-1/+1
|/ /
* | Merge pull request #8783 from goshakkk/refactor-journey-routesRafael Mendonça França2013-01-061-12/+11
|\ \ | | | | | | Refactor Journey::Routes
| * | refactor Journey::RoutesGosha Arinich2013-01-071-12/+11
| | | | | | | | | | | | | | | * prefer do-end for multiline blocks * prefer or-equals over returns with checks
* | | Merge pull request #8782 from tank-bohr/masterRafael Mendonça França2013-01-061-2/+2
|\ \ \ | | | | | | | | doesn't work with rubinius
| * | | fix for rbxtank-bohr2013-01-071-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_fixRafael Mendonça França2013-01-063-9/+12
|\ \ \ \ | |/ / / |/| / / | |/ / Fix error raised when assigning NaN to an integer column
| * / Fix error when assigning NaN to an integer columnTristan Harward2013-01-063-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 requireAkira Matsuda2013-01-071-0/+2
| |
* | These are already required through AS/railsAkira Matsuda2013-01-078-12/+0
| | | | | | | | | | | | * dependencies/autoload * concern * deprecation
* | Merge pull request #8263 from senny/refactor_plugin_new_generatorYehuda Katz2013-01-065-11/+13
|\ \ | | | | | | refactor the naming within plugin new generator
| * | refactor the naming within plugin new generatorYves Senn2012-11-185-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-fixXavier Noria2013-01-061-0/+4
|\ \ \ | | | | | | | | Fix img width in guides
| * | | fix img width in guidesGosha Arinich2013-01-051-0/+4
| | | |
* | | | Merge pull request #8780 from diogomafra/require_core_extCarlos Antonio da Silva2013-01-061-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 Mafra2013-01-061-0/+1
| | | | | | | | | | | | | | | | | | | | module
* | | | | Needless requiresAkira Matsuda2013-01-062-6/+0
| | | | |
* | | | | Missing requiresAkira Matsuda2013-01-062-0/+2
| | | | |
* | | | | These are already required through AS/railsAkira Matsuda2013-01-065-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * core_ext/object/blank * concern * core_ext/class/attribute * deprecation
* | | | | Rescue from LoadError when trying to load the debugger gem for consoleCarlos Antonio da Silva2013-01-061-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 tableCarlos Antonio da Silva2013-01-062-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 itCarlos Antonio da Silva2013-01-064-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-classAndrew White2013-01-065-5/+5
|\ \ \ \ | | | | | | | | | | Delegate to :class rather than 'self.class'
| * | | | delegate to :class rather than 'self.class'Gosha Arinich2013-01-065-5/+5
| | | | |
* | | | | Refactor the logic that checks whether or not to emit the hidden id fieldCarlos Antonio da Silva2013-01-061-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | By checking for object.persisted? first, we avoid the hash lookups for new objects.
* | | | | Move the hidden :id field logic to where it belongs toCarlos Antonio da Silva2013-01-061-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When dealing with nested forms, Rails automatically generates a hidden field with the id value of the current object being generated by fields_for. This logic was inside the method that's available from the template object, but we just need it when really dealing with nested attributes, so moving the code to here makes more sense.