rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #11389 from jetthoughts/11381_fix_hit_database_on_precompile	José Valim	2013-07-10	4	-19/+26
\|\ \| \| \| \|	#11381: Ignore config.eager_load=true for rake
\| *	#11381: Ignore config.eager_load=true for rake	Paul Nikitochkin	2013-07-10	4	-19/+26
\| \| \| \| \| \| \| \|	Closes #11381
* \|	Merge pull request #11385 from MarceloCajueiro/remove_string_interpolation	Rafael Mendonça França	2013-07-09	1	-2/+2
\|\ \ \| \|/ \|/\|	Remove unnecessary string interpolation
\| *	Remove unnecessary string interpolation	Marcelo G. Cajueiro	2013-07-09	1	-2/+2
\| \| \| \| \| \| \| \|	Removed from controller template of scaffold generator.
* \|	Merge pull request #11378 from wangjohn/class_for_application_generator	Rafael Mendonça França	2013-07-09	2	-27/+63
\|\ \ \| \| \| \| \| \|	Creating a class to handle preparing ARGV.
\| * \|	Creating a class to handle preparing ARGV.	wangjohn	2013-07-09	2	-27/+63
\| \|/ \| \| \| \| \| \| \| \| \| \|	Before the AppGenerator is started, ARGV needs to be modified to correctly account for some things. I'm extracting these out into their own class.
* /	Using the instance variable for argv.	wangjohn	2013-07-09	1	-2/+2
\|/ \| \| \| \|	Instead of using the global constant ARGV, we're changing to using the instance variable because it is more testable.
*	Merge pull request #11355 from wangjohn/class_for_rails_commands	Rafael Mendonça França	2013-07-08	2	-94/+172
\|\ \| \| \| \|	Creating a class for carrying out rails commands.
\| *	Creating a class for carrying out rails commands.	wangjohn	2013-07-07	2	-94/+172
\| \| \| \| \| \| \| \| \| \| \| \|	This class encapsulates a lot of logic that wasn't very object oriented. Helper methods have been created to try to make things more logical and easy to read.
* \|	handle notes in *.sass files	Yuri Artemev	2013-07-08	3	-2/+8
\|/
*	fixes Rails version for the stable API [ci skip]	Xavier Noria	2013-07-06	1	-0/+8
\|
*	fixes broken links in the API [Fixes #11335] [ci skip]	Xavier Noria	2013-07-06	1	-2/+2
\|
*	Removed deprecated `Rails.application.railties.engines`.	Arun Agrawal	2013-07-04	3	-12/+4
\|
*	build fix: railties tests used deprecated `SchemaCache` methods.	Yves Senn	2013-07-04	1	-2/+2
\|
*	Removed unused deprecation requires.	Paul Nikitochkin	2013-07-03	4	-5/+0
\|
*	Merge pull request #11280 from arunagw/added-missing-changelog-entry	Yves Senn	2013-07-03	1	-0/+4
\|\ \| \| \| \|	Added missing CHANGELOG from PR #11279 [ci skip]
\| *	Added missing CHANGELOG from PR #11279 [ci skip]	Arun Agrawal	2013-07-03	1	-0/+4
\| \|
* \|	Removed deprecated threadsafe!	Paul Nikitochkin	2013-07-03	1	-10/+0
\|/
*	Merge pull request #11272 from vipulnsward/generator_update	Rafael Mendonça França	2013-07-03	2	-6/+5
\|\ \| \| \| \|	Remove deprecated `ActiveRecord::Generators::ActiveModel#update_attribute`
\| *	Remove deprecated `ActiveRecord::Generators::ActiveModel#update_attributes` in	Vipul A M	2013-07-03	2	-6/+5
\| \| \| \| \| \| \| \|	favor of `ActiveRecord::Generators::ActiveModel#update`
* \|	Fix ruby patch level example in rails docs regarding info page [ci skip]	Carlos Antonio da Silva	2013-07-03	1	-1/+1
\|/ \| \| \|	Thanks @egilburg.
*	Add patch level to Ruby version information	Tyler Brock	2013-07-03	1	-2/+4
\| \| \| \| \|	Given the recent security related patches to ruby and rails it is more important than ever to know what patch level you are running.
*	Merge pull request #10565 from prathamesh-sonpatki/rake-db	Carlos Antonio da Silva	2013-07-02	1	-1/+1
\|\ \| \| \| \|	Improved grammar and replaced 'dbs' slang with 'databases'
\| *	Improved grammar and replaced 'dbs' slang with 'databases'	Prathamesh Sonpatki	2013-06-27	1	-1/+1
\| \|
* \|	Merge pull request #11134 from wangjohn/object_orienting_testing_rake_file	Carlos Antonio da Silva	2013-07-02	2	-15/+45
\|\ \ \| \| \| \| \| \|	Making the rake file for tests easier to read.
\| * \|	Making the rake file for tests easier to read.	wangjohn	2013-06-25	2	-15/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I'm defining a new class which modularizes how the `rake test` tasks are defined and invoked.
* \| \|	Remove deprecated `config.whiny_nils`	Vipul A M	2013-07-02	2	-3/+4
\| \| \|
* \| \|	Use block instead passing as argument	Rafael Mendonça França	2013-07-02	1	-1/+1
\| \| \|
* \| \|	Merge pull request #11220 from aditya-kapoor/add-concern	Carlos Antonio da Silva	2013-07-01	1	-4/+3
\|\ \ \ \| \| \| \| \| \| \| \|	Change Rails Migration generator module to use AS::Concern
\| * \| \|	Using ActiveSupport::Concern instead of plain regular Ruby hooks in ↵	aditya-kapoor	2013-07-01	1	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	railties/lib/rails/generators/migration.rb file
* \| \| \|	Merge pull request #11203 from schneems/schneems/plugin_new-plugin	Rafael Mendonça França	2013-07-01	35	-16/+20
\|\ \ \ \ \| \|/ / / \|/\| \| \|	s/plugin_new/plugin
\| * \| \|	s/plugin_new/plugin	schneems	2013-06-30	35	-16/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There are historical reasons that the `plugin` command was `plugin_new`, now those are no longer applicable, we should remove the naming edge case from the project. This PR is based off of comments from #11176 ATP Railties
* \| \| \|	Allowing multiple rails applications in the same ruby instance.	wangjohn	2013-06-30	2	-7/+226
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	This change provides the ability to create a new application with a configuration which can be specified.
* \| \|	Merge pull request #11176 from schneems/schneems/plugin_new_help_fix	Rafael Mendonça França	2013-06-29	2	-9/+11
\|\ \ \ \| \| \| \| \| \| \| \|	Fix `rails plugin --help`
\| * \| \|	Fix `rails plugin --help`	schneems	2013-06-29	2	-9/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Right now if you run the `rails plugin --help` command it fails because rails expects a command in `railties/lib/rails/commands/plugin.rb` that does not exist because the file is named `plugin_new`. This is the error: ``` ruby-2.0.0-p0 ~/documents/projects/tmp/vanilla (master) $ rails plugin --help /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/activesupport-4.0.0/lib/active_support/dependencies.rb:228:in `require': cannot load such file -- rails/commands/plugin (LoadError) from /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/activesupport-4.0.0/lib/active_support/dependencies.rb:228:in `block in require' from /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/activesupport-4.0.0/lib/active_support/dependencies.rb:213:in `load_dependency' from /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/activesupport-4.0.0/lib/active_support/dependencies.rb:228:in `require' from /Users/schneems/.rvm/gems/ruby-2.0.0-p0/gems/railties-4.0.0/lib/rails/commands.rb:49:in `<top (required)>' from bin/rails:4:in `require' from bin/rails:4:in `<main>' ```
* \| \| \|	Update a broken link into the fixtures' template	Robin Dupret	2013-06-29	1	-1/+1
\|/ / /
* / /	Omit turbolinks configuration completely on skip_javascript generator option	Nikita Fedyashev	2013-06-28	3	-3/+17
\|/ /
* \|	Fix punctuation in config templates	Akira Matsuda	2013-06-28	1	-1/+1
\| \|
* \|	Removing deprecation message and silencing method.	wangjohn	2013-06-26	1	-18/+0
\|/ \| \| \| \| \| \| \|	The deprecation rake task is no longer useful because the deprecated methods have already been removed. The method for silencing stderr has been removed since it was only useful for `rake test:uncommitted` which was deprecated and removed.
*	Review railties changelog [ci skip]	Carlos Antonio da Silva	2013-06-26	1	-5/+4
\|
*	Removing deprecated rake tasks.	wangjohn	2013-06-24	3	-101/+6
\| \| \| \| \|	The `rake test:recent` and `rake test:uncommitted` tasks were deprecated and are now being removed.
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2013-06-26	1	-0/+1
\|\ \| \| \| \| \| \| \| \|	Conflicts: guides/source/layout.html.erb
\| *	Missing mention about a generated file [ci skip]	Robin Dupret	2013-06-22	1	-0/+1
\| \| \| \| \| \| \| \|	Add a mention about the helper's test file generated invoking the controller generator in the USAGE file
* \|	remove trailing whitespace from `config/routes.rb` template.	Yves Senn	2013-06-26	1	-1/+1
\| \|
* \|	Merge pull request #10666 from YanhaoYang/master	Carlos Antonio da Silva	2013-06-25	1	-1/+1
\|\ \ \| \| \| \| \| \|	Make "rails dbconsole" work with activerecord-postgis-adapter
\| * \|	make "rails dbconsole" work with activerecord-postgis-adapter	YanhaoYang	2013-05-17	1	-1/+1
\| \| \|
* \| \|	restore correct scaffold generation	Nolan Evans	2013-06-25	1	-1/+1
\| \| \|
* \| \|	Change reference to all to scoped instead.	Steve Klabnik	2013-06-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In #11088, `#to_a` was added to remove a deprecation around using `#all`. I merged, but it really should have been `#scoped` instead, as that's the preferred replacement.
* \| \|	fix deprecation warning in scaffold controllers	Nolan Evans	2013-06-25	1	-1/+1
\| \| \|
* \| \|	Remove code related to the rails test command	Robin Dupret	2013-06-21	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the mention about this command in the rails command's help message and remove the "t" alias related to it.