aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | Eliminate the usage of parent_builder option from form_forCarlos Antonio da Silva2013-01-061-19/+15
| | | | | | | | | | | | | | | | Just use it internally from fields_for until we come up with a better solution.
* | | | Do not call fields_for from form_for, to avoid instantiating two buildersCarlos Antonio da Silva2013-01-062-6/+18
| | | |
* | | | Refactor to not call path.ast twiceCarlos Antonio da Silva2013-01-061-2/+3
| | | |
* | | | Merge pull request #8779 from goshakkk/refactor-route-astCarlos Antonio da Silva2013-01-061-5/+4
|\ \ \ \ | | | | | | | | | | Refactor Route#ast to use or-equals and block, instead of return with a check
| * | | | refactor Route#ast to use or-equals and block, instead of return with a condGosha Arinich2013-01-061-5/+4
| | | | |
* | | | | Improve javascript in welcome page [ci skip]Carlos Antonio da Silva2013-01-061-4/+5
| | | | |
* | | | | This is not that common of a change to warrant top-line billing and you ↵David Heinemeier Hansson2013-01-061-6/+1
| | | | | | | | | | | | | | | | | | | | should read more about the consequences than just toggling a boolean to make best use of it
* | | | | Include the standard reminder that you need to restart for changes in ↵David Heinemeier Hansson2013-01-062-0/+4
|/ / / / | | | | | | | | | | | | config/initializers to take effect
* | | | Update generated app's README [ci skip]Akira Matsuda2013-01-061-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * a controller that destroying Weblogs might be WeblogsController * a controller that indexing Posts might be PostsController * Post.all returns a Relation * modernize Model.inspect results
* | | | Remove unnecessary begin..rescue..end, use only rescueAkira Matsuda2013-01-0615-123/+94
| | | |
* | | | The controller generator invokes assets generator in additionAkira Matsuda2013-01-061-1/+1
| | | |
* | | | Fix generated migration file name in model generator USAGEAkira Matsuda2013-01-061-7/+7
| | | |
* | | | Update mailer generator USAGEAkira Matsuda2013-01-061-3/+2
|/ / / | | | | | | | | | | | | * it does not generate fixtures * it generates .text.erb templates
* | | Merge pull request #8774 from goshakkk/multiline-block-do-endCarlos Antonio da Silva2013-01-053-6/+6
|\ \ \ | | | | | | | | Prefer do-end for multiline block [ci skip]
| * | | prefer do-end for multiline blockGosha Arinich2013-01-063-6/+6
|/ / /
* | | Merge pull request #8772 from goshakkk/guides-warning-fixRafael Mendonça França2013-01-051-1/+1
|\ \ \ | | | | | | | | Fix guides' warning bottom padding
| * | | fix guides' warning bottom paddingGosha Arinich2013-01-061-1/+1
|/ / /
* | | Remove the content_tag_for change from CHANGELOG since it was revertedRafael Mendonça França2013-01-051-5/+3
| | |
* | | Merge pull request #8771 from lucasmazza/unobtrusive-javascript-examplesSteve Klabnik2013-01-051-31/+33
|\ \ \ | | | | | | | | New code examples on "Working with JavaScript in Rails" guide.
| * | | Update some code examples on the "Working with JavaScript in Rails" guide.Lucas Mazza2013-01-051-31/+33
| | | |
* | | | Fix documentation to content_tag_for [ci skip]Rafael Mendonça França2013-01-051-2/+2
|/ / /
* | | Move config.filter_parameters to you own initializer fileRafael Mendonça França2013-01-053-5/+4
| | | | | | | | | | | | This is very rarely changed and does not deserve to be in application.rb
* | | Merge pull request #8766 from jcoglan/session_token_docsAndrew White2013-01-051-7/+4
|\ \ \ | | | | | | | | | | | | | | | | Remove suggestion that Procs can be used as session secrets. [ci skip]
| * | | Remove suggestion that Procs can be used as session secrets.James Coglan2013-01-051-7/+4
| | | |