aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* fix template GemfilesAaron Patterson2013-10-283-12/+25
|
* always call set_default_accessors from create_rootAaron Patterson2013-10-281-0/+1
|
* Fix indentation [ci skip]Carlos Antonio da Silva2013-10-271-2/+2
|
* Fixed tests for app_generatorArun Agrawal2013-10-272-7/+18
| | | | | | Added test for jbuilder and web-console inclusion. Added README.rdoc for test default files
* Remove dead code after the skip_jbuilder option removalRafael Mendonça França2013-10-271-1/+0
|
* remove the skip_jbuilder option, just rm it from the GemfileAaron Patterson2013-10-271-3/+0
|
* add comments and fix variable name. oops, forgot to add this. orz!Aaron Patterson2013-10-271-2/+2
|
* remove unused methodsAaron Patterson2013-10-271-4/+0
|
* Merge remote-tracking branch 'origin/master'Aaron Patterson2013-10-275-12/+21
|\ | | | | | | | | | | | | | | * origin/master: Removal of javascript related gems when creating an app Conflicts: railties/lib/rails/generators/app_base.rb
| * Merge pull request #12657 from robin850/skip-javascriptGuillermo Iguaran2013-10-275-14/+21
| |\ | | | | | | Removal of javascript related files when creating an app
| | * Removal of javascript related gems when creating an appRobin Dupret2013-10-275-14/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 0417bc8 add the coffee-rails and javascript runtime gems even when passing the --skip-javascript option but this is not the desired behavior. Also remove all javascript related stuff in the generated application such as the vendor/assets/javascripts folder.
* | | add an option to skip jbuilderAaron Patterson2013-10-271-0/+4
| | |
* | | fix variable nameAaron Patterson2013-10-272-3/+3
| | |
* | | add jbuilder web-console and sdoc to the GemEntry listAaron Patterson2013-10-273-29/+33
| | |
* | | fix the class nameAaron Patterson2013-10-271-17/+17
| | |
* | | refactor Gemfile templateAaron Patterson2013-10-271-8/+6
| | |
* | | use the GemfileGem object for more entriesAaron Patterson2013-10-273-56/+53
| | |
* | | add the database gemAaron Patterson2013-10-273-9/+8
| | |
* | | get a list of gems when filling out the gemfileAaron Patterson2013-10-273-13/+42
|/ /
* | set accessors in the set_accessors! methodAaron Patterson2013-10-272-2/+2
| |
* | Improve usage example for model generatorAndrey Koleshko2013-10-251-1/+1
|/
* this should be private, no other instances of Root should call itAaron Patterson2013-10-221-1/+1
|
* do not search through the keys array twiceAaron Patterson2013-10-221-2/+3
|
* use the provided block to filter listsAaron Patterson2013-10-221-11/+5
|
* stop using `send` so that method privacy is respected and we get a smallAaron Patterson2013-10-221-7/+7
| | | | perf increase
* Make the application name snake cased when it contains spacesRobin Dupret2013-10-224-2/+20
| | | | | | | | | | | | | The application name is used to fill the `database.yml` and `session_store.rb` files ; previously, if the provided name contained whitespaces, it led to unexpected names in these files. Since Shellwords.escape adds backslashes to escape spaces, the app_name should remove them and replace any space with an underscore (just like periods previously). Also improve the assert_file helper to work with paths containing spaces using String#shellescape.
* Fix typo in the changelog entryRafael Mendonça França2013-10-151-1/+1
| | | | [ci skip]
* Merge pull request #12524 from kirs/patch-1Rafael Mendonça França2013-10-151-1/+1
|\ | | | | Prepare generated Gemfile for Capistrano 3
| * Prepare generated Gemfile for Capistrano 3Kir Shatrov2013-10-151-1/+1
| | | | | | | | | | | | | | Capistrano 3 is now rails-less, so we need to encourage developers to use capistrano-rails gem. More details: http://www.capistranorb.com/documentation/frameworks/ruby-on-rails/ [ci skip]
* | Added --model-name option scaffold_controller_generator.yalab2013-10-155-6/+53
|/
* Make logging to stdout work again with implicit `development` envMarc Schütz2013-10-133-13/+54
|
* No need to require rbconfig as we are using Gem.rubyArun Agrawal2013-10-111-1/+0
|
* Expose MiddlewareStack#unshift to environment configuration.Ben Pickles2013-10-093-0/+14
|
* instrumenter can't be cached because the app could be called fromAaron Patterson2013-10-041-3/+4
| | | | different threads.
* 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