Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2015-01-03 | 1 | -0/+8 |
|\ | |||||
| * | Add docs for `Rails.env` and `Rails.env=` | claudiob | 2014-12-22 | 1 | -0/+8 |
| | | | | | | | | [ci skip] | ||||
* | | Merge pull request #18309 from PaBLoX-CL/fix-fixtures-references | Rafael Mendonça França | 2015-01-02 | 3 | -5/+11 |
|\ \ | | | | | | | | | | | | | Generated fixtures won't use parent_id when generated with parent:references | ||||
| * | | Generated fixtures won't use parent_id when generated with parent:references | Pablo Olmos de Aguilera Corradini | 2015-01-02 | 2 | -5/+7 |
|/ / | | | | | | | Fix #18301 | ||||
* | | Remove warnings | Carlos Antonio da Silva | 2015-01-02 | 1 | -2/+2 |
| | | | | | | | | | | warning: ambiguous first argument; put parentheses or a space even after `/' operator'` | ||||
* | | Verify the helper name with plural as it is generated | Carlos Antonio da Silva | 2015-01-02 | 1 | -1/+1 |
| | | | | | | | | Thanks @robin850. | ||||
* | | Add --skip-action-mailer (or -M) to rails generate | claudiob | 2015-01-01 | 10 | -4/+75 |
| | | |||||
* | | Fix scaffold generator with --helper=false option | Rafael Mendonça França | 2015-01-01 | 2 | -0/+15 |
| | | |||||
* | | Fix test description to match the test behaviour | Rafael Mendonça França | 2015-01-01 | 1 | -1/+1 |
| | | |||||
* | | Update copyright notices to 2015 [ci skip] | Arun Agrawal | 2014-12-31 | 1 | -1/+1 |
| | | |||||
* | | Fix description for application_name method - change simple to simply | Prathamesh Sonpatki | 2014-12-30 | 1 | -1/+1 |
| | | | | | | | | [ci skip] | ||||
* | | Merge pull request #18240 from shunsukeaida/add_tzinfo_data_to_plugin_gemfile | Rafael Mendonça França | 2014-12-29 | 1 | -0/+4 |
|\ \ | | | | | | | plugin's gemfile also needs tzinfo-data in Windows | ||||
| * | | plugin's gemfile also needs tzinfo-data in Windows | ShunsukeAida | 2014-12-30 | 1 | -0/+4 |
| | | | |||||
* | | | Remove some warning with Ruby 2.2 | Rafael Mendonça França | 2014-12-29 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #18209 from claudiob/bump-to-2-2 | Guillermo Iguaran | 2014-12-28 | 2 | -4/+4 |
|\ \ | | | | | | | Require Ruby 2.2 for Rails 5.0 | ||||
| * | | Require Ruby 2.2 for Rails 5.0 | claudiob | 2014-12-26 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | Stems from [this comment](https://github.com/rails/rails/pull/18203#issuecomment-68138096) by @robin850 and by the blog post http://weblog.rubyonrails.org/2014/12/19/Rails-4-2-final | ||||
* | | | actually autoload all second-level directories called `app/*/concerns` | Alex Robbin | 2014-12-26 | 3 | -4/+34 |
|/ / | |||||
* | | - Changed `paths` to `routing_paths` to avoid warning `possible reference to ↵ | Vipul A M | 2014-12-26 | 1 | -3/+3 |
| | | | | | | | | past scope` | ||||
* | | Remove unnecessary double space | Kenta Okamoto | 2014-12-26 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #18170 from tgxworld/add_docs_for_rails_application_secrets | Sean Griffin | 2014-12-23 | 1 | -1/+15 |
|\ \ | | | | | | | | | | [ci skip] | ||||
| * | | Rails::Application#secrets should be documented. | Guo Xiang Tan | 2014-12-24 | 1 | -1/+15 |
| | | | |||||
* | | | Add test missed by a03ea684efc3505647cf0327a501aa2dbb591ad2 | Sean Griffin | 2014-12-22 | 1 | -2/+3 |
| | | | |||||
* | | | Use the new `foreign_key` option on `references` in generators | Sean Griffin | 2014-12-22 | 3 | -5/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes `rails g model Post user:references` from def change create_table :posts do |t| t.references :user, index: true end add_foreign_key :posts, :users end to def change create_table :posts do |t| t.references :user, index: true, foreign_key: true end end Changes `rails g migration add_user_to_posts user:references` from def change add_reference :posts, :users, index: true add_foreign_key :posts, :users end to def change add_reference :posts, :users, index: true, foreign_key: true end | ||||
* | | | Skip byebug on all non-MRI rubies, fix tests | Sean Griffin | 2014-12-22 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | | The changes in #18149 added tests for the app generator, but only fixed it for the plugin generator (I should have let CI finish though I think it would have failed as an allowed failure). | ||||
* | | | Only add debugger/byebug if on MRI | Arthur Neves | 2014-12-22 | 2 | -2/+2 |
|/ / | |||||
* / | Fix typo in nodoc | rochefort | 2014-12-22 | 1 | -1/+1 |
|/ | |||||
* | prefer single quotes, by the beard of the prophet! | Xavier Noria | 2014-12-20 | 1 | -10/+10 |
| | |||||
* | Make bin/setup portable | Tim Pope | 2014-12-19 | 1 | -7/+9 |
| | |||||
* | Merge pull request #18100 from chancancode/serve_static_files | Godfrey Chan | 2014-12-19 | 9 | -13/+91 |
| | | | | | | Allow static asset serving from env variable (enhanced!) Conflicts: railties/CHANGELOG.md | ||||
* | `db:structure:load` and `db:schema:load` no longer purge the database. | Yves Senn | 2014-12-18 | 1 | -0/+25 |
| | | | | | | | | | | | | | | | | | Closes #17945 `db:test:prepare` still purges the database to always keep the test database in a consistent state. This patch introduces new problems with `db:schema:load`. Prior to the introduction of foreign-keys, we could run this file against a non-empty database. Since every `create_table` containted the `force: true` option, this would recreate tables when loading the schema. However with foreign-keys in place, `force: true` wont work anymore and the task will crash. /cc @schneems | ||||
* | Merge pull request #18049 from yuki3738/fix_rails_db_command_error | Rafael Mendonça França | 2014-12-16 | 1 | -1/+1 |
|\ | | | | | Add a code checking about file or not to the rails db command | ||||
| * | Add a code checking about file or not to the rails db command | yuki3738 | 2014-12-16 | 1 | -1/+1 |
| | | |||||
* | | English fix [ci skip] | George Millo | 2014-12-16 | 1 | -3/+3 |
|/ | |||||
* | Fix Duplicate web-console entries in Gemfile | NorimasaAndo | 2014-12-14 | 3 | -10/+22 |
| | |||||
* | New applications should use sass-rails 5.0 | Rafael Mendonça França | 2014-12-12 | 1 | -6/+1 |
| | |||||
* | Rails master requires arel master | Rafael Mendonça França | 2014-12-12 | 1 | -2/+8 |
| | |||||
* | Align the GemfileEntry API with stable branches | Godfrey Chan | 2014-12-12 | 1 | -5/+9 |
| | | | | See 63462ec | ||||
* | [ci skip] Fix typo | yui-knk | 2014-12-09 | 1 | -1/+1 |
| | |||||
* | Merge pull request #17896 from GBH/globbing_route_mailer_preview | Rafael Mendonça França | 2014-12-08 | 1 | -0/+11 |
|\ | | | | | fixing mailer previews for apps with globbing route | ||||
| * | fixing mailer previews for apps with globbing route | Oleg | 2014-12-03 | 1 | -0/+11 |
| | | |||||
* | | Merge pull request #17953 from kirs/test-activejob-generator | Rafael Mendonça França | 2014-12-08 | 1 | -0/+29 |
|\ \ | | | | | | | Test coverage for ActiveJob generator | ||||
| * | | Test coverage for ActiveJob generator | Kir Shatrov | 2014-12-07 | 1 | -0/+29 |
| | | | |||||
* | | | Use latest web-console when using --dev or --edge | Sam Ruby | 2014-12-05 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | Fixes: http://intertwingly.net/projects/AWDwR4/checkdepot-215/makedepot.log | ||||
* | | | Merge pull request #17797 from y-yagi/donot_delete_mailer_layouts | Rafael Mendonça França | 2014-12-04 | 2 | -3/+20 |
|\ \ \ | | | | | | | | | Don't remove mailer layouts files | ||||
| * | | | Don't remove mailer layouts files | yuuji.yaginuma | 2014-11-27 | 2 | -3/+20 |
| | | | | |||||
* | | | | Removed use of mocha in the info_controller tests | Prathamesh Sonpatki | 2014-12-03 | 1 | -5/+4 |
| |_|/ |/| | | |||||
* | | | Fix "nonexistent" typo in tests | Melissa Xie | 2014-12-02 | 1 | -1/+1 |
| | | | |||||
* | | | require 'rake' before requiring Rake tasks | Akira Matsuda | 2014-12-03 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | Without this, % rails r "require 'rails/tasks'" would cause a NoMethodError: undefined method `desc' for main:Object | ||||
* | | | Silence Minitest for plugin tests. | Guo Xiang Tan | 2014-12-02 | 2 | -1/+4 |
| |/ |/| | | | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/17340. Use Minitest::BacktraceFilter instead of removing all silencers. This will allow the backtrace for all libraries in the plugin to be shown while removing noise generated by Minitest's backtrace. | ||||
* | | Merge pull request #17866 from bogdan/default-form-builder | Santiago Pastorino | 2014-12-01 | 1 | -0/+39 |
|\ \ | | | | | | | Bugfix config.action_view.default_form_builder option |