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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \|	copy-edits ae9b3d7 [ci skip]	Xavier Noria	2012-10-09	1	-2/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	AS guide: revises the description of #monday, and #sunday [ci skip]	Xavier Noria	2012-10-09	1	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The start of the week is a parameter nowadays, it is a little confusing that we say here that we assume something about it. Better to use "next" and "previous", which are clear regardless of the concept of beginning of week. Adds examples for the edge cases where the receiver is a Monday or Sunday itself.
\| * \| \| \| \| \| \|	Merge pull request #7736 from gregolsen/beginning_of_week_guides	Xavier Noria	2012-10-09	1	-2/+6
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActiveSupport core extensions guides update
\| \| * \| \| \| \| \| \|	active support core extensions guides updated with config.beginning_of_week info	gregolsen	2012-09-22	1	-2/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	keys.include? -> key?	Xavier Noria	2012-10-09	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #7817 from NARKOZ/object-conversions	Xavier Noria	2012-10-09	4	-11/+2
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|	remove unnecessary object/conversions file
\| \| * \| \| \| \| \| \|	remove unnecessary object/conversions file	Nihad Abbasov	2012-10-02	4	-11/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #7877 from claudiob/remove_duplicate_article_THE	Rafael Mendonça França	2012-10-08	2	-2/+2
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicate 'the' article in commented line
\| \| * \| \| \| \| \| \| \|	Remove duplicate 'the' article in commented line	claudiob	2012-10-08	2	-2/+2
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The sentence used to read "at the bottom of the the compiled file"
\| * \| \| \| \| \| \| \|	Merge pull request #7875 from senny/interpolation_for_execute	Rafael Mendonça França	2012-10-08	1	-17/+0
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove unused `expand_range_bind_variables` method
\| \| * \| \| \| \| \| \| \|	remove unused `expand_range_bind_variables` method	Yves Senn	2012-10-08	1	-17/+0
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this method was not used, not documented and not tested.
\| * \| \| \| \| \| \| \|	Merge pull request #7873 from steveklabnik/update_initializer	David Heinemeier Hansson	2012-10-08	2	-8/+7
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moving locale stuff from app.rb to an initializer.
\| \| * \| \| \| \| \| \| \|	Moving locale stuff from app.rb to an initializer.	Steve Klabnik	2012-10-08	2	-8/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	There is already an invitation to use rack-cache in ↵	David Heinemeier Hansson	2012-10-08	1	-3/+0
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	config/environments/production.rb
* \| \| \| \| \| \| \| \|	Cleanup comments a bit and fuck 80 characters	David Heinemeier Hansson	2012-10-08	1	-16/+10
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Inline comment	David Heinemeier Hansson	2012-10-08	1	-3/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Encoding already defaults to utf-8 per lib/rails/application/configuration.rb:23	David Heinemeier Hansson	2012-10-08	1	-3/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Everyone is running bundler, no need for defensive programming shit	David Heinemeier Hansson	2012-10-08	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Not precompiling your assets for production is a bad idea -- do not encourage it	David Heinemeier Hansson	2012-10-08	1	-6/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #7872 from kennyj/should_use_app_paths	José Valim	2012-10-08	1	-1/+2
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \|	Should use app.paths instead of specific path.
\| * \| \| \| \| \| \|	Should use app.paths instead of specific path.	kennyj	2012-10-08	1	-1/+2
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #6282 from alexeymuranov/rename-fixtures-class	Rafael Mendonça França	2012-10-07	14	-63/+83
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename "ActiveRecord::Fixtures" to "ActiveRecord::FixtureSet"
\| * \| \| \| \| \| \|	Add CHANGELOG entry for "Fixtures" -> "FixtureSet"	Alexey Muranov	2012-10-07	1	-1/+13
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Move/rename files to follow naming conventions	Alexey Muranov	2012-10-07	3	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Deprecate "Fixtures" constant	Alexey Muranov	2012-10-07	1	-0/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Rename "Fixtures" class to "FixtureSet"	Alexey Muranov	2012-10-07	13	-61/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename `ActiveRecord::Fixtures` class to `ActiveRecord::FixtureSet`. Instances of this class normally hold a collection of fixtures (records) loaded either from a single YAML file, or from a file and a folder with the same name. This change make the class name singular and makes the class easier to distinguish from the modules like `ActiveRecord::TestFixtures`, which operates on multiple fixture sets, or `DelegatingFixtures`, `::Fixtures`, etc., and from the class `ActiveRecord::Fixture`, which corresponds to a single fixture.
* \| \| \| \| \| \| \|	Merge pull request #7869 from Locke23rus/actionmailer_new_hash_syntax	Rafael Mendonça França	2012-10-07	15	-169/+169
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update actionmailer with new hash syntax. Just to make clear we don't accept this kind of pull request because it can invalidate a lot of pull requests. I'm accepting this because Action Mailer has only two open pull requests.
\| * \| \| \| \| \| \|	Update actionmailer with new hash syntax.	Kirill Nikitin	2012-10-07	15	-169/+169
\|/ / / / / / /
* \| \| \| \| \| \|	explains why these requires are in an unusual place	Xavier Noria	2012-10-07	1	-0/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #7650 from kennyj/fix_warning_20120915	Xavier Noria	2012-10-07	1	-6/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix warning: circular require considered harmful.
\| * \| \| \| \| \| \|	Fix warning: circular require considered harmful.	kennyj	2012-10-03	1	-6/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	adds a CHANGELOG for guides and registers the new responsive design	Xavier Noria	2012-10-07	1	-0/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Gotta log each spacer line separately to ensure each is tagged	Jeremy Kemper	2012-10-06	1	-1/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Tag the blank log line between dev requests so it's easier to filter out ↵	Jeremy Kemper	2012-10-06	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	entire requests with grep -v without leaving a stray newline behind. Example: # Tag asset requests so it's easy to filter them from dev logs config.log_tags = [ -> request { :assets if request.path.starts_with?(config.assets.prefix) }, -> request { request.uuid } ] # Watch the logs, ignoring asset requests $ tail -100f log/development.log \| grep -v assets
* \| \| \| \| \| \| \|	Remove unneeded attr_reader	Rafael Mendonça França	2012-10-07	1	-1/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Ruby 2 compat. CGI.escapeHTML has changed the way it escapes apostrophes a ↵	Jeremy Kemper	2012-10-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	few times, so fix up the test to work with however it chooses to escape.
* \| \| \| \| \| \| \|	Ruby 2 compat. Hash[] now raises on bad elements rather than ignoring them. ↵	Jeremy Kemper	2012-10-06	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	No sense over-testing this MRI-specific behavior. See ruby/ruby@8d6add973ebcb3b4c1efbfaf07786550a3e219af
* \| \| \| \| \| \| \|	Fix nodoc comment	Rafael Mendonça França	2012-10-07	1	-16/+15
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	More Ruby 1.9 hash syntax.	Rafael Mendonça França	2012-10-06	1	-52/+47
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	We don't need to check blank? here.	Rafael Mendonça França	2012-10-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also the blank? check introduced a bug. $ rails generate model Foo blank:boolean form_for(Foo.new(:blank => true)) => ArgumentError, "First argument in form cannot contain nil or be empty"
* \| \| \| \| \| \| \|	Update some code styles.	Rafael Mendonça França	2012-10-06	2	-200/+228
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Uses the Ruby 1.9 hash syntax * Avoid escaping " inside string using the %{} syntax
* \| \| \| \| \| \| \|	Merge pull request #6475 from joefiorini/responsive-guides	Xavier Noria	2012-10-06	9	-234/+648
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Responsive guides
\| * \| \| \| \| \| \| \|	[Guides] Format content for small devices	Joe Fiorini	2012-10-06	6	-5/+163
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	[Guides] Navigation styling for small devices	Joe Fiorini	2012-10-06	5	-231/+487
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #7864 from teleological/link_to_remote_master	Rafael Mendonça França	2012-10-06	3	-2/+21
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Accept :remote as symbol in link_to options
\| * \| \| \| \| \| \| \| \|	Accept :remote as symbol in link_to options	Riley Lynch	2012-10-06	3	-2/+21
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Accept either :remote or 'remote' in both the html_options and (url_)options hash arguments to link_to.
* \| \| \| \| \| \| \| \|	Remove unneeded require	Rafael Mendonça França	2012-10-06	1	-1/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Move multiparameter attributes related tests to its own file	Rafael Mendonça França	2012-10-06	2	-337/+351
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #7848 from senny/3415_assert_template_has_nil_variable	Rafael Mendonça França	2012-10-06	3	-4/+24
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	can't pass :locals to #assert_template without a view test case (#3415)
\| * \| \| \| \| \| \| \|	can't pass :locals to #assert_template without a view test case. Closes #3415	Yves Senn	2012-10-06	3	-4/+24
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the documentation on #assert_template states that the :locals option is only available in view test cases: # In a view test case, you can also assert that specific locals are passed # to partials: I added a warning when it's passed in an inapropriate context to prevent a NoMethodError.