aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-08-173-13/+10
|\ | | | | | | | | | | | | | | Conflicts: actionview/README.rdoc activerecord/lib/active_record/migration.rb guides/source/development_dependencies_install.md guides/source/getting_started.md
| * Revert "Merge branch 'master' of github.com:rails/docrails"Vijay Dev2013-08-173-13/+10
| | | | | | | | | | | | | | This reverts commit 70d6e16fbad75b89dd1798ed697e7732b8606fa3, reversing changes made to ea4db3bc078fb3093ecdddffdf4f2f4ff3e1e8f9. Seems to be a code merge done by mistake.
| * Revert "Removing obsolete html tags in favor of markdown code block"Avner Cohen2013-08-062-51/+51
| | | | | | | | This reverts commit 157dc275da0ad38635337b7c1d96de656d91de8e.
| * Removing obsolete html tags in favor of markdown code block.Avner Cohen2013-08-062-51/+51
| |
* | fix build error caused by #11900.Yves Senn2013-08-151-1/+1
| |
* | Adding LESS to rake notesJosh Crowder2013-08-153-1/+7
| |
* | Generate namespaced routes correctly for generators. Fix for #11532Prathamesh Sonpatki2013-08-143-1/+58
| |
* | "Naked" rescue clauses only catch StandardError subclasses.thedarkone2013-08-062-3/+6
| | | | | | | | Similar to #11497.
* | Add a missing require.thedarkone2013-08-061-0/+1
| | | | | | | | This makes the rack_logger_test.rb runnable by itself (outside of the `rake test` suite).
* | Use the right instrumentation nameRafael Mendonça França2013-08-053-3/+7
| | | | | | | | | | | | | | | | | | The pattern is event.component Closes #11769 Conflicts: railties/CHANGELOG.md
* | Add CHANGELOG entry for #11665Rafael Mendonça França2013-08-041-0/+4
| | | | | | | | [ci skip]
* | Merge pull request #11665 from mshytikov/fix-config-log_levelRafael Mendonça França2013-08-042-1/+10
|\ \ | | | | | | Rails.logger should have level specified by config.log_level.
| * | Rails.logger should have level specified by config.log_level. Max Shytikov2013-07-302-1/+10
| | | | | | | | | Fix bug when log level of Rails.logger (which was set via config.logger) does not match the config.log_level.
* | | Revert "Isolate railties Generators Tests"Guillermo Iguaran2013-08-021-1/+0
| | | | | | | | | | | | | | | This fixes railties tests in JRuby but break it in MRI This reverts commit fea99276c7024f183bf72a16ad9f36af4bae1d42.
* | | Isolate railties Generators TestsAlex Tambellini2013-08-021-0/+1
| | | | | | | | | | | | With this change jruby should pass all of the railties tests.
* | | Added action_view in Rails::InfoArun Agrawal2013-08-021-1/+1
| | |
* | | Merge pull request #11601 from TylerRick/dont_permanently_silence_all_warningsRafael Mendonça França2013-07-301-2/+0
|\ \ \ | |/ / |/| | Remove $VERBOSE = nil from tasks.rb
| * | Remove $VERBOSE = nil from tasks.rbTyler Rick2013-07-251-2/+0
| | | | | | | | | | | | | | | | | | Permanently setting $VERBOSE to nil causes unwanted side effects (warnings generated by app code are silenced when triggered by a rake task but visible otherwise). silence_warnings {} would be safer to use here since it resets $VERBOSE back to what it was when the block finishes.
* | | Move changelog entry to the top [ci skip]Carlos Antonio da Silva2013-07-291-5/+7
| | |
* | | Changed stylesheet load order in the stylesheet manifest generator.Pawel Janiak2013-07-283-6/+14
| |/ |/|
* | Removed excluding vendor from API doc [ci skip]Arun Agrawal2013-07-261-6/+3
| | | | | | | | These folder not exists in system
* | Excluding action_view/vendor in API [ci skip]Arun Agrawal2013-07-261-1/+2
|/
* grab executable from rubygemsAaron Patterson2013-07-251-1/+1
|
* Use Ruby 2.0 caller_locations instead of caller if availableAkira Matsuda2013-07-251-2/+7
| | | | | | | | | * we no more have to manipulate the each caller strings by ourselves using caller_locations * caller_locations runs slightly faster, and creates less objects than good old caller Benchmark (loading an Engine 1000 times): caller: 262.89 ms caller_locations: 186.068 ms
* Privatize non-test methodAkira Matsuda2013-07-251-0/+1
|
* Use GeneratedAttribute#column_name if #reference? scaffold_generator in ↵Zachary Scott2013-07-232-0/+29
| | | | _form view [Fixes #11573]
* Stop reading the same file twice for testing different contentCarlos Antonio da Silva2013-07-221-8/+4
| | | | | assert_file already gives this functionality for free by passing multiple contents.
* Revert "Match Dev/Prod parity for Index Page"Piotr Sarnacki2013-07-223-5/+3
| | | | | | | | Showing welcome page in production can expose information, which should not be visible on production if people don't override the default root route. This reverts commit b0caea29c2da9f4c8bb958019813482da297067d.
* Merge pull request #11514 from schneems/schneems/dev-prod-parity-indexPiotr Sarnacki2013-07-223-3/+5
|\ | | | | Match Dev/Prod parity for Index Page
| * Match Dev/Prod parity for Index Pageschneems2013-07-203-3/+5
| | | | | | | | | | | | | | With Rails 4 the default index page was moved from a static file `index.html` inside the `public/` folder to an internal controller/view inside of the railties gem. This was to allow use of erb in the default index page and to remove the requirement that new apps must delete a static file to make their index pages work. While this was a good change, the functionality was unexpected to developers who wish to get their apps running in production ASAP. They will create a new app `rails new my app`, start a server to verify it works, then immediately deploy the app to verify that it can start working in production. Unfortunately locally they see a page when they visit `localhost:3000` when they visit their production app they get an error page. We initially anticipated this problem in the original pull request, but did not properly anticipate the severity or quantity of people who would like this functionality. Having a default index page serves as an excellent litmus test for a passed deploy on default apps, and it is very unexpected to have a page work locally, but not on production. This change makes the default index page available in production if the developer has not over-written it by defining their own `root` path inside of routes.
* | Clear named routes when routes.rb is reloadedAndrew White2013-07-211-0/+45
| | | | | | | | | | | | | | | | Fix an issue where Journey was failing to clear the named routes hash when the routes were reloaded and since it doesn't overwrite existing routes then if a route changed but wasn't renamed it kept the old definition. This was being masked by the optimised url helpers so it only became apparent when passing an options hash to the url helper.
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-07-211-0/+6
|\ \
| * | use the appropriate RDoc code markupDamien Mathieu2013-07-181-2/+2
| | | | | | | | | | | | Thanks @fxn
| * | document the Rails::ConsoleMethods#helper and #controller methodsDamien Mathieu2013-07-181-0/+6
| | | | | | | | | | | | Closes rails/rails#11362
* | | Removed information about creating database[ci skip]Prathamesh Sonpatki2013-07-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - As default index page is no longer in public folder, rails hits the welcome controller in railties for index action - If the database is not created or username and password are incorrect in database.yml, those errors are first shown before index action succeeds - welcome#index succeeds iff the database is created with correct details in database.yml - So this information about creating database is not required in the index template
* | | Merge pull request #11465 from arunagw/removed_missleading_readme_link_docXavier Noria2013-07-171-1/+1
|\ \ \ | | | | | | | | Fixed README link in API
| * | | Fixed README link in API [ci skip]Arun Agrawal2013-07-171-1/+1
| | |/ | |/| | | | | | | This should not be a link because it's creating a link with activesupport README right now
* / | bcrypt-ruby stable is 3.1Burkhard Vogel-Kreykenbohm2013-07-171-1/+1
|/ /
* | Fixed USAGE file for generator [ci skip]Arun Agrawal2013-07-161-1/+1
| |
* | Added generated unit test for generator generator and new test:generators ↵Josef Šimánek2013-07-168-1/+72
| | | | | | | | rake task included in test:all rake task.
* | Added CheckPending middleware in defaultArun Agrawal2013-07-151-0/+4
| | | | | | | | | | | | | | | | | | As this middleware comes by default in a new rails app Added test to check omit for CheckPending when Active Record is not included.
* | No need to add config for x_sendfile_headerArun Agrawal2013-07-151-2/+0
| | | | | | | | Rack::Sendfile is loaded by default now
* | Rack::Sendfile is now included in middleware by default, change tests to ↵Guillermo Iguaran2013-07-151-10/+4
| | | | | | | | reflect that
* | Revert "Don't use Rack::Sendfile middleware if x_sendfile_header is not present"Santiago Pastorino2013-07-151-3/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 19ac034bdc9be175eff7cf54208ba14b43d97681. And allows webservers to configure X-Sendfile-Type. Closes #11440 thanks to [@MSch] Conflicts: railties/lib/rails/application.rb
* | Removed unused require from RakefileArun Agrawal2013-07-141-4/+0
| |
* | Removed unused broken task for update README [ci skip]Arun Agrawal2013-07-141-9/+0
| |
* | Merge pull request #11425 from arunagw/actionview_api_generationXavier Noria2013-07-141-8/+7
|\ \ | | | | | | Actionview api generation
| * | Added actionview in API generation [ci skip]Arun Agrawal2013-07-141-8/+7
| | | | | | | | | CHANGELOG and LICENSE removed as suggested
* | | This is not needed anymore, before_initialize block can access configSantiago Pastorino2013-07-141-1/+0
|/ /
* | Remove update:application_controller rake task.Josef Šimánek2013-07-132-12/+6
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 10:37:01 +0000