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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Revert changes related to `bundle install` fixes in `rails new`	Piotr Sarnacki	2012-05-17	1	-10/+1
\| \| \| \| \| \| \| \| \| \| \|	Reverted changes: f3482a9 Fix tests in railties 5904295 improve #6318 aed906a prevent using already loaded Gemfile for 'bundle install' In order to fix this, we need a fix in bundler related to GEM_PATH, which will allow to run tests properly. I will get this changes back when it happens.
*	Merge pull request #6337 from bcardarella/patch-1	Aaron Patterson	2012-05-16	1	-1/+1
\|\ \| \| \| \|	Changing the indentation level of the block comment close for Sass
\| *	Changing the indentation level of the block comment close for SASS	Brian Cardarella	2012-05-15	1	-1/+1
\| \| \| \| \| \|	If one wants to use use SASS for application.css.sass the comment block indentation is invalid.
* \|	improve #6318	Michal Papis	2012-05-15	1	-4/+5
\|/
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-05-15	3	-49/+0
\|\ \| \| \| \| \| \| \| \|	Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb
\| *	Removing ==Examples and last blank lines of docs from railties	Francesco Rodriguez	2012-05-14	3	-49/+0
\| \|
* \|	prevent using already loaded Gemfile for 'bundle install', fix #6314	Michal Papis	2012-05-15	1	-0/+8
\| \|
* \|	Remove dates and environment variables from humans.txt	José Valim	2012-05-14	1	-2/+0
\| \|
* \|	Since escape_html_entities_in_json was moved to 3-2-stable, make it true in ↵	José Valim	2012-05-14	1	-3/+0
\| \| \| \| \| \| \| \|	AS, closes #6287
* \|	Remove remaining require 'rubygems'	Santiago Pastorino	2012-05-13	1	-1/+1
\| \|
* \|	require "rubygems" is obsolete in Ruby 1.9.3	Kornelius Kalnbach	2012-05-13	3	-4/+0
\| \|
* \|	Remove tailing spaces :scissors: [ci skip]	Rafael Mendonça França	2012-05-12	1	-1/+1
\|/
*	s/wether/whether [ci skip]	Vijay Dev	2012-05-12	1	-1/+1
\|
*	Merge pull request #6277 from homakov/patch-6	José Valim	2012-05-12	1	-0/+3
\|\ \| \| \| \|	Comment for active_support's option in application.rb
\| *	Update railties/lib/rails/generators/rails/app/templates/config/application.rb	Egor Homakov	2012-05-12	1	-0/+3
\| \|
* \|	Add commas missing in performance tests	Geoffrey Roguelon	2012-05-12	1	-1/+1
\|/
*	In robots.txt, User-agent should be all downcase except for the first 'U', ↵	Enrico Carlesso	2012-05-11	1	-1/+1
\| \| \| \|	according with http://en.wikipedia.org/wiki/Robots_exclusion_standard
*	Fixes issue #6251	David Padilla	2012-05-10	1	-1/+1
\| \| \| \| \| \| \|	Plugin generator crashes when using the --dummy-path option Code was assuming the application name in `config/application.rb` was module Dummy.
*	add humans.txt	Paul Campbell	2012-05-08	1	-0/+9
\|
*	Rakefile executable attributes and shebang lines has been removed	Roman V. Babenko	2012-05-02	2	-2/+0
\|
*	Use new hash syntax in generated Gemfile	Oscar Del Ben	2012-05-02	1	-14/+14
\|
*	Merge pull request #4345 from sunaku/patch-1	Santiago Pastorino	2012-05-01	1	-1/+1
\|\ \| \| \| \|	gemspec assumes that user kept all generated files
\| *	gemspec assumes that user kept all generated files	Suraj N. Kurapati	2012-01-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	This commit allows the user be lazy and not update their gemspec's `files` directive after deleting unwanted files from their generated Rails plugin.
* \|	Use :github option in Gemfile and make hashes consistent	Piotr Sarnacki	2012-05-01	1	-8/+8
\| \|
* \|	Merge pull request #5530 from ↵	José Valim	2012-04-30	2	-0/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	malclocke/add_option_to_skip_index.html_on_rails_generate Added a generator option to skip the public/index.html file
\| * \|	Added a generator option to remove the public/index.html file when ↵	Ivan Vanderbyl	2012-03-21	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	generating a new Rails application The option is: -i, [--skip-index-html] # Skip public/index.html file
* \| \|	Close #3886 - Add THEAD and TBODY to scaffold markup	twinturbo	2012-04-29	1	-16/+20
\| \| \|
* \| \|	Use Rails::Queueing::Queue instead of Queue so people can build their own ↵	José Valim	2012-04-28	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	consumers around stdlib's Queue
* \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-04-28	1	-4/+4
\|\ \ \
\| * \| \|	Fix misprints in assert_file & assert_instance_method docs	Alexey Vakhov	2012-04-26	1	-4/+4
\| \| \| \|
* \| \| \|	Initial queue implementation	Yehuda Katz	2012-04-26	3	-0/+10
\| \| \| \|
* \| \| \|	Remove blank line at the end of routes.rb	Jeremy Kemper	2012-04-25	1	-2/+1
\| \| \| \|
* \| \| \|	Merge pull request #5902 from avakhov/generator-no-indent-blank-lines	José Valim	2012-04-25	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Don't indent blank lines in named base generators
\| * \| \|	Don't indent blank lines in named base generators	Alexey Vakhov	2012-04-25	1	-1/+1
\| \| \| \|
* \| \| \|	Merge pull request #5880 from asanghi/master	Jeremy Kemper	2012-04-25	2	-3/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Stamp out ruby-debug with debugger everywhere else in the code base
\| * \| \|	and one more time	Aditya Sanghi	2012-04-24	1	-2/+2
\| \| \| \|
\| * \| \|	another attempt at the language	Aditya Sanghi	2012-04-18	1	-2/+2
\| \| \| \|
\| * \| \|	stamp out ruby-debug19 with extreme prejudice :)	Aditya Sanghi	2012-04-17	2	-3/+3
\| \| \| \|
* \| \| \|	Deleting insecure and "bad practice" code. related: ↵	Egor Homakov	2012-04-24	1	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	http://homakov.blogspot.com/2012/04/whitelist-your-routes-match-is-evil.html
* \| \| \|	Refactor GeneratedAttributes	Carlos Antonio da Silva	2012-04-22	1	-7/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Move reference? method to class to remove duplicated code * Move to_sym typecast from #initialize to .parse method (make it easier to refactor reference?), remove AS object/blank require * Use []= instead of merge!({}) * Remove in? in favor of include?, remove AS object/inclusion require
* \| \| \|	Remove unused generator options. This was added for the removed rails new --http	Santiago Pastorino	2012-04-18	3	-9/+0
\| \| \| \|
* \| \| \|	Add hook for add_resource_route	Santiago Pastorino	2012-04-18	2	-7/+14
\| \| \| \|
* \| \| \|	Add missing dependency for active_record_deprecated_finders	Juan Manuel Azambuja	2012-04-18	1	-0/+2
\| \| \| \|
* \| \| \|	Merge pull request #5869 from LachyGroom/patch-1	Piotr Sarnacki	2012-04-17	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Changes b tag to strong
\| * \| \| \|	Changes b tag to strong	CollectiveJam	2012-04-16	1	-1/+1
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	The change is made due to importance of the attribute name (e.g. Name:) on the page (versus just stylistic / appearance sake tag).
* \| \| \|	the index option is always created if the type is one of references or ↵	Vijay Dev	2012-04-18	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	belongs_to. Refactoring it to a simpler form and fixing the build
* \| \| \|	let's not use `and` in place of `&&`	Vijay Dev	2012-04-18	1	-1/+1
\|/ / /
* \| \|	Merge pull request #5835 from asanghi/master	Jeremy Kemper	2012-04-16	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Update Gemfile to use 'debugger' instead of unmaintained 'ruby-debug19'
\| * \| \|	Hey, let's just make it easier for everyone and dump the unmaintained ↵	Aditya Sanghi	2012-04-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ruby-debug19 and move to debugger. Whats the consensus here? If we want better adoption on ruby1.9, please lets just use this fork.
* \| \| \|	Make log_level explicit in production.rb template	Rodrigo Rosenfeld Rosas	2012-04-16	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The 'production' environment name is currently checked for setting up the default log_level to 'info' but that won't work if the environment is copied to staging.rb, for instance. Better to have it explicitly set.