aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixing build broken by this changeArun Agrawal2013-05-131-2/+2
| | | | c43ca06ca091fc09e2c86bb051ac92b648f12b64
* Merge pull request #10587 from vipulnsward/indent_varRafael Mendonça França2013-05-121-1/+2
|\ | | | | Extract variable out of loop
| * Extract variable out of loopVipul A M2013-05-131-1/+2
| |
* | Merge pull request #10584 from alindeman/range-missing-alias-attributeRafael Mendonça França2013-05-122-0/+4
|\ \ | | | | | | Fixes NoMethodError: `alias_method_chain` when requiring just active_support/core_ext
| * | Fixes NoMethodError: `alias_method_chain` when requiring just ↵Andy Lindeman2013-05-122-0/+4
| |/ | | | | | | | | | | active_support/core_ext * Each file that uses `alias_method_chain` brings it in explicitly
* | Merge pull request #10586 from AJ-Acevedo/commentsRafael Mendonça França2013-05-121-1/+1
|\ \ | |/ |/| Updated comment to Rails 4
| * Updated comment to Rails 4AJ Acevedo2013-05-121-1/+1
|/
* Merge pull request #10581 from shime/better-generator-errorRafael Mendonça França2013-05-121-1/+9
|\ | | | | better error message when app name is not passed in `rails new`
| * better error message when app name is not passed in `rails new`Hrvoje Šimić2013-05-121-1/+9
| | | | | | | | | | | | | | | | | | | | Prior to this change, for the following command: $ rails new we received "Options should be given after the application name" as an error message. This is outdated and should be "Application name should be provided in arguments".
* | Merge pull request #10580 from CodeTag/masterGuillermo Iguaran2013-05-121-9/+3
|\ \ | |/ |/| Code cleanup for ActionDispatch::Flash#call
| * Code cleanup for ActionDispatch::Flash#callJulian Vargas2013-05-121-9/+3
|/ | | | | | | The nested `if` was replaced by using `presence` which takes account for the given hash when it is `nil` or when it is empty. The `else` was removed because what it was doing was to assign to `env[KEY]` the value it already had.
* Merge pull request #10577 from vipulnsward/fix_method_typosRafael Mendonça França2013-05-123-3/+3
|\ | | | | Fix class and method name typos
| * Fix class and method name typosVipul A M2013-05-123-3/+3
| |
* | Merge pull request #10560 from jkutner/masterRafael Mendonça França2013-05-123-10/+0
|\ \ | | | | | | Remove jruby-openssl from default Gemfile
| * | Removed jruby-openssl gem from default template GemfileJoe Kutner2013-05-103-10/+0
| | |
* | | Fix typo: require -> requiresRafael Mendonça França2013-05-121-1/+1
| | | | | | | | | | | | [ci skip]
* | | Add CHANGELOG entry for #10576Rafael Mendonça França2013-05-121-0/+7
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #10556 from Empact/deprecate-schema-statements-distinctRafael Mendonça França2013-05-123-13/+31
| | | | | | | | | | | | | | | | | | Deprecate SchemaStatements#distinct, and make SchemaStatements#columns_for_distinct nodoc. Conflicts: activerecord/CHANGELOG.md
* | | Some editorial changes on the documentation.Rafael Mendonça França2013-05-122-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | * Remove some autolinks * Fix the rendered result * Change sql to SQL [ci skip]
* | | respond_to -> respond to in a message from AM::LintXavier Noria2013-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The error message uses English to say that the object should respond to a certain method. You check that with respond_to, but that's not English. This makes this error message also consistent with the rest.
* | | specify that dom_(id|class) are deprecated in controllers, views are fineXavier Noria2013-05-121-1/+1
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-1226-89/+120
|\ \ \ | |_|/ |/| | | | | | | | Conflicts: activesupport/lib/active_support/callbacks.rb
| * | copy edits [ci skip]Vijay Dev2013-05-121-5/+1
| | |
| * | ruby -> RubyPrathamesh Sonpatki2013-05-123-3/+3
| | |
| * | added docs for InheritedOptions class [ci skip]Anton Kalyaev2013-05-111-0/+8
| | |
| * | Fixed boolean validation example to use inclusion instead of presence on ↵Dana Jones2013-05-101-2/+3
| | | | | | | | | | | | migrations guide
| * | RDoc style for ActionMailer::Base#mailZachary Scott2013-05-101-23/+25
| | |
| * | Document ActionMailer::Base::default, ::mailer_name, and #mailer_nameZachary Scott2013-05-101-14/+25
| | |
| * | Added documentation for ↵aditya-kapoor2013-05-101-0/+4
| | | | | | | | | | | | ActiveRecord::Generators::MigrationGenerator.next_migration_number
| * | Added documentation for ActiveRecord::Base#next_migration_numberaditya-kapoor2013-05-091-0/+5
| | |
| * | changed rails -> Rails at two placesaditya-kapoor2013-05-092-2/+2
| | |
| * | minor rdoc cleanup for reflection methodsNeeraj Singh2013-05-091-4/+4
| | |
| * | Fix Typo xml -> XML, json -> JSONPrathamesh Sonpatki2013-05-081-2/+2
| | |
| * | Changed spelling of Busines to Businessaditya-kapoor2013-05-081-1/+1
| | |
| * | according to @fxn it's ERB not ERb.Yves Senn2013-05-071-2/+1
| | |
| * | XML-files isn't a wordWaynn Lue2013-05-061-1/+1
| | |
| * | Fix grammar on AM.mailer_name documentation.Hendy Tanata2013-05-061-1/+1
| | |
| * | Improve model generator USAGE grammarMatthew Michihara2013-05-051-5/+5
| | |
| * | 2.15.1 is the first release that supports Rails 4.Sam Ruby2013-05-051-1/+1
| | | | | | | | | | | | specifically manifest.json
| * | dir -> directoryPrathamesh Sonpatki2013-05-042-2/+2
| | |
| * | Changing the wordings in a few placesAkshay Khole2013-05-041-2/+2
| | |
| * | comments in the callbacks description are in present tenseAkshay Khole2013-05-041-3/+3
| | |
| * | Update CreateComments migration to reflect the output from Rails 4.Douglas Teoh2013-05-041-9/+5
| | |
| * | Fix another incorrect post_path link generation.Douglas Teoh2013-05-041-1/+1
| | |
| * | Remove unopened closing brace.Douglas Teoh2013-05-041-2/+1
| | |
| * | Fix incorrect post_path link generation.Douglas Teoh2013-05-041-1/+1
| | |
| * | Add some documentation for AM.mailer_namePrem Sichanugrist2013-05-031-0/+2
| | |
| * | replace apostrophe with backquote for matching [ci skip]Anton Kalyaev2013-05-031-2/+2
| | |
| * | Capitalizing internet to Internet. [ci skip]Akshay Khole2013-05-032-2/+2
| | |
| * | added to rdoc for unscope that default_scope winsNeeraj Singh2013-05-031-0/+3
| | |