aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-ip-spoof-errors' of https://github.com/tamird/rails into ↵Andrew White2013-09-301-0/+10
|\ | | | | | | tamird-fix-ip-spoof-errors
| * make sure both headers are set before checking for ip spoofingTamir Duberstein2013-06-041-0/+10
| |
* | Merge pull request #10822 from gaurish/poolXavier Noria2013-09-241-0/+2
|\ \ | | | | | | Add note about database connection pool in postgres template
| * | Add notes about database connection pool [ci skip]Gaurish Sharma2013-09-221-0/+2
| | |
* | | Add a CHANGELOG entry about Web Console inclusionGenadi Samokovarov2013-09-241-0/+4
| | |
* | | Include web-console in new projects GemfileGenadi Samokovarov2013-09-241-0/+3
| | |
* | | bcrypt-ruby v3.1.2 supports Ruby 2.0 on WindowsT.J. Schuck2013-09-231-1/+1
| | |
* | | Merge pull request #12070 from wangjohn/small_refactors_to_generatorsRafael Mendonça França2013-09-231-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Small refactoring changes to generators. Conflicts: railties/lib/rails/generators/rails/controller/controller_generator.rb
| * | | Small refactoring changes to generators.wangjohn2013-08-292-5/+9
| | | | | | | | | | | | | | | | | | | | Made a method name clearer (added a bang to the end to show that it mutates arguments) and extracted indentation into its own method.
* | | | Only output Server logs in Developmentschneems2013-09-223-2/+18
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now when you start a server via `rails s`, the logger gets extended so that it logs to the file system and also to stdout. This extension behavior is not "intelligent" and if the default logger is already set to output to stdout, then the contents will be received twice. To capture logs in accordance with http://www.12factor.net/logs some platforms require the logs to be sent to standard out. If a logger is set to stdout, and the server is started using `rails server` instead of another method (i.e. `thin start` etc.) then the app will produce double logs. This PR fixes the issue by only extending the logger to standard out in the development environment. So that in production you don't get double logs like this: ``` ActionView::Template::Error (wrong number of arguments (5 for 4)): 1: <% lang_index = 0 %> 2: <div class="row"> 3: <ul class="nav nav-tabs nav-stacked span2" data-tabs="tabs" id="repo-tabs"> 4: <% repos.group_by(&:language).each do |lang, repos| %> 5: <% unless lang == nil %> 6: <li><a href="#<%= "#{lang.parameterize}#{lang.hash}" %>" data-toggle="tab"><%= lang %></a></li> 7: <% end -%> app/views/shared/_repos.html.erb:4:in `_app_views_shared__repos_html_erb___1685450633638247395_70300668607000' app/views/pages/index.html.erb:13:in `_app_views_pages_index_html_erb__2084723628308867770_70300687584880' ActionView::Template::Error (wrong number of arguments (5 for 4)): 1: <% lang_index = 0 %> 2: <div class="row"> 3: <ul class="nav nav-tabs nav-stacked span2" data-tabs="tabs" id="repo-tabs"> 4: <% repos.group_by(&:language).each do |lang, repos| %> 5: <% unless lang == nil %> 6: <li><a href="#<%= "#{lang.parameterize}#{lang.hash}" %>" data-toggle="tab"><%= lang %></a></li> 7: <% end -%> app/views/shared/_repos.html.erb:4:in `_app_views_shared__repos_html_erb___1685450633638247395_70300668607000' app/views/pages/index.html.erb:13:in `_app_views_pages_index_html_erb__2084723628308867770_70300687584880' ``` ATP Railties. Opened against master in favor of #10999
* | | Don't require using application_name before optionsPiotr Sarnacki2013-09-135-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit options for `rails new` and `rails plugin new` had to be passed in a strict order, trying to execute a following command: rails new -J path/to/app resulted in an error. This commit fixes the situation and allows to pass path to app anywhere after `new`
* | | Merge pull request #12216 from suginoy/a-anRafael Mendonça França2013-09-134-5/+5
|\ \ \ | | | | | | | | Fix typos: the indefinite articles(a -> an).
| * | | Fix typos: the indefinite articles(a -> an)SUGINO Yasuhiro2013-09-134-5/+5
| | | |
* | | | Missing destroy commandAkira Matsuda & Yukiko Kawamoto2013-09-131-0/+4
| | | |
* | | | Revert "Add meta tag with charset information to application layout."Aaron Patterson2013-09-111-1/+0
| | | | | | | | | | | | | | | | This reverts commit ba0407337e93c4ef55cef3472143f62e8a984a64.
* | | | Add meta tag with charset information to application layout.Steve Klabnik2013-09-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, our default HTML would validate properly, but would generate a warning: it doesn't declare a character encoding. According to [the spec][encoding-spec], if you don't specify an encoding, a 7 step algorithm happens, with a toooon of sub-steps. Or, we could just actually specify it. Since everything else in Rails assumes UTF-8, we should make sure pages are served with that encoding too. This meta tag is the simplest way to accomplish this. More resources: * http://blog.whatwg.org/the-road-to-html-5-character-encoding * http://www.w3.org/International/tutorials/tutorial-char-enc/ * http://validator.w3.org/ [encoding-spec]: http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html#determining-the-character-encoding
* | | | Use Ruby 2.0 caller_locations instead of caller if availableAkira Matsuda2013-09-101-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
* | | | Merge pull request #12173 from arunagw/fixes_reverted_by_revert_commitGuillermo Iguaran2013-09-102-8/+6
|\ \ \ \ | | | | | | | | | | Revert fixes
| * | | | grab executable from rubygemsArun Agrawal2013-09-091-1/+1
| | | | |
| * | | | Fixed API task fileArun Agrawal2013-09-091-7/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | 1. As we have vendor in AV only 2. No more vendor in AC 3. No vendor folder in AR
* / / / Remove BasicRendering testsJosé Valim2013-09-091-62/+0
|/ / /
* | | Merge pull request #12097 from kassio/remove-unused-delegate-on-railtieJosé Valim2013-08-311-2/+0
|\ \ \ | | | | | | | | Remove unused delegate
| * | | Remove unused delegateKassio Borges2013-08-311-2/+0
| | | | | | | | | | | | | | | | Related with commit 4a2a504
* | | | Merge pull request #11912 from jonkessler/respond-to-signature-fixesRafael Mendonça França2013-08-312-1/+8
|\ \ \ \ | |/ / / |/| | | Update Rails::Railtie::Configuration and ActionDispatch::Response#respond_to? to accept include_private argument
| * | | update Rails::Railtie::Configuration and ↵Jon Kessler2013-08-162-1/+8
| | | | | | | | | | | | | | | | ActionDispatch::Response#respond_to? to accept include_private argument
* | | | Using indent method to refactor controller generator.wangjohn2013-08-311-3/+3
| | | | | | | | | | | | | | | | [John J. Wang & Prathamesh Sonpatki]
* | | | Fix typo in generators test helpr -> helper [ci skip]Prathamesh Sonpatki2013-08-301-1/+1
| |/ / |/| |
* | | Refactoring Generators::Base.wangjohn2013-08-281-14/+17
| | | | | | | | | | | | | | | | | | | | | The defaults hash isn't used unless the +class_options+ hash has a particular key, so we don't need to compute it unless this is true. Also moving some code for extracting a module into its own method.
* | | Comply with current umask when generating new app:Thibault Jouan2013-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a new application using the default rails generator (`rails new my_app`), it will apply some permissions bypassing the current process umask. The `bin' directory and any files inside it will always be set a mode of 0755. This change removes the current umask bits from the mode applied by the generator on the `bin' directory and its content.
* | | Extend basic rendering, test it in railtiesŁukasz Strzałkowski2013-08-252-0/+68
| | |
* | | Add --skip-action-view to app generatorŁukasz Strzałkowski2013-08-254-2/+11
| | |
* | | Include AV railtie when we're not loading full rails stackŁukasz Strzałkowski2013-08-251-0/+1
| | |
* | | Missing AV requires in railties testsŁukasz Strzałkowski2013-08-252-0/+2
| | |
* | | Include AV railtie in railties isolation testsŁukasz Strzałkowski2013-08-251-0/+1
| | |
* | | Add AV as development dependency for railtiesŁukasz Strzałkowski2013-08-252-0/+3
| | | | | | | | | | | | It's needed for tests
* | | Fix railtie testsŁukasz Strzałkowski2013-08-251-0/+2
| | |
* | | Add loading 'action_view' as part of rails/allŁukasz Strzałkowski2013-08-251-0/+1
| | |
* | | Fix typo in file path, should include extension.Semyon Perepelitsa2013-08-231-1/+1
| | |
* | | Fix the indentation on the from template of the scaffold generatorRafael Mendonça França2013-08-192-5/+5
| | |
* | | 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]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 10:30:21 +0000