aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Reverting commit regarding public/index.html (no longer in Rails 4.)Christine Hertzel2013-03-011-2/+0
| | | | This reverts commit f8461f73c77c186ad0aa735fe9877990bffe1990.
* Fixed grammatical error and simplified paragraph concerning controllers.Christine Hertzel2013-03-011-1/+1
| | | | Signed-off-by: Chelsea Macaluso <c.macaluso@modcloth.com>
* Clarified removal of public/index.html fileChelsea Macaluso2013-03-011-0/+2
| | | | Signed-off-by: Trent Michaels <t.michaels@modcloth.com>
* Clarified need to remove existing code in welcome index.Trent Michaels2013-03-011-1/+1
| | | | Signed-off-by: Chelsea Macaluso <c.macaluso@modcloth.com>
* fix broken links to README docs in introMike Munroe2013-02-281-2/+2
|
* change log4r link to most recent, updated locationMike Munroe2013-02-281-1/+1
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-02-2613-23/+37
|\
| * Typo fixCarson McDonald2013-02-251-1/+1
| |
| * BELONGS TO ASSOCIATION | Typo fixlibin2013-02-251-1/+1
| |
| * Update guide doc to use migration shortcutsQihuan Piao2013-02-251-1/+1
| |
| * Wrap `around_action` word with <code> tagQihuan Piao2013-02-251-1/+1
| |
| * Added documentation for beginning_of_minute and end_of_minute to Active ↵Gagan Awhad2013-02-221-1/+19
| | | | | | | | Support Core Extensions guide
| * Link is not relevant anymorebobbus2013-02-221-5/+0
| | | | | | Cannot find the screencast on the internet, guess it was removed
| * Typo fix.Carson McDonald2013-02-211-1/+1
| |
| * Update the "upgrading" guide for people coming from 3.0 and 3.1. The latest ↵Arne Brasseur2013-02-201-4/+4
| | | | | | | | versions for 3.1 and 3.2 are now 3.2.12 and 3.1.11 respectively.
| * improve grammar describing ActionDispatch::Cookies::CookieJar#deleteWeston Platter2013-02-191-1/+1
| |
| * improve grammar describing ActionDispatch::Cookies::CookieJar#deleteWeston Platter2013-02-191-1/+1
| |
| * Corrected link anchor and added colons for continuityDoug Yun2013-02-192-3/+3
| |
| * Fix bug in code example from layouts and rendering guideBrian Kim2013-02-181-1/+2
| | | | | | | | | | The code in 2.3.2 assumed that render has an alert option like redirect_to to create a flash alert message, but it doesn't.
| * Update guides/source/active_record_querying.mdHanfei Shen2013-02-191-2/+2
| | | | | | | | Fix missing `ORDER BY id ASC` for Client.first(2); Uppercase the little y in the SQL equivalent of the Client.last(2).
| * clarify singular and plural routesNoam Gagliardi2013-02-181-1/+1
| | | | | | Found the wording on line 158 somewhat confusing. Added short example to clarify.
* | Merge pull request #9441 from rubys/masterGuillermo Iguaran2013-02-261-2/+9
|\ \ | | | | | | This is a small thing, motivated by https://github.com/rails/rails/issues/9419
| * | Allow both a path and an option on root in config/routesSam Ruby2013-02-261-2/+9
|/ /
* | Merge pull request #9414 from senny/9275_order_with_symbol_and_joinRafael Mendonça França2013-02-264-2/+34
|\ \ | | | | | | Expand order(:symbol) to "table".symbol to prevent broken queries on PG.
| * | Expand order(:symbol) to "table".symbol to prevent broken queries on PG.Yves Senn2013-02-254-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #9275. When `#order` is called with a Symbol this patch will prepend the quoted_table_name. Before the postgresql adapter failed to build queries containg a join and an order with a symbol. This expansion happens for all adapters.
* | | No need to send public methodsAkira Matsuda2013-02-263-3/+3
| | |
* | | Merge pull request #9429 from frodsan/racc_jruby_incompatibilityGuillermo Iguaran2013-02-251-3/+3
|\ \ \ | | | | | | | | JRuby does not support racc, include it only in ruby platform
| * | | JRuby does not support racc, include it only in ruby platformFrancesco Rodriguez2013-02-261-3/+3
| | | |
* | | | Merge pull request #9419 from banyan/change-default-root-route-helperGuillermo Iguaran2013-02-253-4/+4
|\ \ \ \ | |/ / / |/| | | Change default root route helper
| * | | Change default root route helperKohei Hasegawa2013-02-263-4/+4
| | | |
* | | | Apparently we can't get away from adding lib to the load pathJosé Valim2013-02-251-0/+1
| | | |
* | | | Plugins can use a similar bootscript to Rails appsJosé Valim2013-02-251-8/+3
| | | |
* | | | Merge pull request #9425 from dickeyxxx/patch-1Rafael Mendonça França2013-02-251-1/+1
|\ \ \ \ | | | | | | | | | | small typo on upgrade guide
| * | | | small typoJeff Dickey2013-02-251-1/+1
|/ / / / | | | | | | | | small typo fix
* | | | Bundler 1.3.0 released. We prefer it for new binstub behavior.Jeremy Kemper2013-02-251-1/+1
| | | |
* | | | Bump i18n version to 0.6.2Guillermo Iguaran2013-02-251-1/+1
| | | |
* | | | Are was releaseRafael Mendonça França2013-02-252-3/+1
| | | |
* | | | Bump sass-rails and coffee-rails to 4.0.0.beta1 in GemfileGuillermo Iguaran2013-02-252-3/+3
| | | |
* | | | removes redundant requireXavier Noria2013-02-251-2/+0
| | | | | | | | | | | | | | | | It turns out this file is required in active_record.rb.
* | | | Merge pull request #9420 from robertomiranda/remove-sprockets-railsGuillermo Iguaran2013-02-251-1/+0
|\ \ \ \ | | | | | | | | | | Remove sprockets-rails from the Gemfile generator
| * | | | Remove sprockets-rails from the Gemfile generatorrobertomiranda2013-02-251-1/+0
| | | | |
* | | | | typoXavier Noria2013-02-251-1/+1
| | | | |
* | | | | AR loads activerecord-deprecated_finders, no need to add it to the GemfileXavier Noria2013-02-252-6/+7
|/ / / /
* | | | sprockets 2.0.0.rc3 is in rails gemspec alreadyGuillermo Iguaran2013-02-251-2/+0
| | | |
* | | | ar-deprecated_finders is already in the gemspecJosé Valim2013-02-251-2/+0
| | | |
* | | | I released 0.0.3 some time agoRafael Mendonça França2013-02-251-1/+1
| | | |
* | | | jquery-rails 2.2.1 was releasedRafael Mendonça França2013-02-251-1/+1
| | | |
* | | | Remove rack-test git dependencyJosé Valim2013-02-251-1/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | The dependency was introduced in this commit: 002713c64568114f3754799acc0723ea0d442f7a which has been released a long time ago
* | | New CHANGELOG entries always on top [ci skip]Rafael Mendonça França2013-02-251-4/+4
| | |
* | | Merge pull request #9197 from yaotti/fix/overriden-attr-on-dupRafael Mendonça França2013-02-253-1/+13
|\ \ \ | | | | | | | | Fix: Overriding attributes on `dup` by default scopes