aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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-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-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. ...Jeremy Kemper2013-01-0631-230/+163
|/ /
* / Use whitelist to pass valid connection parameters to PGConn.Rafael Mendonça França2013-01-061-7/+10
|/
* 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
|\
| * 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 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::RoutesGosha Arinich2013-01-071-12/+11
* | Merge pull request #8782 from tank-bohr/masterRafael Mendonça França2013-01-061-2/+2
|\ \
| * | fix for rbxtank-bohr2013-01-071-2/+2
* | | Merge pull request #8781 from trisweb/tristan_8757_integer_column_nan_error_fixRafael Mendonça França2013-01-063-9/+12
|\ \ \ | |/ / |/| / | |/
| * Fix error when assigning NaN to an integer columnTristan Harward2013-01-063-9/+12
|/
* Missing requireAkira Matsuda2013-01-071-0/+2
* These are already required through AS/railsAkira Matsuda2013-01-078-12/+0
* Merge pull request #8263 from senny/refactor_plugin_new_generatorYehuda Katz2013-01-065-11/+13
|\
| * refactor the naming within plugin new generatorYves Senn2012-11-185-11/+13
* | Merge pull request #8770 from goshakkk/guides-img-fixXavier Noria2013-01-061-0/+4
|\ \
| * | 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 ...Diogo Mafra2013-01-061-0/+1
* | | | 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
* | | | Rescue from LoadError when trying to load the debugger gem for consoleCarlos Antonio da Silva2013-01-061-1/+1
|/ / /
* | | Rename route_wrapper partial layout to tableCarlos Antonio da Silva2013-01-062-1/+1
* | | Move table routes formatter class to the inspector and rename itCarlos Antonio da Silva2013-01-064-20/+20
* | | Merge pull request #8777 from goshakkk/delegate-classAndrew White2013-01-065-5/+5
|\ \ \
| * | | 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
* | | | Move the hidden :id field logic to where it belongs toCarlos Antonio da Silva2013-01-061-6/+9
* | | | Eliminate the usage of parent_builder option from form_forCarlos Antonio da Silva2013-01-061-19/+15
* | | | 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 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 shoul...David Heinemeier Hansson2013-01-061-6/+1