aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-01-031-0/+8
|\
| * Add docs for `Rails.env` and `Rails.env=`claudiob2014-12-221-0/+8
| | | | | | | | [ci skip]
* | Merge pull request #18309 from PaBLoX-CL/fix-fixtures-referencesRafael Mendonça França2015-01-023-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:referencesPablo Olmos de Aguilera Corradini2015-01-022-5/+7
|/ / | | | | | | Fix #18301
* | Remove warningsCarlos Antonio da Silva2015-01-021-2/+2
| | | | | | | | | | warning: ambiguous first argument; put parentheses or a space even after `/' operator'`
* | Verify the helper name with plural as it is generatedCarlos Antonio da Silva2015-01-021-1/+1
| | | | | | | | Thanks @robin850.
* | Add --skip-action-mailer (or -M) to rails generateclaudiob2015-01-0110-4/+75
| |
* | Fix scaffold generator with --helper=false optionRafael Mendonça França2015-01-012-0/+15
| |
* | Fix test description to match the test behaviourRafael Mendonça França2015-01-011-1/+1
| |
* | Update copyright notices to 2015 [ci skip]Arun Agrawal2014-12-311-1/+1
| |
* | Fix description for application_name method - change simple to simplyPrathamesh Sonpatki2014-12-301-1/+1
| | | | | | | | [ci skip]
* | Merge pull request #18240 from shunsukeaida/add_tzinfo_data_to_plugin_gemfileRafael Mendonça França2014-12-291-0/+4
|\ \ | | | | | | plugin's gemfile also needs tzinfo-data in Windows
| * | plugin's gemfile also needs tzinfo-data in WindowsShunsukeAida2014-12-301-0/+4
| | |
* | | Remove some warning with Ruby 2.2Rafael Mendonça França2014-12-291-1/+1
|/ /
* | Merge pull request #18209 from claudiob/bump-to-2-2Guillermo Iguaran2014-12-282-4/+4
|\ \ | | | | | | Require Ruby 2.2 for Rails 5.0
| * | Require Ruby 2.2 for Rails 5.0claudiob2014-12-262-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 Robbin2014-12-263-4/+34
|/ /
* | - Changed `paths` to `routing_paths` to avoid warning `possible reference to ↵Vipul A M2014-12-261-3/+3
| | | | | | | | past scope`
* | Remove unnecessary double spaceKenta Okamoto2014-12-261-1/+1
| |
* | Merge pull request #18170 from tgxworld/add_docs_for_rails_application_secretsSean Griffin2014-12-231-1/+15
|\ \ | | | | | | | | | [ci skip]
| * | Rails::Application#secrets should be documented.Guo Xiang Tan2014-12-241-1/+15
| | |
* | | Add test missed by a03ea684efc3505647cf0327a501aa2dbb591ad2Sean Griffin2014-12-221-2/+3
| | |
* | | Use the new `foreign_key` option on `references` in generatorsSean Griffin2014-12-223-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 testsSean Griffin2014-12-223-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 MRIArthur Neves2014-12-222-2/+2
|/ /
* / Fix typo in nodocrochefort2014-12-221-1/+1
|/
* prefer single quotes, by the beard of the prophet!Xavier Noria2014-12-201-10/+10
|
* Make bin/setup portableTim Pope2014-12-191-7/+9
|
* Merge pull request #18100 from chancancode/serve_static_filesGodfrey Chan2014-12-199-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 Senn2014-12-181-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_errorRafael Mendonça França2014-12-161-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 commandyuki37382014-12-161-1/+1
| |
* | English fix [ci skip]George Millo2014-12-161-3/+3
|/
* Fix Duplicate web-console entries in GemfileNorimasaAndo2014-12-143-10/+22
|
* New applications should use sass-rails 5.0Rafael Mendonça França2014-12-121-6/+1
|
* Rails master requires arel masterRafael Mendonça França2014-12-121-2/+8
|
* Align the GemfileEntry API with stable branchesGodfrey Chan2014-12-121-5/+9
| | | | See 63462ec
* [ci skip] Fix typoyui-knk2014-12-091-1/+1
|
* Merge pull request #17896 from GBH/globbing_route_mailer_previewRafael Mendonça França2014-12-081-0/+11
|\ | | | | fixing mailer previews for apps with globbing route
| * fixing mailer previews for apps with globbing routeOleg2014-12-031-0/+11
| |
* | Merge pull request #17953 from kirs/test-activejob-generatorRafael Mendonça França2014-12-081-0/+29
|\ \ | | | | | | Test coverage for ActiveJob generator
| * | Test coverage for ActiveJob generatorKir Shatrov2014-12-071-0/+29
| | |
* | | Use latest web-console when using --dev or --edgeSam Ruby2014-12-051-0/+10
| | | | | | | | | | | | | | | | | | Fixes: http://intertwingly.net/projects/AWDwR4/checkdepot-215/makedepot.log
* | | Merge pull request #17797 from y-yagi/donot_delete_mailer_layoutsRafael Mendonça França2014-12-042-3/+20
|\ \ \ | | | | | | | | Don't remove mailer layouts files
| * | | Don't remove mailer layouts filesyuuji.yaginuma2014-11-272-3/+20
| | | |
* | | | Removed use of mocha in the info_controller testsPrathamesh Sonpatki2014-12-031-5/+4
| |_|/ |/| |
* | | Fix "nonexistent" typo in testsMelissa Xie2014-12-021-1/+1
| | |
* | | require 'rake' before requiring Rake tasksAkira Matsuda2014-12-031-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 Tan2014-12-022-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-builderSantiago Pastorino2014-12-011-0/+39
|\ \ | | | | | | Bugfix config.action_view.default_form_builder option